@mralfarrakhan/svork 0.6.6 → 0.7.0-alpha

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { PreprocessorGroup } from "svelte/compiler";
+import { CompileArgs } from "@myriaddreamin/typst-ts-node-compiler";
 
 //#region node_modules/@types/unist/index.d.ts
 // ## Interfaces
@@ -3287,4 +3288,12 @@ type SvelteMarkdownOptions = {
 };
 declare const svelteMarkdown: (options?: SvelteMarkdownOptions) => PreprocessorGroup;
 //#endregion
-export { SvelteMarkdownOptions, svelteMarkdown };
+//#region src/typst.d.ts
+type SvelteTypstOptions = {
+  extensions?: string[];
+  rehypePlugins?: PluggableList;
+  compileArgs?: CompileArgs;
+};
+declare const svelteTypst: (options?: SvelteTypstOptions) => PreprocessorGroup;
+//#endregion
+export { SvelteMarkdownOptions, SvelteTypstOptions, svelteMarkdown, svelteTypst };

package/dist/index.mjs

@@ -7,6 +7,7 @@ import remarkRehype from "remark-rehype";
 import rehypeRaw from "rehype-raw";
 import rehypeStringify from "rehype-stringify";
 import yaml from "js-yaml";
+import { NodeCompiler } from "@myriaddreamin/typst-ts-node-compiler";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -2220,6 +2221,33 @@ function isUint8Array(value) {
 	return Boolean(value && typeof value === "object" && "byteLength" in value && "byteOffset" in value);
 }
 //#endregion
+//#region src/shared.ts
+const escapeSvelteTextBraces = (value) => value.replace(/\{/g, "{").replace(/\}/g, "}");
+const revertDoubleEscapedBraces = (html) => html.replace(/({|{)/g, "{").replace(/(}|})/g, "}");
+function escapeBracesPlugin() {
+	return (tree) => {
+		const SKIP = new Set(["script", "style"]);
+		const escapeProperties = (properties) => {
+			if (!properties) return;
+			for (const [key, value] of Object.entries(properties)) if (typeof value === "string") properties[key] = escapeSvelteTextBraces(value);
+			else if (Array.isArray(value)) properties[key] = value.map((item) => typeof item === "string" ? escapeSvelteTextBraces(item) : item);
+		};
+		const visit = (node, ancestors) => {
+			if (!node) return;
+			if (node.type === "element") escapeProperties(node.properties);
+			if (node.type === "text") {
+				if (!ancestors.some((a) => a?.type === "element" && typeof a.tagName === "string" && SKIP.has(a.tagName)) && typeof node.value === "string" && (node.value.includes("{") || node.value.includes("}"))) node.value = escapeSvelteTextBraces(node.value);
+			}
+			for (const key of Object.keys(node)) {
+				const child = node[key];
+				if (Array.isArray(child)) for (const c of child) visit(c, ancestors.concat(node));
+				else if (child && typeof child === "object" && child.type) visit(child, ancestors.concat(node));
+			}
+		};
+		visit(tree, []);
+	};
+}
+//#endregion
 //#region src/markdown.ts
 const genId = () => `SVELTE_${Math.random().toString(36).slice(2, 10)}_${Date.now().toString(36)}`;
 const escapeSvelteText = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\{/g, "&#123;").replace(/\}/g, "&#125;");
@@ -2310,30 +2338,6 @@ const maskMarkdownCodeForSvelteParse = (source) => {
 	}
 	return chars.join("");
 };
