@incremark/core 0.3.1 → 0.3.2

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 import { I as IncrementalUpdate, P as ParsedBlock, D as DefinitionMap, F as FootnoteDefinitionMap, a as ParserState, B as BlockStatus } from './index-CWuosVAK.js';
 export { A as AstNode, M as MathOptions, b as ParserOptions } from './index-CWuosVAK.js';
-import { E as EngineParserOptions, I as IAstBuilder } from './types-N1b99kYB.js';
-export { a as EngineType, b as IncremarkPlugin, M as MarkedEngineExtension, c as MicromarkEngineExtension } from './types-N1b99kYB.js';
+import { E as EngineParserOptions, I as IAstBuilder } from './types-B7GTGJc2.js';
+export { a as EngineType, b as IncremarkPlugin, M as MarkedEngineExtension, c as MicromarkEngineExtension } from './types-B7GTGJc2.js';
 import { Root, RootContent, Text } from 'mdast';
 export { Root, RootContent } from 'mdast';
-export { M as MarkedAstBuilder } from './MarkedAstBuildter-DDP1An5M.js';
+export { M as MarkedAstBuilder } from './MarkedAstBuildter-B2QhLKKy.js';
+export { collectFootnoteReferences, traverseAst } from './utils/index.js';
 import 'micromark-util-types';
 import 'mdast-util-from-markdown';
 import 'marked';
