defuss-markdown 1.0.1 → 1.0.3

package/dist/index.d.ts

@@ -11,7 +11,7 @@ interface MarkdownAstNode {
     children?: MarkdownAstNode[];
     value?: string;
     depth?: number;
-    ordered?: boolean;
+    ordered?: boolean | null;
     start?: number;
     spread?: boolean;
     checked?: boolean | null;
@@ -30,8 +30,7 @@ interface MarkdownAstNode {
         name?: string;
         value?: string;
     }>;
-    data?: Record<string, unknown>;
-    [key: string]: unknown;
+    data?: unknown;
 }
 interface ParserLike {
     append?: (chunk: string) => unknown;
@@ -39,7 +38,6 @@ interface ParserLike {
     render?: (content: string) => unknown;
     reset?: () => void;
     blocks?: MarkdownBlockLike[];
-    completedBlocks?: MarkdownBlockLike[];
     pendingBlocks?: MarkdownBlockLike[];
     pendingBlock?: MarkdownBlockLike | null;
     getBlocks?: () => MarkdownBlockLike[];

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sources":["../../src/index.ts"],"mappings":"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","names":[]}
+{"version":3,"file":"index.d.ts","sources":["../../src/index.ts"],"mappings":"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","names":[]}

package/dist/index.js

@@ -2,6 +2,7 @@ const FALL_THROUGH = Symbol("defuss-markdown:fallback-renderer");
 const DEFAULT_PARSER_OPTIONS = Object.freeze({
   gfm: true,
   math: true,
+  table: true,
   htmlTree: true,
   containers: true
 });
@@ -32,21 +33,14 @@ async function getParser(options) {
   if (options.createParser) {
     return await options.createParser();
   }
-  const incremark = await dynamicModuleImport("@incremark/core");
+  const incremark = await import('@incremark/core');
   const parserOptions = { ...DEFAULT_PARSER_OPTIONS, ...options.parserOptions ?? {} };
-  if (typeof incremark?.createIncremarkParser === "function") {
+  if (typeof incremark.createIncremarkParser === "function") {
     return incremark.createIncremarkParser(parserOptions);
   }
-  if (typeof incremark?.IncremarkParser === "function") {
+  if (typeof incremark.IncremarkParser === "function") {
     return new incremark.IncremarkParser(parserOptions);
   }
-  if (typeof incremark?.default === "function") {
-    try {
-      return new incremark.default(parserOptions);
-    } catch {
-      return incremark.default(parserOptions);
-    }
-  }
   throw new Error(
     "Could not construct an Incremark parser. Provide options.parser or options.createParser, or install @incremark/core with either createIncremarkParser() or IncremarkParser exported."
   );
@@ -81,7 +75,7 @@ async function renderIntoElement(target, jsx, options) {
     await options.render(jsx, target);
     return;
   }
-  const defuss = await dynamicModuleImport("defuss");
+  const defuss = await import('defuss');
   const render = defuss?.render ?? defuss?.default?.render ?? defuss?.default ?? null;
   if (typeof render !== "function") {
     throw new Error(
@@ -242,13 +236,13 @@ function renderUnknownNode(node, context) {
 function renderTable(node, context) {
   const rows = Array.isArray(node.children) ? node.children : [];
   if (rows.length === 0) {
-    return h("table", {});
+    return h("table", { class: "table" });
   }
   const [headerRow, ...bodyRows] = rows;
   const alignments = Array.isArray(node.align) ? node.align : [];
   return h(
     "table",
-    {},
+    { class: "table" },
     h(
       "thead",
       {},
@@ -315,45 +309,99 @@ function createBlockState() {
   };
 }
 function hydrateStateFromParserOrUpdate(parser, update, state) {
+  const updateKeys = update && typeof update === "object" ? Object.keys(update) : [];
+  console.log("[defuss-markdown] hydrateState: updateKeys =", updateKeys, "isIncremental =", isIncrementalUpdate(update));
+  if (isIncrementalUpdate(update)) {
+    const value = update;
+    const completed = pickBlockArray(value.completed);
+    const updated = pickBlockArray(value.updated);
+    const pending = pickBlockArray(value.pending);
+    const removed = pickBlockArray(value.removed);
+    console.log("[defuss-markdown] Incremark INCREMENTAL path:", {
+      completed: completed.map((b) => `${b.id}(${b.status})`),
+      updated: updated.map((b) => `${b.id}(${b.status})`),
+      pending: pending.map((b) => `${b.id}(${b.status})`),
+      removed: removed.map((b) => b.id)
+    });
+    applyIncrementalCollections(state, update);
+    const parserCompleted = pickBlockArray(parser.getCompletedBlocks?.());
+    if (parserCompleted.length > 0) {
+      for (const block of parserCompleted) {
+        upsertBlock(state, block);
+      }
+    }
+    const parserPending = pickBlockArray(parser.pendingBlocks ?? parser.pendingBlock);
+    for (const block of parserPending) {
+      upsertBlock(state, block);
+    }
+    return;
+  }
   const directSnapshot = extractSnapshotBlocksFromUpdate(update);
   if (directSnapshot) {
+    console.log("[defuss-markdown] DIRECT SNAPSHOT path, blocks =", directSnapshot.map((b) => b.id));
     replaceState(state, directSnapshot);
     return;
   }
   const parserSnapshot = extractBlocksFromParser(parser);
   if (parserSnapshot) {
+    console.log("[defuss-markdown] PARSER SNAPSHOT path, blocks =", parserSnapshot.map((b) => b.id));
     replaceState(state, parserSnapshot);
     return;
   }
+  console.log("[defuss-markdown] FALLBACK to applyIncrementalCollections");
   applyIncrementalCollections(state, update);
 }
+function isIncrementalUpdate(update) {
+  if (!update || typeof update !== "object") {
+    return false;
+  }
+  const value = update;
+  return Array.isArray(value.completed) || Array.isArray(value.updated) || Array.isArray(value.pending);
+}
 function extractSnapshotBlocksFromUpdate(update) {
   if (!update || typeof update !== "object") {
     return null;
   }
   const value = update;
   const direct = pickBlockArray(value.blocks);
-  return direct.length > 0 ? direct : null;
+  const pending = pickBlockArray(value.pendingBlocks ?? value.pendingBlock);
+  if (direct.length > 0) {
+    if (pending.length > 0) {
+      return mergeCompletedAndPending(direct, pending);
+    }
+    return direct;
+  }
+  if (pending.length > 0) {
+    return pending;
+  }
+  return null;
 }
 function extractBlocksFromParser(parser) {
+  const pending = pickBlockArray(parser.pendingBlocks ?? parser.pendingBlock);
   const methodBlocks = pickBlockArray(parser.getBlocks?.());
   if (methodBlocks.length > 0) {
+    if (pending.length > 0) {
+      return mergeCompletedAndPending(methodBlocks, pending);
+    }
     return methodBlocks;
   }
   const methodMerged = mergeCompletedAndPending(
     pickBlockArray(parser.getCompletedBlocks?.()),
-    pickBlockArray(parser.pendingBlocks ?? parser.pendingBlock)
+    pending
   );
   if (methodMerged.length > 0) {
     return methodMerged;
   }
   const propBlocks = pickBlockArray(parser.blocks);
   if (propBlocks.length > 0) {
+    if (pending.length > 0) {
+      return mergeCompletedAndPending(propBlocks, pending);
+    }
     return propBlocks;
   }
   const propMerged = mergeCompletedAndPending(
     pickBlockArray(parser.completedBlocks),
-    pickBlockArray(parser.pendingBlocks ?? parser.pendingBlock)
+    pending
   );
   return propMerged.length > 0 ? propMerged : null;
 }
@@ -472,8 +520,5 @@ async function* toAsyncIterable(input) {
     yield result.value;
   }
 }
-async function dynamicModuleImport(specifier) {
-  return Function("specifier", "return import(specifier)")(specifier);
-}
 
 export { FALL_THROUGH, updateWithMarkdown };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defuss-markdown",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "description": "Incremental Markdown -> Defuss JSX bridge built on Incremark core.",
   "keywords": [
@@ -56,4 +56,4 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.2"
   }
-}
+}