@jxsuite/parser 3.0.0 → 4.0.0

package/dist/content-loader.js

@@ -33786,7 +33786,7 @@ function walkFiles(root, accept, exclude) {
 var init_walk = () => {};
 
 // src/content-loader.ts
-import { existsSync, readFileSync, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
+import { existsSync, readFileSync, readdirSync as readdirSync2, realpathSync as realpathSync2, statSync as statSync2 } from "node:fs";
 import { basename, dirname, extname, relative, resolve } from "node:path";
 
 // ../../packages/schema/src/asset-paths.ts
@@ -34418,11 +34418,21 @@ function discoverJSONFiles(resolvedSource, exclude) {
 function localesForExpansion(projectConfig) {
   return resolveI18n(projectConfig ?? {}).i18n?.locales ?? [];
 }
+function existsWithSpelling(root, path) {
+  const full = resolve(root, path);
+  if (!existsSync(full)) {
+    return false;
+  }
+  const wanted = full.split(/[\\/]/).filter(Boolean);
+  const actual = realpathSync2.native(full).split(/[\\/]/).filter(Boolean);
+  const tail = actual.slice(-wanted.length);
+  return wanted.every((segment, index) => segment === tail[index]);
+}
 function localeSource(root, source, locale) {
   const candidates = [locale, locale.toLowerCase()];
   for (const spelling of candidates) {
     const path = source.split(LOCALE_PLACEHOLDER).join(spelling);
-    if (existsSync(resolve(root, path))) {
+    if (existsWithSpelling(root, path)) {
       return path;
     }
   }

package/dist/markdown.js

@@ -40742,6 +40742,143 @@ var init_dist3 = __esm(() => {
   $visitAsync = visit2.visitAsync;
 });
 
+// src/source-style.ts
+function frontmatterText(source) {
+  const match = FRONTMATTER_RE.exec(source);
+  if (!match) {
+    return null;
+  }
+  return match[1] ?? "";
+}
+function bodyText(source) {
+  return source.replace(FRONTMATTER_RE, "");
+}
+function sameValue2(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    return Array.isArray(a) && Array.isArray(b) && a.length === b.length && a.every((item, index) => sameValue2(item, b[index]));
+  }
+  if (!isJsonObject(a) || !isJsonObject(b)) {
+    return false;
+  }
+  const keys = Object.keys(a).filter((key) => a[key] !== undefined);
+  const otherKeys = Object.keys(b).filter((key) => b[key] !== undefined);
+  return keys.length === otherKeys.length && keys.every((key) => sameValue2(a[key], b[key]));
+}
+function lineStart(text, offset) {
+  return text.lastIndexOf(`
+`, offset - 1) + 1;
+}
+function lineEnd(text, offset) {
+  const newline = text.indexOf(`
+`, offset);
+  return newline === -1 ? text.length : newline + 1;
+}
+function sourceEntries(text) {
+  const doc = $parseDocument(text);
+  if (doc.errors.length > 0 || doc.warnings.length > 0) {
+    return null;
+  }
+  const { contents } = doc;
+  if (!$isMap(contents) || contents.flow === true) {
+    return null;
+  }
+  const pairs = contents.items;
+  const keys = [];
+  for (const { key } of pairs) {
+    if (!$isScalar(key) || !key.range || !isString(key.value)) {
+      return null;
+    }
+    keys.push({ name: key.value, range: key.range });
+  }
+  const js = doc.toJS();
+  const values = isJsonObject(js) ? js : {};
+  const entries = [];
+  for (const [index, { name, range }] of keys.entries()) {
+    const end = pairs[index]?.value?.range?.[1] ?? range[1];
+    entries.push({
+      key: name,
+      start: lineStart(text, range[0]),
+      value: values[name],
+      valueEnd: lineEnd(text, Math.max(end - 1, range[0]))
+    });
+  }
+  return entries;
+}
+function spliceFrontmatter(frontmatter, source, write) {
+  const entries = sourceEntries(source);
+  if (!entries) {
+    return null;
+  }
+  const present = (key) => Object.hasOwn(frontmatter, key) && frontmatter[key] !== undefined;
+  const segments = [];
+  const head = source.slice(0, entries[0]?.start ?? source.length);
+  if (head.trim().length > 0) {
+    segments.push(head);
+  }
+  for (const [index, entry] of entries.entries()) {
+    const chunkEnd = entries[index + 1]?.start ?? source.length;
+    if (!present(entry.key)) {
+      continue;
+    }
+    if (sameValue2(entry.value, frontmatter[entry.key])) {
+      segments.push(source.slice(entry.start, chunkEnd));
+      continue;
+    }
+    const tail = source.slice(Math.min(entry.valueEnd, chunkEnd), chunkEnd);
+    segments.push(`${write({ [entry.key]: frontmatter[entry.key] })}
+${tail}`);
+  }
+  const known = new Set(entries.map((entry) => entry.key));
+  const added = {};
+  for (const [key, value] of Object.entries(frontmatter)) {
+    if (!known.has(key) && value !== undefined) {
+      added[key] = value;
+    }
+  }
+  if (Object.keys(added).length > 0) {
+    segments.push(write(added));
+  }
+  return segments.map((segment) => segment.endsWith(`
+`) ? segment : `${segment}
+`).join("").replace(/\s+$/u, "");
+}
+function startOffset(node) {
+  const position = node.position;
+  const offset = position?.start?.offset;
+  return isNumber(offset) ? offset : null;
+}
+function markdownMarkers(tree, source) {
+  const markers = { bullet: "-", emphasis: "*", strong: "*" };
+  const seen = new Set;
+  const visit = (node) => {
+    const offset = startOffset(node);
+    if (offset !== null && !seen.has(node.type)) {
+      const char = source[offset];
+      if ((node.type === "emphasis" || node.type === "strong") && (char === "*" || char === "_")) {
+        markers[node.type] = char;
+        seen.add(node.type);
+      } else if (node.type === "listItem" && (char === "-" || char === "*" || char === "+")) {
+        markers.bullet = char;
+        seen.add(node.type);
+      }
+    }
+    for (const child of node.children ?? []) {
+      visit(child);
+    }
+  };
+  visit(tree);
+  return markers;
+}
+var FRONTMATTER_RE;
+var init_source_style = __esm(() => {
+  init_dist3();
+  init_guards();
+  FRONTMATTER_RE = /^---\r?\n(?:([\s\S]*?)\r?\n)?---[ \t]*(?:\r?\n|$)/u;
+});
+
 // src/serialize.ts
 function textOf(el) {
   return el && isString(el.textContent) ? el.textContent : undefined;
@@ -40952,6 +41089,72 @@ function hasJxProps(el) {
   }
   return false;
 }
+function hasOnlyMarkdownAttributes(el, tag) {
+  const allowed = MD_ATTRIBUTES.get(tag);
+  return Object.keys(el.attributes ?? {}).every((name) => allowed?.has(name) ?? false);
+}
+function partChildren(el) {
+  return childList(el).filter((child) => !isString(child) || child.trim() !== "");
+}
+function plainPart(slot, tag) {
+  if (slot === undefined || isString(slot) || slot.tagName !== tag) {
+    return null;
+  }
+  const attributes = Object.keys(slot.attributes ?? {});
+  return attributes.length === 0 && !hasJxProps(slot) ? slot : null;
+}
+function isGfmCell(cell) {
+  if (cell.textContent != null) {
+    return !String(cell.textContent).includes(`
+`);
+  }
+  return childList(cell).every((child) => isString(child) ? !child.includes(`
+`) : isString(child.tagName) && (MD_INLINE.has(child.tagName) || child.tagName === "span"));
+}
+function gfmRowCells(row, cellTag) {
+  const tr = plainPart(row, "tr");
+  if (!tr || tr.textContent != null) {
+    return null;
+  }
+  const cells = [];
+  for (const slot of partChildren(tr)) {
+    const cell = plainPart(slot, cellTag);
+    if (!cell || !isGfmCell(cell)) {
+      return null;
+    }
+    cells.push(cell);
+  }
+  return cells.length > 0 ? cells : null;
+}
+function gfmTableRows(el) {
+  if (el.textContent != null) {
+    return null;
+  }
+  const [headSlot, bodySlot, ...rest] = partChildren(el);
+  const thead = plainPart(headSlot, "thead");
+  if (!thead || rest.length > 0) {
+    return null;
+  }
+  const headRows = partChildren(thead);
+  const head = headRows.length === 1 ? gfmRowCells(headRows[0], "th") : null;
+  if (!head) {
+    return null;
+  }
+  if (bodySlot === undefined) {
+    return { body: [], head };
+  }
+  const tbody = plainPart(bodySlot, "tbody");
+  const rows = tbody ? partChildren(tbody) : [];
+  const body = [];
+  for (const row of rows) {
+    const cells = gfmRowCells(row, "td");
+    if (!cells || cells.length !== head.length) {
+      return null;
+    }
+    body.push(cells);
+  }
+  return body.length > 0 ? { body, head } : null;
+}
 function convertJxNode(slot, isBlock, allowlist) {
   if (isString(slot) || isNumber(slot)) {
     return { type: "text", value: String(slot) };
@@ -40961,7 +41164,8 @@ function convertJxNode(slot, isBlock, allowlist) {
   }
   const el = slot;
   const tag = serializableTag(el.tagName) || "div";
-  if (!allowlist.has(tag) || hasJxProps(el)) {
+  const tableRows = tag === "table" ? gfmTableRows(el) : null;
+  if (!allowlist.has(tag) || hasJxProps(el) || !hasOnlyMarkdownAttributes(el, tag) || TABLE_PARTS.has(tag) || tag === "table" && tableRows === null || isBlock && tag === "img") {
     return convertToDirective(el, isBlock, allowlist);
   }
   const mdastType = hasMdastType(tag) ? TAG_MDAST_MAP[tag] : undefined;
@@ -41054,36 +41258,20 @@ function convertJxNode(slot, isBlock, allowlist) {
       return { type: "break" };
     }
     case "table": {
-      const rows = [];
-      for (const section of childList(el)) {
-        if (isString(section)) {
-          continue;
-        }
-        if (section.tagName === "thead" || section.tagName === "tbody") {
-          for (const row of childList(section)) {
-            const mdRow = convertJxNode(row, true, allowlist);
-            if (mdRow) {
-              if (section.tagName === "thead") {
-                for (const cell of mdRow.children ?? []) {
-                  cell.isHeader = true;
-                }
-              }
-              rows.push(mdRow);
-            }
-          }
-        }
-      }
-      return { children: rows, type: "table" };
-    }
-    case "tableRow": {
-      return {
-        children: convertJxChildren(childList(el), false, allowlist),
+      const { body, head } = tableRows ?? { body: [], head: [] };
+      const row = (cells, isHeader) => ({
+        children: cells.map((cell) => ({
+          children: inline(cell),
+          type: "tableCell",
+          ...isHeader && { isHeader: true }
+        })),
         type: "tableRow"
+      });
+      return {
+        children: [row(head, true), ...body.map((cells) => row(cells, false))],
+        type: "table"
       };
     }
-    case "tableCell": {
-      return { children: inline(el), type: "tableCell" };
-    }
     default: {
       break;
     }
@@ -41782,21 +41970,31 @@ function serializeRoundtrip(doc, opts) {
       frontmatter[key] = value;
     }
     if (Object.keys(frontmatter).length > 0) {
-      lines.push("---", $stringify(frontmatter).trim(), "---", "");
+      const sourceYaml = opts.source === undefined ? null : frontmatterText(opts.source);
+      const spliced = sourceYaml === null ? null : spliceFrontmatter(frontmatter, sourceYaml, (values) => stringifyFrontmatter(values));
+      lines.push("---", spliced ?? stringifyFrontmatter(frontmatter), "---", "");
     }
   }
   if (Array.isArray(doc.children) && doc.children.length > 0) {
     const mdast = jxToMdast(doc, opts);
-    const processor = createProcessor().use(remarkGfm).use(remarkDirective).use(remarkStringifyPlugin, { bullet: "-", emphasis: "*", strong: "*" });
-    const md = processor.stringify(mdast);
-    lines.push(md);
+    const markers = opts.source === undefined ? { bullet: "-", emphasis: "*", strong: "*" } : sourceMarkers(opts.source);
+    const processor = createProcessor().use(remarkGfm).use(remarkDirective).use(remarkStringifyPlugin, { ...markers });
+    lines.push(processor.stringify(mdast).replaceAll(/\n{3,}/g, `
+
+`));
   }
   return `${lines.join(`
-`).replaceAll(/\n{3,}/g, `
-
 `).trim()}
 `;
 }
+function sourceMarkers(source) {
+  const body = bodyText(source);
+  const tree = createProcessor().use(remarkParsePlugin).use(remarkGfm).use(remarkDirective).parse(body);
+  return markdownMarkers(tree, body);
+}
+function stringifyFrontmatter(frontmatter) {
+  return $stringify(frontmatter, { lineWidth: 0, version: "1.1" }).trim();
+}
 function serializeExport(doc, opts) {
   if (!Array.isArray(doc.children) || doc.children.length === 0) {
     return "";
@@ -41841,16 +42039,18 @@ function serializeExport(doc, opts) {
 `).trim()}
 `;
 }
-var MD_ELEMENTS, MD_BLOCK, MD_INLINE, MD_ALL, MD_VOID, MD_TEXT_ONLY, TAG_MDAST_MAP, WRAPPER_TAGS, INLINE_CONTENT_TAGS, MDAST_TAG_MAP, CSS_PSEUDO_NAMES2, JX_DOLLAR_KEYS2, PROTOTYPE_DIRECTIVE_NAMES2, JX_ANNOTATION_KEYS2, remarkStringifyPlugin;
+var MD_ELEMENTS, MD_BLOCK, MD_INLINE, MD_ALL, MD_VOID, MD_TEXT_ONLY, TAG_MDAST_MAP, WRAPPER_TAGS, INLINE_CONTENT_TAGS, MDAST_TAG_MAP, MD_ATTRIBUTES, TABLE_PARTS, CSS_PSEUDO_NAMES2, JX_DOLLAR_KEYS2, PROTOTYPE_DIRECTIVE_NAMES2, JX_ANNOTATION_KEYS2, remarkStringifyPlugin, remarkParsePlugin;
 var init_serialize = __esm(() => {
   init_unified();
   init_guards();
+  init_remark_parse();
   init_remark_stringify();
   init_remark_directive();
   init_remark_gfm();
   init_dist3();
   init_html_to_jx();
   init_transpile();
+  init_source_style();
   MD_ELEMENTS = {
     block: [
       "h1",
@@ -41985,6 +42185,12 @@ var init_serialize = __esm(() => {
     text: () => "span",
     thematicBreak: () => "hr"
   };
+  MD_ATTRIBUTES = new Map([
+    ["a", new Set(["href", "title"])],
+    ["img", new Set(["alt", "src", "title"])],
+    ["ol", new Set(["start"])]
+  ]);
+  TABLE_PARTS = new Set(["tbody", "td", "th", "thead", "tr"]);
   CSS_PSEUDO_NAMES2 = new Set([
     "hover",
     "focus",
@@ -42016,6 +42222,7 @@ var init_serialize = __esm(() => {
   PROTOTYPE_DIRECTIVE_NAMES2 = new Set(["Array"]);
   JX_ANNOTATION_KEYS2 = new Set(["$title", "$description"]);
   remarkStringifyPlugin = remarkStringify;
+  remarkParsePlugin = remarkParse;
 });
 
 // src/walk.ts
@@ -53964,6 +54171,11 @@ function getHighlighter() {
     ],
     themes: [github_light_default_default, github_dark_default_default]
   });
+  _highlighter.codeToTokens("const a = 1;", {
+    defaultColor: false,
+    lang: "javascript",
+    themes: THEMES
+  });
   return _highlighter;
 }
 function highlightFence(code, info) {
@@ -53972,7 +54184,12 @@ function highlightFence(code, info) {
   if (!h.getLoadedLanguages().includes(lang)) {
     return null;
   }
-  const { tokens } = h.codeToTokens(code, { defaultColor: false, lang, themes: THEMES });
+  const { tokens } = h.codeToTokens(code, {
+    defaultColor: false,
+    lang,
+    themes: THEMES,
+    tokenizeTimeLimit: 0
+  });
   const out = [];
   for (const [i, line] of tokens.entries()) {
     if (i > 0) {