sommark 5.0.5 → 5.2.0

package/mappers/languages/xml.js

@@ -4,100 +4,115 @@ import { registerSharedOutputs } from "../shared/index.js";
 /**
  * Renders a standard XML tag based on the provided identifier and arguments.
  * Ensures strict attribute quoting and handles self-closing tags for empty bodies.
- * 
+ *
  * @param {string} id - The XML tag identifier (case-sensitive).
  * @param {Object} props - Key-value pairs to be rendered as XML attributes.
  * @param {string} content - The rendered inner content of the tag.
  * @returns {string} The fully rendered XML tag string.
  */
 const renderXmlTag = function (id, props, content, isSelfClosing) {
-    // XML is case-sensitive, so we use the exact id provided
-    const element = this.tag(id);
+	// XML is case-sensitive, so we use the exact id provided
+	const element = this.tag(id);
 
-    // Filter out positional indices (numeric keys) for XML attributes
-    const namedArgs = {};
-    Object.keys(props).forEach(key => {
-        if (isNaN(parseInt(key))) {
-            namedArgs[key] = props[key];
-        }
-    });
+	// Filter out positional indices (numeric keys) for XML attributes
+	const namedArgs = {};
+	Object.keys(props).forEach(key => {
+		if (isNaN(parseInt(key))) {
+			namedArgs[key] = props[key];
+		}
+	});
 
-    // In XML, attributes must always have values (strict = true)
-    element.attributes(namedArgs, true);
+	// In XML, attributes must always have values (strict = true)
+	element.attributes(namedArgs, true);
 
-    const hasBody = typeof content === "string" && content.trim().length > 0;
+	const hasBody = typeof content === "string" && content.trim().length > 0;
 
-    if (isSelfClosing || !hasBody) {
-        return element.selfClose();
-    }
+	if (isSelfClosing || !hasBody) {
+		return element.selfClose();
+	}
 
-    return element.body(content);
+	return element.body(content);
 };
 
 /**
  * The XML Mapper used for creating XML pages.
  */
 const XML = Mapper.define({
-    /**
-     * Renders a comment in XML format.
-     * @param {string} text - The comment content.
-     * @returns {string}
-     */
-    comment(text) {
-        return `<!-- ${text} -->`;
-    },
+	/**
+	 * Renders a comment in XML format.
+	 * @param {string} text - The comment content.
+	 * @returns {string}
+	 */
+	comment(text) {
+		return `<!-- ${text} -->`;
+	},
 
-    /**
-     * Resolves unknown tags by preserving their original case and applying XML rules.
-     * @param {Object} node - The AST node representing the unknown tag.
-     * @returns {Object} Renderer definition for the tag.
-     */
-    getUnknownTag(node) {
-        const id = node.id;
-        return {
-            render: ({ props, content, isSelfClosing }) => renderXmlTag.call(this, id, props, content, isSelfClosing),
-            options: {}
-        };
-    }
+	/**
+	 * Resolves unknown tags by preserving their original case and applying XML rules.
+	 * @param {Object} node - The AST node representing the unknown tag.
+	 * @returns {Object} Renderer definition for the tag.
+	 */
+	getUnknownTag(node) {
+		const id = node.id;
+		return {
+			render: ({ props, content, isSelfClosing }) => renderXmlTag.call(this, id, props, content, isSelfClosing),
+			options: {}
+		};
+	},
+	options: {
+		trimAndWrapBlocks: true
+	}
 });
 
 /**
  * Registers the XML declaration as a self-closing block.
  * Usage: [xml = version: "1.0", encoding: "UTF-8"]
  */
-XML.register("xml", ({ props }) => {
-    const version = props.version || "1.0";
-    const encoding = props.encoding || "UTF-8";
-    return `<?xml version="${version}" encoding="${encoding}"?>`;
-}, { rules: { is_empty_body: true } });
+XML.register(
+	"xml",
+	({ props }) => {
+		const version = props.version || "1.0";
+		const encoding = props.encoding || "UTF-8";
+		return `<?xml version="${version}" encoding="${encoding}"?>`;
+	},
+	{ rules: { is_empty_body: true } }
+);
 
 /**
  * Registers the DOCTYPE declaration.
  * Usage: [doctype = root: "note", system: "note.dtd"]
  */
