@canofold/markdown 0.2.1 → 0.3.0

package/dist/server/analyze.d.ts

@@ -2,5 +2,5 @@
 export { detectMarkdownAssets } from '../compiler/assets';
 export { analyzeMarkdown } from '../compiler/analyze';
 export { analyzeMdxModuleBoundary } from '../compiler/mdxModules';
-export type { AnalyzeMarkdownOptions, MarkdownAnalysis, MarkdownCodeExample, MarkdownHeading } from '../compiler/analyze';
+export type { AnalyzeMarkdownOptions, MarkdownAnalysis, MarkdownCodeExample, MarkdownDirective, MarkdownHeading } from '../compiler/analyze';
 export type { MdxImportBinding, MdxImportDeclaration, MdxModuleBoundary } from '../compiler/mdxModules';

package/dist/server/analyze.js

@@ -1,132 +1,150 @@
-import { n as k, c as w } from "../directiveValidation-CwXRsn5k.js";
-import { d as K } from "../directiveValidation-CwXRsn5k.js";
-import x from "github-slugger";
-import { remarkDefinitionList as b } from "remark-definition-list";
-import D from "remark-directive";
-import M from "remark-gfm";
+import { n as w, c as x } from "../directiveValidation-BdVbgcY_.js";
+import { d as V } from "../directiveValidation-BdVbgcY_.js";
+import b from "github-slugger";
+import { remarkDefinitionList as D } from "remark-definition-list";
+import M from "remark-directive";
+import E from "remark-gfm";
 import S from "remark-parse";
