@jxsuite/parser 0.28.2 → 0.28.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/parser",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "description": "Jx markdown parser and external class integration",
   "license": "MIT",
   "repository": {
@@ -39,7 +39,7 @@
     "upgrade": "bunx npm-check-updates -u && bun install"
   },
   "dependencies": {
-    "@jxsuite/schema": "^0.28.2",
+    "@jxsuite/schema": "^0.28.3",
     "glob": "^13.0.6",
     "hast-util-from-html": "^2.0.3",
     "hast-util-whitespace": "^3.0.0",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.10.2",
-    "@jxsuite/runtime": "^0.28.2",
+    "@jxsuite/runtime": "^0.28.3",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4"
   }

package/src/content.ts

@@ -50,28 +50,39 @@ export function evaluateFilterRule(
 ) {
   const actual = rule.field === "id" ? entry.id : entry.data[rule.field];
   switch (rule.op) {
-    case "==":
+    case "==": {
       return actual === rule.value;
-    case "!=":
+    }
+    case "!=": {
       return actual !== rule.value;
-    case "empty":
+    }
+    case "empty": {
       return actual == null || actual === "" || (Array.isArray(actual) && actual.length === 0);
-    case "not empty":
+    }
+    case "not empty": {
       return actual != null && actual !== "" && !(Array.isArray(actual) && actual.length === 0);
-    case "contains":
+    }
+    case "contains": {
       return typeof actual === "string" && actual.includes(String(rule.value ?? ""));
-    case "not contains":
+    }
+    case "not contains": {
       return typeof actual === "string" && !actual.includes(String(rule.value ?? ""));
-    case ">":
+    }
+    case ">": {
       return Number(actual) > Number(rule.value);
-    case "<":
+    }
+    case "<": {
       return Number(actual) < Number(rule.value);
-    case ">=":
+    }
+    case ">=": {
       return Number(actual) >= Number(rule.value);
-    case "<=":
+    }
+    case "<=": {
       return Number(actual) <= Number(rule.value);
-    default:
+    }
+    default: {
       return true;
+    }
   }
 }
 
