@waline/client 2.0.3 → 2.0.4

package/package.json

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

package/src/compact/convert.ts

@@ -27,7 +27,7 @@ export const covertOptions = (
     visitor,
 
     pageview = visitor === true
-      ? '.leancloud_visitors,.waline-visitor-count,.waline-pageview-count'
+      ? '.leancloud_visitors,.leancloud-visitors,.waline-visitor-count,.waline-pageview-count'
       : visitor,
     locale = langMode,
     emoji,

package/src/components/CommentBox.vue

@@ -235,11 +235,12 @@ import {
   getWordNumber,
   parseEmoji,
   postComment,
+  getEmojis,
 } from '../utils';
 
 import type { ComputedRef, DeepReadonly } from 'vue';
 import type { WalineCommentData, WalineImageUploader } from '../typings';
-import type { Config, EmojiConfig } from '../utils';
+import type { WalineConfig, WalineEmojiConfig } from '../utils';
 
 export default defineComponent({
   name: 'CommentBox',
@@ -271,7 +272,9 @@ export default defineComponent({
   emits: ['submit', 'cancel-reply'],
 
   setup(props, { emit }) {
-    const config = inject<ComputedRef<Config>>('config') as ComputedRef<Config>;
+    const config = inject<ComputedRef<WalineConfig>>(
+      'config'
+    ) as ComputedRef<WalineConfig>;
 
     const inputs = useInputs();
     const userInfo = useUserInfo();
@@ -282,7 +285,7 @@ export default defineComponent({
     const emojiButtonRef = ref<HTMLDivElement | null>(null);
     const emojiPopupRef = ref<HTMLDivElement | null>(null);
 
-    const emoji = ref<DeepReadonly<EmojiConfig>>({ tabs: [], map: {} });
+    const emoji = ref<DeepReadonly<WalineEmojiConfig>>({ tabs: [], map: {} });
     const emojiTabIndex = ref(0);
     const showEmoji = ref(false);
     const showPreview = ref(false);
@@ -544,37 +547,6 @@ export default defineComponent({
         showEmoji.value = false;
     };
 
-    // watch editor
-    watch(
-      () => inputs.value.editor,
-      (value) => {
-        const { highlighter, texRenderer } = config.value;
-
-        content.value = value;
-        previewText.value = parseMarkdown(value, {
-          emojiMap: emoji.value.map,
-          highlighter,
-          texRenderer,
-        });
-        wordNumber.value = getWordNumber(value);
-
-        if (editorRef.value)
-          if (value) autosize(editorRef.value);
-          else autosize.destroy(editorRef.value);
-      },
-      { immediate: true }
-    );
-
-    // watch emoji value change
-    watch(
-      () => config.value.emoji,
-      (emojiConfig) =>
-        emojiConfig.then((config) => {
-          emoji.value = config;
-        }),
-      { immediate: true }
-    );
-
     // update wordNumber
     watch(
       [config, wordNumber],
@@ -602,6 +574,38 @@ export default defineComponent({
 
     onMounted(() => {
       document.body.addEventListener('click', popupHandler);
+
+      // watch editor
+      watch(
+        () => inputs.value.editor,
+        (value) => {
+          const { highlighter, texRenderer } = config.value;
+
+          content.value = value;
+          previewText.value = parseMarkdown(value, {
+            emojiMap: emoji.value.map,
+            highlighter,
+            texRenderer,
+          });
+          wordNumber.value = getWordNumber(value);
+
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          if (value) autosize(editorRef.value!);
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          else autosize.destroy(editorRef.value!);
+        },
+        { immediate: true }
+      );
+
+      // watch emoji value change
+      watch(
+        () => config.value.emoji,
+        (emojiConfig) =>
+          getEmojis(emojiConfig).then((config) => {
+            emoji.value = config;
+          }),
+        { immediate: true }
+      );
     });
 
     onUnmounted(() => {

package/src/components/CommentCard.vue

@@ -73,7 +73,7 @@ import { isLinkHttp } from '../utils';
 import { useTimeAgo } from '../composables';
 
 import type { ComputedRef, PropType } from 'vue';
-import type { Config } from '../utils';
+import type { WalineConfig } from '../utils';
 import type { WalineComment } from '../typings';
 
 export default defineComponent({
@@ -100,7 +100,9 @@ export default defineComponent({
   emits: ['submit', 'reply'],
 
   setup(props) {
-    const config = inject<ComputedRef<Config>>('config') as ComputedRef<Config>;
+    const config = inject<ComputedRef<WalineConfig>>(
+      'config'
+    ) as ComputedRef<WalineConfig>;
     const locale = computed(() => config.value.locale);
 
     const link = computed(() => {

package/src/components/Waline.vue

@@ -134,10 +134,6 @@ export default defineComponent({
         : {}),
     },
 
-    visitor: {
-      type: Boolean,
-    },
-
     dark: {
       type: [String, Boolean],
     },

package/src/pageview.ts

@@ -61,7 +61,7 @@ export const pageviewCount = ({
   const controller = new AbortController();
 
   const elements = Array.from(
-    // visitor selectors
+    // pageview selectors
     document.querySelectorAll<HTMLElement>(selector)
   );
 

package/src/utils/config.ts

@@ -7,7 +7,6 @@ import {
 } from '../config';
 
 import { decodePath, isLinkHttp, removeEndingSplash } from './path';
-import { getEmojis } from './emoji';
 
 import type {
   WalineEmojiInfo,
@@ -17,31 +16,15 @@ import type {
 } from '../typings';
 import hanabi from 'hanabi';
 
-export interface EmojiConfig {
+export interface WalineEmojiConfig {
   tabs: Pick<WalineEmojiInfo, 'name' | 'icon' | 'items'>[];
   map: WalineEmojiMaps;
 }
 
-export interface Config
-  extends Required<
-      Pick<
-        WalineProps,
-        | 'path'
-        | 'lang'
-        | 'meta'
-        | 'pageSize'
-        | 'requiredMeta'
-        | 'imageUploader'
-        | 'highlighter'
-        | 'texRenderer'
-        | 'copyright'
-        | 'login'
-      >
-    >,
-    Pick<WalineProps, 'dark' | 'serverURL'> {
+export interface WalineConfig extends Required<Omit<WalineProps, 'wordLimit'>> {
   locale: WalineLocale;
   wordLimit: [number, number] | false;
-  emoji: Promise<EmojiConfig>;
+  // emoji: Promise<EmojiConfig>;
 }
 
 const getServerURL = (serverURL: string): string => {
@@ -50,6 +33,11 @@ const getServerURL = (serverURL: string): string => {
   return isLinkHttp(result) ? result : `https://${result}`;
 };
 
+const getWordLimit = (
+  wordLimit: WalineProps['wordLimit']
+): [number, number] | false =>
+  Array.isArray(wordLimit) ? wordLimit : wordLimit ? [0, wordLimit] : false;
+
 const fallback = <T = unknown>(
   value: T | false | undefined,
   fallback: T
@@ -65,6 +53,7 @@ export const getConfig = ({
   emoji = ['https://cdn.jsdelivr.net/gh/walinejs/emojis@1.0.0/weibo'],
   meta = ['nick', 'mail', 'link'],
   requiredMeta = [],
+  dark = false,
   pageSize = 10,
   wordLimit,
   imageUploader,
@@ -73,27 +62,25 @@ export const getConfig = ({
   copyright = true,
   login = 'enable',
   ...more
-}: WalineProps): Config => ({
+}: WalineProps): WalineConfig => ({
   serverURL: getServerURL(serverURL),
   path: decodePath(path),
-  lang,
   locale: {
     ...(locales[lang] || locales[defaultLang]),
     ...(typeof locale === 'object' ? locale : {}),
   },
-  emoji: getEmojis(emoji),
-  wordLimit: Array.isArray(wordLimit)
-    ? wordLimit
-    : wordLimit
-    ? [0, wordLimit]
-    : false,
+  // emoji: getEmojis(emoji),
+  wordLimit: getWordLimit(wordLimit),
   meta: getMeta(meta),
   requiredMeta: getMeta(requiredMeta),
-  pageSize,
-  login,
   imageUploader: fallback(imageUploader, defaultUploadImage),
   highlighter: fallback(highlighter, hanabi),
   texRenderer: fallback(texRenderer, defaultTexRenderer),
+  lang,
+  dark,
+  emoji,
+  pageSize,
+  login,
   copyright,
   ...more,
 });

package/src/utils/emoji.ts

@@ -1,7 +1,7 @@
 import { useStorage } from '@vueuse/core';
 import { removeEndingSplash } from './path';
 
-import type { EmojiConfig } from './config';
+import type { WalineEmojiConfig } from './config';
 import type { WalineEmojiInfo } from '../typings';
 
 const hasVersion = (url: string): boolean =>
@@ -40,7 +40,7 @@ const getLink = (name: string, folder = '', prefix = '', type = ''): string =>
 
 export const getEmojis = (
   emojis: (string | WalineEmojiInfo)[]
-): Promise<EmojiConfig> =>
+): Promise<WalineEmojiConfig> =>
   Promise.all(
     emojis.map((emoji) =>
       typeof emoji === 'string'
@@ -48,7 +48,7 @@ export const getEmojis = (
         : Promise.resolve(emoji)
     )
   ).then((emojiInfos) => {
-    const emojiConfig: EmojiConfig = {
+    const emojiConfig: WalineEmojiConfig = {
       tabs: [],
       map: {},
     };