Add language highlighting

Yureien · Jun 8, 2023 · 5d41dd3 · 5d41dd3
1 parent afbec39
commit 5d41dd3
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
  "@sveltejs/adapter-node": "^1.2.4",
  "@sveltejs/kit": "^1.5.0",
  "@types/prismjs": "^1.26.0",
+ "@types/sanitize-html": "^2.9.0",
  "@typescript-eslint/eslint-plugin": "^5.45.0",
  "@typescript-eslint/parser": "^5.45.0",
  "autoprefixer": "^10.4.14",
@@ -37,6 +38,7 @@
  },
  "type": "module",
  "dependencies": {
- "@prisma/client": "^4.15.0"
+ "@prisma/client": "^4.15.0",
+ "sanitize-html": "^2.10.0"
  }
 }
diff --git a/src/lib/server/prisma/migrations/20230608002258_add_language_paste/migration.sql b/src/lib/server/prisma/migrations/20230608002258_add_language_paste/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Paste" ADD COLUMN "language" TEXT NOT NULL DEFAULT 'plaintext';
diff --git a/src/lib/server/prisma/schema.prisma b/src/lib/server/prisma/schema.prisma
@@ -16,6 +16,7 @@ model Paste {
  key String @unique
  authorIp String
  content String
+ language String @default("plaintext")
  expiresAt DateTime?
  expiresCount Int?
  readCount Int @default(0)

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -1,5 +1,5 @@
 export interface PasteConfig {
- type: string;
+ language: string;
  encrypted: boolean;
  expiresAfter: string;
  burn: boolean;

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -9,7 +9,7 @@
  let placeholderRef: HTMLDivElement;
  let cmdKey = 'Ctrl';
  let config: PasteConfig = {
- type: 'plaintext',
+ language: 'plaintext',
  encrypted: false,
  expiresAfter: 'never',
  burn: false,
@@ -44,6 +44,8 @@
 
  const save = async () => {
  let content = inputRef.value;
+ if (!content) return;
+
  const data: Paste = {
  content,
  config
@@ -105,7 +107,8 @@
  <Select
  class="px-1 py-1"
  items={Array.from(languageKeysByName, ([label, value]) => ({ label, value }))}
- bind:value={config.type}
+ value={config.language}
+ bind:justValue={config.language}
  showChevron
  clearable={false}
  --background="var(--color-dark)"

diff --git a/src/routes/[key]/+page.server.ts b/src/routes/[key]/+page.server.ts
@@ -3,22 +3,33 @@ import type { PageServerLoad } from './$types';
 import prisma from '@db';
 import Prism from 'prismjs';
 import loadLanguages from 'prismjs/components/index.js';
+import sanitize from 'sanitize-html';
 
 /** @type {PageServerLoad} */
 export async function load({ params }) {
  const { key } = params;
 
  const data = await prisma.paste.findUnique({
- where: { key },
- select: { content: true }
+ where: { key }
  });
 
  if (!data) throw error(404, 'Not found');
 
- let { content } = data;
+ let { content, language } = data;
 
- // loadLanguages();
- const contentHtml = Prism.highlight(content, Prism.languages.html, 'html');
+ let contentHtml;
+
+ try {
+ if (language !== 'plaintext') {
+ loadLanguages([language]);
+ contentHtml = Prism.highlight(content, Prism.languages[language], language);
+ } else {
+ contentHtml = sanitize(content, { disallowedTagsMode: 'escape' });
+ }
+ } catch (e) {
+ console.error(e);
+ contentHtml = sanitize(content, { disallowedTagsMode: 'escape' });
+ }
 
  return {
  contentHtml

diff --git a/src/routes/api/create/+server.ts b/src/routes/api/create/+server.ts
@@ -4,7 +4,7 @@ import prisma from '@db';
 
 /** @type {RequestHandler} */
 export async function POST({ request, getClientAddress }) {
- const data: Paste = await request.json();
+ const { content, config }: Paste = await request.json();
 
  let attempts = 0;
  let keyLength = 5;
@@ -22,7 +22,8 @@ export async function POST({ request, getClientAddress }) {
  data: {
  key,
  authorIp: getClientAddress(),
- content: data.content
+ content,
+ language: config.language
  }
  });
 

diff --git a/yarn.lock b/yarn.lock
@@ -386,6 +386,13 @@
  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
  integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
 
+"@types/sanitize-html@^2.9.0":
+ version "2.9.0"
+ resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.9.0.tgz#5b609f7592de22ef80a0930c39670329753dca1b"
+ integrity sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==
+ dependencies:
+ htmlparser2 "^8.0.0"
+
 "@types/semver@^7.3.12":
  version "7.5.0"
  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
@@ -741,11 +748,46 @@ doctrine@^3.0.0:
  dependencies:
  esutils "^2.0.2"
 
+dom-serializer@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+ integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+ dependencies:
+ domelementtype "^2.3.0"
+ domhandler "^5.0.2"
+ entities "^4.2.0"
+
+domelementtype@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+ integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
+domhandler@^5.0.2, domhandler@^5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+ integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+ dependencies:
+ domelementtype "^2.3.0"
+
+domutils@^3.0.1:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
+ integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
+ dependencies:
+ dom-serializer "^2.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.3"
+
 electron-to-chromium@^1.4.411:
  version "1.4.423"
  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.423.tgz#99567f3a0563fe0d1d0931e9ce851bca239f6658"
  integrity sha512-y4A7YfQcDGPAeSWM1IuoWzXpg9RY1nwHzHSwRtCSQFp9FgAVDgdWlFf0RbdWfLWQ2WUI+bddUgk5RgTjqRE6FQ==
 
+entities@^4.2.0, entities@^4.4.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+ integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 es6-promise@^3.1.2:
  version "3.3.1"
  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -1116,6 +1158,16 @@ has@^1.0.3:
  dependencies:
  function-bind "^1.1.1"
 
+htmlparser2@^8.0.0:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
+ integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
+ dependencies:
+ domelementtype "^2.3.0"
+ domhandler "^5.0.3"
+ domutils "^3.0.1"
+ entities "^4.4.0"
+
 ignore@^5.2.0:
  version "5.2.4"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -1200,6 +1252,11 @@ is-path-inside@^3.0.3:
  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
+is-plain-object@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+ integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 [email protected]:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
@@ -1448,6 +1505,11 @@ parent-module@^1.0.0:
  dependencies:
  callsites "^3.0.0"
 
+parse-srcset@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+ integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
+
 path-exists@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -1550,7 +1612,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.5:
+postcss@^8.3.11, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.5:
  version "8.4.24"
  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
@@ -1674,6 +1736,18 @@ sander@^0.5.0:
  mkdirp "^0.5.1"
  rimraf "^2.5.2"
 
+sanitize-html@^2.10.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452"
+ integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==
+ dependencies:
+ deepmerge "^4.2.2"
+ escape-string-regexp "^4.0.0"
+ htmlparser2 "^8.0.0"
+ is-plain-object "^5.0.0"
+ parse-srcset "^1.0.2"
+ postcss "^8.3.11"
+
 semver@^7.3.7:
  version "7.5.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"