@incremark/core 0.2.5 → 0.2.7

package/dist/index.js

@@ -4,6 +4,8 @@ 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 { directive } from 'micromark-extension-directive';
+import { directiveFromMarkdown } from 'mdast-util-directive';
 import { codes, constants, types } from 'micromark-util-symbol';
 import { markdownLineEndingOrSpace } from 'micromark-util-character';
 import { factoryDestination } from 'micromark-factory-destination';
@@ -12,10 +14,699 @@ import { factoryLabel } from 'micromark-factory-label';
 import { factoryWhitespace } from 'micromark-factory-whitespace';
 import { gfmFootnote } from 'micromark-extension-gfm-footnote';
 import { normalizeIdentifier } from 'micromark-util-normalize-identifier';
-import { directive } from 'micromark-extension-directive';
-import { directiveFromMarkdown } from 'mdast-util-directive';
 
-// src/parser/IncremarkParser.ts
+// src/detector/index.ts
+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_BLOCKQUOTE = /^\s{0,3}>/;
+var RE_ESCAPE_SPECIAL = /[.*+?^${}()|[\]\\]/g;
+var RE_FOOTNOTE_DEFINITION = /^\[\^([^\]]+)\]:\s/;
+var RE_FOOTNOTE_CONTINUATION = /^(?:    |\t)/;
+var fenceEndPatternCache = /* @__PURE__ */ new Map();
+var containerPatternCache = /* @__PURE__ */ new Map();
+function detectFenceStart(line) {
+  const match = line.match(RE_FENCE_START);
+  if (match) {
+    const fence = match[2];
+    const char = fence[0];
+    return { char, length: fence.length };
+  }
+  return null;
+}
+function detectFenceEnd(line, context) {
+  if (!context.inFencedCode || !context.fenceChar || !context.fenceLength) {
+    return false;
+  }
+  const cacheKey = `${context.fenceChar}-${context.fenceLength}`;
+  let pattern = fenceEndPatternCache.get(cacheKey);
+  if (!pattern) {
+    pattern = new RegExp(`^\\s{0,3}${context.fenceChar}{${context.fenceLength},}\\s*$`);
+    fenceEndPatternCache.set(cacheKey, pattern);
+  }
+  return pattern.test(line);
+}
+function isEmptyLine(line) {
+  return RE_EMPTY_LINE.test(line);
+}
+function isSetextHeadingUnderline(line, prevLine) {
+  const trimmed = line.trim();
+  if (!/^={3,}$|^-{3,}$/.test(trimmed)) {
+    return false;
+  }
+  if (!prevLine) {
+    return false;
+  }
+  const trimmedPrev = prevLine.trim();
+  if (trimmedPrev === "") {
+    return false;
+  }
+  if (/^#{1,6}\s/.test(trimmedPrev) || /^(\*{3,}|-{3,}|_{3,})\s*$/.test(trimmedPrev)) {
+    return false;
+  }
+  if (/^(\s*)([-*+])\s/.test(trimmedPrev) || /^(\s*)(\d{1,9})[.)]\s/.test(trimmedPrev)) {
+    return false;
+  }
+  if (/^\s{0,3}>/.test(trimmedPrev)) {
+    return false;
+  }
+  if (/^(\s*)(`{3,}|~{3,})/.test(trimmedPrev)) {
+    return false;
+  }
+  const underlineIndent = line.match(/^(\s*)/)?.[1].length ?? 0;
+  if (underlineIndent > 3) {
+    return false;
+  }
+  const contentIndent = prevLine.match(/^(\s*)/)?.[1].length ?? 0;
+  if (contentIndent > 3) {
+    return false;
+  }
+  return true;
+}
+function isHeading(line) {
+  return RE_HEADING.test(line);
+}
+function isThematicBreak(line) {
+  return RE_THEMATIC_BREAK.test(line.trim());
+}
+function isListItemStart(line) {
+  const hasListMarker = /^(\s*)([-*+]|\d{1,9}[.)])/.test(line);
+  if (!hasListMarker) {
+    return null;
+  }
+  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;
+}
+function isBlockquoteStart(line) {
+  return RE_BLOCKQUOTE.test(line);
+}
+function isFootnoteDefinitionStart(line) {
+  return RE_FOOTNOTE_DEFINITION.test(line);
+}
+function isFootnoteContinuation(line) {
+  return RE_FOOTNOTE_CONTINUATION.test(line);
+}
+function detectContainer(line, config) {
+  const marker = config?.marker || ":";
+  const minLength = config?.minMarkerLength || 3;
+  const cacheKey = `${marker}-${minLength}`;
+  let pattern = containerPatternCache.get(cacheKey);
+  if (!pattern) {
+    const escapedMarker = marker.replace(RE_ESCAPE_SPECIAL, "\\$&");
+    pattern = new RegExp(
+      `^(\\s*)(${escapedMarker}{${minLength},})(?:\\s*(\\w[\\w-]*))?(?:\\{[^}]*\\})?(?:\\s+(.*))?\\s*$`
+    );
+    containerPatternCache.set(cacheKey, pattern);
+  }
+  const match = line.match(pattern);
+  if (!match) {
+    return null;
+  }
+  const markerLength = match[2].length;
+  const name = match[3] || "";
+  const isEnd = !name && !match[4];
+  if (!isEnd && config?.allowedNames && config.allowedNames.length > 0) {
+    if (!config.allowedNames.includes(name)) {
+      return null;
+    }
+  }
+  return { name, markerLength, isEnd };
+}
+function detectContainerEnd(line, context, config) {
+  if (!context.inContainer || !context.containerMarkerLength) {
+    return false;
+  }
+  const result = detectContainer(line, config);
+  if (!result) {
+    return false;
+  }
+  return result.isEnd && result.markerLength >= context.containerMarkerLength;
+}
+var CodeContextUpdater = class {
+  update(line, context) {
+    const newContext = { ...context };
+    if (context.inFencedCode) {
+      if (detectFenceEnd(line, context)) {
+        newContext.inFencedCode = false;
+        newContext.fenceChar = void 0;
+        newContext.fenceLength = void 0;
+        return newContext;
+      }
+      return null;
+    }
+    const fence = detectFenceStart(line);
+    if (fence) {
+      newContext.inFencedCode = true;
+      newContext.fenceChar = fence.char;
+      newContext.fenceLength = fence.length;
+      return newContext;
+    }
+    return null;
+  }
+};
+var ContainerContextUpdater = class {
+  update(line, context, config) {
+    if (config === void 0) {
+      return null;
+    }
+    const newContext = { ...context };
+    if (context.inContainer) {
+      if (detectContainerEnd(line, context, config)) {
+        newContext.containerDepth = context.containerDepth - 1;
+        if (newContext.containerDepth === 0) {
+          newContext.inContainer = false;
+          newContext.containerMarkerLength = void 0;
+          newContext.containerName = void 0;
+        }
+        return newContext;
+      }
+      const nested = detectContainer(line, config);
+      if (nested && !nested.isEnd) {
+        newContext.containerDepth = context.containerDepth + 1;
+        return newContext;
+      }
+      return newContext;
+    } else {
+      const container = detectContainer(line, config);
+      if (container && !container.isEnd) {
+        newContext.inContainer = true;
+        newContext.containerMarkerLength = container.markerLength;
+        newContext.containerName = container.name;
+        newContext.containerDepth = 1;
+        return newContext;
+      }
+    }
+    return null;
+  }
+};
+var FootnoteContextUpdater = class {
+  update(line, context) {
+    const newContext = { ...context };
+    if (!context.inFootnote && isFootnoteDefinitionStart(line)) {
+      const identifier = line.match(RE_FOOTNOTE_DEFINITION)?.[1];
+      newContext.inFootnote = true;
+      newContext.footnoteIdentifier = identifier;
+      return newContext;
+    }
+    if (context.inFootnote) {
+      if (isFootnoteDefinitionStart(line)) {
+        const identifier = line.match(RE_FOOTNOTE_DEFINITION)?.[1];
+        newContext.footnoteIdentifier = identifier;
+        return newContext;
+      }
+      if (isEmptyLine(line)) {
+        return { ...context };
+      }
+      const listItem = isListItemStart(line);
+      if (listItem) {
+        if (listItem.indent === 0) {
+          newContext.inFootnote = false;
+          newContext.footnoteIdentifier = void 0;
+        } else {
+          return { ...context };
+        }
+        return null;
+      }
+      if (isHeading(line) || detectFenceStart(line) || isBlockquoteStart(line)) {
+        newContext.inFootnote = false;
+        newContext.footnoteIdentifier = void 0;
+        return newContext;
+      }
+      if (isFootnoteContinuation(line)) {
+        return { ...context };
+      }
+      newContext.inFootnote = false;
+      newContext.footnoteIdentifier = void 0;
+      return newContext;
+    }
+    return null;
+  }
+};
+var ListContextUpdater = class {
+  /**
+   * 检测是否是列表项的延续内容（缩进内容或空行）
+   */
+  isListContinuation(line, listIndent) {
+    if (isEmptyLine(line)) {
+      return true;
+    }
+    const contentIndent = line.match(/^(\s*)/)?.[1].length ?? 0;
+    return contentIndent > listIndent;
+  }
+  update(line, context) {
+    const newContext = { ...context };
+    const listItem = isListItemStart(line);
+    if (context.inList) {
+      if (context.listMayEnd) {
+        if (listItem) {
+          if (listItem.ordered === context.listOrdered && listItem.indent === context.listIndent) {
+            newContext.listMayEnd = false;
+            return newContext;
+          }
+          newContext.listOrdered = listItem.ordered;
+          newContext.listIndent = listItem.indent;
+          newContext.listMayEnd = false;
+          return newContext;
+        } else if (this.isListContinuation(line, context.listIndent ?? 0)) {
+          newContext.listMayEnd = isEmptyLine(line);
+          return newContext;
+        } else {
+          newContext.inList = false;
+          newContext.listOrdered = void 0;
+          newContext.listIndent = void 0;
+          newContext.listMayEnd = false;
+          return newContext;
+        }
+      } else {
+        if (listItem) {
+          return null;
+        } else if (isEmptyLine(line)) {
+          newContext.listMayEnd = true;
+          return newContext;
+        } else if (this.isListContinuation(line, context.listIndent ?? 0)) {
+          return null;
+        } else {
+          newContext.inList = false;
+          newContext.listOrdered = void 0;
+          newContext.listIndent = void 0;
+          newContext.listMayEnd = false;
+          return newContext;
+        }
+      }
+    } else {
+      if (listItem) {
+        newContext.inList = true;
+        newContext.listOrdered = listItem.ordered;
+        newContext.listIndent = listItem.indent;
+        newContext.listMayEnd = false;
+        return newContext;
+      }
+    }
+    return null;
+  }
+};
+function createInitialContext() {
+  return {
+    inFencedCode: false,
+    listDepth: 0,
+    blockquoteDepth: 0,
+    inContainer: false,
+    containerDepth: 0,
+    inList: false,
+    inFootnote: false,
+    footnoteIdentifier: void 0
+  };
+}
+var ContextManager = class {
+  updaters = [
+    new CodeContextUpdater(),
+    new ContainerContextUpdater(),
+    new FootnoteContextUpdater(),
+    new ListContextUpdater()
+  ];
+  /**
+   * 更新上下文（处理一行后）
+   *
+   * @param line 当前行
+   * @param context 当前上下文
+   * @param containerConfig 容器配置
+   * @returns 更新后的上下文
+   */
+  update(line, context, containerConfig) {
+    const config = containerConfig === true ? {} : containerConfig === false ? void 0 : containerConfig;
+    for (const updater of this.updaters) {
+      const result = updater.update(line, context, config);
+      if (result !== null) {
+        return result;
+      }
+    }
+    return { ...context };
+  }
+};
+var contextManager = new ContextManager();
+function updateContext(line, context, containerConfig) {
+  return contextManager.update(line, context, containerConfig);
+}
+
+// src/parser/boundary/BoundaryDetector.ts
+var ContainerBoundaryChecker = class {
+  constructor(containerConfig) {
+    this.containerConfig = containerConfig;
+  }
+  check(lineIndex, context, lines) {
+    const line = lines[lineIndex];
+    if (!context.inContainer) {
+      return -1;
+    }
+    if (this.containerConfig !== void 0) {
+      const containerEnd = detectContainerEnd(line, context, this.containerConfig);
+      if (containerEnd) {
+        return lineIndex - 1;
+      }
+    }
+    return -1;
+  }
+};
+var ListBoundaryChecker = class {
+  check(lineIndex, context, lines) {
+    if (!context.inList) {
+      return -1;
+    }
+    if (!context.listMayEnd) {
+      return -1;
+    }
+    const line = lines[lineIndex];
+    const listItem = isListItemStart(line);
+    const contentIndent = line.match(/^(\s*)/)?.[1].length ?? 0;
+    const isListContent = contentIndent > (context.listIndent ?? 0);
+    if (!listItem && !isListContent && !isEmptyLine(line)) {
+      return lineIndex - 1;
+    }
+    return -1;
+  }
+};
+var FootnoteBoundaryChecker = class {
+  check(lineIndex, context, lines) {
+    const line = lines[lineIndex];
+    const prevLine = lines[lineIndex - 1];
+    if (isFootnoteDefinitionStart(prevLine)) {
+      if (isEmptyLine(line) || isFootnoteContinuation(line)) {
+        return -1;
+      }
+      if (isFootnoteDefinitionStart(line)) {
+        return lineIndex - 1;
+      }
+    }
+    if (!isEmptyLine(prevLine) && isFootnoteContinuation(prevLine)) {
+      return -1;
+    }
+    if (!isEmptyLine(prevLine) && isFootnoteDefinitionStart(line) && !isFootnoteDefinitionStart(prevLine)) {
+      return lineIndex - 1;
+    }
+    return -1;
+  }
+};
+var NewBlockBoundaryChecker = class {
+  check(lineIndex, context, lines) {
+    const line = lines[lineIndex];
+    const prevLine = lines[lineIndex - 1];
+    if (isEmptyLine(prevLine)) {
+      return -1;
+    }
+    if (isSetextHeadingUnderline(line, prevLine)) {
+      return lineIndex - 1;
+    }
+    if (isHeading(line)) {
+      return lineIndex - 1;
+    }
+    if (detectFenceStart(line)) {
+      return lineIndex - 1;
+    }
+    if (isBlockquoteStart(line) && !isBlockquoteStart(prevLine)) {
+      return lineIndex - 1;
+    }
+    if (!context.inList && isListItemStart(line) && !isListItemStart(prevLine)) {
+      return lineIndex - 1;
+    }
+    return -1;
+  }
+};
+var EmptyLineBoundaryChecker = class {
+  check(lineIndex, context, lines) {
+    const line = lines[lineIndex];
+    const prevLine = lines[lineIndex - 1];
+    if (isEmptyLine(line) && !isEmptyLine(prevLine) && !context.inList) {
+      return lineIndex;
+    }
+    return -1;
+  }
+};
+var BoundaryDetector = class {
+  containerConfig;
+  checkers;
+  constructor(config = {}) {
+    this.containerConfig = config.containers;
+    this.checkers = [
+      new ContainerBoundaryChecker(this.containerConfig),
+      new ListBoundaryChecker(),
+      new FootnoteBoundaryChecker(),
+      new NewBlockBoundaryChecker(),
+      new EmptyLineBoundaryChecker()
+    ];
+  }
+  /**
+   * 查找稳定边界
+   * 返回稳定边界行号和该行对应的上下文（用于后续更新，避免重复计算）
+   *
+   * @param lines 所有行
+   * @param startLine 起始行
+   * @param context 当前上下文
+   * @returns 稳定边界结果
+   */
+  findStableBoundary(lines, startLine, context) {
+    let stableLine = -1;
+    let stableContext = context;
+    let tempContext = { ...context };
+    for (let i = startLine; i < lines.length; i++) {
+      const line = lines[i];
+      const wasInFencedCode = tempContext.inFencedCode;
+      const wasInContainer = tempContext.inContainer;
+      const wasContainerDepth = tempContext.containerDepth;
+      tempContext = updateContext(line, tempContext, this.containerConfig);
+      if (wasInFencedCode && !tempContext.inFencedCode) {
+        if (i < lines.length - 1) {
+          stableLine = i;
+          stableContext = { ...tempContext };
+        }
+        continue;
+      }
+      if (tempContext.inFencedCode) {
+        continue;
+      }
+      if (wasInContainer && wasContainerDepth === 1 && !tempContext.inContainer) {
+        if (i < lines.length - 1) {
+          stableLine = i;
+          stableContext = { ...tempContext };
+        }
+        continue;
+      }
+      if (tempContext.inContainer) {
+        continue;
+      }
+      const stablePoint = this.checkStability(i, tempContext, lines);
+      if (stablePoint >= 0) {
+        stableLine = stablePoint;
+        stableContext = { ...tempContext };
+      }
+    }
+    return { line: stableLine, context: stableContext };
+  }
+  /**
+   * 检查指定行是否是稳定边界
+   * 使用责任链模式，依次调用各个检查器
+   *
+   * @param lineIndex 行索引
+   * @param context 当前上下文
+   * @param lines 所有行
+   * @returns 稳定边界行号，如果不是稳定边界返回 -1
+   */
+  checkStability(lineIndex, context, lines) {
+    if (lineIndex === 0) {
+      return -1;
+    }
+    const line = lines[lineIndex];
+    const prevLine = lines[lineIndex - 1];
+    if (context.inFootnote) {
+      if (isFootnoteDefinitionStart(prevLine) && !isEmptyLine(line)) {
+        if (isFootnoteContinuation(line)) {
+          return -1;
+        }
+        return lineIndex - 1;
+      }
+      if (isEmptyLine(prevLine) && (isEmptyLine(line) || isFootnoteContinuation(line))) {
+        return -1;
+      }
+      return -1;
+    }
+    if (isHeading(prevLine) || isThematicBreak(prevLine)) {
+      return lineIndex - 1;
+    }
+    if (isSetextHeadingUnderline(prevLine, lines[lineIndex - 2])) {
+      return lineIndex - 1;
+    }
+    if (lineIndex >= lines.length - 1) {
+      return -1;
+    }
+    for (const checker of this.checkers) {
+      const stablePoint = checker.check(lineIndex, context, lines);
+      if (stablePoint >= 0) {
+        return stablePoint;
+      }
+    }
+    return -1;
+  }
+};
+
+// src/utils/index.ts
+function isDefinitionNode(node) {
+  return node.type === "definition";
+}
+function isFootnoteDefinitionNode(node) {
+  return node.type === "footnoteDefinition";
+}
+function traverseAst(node, visitor) {
+  const stopEarly = visitor(node);
+  if (stopEarly === true) {
+    return;
+  }
+  if ("children" in node && Array.isArray(node.children)) {
+    for (const child of node.children) {
+      traverseAst(child, visitor);
+    }
+  }
+}
+function collectAstNodes(node, predicate) {
+  const results = [];
+  traverseAst(node, (node2) => {
+    if (predicate(node2)) {
+      results.push(node2);
+    }
+  });
+  return results;
+}
+
+// src/parser/manager/DefinitionManager.ts
+var DefinitionManager = class {
+  definitions = {};
+  /**
+   * 从已完成的 blocks 中提取 definitions
+   *
+   * @param blocks 已完成的块
+   */
+  extractFromBlocks(blocks) {
+    for (const block of blocks) {
+      const newDefinitions = this.findDefinitions(block);
+      this.definitions = {
+        ...this.definitions,
+        ...newDefinitions
+      };
+    }
+  }
+  /**
+   * 从 block 中提取 definitions
+   *
+   * @param block 解析块
+   * @returns Definition 映射表
+   */
+  findDefinitions(block) {
+    const definitions = collectAstNodes(block.node, isDefinitionNode);
+    return definitions.reduce((acc, node) => {
+      acc[node.identifier] = node;
+      return acc;
+    }, {});
+  }
+  /**
+   * 获取所有 definitions
+   *
+   * @returns Definition 映射表
+   */
+  getAll() {
+    return this.definitions;
+  }
+  /**
+   * 清空所有 definitions
+   */
+  clear() {
+    this.definitions = {};
+  }
+};
+
+// src/parser/manager/FootnoteManager.ts
+var FootnoteManager = class {
+  definitions = {};
+  referenceOrder = [];
+  /**
+   * 从已完成的 blocks 中提取 footnote definitions
+   *
+   * @param blocks 已完成的块
+   */
+  extractDefinitionsFromBlocks(blocks) {
+    for (const block of blocks) {
+      const newDefinitions = this.findFootnoteDefinitions(block);
+      this.definitions = {
+        ...this.definitions,
+        ...newDefinitions
+      };
+    }
+  }
+  /**
+   * 从 block 中提取 footnote definitions
+   *
+   * @param block 解析块
+   * @returns Footnote Definition 映射表
+   */
+  findFootnoteDefinitions(block) {
+    const definitions = collectAstNodes(block.node, isFootnoteDefinitionNode);
+    return definitions.reduce((acc, node) => {
+      acc[node.identifier] = node;
+      return acc;
+    }, {});
+  }
+  /**
+   * 收集 AST 中的脚注引用（按出现顺序）
+   *
+   * @param nodes AST 节点列表
+   */
+  collectReferences(nodes) {
+    nodes.forEach((node) => {
+      traverseAst(node, (n) => {
+        if (n.type === "footnoteReference") {
+          const identifier = n.identifier;
+          if (!this.referenceOrder.includes(identifier)) {
+            this.referenceOrder.push(identifier);
+          }
+        }
+      });
+    });
+  }
+  /**
+   * 获取所有 footnote definitions
+   *
+   * @returns Footnote Definition 映射表
+   */
+  getDefinitions() {
+    return this.definitions;
+  }
+  /**
+   * 获取脚注引用顺序
+   *
+   * @returns 脚注引用顺序
+   */
+  getReferenceOrder() {
+    return this.referenceOrder;
+  }
+  /**
+   * 清空所有 footnote definitions 和引用顺序
+   */
+  clear() {
+    this.definitions = {};
+    this.referenceOrder = [];
+  }
+};
 
 // src/extensions/html-extension/index.ts
 var DEFAULT_TAG_BLACKLIST = [
@@ -403,65 +1094,6 @@ function transformHtmlNodes(ast, options = {}) {
     children: processHtmlNodesInArray(ast.children, options)
   };
 }
-function createHtmlTreeTransformer(options = {}) {
-  return function transformer(tree) {
-    return transformHtmlNodes(tree, options);
-  };
-}
-var htmlTreeExtension = {
-  enter: {},
-  exit: {}
-};
-function isHtmlElementNode(node) {
-  return node.type === "htmlElement";
-}
-function walkHtmlElements(node, callback, parent = null) {
-  if (isHtmlElementNode(node)) {
-    callback(node, parent);
-  }
-  if (hasChildren(node) || node.type === "root") {
-    const children = node.children;
-    for (const child of children) {
-      walkHtmlElements(child, callback, node);
-    }
-  }
-}
-function findHtmlElementsByTag(root, tagName) {
-  const result = [];
-  walkHtmlElements(root, (node) => {
-    if (node.tagName === tagName.toLowerCase()) {
-      result.push(node);
-    }
-  });
-  return result;
-}
-function htmlElementToString(node) {
-  const { tagName, attrs, children } = node;
-  const attrsStr = Object.entries(attrs).map(([name, value]) => {
-    if (value === "") return name;
-    return `${name}="${escapeHtml(value)}"`;
-  }).join(" ");
-  const openTag = attrsStr ? `<${tagName} ${attrsStr}>` : `<${tagName}>`;
-  if (children.length === 0 && isSelfClosingTag(tagName)) {
-    return attrsStr ? `<${tagName} ${attrsStr} />` : `<${tagName} />`;
-  }
-  const childrenStr = children.map((child) => {
-    if (child.type === "text") {
-      return child.value;
-    }
-    if (isHtmlElementNode(child)) {
-      return htmlElementToString(child);
-    }
-    return "";
-  }).join("");
-  return `${openTag}${childrenStr}</${tagName}>`;
-}
-function isSelfClosingTag(tagName) {
-  return ["br", "hr", "img", "input", "meta", "link", "area", "base", "col", "embed", "source", "track", "wbr"].includes(tagName.toLowerCase());
-}
-function escapeHtml(text) {
-  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
-}
 function micromarkReferenceExtension() {
   return {
     // 在 text 中使用 codes.rightSquareBracket 键覆盖 labelEnd
@@ -862,384 +1494,51 @@ function tokenizePotentialGfmFootnoteCallIncremental(effects, ok, nok) {
   }
 }
 
-// src/detector/index.ts
-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_CONTINUATION = /^(?:    |\t)/;
-var fenceEndPatternCache = /* @__PURE__ */ new Map();
-var containerPatternCache = /* @__PURE__ */ new Map();
-function detectFenceStart(line) {
-  const match = line.match(RE_FENCE_START);
-  if (match) {
-    const fence = match[2];
-    const char = fence[0];
-    return { char, length: fence.length };
-  }
-  return null;
-}
-function detectFenceEnd(line, context) {
-  if (!context.inFencedCode || !context.fenceChar || !context.fenceLength) {
-    return false;
-  }
-  const cacheKey = `${context.fenceChar}-${context.fenceLength}`;
-  let pattern = fenceEndPatternCache.get(cacheKey);
-  if (!pattern) {
-    pattern = new RegExp(`^\\s{0,3}${context.fenceChar}{${context.fenceLength},}\\s*$`);
-    fenceEndPatternCache.set(cacheKey, pattern);
-  }
-  return pattern.test(line);
-}
-function isEmptyLine(line) {
-  return RE_EMPTY_LINE.test(line);
-}
-function isHeading(line) {
-  return RE_HEADING.test(line);
-}
-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 ordered = line.match(RE_ORDERED_LIST);
-  if (ordered) {
-    return { ordered: true, indent: ordered[1].length };
-  }
-  return null;
-}
-function isBlockquoteStart(line) {
-  return RE_BLOCKQUOTE.test(line);
-}
-function isHtmlBlock(line) {
-  return RE_HTML_BLOCK_1.test(line) || RE_HTML_BLOCK_2.test(line);
-}
-function isTableDelimiter(line) {
-  return RE_TABLE_DELIMITER.test(line.trim());
-}
-function isFootnoteDefinitionStart(line) {
-  return RE_FOOTNOTE_DEFINITION.test(line);
-}
-function isFootnoteContinuation(line) {
-  return RE_FOOTNOTE_CONTINUATION.test(line);
-}
-function detectContainer(line, config) {
-  const marker = config?.marker || ":";
-  const minLength = config?.minMarkerLength || 3;
-  const cacheKey = `${marker}-${minLength}`;
-  let pattern = containerPatternCache.get(cacheKey);
-  if (!pattern) {
-    const escapedMarker = marker.replace(RE_ESCAPE_SPECIAL, "\\$&");
-    pattern = new RegExp(
-      `^(\\s*)(${escapedMarker}{${minLength},})(?:\\s*(\\w[\\w-]*))?(?:\\{[^}]*\\})?(?:\\s+(.*))?\\s*$`
-    );
-    containerPatternCache.set(cacheKey, pattern);
-  }
-  const match = line.match(pattern);
-  if (!match) {
-    return null;
-  }
-  const markerLength = match[2].length;
-  const name = match[3] || "";
-  const isEnd = !name && !match[4];
-  if (!isEnd && config?.allowedNames && config.allowedNames.length > 0) {
-    if (!config.allowedNames.includes(name)) {
-      return null;
-    }
-  }
-  return { name, markerLength, isEnd };
-}
-function detectContainerEnd(line, context, config) {
-  if (!context.inContainer || !context.containerMarkerLength) {
-    return false;
-  }
-  const result = detectContainer(line, config);
-  if (!result) {
-    return false;
-  }
-  return result.isEnd && result.markerLength >= context.containerMarkerLength;
-}
-function isBlockBoundary(prevLine, currentLine, context) {
-  if (context.inFencedCode) {
-    return detectFenceEnd(currentLine, context);
-  }
-  if (isEmptyLine(prevLine) && !isEmptyLine(currentLine)) {
-    return true;
-  }
-  if (isHeading(currentLine) && !isEmptyLine(prevLine)) {
-    return true;
-  }
-  if (isThematicBreak(currentLine)) {
-    return true;
-  }
-  if (detectFenceStart(currentLine)) {
-    return true;
-  }
-  return false;
-}
-function createInitialContext() {
-  return {
-    inFencedCode: false,
-    listDepth: 0,
-    blockquoteDepth: 0,
-    inContainer: false,
-    containerDepth: 0,
-    inList: false
-  };
-}
-function isListContinuation(line, listIndent) {
-  if (isEmptyLine(line)) {
-    return true;
-  }
-  const contentIndent = line.match(/^(\s*)/)?.[1].length ?? 0;
-  return contentIndent > listIndent;
-}
-function updateContext(line, context, containerConfig) {
-  const newContext = { ...context };
-  const containerCfg = containerConfig === true ? {} : containerConfig === false ? void 0 : containerConfig;
-  if (context.inFencedCode) {
-    if (detectFenceEnd(line, context)) {
-      newContext.inFencedCode = false;
-      newContext.fenceChar = void 0;
-      newContext.fenceLength = void 0;
-    }
-    return newContext;
-  }
-  const fence = detectFenceStart(line);
-  if (fence) {
-    newContext.inFencedCode = true;
-    newContext.fenceChar = fence.char;
-    newContext.fenceLength = fence.length;
-    return newContext;
-  }
-  if (containerCfg !== void 0) {
-    if (context.inContainer) {
-      if (detectContainerEnd(line, context, containerCfg)) {
-        newContext.containerDepth = context.containerDepth - 1;
-        if (newContext.containerDepth === 0) {
-          newContext.inContainer = false;
-          newContext.containerMarkerLength = void 0;
-          newContext.containerName = void 0;
-        }
-        return newContext;
-      }
-      const nested = detectContainer(line, containerCfg);
-      if (nested && !nested.isEnd) {
-        newContext.containerDepth = context.containerDepth + 1;
-        return newContext;
-      }
-      return newContext;
-    } else {
-      const container = detectContainer(line, containerCfg);
-      if (container && !container.isEnd) {
-        newContext.inContainer = true;
-        newContext.containerMarkerLength = container.markerLength;
-        newContext.containerName = container.name;
-        newContext.containerDepth = 1;
-        return newContext;
-      }
-    }
-  }
-  const listItem = isListItemStart(line);
-  if (context.inList) {
-    if (context.listMayEnd) {
-      if (listItem) {
-        if (listItem.ordered === context.listOrdered && listItem.indent === context.listIndent) {
-          newContext.listMayEnd = false;
-          return newContext;
-        }
-        newContext.inList = true;
-        newContext.listOrdered = listItem.ordered;
-        newContext.listIndent = listItem.indent;
-        newContext.listMayEnd = false;
-        return newContext;
-      } else if (isListContinuation(line, context.listIndent ?? 0)) {
-        newContext.listMayEnd = isEmptyLine(line);
-        return newContext;
-      } else {
-        newContext.inList = false;
-        newContext.listOrdered = void 0;
-        newContext.listIndent = void 0;
-        newContext.listMayEnd = false;
-        return newContext;
-      }
-    } else {
-      if (listItem) {
-        return newContext;
-      } else if (isEmptyLine(line)) {
-        newContext.listMayEnd = true;
-        return newContext;
-      } else if (isListContinuation(line, context.listIndent ?? 0)) {
-        return newContext;
-      } else {
-        newContext.inList = false;
-        newContext.listOrdered = void 0;
-        newContext.listIndent = void 0;
-        newContext.listMayEnd = false;
-        return newContext;
-      }
-    }
-  } else {
-    if (listItem) {
-      newContext.inList = true;
-      newContext.listOrdered = listItem.ordered;
-      newContext.listIndent = listItem.indent;
-      newContext.listMayEnd = false;
-      return newContext;
-    }
-  }
-  return newContext;
-}
-
-// src/utils/index.ts
-var idCounter = 0;
-function generateId(prefix = "block") {
-  return `${prefix}-${++idCounter}`;
-}
-function resetIdCounter() {
-  idCounter = 0;
-}
-function calculateLineOffset(lines, lineIndex) {
-  let offset = 0;
-  for (let i = 0; i < lineIndex && i < lines.length; i++) {
-    offset += lines[i].length + 1;
-  }
-  return offset;
-}
-function splitLines(text) {
-  return text.split("\n");
-}
-function joinLines(lines, start, end) {
-  return lines.slice(start, end + 1).join("\n");
-}
-function isDefinitionNode(node) {
-  return node.type === "definition";
-}
-function isFootnoteDefinitionNode(node) {
-  return node.type === "footnoteDefinition";
+// src/parser/ast/AstBuilder.ts
+var INLINE_CONTAINER_TYPES = [
+  "paragraph",
+  "heading",
+  "tableCell",
+  "delete",
+  "emphasis",
+  "strong",
+  "link",
+  "linkReference"
+];
+function isInlineContainer(node) {
+  return INLINE_CONTAINER_TYPES.includes(node.type);
 }
-
-// src/parser/IncremarkParser.ts
-var IncremarkParser = class {
-  buffer = "";
-  lines = [];
-  /** 行偏移量前缀和：lineOffsets[i] = 第i行起始位置的偏移量 */
-  lineOffsets = [0];
-  completedBlocks = [];
-  pendingStartLine = 0;
-  blockIdCounter = 0;
-  context;
+var AstBuilder = class {
   options;
-  /** 缓存的容器配置，避免重复计算 */
   containerConfig;
-  /** 缓存的 HTML 树配置，避免重复计算 */
-  htmlTreeConfig;
-  /** 上次 append 返回的 pending blocks，用于 getAst 复用 */
-  lastPendingBlocks = [];
-  /** Definition 映射表（用于引用式图片和链接） */
-  definitionMap = {};
-  /** Footnote Definition 映射表 */
-  footnoteDefinitionMap = {};
-  /** Footnote Reference 出现顺序（按引用在文档中的顺序） */
-  footnoteReferenceOrder = [];
+  htmlTreeConfig;
   constructor(options = {}) {
-    this.options = {
-      gfm: true,
-      ...options
-    };
-    this.context = createInitialContext();
-    this.containerConfig = this.computeContainerConfig();
-    this.htmlTreeConfig = this.computeHtmlTreeConfig();
-  }
-  generateBlockId() {
-    return `block-${++this.blockIdCounter}`;
+    this.options = options;
+    this.containerConfig = this.computeContainerConfig(options);
+    this.htmlTreeConfig = this.computeHtmlTreeConfig(options);
   }
-  computeContainerConfig() {
-    const containers = this.options.containers;
+  /**
+   * 计算容器配置
+   */
+  computeContainerConfig(options) {
+    const containers = options.containers;
     if (!containers) return void 0;
     return containers === true ? {} : containers;
   }
-  computeHtmlTreeConfig() {
-    const htmlTree = this.options.htmlTree;
+  /**
+   * 计算 HTML 树配置
+   */
+  computeHtmlTreeConfig(options) {
+    const htmlTree = options.htmlTree;
     if (!htmlTree) return void 0;
     return htmlTree === true ? {} : htmlTree;
   }
   /**
-   * 将 HTML 节点转换为纯文本
-   * 递归处理 AST 中所有 html 类型的节点
-   * - 块级 HTML 节点 → 转换为 paragraph 包含 text
-   * - 内联 HTML 节点（在段落内部）→ 转换为 text 节点
+   * 解析文本为 AST
+   *
+   * @param text Markdown 文本
+   * @returns AST
    */
-  convertHtmlToText(ast) {
-    const processInlineChildren = (children) => {
-      return children.map((node) => {
-        const n = node;
-        if (n.type === "html") {
-          const htmlNode = n;
-          const textNode = {
-            type: "text",
-            value: htmlNode.value,
-            position: htmlNode.position
-          };
-          return textNode;
-        }
-        if ("children" in n && Array.isArray(n.children)) {
-          const parent = n;
-          return {
-            ...parent,
-            children: processInlineChildren(parent.children)
-          };
-        }
-        return n;
-      });
-    };
-    const processBlockChildren = (children) => {
-      return children.map((node) => {
-        if (node.type === "html") {
-          const htmlNode = node;
-          const textNode = {
-            type: "text",
-            value: htmlNode.value
-          };
-          const paragraphNode = {
-            type: "paragraph",
-            children: [textNode],
-            position: htmlNode.position
-          };
-          return paragraphNode;
-        }
-        if ("children" in node && Array.isArray(node.children)) {
-          const parent = node;
-          if (node.type === "paragraph" || node.type === "heading" || node.type === "tableCell" || node.type === "delete" || node.type === "emphasis" || node.type === "strong" || node.type === "link" || node.type === "linkReference") {
-            return {
-              ...parent,
-              children: processInlineChildren(parent.children)
-            };
-          }
-          return {
-            ...parent,
-            children: processBlockChildren(parent.children)
-          };
-        }
-        return node;
-      });
-    };
-    return {
-      ...ast,
-      children: processBlockChildren(ast.children)
-    };
-  }
   parse(text) {
     const extensions = [];
     const mdastExtensions = [];
@@ -1273,67 +1572,160 @@ var IncremarkParser = class {
     }
     return ast;
   }
-  updateDefinitionsFromCompletedBlocks(blocks) {
-    for (const block of blocks) {
-      this.definitionMap = {
-        ...this.definitionMap,
-        ...this.findDefinition(block)
-      };
-      this.footnoteDefinitionMap = {
-        ...this.footnoteDefinitionMap,
-        ...this.findFootnoteDefinition(block)
-      };
-    }
+  /**
+   * 将 HTML 节点转换为纯文本（当未启用 HTML 树转换时）
+   *
+   * @param ast AST
+   * @returns 转换后的 AST
+   */
+  convertHtmlToText(ast) {
+    return {
+      ...ast,
+      children: this.processBlockChildren(ast.children)
+    };
   }
-  findDefinition(block) {
-    const definitions = [];
-    function findDefinitionRecursive(node) {
-      if (isDefinitionNode(node)) {
-        definitions.push(node);
+  /**
+   * 处理块级节点
+   */
+  processBlockChildren(children) {
+    return children.map((node) => {
+      if (node.type === "html") {
+        return this.convertBlockHtmlToParagraph(node);
       }
       if ("children" in node && Array.isArray(node.children)) {
-        for (const child of node.children) {
-          findDefinitionRecursive(child);
-        }
+        const parent = node;
+        const children2 = isInlineContainer(node) ? this.processInlineChildren(parent.children) : this.processBlockChildren(parent.children);
+        return {
+          ...parent,
+          children: children2
+        };
       }
-    }
-    findDefinitionRecursive(block.node);
-    return definitions.reduce((acc, node) => {
-      acc[node.identifier] = node;
-      return acc;
-    }, {});
+      return node;
+    });
   }
-  findFootnoteDefinition(block) {
-    const footnoteDefinitions = [];
-    function findFootnoteDefinition(node) {
-      if (isFootnoteDefinitionNode(node)) {
-        footnoteDefinitions.push(node);
+  /**
+   * 处理内联节点
+   */
+  processInlineChildren(children) {
+    return children.map((node) => {
+      const n = node;
+      if (n.type === "html") {
+        return this.convertInlineHtmlToText(n);
+      }
+      if ("children" in n && Array.isArray(n.children)) {
+        const parent = n;
+        return {
+          ...parent,
+          children: this.processInlineChildren(parent.children)
+        };
       }
+      return n;
+    });
+  }
+  /**
+   * 将块级 HTML 节点转换为段落
+   */
+  convertBlockHtmlToParagraph(htmlNode) {
+    const textNode = {
+      type: "text",
+      value: htmlNode.value
+    };
+    const paragraphNode = {
+      type: "paragraph",
+      children: [textNode],
+      position: htmlNode.position
+    };
+    return paragraphNode;
+  }
+  /**
+   * 将内联 HTML 节点转换为纯文本节点
+   */
+  convertInlineHtmlToText(htmlNode) {
+    return {
+      type: "text",
+      value: htmlNode.value,
+      position: htmlNode.position
+    };
+  }
+  /**
+   * 将 AST 节点转换为 ParsedBlock
+   *
+   * @param nodes AST 节点列表
+   * @param startOffset 起始偏移量
+   * @param rawText 原始文本
+   * @param status 块状态
+   * @param generateBlockId 生成块 ID 的函数
+   * @returns ParsedBlock 列表
+   */
+  nodesToBlocks(nodes, startOffset, rawText, status, generateBlockId) {
+    const blocks = [];
+    let currentOffset = startOffset;
+    for (const node of nodes) {
+      const nodeStart = node.position?.start?.offset ?? currentOffset;
+      const nodeEnd = node.position?.end?.offset ?? currentOffset + 1;
+      const nodeText = rawText.substring(nodeStart - startOffset, nodeEnd - startOffset);
+      blocks.push({
+        id: generateBlockId(),
+        status,
+        node,
+        startOffset: nodeStart,
+        endOffset: nodeEnd,
+        rawText: nodeText
+      });
+      currentOffset = nodeEnd;
     }
-    findFootnoteDefinition(block.node);
-    return footnoteDefinitions.reduce((acc, node) => {
-      acc[node.identifier] = node;
-      return acc;
-    }, {});
+    return blocks;
+  }
+};
+
+// src/parser/IncremarkParser.ts
+var IncremarkParser = class {
+  buffer = "";
+  lines = [];
+  /** 行偏移量前缀和：lineOffsets[i] = 第i行起始位置的偏移量 */
+  lineOffsets = [0];
+  completedBlocks = [];
+  pendingStartLine = 0;
+  blockIdCounter = 0;
+  context;
+  options;
+  /** 边界检测器 */
+  boundaryDetector;
+  /** AST 构建器 */
+  astBuilder;
+  /** Definition 管理器 */
+  definitionManager;
+  /** Footnote 管理器 */
+  footnoteManager;
+  /** 上次 append 返回的 pending blocks，用于 getAst 复用 */
+  lastPendingBlocks = [];
+  constructor(options = {}) {
+    this.options = {
+      gfm: true,
+      ...options
+    };
+    this.context = createInitialContext();
+    this.astBuilder = new AstBuilder(this.options);
+    this.boundaryDetector = new BoundaryDetector({ containers: this.astBuilder.containerConfig });
+    this.definitionManager = new DefinitionManager();
+    this.footnoteManager = new FootnoteManager();
+  }
+  generateBlockId() {
+    return `block-${++this.blockIdCounter}`;
+  }
+  /**
+   * 更新已完成的 blocks 中的 definitions 和 footnote definitions
+   */
+  updateDefinitionsFromCompletedBlocks(blocks) {
+    this.definitionManager.extractFromBlocks(blocks);
+    this.footnoteManager.extractDefinitionsFromBlocks(blocks);
   }
   /**
    * 收集 AST 中的脚注引用（按出现顺序）
    * 用于确定脚注的显示顺序
    */
   collectFootnoteReferences(nodes) {
-    const visitNode = (node) => {
-      if (!node) return;
-      if (node.type === "footnoteReference") {
-        const identifier = node.identifier;
-        if (!this.footnoteReferenceOrder.includes(identifier)) {
-          this.footnoteReferenceOrder.push(identifier);
-        }
-      }
-      if (node.children && Array.isArray(node.children)) {
-        node.children.forEach(visitNode);
-      }
-    };
-    nodes.forEach(visitNode);
+    this.footnoteManager.collectReferences(nodes);
   }
   /**
    * 增量更新 lines 和 lineOffsets
@@ -1371,169 +1763,12 @@ var IncremarkParser = class {
    * 返回稳定边界行号和该行对应的上下文（用于后续更新，避免重复计算）
    */
   findStableBoundary() {
-    let stableLine = -1;
-    let stableContext = this.context;
-    let tempContext = { ...this.context };
-    for (let i = this.pendingStartLine; i < this.lines.length; i++) {
-      const line = this.lines[i];
-      const wasInFencedCode = tempContext.inFencedCode;
-      const wasInContainer = tempContext.inContainer;
-      const wasContainerDepth = tempContext.containerDepth;
-      tempContext = updateContext(line, tempContext, this.containerConfig);
-      if (wasInFencedCode && !tempContext.inFencedCode) {
-        if (i < this.lines.length - 1) {
-          stableLine = i;
-          stableContext = { ...tempContext };
-        }
-        continue;
-      }
-      if (tempContext.inFencedCode) {
-        continue;
-      }
-      if (wasInContainer && wasContainerDepth === 1 && !tempContext.inContainer) {
-        if (i < this.lines.length - 1) {
-          stableLine = i;
-          stableContext = { ...tempContext };
-        }
-        continue;
-      }
-      if (tempContext.inContainer) {
-        continue;
-      }
-      const stablePoint = this.checkStability(i, tempContext);
-      if (stablePoint >= 0) {
-        stableLine = stablePoint;
-        stableContext = { ...tempContext };
-      }
-    }
-    return { line: stableLine, contextAtLine: stableContext };
-  }
-  checkStability(lineIndex, context) {
-    if (lineIndex === 0) {
-      return -1;
-    }
-    const line = this.lines[lineIndex];
-    const prevLine = this.lines[lineIndex - 1];
-    if (context.inContainer) {
-      if (this.containerConfig !== void 0) {
-        const containerEnd = detectContainerEnd(line, context, this.containerConfig);
-        if (containerEnd) {
-          return lineIndex - 1;
-        }
-      }
-      return -1;
-    }
-    if (context.inList) {
-      if (!context.listMayEnd) {
-        return -1;
-      }
-    }
-    if (isHeading(prevLine) || isThematicBreak(prevLine)) {
-      return lineIndex - 1;
-    }
-    if (lineIndex >= this.lines.length - 1) {
-      return -1;
-    }
-    if (isFootnoteDefinitionStart(prevLine)) {
-      if (isEmptyLine(line) || isFootnoteContinuation(line)) {
-        return -1;
-      }
-      if (isFootnoteDefinitionStart(line)) {
-        return lineIndex - 1;
-      }
-    }
-    if (!isEmptyLine(prevLine) && isFootnoteContinuation(prevLine)) {
-      const footnoteStartLine = this.findFootnoteStart(lineIndex - 1);
-      if (footnoteStartLine >= 0) {
-        if (isEmptyLine(line) || isFootnoteContinuation(line)) {
-          return -1;
-        }
-        if (isFootnoteDefinitionStart(line)) {
-          return lineIndex - 1;
-        }
-        return lineIndex - 1;
-      }
-    }
-    if (!isEmptyLine(prevLine)) {
-      if (isFootnoteDefinitionStart(line) && !isFootnoteDefinitionStart(prevLine)) {
-        return lineIndex - 1;
-      }
-      if (isHeading(line)) {
-        return lineIndex - 1;
-      }
-      if (detectFenceStart(line)) {
-        return lineIndex - 1;
-      }
-      if (isBlockquoteStart(line) && !isBlockquoteStart(prevLine)) {
-        return lineIndex - 1;
-      }
-      if (!context.inList && isListItemStart(line) && !isListItemStart(prevLine)) {
-        return lineIndex - 1;
-      }
-      if (this.containerConfig !== void 0) {
-        const container = detectContainer(line, this.containerConfig);
-        if (container && !container.isEnd) {
-          const prevContainer = detectContainer(prevLine, this.containerConfig);
-          if (!prevContainer || prevContainer.isEnd) {
-            return lineIndex - 1;
-          }
-        }
-      }
-    }
-    if (isEmptyLine(line) && !isEmptyLine(prevLine) && !context.inList) {
-      return lineIndex;
-    }
-    return -1;
-  }
-  /**
-   * 从指定行向上查找脚注定义的起始行
-   * 
-   * @param fromLine 开始查找的行索引
-   * @returns 脚注起始行索引，如果不属于脚注返回 -1
-   * 
-   * @example
-   * // 假设 lines 为:
-   * // 0: "[^1]: 第一行"
-   * // 1: "    第二行"
-   * // 2: "    第三行"
-   * findFootnoteStart(2) // 返回 0
-   * findFootnoteStart(1) // 返回 0
-   */
-  findFootnoteStart(fromLine) {
-    const maxLookback = 20;
-    const startLine = Math.max(0, fromLine - maxLookback);
-    for (let i = fromLine; i >= startLine; i--) {
-      const line = this.lines[i];
-      if (isFootnoteDefinitionStart(line)) {
-        return i;
-      }
-      if (isEmptyLine(line)) {
-        continue;
-      }
-      if (!isFootnoteContinuation(line)) {
-        return -1;
-      }
-    }
-    return -1;
-  }
-  nodesToBlocks(nodes, startOffset, rawText, status) {
-    const blocks = [];
-    let currentOffset = startOffset;
-    for (const node of nodes) {
-      const nodeStart = node.position?.start?.offset ?? currentOffset;
-      const nodeEnd = node.position?.end?.offset ?? currentOffset + 1;
-      const nodeText = rawText.substring(nodeStart - startOffset, nodeEnd - startOffset);
-      blocks.push({
-        id: this.generateBlockId(),
-        status,
-        node,
-        startOffset: nodeStart,
-        endOffset: nodeEnd,
-        rawText: nodeText
-      });
-      currentOffset = nodeEnd;
-    }
-    return blocks;
+    const result = this.boundaryDetector.findStableBoundary(
+      this.lines,
+      this.pendingStartLine,
+      this.context
+    );
+    return { line: result.line, contextAtLine: result.context };
   }
   /**
    * 追加新的 chunk 并返回增量更新
@@ -1554,8 +1789,8 @@ var IncremarkParser = class {
     if (stableBoundary >= this.pendingStartLine && stableBoundary >= 0) {
       const stableText = this.lines.slice(this.pendingStartLine, stableBoundary + 1).join("\n");
       const stableOffset = this.getLineOffset(this.pendingStartLine);
-      const ast = this.parse(stableText);
-      const newBlocks = this.nodesToBlocks(ast.children, stableOffset, stableText, "completed");
+      const ast = this.astBuilder.parse(stableText);
+      const newBlocks = this.astBuilder.nodesToBlocks(ast.children, stableOffset, stableText, "completed", () => this.generateBlockId());
       this.completedBlocks.push(...newBlocks);
       update.completed = newBlocks;
       this.updateDefinitionsFromCompletedBlocks(newBlocks);
@@ -1566,8 +1801,8 @@ var IncremarkParser = class {
       const pendingText = this.lines.slice(this.pendingStartLine).join("\n");
       if (pendingText.trim()) {
         const pendingOffset = this.getLineOffset(this.pendingStartLine);
-        const ast = this.parse(pendingText);
-        update.pending = this.nodesToBlocks(ast.children, pendingOffset, pendingText, "pending");
+        const ast = this.astBuilder.parse(pendingText);
+        update.pending = this.astBuilder.nodesToBlocks(ast.children, pendingOffset, pendingText, "pending", () => this.generateBlockId());
       }
     }
     this.lastPendingBlocks = update.pending;
@@ -1598,8 +1833,8 @@ var IncremarkParser = class {
             ...pendingBlocks.map((b) => b.node)
           ]
         },
-        definitions: { ...this.definitionMap },
-        footnoteDefinitions: { ...this.footnoteDefinitionMap }
+        definitions: { ...this.getDefinitionMap() },
+        footnoteDefinitions: { ...this.getFootnoteDefinitionMap() }
       };
       this.options.onChange(state);
     }
@@ -1614,20 +1849,21 @@ var IncremarkParser = class {
       updated: [],
       pending: [],
       ast: { type: "root", children: [] },
-      definitions: {},
-      footnoteDefinitions: {},
-      footnoteReferenceOrder: []
+      definitions: this.getDefinitionMap(),
+      footnoteDefinitions: this.getFootnoteDefinitionMap(),
+      footnoteReferenceOrder: this.getFootnoteReferenceOrder()
     };
     if (this.pendingStartLine < this.lines.length) {
       const remainingText = this.lines.slice(this.pendingStartLine).join("\n");
       if (remainingText.trim()) {
         const remainingOffset = this.getLineOffset(this.pendingStartLine);
-        const ast = this.parse(remainingText);
-        const finalBlocks = this.nodesToBlocks(
+        const ast = this.astBuilder.parse(remainingText);
+        const finalBlocks = this.astBuilder.nodesToBlocks(
           ast.children,
           remainingOffset,
           remainingText,
-          "completed"
+          "completed",
+          () => this.generateBlockId()
         );
         this.completedBlocks.push(...finalBlocks);
         update.completed = finalBlocks;
@@ -1685,19 +1921,19 @@ var IncremarkParser = class {
    * 获取 Definition 映射表（用于引用式图片和链接）
    */
   getDefinitionMap() {
-    return { ...this.definitionMap };
+    return this.definitionManager.getAll();
   }
   /**
    * 获取 Footnote Definition 映射表
    */
   getFootnoteDefinitionMap() {
-    return { ...this.footnoteDefinitionMap };
+    return this.footnoteManager.getDefinitions();
   }
   /**
    * 获取脚注引用的出现顺序
    */
   getFootnoteReferenceOrder() {
-    return [...this.footnoteReferenceOrder];
+    return this.footnoteManager.getReferenceOrder();
   }
   /**
    * 设置状态变化回调（用于 DevTools 等）
@@ -1721,9 +1957,8 @@ var IncremarkParser = class {
     this.blockIdCounter = 0;
     this.context = createInitialContext();
     this.lastPendingBlocks = [];
-    this.definitionMap = {};
-    this.footnoteDefinitionMap = {};
-    this.footnoteReferenceOrder = [];
+    this.definitionManager.clear();
+    this.footnoteManager.clear();
     this.emitChange([]);
   }
   /**
@@ -1985,19 +2220,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) {
-        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.handleContentChange(this.state.currentBlock.node, updated.node, true);
         this.state.currentBlock = updated;
-        if (!this.rafId && !this.isPaused) {
-          if (this.state.currentProgress < newTotal) {
-            this.startIfNeeded();
-          }
-        }
       }
     }
   }
@@ -2006,19 +2230,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);
-      if (newTotal !== oldTotal) {
-        this.clearCache();
-      }
-      if (newTotal < oldTotal || newTotal < this.state.currentProgress) {
-        this.state.currentProgress = Math.min(this.state.currentProgress, newTotal);
-        this.chunks = [];
-      }
+      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.startIfNeeded();
-      }
     }
   }
   /**
@@ -2165,6 +2378,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),
@@ -2251,8 +2488,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) {
@@ -2260,12 +2510,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)) {
@@ -2383,12 +2633,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 切换或内容更新时）
@@ -2519,6 +2778,6 @@ function createPlugin(name, matcher, options = {}) {
  * @license MIT
  */
 
-export { BlockTransformer, DEFAULT_ATTR_BLACKLIST as HTML_ATTR_BLACKLIST, DEFAULT_PROTOCOL_BLACKLIST as HTML_PROTOCOL_BLACKLIST, DEFAULT_TAG_BLACKLIST as HTML_TAG_BLACKLIST, IncremarkParser, allPlugins, calculateLineOffset, cloneNode, codeBlockPlugin, countChars, createBlockTransformer, createHtmlTreeTransformer, createIncremarkParser, createInitialContext, createPlugin, defaultPlugins, detectContainer, detectContainerEnd, detectFenceEnd, detectFenceStart, detectHtmlContentType, findHtmlElementsByTag, generateId, htmlElementToString, htmlTreeExtension, imagePlugin, isBlockBoundary, isBlockquoteStart, isEmptyLine, isHeading, isHtmlBlock, isHtmlElementNode, isListItemStart, isTableDelimiter, isThematicBreak, joinLines, mathPlugin, mermaidPlugin, parseHtmlFragment, parseHtmlTag, resetIdCounter, sliceAst, splitLines, thematicBreakPlugin, transformHtmlNodes, updateContext, walkHtmlElements };
+export { BlockTransformer, IncremarkParser, allPlugins, cloneNode, codeBlockPlugin, countChars, createBlockTransformer, createIncremarkParser, createPlugin, defaultPlugins, imagePlugin, mathPlugin, mermaidPlugin, sliceAst, thematicBreakPlugin };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map