-const escapeSvelteTextBraces = (value) => value.replace(/\{/g, "&#123;").replace(/\}/g, "&#125;");
-function escapeBracesPlugin() {
-	return (tree) => {
-		const SKIP = new Set(["script", "style"]);
-		const escapeProperties = (properties) => {
-			if (!properties) return;
-			for (const [key, value] of Object.entries(properties)) if (typeof value === "string") properties[key] = escapeSvelteTextBraces(value);
-			else if (Array.isArray(value)) properties[key] = value.map((item) => typeof item === "string" ? escapeSvelteTextBraces(item) : item);
-		};
-		const visit = (node, ancestors) => {
-			if (!node) return;
-			if (node.type === "element") escapeProperties(node.properties);
-			if (node.type === "text") {
-				if (!ancestors.some((a) => a?.type === "element" && typeof a.tagName === "string" && SKIP.has(a.tagName)) && typeof node.value === "string" && (node.value.includes("{") || node.value.includes("}"))) node.value = escapeSvelteTextBraces(node.value);
-			}
-			for (const key of Object.keys(node)) {
-				const child = node[key];
-				if (Array.isArray(child)) for (const c of child) visit(c, ancestors.concat(node));
-				else if (child && typeof child === "object" && child.type) visit(child, ancestors.concat(node));
-			}
-		};
-		visit(tree, []);
-	};
-}
 const svelteMarkdown = (options) => {
 	const hasWantedExt = (s) => (options?.extensions ?? [".md"]).some((e) => s.endsWith(e.trim()));
 	const FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/;
@@ -2355,9 +2359,7 @@ const svelteMarkdown = (options) => {
 			}
 			const finalize = async (markdownSource, placeholderMap = /* @__PURE__ */ new Map()) => {
 				const vfile = await mdCompiler.process(markdownSource);
-				let compiled = String(vfile);
-				compiled = compiled.replace(/(&amp;#123;|&#x26;#123;)/g, "&#123;").replace(/(&amp;#125;|&#x26;#125;)/g, "&#125;");
-				let restored = compiled;
+				let restored = revertDoubleEscapedBraces(String(vfile));
 				if (vfile.data?.fm && typeof vfile.data.fm === "object") metadata = {
 					...metadata,
 					...vfile.data.fm
@@ -2505,4 +2507,52 @@ const svelteMarkdown = (options) => {
 	};
 };
 //#endregion
-export { svelteMarkdown };
+//#region src/typst.ts
+const svelteTypst = (options) => {
+	let compiler = null;
+	const getCompiler = () => {
+		if (!compiler) compiler = NodeCompiler.create(options?.compileArgs ?? {});
+		return compiler;
+	};
+	const hasWantedExt = (s) => (options?.extensions ?? [".typ"]).some((e) => s.endsWith(e.trim()));
+	const rehypeProcessor = unified().use(options?.rehypePlugins ?? []).use(escapeBracesPlugin).use(rehypeStringify, { allowDangerousHtml: true });
+	return {
+		name: "svelteTypst",
+		markup: async ({ content, filename }) => {
+			if (!filename || !hasWantedExt(filename)) return;
+			const c = getCompiler();
+			const compiled = c.compileHtml({ mainFileContent: content });
+			if (compiled.hasError()) {
+				compiled.printErrors();
+				throw new Error(`[svelteTypst] Compilation failed for ${filename}`);
+			}
+			const doc = compiled.result;
+			let metadata = {};
+			try {
+				const queryResult = c.query(doc, {
+					selector: "<frontmatter>",
+					field: "value"
+				});
+				if (Array.isArray(queryResult) && queryResult.length > 0) {
+					const value = queryResult[0];
+					if (value !== null && typeof value === "object" && !Array.isArray(value)) metadata = value;
+				}
+			} catch {}
+			const htmlExec = c.tryHtml(doc);
+			if (htmlExec.hasError()) {
+				htmlExec.printErrors();
+				throw new Error(`[svelteTypst] HTML rendering failed for ${filename}`);
+			}
+			const docHast = htmlExec.result.hast();
+			const bodyRoot = {
+				type: "root",
+				children: (docHast.children?.find((n) => n.tagName === "body"))?.children ?? docHast.children ?? []
+			};
+			const transformed = await rehypeProcessor.run(bodyRoot);
+			const html = revertDoubleEscapedBraces(rehypeProcessor.stringify(transformed));
+			return { code: `<script module lang="ts">${`\nexport const metadata = ${JSON.stringify(metadata)};\n`}<\/script>\n${html}` };
+		}
+	};
+};
+//#endregion
+export { svelteMarkdown, svelteTypst };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mralfarrakhan/svork",
   "type": "module",
-  "version": "0.6.6",
+  "version": "0.7.0-alpha",
   "description": "Svelte utilities for writing blog",
   "author": "mralfarrakhan <alfarrakhan@gmail.com",
   "license": "AGPL-3.0-or-later",
@@ -41,6 +41,7 @@
     "prepare": "bunx tsdown --dst"
   },
   "devDependencies": {
+    "@myriaddreamin/typst-ts-node-compiler": "^0.7.0-rc2",
     "@shikijs/rehype": "^4.1.0",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^25.9.1",
@@ -57,7 +58,13 @@
     "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "svelte": ">=5.0.0"
+    "svelte": ">=5.0.0",
+    "@myriaddreamin/typst-ts-node-compiler": ">=0.7.0"
+  },
+  "peerDependenciesMeta": {
+    "@myriaddreamin/typst-ts-node-compiler": {
+      "optional": true
+    }
   },
   "dependencies": {
     "js-yaml": "^4.1.1",