@waline/client 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/client",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "client for waline comment system",
   "keywords": [
     "valine",
@@ -56,15 +56,6 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "build": "npm run rollup && npm run style",
-    "clean": "rimraf ./dist",
-    "dev": "vite -c config/vite.config.js",
-    "lint": "eslint --ext .ts,.vue .",
-    "prepublish": "npm run clean && npm run build",
-    "rollup": "rollup -c ./config/rollup.config.js",
-    "style": "sass ./src/styles/index.scss ./dist/waline.css --style=compressed"
-  },
   "browserslist": {
     "production": [
       ">0.5%",
@@ -82,7 +73,6 @@
   "dependencies": {
     "@vueuse/core": "^8.4.0",
     "autosize": "^5.0.1",
-    "hanabi": "^0.4.0",
     "marked": "^4.0.15",
     "vue": "^3.2.33"
   },
@@ -94,5 +84,14 @@
   },
   "engines": {
     "node": ">=12.20.0"
+  },
+  "scripts": {
+    "build": "pnpm rollup && pnpm style",
+    "clean": "rimraf ./dist",
+    "dev": "vite -c config/vite.config.js",
+    "lint": "eslint --ext .ts,.vue .",
+    "prepublish": "pnpm clean && pnpm build",
+    "rollup": "rollup -c ./config/rollup.config.js",
+    "style": "sass ./src/styles/index.scss ./dist/waline.css --style=compressed"
   }
-}
+}

package/src/components/Waline.vue

@@ -126,9 +126,7 @@ export default defineComponent({
         : {}),
     },
 
-    dark: {
-      type: [String, Boolean],
-    },
+    dark: [String, Boolean],
 
     lang: {
       type: String,
@@ -140,13 +138,9 @@ export default defineComponent({
         : {}),
     },
 
-    locale: {
-      type: Object as PropType<Partial<WalineLocale>>,
-    },
+    locale: Object as PropType<Partial<WalineLocale>>,
 
-    pageSize: {
-      type: Number,
-    },
+    pageSize: Number,
 
     wordLimit: {
       type: [Number, Array] as PropType<number | [number, number]>,
@@ -185,21 +179,15 @@ export default defineComponent({
         : {}),
     },
 
-    login: {
-      type: String as PropType<'enable' | 'disable' | 'force'>,
-    },
+    login: String as PropType<'enable' | 'disable' | 'force'>,
 
-    highlighter: {
-      type: Function as PropType<WalineHighlighter>,
-    },
+    highlighter: Function as PropType<WalineHighlighter>,
 
-    imageUploader: {
-      type: [Function, Boolean] as PropType<WalineImageUploader | false>,
-    },
+    imageUploader: [Function, Boolean] as PropType<WalineImageUploader | false>,
 
-    texRenderer: {
-      type: [Function, Boolean] as PropType<WalineTexRenderer | false>,
-    },
+    texRenderer: [Function, Boolean] as PropType<WalineTexRenderer | false>,
+
+    copyright: Boolean,
   },
 
   setup(props) {

package/src/config/highlighter.ts

@@ -0,0 +1,74 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) egoist <0x142857@gmail.com> (https://egoistian.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+const WORD_REGEXP =
+  /[\u4E00-\u9FFF\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af\u0400-\u04FF]+|\w+/;
+const LEFT_ANGLE_REGEXP = /</;
+const LINE_COMMENT_REGEXP = /(?:^|\s)\/\/(.+?)$/gm;
+const BLOCK_COMMENT_REGEXP = /\/\*([\S\s]*?)\*\//gm;
+const REGEXP = new RegExp(
+  `(${WORD_REGEXP.source}|${LEFT_ANGLE_REGEXP.source})|((?:${LINE_COMMENT_REGEXP.source})|(?:${BLOCK_COMMENT_REGEXP.source}))`,
+  'gmi'
+);
+
+const COLORS = [
+  '23AC69',
+  '91C132',
+  'F19726',
+  'E8552D',
+  '1AAB8E',
+  'E1147F',
+  '2980C1',
+  '1BA1E6',
+  '9FA0A0',
+  'F19726',
+  'E30B20',
+  'E30B20',
+  'A3338B',
+];
+const cache: Record<string, string> = {};
+
+export const defaultHighlighter = (input: string): string => {
+  let index = 0;
+
+  return input.replace(REGEXP, (_match, word: string, comment: string) => {
+    if (comment) return `<span style="color: slategray">${comment}</span>`;
+    if (word === '<') return '&lt;';
+
+    let color: string;
+
+    if (cache[word]) color = cache[word];
+    else {
+      color = COLORS[index];
+      cache[word] = color;
+    }
+
+    const out = `<span style="color: #${color}">${word}</span>`;
+
+    index = ++index % COLORS.length;
+
+    return out;
+  });
+};

package/src/config/index.ts

@@ -1,2 +1,3 @@
 export * from './default';
+export * from './highlighter';
 export * from './i18n';

package/src/typings/base.ts

@@ -43,12 +43,6 @@ export type WalineMeta = 'nick' | 'mail' | 'link';
 
 export type WalineImageUploader = (image: File) => Promise<string>;
 
-export type WalineHighlighter =
-  | ((code: string, lang: string) => string)
-  | ((
-      code: string,
-      lang: string,
-      callback?: (error: unknown | undefined, code?: string) => void
-    ) => void);
+export type WalineHighlighter = (code: string, lang: string) => string;
 
 export type WalineTexRenderer = (blockMode: boolean, tex: string) => string;

package/src/utils/config.ts

@@ -1,6 +1,7 @@
 import {
   defaultLang,
   defaultUploadImage,
+  defaultHighlighter,
   defaultTexRenderer,
   getMeta,
   defaultLocales,
@@ -14,7 +15,6 @@ import type {
   WalineLocale,
   WalineProps,
 } from '../typings';
-import hanabi from 'hanabi';
 
 export interface WalineEmojiConfig {
   tabs: Pick<WalineEmojiInfo, 'name' | 'icon' | 'items'>[];
@@ -73,7 +73,7 @@ export const getConfig = ({
   meta: getMeta(meta),
   requiredMeta: getMeta(requiredMeta),
   imageUploader: fallback(imageUploader, defaultUploadImage),
-  highlighter: fallback(highlighter, hanabi),
+  highlighter: fallback(highlighter, defaultHighlighter),
   texRenderer: fallback(texRenderer, defaultTexRenderer),
   lang,
   dark,

package/src/shims-hanabi.d.ts

@@ -1,9 +0,0 @@
-declare module 'hanabi' {
-  const hanabi: (
-    code: string,
-    lang: string,
-    callback?: (error: unknown, code?: string | undefined) => void
-  ) => string | void;
-
-  export default hanabi;
-}