@mralfarrakhan/svork 0.5.0 → 0.6.1

package/README.md

@@ -7,7 +7,7 @@ It is intended for blog/content pages where Markdown should stay ergonomic while
 ## Install
 
 ```sh
-bun add svork
+bun add -D @mralfarrakhan/svork
 ```
 
 Svork has a peer dependency on Svelte 5.
@@ -21,7 +21,7 @@ import { svelteMarkdown } from "svork";
 
 export default {
   preprocess: [svelteMarkdown()],
-  extensions: [".svelte", ".md"],
+  extensions: [".svx", ".md"],
 };
 ```
 

package/dist/index.mjs

@@ -2311,6 +2311,9 @@ const maskMarkdownCodeForSvelteParse = (source) => {
 	return chars.join("");
 };
 const escapeSvelteTextBraces = (value) => value.replace(/\{/g, "{").replace(/\}/g, "}");
+const escapeRawNodeBraces = (html) => {
+	return html.split(/(<(?:script|style)\b[\s\S]*?<\/(?:script|style)\s*>)/gi).map((part, i) => i % 2 === 1 ? part : escapeSvelteTextBraces(part)).join("");
+};
 function escapeBracesPlugin() {
 	return (tree) => {
 		const SKIP = new Set(["script", "style"]);
@@ -2322,6 +2325,10 @@ function escapeBracesPlugin() {
 		const visit = (node, ancestors) => {
 			if (!node) return;
 			if (node.type === "element") escapeProperties(node.properties);
+			if (node.type === "raw" && typeof node.value === "string") {
+				node.value = escapeRawNodeBraces(node.value);
+				return;
+			}
 			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);
 			}
@@ -2354,11 +2361,25 @@ const svelteMarkdown = (options) => {
 				workingString = workingString.slice(fmMatch[0].length);
 			}
 			const finalize = async (markdownSource, placeholderMap = /* @__PURE__ */ new Map()) => {
-				let compiled = String(await mdCompiler.process(markdownSource));
+				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;
+				if (vfile.data?.fm && typeof vfile.data.fm === "object") metadata = {
+					...metadata,
+					...vfile.data.fm
+				};
 				const metadataString = `\nexport const metadata = ${JSON.stringify(metadata)};\n`;
+				let hasModuleScript = false;
 				for (const [placeholder, info] of placeholderMap.entries()) {
+					if (info.type === "ModuleScript") {
+						const scriptTagMatch = info.original.match(/^<script[^>]*>/);
+						if (scriptTagMatch) {
+							const injectIndex = scriptTagMatch[0].length;
+							info.original = info.original.slice(0, injectIndex) + metadataString + info.original.slice(injectIndex);
+						}
+						hasModuleScript = true;
+					}
 					const escPlaceholder = escapeRegExp(placeholder);
 					const markerPattern = `<svork-placeholder\\s+data-svork-id=(["'])${escPlaceholder}\\1[^>]*>[\\s\\S]*?<\\/svork-placeholder>`;
 					const markerRegex = new RegExp(markerPattern, "g");
@@ -2395,7 +2416,7 @@ const svelteMarkdown = (options) => {
 					}
 					restored = restored.replace(new RegExp(placeholder, "g"), () => info.original);
 				}
-				restored = `<script module lang="ts">${metadataString}<\/script>\n` + restored;
+				if (!hasModuleScript) restored = `<script module lang="ts">${metadataString}<\/script>\n` + restored;
 				return restored;
 			};
 			let root;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mralfarrakhan/svork",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Svelte utilities for writing blog",
   "author": "mralfarrakhan <alfarrakhan@gmail.com",
   "license": "AGPL-3.0-or-later",
@@ -77,5 +77,8 @@
     "unist-util-stringify-position": "4.0.0",
     "vfile": "6.0.3",
     "vfile-message": "4.0.3"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }