@vizejs/nuxt 0.70.0 → 0.71.0

package/dist/index.mjs

@@ -4,6 +4,7 @@ import { addServerPlugin, addVitePlugin, createResolver, defineNuxtModule } from
 import vize from "@vizejs/vite-plugin";
 import { musea } from "@vizejs/vite-plugin-musea";
 import path from "node:path";
+import { createHash } from "node:crypto";
 //#region src/components.ts
 const COMPONENT_CALL_RE = /_?resolveComponent\s*\(\s*["'`]([^"'`]+)["'`]\s*(?:,\s*[^)]+)?\)/g;
 const COMPONENT_EXT_RE = /\.(?:[cm]?js|ts|vue)$/;
@@ -226,11 +227,18 @@ function getLocalAlias(specifier) {
 }
 function collectUsedI18nSpecifiers(code) {
 	const used = /* @__PURE__ */ new Set();
+	let firstUseIndex = Number.POSITIVE_INFINITY;
 	for (const match of code.matchAll(I18N_FN_RE)) {
 		const specifier = I18N_FN_MAP[`$${match[1]}`];
-		if (specifier) used.add(specifier);
+		if (specifier) {
+			used.add(specifier);
+			firstUseIndex = Math.min(firstUseIndex, match.index ?? firstUseIndex);
+		}
 	}
-	return Array.from(used);
+	return {
+		firstUseIndex,
+		specifiers: Array.from(used)
+	};
 }
 function collectDestructuredLocalNames(destructure) {
 	const locals = /* @__PURE__ */ new Set();
@@ -245,18 +253,20 @@ function collectDestructuredLocalNames(destructure) {
 	return locals;
 }
 function injectNuxtI18nHelpers(code) {
-	const usedSpecifiers = collectUsedI18nSpecifiers(code);
-	if (usedSpecifiers.length === 0) return code;
 	const setupMatch = code.match(SETUP_FN_RE);
 	if (!setupMatch || setupMatch.index === void 0) return code;
 	const setupBodyStart = setupMatch.index + setupMatch[0].length;
-	const existingMatch = code.slice(setupBodyStart).match(USE_I18N_DESTRUCTURE_RE);
+	const setupBody = code.slice(setupBodyStart);
+	const { firstUseIndex, specifiers: usedSpecifiers } = collectUsedI18nSpecifiers(setupBody);
+	if (usedSpecifiers.length === 0) return code;
+	const existingMatch = setupBody.match(USE_I18N_DESTRUCTURE_RE);
 	if (existingMatch && existingMatch.index !== void 0) {
 		const existingLocals = collectDestructuredLocalNames(existingMatch[1]);
 		const missingSpecifiers = usedSpecifiers.filter((specifier) => {
 			return !existingLocals.has(getLocalAlias(specifier));
 		});
 		if (missingSpecifiers.length === 0) return code;
+		if (existingMatch.index > firstUseIndex) return code.slice(0, setupBodyStart) + `\nconst { ${missingSpecifiers.join(", ")} } = useI18n();\n` + code.slice(setupBodyStart);
 		const merged = existingMatch[1].trim();
 		const nextDestructure = merged ? `${merged}, ${missingSpecifiers.join(", ")}` : missingSpecifiers.join(", ");
 		const matchStart = setupBodyStart + existingMatch.index;
@@ -288,6 +298,19 @@ function isVizeVirtualVueModuleId(id) {
 function normalizeVizeVirtualVueModuleId(id) {
 	return (id.startsWith("\0vize-ssr:") ? id.slice(10) : id.slice(1)).replace(/\.ts(?=\?|$)/, "");
 }
+const NUXT_INJECTED_MARKER = "/* nuxt-injected */";
+const NUXT_INJECTED_KEY_RE = /'\$[^']+'\s+\/\* nuxt-injected \*\//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);
+	let index = 0;
+	return code.replace(NUXT_INJECTED_KEY_RE, () => {
+		index += 1;
+		return `'$${buildStableNuxtKey(normalizedId, index)}' ${NUXT_INJECTED_MARKER}`;
+	});
+}
 //#endregion
 //#region src/index.ts
 /**
@@ -299,6 +322,31 @@ function normalizeVizeVirtualVueModuleId(id) {
 * - Linter: `vize lint` CLI command (via `vize` bin)
 * - Type Checker: `vize check` CLI command (via `vize` bin)
 */
+function normalizeNuxtKeyedTransformResult(id, result) {
+	if (!isVizeVirtualVueModuleId(id) || result == null) return result;
+	if (typeof result === "string") return normalizeNuxtInjectedKeysForVizeVirtualModule(result, id);
+	if (typeof result.code !== "string") return result;
+	const code = normalizeNuxtInjectedKeysForVizeVirtualModule(result.code, id);
+	return code === result.code ? result : {
+		...result,
+		code
+	};
+}
+function patchNuxtKeyedFunctionsPlugin(plugin) {
+	if (typeof plugin.transform === "function") {
+		const original = plugin.transform;
+		plugin.transform = async function(code, id, ...args) {
+			return normalizeNuxtKeyedTransformResult(id, await original.call(this, code, id, ...args));
+		};
+		return;
+	}
+	const transform = plugin.transform;
+	if (!transform || typeof transform.handler !== "function") return;
+	const original = transform.handler;
+	transform.handler = async function(code, id, ...args) {
+		return normalizeNuxtKeyedTransformResult(id, await original.call(this, code, id, ...args));
+	};
+}
 var src_default = defineNuxtModule({
 	meta: {
 		name: "@vizejs/nuxt",
@@ -325,7 +373,9 @@ var src_default = defineNuxtModule({
 			nuxt.hook("vite:configResolved", (config) => {
 				for (let i = config.plugins.length - 1; i >= 0; i--) {
 					const p = config.plugins[i];
-					if ((p && typeof p === "object" && "name" in p ? p.name : "") === "vite:vue") config.plugins.splice(i, 1);
+					const name = p && typeof p === "object" && "name" in p ? p.name : "";
+					if (name === "vite:vue") config.plugins.splice(i, 1);
+					else if (name === "nuxt:compiler:keyed-functions") patchNuxtKeyedFunctionsPlugin(p);
 				}
 			});
 		}
@@ -367,6 +417,11 @@ var src_default = defineNuxtModule({
 						changed = true;
 					}
 				} catch {}
+				const stableKeyResult = normalizeNuxtInjectedKeysForVizeVirtualModule(result, id);
+				if (stableKeyResult !== result) {
+					result = stableKeyResult;
+					changed = true;
+				}
 				if (changed) return {
 					code: result,
 					map: null

package/package.json

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