@incremark/core 0.2.4 → 0.2.5

package/dist/detector/index.d.ts

@@ -1,4 +1,4 @@
-export { r as createInitialContext, o as detectContainer, p as detectContainerEnd, g as detectFenceEnd, f as detectFenceStart, q as isBlockBoundary, l as isBlockquoteStart, i as isEmptyLine, T as isFootnoteContinuation, S as isFootnoteDefinitionStart, h as isHeading, m as isHtmlBlock, k as isListItemStart, n as isTableDelimiter, j as isThematicBreak, u as updateContext } from '../index-zDgyJFpf.js';
+export { r as createInitialContext, o as detectContainer, p as detectContainerEnd, g as detectFenceEnd, f as detectFenceStart, q as isBlockBoundary, l as isBlockquoteStart, i as isEmptyLine, T as isFootnoteContinuation, S as isFootnoteDefinitionStart, h as isHeading, m as isHtmlBlock, k as isListItemStart, n as isTableDelimiter, j as isThematicBreak, u as updateContext } from '../index-BfVDhalw.js';
 import 'mdast';
 import 'micromark-util-types';
 import 'mdast-util-from-markdown';

package/dist/{index-zDgyJFpf.d.ts → index-BfVDhalw.d.ts}

@@ -228,6 +228,12 @@ interface ParserState {
 interface ParserOptions {
     /** 启用 GFM 扩展（表格、任务列表等） */
     gfm?: boolean;
+    /**
+     * 启用数学公式支持（$..$ 行内公式和 $$...$$ 块级公式）
+     * - false/undefined: 禁用（默认）
+     * - true: 启用数学公式解析
+     */
+    math?: boolean;
     /**
      * 启用 ::: 容器语法支持（用于边界检测）
      * - false: 禁用（默认）

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { P as ParserOptions, I as IncrementalUpdate, a as ParsedBlock, D as DefinitionMap, F as FootnoteDefinitionMap, b as ParserState, B as BlockStatus } from './index-zDgyJFpf.js';
-export { A as AstNode, c as BlockContext, e as BlockTypeInfo, C as ContainerConfig, d as ContainerMatch, J as HTML_ATTR_BLACKLIST, K as HTML_PROTOCOL_BLACKLIST, H as HTML_TAG_BLACKLIST, N as HtmlAttrInfo, R as HtmlContentType, M as HtmlElementNode, Q as HtmlTreeExtensionOptions, O as ParsedHtmlTag, s as createHtmlTreeTransformer, r as createInitialContext, o as detectContainer, p as detectContainerEnd, g as detectFenceEnd, f as detectFenceStart, x as detectHtmlContentType, E as findHtmlElementsByTag, G as htmlElementToString, L as htmlTreeExtension, q as isBlockBoundary, l as isBlockquoteStart, i as isEmptyLine, h as isHeading, m as isHtmlBlock, y as isHtmlElementNode, k as isListItemStart, n as isTableDelimiter, j as isThematicBreak, w as parseHtmlFragment, v as parseHtmlTag, t as transformHtmlNodes, u as updateContext, z as walkHtmlElements } from './index-zDgyJFpf.js';
+import { P as ParserOptions, I as IncrementalUpdate, a as ParsedBlock, D as DefinitionMap, F as FootnoteDefinitionMap, b as ParserState, B as BlockStatus } from './index-BfVDhalw.js';
+export { A as AstNode, c as BlockContext, e as BlockTypeInfo, C as ContainerConfig, d as ContainerMatch, J as HTML_ATTR_BLACKLIST, K as HTML_PROTOCOL_BLACKLIST, H as HTML_TAG_BLACKLIST, N as HtmlAttrInfo, R as HtmlContentType, M as HtmlElementNode, Q as HtmlTreeExtensionOptions, O as ParsedHtmlTag, s as createHtmlTreeTransformer, r as createInitialContext, o as detectContainer, p as detectContainerEnd, g as detectFenceEnd, f as detectFenceStart, x as detectHtmlContentType, E as findHtmlElementsByTag, G as htmlElementToString, L as htmlTreeExtension, q as isBlockBoundary, l as isBlockquoteStart, i as isEmptyLine, h as isHeading, m as isHtmlBlock, y as isHtmlElementNode, k as isListItemStart, n as isTableDelimiter, j as isThematicBreak, w as parseHtmlFragment, v as parseHtmlTag, t as transformHtmlNodes, u as updateContext, z as walkHtmlElements } from './index-BfVDhalw.js';
 import { Root, RootContent, Text } from 'mdast';
 export { Root, RootContent } from 'mdast';
 export { calculateLineOffset, generateId, joinLines, resetIdCounter, splitLines } from './utils/index.js';
@@ -40,7 +40,7 @@ declare class IncremarkParser {
      */
     private convertHtmlToText;
     private parse;
-    private updateDefinationsFromComplatedBlocks;
+    private updateDefinitionsFromCompletedBlocks;
     private findDefinition;
     private findFootnoteDefinition;
     /**
@@ -94,7 +94,7 @@ declare class IncremarkParser {
     finalize(): IncrementalUpdate;
     /**
      * 强制中断解析，将所有待处理内容标记为完成
-     * 语义上等同于 finalize()，但名称更清晰
+     * @deprecated 请使用 finalize() 代替，功能完全相同
      */
     abort(): IncrementalUpdate;
     /**
@@ -221,6 +221,11 @@ interface TransformerOptions {
     plugins?: TransformerPlugin[];
     /** 状态变化回调 */
     onChange?: (displayBlocks: DisplayBlock[]) => void;
+    /**
+     * 所有动画完成时的回调
+     * 当队列中没有更多 block 需要处理时触发
+     */
+    onAllComplete?: () => void;
     /**
      * 是否在页面不可见时自动暂停
      * 默认 true，节省资源
@@ -384,6 +389,7 @@ declare class BlockTransformer<T = unknown> {
     private clearCache;
     /**
      * 获取累积的 chunks（用于 fade-in 效果）
+     * stableChars 表示在 chunks 之前的稳定字符数
      */
     private getAccumulatedChunks;
 }

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';
@@ -1245,6 +1247,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 +1273,7 @@ var IncremarkParser = class {
     }
     return ast;
   }