@@ -89,8 +100,8 @@ export function evaluateFilterRule(
 export function queryContentType(
   entries: ContentLoaderEntry[],
   query: {
-    filter?: Record<string, unknown> | Array<{ field: string; op: string; value?: unknown }>;
-    sort?: { field: string; order?: string } | Array<{ field: string; order?: string }>;
+    filter?: Record<string, unknown> | { field: string; op: string; value?: unknown }[];
+    sort?: { field: string; order?: string } | { field: string; order?: string }[];
     limit?: number;
   } = {},
 ) {
@@ -120,8 +131,12 @@ export function queryContentType(
       for (const { field, order = "asc" } of sortRules) {
         const aVal = field === "id" ? a.id : ((a.data[field] ?? "") as string | number);
         const bVal = field === "id" ? b.id : ((b.data[field] ?? "") as string | number);
-        if (aVal < bVal) return order === "asc" ? -1 : 1;
-        if (aVal > bVal) return order === "asc" ? 1 : -1;
+        if (aVal < bVal) {
+          return order === "asc" ? -1 : 1;
+        }
+        if (aVal > bVal) {
+          return order === "asc" ? 1 : -1;
+        }
       }
       return 0;
     });
@@ -158,15 +173,17 @@ export class ContentCollection {
   resolve() {
     const { contentType, filter, sort, limit, _project } = this.config;
     const entries = _project?.contentTypes?.get(contentType ?? "");
-    if (!entries) return [];
+    if (!entries) {
+      return [];
+    }
     return queryContentType(entries, {
       ...(filter != null && {
         filter: filter as
           | Record<string, unknown>
-          | Array<{ field: string; op: string; value?: unknown }>,
+          | { field: string; op: string; value?: unknown }[],
       }),
       ...(sort != null && {
-        sort: sort as { field: string; order?: string } | Array<{ field: string; order?: string }>,
+        sort: sort as { field: string; order?: string } | { field: string; order?: string }[],
       }),
       ...(limit != null && { limit }),
     });
@@ -183,7 +200,9 @@ export class ContentEntry {
   resolve() {
     const { contentType, id, field, _project, _document } = this.config;
     const entries = _project?.contentTypes?.get(contentType ?? "");
-    if (!entries) return null;
+    if (!entries) {
+      return null;
+    }
 
     let resolvedId = id;
     if (
@@ -194,7 +213,9 @@ export class ContentEntry {
       const paramName = (resolvedId as { $ref: string }).$ref.replace("#/$params/", "");
       resolvedId = _document?.route?._pathParams?.[paramName];
     }
-    if (!resolvedId) return null;
+    if (!resolvedId) {
+      return null;
+    }
 
     if (field && field !== "id") {
       return entries.find((e: ContentLoaderEntry) => e.data[field] === resolvedId) ?? null;

package/src/csv.ts

@@ -32,21 +32,27 @@ export function parseCSV(csv: string): Record<string, string>[] {
       current += ch;
       if (inQuotes && csv[i + 1] === '"') {
         current += csv[i + 1];
-        i++;
+        i += 1;
       } else {
         inQuotes = !inQuotes;
       }
     } else if ((ch === "\n" || (ch === "\r" && csv[i + 1] === "\n")) && !inQuotes) {
       lines.push(current);
       current = "";
-      if (ch === "\r") i++;
+      if (ch === "\r") {
+        i += 1;
+      }
     } else {
       current += ch;
     }
   }
-  if (current.trim()) lines.push(current);
+  if (current.trim()) {
+    lines.push(current);
+  }
 
-  if (lines.length === 0) return [];
+  if (lines.length === 0) {
+    return [];
+  }
 
   const parseRow = (line: string) => {
     const fields: string[] = [];
@@ -57,7 +63,7 @@ export function parseCSV(csv: string): Record<string, string>[] {
       if (ch === '"') {
         if (q && line[i + 1] === '"') {
           field += '"';
-          i++;
+          i += 1;
         } else {
           q = !q;
         }
@@ -107,15 +113,17 @@ export function coerceCSVRows(
     const data: Record<string, unknown> = { ...row };
     if (schema?.properties) {
       for (const [key, def] of Object.entries(schema.properties)) {
-        if (!(key in data)) continue;
+        if (!(key in data)) {
+          continue;
+        }
         if (def.type === "number") {
           const raw = String(data[key] ?? "").trim();
           if (raw === "") {
             data[key] = null;
           } else {
-            const cleaned = raw.replace(/[$€£¥,\s]/g, "");
+            const cleaned = raw.replaceAll(/[$€£¥,\s]/g, "");
             const n = Number(cleaned);
-            data[key] = isNaN(n) ? null : n;
+            data[key] = Number.isNaN(n) ? null : n;
           }
         } else if (def.type === "boolean") {
           data[key] = data[key] === "true";
@@ -138,7 +146,7 @@ export function coerceCSVRows(
       (data.slug as string | undefined) ??
       (data.Slug as string | undefined) ??
       String(i);
-    return { id, data, body: null };
+    return { body: null, data, id };
   });
 }
 
@@ -193,7 +201,7 @@ export class Csv {
       return Csv.parse(await response.text(), options);
     }
     const { readFileSync } = await import("node:fs");
-    return Csv.parse(readFileSync(path, "utf-8"), options);
+    return Csv.parse(readFileSync(path, "utf8"), options);
   }
 
   /** Runtime on-demand access: load the configured source. */

package/src/html-to-jx.ts

@@ -24,7 +24,9 @@ function convertHastChildren(children: HastNode[]) {
   const result: (JxElement | string)[] = [];
   for (const child of children) {
     const converted = convertHastNode(child);
-    if (converted != null) result.push(converted);
+    if (converted != null) {
+      result.push(converted);
+    }
   }
   return result;
 }
@@ -35,7 +37,9 @@ function convertHastChildren(children: HastNode[]) {
  */
 function convertHastNode(node: HastNode) {
   if (node.type === "text") {
-    if (whitespace(node as unknown as HastNode)) return null;
+    if (whitespace(node as unknown as HastNode)) {
+      return null;
+    }
     return node.value ?? null;
   }
 
@@ -44,14 +48,18 @@ function convertHastNode(node: HastNode) {
 
     if (node.properties && Object.keys(node.properties).length > 0) {
       const { style, attrs } = hastPropsToJx(node.properties);
-      if (Object.keys(attrs).length > 0) el.attributes = attrs;
-      if (Object.keys(style).length > 0) el.style = style;
+      if (Object.keys(attrs).length > 0) {
+        el.attributes = attrs;
+      }
+      if (Object.keys(style).length > 0) {
+        el.style = style;
+      }
     }
 
     const kids = node.children ? convertHastChildren(node.children) : [];
 
     if (kids.length === 1 && typeof kids[0] === "string") {
-      el.textContent = kids[0];
+      [el.textContent] = kids;
     } else if (kids.length > 0) {
       el.children = kids as JxElement[];
     }
@@ -71,7 +79,9 @@ function hastPropsToJx(properties: Record<string, unknown>) {
   const style: Record<string, string> = {};
 
   for (const [key, value] of Object.entries(properties)) {
-    if (value === false || value === undefined || value === null) continue;
+    if (value === false || value === undefined || value === null) {
+      continue;
+    }
 
     const info = find(htmlInfo, key);
     const name = info.attribute;
@@ -89,7 +99,7 @@ function hastPropsToJx(properties: Record<string, unknown>) {
       attrs[name] = String(value);
     }
   }
-  return { style, attrs };
+  return { attrs, style };
 }
 
 /**
@@ -99,9 +109,13 @@ function hastPropsToJx(properties: Record<string, unknown>) {
 function parseInlineStyle(styleStr: string, out: Record<string, string>) {
   for (const decl of styleStr.split(";")) {
     const colon = decl.indexOf(":");
-    if (colon === -1) continue;
+    if (colon === -1) {
+      continue;
+    }
     const prop = decl.slice(0, colon).trim();
     const val = decl.slice(colon + 1).trim();
-    if (prop && val) out[prop] = val;
+    if (prop && val) {
+      out[prop] = val;
+    }
   }
 }

package/src/markdown.ts

@@ -16,7 +16,8 @@
  */
 
 import { transpileJxMarkdown } from "./transpile.ts";
-import { serializeJxMarkdown, type SerializeOptions } from "./serialize.ts";
+import { serializeJxMarkdown } from "./serialize.ts";
+import type { SerializeOptions } from "./serialize.ts";
 import type { JxDocument } from "@jxsuite/schema/types";
 import type { ContentLoaderEntry, MarkdownFileResult } from "./types.ts";
 
@@ -76,7 +77,7 @@ export class Markdown {
   ): Promise<ContentLoaderEntry[]> {
     const { processMarkdown } = await import("./md.ts");
     const { readFileSync } = await import("node:fs");
-    const source = readFileSync(path, "utf-8");
+    const source = readFileSync(path, "utf8");
     const result = processMarkdown(source, path, {
       ...(options.directives !== undefined && { directives: options.directives }),
       ...(options.directiveOptions !== undefined && {
@@ -84,17 +85,25 @@ export class Markdown {
       }),
     });
     const _meta: ContentLoaderEntry["_meta"] = {};
-    if (result.$excerpt != null) _meta.excerpt = result.$excerpt;
-    if (result.$toc != null) _meta.toc = result.$toc;
-    if (result.$readingTime != null) _meta.readingTime = result.$readingTime;
-    if (result.$wordCount != null) _meta.wordCount = result.$wordCount;
+    if (result.$excerpt != null) {
+      _meta.excerpt = result.$excerpt;
+    }
+    if (result.$toc != null) {
+      _meta.toc = result.$toc;
+    }
+    if (result.$readingTime != null) {
+      _meta.readingTime = result.$readingTime;
+    }
+    if (result.$wordCount != null) {
+      _meta.wordCount = result.$wordCount;
+    }
     return [
       {
-        id: result.slug,
-        data: result.frontmatter,
-        body: source,
         $children: result.$children,
         _meta,
+        body: source,
+        data: result.frontmatter,
+        id: result.slug,
       },
     ];
   }
@@ -106,7 +115,7 @@ export class Markdown {
     const { resolve } = await import("node:path");
     const { src, basePath, ...processorConfig } = this.config;
     const filePath = basePath ? resolve(basePath, src) : resolve(src);
-    const source = readFileSync(filePath, "utf-8");
+    const source = readFileSync(filePath, "utf8");
     return processMarkdown(source, filePath, processorConfig);
   }
 }

package/src/md.ts

@@ -1,5 +1,5 @@
 /**
- * jxsuite/md — Markdown integration for Jx
+ * Jxsuite/md — Markdown integration for Jx
  *
  * Provides two exports:
  *   - MarkdownFile       — Parse a single markdown file (external class for $prototype)
@@ -21,7 +21,7 @@ import { readFileSync } from "node:fs";
 import { basename, extname, resolve as resolvePath } from "node:path";
 import { globSync } from "glob";
 import { mdastNodeToJx } from "./transpile.ts";
-import type { MarkdownFileResult, TocEntry, MdastNode } from "./types.ts";
+import type { MarkdownFileResult, MdastNode, TocEntry } from "./types.ts";
 import type { JxElement } from "@jxsuite/schema/types";
 
 // ─── Tree utilities (inline to avoid Bun ESM resolution issues with unist-util-*) ──
@@ -42,10 +42,16 @@ function visit(
   const visitor = type ? maybeVisitor : typeOrVisitor;
 
   function walk(node: MdastNode) {
-    if (!node || typeof node !== "object") return;
-    if (!type || node.type === type) (visitor as Function)(node);
+    if (!node || typeof node !== "object") {
+      return;
+    }
+    if (!type || node.type === type) {
+      (visitor as (node: MdastNode) => void)(node);
+    }
     if (Array.isArray(node.children)) {
-      for (const child of node.children) walk(child);
+      for (const child of node.children) {
+        walk(child);
+      }
     }
   }
   walk(tree as MdastNode);
@@ -58,10 +64,18 @@ function visit(
  * @returns {string}
  */
 function mdastToString(node: MdastNode): string {
-  if (!node) return "";
-  if (typeof node === "string") return node;
-  if (node.value) return node.value;
-  if (Array.isArray(node.children)) return node.children.map(mdastToString).join("");
+  if (!node) {
+    return "";
+  }
+  if (typeof node === "string") {
+    return node;
+  }
+  if (node.value) {
+    return node.value;
+  }
+  if (Array.isArray(node.children)) {
+    return node.children.map(mdastToString).join("");
+  }
   return "";
 }
 
@@ -91,11 +105,11 @@ function extractToc(tree: MdastNode) {
     const text = mdastToString(node);
     const id = text
       .toLowerCase()
-      .replace(/[^\w\s-]/g, "")
-      .replace(/\s+/g, "-")
-      .replace(/-+/g, "-")
-      .replace(/^-|-$/g, "");
-    entries.push({ depth: node.depth as number, text, id });
+      .replaceAll(/[^\w\s-]/g, "")
+      .replaceAll(/\s+/g, "-")
+      .replaceAll(/-+/g, "-")
+      .replaceAll(/^-|-$/g, "");
+    entries.push({ depth: node.depth as number, id, text });
   });
   return entries;
 }
@@ -109,9 +123,13 @@ function extractToc(tree: MdastNode) {
 function extractExcerpt(tree: MdastNode) {
   let firstParagraph: MdastNode | null = null;
   visit(tree, "paragraph", (node: MdastNode) => {
-    if (!firstParagraph) firstParagraph = node;
+    if (!firstParagraph) {
+      firstParagraph = node;
+    }
   });
-  if (!firstParagraph) return "";
+  if (!firstParagraph) {
+    return "";
+  }
   return mdastToString(firstParagraph);
 }
 
@@ -147,7 +165,6 @@ export function processMarkdown(
 
   const tree = processor.parse(source);
   const vfile = { data: {} };
-  // @ts-ignore - vfile shape satisfies unified's internal contract
   processor.runSync(tree, vfile);
 
   const vfileData = vfile.data as Record<string, unknown>;
@@ -161,19 +178,20 @@ export function processMarkdown(
   const bodyNodes = tree.children.filter(
     (n: MdastNode) => n.type !== "yaml" && n.type !== "toml",
   ) as MdastNode[];
-  const $children = bodyNodes
-    .map(/** @type {(n: MdastNode) => any} */ mdastNodeToJx)
-    .filter(Boolean) as (JxElement | string)[];
+  const $children = bodyNodes.map((n: MdastNode) => mdastNodeToJx(n)).filter(Boolean) as (
+    | JxElement
+    | string
+  )[];
 
   return {
-    slug,
-    path: filePath,
-    frontmatter,
     $children,
     $excerpt: excerpt,
-    $toc: toc,
     $readingTime: readingTime(plainText),
+    $toc: toc,
     $wordCount: plainText.split(/\s+/).filter(Boolean).length,
+    frontmatter,
+    path: filePath,
+    slug,
   };
 }
 
@@ -185,12 +203,11 @@ export function processMarkdown(
  * @returns {unknown}
  */
 function getNestedValue(obj: Record<string, unknown> | MarkdownFileResult, path: string) {
-  return path
-    .split(".")
-    .reduce(
-      (o: unknown, k) => (o as Record<string, unknown> | undefined)?.[k],
-      /** @type {unknown} */ obj,
-    );
+  let current: unknown = obj;
+  for (const k of path.split(".")) {
+    current = (current as Record<string, unknown> | undefined)?.[k];
+  }
+  return current;
 }
 
 // ─── Markdown format class (re-exported from browser-safe module) ────────────
@@ -266,22 +283,28 @@ export class MarkdownCollection {
     const files = globSync(pattern, { absolute: true });
 
     const results = files.map((filePath: string) => {
-      const source = readFileSync(filePath, "utf-8");
+      const source = readFileSync(filePath, "utf8");
       return processMarkdown(source, filePath, processorConfig);
     });
 
     // Filter
     let filtered = results;
     if (typeof filter === "function") {
-      filtered = results.filter(/** @type {(r: MarkdownFileResult) => boolean} */ filter);
+      filtered = results.filter((r: MarkdownFileResult) =>
+        (filter as (r: MarkdownFileResult) => boolean)(r),
+      );
     }
 
     // Sort
     filtered.sort((a: MarkdownFileResult, b: MarkdownFileResult) => {
       const aVal = getNestedValue(a, sortBy) ?? ("" as string | number);
       const bVal = getNestedValue(b, sortBy) ?? ("" as string | number);
-      if (aVal < bVal) return sortOrder === "asc" ? -1 : 1;
-      if (aVal > bVal) return sortOrder === "asc" ? 1 : -1;
+      if (aVal < bVal) {
+        return sortOrder === "asc" ? -1 : 1;
+      }
+      if (aVal > bVal) {
+        return sortOrder === "asc" ? 1 : -1;
+      }
       return 0;
     });