@vizejs/nuxt 0.154.0 → 0.156.0

package/dist/index.mjs

@@ -304,6 +304,12 @@ function buildNuxtCompilerOptions(rootDir, baseURL = "/", buildAssetsDir = "/_nu
 function isVizeVirtualVueModuleId(id) {
 	return id.startsWith("\0") && /\.vue\.ts(?:\?|$)/.test(id);
 }
+function isVizeGeneratedVueModuleId(id) {
+	let normalized = id;
+	if (normalized.startsWith("/@id/__x00__")) normalized = normalized.slice(12);
+	else if (normalized.startsWith("__x00__")) normalized = normalized.slice(7);
+	return /\.vue\.ts(?:\?|$)/.test(normalized);
+}
 function normalizeVizeVirtualVueModuleId(id) {
 	return (id.startsWith("\0vize-ssr:") ? id.slice(10) : id.slice(1)).replace(/\.ts(?=\?|$)/, "");
 }
@@ -320,6 +326,80 @@ function normalizeNuxtInjectedKeysForVizeVirtualModule(code, id) {
 		return `'$${buildStableNuxtKey(normalizedId, index)}' ${NUXT_INJECTED_MARKER}`;
 	});
 }
+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) => {
+		const withoutType = specifier.replace(/^type\s+/, "").trim();
+		if (!withoutType) return [];
+		const match = withoutType.match(/^([A-Za-z_$][\w$]*)(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
+		if (!match) return [];
+		const imported = match[1];
+		return [{
+			imported,
+			local: match[2] ?? imported,
+			raw: withoutType
+		}];
+	});
+}
+function collectNamedImports(code) {
+	const imports = [];
+	for (const match of code.matchAll(NAMED_IMPORT_RE)) imports.push({
+		start: match.index ?? 0,
+		end: (match.index ?? 0) + match[0].length,
+		quote: match[2],
+		source: match[3],
+		specifiers: parseNamedImportSpecifiers(match[1] ?? "")
+	});
+	return imports;
+}
+function renderNamedImport(specifiers, source, quote) {
+	return `import { ${specifiers.map((specifier) => specifier.raw).join(", ")} } from ${quote}${source}${quote};`;
+}
+function preserveExplicitVueImportsFromNuxtAutoImports(originalCode, injectedCode) {
+	const originalVueSpecifiers = /* @__PURE__ */ new Map();
+	for (const statement of collectNamedImports(originalCode)) {
+		if (statement.source !== "vue") continue;
+		for (const specifier of statement.specifiers) originalVueSpecifiers.set(specifier.local, specifier);
+	}
+	if (originalVueSpecifiers.size === 0) return injectedCode;
+	const restoredSpecifiers = /* @__PURE__ */ new Map();
+	const replacements = [];
+	for (const statement of collectNamedImports(injectedCode)) {
+		if (statement.source !== "#imports" && statement.source !== "#entry") continue;
+		const keep = [];
+		let changed = false;
+		for (const specifier of statement.specifiers) {
+			const original = originalVueSpecifiers.get(specifier.local);
+			if (original) {
+				restoredSpecifiers.set(specifier.local, original);
+				changed = true;
+			} else keep.push(specifier);
+		}
+		if (!changed) continue;
+		replacements.push({
+			start: statement.start,
+			end: statement.end,
+			text: keep.length > 0 ? renderNamedImport(keep, statement.source, statement.quote) : ""
+		});
+	}
+	if (replacements.length === 0) return injectedCode;
+	let output = injectedCode;
+	for (const replacement of replacements.reverse()) output = output.slice(0, replacement.start) + replacement.text + output.slice(replacement.end);
+	const currentVueLocals = /* @__PURE__ */ new Set();
+	for (const statement of collectNamedImports(output)) {
+		if (statement.source !== "vue") continue;
+		for (const specifier of statement.specifiers) currentVueLocals.add(specifier.local);
+	}
+	const missing = [...restoredSpecifiers.values()].filter((specifier) => !currentVueLocals.has(specifier.local));
+	if (missing.length > 0) output = `${renderNamedImport(missing, "vue", "\"")}\n${output}`;
+	return output.replace(/\n{3,}/g, "\n\n");
+}
+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(/\?.*$/, "");
+	if (!sourcePath.endsWith(".vue") || !fs.existsSync(sourcePath)) return code;
+	return preserveExplicitVueImportsFromNuxtAutoImports(fs.readFileSync(sourcePath, "utf-8"), code);
+}
 //#endregion
 //#region src/options.ts
 const DEFAULT_NUXT_BRIDGE_OPTIONS = {
@@ -407,6 +487,15 @@ function appendOriginalVueSourceForUnoCss(code, normalizedId, options = {}) {
 * - Linter: `vize lint` CLI command (via `vize` bin)
 * - Type Checker: `vize check` CLI command (via `vize` bin)
 */
+const VIZE_NUXT_AUTO_IMPORT_PATCHED = "__vizeNuxtAutoImportPatched";
+const VUE_RUNTIME_DEDUPE = [
+	"vue",
+	"@vue/reactivity",
+	"@vue/runtime-core",
+	"@vue/runtime-dom",
+	"@vue/shared"
+];
+const VUE_CLIENT_RUNTIME_IMPORT = "vue/dist/vue.runtime.esm-bundler.js";
 function getDetectedNuxtMajor(nuxt) {
 	try {
 		const version = getNuxtVersion(nuxt);
@@ -435,6 +524,23 @@ function getNuxtBuildAssetsDir(nuxt) {
 function shouldUseVizeCompiler(compilerOptions) {
 	return compilerOptions !== false && (compilerOptions.vueVersion ?? 3) === 3;
 }
+function dedupeVueRuntimePackages(vite) {
+	vite.resolve ||= {};
+	const dedupe = new Set(vite.resolve.dedupe ?? []);
+	for (const packageName of VUE_RUNTIME_DEDUPE) dedupe.add(packageName);
+	vite.resolve.dedupe = [...dedupe];
+}
+function isViteSsrTransform(args) {
+	const options = args[0];
+	return typeof options === "object" && options !== null && "ssr" in options && options.ssr === true;
+}
+function rewriteBareVueImportsToClientRuntime(code) {
+	return code.replace(/(\bfrom\s*)(["'])vue\2/g, (_, prefix, quote) => {
+		return `${prefix}${quote}${VUE_CLIENT_RUNTIME_IMPORT}${quote}`;
+	}).replace(/(\bimport\s*)(["'])vue\2/g, (_, prefix, quote) => {
+		return `${prefix}${quote}${VUE_CLIENT_RUNTIME_IMPORT}${quote}`;
+	});
+}
 function normalizeNuxtKeyedTransformResult(id, result) {
 	if (!isVizeVirtualVueModuleId(id) || result == null) return result;
 	if (typeof result === "string") return normalizeNuxtInjectedKeysForVizeVirtualModule(result, id);
@@ -460,6 +566,39 @@ function patchNuxtKeyedFunctionsPlugin(plugin) {
 		return normalizeNuxtKeyedTransformResult(id, await original.call(this, code, id, ...args));
 	};
 }
+function normalizeNuxtAutoImportTransformResult(code, id, result, rewriteVueRuntimeImports) {
+	if (!isVizeGeneratedVueModuleId(id) || result == null) return result;
+	if (typeof result === "string") {
+		const restored = preserveExplicitVueImportsFromVizeModuleSource(id, preserveExplicitVueImportsFromNuxtAutoImports(code, result));
+		return rewriteVueRuntimeImports ? rewriteBareVueImportsToClientRuntime(restored) : restored;
+	}
+	if (typeof result.code !== "string") return result;
+	let normalized = preserveExplicitVueImportsFromVizeModuleSource(id, preserveExplicitVueImportsFromNuxtAutoImports(code, result.code));
+	if (rewriteVueRuntimeImports) normalized = rewriteBareVueImportsToClientRuntime(normalized);
+	return normalized === result.code ? result : {
+		...result,
+		code: normalized
+	};
+}
+function patchNuxtAutoImportTransformPlugin(plugin, isBuild) {
+	if (!plugin) return;
+	if (plugin[VIZE_NUXT_AUTO_IMPORT_PATCHED]) return;
+	if (typeof plugin.transform === "function") {
+		const original = plugin.transform;
+		plugin.transform = async function(code, id, ...args) {
+			return normalizeNuxtAutoImportTransformResult(code, id, await original.call(this, code, id, ...args), isBuild && !isViteSsrTransform(args));
+		};
+		plugin[VIZE_NUXT_AUTO_IMPORT_PATCHED] = true;
+		return;
+	}
+	const transform = plugin.transform;
+	if (!transform || typeof transform.handler !== "function") return;
+	const original = transform.handler;
+	transform.handler = async function(code, id, ...args) {
+		return normalizeNuxtAutoImportTransformResult(code, id, await original.call(this, code, id, ...args), isBuild && !isViteSsrTransform(args));
+	};
+	plugin[VIZE_NUXT_AUTO_IMPORT_PATCHED] = true;
+}
 var src_default = defineNuxtModule({
 	meta: {
 		name: "@vizejs/nuxt",
@@ -485,12 +624,20 @@ var src_default = defineNuxtModule({
 			supportsViteCompiler,
 			vueVersion
 		});
+		const usesVizeCompiler = shouldUseVizeCompiler(compilerOptions);
 		if (compilerOptions !== false) {
 			nuxt.options.vite ||= {};
 			nuxt.options.vite.plugins = nuxt.options.vite.plugins || [];
 			nuxt.options.vite.plugins.push(vize(compilerOptions));
 		}
-		const usesVizeCompiler = shouldUseVizeCompiler(compilerOptions);
+		let isNuxtBuild = false;
+		let isViteBuild = false;
+		if (usesVizeCompiler) nuxt.hook("build:before", () => {
+			if (nuxt.options.dev !== false) return;
+			isNuxtBuild = true;
+			nuxt.options.vite ||= {};
+			dedupeVueRuntimePackages(nuxt.options.vite);
+		});
 		if (usesVizeCompiler) {
 			if (nuxt.options.dev && devOptions.stylesheetLinks) {
 				const devAssetBase = compilerOptions.devUrlBase ?? buildNuxtDevAssetBase(appBaseURL, buildAssetsDir);
@@ -502,11 +649,13 @@ var src_default = defineNuxtModule({
 				}
 			}
 			nuxt.hook("vite:configResolved", (config) => {
+				isViteBuild = config.command === "build" || isNuxtBuild || nuxt.options.dev === false;
 				for (let i = config.plugins.length - 1; i >= 0; i--) {
 					const p = config.plugins[i];
 					const name = p && typeof p === "object" && "name" in p ? p.name : "";
 					if (name === "vite:vue") config.plugins.splice(i, 1);
 					else if (bridgeOptions.stableInjectedKeys && name === "nuxt:compiler:keyed-functions") patchNuxtKeyedFunctionsPlugin(p);
+					if (bridgeOptions.autoImports) patchNuxtAutoImportTransformPlugin(p, isViteBuild);
 				}
 			});
 		}
@@ -525,7 +674,7 @@ var src_default = defineNuxtModule({
 		if (usesVizeCompiler && (bridgeOptions.autoImports || bridgeOptions.components || bridgeOptions.i18n || bridgeOptions.stableInjectedKeys)) addVitePlugin({
 			name: "vizejs:nuxt-transform-bridge",
 			enforce: "post",
-			async transform(code, id) {
+			async transform(code, id, ...args) {
 				if (!isVizeVirtualVueModuleId(id)) return;
 				let result = code;
 				let changed = false;
@@ -546,12 +695,20 @@ var src_default = defineNuxtModule({
 					}
 				}
 				if (unimportCtx) try {
+					const beforeUnimport = result;
 					const injected = await unimportCtx.injectImports(result, id);
 					if (injected.imports && injected.imports.length > 0) {
-						result = injected.code;
+						result = preserveExplicitVueImportsFromNuxtAutoImports(beforeUnimport, injected.code);
 						changed = true;
 					}
 				} catch {}
+				if (bridgeOptions.autoImports) {
+					const nextResult = preserveExplicitVueImportsFromVizeModuleSource(id, result);
+					if (nextResult !== result) {
+						result = nextResult;
+						changed = true;
+					}
+				}
 				if (bridgeOptions.stableInjectedKeys) {
 					const stableKeyResult = normalizeNuxtInjectedKeysForVizeVirtualModule(result, id);
 					if (stableKeyResult !== result) {
@@ -559,6 +716,13 @@ var src_default = defineNuxtModule({
 						changed = true;
 					}
 				}
+				if (isViteBuild && !isViteSsrTransform(args)) {
+					const clientRuntimeResult = rewriteBareVueImportsToClientRuntime(result);
+					if (clientRuntimeResult !== result) {
+						result = clientRuntimeResult;
+						changed = true;
+					}
+				}
 				if (changed) return {
 					code: result,
 					map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/nuxt",
-  "version": "0.154.0",
+  "version": "0.156.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.154.0",
-    "@vizejs/vite-plugin": "0.154.0",
-    "@vizejs/vite-plugin-musea": "0.154.0",
-    "vize": "0.154.0"
+    "@vizejs/musea-nuxt": "0.156.0",
+    "@vizejs/vite-plugin": "0.156.0",
+    "@vizejs/vite-plugin-musea": "0.156.0",
+    "vize": "0.156.0"
   },
   "devDependencies": {
     "typescript": "6.0.3",