@waline/client 2.3.1 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/client",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "client for waline comment system",
   "keywords": [
     "valine",

package/src/components/CommentBox.vue

@@ -405,9 +405,7 @@ export default defineComponent({
         if (
           (requiredMeta.indexOf('mail') > -1 && !comment.mail) ||
           (comment.mail &&
-            !/^\w(?:[\w._-]*\w)?@(?:\w(?:[\w-]*\w)?\.){0,2}\w+$/.exec(
-              comment.mail
-            ))
+            !/^\w(?:[\w._-]*\w)?@(?:\w(?:[\w-]*\w)?\.)*\w+$/.exec(comment.mail))
         ) {
           inputRefs.value.mail?.focus();
           return alert(locale.value.mailError);

package/src/components/Waline.vue

@@ -79,119 +79,128 @@ import type {
   WalineImageUploader,
   WalineLocale,
   WalineProps,
+  WalineMeta,
 } from '../typings';
 
 declare const SHOULD_VALIDATE: boolean;
 declare const VERSION: string;
 
-export default defineComponent({
-  name: 'WalineRoot',
+const props = [
+  'serverURL',
+  'path',
+  'meta',
+  'requiredMeta',
+  'dark',
+  'lang',
+  'locale',
+  'pageSize',
+  'wordLimit',
+  'emoji',
+  'login',
+  'highlighter',
+  'texRenderer',
+  'imageUploader',
+  'copyright',
+];
+
+const propsWithValidate = {
+  serverURL: {
+    type: String,
+    required: true,
+  },
 
-  components: {
-    CommentBox,
-    CommentCard,
-    LoadingIcon,
+  path: {
+    type: String,
+    required: true,
   },
 
-  props: {
-    serverURL: {
-      type: String,
-      required: true,
-    },
-
-    path: {
-      type: String,
-      required: true,
-    },
-
-    meta: {
-      type: Array,
-      ...(SHOULD_VALIDATE
-        ? {
-            validator: (value: unknown): boolean =>
-              Array.isArray(value) &&
-              value.every((item) => ['nick', 'mail', 'link'].includes(item)),
-          }
-        : {}),
-    },
-
-    requiredMeta: {
-      type: Array,
-      ...(SHOULD_VALIDATE
-        ? {
-            validator: (value: unknown): boolean =>
-              Array.isArray(value) &&
-              value.every((item) => ['nick', 'mail', 'link'].includes(item)),
-          }
-        : {}),
-    },
+  meta: {
+    type: Array as PropType<WalineMeta[]>,
+    default: (): WalineMeta[] => ['nick', 'mail', 'link'],
+    validator: (value: unknown): boolean =>
+      Array.isArray(value) &&
+      value.every((item) => ['nick', 'mail', 'link'].includes(item)),
+  },
 
-    dark: [String, Boolean],
+  requiredMeta: {
+    type: Array,
+    default: (): WalineMeta[] => [],
+    validator: (value: unknown): boolean =>
+      Array.isArray(value) &&
+      value.every((item) => ['nick', 'mail', 'link'].includes(item)),
+  },
 
-    lang: {
-      type: String,
-      ...(SHOULD_VALIDATE
-        ? {
-            validator: (value: unknown): boolean =>
-              Object.keys(defaultLocales).includes(value as string),
-          }
-        : {}),
-    },
-
-    locale: Object as PropType<Partial<WalineLocale>>,
-
-    pageSize: Number,
-
-    wordLimit: {
-      type: [Number, Array] as PropType<number | [number, number]>,
-      // default: 0,
-      ...(SHOULD_VALIDATE
-        ? {
-            validator: (value: unknown): boolean =>
-              typeof value === 'number' ||
-              (Array.isArray(value) &&
-                value.length === 2 &&
-                value.every((item) => typeof item === 'number')),
-          }
-        : {}),
-    },
-
-    emoji: {
-      type: [Array, Boolean] as PropType<(string | WalineEmojiInfo)[] | false>,
-      ...(SHOULD_VALIDATE
-        ? {
-            validator: (value: unknown): boolean =>
-              value === false ||
-              (Array.isArray(value) &&
-                value.every(
-                  (item) =>
-                    typeof item === 'string' ||
-                    (typeof item === 'object' &&
-                      typeof item.name === 'string' &&
-                      typeof item.folder === 'string' &&
-                      typeof item.icon === 'string' &&
-                      Array.isArray(item.items) &&
-                      (item.items as unknown[]).every(
-                        (icon) => typeof icon === 'string'
-                      ))
-                )),
-          }
-        : {}),
-    },
+  dark: [String, Boolean],
 
-    login: String as PropType<'enable' | 'disable' | 'force'>,
+  lang: {
+    type: String,
+    default: 'zh-CN',
+    validator: (value: unknown): boolean =>
+      Object.keys(defaultLocales).includes(value as string),
+  },
 
-    highlighter: Function as PropType<WalineHighlighter>,
+  locale: Object as PropType<Partial<WalineLocale>>,
 
-    imageUploader: [Function, Boolean] as PropType<WalineImageUploader | false>,
+  pageSize: { type: Number, default: 10 },
 
-    texRenderer: [Function, Boolean] as PropType<WalineTexRenderer | false>,
+  wordLimit: {
+    type: [Number, Array] as PropType<number | [number, number]>,
+    validator: (value: unknown): boolean =>
+      typeof value === 'number' ||
+      (Array.isArray(value) &&
+        value.length === 2 &&
+        value.every((item) => typeof item === 'number')),
+  },
 
-    copyright: Boolean,
+  emoji: {
+    type: [Array, Boolean] as PropType<(string | WalineEmojiInfo)[] | false>,
+    validator: (value: unknown): boolean =>
+      value === false ||
+      (Array.isArray(value) &&
+        value.every(
+          (item) =>
+            typeof item === 'string' ||
+            (typeof item === 'object' &&
+              typeof item.name === 'string' &&
+              typeof item.folder === 'string' &&
+              typeof item.icon === 'string' &&
+              Array.isArray(item.items) &&
+              (item.items as unknown[]).every(
+                (icon) => typeof icon === 'string'
+              ))
+        )),
   },
 
+  login: String as PropType<'enable' | 'disable' | 'force'>,
+
+  highlighter: Function as PropType<WalineHighlighter>,
+
+  imageUploader: {
+    type: [Function, Boolean] as PropType<WalineImageUploader | false>,
+    default: undefined,
+  },
+
+  texRenderer: {
+    type: [Function, Boolean] as PropType<WalineTexRenderer | false>,
+    default: undefined,
+  },
+
+  copyright: { type: Boolean, default: true },
+};
+
+export default defineComponent({
+  name: 'WalineRoot',
+
+  components: {
+    CommentBox,
+    CommentCard,
+    LoadingIcon,
+  },
+
+  props: SHOULD_VALIDATE ? propsWithValidate : props,
+
   setup(props) {
-    const config = computed(() => getConfig(props as WalineProps));
+    const config = computed(() => getConfig(props as unknown as WalineProps));
 
     const userInfo = useUserInfo();
 
@@ -274,7 +283,7 @@ export default defineComponent({
 
     provide('config', config);
 
-    watch(() => props.path, refresh);
+    watch(() => (props as unknown as WalineProps).path, refresh);
 
     onMounted(() => refresh());