@incremark/core 0.2.4 → 0.2.6

package/dist/index.js

@@ -2,6 +2,8 @@ import { fromMarkdown } from 'mdast-util-from-markdown';
 import { gfmFromMarkdown } from 'mdast-util-gfm';
 import { gfm } from 'micromark-extension-gfm';
 import { gfmFootnoteFromMarkdown } from 'mdast-util-gfm-footnote';
+import { math } from 'micromark-extension-math';
+import { mathFromMarkdown } from 'mdast-util-math';
 import { codes, constants, types } from 'micromark-util-symbol';
 import { markdownLineEndingOrSpace } from 'micromark-util-character';
 import { factoryDestination } from 'micromark-factory-destination';
@@ -865,14 +867,12 @@ var RE_FENCE_START = /^(\s*)((`{3,})|(~{3,}))/;
 var RE_EMPTY_LINE = /^\s*$/;
 var RE_HEADING = /^#{1,6}\s/;
 var RE_THEMATIC_BREAK = /^(\*{3,}|-{3,}|_{3,})\s*$/;
-var RE_UNORDERED_LIST = /^(\s*)([-*+])\s/;
-var RE_ORDERED_LIST = /^(\s*)(\d{1,9})[.)]\s/;
 var RE_BLOCKQUOTE = /^\s{0,3}>/;
 var RE_HTML_BLOCK_1 = /^\s{0,3}<(script|pre|style|textarea|!--|!DOCTYPE|\?|!\[CDATA\[)/i;
 var RE_HTML_BLOCK_2 = /^\s{0,3}<\/?[a-zA-Z][a-zA-Z0-9-]*(\s|>|$)/;
 var RE_TABLE_DELIMITER = /^\|?\s*:?-{3,}:?\s*(\|\s*:?-{3,}:?\s*)*\|?$/;
 var RE_ESCAPE_SPECIAL = /[.*+?^${}()|[\]\\]/g;
-var RE_FOOTNOTE_DEFINITION = /^\[\^[^\]]+\]:\s/;
+var RE_FOOTNOTE_DEFINITION = /^\[\^([^\]]+)\]:\s/;
 var RE_FOOTNOTE_CONTINUATION = /^(?:    |\t)/;
 var fenceEndPatternCache = /* @__PURE__ */ new Map();
 var containerPatternCache = /* @__PURE__ */ new Map();
@@ -907,13 +907,23 @@ function isThematicBreak(line) {
   return RE_THEMATIC_BREAK.test(line.trim());
 }
 function isListItemStart(line) {
-  const unordered = line.match(RE_UNORDERED_LIST);
-  if (unordered) {
-    return { ordered: false, indent: unordered[1].length };
+  const hasListMarker = /^(\s*)([-*+]|\d{1,9}[.)])/.test(line);
+  if (!hasListMarker) {
+    return null;
   }
-  const ordered = line.match(RE_ORDERED_LIST);
-  if (ordered) {
-    return { ordered: true, indent: ordered[1].length };
+  const match = line.match(/^(\s*)([-*+]|\d{1,9}[.)])(.*)/);
+  if (match) {
+    const indent = match[1].length;
+    const marker = match[2];
+    const rest = match[3];
+    if (rest.trim()) {
+      const isOrdered = /^\d{1,9}[.)]/.test(marker);
+      return { ordered: isOrdered, indent };
+    }
+    if (/^\s+$/.test(rest)) {
+      const isOrdered = /^\d{1,9}[.)]/.test(marker);
+      return { ordered: isOrdered, indent };
+    }
   }
   return null;
 }
@@ -993,7 +1003,9 @@ function createInitialContext() {
     blockquoteDepth: 0,
     inContainer: false,
     containerDepth: 0,
-    inList: false
+    inList: false,
+    inFootnote: false,
+    footnoteIdentifier: void 0
   };
 }
 function isListContinuation(line, listIndent) {
@@ -1049,6 +1061,17 @@ function updateContext(line, context, containerConfig) {
       }
     }
   }
+  if (context.inFootnote && isFootnoteDefinitionStart(line)) {
+    const identifier = line.match(RE_FOOTNOTE_DEFINITION)?.[1];
+    newContext.footnoteIdentifier = identifier;
+    return newContext;
+  }
+  if (!context.inFootnote && isFootnoteDefinitionStart(line)) {
+    const identifier = line.match(RE_FOOTNOTE_DEFINITION)?.[1];
+    newContext.inFootnote = true;
+    newContext.footnoteIdentifier = identifier;
+    return newContext;
+  }
   const listItem = isListItemStart(line);
   if (context.inList) {
     if (context.listMayEnd) {
@@ -1097,6 +1120,41 @@ function updateContext(line, context, containerConfig) {
       return newContext;
     }
   }
+  if (context.inFootnote) {
+    if (isEmptyLine(line)) {
+      return newContext;
+    } else if (isListItemStart(line)) {
+      const listItemInfo = isListItemStart(line);
+      if (listItemInfo.indent === 0) {
+        newContext.inFootnote = false;
+        newContext.footnoteIdentifier = void 0;
+      } else {
+        return newContext;
+      }
+    } else if (isHeading(line)) {
+      newContext.inFootnote = false;
+      newContext.footnoteIdentifier = void 0;
+      return newContext;
+    } else if (detectFenceStart(line)) {
+      newContext.inFootnote = false;
+      newContext.footnoteIdentifier = void 0;
+      return newContext;
+    } else if (isBlockquoteStart(line)) {
+      newContext.inFootnote = false;
+      newContext.footnoteIdentifier = void 0;
+      return newContext;
+    } else if (isFootnoteContinuation(line)) {
+      return newContext;
+    } else if (isFootnoteDefinitionStart(line)) {
+      const identifier = line.match(RE_FOOTNOTE_DEFINITION)?.[1];
+      newContext.footnoteIdentifier = identifier;
+      return newContext;
+    } else {
+      newContext.inFootnote = false;
+      newContext.footnoteIdentifier = void 0;
+      return newContext;
+    }
+  }
   return newContext;
 }
 
@@ -1245,6 +1303,10 @@ var IncremarkParser = class {
       extensions.push(gfm());
       mdastExtensions.push(...gfmFromMarkdown(), gfmFootnoteFromMarkdown());
     }
+    if (this.options.math) {
+      extensions.push(math());
+      mdastExtensions.push(mathFromMarkdown());
+    }
     if (this.containerConfig !== void 0) {
       extensions.push(directive());
       mdastExtensions.push(directiveFromMarkdown());
@@ -1267,7 +1329,7 @@ var IncremarkParser = class {
     }
     return ast;
   }
-  updateDefinationsFromComplatedBlocks(blocks) {
+  updateDefinitionsFromCompletedBlocks(blocks) {
     for (const block of blocks) {
       this.definitionMap = {
         ...this.definitionMap,
@@ -1281,17 +1343,17 @@ var IncremarkParser = class {
   }
   findDefinition(block) {
     const definitions = [];
-    function findDefination(node) {
+    function findDefinitionRecursive(node) {
       if (isDefinitionNode(node)) {
         definitions.push(node);
       }
       if ("children" in node && Array.isArray(node.children)) {
         for (const child of node.children) {
-          findDefination(child);
+          findDefinitionRecursive(child);
         }
       }
     }
-    findDefination(block.node);
+    findDefinitionRecursive(block.node);
     return definitions.reduce((acc, node) => {
       acc[node.identifier] = node;
       return acc;
@@ -1552,7 +1614,7 @@ var IncremarkParser = class {
       const newBlocks = this.nodesToBlocks(ast.children, stableOffset, stableText, "completed");
       this.completedBlocks.push(...newBlocks);
       update.completed = newBlocks;
-      this.updateDefinationsFromComplatedBlocks(newBlocks);
+      this.updateDefinitionsFromCompletedBlocks(newBlocks);
       this.context = contextAtLine;
       this.pendingStartLine = stableBoundary + 1;
     }
@@ -1625,7 +1687,7 @@ var IncremarkParser = class {
         );
         this.completedBlocks.push(...finalBlocks);
         update.completed = finalBlocks;
-        this.updateDefinationsFromComplatedBlocks(finalBlocks);
+        this.updateDefinitionsFromCompletedBlocks(finalBlocks);
       }
     }
     this.lastPendingBlocks = [];
@@ -1643,7 +1705,7 @@ var IncremarkParser = class {
   }
   /**
    * 强制中断解析，将所有待处理内容标记为完成
-   * 语义上等同于 finalize()，但名称更清晰
+   * @deprecated 请使用 finalize() 代替，功能完全相同
    */
   abort() {
     return this.finalize();
@@ -1852,54 +1914,57 @@ function appendToAst(baseNode, sourceNode, startChars, endChars, accumulatedChun
   if (endChars <= startChars) {
     return baseNode;
   }
-  const newPart = sliceAst(sourceNode, endChars, accumulatedChunks, startChars);
-  if (!newPart) {
+  const fullSlice = sliceAst(sourceNode, endChars, accumulatedChunks);
+  if (!fullSlice) {
     return baseNode;
   }
-  return mergeAstNodes(baseNode, newPart);
+  return smartMergeAst(baseNode, fullSlice);
 }
-function mergeAstNodes(baseNode, newPart) {
-  if (baseNode.type !== newPart.type) {
-    return baseNode;
+function smartMergeAst(baseNode, fullSlice) {
+  if (baseNode.type !== fullSlice.type) {
+    return fullSlice;
   }
   const base = baseNode;
-  const part = newPart;
-  if (base.value && typeof base.value === "string" && part.value && typeof part.value === "string") {
-    const baseChunks = base.chunks || [];
-    const partChunks = part.chunks || [];
-    const mergedChunks = [...baseChunks, ...partChunks];
-    const mergedValue = base.value + part.value;
-    const baseStableLength = base.stableLength ?? 0;
-    const result = {
-      ...base,
-      value: mergedValue,
-      stableLength: mergedChunks.length > 0 ? baseStableLength : void 0,
-      chunks: mergedChunks.length > 0 ? mergedChunks : void 0
-    };
-    return result;
+  const full = fullSlice;
+  if (full.value !== void 0) {
+    return fullSlice;
   }
-  if (base.children && Array.isArray(base.children) && part.children && Array.isArray(part.children)) {
-    if (base.children.length > 0 && part.children.length > 0) {
-      const lastBaseChild = base.children[base.children.length - 1];
-      const firstPartChild = part.children[0];
-      if (lastBaseChild.type === firstPartChild.type) {
-        const merged = mergeAstNodes(lastBaseChild, firstPartChild);
-        return {
-          ...base,
-          children: [
-            ...base.children.slice(0, -1),
-            merged,
-            ...part.children.slice(1)
-          ]
-        };
+  if (base.children && Array.isArray(base.children) && full.children && Array.isArray(full.children)) {
+    if (full.children.length < base.children.length) {
+      return fullSlice;
+    }
+    if (full.children.length === base.children.length) {
+      if (base.children.length === 0) {
+        return fullSlice;
       }
+      const lastIndex = base.children.length - 1;
+      const mergedLast2 = smartMergeAst(
+        base.children[lastIndex],
+        full.children[lastIndex]
+      );
+      return {
+        ...full,
+        children: [
+          ...base.children.slice(0, lastIndex),
+          mergedLast2
+        ]
+      };
     }
+    const baseLastIndex = base.children.length - 1;
+    const mergedLast = smartMergeAst(
+      base.children[baseLastIndex],
+      full.children[baseLastIndex]
+    );
     return {
-      ...base,
-      children: [...base.children, ...part.children]
+      ...full,
+      children: [
+        ...base.children.slice(0, baseLastIndex),
+        mergedLast,
+        ...full.children.slice(base.children.length)
+      ]
     };
   }
-  return baseNode;
+  return fullSlice;
 }
 function cloneNode(node) {
   if (typeof structuredClone === "function") {
@@ -1949,6 +2014,7 @@ var BlockTransformer = class {
       plugins: options.plugins ?? [],
       onChange: options.onChange ?? (() => {
       }),
+      onAllComplete: options.onAllComplete ?? null,
       pauseOnHidden: options.pauseOnHidden ?? true
     };
     this.state = {
@@ -1975,18 +2041,8 @@ var BlockTransformer = class {
     if (this.state.currentBlock) {
       const updated = blocks.find((b) => b.id === this.state.currentBlock.id);
       if (updated && updated.node !== this.state.currentBlock.node) {
-        this.clearCache();
-        const oldTotal = this.cachedTotalChars ?? this.countChars(this.state.currentBlock.node);
-        const newTotal = this.countChars(updated.node);
-        if (newTotal < oldTotal || newTotal < this.state.currentProgress) {
-          this.state.currentProgress = Math.min(this.state.currentProgress, newTotal);
-        }
+        this.handleContentChange(this.state.currentBlock.node, updated.node, true);
         this.state.currentBlock = updated;
-        if (!this.rafId && !this.isPaused) {
-          if (this.state.currentProgress < newTotal) {
-            this.startIfNeeded();
-          }
-        }
       }
     }
   }
@@ -1995,13 +2051,8 @@ var BlockTransformer = class {
    */
   update(block) {
     if (this.state.currentBlock?.id === block.id) {
-      const oldTotal = this.cachedTotalChars ?? this.countChars(this.state.currentBlock.node);
-      const newTotal = this.countChars(block.node);
+      this.handleContentChange(this.state.currentBlock.node, block.node, false);
       this.state.currentBlock = block;
-      if (newTotal > oldTotal && !this.rafId && !this.isPaused && this.state.currentProgress >= oldTotal) {
-        this.clearCache();
-        this.startIfNeeded();
-      }
     }
   }
   /**
@@ -2023,6 +2074,7 @@ var BlockTransformer = class {
     this.chunks = [];
     this.clearCache();
     this.emit();
+    this.options.onAllComplete?.();
   }
   /**
    * 重置状态
@@ -2147,6 +2199,30 @@ var BlockTransformer = class {
     this.removeVisibilityHandler();
   }
   // ============ 私有方法 ============
+  /**
+   * 处理 block 内容更新时的字符数变化和进度调整
+   * 统一 push 和 update 方法中的重复逻辑
+   */
+  handleContentChange(oldNode, newNode, isUpdateFromPush) {
+    const oldTotal = this.cachedTotalChars ?? this.countChars(oldNode);
+    const newTotal = this.countChars(newNode);
+    if (newTotal < oldTotal || newTotal < this.state.currentProgress) {
+      this.state.currentProgress = Math.min(this.state.currentProgress, newTotal);
+      this.chunks = [];
+    }
+    this.clearCache();
+    if (isUpdateFromPush) {
+      if (!this.rafId && !this.isPaused) {
+        if (this.state.currentProgress < newTotal) {
+          this.startIfNeeded();
+        }
+      }
+    } else {
+      if (newTotal > oldTotal && !this.rafId && !this.isPaused && this.state.currentProgress >= oldTotal) {
+        this.startIfNeeded();
+      }
+    }
+  }
   getAllBlockIds() {
     return new Set([
       ...this.state.completedBlocks.map((b) => b.id),
@@ -2233,8 +2309,21 @@ var BlockTransformer = class {
   }
   /**
    * 从 AST 节点中提取指定范围的文本
+   *
+   * 优化说明：
+   * - 提前终止：当 charIndex >= end 时立即返回，避免不必要的遍历
+   * - 局部更新：charIndex 只在需要时更新，减少计算
+   * - 早期返回：发现足够的文本后可以提前退出（当前未实现，可作为未来优化）
+   *
+   * @param node 要提取文本的 AST 节点
+   * @param start 起始字符索引（包含）
+   * @param end 结束字符索引（不包含）
+   * @returns 提取的文本
    */
   extractText(node, start, end) {
+    if (start >= end) {
+      return "";
+    }
     let result = "";
     let charIndex = 0;
     function traverse(n) {
@@ -2242,12 +2331,12 @@ var BlockTransformer = class {
       if (n.value && typeof n.value === "string") {
         const nodeStart = charIndex;
         const nodeEnd = charIndex + n.value.length;
-        charIndex = nodeEnd;
         const overlapStart = Math.max(start, nodeStart);
         const overlapEnd = Math.min(end, nodeEnd);
         if (overlapStart < overlapEnd) {
           result += n.value.slice(overlapStart - nodeStart, overlapEnd - nodeStart);
         }
+        charIndex = nodeEnd;
         return charIndex < end;
       }
       if (n.children && Array.isArray(n.children)) {
@@ -2279,6 +2368,7 @@ var BlockTransformer = class {
       this.isRunning = false;
       this.cancelRaf();
       this.emit();
+      this.options.onAllComplete?.();
     }
   }
   cancelRaf() {
@@ -2364,12 +2454,21 @@ var BlockTransformer = class {
   }
   /**
    * 获取总字符数（带缓存）
+   *
+   * 缓存策略：
+   * - 首次调用时计算并缓存
+   * - 内容更新时通过 clearCache() 清除缓存，下次重新计算
+   * - 切换到新 block 时也会清除缓存
    */
   getTotalChars() {
-    if (this.cachedTotalChars === null && this.state.currentBlock) {
+    if (!this.state.currentBlock) {
+      this.cachedTotalChars = null;
+      return 0;
+    }
+    if (this.cachedTotalChars === null) {
       this.cachedTotalChars = this.countChars(this.state.currentBlock.node);
     }
-    return this.cachedTotalChars ?? 0;
+    return this.cachedTotalChars;
   }
   /**
    * 清除缓存（当 block 切换或内容更新时）
@@ -2381,10 +2480,13 @@ var BlockTransformer = class {
   }
   /**
    * 获取累积的 chunks（用于 fade-in 效果）
+   * stableChars 表示在 chunks 之前的稳定字符数
    */
   getAccumulatedChunks() {
     if (this.options.effect === "fade-in" && this.chunks.length > 0) {
-      return { stableChars: 0, chunks: this.chunks };
+      const chunksLength = this.chunks.reduce((sum, c) => sum + c.text.length, 0);
+      const stableChars = this.state.currentProgress - chunksLength;
+      return { stableChars: Math.max(0, stableChars), chunks: this.chunks };
     }
     return void 0;
   }