-XML.register(["DOCTYPE", "doctype"], ({ props }) => {
-    const root = props.root || "root";
-    const system = props.system;
-    const pub = props.public || props.fpi;
+XML.register(
+	["DOCTYPE", "doctype"],
+	({ props }) => {
+		const root = props.root || "root";
+		const system = props.system;
+		const pub = props.public || props.fpi;
 
-    if (pub && system) {
-        return `<!DOCTYPE ${root} PUBLIC "${pub}" "${system}">`;
-    } else if (system) {
-        return `<!DOCTYPE ${root} SYSTEM "${system}">`;
-    }
-    return `<!DOCTYPE ${root}>`;
-}, { rules: { is_empty_body: true } });
+		if (pub && system) {
+			return `<!DOCTYPE ${root} PUBLIC "${pub}" "${system}">`;
+		} else if (system) {
+			return `<!DOCTYPE ${root} SYSTEM "${system}">`;
+		}
+		return `<!DOCTYPE ${root}>`;
+	},
+	{ rules: { is_empty_body: true } }
+);
 
 /**
  * Registers the XML stylesheet processing instruction.
  * Usage: [xml-stylesheet = href: "style.xsl"]
  */
-XML.register("xml-stylesheet", ({ props }) => {
-    const type = props.type || "text/xsl";
-    const href = props.href;
-    if (!href) return "";
-    return `<?xml-stylesheet type="${type}" href="${href}"?>`;
-}, { rules: { is_empty_body: true } });
+XML.register(
+	"xml-stylesheet",
+	({ props }) => {
+		const type = props.type || "text/xsl";
+		const href = props.href;
+		if (!href) return "";
+		return `<?xml-stylesheet type="${type}" href="${href}"?>`;
+	},
+	{ rules: { is_empty_body: true } }
+);
 
 /**
  * Registers CDATA sections.
@@ -105,8 +120,8 @@ XML.register("xml-stylesheet", ({ props }) => {
  * Self-closing: [cdata = "raw content" !] or [cdata = text: "raw content" !]
  */
 XML.register("cdata", ({ props, content, isSelfClosing }) => {
-    const text = isSelfClosing ? (props[0] ?? props.text ?? "") : content;
-    return `<![CDATA[${text}]]>`;
+	const text = isSelfClosing ? (props[0] ?? props.text ?? "") : content;
+	return `<![CDATA[${text}]]>`;
 });
 
 registerSharedOutputs(XML);

package/mappers/shared/index.js

@@ -1,8 +1,17 @@
 /**
  * Registers universal utility blocks shared across all SomMark mappers.
- * These blocks are considered "Format Agnostic."
  *
  * @param {Mapper} mapper - The mapper instance to register tags on.
  */
 export function registerSharedOutputs(mapper) {
+	mapper.register(
+		["raw", "Raw"],
+		({ content }) => {
+			return content;
+		},
+    {
+      escape: false, rules: {
+      required_directives: ["raw"]
+		} }
+	);
 }

package/package.json

