@vizejs/nuxt 0.166.0 → 0.168.0

package/dist/index.mjs

@@ -433,19 +433,94 @@ function isVizeGeneratedVueModuleId(id) {
 function normalizeVizeVirtualVueModuleId(id) {
 	return (id.startsWith("\0vize-ssr:") ? id.slice(10) : id.slice(1)).replace(/\.ts(?=\?|$)/, "");
 }
+function normalizeVizeGeneratedVueModuleId(id) {
+	if (isVizeVirtualVueModuleId(id)) return normalizeVizeVirtualVueModuleId(id);
+	return id.replace(/^\/@id\/__x00__/, "").replace(/^__x00__/, "").replace(/\.ts(?=\?|$)/, "");
+}
 const NUXT_INJECTED_MARKER = "/* nuxt-injected */";
 const NUXT_INJECTED_KEY_RE = /'\$[^']+'\s+\/\* nuxt-injected \*\//g;
+const NUXT_FETCH_COMPOSABLE_RE = /\b(?:useFetch|useLazyFetch)\s*\(/g;
 function buildStableNuxtKey(id, index) {
 	return createHash("sha256").update(id).update(":").update(String(index)).digest("base64url").slice(0, 10);
 }
-function normalizeNuxtInjectedKeysForVizeVirtualModule(code, id) {
-	const normalizedId = normalizeVizeVirtualVueModuleId(id);
+function normalizeNuxtInjectedKeysForVizeVirtualModule$1(code, id) {
+	const normalizedId = normalizeVizeGeneratedVueModuleId(id).replace(/\?.*$/, "");
 	let index = 0;
 	return code.replace(NUXT_INJECTED_KEY_RE, () => {
 		index += 1;
 		return `'$${buildStableNuxtKey(normalizedId, index)}' ${NUXT_INJECTED_MARKER}`;
 	});
 }
+function stabilizeNuxtInjectedKeysForVizeVirtualModule(code, id) {
+	return normalizeNuxtInjectedKeysForVizeVirtualModule$1(injectMissingNuxtFetchKeys(code), id);
+}
+function injectMissingNuxtFetchKeys(code) {
+	let output = "";
+	let cursor = 0;
+	for (const match of code.matchAll(NUXT_FETCH_COMPOSABLE_RE)) {
+		const openParenIndex = (match.index ?? 0) + match[0].length - 1;
+		if (openParenIndex < cursor) continue;
+		const closeParenIndex = findMatchingParen(code, openParenIndex);
+		if (closeParenIndex === -1) continue;
+		const args = code.slice(openParenIndex + 1, closeParenIndex);
+		if (args.includes(NUXT_INJECTED_MARKER)) continue;
+		output += code.slice(cursor, closeParenIndex);
+		output += `${args.trim().length === 0 ? "" : ", "}'$__vize_nuxt_key__' ${NUXT_INJECTED_MARKER}`;
+		cursor = closeParenIndex;
+	}
+	return cursor === 0 ? code : output + code.slice(cursor);
+}
+function findMatchingParen(code, openParenIndex) {
+	let depth = 0;
+	let quote = null;
+	let escaped = false;
+	let lineComment = false;
+	let blockComment = false;
+	for (let index = openParenIndex; index < code.length; index += 1) {
+		const char = code[index];
+		const next = code[index + 1];
+		if (lineComment) {
+			if (char === "\n" || char === "\r") lineComment = false;
+			continue;
+		}
+		if (blockComment) {
+			if (char === "*" && next === "/") {
+				blockComment = false;
+				index += 1;
+			}
+			continue;
+		}
+		if (quote) {
+			if (escaped) escaped = false;
+			else if (char === "\\") escaped = true;
+			else if (char === quote) quote = null;
+			continue;
+		}
+		if (char === "/" && next === "/") {
+			lineComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			blockComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "'" || char === "\"" || char === "`") {
+			quote = char;
+			continue;
+		}
+		if (char === "(") {
+			depth += 1;
+			continue;
+		}
+		if (char === ")") {
+			depth -= 1;
+			if (depth === 0) return index;
+		}
+	}
+	return -1;
+}
 const NAMED_IMPORT_RE = /^import\s*\{([\s\S]*?)\}\s*from\s*(['"])(vue|#imports|#entry)\2\s*;?/gm;
 function parseNamedImportSpecifiers(specifierSource) {
 	return specifierSource.split(",").map((specifier) => specifier.trim()).filter(Boolean).flatMap((specifier) => {
@@ -516,7 +591,7 @@ function preserveExplicitVueImportsFromNuxtAutoImports(originalCode, injectedCod
 }
 function preserveExplicitVueImportsFromVizeModuleSource(id, code) {
 	if (!isVizeVirtualVueModuleId(id) && !isVizeGeneratedVueModuleId(id)) return code;
-	const sourcePath = (isVizeVirtualVueModuleId(id) ? normalizeVizeVirtualVueModuleId(id) : id.replace(/^\/@id\/__x00__/, "").replace(/^__x00__/, "").replace(/\.ts(?=\?|$)/, "")).replace(/\?.*$/, "");
+	const sourcePath = normalizeVizeGeneratedVueModuleId(id).replace(/\?.*$/, "");
 	if (!sourcePath.endsWith(".vue") || !fs.existsSync(sourcePath)) return code;
 	return preserveExplicitVueImportsFromNuxtAutoImports(fs.readFileSync(sourcePath, "utf-8"), code);
 }
@@ -795,7 +870,7 @@ var src_default = defineNuxtModule({
 			name: "vizejs:nuxt-transform-bridge",
 			enforce: "post",
 			async transform(code, id, ...args) {
-				if (!isVizeVirtualVueModuleId(id)) return;
+				if (!isVizeGeneratedVueModuleId(id)) return;
 				let result = code;
 				let changed = false;
 				if (nuxtComponentResolver) {
@@ -830,7 +905,7 @@ var src_default = defineNuxtModule({
 					}
 				}
 				if (bridgeOptions.stableInjectedKeys) {
-					const stableKeyResult = normalizeNuxtInjectedKeysForVizeVirtualModule(result, id);
+					const stableKeyResult = stabilizeNuxtInjectedKeysForVizeVirtualModule(result, id);
 					if (stableKeyResult !== result) {
 						result = stableKeyResult;
 						changed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/nuxt",
-  "version": "0.166.0",
+  "version": "0.168.0",
   "description": "Nuxt module for Vize - compiler, musea gallery, linter, and type checker",
   "keywords": [
     "compiler",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@nuxt/kit": "4.4.6",
-    "@vizejs/musea-nuxt": "0.166.0",
-    "@vizejs/vite-plugin": "0.166.0",
-    "@vizejs/vite-plugin-musea": "0.166.0",
-    "vize": "0.166.0"
+    "@vizejs/musea-nuxt": "0.168.0",
+    "@vizejs/vite-plugin": "0.168.0",
+    "@vizejs/vite-plugin-musea": "0.168.0",
+    "vize": "0.168.0"
   },
   "devDependencies": {
     "typescript": "6.0.3",