@vunk/plus 1.11.8 → 1.11.9

package/components/broadcasting-markdown/index.mjs

@@ -4172,6 +4172,84 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
 }
 var ParagraphView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__file", "/home/runner/work/vunk-plus/vunk-plus/packages/components/broadcasting-markdown/src/paragraph.vue"]]);
 
+function resolveSeparatorParagraphActions(options) {
+  const {
+    source,
+    currentIndex,
+    sortedSeparators,
+    paragraphMinlength,
+    lastParagraph
+  } = options;
+  const mergeActions = [];
+  const appendActions = [];
+  for (const separator of sortedSeparators) {
+    const separatorLen = separator.length;
+    const compareText = source.slice(
+      currentIndex - separatorLen,
+      currentIndex
+    );
+    if (compareText !== separator) {
+      continue;
+    }
+    const start = lastParagraph?.end ?? 0;
+    const end = currentIndex;
+    const value = source.slice(start, end);
+    if (lastParagraph && separator.length >= value.length) {
+      if (lastParagraph.status === ParagraphStatus.initial) {
+        mergeActions.push({
+          end,
+          value: source.slice(lastParagraph.start, end),
+          separator
+        });
+      }
+      continue;
+    }
+    if (value.length > paragraphMinlength) {
+      appendActions.push({
+        start,
+        separator,
+        end,
+        status: ParagraphStatus.initial,
+        value,
+        broadcast: Broadcast.play
+      });
+    }
+  }
+  return {
+    mergeActions,
+    appendActions
+  };
+}
+function resolveTailParagraphAction(options) {
+  const { source, currentIndex, lastParagraph } = options;
+  if (lastParagraph?.end === currentIndex) {
+    return { type: "none" };
+  }
+  const start = lastParagraph?.end ?? 0;
+  const end = currentIndex;
+  if (lastParagraph && lastParagraph.status === ParagraphStatus.initial && lastParagraph.separator === "") {
+    return {
+      type: "merge",
+      data: {
+        end,
+        value: source.slice(lastParagraph.start, end),
+        separator: ""
+      }
+    };
+  }
+  return {
+    type: "append",
+    data: {
+      start,
+      separator: "",
+      end,
+      status: ParagraphStatus.initial,
+      value: source.slice(start, end),
+      broadcast: Broadcast.play
+    }
+  };
+}
+
 var _sfc_main = defineComponent({
   name: "VkBroadcastingMarkdown",
   components: {
@@ -4226,9 +4304,6 @@ var _sfc_main = defineComponent({
     const isFinished = computed(() => {
       return currentIndex.value >= props2.source.length;
     });
-    const currentText = computed(() => {
-      return props2.source.substring(0, currentIndex.value);
-    });
     const fulfilledTextValue = computed(() => {
       if (props2.disabled) {
         return props2.source;
@@ -4250,41 +4325,24 @@ var _sfc_main = defineComponent({
     }, { immediate: true });
     function write() {
       const lastParagraph = theData.value.at(-1);
-      for (const separator of sortedSeparators.value) {
-        const separatorLen = separator.length;
-        const compareText = currentText.value.slice(
-          currentIndex.value - separatorLen,
-          currentIndex.value
-        );
-        if (compareText === separator) {
-          const start = lastParagraph?.end ?? 0;
-          const end = currentIndex.value;
-          const value = props2.source.slice(
-            start,
-            end
-          );
-          if (lastParagraph && separator.length >= value.length) {
-            if (lastParagraph.status === ParagraphStatus.initial) {
-              lastParagraph.end = end;
-              lastParagraph.value = props2.source.slice(
-                lastParagraph.start,
-                end
-              );
-              lastParagraph.separator = separator;
-            }
-          } else if (value.length > props2.paragraphMinlength) {
-            const paragraph = {
-              start,
-              separator,
-              end,
-              status: ParagraphStatus.initial,
-              value,
-              broadcast: Broadcast.play
-            };
-            addParagraph(paragraph);
-          }
+      const separatorActions = resolveSeparatorParagraphActions({
+        source: props2.source,
+        currentIndex: currentIndex.value,
+        sortedSeparators: sortedSeparators.value,
+        paragraphMinlength: props2.paragraphMinlength,
+        lastParagraph
+      });
+      separatorActions.mergeActions.forEach((action) => {
+        if (!lastParagraph) {
+          return;
         }
-      }
+        lastParagraph.end = action.end;
+        lastParagraph.value = action.value;
+        lastParagraph.separator = action.separator;
+      });
+      separatorActions.appendActions.forEach((action) => {
+        addParagraph(action);
+      });
       if (currentIndex.value < props2.source.length) {
         currentIndex.value++;
         setTimeout(write, props2.delay);
@@ -4293,30 +4351,24 @@ var _sfc_main = defineComponent({
           setTimeout(write, props2.delay);
           return;
         }
-        if (lastParagraph?.end === currentIndex.value) {
+        const tailAction = resolveTailParagraphAction({
+          source: props2.source,
+          currentIndex: currentIndex.value,
+          lastParagraph
+        });
+        if (tailAction.type === "none") {
           return;
         }
-        const start = lastParagraph?.end ?? 0;
-        const end = currentIndex.value;
-        const value = props2.source.slice(start, end);
-        if (lastParagraph && lastParagraph.status === ParagraphStatus.initial && lastParagraph.separator === "") {
-          lastParagraph.end = end;
-          lastParagraph.value = props2.source.slice(
-            lastParagraph.start,
-            end
-          );
-          lastParagraph.separator = "";
-        } else {
-          const paragraph = {
-            start,
-            separator: "",
-            end,
-            status: ParagraphStatus.initial,
-            value,
-            broadcast: Broadcast.play
-          };
-          addParagraph(paragraph);
+        if (tailAction.type === "merge") {
+          if (!lastParagraph) {
+            return;
+          }
+          lastParagraph.end = tailAction.data.end;
+          lastParagraph.value = tailAction.data.value;
+          lastParagraph.separator = tailAction.data.separator;
+          return;
         }
+        addParagraph(tailAction.data);
       }
     }
     function isPrevParagraphFulfilled(currentIndex2) {

package/components/broadcasting-markdown/src/index.vue.d.ts

@@ -179,10 +179,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     processing: (paragraph: Paragraph) => void;
     delay: number;
     status: TickerStatus;
+    paragraphMinlength: number;
     separators: string[];
     keepRead: boolean;
     textToSpeech: import("./types").TextToSpeech;
-    paragraphMinlength: number;
 }, {}, {
     ParagraphView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         enable: {

package/components/broadcasting-markdown/src/utils.d.ts

@@ -0,0 +1,29 @@
+import type { Paragraph } from './types';
+interface SeparatorActionOptions {
+    source: string;
+    currentIndex: number;
+    sortedSeparators: string[];
+    paragraphMinlength: number;
+    lastParagraph?: Paragraph;
+}
+interface TailActionOptions {
+    source: string;
+    currentIndex: number;
+    lastParagraph?: Paragraph;
+}
+export interface ParagraphSeparatorActions {
+    mergeActions: Array<Pick<Paragraph, 'end' | 'value' | 'separator'>>;
+    appendActions: Array<Pick<Paragraph, 'start' | 'separator' | 'end' | 'status' | 'value' | 'broadcast'>>;
+}
+export type TailParagraphAction = {
+    type: 'none';
+} | {
+    type: 'merge';
+    data: Pick<Paragraph, 'end' | 'value' | 'separator'>;
+} | {
+    type: 'append';
+    data: Pick<Paragraph, 'start' | 'separator' | 'end' | 'status' | 'value' | 'broadcast'>;
+};
+export declare function resolveSeparatorParagraphActions(options: SeparatorActionOptions): ParagraphSeparatorActions;
+export declare function resolveTailParagraphAction(options: TailActionOptions): TailParagraphAction;
+export {};

package/components/metahuman-broadcasting/src/index.vue.d.ts

@@ -262,10 +262,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         processing: (paragraph: __VkBroadcastingMarkdown.Paragraph) => void;
         delay: number;
         status: TickerStatus;
+        paragraphMinlength: number;
         separators: string[];
         keepRead: boolean;
         textToSpeech: __VkBroadcastingMarkdown.TextToSpeech;
-        paragraphMinlength: number;
     }, {}, {
         ParagraphView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
             enable: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/plus",
-  "version": "1.11.8",
+  "version": "1.11.9",
   "description": "",
   "author": "",
   "license": "ISC",