@@ -39,7 +40,6 @@ declare class IncremarkParser {
     private lineOffsets;
     private completedBlocks;
     private pendingStartLine;
-    private blockIdCounter;
     private context;
     private options;
     /** 边界检测器 */
@@ -53,7 +53,17 @@ declare class IncremarkParser {
     /** 上次 append 返回的 pending blocks，用于 getAst 复用 */
     private lastPendingBlocks;
     constructor(options?: IncremarkParserOptions);
+    /**
+     * 生成 block 的 id（直接使用 offset）
+     * @param startOffset - block 的起始偏移量
+     */
     private generateBlockId;
+    /**
+     * 生成 pending block 的稳定 id（基于 startOffset）
+     * pending blocks 在每次 append 时都会重新生成，使用 startOffset 确保 id 稳定
+     * @param startOffset - block 的起始偏移量，用作稳定的 id
+     */
+    private generatePendingBlockId;
     /**
      * 更新已完成的 blocks 中的 definitions 和 footnote definitions
      */
@@ -188,13 +198,22 @@ interface SourceBlock<T = unknown> {
 }
 /**
  * 显示用的 Block（转换后）
+ *
+ * 注意：DisplayBlock 的 status 含义与 SourceBlock 不同：
+ * - SourceBlock.status: 表示**解析器**的状态（解析是否完成）
+ * - DisplayBlock.status: 表示**打字机动画**的状态（动画是否完成）
+ *
+ * 在打字机模式下：
+ * - 即使解析器已完成（SourceBlock.status = 'completed'），
+ *   如果打字机动画还在进行中，DisplayBlock.status 仍然是 'pending'
+ * - 只有打字机动画完成后，DisplayBlock.status 才变成 'completed'
  */
 interface DisplayBlock<T = unknown> extends SourceBlock<T> {
     /** 用于显示的 AST 节点（可能是截断的） */
     displayNode: RootContent;
     /** 显示进度 0-1 */
     progress: number;
-    /** 是否已完成显示 */
+    /** 是否已完成显示（打字机动画是否完成） */
     isDisplayComplete: boolean;
 }
 /**
@@ -326,7 +345,11 @@ declare class BlockTransformer<T = unknown> {
     constructor(options?: TransformerOptions);
     /**
      * 推入新的 blocks
-     * 会自动过滤已存在的 blocks
+     *
+     * 逻辑：
+     * 1. 移除不在传入列表中的旧 blocks（处理容器增量解析等场景）
+     * 2. 如果 block ID 不存在，添加到 pending
+     * 3. 如果 block ID 已存在且内容变化，更新对应位置的 block
      */
     push(blocks: SourceBlock<T>[]): void;
     /**
@@ -352,6 +375,10 @@ declare class BlockTransformer<T = unknown> {
     /**
      * 获取用于渲染的 display blocks
      * 优化：使用缓存的 displayNode，避免重复遍历已稳定的节点
+     *
+     * 注意：DisplayBlock 的 status 表示的是**打字机动画状态**，而不是解析器的状态：
+     * - 'completed': 打字机动画已完成，内容已完全显示
+     * - 'pending': 打字机动画还在进行中，内容还在逐字显示
      */
     getDisplayBlocks(): DisplayBlock<T>[];
     /**

package/dist/index.js

@@ -484,6 +484,15 @@ var BoundaryDetector = class {
       const wasInFencedCode = tempContext.inFencedCode;
       const wasInContainer = tempContext.inContainer;
       const wasContainerDepth = tempContext.containerDepth;
+      const prevLine = i > 0 ? lines[i - 1] : "";
+      const isSetextUnderline = i > 0 && isSetextHeadingUnderline(line, prevLine);
+      const hasExplicitBlockBoundary = detectFenceStart(line) || // 代码块 fence 开始
+      isHeading(line) || // 新标题开始
+      isThematicBreak(line);
+      if (!wasInFencedCode && !wasInContainer && hasExplicitBlockBoundary && !isSetextUnderline) {
+        stableLine = i - 1;
+        stableContext = { ...tempContext };
+      }
       tempContext = updateContext(line, tempContext, this.containerConfig);
       this.contextCache.set(i, { ...tempContext });
       if (wasInFencedCode && !tempContext.inFencedCode) {
@@ -547,7 +556,8 @@ var BoundaryDetector = class {
     if (isSetextHeadingUnderline(prevLine, lines[lineIndex - 2])) {
       return lineIndex - 1;
     }
-    if (lineIndex >= lines.length - 1) {
+    const isLastLine = lineIndex >= lines.length - 1;
+    if (isLastLine) {
       return -1;
     }
     for (const checker of this.checkers) {
@@ -567,6 +577,20 @@ function isDefinitionNode(node) {
 function isFootnoteDefinitionNode(node) {
   return node.type === "footnoteDefinition";
 }
+function collectFootnoteReferences(node) {
+  const references = [];
+  const seen = /* @__PURE__ */ new Set();
+  traverseAst(node, (n) => {
+    if (n.type === "footnoteReference" && "identifier" in n) {
+      const identifier = n.identifier;
+      if (!seen.has(identifier)) {
+        seen.add(identifier);
+        references.push(identifier);
+      }
+    }
+  });
+  return references;
+}
 function traverseAst(node, visitor) {
   const stopEarly = visitor(node);
   if (stopEarly === true) {
@@ -2315,7 +2339,7 @@ var MarkedAstBuilder = class {
       const absoluteStart = startOffset + relativeStart;
       const absoluteEnd = startOffset + relativeEnd;
       blocks.push({
-        id: generateBlockId(),
+        id: generateBlockId(absoluteStart),
         status,
         node,
         startOffset: absoluteStart,
@@ -2356,7 +2380,6 @@ var IncremarkParser = class {
   lineOffsets = [0];
   completedBlocks = [];
   pendingStartLine = 0;
-  blockIdCounter = 0;
   context;
   options;
   /** 边界检测器 */
@@ -2381,8 +2404,20 @@ var IncremarkParser = class {
     this.definitionManager = new DefinitionManager();
     this.footnoteManager = new FootnoteManager();
   }
-  generateBlockId() {
-    return `block-${++this.blockIdCounter}`;
+  /**
+   * 生成 block 的 id（直接使用 offset）
+   * @param startOffset - block 的起始偏移量
+   */
+  generateBlockId(startOffset) {
+    return String(startOffset);
+  }
+  /**
+   * 生成 pending block 的稳定 id（基于 startOffset）
+   * pending blocks 在每次 append 时都会重新生成，使用 startOffset 确保 id 稳定
+   * @param startOffset - block 的起始偏移量，用作稳定的 id
+   */
+  generatePendingBlockId(startOffset) {
+    return String(startOffset);
   }
   /**
    * 更新已完成的 blocks 中的 definitions 和 footnote definitions
@@ -2454,9 +2489,28 @@ var IncremarkParser = class {
       const stableText = this.lines.slice(this.pendingStartLine, stableBoundary + 1).join("\n");
       const stableOffset = this.getLineOffset(this.pendingStartLine);
       const ast = this.astBuilder.parse(stableText);
-      const newBlocks = this.astBuilder.nodesToBlocks(ast.children, stableOffset, stableText, "completed", () => this.generateBlockId());
+      const newBlocks = this.astBuilder.nodesToBlocks(ast.children, stableOffset, stableText, "completed", (offset) => this.generateBlockId(offset));
+      const blocksToRemove = [];
+      for (const newBlock of newBlocks) {
+        for (const existingBlock of this.completedBlocks) {
+          const isOverlapping = newBlock.startOffset >= existingBlock.startOffset && newBlock.startOffset < existingBlock.endOffset;
+          const isOverlappingReverse = existingBlock.startOffset >= newBlock.startOffset && existingBlock.startOffset < newBlock.endOffset;
+          if (isOverlapping || isOverlappingReverse) {
+            if (newBlock.id !== existingBlock.id) {
+              blocksToRemove.push(existingBlock);
+            }
+          }
+        }
+      }
+      if (blocksToRemove.length > 0) {
+        const idsToRemove = new Set(blocksToRemove.map((b) => b.id));
+        this.completedBlocks = this.completedBlocks.filter((b) => !idsToRemove.has(b.id));
+      }
       this.completedBlocks.push(...newBlocks);
       update.completed = newBlocks;
+      if (blocksToRemove.length > 0) {
+        update.updated = blocksToRemove;
+      }
       this.updateDefinitionsFromCompletedBlocks(newBlocks);
       this.footnoteManager.collectReferencesFromCompletedBlocks(newBlocks);
       this.boundaryDetector.clearContextCache(this.pendingStartLine);
@@ -2468,7 +2522,13 @@ var IncremarkParser = class {
       if (pendingText.trim()) {
         const pendingOffset = this.getLineOffset(this.pendingStartLine);
         const ast = this.astBuilder.parse(pendingText);
-        update.pending = this.astBuilder.nodesToBlocks(ast.children, pendingOffset, pendingText, "pending", () => this.generateBlockId());
+        update.pending = this.astBuilder.nodesToBlocks(
+          ast.children,
+          pendingOffset,
+          pendingText,
+          "pending",
+          (offset) => this.generatePendingBlockId(offset)
+        );
       }
     }
     this.lastPendingBlocks = update.pending;
@@ -2528,7 +2588,7 @@ var IncremarkParser = class {
           remainingOffset,
           remainingText,
           "completed",
-          () => this.generateBlockId()
+          (offset) => this.generateBlockId(offset)
         );
         this.completedBlocks.push(...finalBlocks);
         update.completed = finalBlocks;
@@ -2619,7 +2679,6 @@ var IncremarkParser = class {
     this.lineOffsets = [0];
     this.completedBlocks = [];
     this.pendingStartLine = 0;
-    this.blockIdCounter = 0;
     this.context = createInitialContext();
     this.lastPendingBlocks = [];
     this.definitionManager.clear();
@@ -2885,22 +2944,78 @@ var BlockTransformer = class {
   }
   /**
    * 推入新的 blocks
-   * 会自动过滤已存在的 blocks
+   *
+   * 逻辑：
+   * 1. 移除不在传入列表中的旧 blocks（处理容器增量解析等场景）
+   * 2. 如果 block ID 不存在，添加到 pending
+   * 3. 如果 block ID 已存在且内容变化，更新对应位置的 block
    */
   push(blocks) {
+    const inputIds = new Set(blocks.map((b) => b.id));
     const existingIds = this.getAllBlockIds();
+    let hasRemovals = false;
+    const completedBefore = this.state.completedBlocks.length;
+    this.state.completedBlocks = this.state.completedBlocks.filter((b) => inputIds.has(b.id));
+    if (this.state.completedBlocks.length < completedBefore) {
+      hasRemovals = true;
+    }
+    if (this.state.currentBlock && !inputIds.has(this.state.currentBlock.id)) {
+      this.state.currentBlock = null;
+      this.state.currentProgress = 0;
+      this.chunks = [];
+      this.clearCache();
+      hasRemovals = true;
+    }
+    const pendingBefore = this.state.pendingBlocks.length;
+    this.state.pendingBlocks = this.state.pendingBlocks.filter((b) => inputIds.has(b.id));
+    if (this.state.pendingBlocks.length < pendingBefore) {
+      hasRemovals = true;
+    }
+    if (hasRemovals && !this.state.currentBlock && this.state.pendingBlocks.length > 0) {
+      this.startIfNeeded();
+    }
     const newBlocks = blocks.filter((b) => !existingIds.has(b.id));
     if (newBlocks.length > 0) {
       this.state.pendingBlocks.push(...newBlocks);
       this.startIfNeeded();
     }
-    if (this.state.currentBlock) {
-      const updated = blocks.find((b) => b.id === this.state.currentBlock.id);
-      if (updated && updated.node !== this.state.currentBlock.node) {
-        this.handleContentChange(this.state.currentBlock.node, updated.node, true);
-        this.state.currentBlock = updated;
+    for (const block of blocks) {
+      if (!existingIds.has(block.id)) continue;
+      if (this.state.currentBlock?.id === block.id) {
+        const total = this.getTotalChars();
+        const isComplete = this.state.currentProgress >= total;
+        if (isComplete) {
+          this.state.completedBlocks.push(block);
+          this.state.currentBlock = null;
+          this.state.currentProgress = 0;
+          this.chunks = [];
+          this.clearCache();
+          this.processNext();
+        } else if (this.state.currentBlock.node !== block.node) {
+          this.handleContentChange(this.state.currentBlock.node, block.node, true);
+          this.state.currentBlock = block;
+        }
+        continue;
+      }
+      const completedIndex = this.state.completedBlocks.findIndex((b) => b.id === block.id);
+      if (completedIndex !== -1) {
+        if (this.state.completedBlocks[completedIndex].node !== block.node) {
+          this.state.completedBlocks[completedIndex] = block;
+          this.emit();
+        }
+        continue;
+      }
+      const pendingIndex = this.state.pendingBlocks.findIndex((b) => b.id === block.id);
+      if (pendingIndex !== -1) {
+        if (this.state.pendingBlocks[pendingIndex].node !== block.node) {
+          this.state.pendingBlocks[pendingIndex] = block;
+        }
+        continue;
       }
     }
+    if (hasRemovals) {
+      this.emit();
+    }
   }
   /**
    * 更新指定 block（用于 pending block 内容增加时）
@@ -2909,6 +3024,18 @@ var BlockTransformer = class {
     if (this.state.currentBlock?.id === block.id) {
       this.handleContentChange(this.state.currentBlock.node, block.node, false);
       this.state.currentBlock = block;
+      return;
+    }
+    const completedIndex = this.state.completedBlocks.findIndex((b) => b.id === block.id);
+    if (completedIndex !== -1) {
+      this.state.completedBlocks[completedIndex] = block;
+      this.emit();
+      return;
+    }
+    const pendingIndex = this.state.pendingBlocks.findIndex((b) => b.id === block.id);
+    if (pendingIndex !== -1) {
+      this.state.pendingBlocks[pendingIndex] = block;
+      return;
     }
   }
   /**
@@ -2966,12 +3093,18 @@ var BlockTransformer = class {
   /**
    * 获取用于渲染的 display blocks
    * 优化：使用缓存的 displayNode，避免重复遍历已稳定的节点
+   *
+   * 注意：DisplayBlock 的 status 表示的是**打字机动画状态**，而不是解析器的状态：
+   * - 'completed': 打字机动画已完成，内容已完全显示
+   * - 'pending': 打字机动画还在进行中，内容还在逐字显示
    */
   getDisplayBlocks() {
     const result = [];
     for (const block of this.state.completedBlocks) {
       result.push({
         ...block,
+        // 打字机动画已完成，状态为 completed
+        status: "completed",
         displayNode: block.node,
         progress: 1,
         isDisplayComplete: true
@@ -2984,6 +3117,8 @@ var BlockTransformer = class {
       }
       result.push({
         ...this.state.currentBlock,
+        // 打字机动画进行中，状态为 pending
+        status: "pending",
         displayNode: this.cachedDisplayNode || { type: "paragraph", children: [] },
         progress: total > 0 ? this.state.currentProgress / total : 1,
         isDisplayComplete: false
@@ -3410,6 +3545,6 @@ function createPlugin(name, matcher, options = {}) {
   };
 }
 
-export { BlockTransformer, IncremarkParser, MarkedAstBuilder, allPlugins, cloneNode, codeBlockPlugin, countChars, createBlockTransformer, createIncremarkParser, createPlugin, defaultPlugins, imagePlugin, mathPlugin, mermaidPlugin, sliceAst, thematicBreakPlugin };
+export { BlockTransformer, IncremarkParser, MarkedAstBuilder, allPlugins, cloneNode, codeBlockPlugin, collectFootnoteReferences, countChars, createBlockTransformer, createIncremarkParser, createPlugin, defaultPlugins, imagePlugin, mathPlugin, mermaidPlugin, sliceAst, thematicBreakPlugin, traverseAst };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map