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

package/dist/components/ncm-document.js

@@ -3,8 +3,8 @@ import { createContext, useMemo, useContext, createElement, useRef, Component, u
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
+import { serializeInlineContent, isTypedNestedList, parseNcm } from '@nuucognition/ncm';
 import { extractExtension, embedTypeFromExtension } from '@nuucognition/mesh-core';
-import { serializeInlineContent, isTypedNestedList } from '@nuucognition/ncm';
 
 function blockKey(block) {
   return block.stableId ? `${block.id}:${block.stableId}` : block.id;
@@ -153,6 +153,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 = [];
@@ -224,17 +270,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) {
@@ -245,18 +285,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) });
@@ -407,48 +435,81 @@ function collectListStrings(items) {
   }
   return out;
 }
-function countInlineRefs(tokens, acc) {
+function normalizeReferenceContent(content) {
+  return content.replace(/\s+/g, " ").trim().toLowerCase();
+}
+var BIBLIOGRAPHY_ENTRY_RE = /^\s*\[(\d+)\]\s+([\s\S]+?)\s*$/;
+function collectBibliography(blocks) {
+  const entries = /* @__PURE__ */ new Map();
+  for (const block of blocks) {
+    if (block.type !== "paragraph") continue;
+    const content = block.content ?? "";
+    const match = BIBLIOGRAPHY_ENTRY_RE.exec(content);
+    if (!match || !match[1] || !match[2]) continue;
+    const key = normalizeReferenceContent(match[2]);
+    if (key && !entries.has(key)) entries.set(key, Number(match[1]));
+  }
+  return entries;
+}
+function walkInlineRefs(tokens, visit) {
   for (const token of tokens) {
     if (token.type === "inline_ref") {
-      acc[token.kind] += 1;
+      visit(token);
     } else if ("children" in token) {
-      countInlineRefs(token.children, acc);
+      walkInlineRefs(token.children, visit);
     }
   }
 }
-function countBlock(block) {
-  const acc = { ref: 0, footnote: 0 };
-  for (const str of collectInlineStrings(block)) {
-    if (str) countInlineRefs(parseInline(str), acc);
-  }
-  return acc;
-}
-function computeReferenceBases(blocks) {
-  const bases = /* @__PURE__ */ new Map();
-  const acc = { ref: 0, footnote: 0 };
+function computeReferenceNumbering(blocks) {
+  const bibliography = collectBibliography(blocks);
+  let maxBibliography = 0;
+  for (const n of bibliography.values()) maxBibliography = Math.max(maxBibliography, n);
+  const numbering = { ref: /* @__PURE__ */ new Map(), footnote: /* @__PURE__ */ new Map() };
+  let nextRef = maxBibliography;
+  let nextFootnote = 0;
   for (const block of blocks) {
-    bases.set(block.id, { ...acc });
-    const counts = countBlock(block);
-    acc.ref += counts.ref;
-    acc.footnote += counts.footnote;
+    for (const str of collectInlineStrings(block)) {
+      if (!str) continue;
+      walkInlineRefs(parseInline(str), (token) => {
+        const key = normalizeReferenceContent(token.content);
+        const map = numbering[token.kind];
+        if (map.has(key)) return;
+        if (token.kind === "ref") {
+          const fromBibliography = bibliography.get(key);
+          map.set(key, fromBibliography ?? ++nextRef);
+        } else {
+          map.set(key, ++nextFootnote);
+        }
+      });
+    }
   }
-  return bases;
+  return numbering;
 }
-var ReferenceBasesContext = createContext(null);
+var ReferenceNumberingContext = createContext(null);
 var BlockReferenceScopeContext = createContext(null);
 function NcmReferencesProvider({ blocks, children }) {
-  const bases = useMemo(() => computeReferenceBases(blocks), [blocks]);
-  return /* @__PURE__ */ jsx(ReferenceBasesContext.Provider, { value: bases, children });
+  const numbering = useMemo(() => computeReferenceNumbering(blocks), [blocks]);
+  return /* @__PURE__ */ jsx(ReferenceNumberingContext.Provider, { value: numbering, children });
 }
-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 });
@@ -456,7 +517,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 });
 }