@@ -1,12 +1,16 @@
 {
 	"name": "sommark",
-	"version": "5.0.5",
+	"version": "5.2.0",
 	"description": "SomMark is a template language that compiles to multiple output formats — HTML, JSON, YAML, TOML, CSV, Markdown, XML, and more.",
 	"main": "index.js",
 	"files": [
 		"index.js",
 		"index.browser.js",
 		"index.shared.js",
+		"async-hooks.js",
+		"vite.js",
+		"rollup.js",
+		"esbuild.js",
 		"core/",
 		"mappers/",
 		"helpers/",
@@ -25,18 +29,22 @@
 	"type": "module",
 	"exports": {
 		".": "./index.js",
-		"./browser": "./index.browser.js"
+		"./browser": "./index.browser.js",
+		"./vite": "./vite.js",
+		"./rollup": "./rollup.js",
+		"./esbuild": "./esbuild.js"
 	},
 	"scripts": {
 		"test": "vitest",
 		"test:run": "vitest run --pool=forks --maxWorkers=1",
 		"test:watch": "vitest watch",
 		"test:html": "vitest run tests/html",
+		"build:pathe": "node scripts/build-pathe.js",
 		"build:browser": "rollup -c rollup.browser.config.js",
 		"build:lite": "rollup -c rollup.browser.lite.config.js",
 		"build:lexer": "rollup -c rollup.browser.lexer.config.js",
 		"build:parser": "rollup -c rollup.browser.parser.config.js",
-		"build:all": "npm run build:browser && npm run build:lite && npm run build:lexer && npm run build:parser",
+		"build:all": "npm run build:pathe && npm run build:browser && npm run build:lite && npm run build:lexer && npm run build:parser",
 		"prepublishOnly": "npm run build:all"
 	},
 	"bin": {

package/rollup.js

@@ -0,0 +1,79 @@
+import { readFileSync, existsSync } from "node:fs";
+import nodePath from "node:path";
+
+/**
+ * Rollup plugin for SomMark.
+ *
+ * Fixes two issues:
+ * 1. Prevents Rollup from tree-shaking QuickJS modules (they have side effects
+ *    that Rollup incorrectly marks as removable).
+ * 2. Handles QuickJS WASM assets referenced via new URL("*.wasm", import.meta.url).
+ *    Rollup does not copy or rewrite these automatically, so this plugin emits
+ *    them as assets and rewrites the URLs to point to the output paths.
+ *
+ * @example
+ * // rollup.config.js
+ * import { sommarkRollup } from "sommark/rollup";
+ * export default { plugins: [sommarkRollup(), commonjs(), nodeResolve({ browser: true })] };
+ */
+export function sommarkRollup() {
+  let emitted = new Map();
+
+  return {
+    name: "sommark",
+
+    options(opts) {
+      const prev = opts.treeshake;
+      return {
+        ...opts,
+        treeshake: {
+          ...(prev && typeof prev === "object" ? prev : {}),
+          moduleSideEffects(id, external) {
+            // quickjs-emscripten uses side-effectful env/importObject setup that
+            // tree-shaking removes incorrectly without this guard
+            if (id.includes("quickjs") || id.includes("@jitl/")) return true;
+            const fn = prev?.moduleSideEffects;
+            return typeof fn === "function" ? fn(id, external) : (fn ?? true);
+          },
+        },
+      };
+    },
+
+    buildStart() {
+      emitted = new Map();
+    },
+
+    transform(code, id) {
+      if (!code.includes(".wasm")) return null;
+
+      const dir = nodePath.dirname(id);
+      let changed = false;
+      let result = code;
+
+      const pattern = /new URL\(['"]([^'"]+\.wasm)['"]\s*,\s*import\.meta\.url\)/g;
+      let match;
+      while ((match = pattern.exec(code)) !== null) {
+        const [full, wasmFile] = match;
+        const wasmPath = nodePath.resolve(dir, wasmFile);
+        if (!existsSync(wasmPath)) continue;
+
+        let refId;
+        if (emitted.has(wasmPath)) {
+          refId = emitted.get(wasmPath);
+        } else {
+          const source = readFileSync(wasmPath);
+          refId = this.emitFile({ type: "asset", name: nodePath.basename(wasmPath), source });
+          emitted.set(wasmPath, refId);
+        }
+
+        result = result.replace(
+          full,
+          `new URL(import.meta.ROLLUP_FILE_URL_${refId}, import.meta.url)`
+        );
+        changed = true;
+      }
+
+      return changed ? { code: result, map: null } : null;
+    },
+  };
+}

package/vite.js

@@ -0,0 +1,20 @@
+/**
+ * Vite plugin for SomMark.
+ *
+ * @example
+ * // vite.config.js
+ * import { sommarkVite } from "sommark/vite";
+ * export default defineConfig({ plugins: [sommarkVite()] });
+ */
+export function sommarkVite() {
+  return {
+    name: "sommark",
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: ["quickjs-emscripten"],
+        },
+      };
+    },
+  };
+}