@jxsuite/parser 1.4.0 → 1.5.0

package/dist/markdown.js

@@ -865,6 +865,22 @@ function isJsonObject(value) {
 function isRef(value) {
   return isJsonObject(value) && typeof value.$ref === "string";
 }
+function isTagExpression(tagName) {
+  return isJsonObject(tagName) && isJsonObject(tagName.$expression);
+}
+function tagNameCandidates(tagName) {
+  if (typeof tagName === "string") {
+    return [tagName];
+  }
+  if (!isTagExpression(tagName)) {
+    return [];
+  }
+  const expression = tagName.$expression;
+  if (expression.operator === "?:") {
+    return [...new Set([expression.value, expression.initial])];
+  }
+  return [...new Set([...Object.values(expression.cases), expression.default])];
+}
 var SCHEMA_KEYWORDS;
 var init_guards = __esm(() => {
   SCHEMA_KEYWORDS = new Set([
@@ -41982,7 +41998,7 @@ function transpileJxMarkdown(source) {
   return doc;
 }
 function slugifyHeading(text5) {
-  return text5.toLowerCase().replaceAll(/[^\w\s-]/g, "").replaceAll(/\s+/g, "-").replaceAll(/-+/g, "-").replaceAll(/^-|-$/g, "");
+  return text5.normalize("NFC").toLowerCase().replaceAll(/[^\p{L}\p{N}_\s-]/gu, "").replaceAll(/\s+/gu, "-").replaceAll(/-+/g, "-").replaceAll(/^-|-$/g, "");
 }
 function jxNodeText(node2) {
   if (typeof node2 === "string") {
@@ -42004,7 +42020,7 @@ function assignHeadingIds(children) {
       if (typeof node2 !== "object" || node2 === null) {
         continue;
       }
-      const tag = node2.tagName;
+      const tag = typeof node2.tagName === "string" ? node2.tagName : "";
       if (tag && HEADING_TAGS.has(tag)) {
         const text5 = jxNodeText(node2).trim();
         let id = typeof node2.id === "string" && node2.id.length > 0 ? node2.id : "";
@@ -42313,7 +42329,7 @@ function convertJxNode(el, isBlock, allowlist) {
   if (!el || typeof el !== "object") {
     return null;
   }
-  const tag = el.tagName ?? "div";
+  const tag = serializableTag(el.tagName) || "div";
   if (!allowlist.has(tag) || hasJxProps(el)) {
     return convertToDirective(el, isBlock, allowlist);
   }
@@ -42442,6 +42458,15 @@ function convertJxNode(el, isBlock, allowlist) {
   }
   return null;
 }
+function serializableTag(tagName) {
+  if (typeof tagName === "string") {
+    return tagName;
+  }
+  if (tagName == null) {
+    return "";
+  }
+  throw new Error(`Markdown cannot express a tag chosen at creation (candidates: ` + `${tagNameCandidates(tagName).join(", ")}). Keep this element in a JSON component.`);
+}
 function collectDirectiveAttrs(el) {
   const propsObj = {};
   for (const [key2, value2] of Object.entries(el)) {
@@ -42574,7 +42599,7 @@ function nodeToMdast(node2, ctx, scope) {
   if (node2.$prototype === "Array") {
     return expandArray(node2, ctx, scope);
   }
-  const tag = node2.tagName ?? "div";
+  const tag = serializableTag(node2.tagName) || "div";
   const text5 = resolveText(node2.textContent, ctx, scope);
   if (typeof node2.innerHTML === "string" && node2.innerHTML.trim()) {
     const htmlNodes = htmlToMdast(node2.innerHTML);
@@ -43373,6 +43398,63 @@ var init_serialize = __esm(() => {
   JX_ANNOTATION_KEYS2 = new Set(["$title", "$description"]);
 });
 
+// ../../packages/schema/src/intl.ts
+var DEFAULT_FORMAT_LOCALE = "en-US", INTL_HELPERS, INTL_HELPER_PATHS, INTL_LOCALE_PARAM;
+var init_intl = __esm(() => {
+  INTL_HELPERS = [
+    {
+      api: "Intl.NumberFormat",
+      params: ["value", "locale", "options"],
+      path: "Intl/formatNumber",
+      summary: "Format a number for a locale — grouping, decimals, currency, percent, units."
+    },
+    {
+      api: "Intl.DateTimeFormat",
+      params: ["value", "locale", "options"],
+      path: "Intl/formatDate",
+      summary: "Format a date or timestamp for a locale. Pass `timeZone` in options."
+    },
+    {
+      api: "Intl.RelativeTimeFormat",
+      params: ["value", "unit", "locale", "options"],
+      path: "Intl/formatRelativeTime",
+      summary: 'Format a relative time — `-3, "day"` becomes "3 days ago".'
+    },
+    {
+      api: "Intl.ListFormat",
+      params: ["values", "locale", "options"],
+      path: "Intl/formatList",
+      summary: 'Join a list the way a locale does — "a, b, and c", not a hand-written comma join.'
+    },
+    {
+      api: "Intl.PluralRules",
+      params: ["value", "locale", "options"],
+      path: "Intl/plural",
+      summary: 'Which plural category a number falls in ("one", "few", "other") — many languages have ' + "more than two, so a ternary on `n === 1` is wrong outside English."
+    },
+    {
+      api: "Intl.Collator",
+      params: ["a", "b", "locale", "options"],
+      path: "Intl/compare",
+      summary: "Compare two strings for sorting. `<` and `sort()` order by UTF-16 code unit, which puts " + '"Zebra" before "apple" and sorts every accented word into the wrong place.'
+    },
+    {
+      api: "Intl.DisplayNames",
+      params: ["code", "type", "locale", "options"],
+      path: "Intl/displayName",
+      summary: 'The name of a language, region, script or currency in a locale — "de" as "German" or ' + '"Deutsch", from CLDR rather than a hand-kept table.'
+    },
+    {
+      api: "Intl.Segmenter",
+      params: ["value", "granularity", "locale"],
+      path: "Intl/segment",
+      summary: "Split text into graphemes, words or sentences (UAX #29). `[...str]` splits code points, " + "so it cuts an emoji with a skin-tone modifier in half."
+    }
+  ];
+  INTL_HELPER_PATHS = INTL_HELPERS.map((helper) => helper.path);
+  INTL_LOCALE_PARAM = Object.fromEntries(INTL_HELPERS.map((helper) => [helper.path, helper.params.indexOf("locale")]));
+});
+
 // ../../node_modules/glob/dist/esm/index.min.js
 import { fileURLToPath as Wi } from "node:url";
 import { posix as mi, win32 as re2 } from "node:path";
@@ -51707,15 +51789,34 @@ function splitToken(token, offsets) {
     });
   return tokens;
 }
+function findFirstBreakpointAfter(breakpoints, offset) {
+  let start = 0;
+  let end = breakpoints.length;
+  while (start < end) {
+    const middle = start + (end - start >> 1);
+    if (breakpoints[middle] <= offset)
+      start = middle + 1;
+    else
+      end = middle;
+  }
+  return start;
+}
 function splitTokens(tokens, breakpoints) {
   const sorted = [...breakpoints instanceof Set ? breakpoints : new Set(breakpoints)].sort((a, b) => a - b);
   if (!sorted.length)
     return tokens;
   return tokens.map((line) => {
     return line.flatMap((token) => {
-      const breakpointsInToken = sorted.filter((i) => token.offset < i && i < token.offset + token.content.length).map((i) => i - token.offset).sort((a, b) => a - b);
-      if (!breakpointsInToken.length)
+      const tokenEnd = token.offset + token.content.length;
+      const start = findFirstBreakpointAfter(sorted, token.offset);
+      let end = start;
+      while (end < sorted.length && sorted[end] < tokenEnd)
+        end++;
+      if (start === end)
         return token;
+      const breakpointsInToken = sorted.slice(start, end);
+      for (let index2 = 0;index2 < breakpointsInToken.length; index2++)
+        breakpointsInToken[index2] -= token.offset;
       return splitToken(token, breakpointsInToken);
     });
   });
@@ -51742,7 +51843,9 @@ function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColo
           const darkIndex = variantsOrder.findIndex((t) => t === "dark");
           if (lightIndex === -1 || darkIndex === -1)
             throw new ShikiError('When using `defaultColor: "light-dark()"`, you must provide both `light` and `dark` themes');
-          mergedStyles[key2] = `light-dark(${styles[lightIndex][key2] || "inherit"}, ${styles[darkIndex][key2] || "inherit"})`;
+          const lightValue = styles[lightIndex][key2] || "inherit";
+          const darkValue = styles[darkIndex][key2] || "inherit";
+          mergedStyles[key2] = `light-dark(${lightValue}, ${darkValue})`;
           if (colorsRendering === "css-vars")
             mergedStyles[varKey(idx, key2)] = value2;
         } else
@@ -56080,9 +56183,17 @@ function mdastToString(node2) {
   }
   return "";
 }
+function countWords(text6) {
+  let words = 0;
+  for (const { segment } of WORD_SEGMENTER.segment(text6)) {
+    if (WORD_LIKE.test(segment)) {
+      words += 1;
+    }
+  }
+  return words;
+}
 function readingTime(text6) {
-  const words = text6.split(/\s+/).filter(Boolean).length;
-  return Math.max(1, Math.ceil(words / 200));
+  return Math.max(1, Math.ceil(countWords(text6) / WORDS_PER_MINUTE));
 }
 function extractExcerpt(tree) {
   let firstParagraph = null;
@@ -56132,7 +56243,7 @@ function processMarkdown(source, filePath, config = {}) {
     $excerpt: excerpt,
     $readingTime: readingTime(plainText),
     $toc: toc,
-    $wordCount: plainText.split(/\s+/).filter(Boolean).length,
+    $wordCount: countWords(plainText),
     frontmatter: frontmatter2,
     path: filePath,
     slug
@@ -56191,19 +56302,22 @@ class MarkdownCollection {
     return filtered;
   }
 }
-var import_remark_parse_frontmatter2;
+var import_remark_parse_frontmatter2, WORDS_PER_MINUTE = 200, WORD_SEGMENTER, WORD_LIKE;
 var init_md = __esm(() => {
   init_unified();
   init_remark_parse();
   init_remark_frontmatter();
   init_remark_gfm();
   init_remark_directive();
+  init_intl();
   init_index_min();
   init_transpile();
   init_highlight();
   init_markdown2();
   init_transpile();
   import_remark_parse_frontmatter2 = __toESM(require_dist2(), 1);
+  WORD_SEGMENTER = new Intl.Segmenter(DEFAULT_FORMAT_LOCALE, { granularity: "word" });
+  WORD_LIKE = /[\p{L}\p{N}]/u;
 });
 
 // src/markdown.ts
@@ -56233,7 +56347,7 @@ class Markdown {
   }
   static async load(path2, options = {}) {
     const { processMarkdown: processMarkdown2 } = await Promise.resolve().then(() => (init_md(), exports_md));
-    const { readFileSync: readFileSync2 } = await import("node:fs");
+    const { readFileSync: readFileSync2, statSync } = await import("node:fs");
     const source = readFileSync2(path2, "utf8");
     const result = processMarkdown2(source, path2, {
       ...options.directives !== undefined && { directives: options.directives },
@@ -56243,6 +56357,9 @@ class Markdown {
       ...options.sourceRoot !== undefined && { sourceRoot: options.sourceRoot }
     });
     const _meta = {};
+    try {
+      _meta.mtime = statSync(path2).mtime.toISOString().replace(/\.\d{3}Z$/, "Z");
+    } catch {}
     if (result.$excerpt != null) {
       _meta.excerpt = result.$excerpt;
     }

package/dist/serialize.js

@@ -865,6 +865,22 @@ function isJsonObject(value) {
 function isRef(value) {
   return isJsonObject(value) && typeof value.$ref === "string";
 }
+function isTagExpression(tagName) {
+  return isJsonObject(tagName) && isJsonObject(tagName.$expression);
+}
+function tagNameCandidates(tagName) {
+  if (typeof tagName === "string") {
+    return [tagName];
+  }
+  if (!isTagExpression(tagName)) {
+    return [];
+  }
+  const expression = tagName.$expression;
+  if (expression.operator === "?:") {
+    return [...new Set([expression.value, expression.initial])];
+  }
+  return [...new Set([...Object.values(expression.cases), expression.default])];
+}
 var SCHEMA_KEYWORDS;
 var init_guards = __esm(() => {
   SCHEMA_KEYWORDS = new Set([
@@ -41982,7 +41998,7 @@ function transpileJxMarkdown(source) {
   return doc;
 }
 function slugifyHeading(text5) {
-  return text5.toLowerCase().replaceAll(/[^\w\s-]/g, "").replaceAll(/\s+/g, "-").replaceAll(/-+/g, "-").replaceAll(/^-|-$/g, "");
+  return text5.normalize("NFC").toLowerCase().replaceAll(/[^\p{L}\p{N}_\s-]/gu, "").replaceAll(/\s+/gu, "-").replaceAll(/-+/g, "-").replaceAll(/^-|-$/g, "");
 }
 function jxNodeText(node2) {
   if (typeof node2 === "string") {
@@ -42004,7 +42020,7 @@ function assignHeadingIds(children) {
       if (typeof node2 !== "object" || node2 === null) {
         continue;
       }
-      const tag = node2.tagName;
+      const tag = typeof node2.tagName === "string" ? node2.tagName : "";
       if (tag && HEADING_TAGS.has(tag)) {
         const text5 = jxNodeText(node2).trim();
         let id = typeof node2.id === "string" && node2.id.length > 0 ? node2.id : "";
@@ -42313,7 +42329,7 @@ function convertJxNode(el, isBlock, allowlist) {
   if (!el || typeof el !== "object") {
     return null;
   }
-  const tag = el.tagName ?? "div";
+  const tag = serializableTag(el.tagName) || "div";
   if (!allowlist.has(tag) || hasJxProps(el)) {
     return convertToDirective(el, isBlock, allowlist);
   }
@@ -42442,6 +42458,15 @@ function convertJxNode(el, isBlock, allowlist) {
   }
   return null;
 }
+function serializableTag(tagName) {
+  if (typeof tagName === "string") {
+    return tagName;
+  }
+  if (tagName == null) {
+    return "";
+  }
+  throw new Error(`Markdown cannot express a tag chosen at creation (candidates: ` + `${tagNameCandidates(tagName).join(", ")}). Keep this element in a JSON component.`);
+}
 function collectDirectiveAttrs(el) {
   const propsObj = {};
   for (const [key2, value2] of Object.entries(el)) {
@@ -42574,7 +42599,7 @@ function nodeToMdast(node2, ctx, scope) {
   if (node2.$prototype === "Array") {
     return expandArray(node2, ctx, scope);
   }
-  const tag = node2.tagName ?? "div";
+  const tag = serializableTag(node2.tagName) || "div";
   const text5 = resolveText(node2.textContent, ctx, scope);
   if (typeof node2.innerHTML === "string" && node2.innerHTML.trim()) {
     const htmlNodes = htmlToMdast(node2.innerHTML);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/parser",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Jx markdown parser and external class integration",
   "license": "MIT",
   "repository": {
@@ -48,10 +48,10 @@
     "upgrade": "bunx npm-check-updates -u && bun install"
   },
   "dependencies": {
-    "@jxsuite/markup": "^0.4.1",
-    "@jxsuite/schema": "^1.4.0",
-    "@shikijs/langs": "^4.3.1",
-    "@shikijs/themes": "^4.3.1",
+    "@jxsuite/markup": "^0.4.3",
+    "@jxsuite/schema": "^1.6.0",
+    "@shikijs/langs": "^4.4.3",
+    "@shikijs/themes": "^4.4.3",
     "glob": "^13.0.6",
     "mdast-util-to-string": "^4.0.0",
     "remark-directive": "^4.0.0",
@@ -60,14 +60,14 @@
     "remark-parse": "^11.0.0",
     "remark-parse-frontmatter": "^1.0.3",
     "remark-stringify": "^11.0.0",
-    "shiki": "^4.3.1",
+    "shiki": "^4.4.3",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.1.0",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@happy-dom/global-registrator": "^20.11.1",
-    "@jxsuite/runtime": "^1.3.1",
+    "@happy-dom/global-registrator": "^20.11.2",
+    "@jxsuite/runtime": "^2.0.0",
     "@types/mdast": "^4.0.4",
     "ajv": "^8.20.0"
   },

package/src/Markdown.class.json

@@ -9,7 +9,7 @@
 
   "format": {
     "extensions": [".md"],
-    "mediaType": "text/markdown",
+    "mediaType": "text/markdown; variant=GFM",
     "documentKinds": ["page", "component", "content"],
     "exportTarget": true,
     "remote": false