@@ -747,7 +808,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:
@@ -813,8 +874,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",
     {
@@ -824,7 +909,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/context/index.d.ts

@@ -1,5 +1,5 @@
 export { C as CodeConfig, E as EmbeddingsConfig, I as ImageErrorProps, a as InlineConfig, N as NcmConfig, b as NcmProvider, c as NcmProviderProps, u as useNcmConfig } from '../use-ncm-config-CnntcShj.js';
-export { B as BlockReferenceScope, a as BlockReferenceScopeProps, b as BlockReferenceScopeValue, I as InertReferenceScope, N as NcmReferencesProvider, c as NcmReferencesProviderProps, R as ReferenceCounts, d as ReferenceKind, e as computeReferenceBases, u as useBlockReferenceScope } from '../references-BYW5pnj_.js';
+export { B as BlockReferenceScope, a as BlockReferenceScopeProps, b as BlockReferenceScopeValue, I as InertReferenceScope, N as NcmReferencesProvider, c as NcmReferencesProviderProps, R as ReferenceCounts, d as ReferenceKind, e as ReferenceNumbering, f as collectBibliography, g as computeReferenceBases, h as computeReferenceNumbering, n as normalizeReferenceContent, u as useBlockReferenceScope } from '../references-BM-lvGrq.js';
 import 'react';
 import '@nuucognition/mesh-core';
 import '@nuucognition/ncm';

package/dist/context/index.js

@@ -53,6 +53,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 = [];
@@ -124,17 +170,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) {
@@ -145,18 +185,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) });
@@ -227,48 +255,95 @@ function collectListStrings(items) {
   }
   return out;
 }
-function countInlineRefs(tokens, acc) {
+function normalizeReferenceContent(content) {
+  return content.replace(/\s+/g, " ").trim().toLowerCase();
+}
+var BIBLIOGRAPHY_ENTRY_RE = /^\s*\[(\d+)\]\s+([\s\S]+?)\s*$/;
+function collectBibliography(blocks) {
+  const entries = /* @__PURE__ */ new Map();
+  for (const block of blocks) {
+    if (block.type !== "paragraph") continue;
+    const content = block.content ?? "";
+    const match = BIBLIOGRAPHY_ENTRY_RE.exec(content);
+    if (!match || !match[1] || !match[2]) continue;
+    const key = normalizeReferenceContent(match[2]);
+    if (key && !entries.has(key)) entries.set(key, Number(match[1]));
+  }
+  return entries;
+}
+function walkInlineRefs(tokens, visit) {
   for (const token of tokens) {
     if (token.type === "inline_ref") {
-      acc[token.kind] += 1;
+      visit(token);
     } else if ("children" in token) {
-      countInlineRefs(token.children, acc);
+      walkInlineRefs(token.children, visit);
     }
   }
 }
-function countBlock(block) {
-  const acc = { ref: 0, footnote: 0 };
-  for (const str of collectInlineStrings(block)) {
-    if (str) countInlineRefs(parseInline(str), acc);
+function computeReferenceNumbering(blocks) {
+  const bibliography = collectBibliography(blocks);
+  let maxBibliography = 0;
+  for (const n of bibliography.values()) maxBibliography = Math.max(maxBibliography, n);
+  const numbering = { ref: /* @__PURE__ */ new Map(), footnote: /* @__PURE__ */ new Map() };
+  let nextRef = maxBibliography;
+  let nextFootnote = 0;
+  for (const block of blocks) {
+    for (const str of collectInlineStrings(block)) {
+      if (!str) continue;
+      walkInlineRefs(parseInline(str), (token) => {
+        const key = normalizeReferenceContent(token.content);
+        const map = numbering[token.kind];
+        if (map.has(key)) return;
+        if (token.kind === "ref") {
+          const fromBibliography = bibliography.get(key);
+          map.set(key, fromBibliography ?? ++nextRef);
+        } else {
+          map.set(key, ++nextFootnote);
+        }
+      });
+    }
   }
-  return acc;
+  return numbering;
 }
 function computeReferenceBases(blocks) {
   const bases = /* @__PURE__ */ new Map();
   const acc = { ref: 0, footnote: 0 };
   for (const block of blocks) {
     bases.set(block.id, { ...acc });
-    const counts = countBlock(block);
-    acc.ref += counts.ref;
-    acc.footnote += counts.footnote;
+    for (const str of collectInlineStrings(block)) {
+      if (!str) continue;
+      walkInlineRefs(parseInline(str), (token) => {
+        acc[token.kind] += 1;
+      });
+    }
   }
   return bases;
 }
-var ReferenceBasesContext = createContext(null);
+var ReferenceNumberingContext = createContext(null);
 var BlockReferenceScopeContext = createContext(null);
 function NcmReferencesProvider({ blocks, children }) {
-  const bases = useMemo(() => computeReferenceBases(blocks), [blocks]);
-  return /* @__PURE__ */ jsx(ReferenceBasesContext.Provider, { value: bases, children });
+  const numbering = useMemo(() => computeReferenceNumbering(blocks), [blocks]);
+  return /* @__PURE__ */ jsx(ReferenceNumberingContext.Provider, { value: numbering, children });
 }
-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 });
@@ -276,9 +351,9 @@ 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 });
 }
 
-export { BlockReferenceScope, InertReferenceScope, NcmProvider, NcmReferencesProvider, computeReferenceBases, useBlockReferenceScope, useNcmConfig };
+export { BlockReferenceScope, InertReferenceScope, NcmProvider, NcmReferencesProvider, collectBibliography, computeReferenceBases, computeReferenceNumbering, normalizeReferenceContent, useBlockReferenceScope, useNcmConfig };