-import { unified as E } from "unified";
-import { visit as y } from "unist-util-visit";
-import { a as I, n as v, m as C } from "../plugins-CeQ-Bo89.js";
-import { createProcessor as A } from "@mdx-js/mdx";
-function L(t) {
+import { unified as I } from "unified";
+import { visit as k } from "unist-util-visit";
+import { a as j, n as C, m as A } from "../plugins-StkCS2su.js";
+import { createProcessor as L } from "@mdx-js/mdx";
+function P(t) {
   return "children" in t && Array.isArray(t.children);
 }
-function f(t) {
-  return t.type === "text" || t.type === "inlineCode" ? String(t.value ?? "") : t.type === "image" ? String(t.alt ?? "") : t.type === "code" || t.type === "html" || t.type === "definition" ? "" : L(t) ? t.children.map(f).join(" ") : "";
+function l(t) {
+  return t.type === "text" || t.type === "inlineCode" ? String(t.value ?? "") : t.type === "image" ? String(t.alt ?? "") : t.type === "code" || t.type === "html" || t.type === "definition" ? "" : P(t) ? t.children.map(l).join(" ") : "";
 }
-function q(t, e = {}) {
-  const s = E().use(S).use(b).use(M).use(D).parse(k(t)), c = new x(), m = [], o = [], r = [], l = [];
+function H(t, i = {}) {
+  const n = I().use(S).use(D).use(E).use(M).parse(w(t)), c = new b(), f = [], s = [], o = [], m = [], y = [];
   let g = 0;
   const u = /* @__PURE__ */ new Map();
-  y(s, "definition", (n) => {
-    n.url && u.set(n.identifier.toLowerCase(), n.url);
-  }), y(s, (n) => {
-    if (n.type === "heading") {
-      const i = n, a = f(i).replace(/\s+/g, " ").trim();
-      m.push({ level: i.depth, text: a, slug: c.slug(a) });
+  k(n, "definition", (r) => {
+    r.url && u.set(r.identifier.toLowerCase(), r.url);
+  }), k(n, (r) => {
+    if (r.type === "heading") {
+      const e = r, a = l(e).replace(/\s+/g, " ").trim();
+      f.push({ level: e.depth, text: a, slug: c.slug(a) });
     }
-    if (n.type === "code") {
-      const i = n;
-      i.lang || (g += 1), o.push({
-        language: i.lang || "text",
-        ...i.meta ? { meta: i.meta } : {},
-        code: i.value
+    if (r.type === "code") {
+      const e = r;
+      e.lang || (g += 1), s.push({
+        language: e.lang || "text",
+        ...e.meta ? { meta: e.meta } : {},
+        code: e.value
       });
     }
-    if (n.type === "link") {
-      const i = n;
-      i.url && r.push(i.url);
+    if (r.type === "link") {
+      const e = r;
+      e.url && o.push(e.url);
+    }
+    if (r.type === "image") {
+      const e = r;
+      e.url && m.push(e.url);
     }
-    if (n.type === "image") {
-      const i = n;
-      i.url && l.push(i.url);
+    if (r.type === "linkReference") {
+      const e = r, a = u.get(e.identifier.toLowerCase());
+      a && o.push(a);
     }
-    if (n.type === "linkReference") {
-      const i = n, a = u.get(i.identifier.toLowerCase());
-      a && r.push(a);
+    if (r.type === "imageReference") {
+      const e = r, a = u.get(e.identifier.toLowerCase());
+      a && m.push(a);
     }
-    if (n.type === "imageReference") {
-      const i = n, a = u.get(i.identifier.toLowerCase());
-      a && l.push(a);
+    if (r.type === "containerDirective" || r.type === "leafDirective" || r.type === "textDirective") {
+      const e = r;
+      y.push({
+        name: e.name,
+        type: e.type,
+        label: l(e).replace(/\s+/g, " ").trim(),
+        attributes: Object.fromEntries(
+          Object.entries(e.attributes ?? {}).flatMap(
+            ([a, h]) => typeof h == "string" ? [[a, h]] : []
+          )
+        ),
+        ...e.position?.start.line === void 0 ? {} : { line: e.position.start.line },
+        ...e.position?.start.column === void 0 ? {} : { column: e.position.start.column },
+        ...e.position?.start.offset === void 0 ? {} : { offset: e.position.start.offset },
+        ...e.position?.end.offset === void 0 ? {} : { endOffset: e.position.end.offset }
+      });
     }
   });
-  const h = I(v(e.plugins), {
+  const v = j(C(i.plugins), {
     source: t,
     mode: "markdown"
   });
   return {
-    text: f(s).replace(/\s+/g, " ").trim(),
-    headings: m,
-    codeExamples: o,
-    links: r,
-    images: l,
+    text: l(n).replace(/\s+/g, " ").trim(),
+    headings: f,
+    codeExamples: s,
+    links: o,
+    images: m,
     missingCodeBlockLanguages: g,
-    directiveIssues: w(s, C(h)).map(
-      ({ message: n, line: i, column: a }) => ({
-        message: n,
-        line: i,
+    directives: y,
+    directiveIssues: x(n, A(v)).map(
+      ({ message: r, line: e, column: a }) => ({
+        message: r,
+        line: e,
         column: a
       })
     )
   };
 }
-function P(t) {
-  return t.specifiers.map((e) => e.type === "ImportDefaultSpecifier" ? { imported: "default", local: e.local.name } : e.type === "ImportNamespaceSpecifier" ? { imported: "*", local: e.local.name, namespace: !0 } : {
-    imported: e.type === "ImportSpecifier" ? "name" in e.imported ? e.imported.name : String(e.imported.value ?? "") : "",
-    local: e.local.name
+function O(t) {
+  return t.specifiers.map((i) => i.type === "ImportDefaultSpecifier" ? { imported: "default", local: i.local.name } : i.type === "ImportNamespaceSpecifier" ? { imported: "*", local: i.local.name, namespace: !0 } : {
+    imported: i.type === "ImportSpecifier" ? "name" in i.imported ? i.imported.name : String(i.imported.value ?? "") : "",
+    local: i.local.name
   });
 }
-function j(t) {
+function R(t) {
   return !!(t && typeof t == "object" && typeof t.type == "string");
 }
-function R(t) {
-  const e = t;
-  return typeof e.start == "number" && typeof e.end == "number";
+function z(t) {
+  const i = t;
+  return typeof i.start == "number" && typeof i.end == "number";
 }
-function d(t, e) {
+function d(t, i) {
   if (!t || typeof t != "object") return;
   if (Array.isArray(t)) {
-    for (const s of t) d(s, e);
+    for (const n of t) d(n, i);
     return;
   }
   const p = t;
-  j(t) && e(t);
-  for (const [s, c] of Object.entries(p))
-    s === "loc" || s === "position" || d(c, e);
+  R(t) && i(t);
+  for (const [n, c] of Object.entries(p))
+    n === "loc" || n === "position" || d(c, i);
 }
-function F(t) {
-  const e = A().parse(t), p = [], s = [], c = [];
-  d(e, (o) => {
-    if (o.type === "ImportExpression") {
-      const r = o.source.type === "Literal" && typeof o.source.value == "string" ? o.source.value : void 0;
-      s.push({
+function J(t) {
+  const i = L().parse(t), p = [], n = [], c = [];
+  d(i, (s) => {
+    if (s.type === "ImportExpression") {
+      const o = s.source.type === "Literal" && typeof s.source.value == "string" ? s.source.value : void 0;
+      n.push({
         kind: "dynamic-import",
-        specifier: r
+        specifier: o
       });
     }
   });
-  for (const o of e.children ?? [])
-    if (o.type === "mdxjsEsm")
-      for (const r of o.data?.estree?.body ?? [])
-        if (r.type === "ImportDeclaration") {
+  for (const s of i.children ?? [])
+    if (s.type === "mdxjsEsm")
+      for (const o of s.data?.estree?.body ?? [])
+        if (o.type === "ImportDeclaration") {
           if (p.push({
-            specifier: String(r.source.value),
-            bindings: P(r)
-          }), !R(r))
+            specifier: String(o.source.value),
+            bindings: O(o)
+          }), !z(o))
             throw new Error("Unable to locate an MDX import declaration in the source document");
-          c.push({ start: r.start, end: r.end });
-        } else (r.type === "ExportNamedDeclaration" || r.type === "ExportAllDeclaration") && r.source && s.push({
+          c.push({ start: o.start, end: o.end });
+        } else (o.type === "ExportNamedDeclaration" || o.type === "ExportAllDeclaration") && o.source && n.push({
           kind: "export-from",
-          specifier: String(r.source.value)
+          specifier: String(o.source.value)
         });
-  const m = [
-    ...new Map(c.map((o) => [`${o.start}:${o.end}`, o])).values()
-  ].sort((o, r) => r.start - o.start).reduce((o, r) => `${o.slice(0, r.start)}${o.slice(r.end)}`, t).replace(/^\s*\n/, "");
-  return { imports: p, sourceWithoutImports: m, unsupportedReferences: s };
+  const f = [
+    ...new Map(c.map((s) => [`${s.start}:${s.end}`, s])).values()
+  ].sort((s, o) => o.start - s.start).reduce((s, o) => `${s.slice(0, o.start)}${s.slice(o.end)}`, t).replace(/^\s*\n/, "");
+  return { imports: p, sourceWithoutImports: f, unsupportedReferences: n };
 }
 export {
-  q as analyzeMarkdown,
-  F as analyzeMdxModuleBoundary,
-  K as detectMarkdownAssets
+  H as analyzeMarkdown,
+  J as analyzeMdxModuleBoundary,
+  V as detectMarkdownAssets
 };

package/dist/server.js

@@ -1,63 +1,68 @@
-import * as p from "react/jsx-runtime";
+import * as f from "react/jsx-runtime";
 import { jsx as i } from "react/jsx-runtime";
-import { evaluate as w } from "@mdx-js/mdx";
-import { c as f, a as h, b as k } from "./Markdown-DgolXL7g.js";
-import { a as M, n as P } from "./directiveValidation-CwXRsn5k.js";
-import { n as x, d as v, c as y, a as N, p as L } from "./prepareMarkdown-Bug1ncYk.js";
-import { a as b, b as S, s as C, c as T } from "./plugins-CeQ-Bo89.js";
-import { d as G } from "./plugins-CeQ-Bo89.js";
-import { createHash as z } from "node:crypto";
-async function O(a = {}, r, t = { warnedLanguages: /* @__PURE__ */ new Set() }) {
-  const n = x(a), e = M(), s = r ?? "", o = b(n.plugins, { source: s, mode: "mdx" }), l = S(o), d = { ...n, plugins: o }, u = v(s, l);
-  o.forEach((g) => e.markPluginAssets(g));
-  const m = u.highlightedCode ? await y(
-    u.codeLanguages,
+import { evaluate as h } from "@mdx-js/mdx";
+import { c as k, a as M, b as P } from "./Markdown-C7O01MRv.js";
+import { a as x, n as v } from "./directiveValidation-BdVbgcY_.js";
+import { n as y, d as L, c as N, a as S, p as b } from "./prepareMarkdown-D-bFl1_V.js";
+import { a as C, b as T, c as z, s as H, e as O } from "./plugins-StkCS2su.js";
+import { d as W } from "./plugins-StkCS2su.js";
+import { createHash as R } from "node:crypto";
+async function A(a = {}, r, s = { warnedLanguages: /* @__PURE__ */ new Set() }) {
+  const n = y(a), e = x(), t = r ?? "", o = C(n.plugins, { source: t, mode: "mdx" }), l = T(o), d = { ...n, plugins: o }, g = L(t, l), m = [
+    .../* @__PURE__ */ new Set([...g.codeLanguages, ...z(o)])
+  ], c = {
+    highlightedCode: m.length > 0,
+    codeLanguages: m
+  };
+  o.forEach((w) => e.markPluginAssets(w));
+  const p = c.highlightedCode ? await N(
+    c.codeLanguages,
     d,
-    t.warnedLanguages,
+    s.warnedLanguages,
     l
-  ) : void 0, c = N("mdx", e, d, u, m);
+  ) : void 0, u = S("mdx", e, d, c, p);
   return {
-    remarkPlugins: c.remarkPlugins,
-    rehypePlugins: c.rehypePlugins,
-    remarkRehypeOptions: { handlers: c.handlers },
+    remarkPlugins: u.remarkPlugins,
+    rehypePlugins: u.rehypePlugins,
+    remarkRehypeOptions: { handlers: u.handlers },
     getAssets: () => e.snapshot()
   };
 }
-function R(a, r) {
-  const { plugins: t, ...n } = r ?? {}, e = C({ ...n, plugins: T(t) });
+function F(a, r) {
+  const { plugins: s, ...n } = r ?? {}, e = H({ ...n, plugins: O(s) });
   if (e !== void 0)
-    return z("sha256").update(a).update("\0").update(e).digest("hex");
+    return R("sha256").update(a).update("\0").update(e).digest("hex");
 }
-function A(a, r, t, n) {
-  for (a.delete(r), a.set(r, t); a.size > n; ) {
+function D(a, r, s, n) {
+  for (a.delete(r), a.set(r, s); a.size > n; ) {
     const e = a.keys().next().value;
     if (e === void 0) break;
     a.delete(e);
   }
-  return t;
+  return s;
 }
-function H(a, r, t, n) {
-  if (!r) return t();
+function J(a, r, s, n) {
+  if (!r) return s();
   const e = a.get(r);
   if (e)
     return a.delete(r), a.set(r, e), e;
-  const s = t().catch((o) => {
-    throw a.get(r) === s && a.delete(r), o;
+  const t = s().catch((o) => {
+    throw a.get(r) === t && a.delete(r), o;
   });
-  return A(a, r, s, n);
+  return D(a, r, t, n);
 }
-function F({
+function K({
   maxEntries: a = 64,
   warningState: r = /* @__PURE__ */ new Set()
 } = {}) {
-  const t = Number.isFinite(a) && a > 0 ? Math.floor(a) : 64, n = /* @__PURE__ */ new Map();
+  const s = Number.isFinite(a) && a > 0 ? Math.floor(a) : 64, n = /* @__PURE__ */ new Map();
   return {
-    prepare(e, s) {
-      return H(
+    prepare(e, t) {
+      return J(
         n,
-        R(e, s),
-        () => L(e, s, { warnedLanguages: r }),
-        t
+        F(e, t),
+        () => b(e, t, { warnedLanguages: r }),
+        s
       );
     },
     clear() {
@@ -65,16 +70,16 @@ function F({
     }
   };
 }
-function q(a = {}) {
-  const r = /* @__PURE__ */ new Set(), t = F({ ...a, warningState: r });
+function G(a = {}) {
+  const r = /* @__PURE__ */ new Set(), s = K({ ...a, warningState: r });
   return {
     async render(n, e = {}) {
-      const s = await t.prepare(n, e.markdown);
+      const t = await s.prepare(n, e.markdown);
       return {
         content: /* @__PURE__ */ i(
-          k,
+          P,
           {
-            document: s.document,
+            document: t.document,
             classNames: e.classNames,
             components: e.components,
             slots: e.slots,
@@ -84,27 +89,27 @@ function q(a = {}) {
             urlTransform: e.urlTransform
           }
         ),
-        assets: s.assets
+        assets: t.assets
       };
     },
     async renderMdx(n, e = {}) {
       if (e.markdown?.html && e.markdown.html !== "trusted")
         throw new Error("MDX executes trusted JSX and does not support sanitize or strip HTML policies");
-      const s = await O(e.markdown, n, {
+      const t = await A(e.markdown, n, {
         warnedLanguages: r
-      }), l = (await w(
+      }), l = (await h(
         {
-          value: P(n),
+          value: v(n),
           data: { canofoldLocale: e.markdown?.locale?.trim() || void 0 }
         },
         {
-          ...p,
-          remarkPlugins: s.remarkPlugins,
-          rehypePlugins: s.rehypePlugins,
-          remarkRehypeOptions: s.remarkRehypeOptions,
+          ...f,
+          remarkPlugins: t.remarkPlugins,
+          rehypePlugins: t.rehypePlugins,
+          remarkRehypeOptions: t.remarkRehypeOptions,
           baseUrl: e.baseUrl ?? import.meta.url
         }
-      )).default, d = f(
+      )).default, d = k(
         e.classNames,
         e.slots,
         e.components,
@@ -112,7 +117,7 @@ function q(a = {}) {
       );
       return {
         content: /* @__PURE__ */ i(
-          h,
+          M,
           {
             "data-cf-runtime": "static",
             as: e.as,
@@ -123,15 +128,15 @@ function q(a = {}) {
             children: /* @__PURE__ */ i(l, { components: d })
           }
         ),
-        assets: s.getAssets()
+        assets: t.getAssets()
       };
     },
     clear() {
-      t.clear();
+      s.clear();
     }
   };
 }
 export {
-  q as createMarkdownRenderer,
-  G as defineMarkdownPlugin
+  G as createMarkdownRenderer,
+  W as defineMarkdownPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canofold/markdown",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "An interactive, themeable Markdown renderer for knowledge and documentation sites.",
   "license": "MIT",
   "author": "Canofold Contributors",
@@ -90,7 +90,7 @@
     "@types/mdast": "^4.0.4",
     "@types/node": "^22.10.0",
     "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.5",
+    "@types/react-dom": "^19.2.7",
     "@types/unist": "^3.0.3",
     "mdast-util-directive": "^3.1.0",
     "mdast-util-to-hast": "^13.2.1",