@vizejs/nuxt 0.695.0 → 0.697.0

package/dist/index.mjs

@@ -4,6 +4,15 @@ import fs, { readFileSync, realpathSync } from "node:fs";
 import path, { dirname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createHash } from "node:crypto";
+//#region src/component-registration.ts
+function registeredComponentPath(component, components) {
+	const name = component.pascalName ?? component.name;
+	const hasClientVariant = components.some((candidate) => candidate.pascalName === component.pascalName && candidate.mode === "client");
+	if (component._raw || component.mode !== "server" || !name || hasClientVariant) return component.filePath;
+	const separator = component.filePath.includes("?") ? "&" : "?";
+	return `${component.filePath}${separator}nuxt_component=server&nuxt_component_name=${name}&nuxt_component_export=${component.export ?? "default"}`;
+}
+//#endregion
 //#region src/component-imports.ts
 const COMPONENT_CALL_RE = /_?resolveComponent\s*\(\s*["'`]([^"'`]+)["'`]\s*(?:,\s*[^)]+)?\)/g;
 const COMPONENTS_IMPORT_RE = /import\s+(?!type\b)\{([^}]*)\}\s+from\s+(["'])#components\2\s*;?/g;
@@ -88,7 +97,7 @@ function injectNuxtComponentImports(code, resolveComponentImport) {
 				continue;
 			}
 			changed = true;
-			const result = addResolvedComponentBinding(explicitComponentImports, resolved, specifier.localName, `__nuxt_import_component_${importCounter++}_raw`);
+			const result = addResolvedComponentBinding(explicitComponentImports, resolved, specifier.localName, `__vize_nuxt_import_component_${importCounter++}_raw`);
 			needsCreateClientOnly ||= result.needsCreateClientOnly;
 			needsDefineAsyncComponent ||= result.needsDefineAsyncComponent;
 		}
@@ -102,7 +111,7 @@ function injectNuxtComponentImports(code, resolveComponentImport) {
 		const importKey = `${resolved.exportName}\u0000${resolved.filePath}\u0000${resolved.lazy ? "lazy" : "eager"}\u0000${resolved.mode ?? "default"}`;
 		let variableName = importedComponents.get(importKey);
 		if (!variableName) {
-			variableName = `__nuxt_component_${counter++}`;
+			variableName = `__vize_nuxt_component_${counter++}`;
 			importedComponents.set(importKey, variableName);
 			const result = addResolvedComponentBinding(componentImports, resolved, variableName, `${variableName}_raw`);
 			needsCreateClientOnly ||= result.needsCreateClientOnly;
@@ -150,6 +159,27 @@ function addComponentAlias(map, name, resolved) {
 	const pascalName = toPascalCase(name);
 	if (!map.has(pascalName)) map.set(pascalName, resolved);
 }
+function addRegisteredComponentAlias(map, name, resolved) {
+	if (!name) return;
+	for (const alias of new Set([
+		name,
+		toKebabCase(name),
+		toPascalCase(name)
+	])) {
+		const candidates = map.get(alias) ?? [];
+		if (candidates.some((candidate) => candidate.mode === resolved.mode)) continue;
+		candidates.push(resolved);
+		map.set(alias, candidates);
+	}
+}
+function selectRegisteredComponent(candidates, mode) {
+	if (!candidates || candidates.length === 0) return null;
+	if (!mode) return candidates[0] ?? null;
+	return candidates.find((candidate) => candidate.mode === mode) ?? candidates.find((candidate) => candidate.mode === void 0) ?? null;
+}
+function matchesBuildMode(component, mode) {
+	return Boolean(component && (!mode || !component.mode || component.mode === mode));
+}
 function addLazyComponentAlias(map, name, resolved) {
 	if (!name || name.startsWith("Lazy")) return;
 	addComponentAlias(map, `Lazy${toPascalCase(name)}`, {
@@ -319,21 +349,32 @@ function createNuxtComponentResolver(options) {
 	return {
 		register(components) {
 			for (const component of components) {
-				const resolved = createComponentImport(component.filePath, component.export || "default", false, component.mode);
-				addComponentAlias(registered, component.pascalName, resolved);
-				addComponentAlias(registered, component.kebabName, resolved);
-				addComponentAlias(registered, component.name, resolved);
-				addLazyComponentAlias(registered, component.pascalName, resolved);
-				addLazyComponentAlias(registered, component.kebabName, resolved);
-				addLazyComponentAlias(registered, component.name, resolved);
+				const resolved = createComponentImport(registeredComponentPath(component, components), component.export || "default", false, component.mode);
+				addRegisteredComponentAlias(registered, component.pascalName, resolved);
+				addRegisteredComponentAlias(registered, component.kebabName, resolved);
+				addRegisteredComponentAlias(registered, component.name, resolved);
+				for (const name of [
+					component.pascalName,
+					component.kebabName,
+					component.name
+				]) {
+					if (!name || name.startsWith("Lazy")) continue;
+					addRegisteredComponentAlias(registered, `Lazy${toPascalCase(name)}`, {
+						...resolved,
+						lazy: true
+					});
+				}
 			}
 		},
-		resolve(name) {
+		resolve(name, mode) {
 			const normalizedName = name.trim();
-			const directResolved = registered.get(normalizedName) ?? getDtsResolved().get(normalizedName);
-			if (directResolved) return directResolved;
+			const registeredResolved = selectRegisteredComponent(registered.get(normalizedName), mode);
+			if (registeredResolved) return registeredResolved;
+			const dtsResolved = getDtsResolved().get(normalizedName);
+			if (matchesBuildMode(dtsResolved, mode)) return dtsResolved;
 			if (!/[A-Z]/.test(normalizedName)) return null;
-			return getRuntimeResolved().get(normalizedName) ?? null;
+			const runtimeResolved = getRuntimeResolved().get(normalizedName);
+			return matchesBuildMode(runtimeResolved, mode) ? runtimeResolved : null;
 		}
 	};
 }
@@ -1635,9 +1676,7 @@ async function setupVizeNuxtModule(raw, nuxt) {
 			let result = code;
 			let changed = false;
 			if (nuxtComponentResolver && hasComponentBridgeInput(result)) {
-				const nextComponentResult = injectNuxtComponentImports(result, (name) => {
-					return nuxtComponentResolver.resolve(name);
-				});
+				const nextComponentResult = injectNuxtComponentImports(result, (name) => nuxtComponentResolver.resolve(name, isViteSsrTransform(args) ? "server" : "client"));
 				if (nextComponentResult !== result) {
 					result = nextComponentResult;
 					changed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/nuxt",
-  "version": "0.695.0",
+  "version": "0.697.0",
   "description": "Nuxt module for Vize - compiler, musea gallery, linter, and type checker",
   "keywords": [
     "compiler",
@@ -49,15 +49,15 @@
   },
   "dependencies": {
     "@nuxt/kit": "3.21.8",
-    "@vizejs/native": "0.695.0",
-    "@vizejs/nuxt-lint-config": "0.695.0",
-    "@vizejs/vite-plugin": "0.695.0",
-    "@vizejs/vite-plugin-musea": "0.695.0",
-    "vize": "0.695.0"
+    "@vizejs/native": "0.697.0",
+    "@vizejs/nuxt-lint-config": "0.697.0",
+    "@vizejs/vite-plugin": "0.697.0",
+    "@vizejs/vite-plugin-musea": "0.697.0",
+    "vize": "0.697.0"
   },
   "devDependencies": {
     "jiti-nuxt2": "npm:jiti@1.21.7",
-    "oxlint-plugin-vize": "0.695.0",
+    "oxlint-plugin-vize": "0.697.0",
     "typescript": "6.0.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",