@nuucognition/ncm-ui 0.1.1-beta.1 → 0.1.1-beta.2

package/dist/blocks/admonition/index.js

@@ -1,10 +1,10 @@
 "use client";
-import { createContext, createElement, useContext, useRef, Component, useState, useEffect, useMemo, useCallback, useId } from 'react';
+import { createContext, createElement, useContext, useMemo, useRef, Component, useState, useEffect, useCallback, useId } from 'react';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { serializeInlineContent, isTypedNestedList, parseNcm } from '@nuucognition/ncm';
 import { extractExtension, embedTypeFromExtension } from '@nuucognition/mesh-core';
-import { serializeInlineContent, isTypedNestedList } from '@nuucognition/ncm';
 
 // src/components/block-shell.tsx
 function cn(...inputs) {
@@ -84,6 +84,52 @@ function tryParseInlineRef(input) {
   }
   return { token: { type: "inline_ref", kind: "footnote", content: inner.trim() }, length };
 }
+function runLength(input, index, char) {
+  let end = index;
+  while (end < input.length && input[end] === char) end++;
+  return end - index;
+}
+function tryParseEmphasis(input) {
+  const char = input[0];
+  if (char !== "*" && char !== "_") return null;
+  const open = Math.min(3, runLength(input, 0, char));
+  const need = open;
+  let i = open;
+  while (i < input.length) {
+    const ch = input[i];
+    if (ch === "`") {
+      const close = input.indexOf("`", i + 1);
+      if (close === -1) break;
+      i = close + 1;
+      continue;
+    }
+    if (ch !== char) {
+      i++;
+      continue;
+    }
+    const run = runLength(input, i, char);
+    const closes = need === 1 ? run % 2 === 1 : run >= need;
+    if (!closes) {
+      i += run;
+      continue;
+    }
+    const extra = run - need;
+    const inner = input.slice(open, i + extra);
+    if (inner.length === 0) return null;
+    const length = i + run;
+    const children = parseInline(inner);
+    let token;
+    if (need === 3) {
+      token = { type: "bold", children: [{ type: "italic", children }] };
+    } else if (need === 2) {
+      token = { type: "bold", children };
+    } else {
+      token = { type: "italic", children };
+    }
+    return { token, length };
+  }
+  return null;
+}
 function parseInline(content) {
   if (!content) return [];
   const tokens = [];
@@ -155,17 +201,11 @@ function parseInline(content) {
       remaining = remaining.slice(linkMatch[0].length);
       continue;
     }
-    const boldMatch = remaining.match(/^\*\*(.+?)\*\*|^__(.+?)__/);
-    if (boldMatch) {
-      const innerContent = boldMatch[1] ?? boldMatch[2];
-      if (innerContent !== void 0) {
-        tokens.push({
-          type: "bold",
-          children: parseInline(innerContent)
-        });
-        remaining = remaining.slice(boldMatch[0].length);
-        continue;
-      }
+    const emphasis = tryParseEmphasis(remaining);
+    if (emphasis) {
+      tokens.push(emphasis.token);
+      remaining = remaining.slice(emphasis.length);
+      continue;
     }
     const strikeMatch = remaining.match(/^~~(.+?)~~/);
     if (strikeMatch && strikeMatch[1] !== void 0) {
@@ -176,18 +216,6 @@ function parseInline(content) {
       remaining = remaining.slice(strikeMatch[0].length);
       continue;
     }
-    const italicMatch = remaining.match(/^\*([^*]+)\*|^_([^_]+)_/);
-    if (italicMatch) {
-      const innerContent = italicMatch[1] ?? italicMatch[2];
-      if (innerContent !== void 0) {
-        tokens.push({
-          type: "italic",
-          children: parseInline(innerContent)
-        });
-        remaining = remaining.slice(italicMatch[0].length);
-        continue;
-      }
-    }
     const nextSpecial = findNextSpecialChar(remaining);
     if (nextSpecial > 0) {
       tokens.push({ type: "text", content: remaining.slice(0, nextSpecial) });
@@ -298,17 +326,30 @@ function ReferenceMarker({ kind, number, children }) {
     }
   );
 }
-var ReferenceBasesContext = createContext(null);
+function normalizeReferenceContent(content) {
+  return content.replace(/\s+/g, " ").trim().toLowerCase();
+}
+var ReferenceNumberingContext = createContext(null);
 var BlockReferenceScopeContext = createContext(null);
-function BlockReferenceScope({ blockId, children }) {
-  const bases = useContext(ReferenceBasesContext);
-  const base = (blockId ? bases?.get(blockId) : void 0) ?? { ref: 0, footnote: 0 };
+function BlockReferenceScope({ children }) {
+  const numbering = useContext(ReferenceNumberingContext);
+  const local = useRef({ ref: /* @__PURE__ */ new Map(), footnote: /* @__PURE__ */ new Map() });
   const counter = useRef({ ref: 0, footnote: 0 });
-  counter.current = { ref: 0, footnote: 0 };
   const value = {
+    numberFor(kind, content) {
+      const key = normalizeReferenceContent(content);
+      const fromDocument = numbering?.[kind].get(key);
+      if (fromDocument !== void 0) return fromDocument;
+      const map = local.current[kind];
+      const existing = map.get(key);
+      if (existing !== void 0) return existing;
+      counter.current[kind] += 1;
+      map.set(key, counter.current[kind]);
+      return counter.current[kind];
+    },
     next(kind) {
       counter.current[kind] += 1;
-      return base[kind] + counter.current[kind];
+      return counter.current[kind];
     }
   };
   return /* @__PURE__ */ jsx(BlockReferenceScopeContext.Provider, { value, children });
@@ -316,7 +357,7 @@ function BlockReferenceScope({ blockId, children }) {
 function useBlockReferenceScope() {
   return useContext(BlockReferenceScopeContext);
 }
-var INERT_SCOPE = { next: () => 0 };
+var INERT_SCOPE = { numberFor: () => 0, next: () => 0 };
 function InertReferenceScope({ children }) {
   return /* @__PURE__ */ jsx(BlockReferenceScopeContext.Provider, { value: INERT_SCOPE, children });
 }
@@ -607,7 +648,7 @@ function TokenRenderer({ token, disableBionic, disableBeeline }) {
       );
     }
     case "inline_ref": {
-      const number = refScope?.next(token.kind) ?? 0;
+      const number = refScope?.numberFor(token.kind, token.content) ?? 0;
       return /* @__PURE__ */ jsx(ReferenceMarker, { kind: token.kind, number, children: token.content ? /* @__PURE__ */ jsx(InertReferenceScope, { children: /* @__PURE__ */ jsx(InlineContent, { content: token.content, disableBionic: true, disableBeeline: true }) }) : null });
     }
     default:
@@ -673,8 +714,32 @@ function renderReadingText(content, opts) {
   if (cursor < content.length) pieces.push(content.slice(cursor));
   return /* @__PURE__ */ jsx(Fragment, { children: pieces });
 }
+function quoteBlocks(block) {
+  try {
+    const doc = parseNcm(block.content, {
+      preset: "ncm-full",
+      allowMissingFrontmatter: true,
+      // Attribution off, as the NUU Editor's bridge keeps it: the promoter's
+      // trigger is any last quote line starting with `-`, so a nested quote
+      // ending in a list item would lose that item to a `— Author` line.
+      blockOptions: { extensions: { attribution: false } }
+    });
+    const blocks = doc.blocks ?? [];
+    if (blocks.length === 0 || blocks.some((child) => child.type === "frontmatter")) {
+      return null;
+    }
+    return blocks.map((child, index) => ({ ...child, id: `${block.id}.${index + 1}`, stableId: void 0 }));
+  } catch {
+    return null;
+  }
+}
+function QuotedLines({ content }) {
+  const lines = content.split("\n");
+  return /* @__PURE__ */ jsx(Fragment, { children: lines.map((line, index) => /* @__PURE__ */ jsx("p", { children: line.trim().length > 0 ? /* @__PURE__ */ jsx(InlineContent, { content: line }) : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: "\xA0" }) }, index)) });
+}
 function BlockquoteBlock({ block, className }) {
-  const lines = block.content.split("\n");
+  const multiline = block.content.includes("\n");
+  const blocks = useMemo(() => multiline ? quoteBlocks(block) : null, [block, multiline]);
   return /* @__PURE__ */ jsx(
     "blockquote",
     {
@@ -684,7 +749,9 @@ function BlockquoteBlock({ block, className }) {
       "data-block-id": block.id,
       "data-ncm-blockquote": "",
       className,
-      children: lines.length <= 1 ? /* @__PURE__ */ jsx(InlineContent, { content: block.content }) : lines.map((line, index) => /* @__PURE__ */ jsx("p", { children: line.trim().length > 0 ? /* @__PURE__ */ jsx(InlineContent, { content: line }) : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: "\xA0" }) }, index))
+      children: !multiline ? /* @__PURE__ */ jsx(InlineContent, { content: block.content }) : blocks === null ? /* @__PURE__ */ jsx(QuotedLines, { content: block.content }) : blocks.map(
+        (child) => child.type === "paragraph" ? /* @__PURE__ */ jsx(QuotedLines, { content: child.content ?? "" }, blockKey(child)) : /* @__PURE__ */ jsx(NcmBlock, { block: child }, blockKey(child))
+      )
     }
   );
 }

package/dist/blocks/aside/index.js

@@ -1,10 +1,10 @@
 "use client";
-import { createContext, createElement, useContext, useRef, Component, useState, useEffect, useMemo, useCallback, useId } from 'react';
+import { createContext, createElement, useContext, useMemo, useRef, Component, useState, useEffect, useCallback, useId } from 'react';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { serializeInlineContent, isTypedNestedList, parseNcm } from '@nuucognition/ncm';
 import { extractExtension, embedTypeFromExtension } from '@nuucognition/mesh-core';
-import { serializeInlineContent, isTypedNestedList } from '@nuucognition/ncm';
 
 // src/components/block-shell.tsx
 function cn(...inputs) {
@@ -109,6 +109,52 @@ function tryParseInlineRef(input) {
   }
   return { token: { type: "inline_ref", kind: "footnote", content: inner.trim() }, length };
 }
+function runLength(input, index, char) {
+  let end = index;
+  while (end < input.length && input[end] === char) end++;
+  return end - index;
+}
+function tryParseEmphasis(input) {
+  const char = input[0];
+  if (char !== "*" && char !== "_") return null;
+  const open = Math.min(3, runLength(input, 0, char));
+  const need = open;
+  let i = open;
+  while (i < input.length) {
+    const ch = input[i];
+    if (ch === "`") {
+      const close = input.indexOf("`", i + 1);
+      if (close === -1) break;
+      i = close + 1;
+      continue;
+    }
+    if (ch !== char) {
+      i++;
+      continue;
+    }
+    const run = runLength(input, i, char);
+    const closes = need === 1 ? run % 2 === 1 : run >= need;
+    if (!closes) {
+      i += run;
+      continue;
+    }
+    const extra = run - need;
+    const inner = input.slice(open, i + extra);
+    if (inner.length === 0) return null;
+    const length = i + run;
+    const children = parseInline(inner);
+    let token;
+    if (need === 3) {
+      token = { type: "bold", children: [{ type: "italic", children }] };
+    } else if (need === 2) {
+      token = { type: "bold", children };
+    } else {
+      token = { type: "italic", children };
+    }
+    return { token, length };
+  }
+  return null;
+}
 function parseInline(content) {
   if (!content) return [];
   const tokens = [];
@@ -180,17 +226,11 @@ function parseInline(content) {
       remaining = remaining.slice(linkMatch[0].length);
       continue;
     }
-    const boldMatch = remaining.match(/^\*\*(.+?)\*\*|^__(.+?)__/);
-    if (boldMatch) {
-      const innerContent = boldMatch[1] ?? boldMatch[2];
-      if (innerContent !== void 0) {
-        tokens.push({
-          type: "bold",
-          children: parseInline(innerContent)
-        });
-        remaining = remaining.slice(boldMatch[0].length);
-        continue;
-      }
+    const emphasis = tryParseEmphasis(remaining);
+    if (emphasis) {
+      tokens.push(emphasis.token);
+      remaining = remaining.slice(emphasis.length);
+      continue;
     }
     const strikeMatch = remaining.match(/^~~(.+?)~~/);
     if (strikeMatch && strikeMatch[1] !== void 0) {
@@ -201,18 +241,6 @@ function parseInline(content) {
       remaining = remaining.slice(strikeMatch[0].length);
       continue;
     }
-    const italicMatch = remaining.match(/^\*([^*]+)\*|^_([^_]+)_/);
-    if (italicMatch) {
-      const innerContent = italicMatch[1] ?? italicMatch[2];
-      if (innerContent !== void 0) {
-        tokens.push({
-          type: "italic",
-          children: parseInline(innerContent)
-        });
-        remaining = remaining.slice(italicMatch[0].length);
-        continue;
-      }
-    }
     const nextSpecial = findNextSpecialChar(remaining);
     if (nextSpecial > 0) {
       tokens.push({ type: "text", content: remaining.slice(0, nextSpecial) });
@@ -323,17 +351,30 @@ function ReferenceMarker({ kind, number, children }) {
     }
   );
 }
-var ReferenceBasesContext = createContext(null);
+function normalizeReferenceContent(content) {
+  return content.replace(/\s+/g, " ").trim().toLowerCase();
+}
+var ReferenceNumberingContext = createContext(null);
 var BlockReferenceScopeContext = createContext(null);
-function BlockReferenceScope({ blockId, children }) {
-  const bases = useContext(ReferenceBasesContext);
-  const base = (blockId ? bases?.get(blockId) : void 0) ?? { ref: 0, footnote: 0 };
+function BlockReferenceScope({ children }) {
+  const numbering = useContext(ReferenceNumberingContext);
+  const local = useRef({ ref: /* @__PURE__ */ new Map(), footnote: /* @__PURE__ */ new Map() });
   const counter = useRef({ ref: 0, footnote: 0 });
-  counter.current = { ref: 0, footnote: 0 };
   const value = {
+    numberFor(kind, content) {
+      const key = normalizeReferenceContent(content);
+      const fromDocument = numbering?.[kind].get(key);
+      if (fromDocument !== void 0) return fromDocument;
+      const map = local.current[kind];
+      const existing = map.get(key);
+      if (existing !== void 0) return existing;
+      counter.current[kind] += 1;
+      map.set(key, counter.current[kind]);
+      return counter.current[kind];
+    },
     next(kind) {
       counter.current[kind] += 1;
-      return base[kind] + counter.current[kind];
+      return counter.current[kind];
     }
   };
   return /* @__PURE__ */ jsx(BlockReferenceScopeContext.Provider, { value, children });
@@ -341,7 +382,7 @@ function BlockReferenceScope({ blockId, children }) {
 function useBlockReferenceScope() {
   return useContext(BlockReferenceScopeContext);
 }
-var INERT_SCOPE = { next: () => 0 };
+var INERT_SCOPE = { numberFor: () => 0, next: () => 0 };
 function InertReferenceScope({ children }) {
   return /* @__PURE__ */ jsx(BlockReferenceScopeContext.Provider, { value: INERT_SCOPE, children });
 }
@@ -632,7 +673,7 @@ function TokenRenderer({ token, disableBionic, disableBeeline }) {
       );
     }
     case "inline_ref": {
-      const number = refScope?.next(token.kind) ?? 0;
+      const number = refScope?.numberFor(token.kind, token.content) ?? 0;
       return /* @__PURE__ */ jsx(ReferenceMarker, { kind: token.kind, number, children: token.content ? /* @__PURE__ */ jsx(InertReferenceScope, { children: /* @__PURE__ */ jsx(InlineContent, { content: token.content, disableBionic: true, disableBeeline: true }) }) : null });
     }
     default:
@@ -698,8 +739,32 @@ function renderReadingText(content, opts) {
   if (cursor < content.length) pieces.push(content.slice(cursor));
   return /* @__PURE__ */ jsx(Fragment, { children: pieces });
 }
+function quoteBlocks(block) {
+  try {
+    const doc = parseNcm(block.content, {
+      preset: "ncm-full",
+      allowMissingFrontmatter: true,
+      // Attribution off, as the NUU Editor's bridge keeps it: the promoter's
+      // trigger is any last quote line starting with `-`, so a nested quote
+      // ending in a list item would lose that item to a `— Author` line.
+      blockOptions: { extensions: { attribution: false } }
+    });
+    const blocks = doc.blocks ?? [];
+    if (blocks.length === 0 || blocks.some((child) => child.type === "frontmatter")) {
+      return null;
+    }
+    return blocks.map((child, index) => ({ ...child, id: `${block.id}.${index + 1}`, stableId: void 0 }));
+  } catch {
+    return null;
+  }
+}
+function QuotedLines({ content }) {
+  const lines = content.split("\n");
+  return /* @__PURE__ */ jsx(Fragment, { children: lines.map((line, index) => /* @__PURE__ */ jsx("p", { children: line.trim().length > 0 ? /* @__PURE__ */ jsx(InlineContent, { content: line }) : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: "\xA0" }) }, index)) });
+}
 function BlockquoteBlock({ block, className }) {
-  const lines = block.content.split("\n");
+  const multiline = block.content.includes("\n");
+  const blocks = useMemo(() => multiline ? quoteBlocks(block) : null, [block, multiline]);
   return /* @__PURE__ */ jsx(
     "blockquote",
     {
@@ -709,7 +774,9 @@ function BlockquoteBlock({ block, className }) {
       "data-block-id": block.id,
       "data-ncm-blockquote": "",
       className,
-      children: lines.length <= 1 ? /* @__PURE__ */ jsx(InlineContent, { content: block.content }) : lines.map((line, index) => /* @__PURE__ */ jsx("p", { children: line.trim().length > 0 ? /* @__PURE__ */ jsx(InlineContent, { content: line }) : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: "\xA0" }) }, index))
+      children: !multiline ? /* @__PURE__ */ jsx(InlineContent, { content: block.content }) : blocks === null ? /* @__PURE__ */ jsx(QuotedLines, { content: block.content }) : blocks.map(
+        (child) => child.type === "paragraph" ? /* @__PURE__ */ jsx(QuotedLines, { content: child.content ?? "" }, blockKey(child)) : /* @__PURE__ */ jsx(NcmBlock, { block: child }, blockKey(child))
+      )
     }
   );
 }

package/dist/blocks/blockquote/index.d.ts

@@ -4,12 +4,14 @@ import { a as BlockRendererProps } from '../../renderers-C5f41FCy.js';
 
 type BlockquoteBlockProps = BlockRendererProps<BlockquoteBlock$1>;
 /**
- * Blockquote block renderer with multiline support.
+ * Blockquote block renderer with nested-block support.
  *
- * Splits content by newlines and renders each line as a separate paragraph
- * to properly display multiline blockquotes. An empty line (a bare `>` in
- * source) renders one non-breaking space, so it keeps a full text line of
- * height instead of collapsing — the same guard the list renderers use.
+ * A single-line quote renders its inline content directly. A multi-line quote
+ * renders the blocks its content parses to: a quoted paragraph keeps one `<p>`
+ * per source line (an empty line renders one non-breaking space, so it keeps a
+ * full text line of height — the same guard the list renderers use), and every
+ * other block — a nested quote, a list, a code fence, a heading, a table —
+ * renders through `NcmBlock` exactly as it would at the top level.
  */
 declare function BlockquoteBlock({ block, className }: BlockquoteBlockProps): react.JSX.Element;