-  updateDefinationsFromComplatedBlocks(blocks) {
+  updateDefinitionsFromCompletedBlocks(blocks) {
     for (const block of blocks) {
       this.definitionMap = {
         ...this.definitionMap,
@@ -1281,17 +1287,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 +1558,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 +1631,7 @@ var IncremarkParser = class {
         );
         this.completedBlocks.push(...finalBlocks);
         update.completed = finalBlocks;
-        this.updateDefinationsFromComplatedBlocks(finalBlocks);
+        this.updateDefinitionsFromCompletedBlocks(finalBlocks);
       }
     }
     this.lastPendingBlocks = [];
@@ -1643,7 +1649,7 @@ var IncremarkParser = class {
   }
   /**
    * 强制中断解析，将所有待处理内容标记为完成
-   * 语义上等同于 finalize()，但名称更清晰
+   * @deprecated 请使用 finalize() 代替，功能完全相同
    */
   abort() {
     return this.finalize();
@@ -1852,54 +1858,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 +1958,7 @@ var BlockTransformer = class {
       plugins: options.plugins ?? [],
       onChange: options.onChange ?? (() => {
       }),
+      onAllComplete: options.onAllComplete ?? null,
       pauseOnHidden: options.pauseOnHidden ?? true
     };
     this.state = {
@@ -1975,12 +1985,13 @@ 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.chunks = [];
         }
+        this.clearCache();
         this.state.currentBlock = updated;
         if (!this.rafId && !this.isPaused) {
           if (this.state.currentProgress < newTotal) {
@@ -1997,9 +2008,15 @@ var BlockTransformer = class {
     if (this.state.currentBlock?.id === block.id) {
       const oldTotal = this.cachedTotalChars ?? this.countChars(this.state.currentBlock.node);
       const newTotal = this.countChars(block.node);
+      if (newTotal !== oldTotal) {
+        this.clearCache();
+      }
+      if (newTotal < oldTotal || newTotal < this.state.currentProgress) {
+        this.state.currentProgress = Math.min(this.state.currentProgress, newTotal);
+        this.chunks = [];
+      }
       this.state.currentBlock = block;
       if (newTotal > oldTotal && !this.rafId && !this.isPaused && this.state.currentProgress >= oldTotal) {
-        this.clearCache();
         this.startIfNeeded();
       }
     }
@@ -2023,6 +2040,7 @@ var BlockTransformer = class {
     this.chunks = [];
     this.clearCache();
     this.emit();
+    this.options.onAllComplete?.();
   }
   /**
    * 重置状态
@@ -2279,6 +2297,7 @@ var BlockTransformer = class {
       this.isRunning = false;
       this.cancelRaf();
       this.emit();
+      this.options.onAllComplete?.();
     }
   }
   cancelRaf() {
@@ -2381,10 +2400,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;
   }