@vizejs/vite-plugin 0.92.0 → 0.94.0

package/dist/index.mjs

@@ -5,6 +5,7 @@ import path from "node:path";
 import { CONFIG_FILE_NAMES, defineConfig, loadConfig } from "vize";
 import { glob } from "tinyglobby";
 import * as native from "@vizejs/native";
+import { classifyVitePluginRequest } from "@vizejs/native";
 import { pathToFileURL } from "node:url";
 import { transformWithOxc } from "vite";
 //#region src/hmr.ts
@@ -509,28 +510,10 @@ ${output}`;
 }
 const VIZE_SSR_PREFIX = "\0vize-ssr:";
 const RESOLVED_CSS_MODULE = "\0vize:all-styles.css";
-/** Check if a module ID is a vize-compiled virtual module */
-function isVizeVirtual(id) {
-	return isVizeVirtualVueModuleId(id);
-}
-function isVizeVirtualVueModuleId(id) {
-	return id.startsWith("\0") && /\.vue\.ts(?:\?|$)/.test(id);
-}
-function isVizeSsrVirtual(id) {
-	return id.startsWith(VIZE_SSR_PREFIX);
-}
 /** Create a virtual module ID from a real .vue file path */
 function toVirtualId(realPath, ssr = false) {
 	return ssr ? `${VIZE_SSR_PREFIX}${realPath}.ts` : "\0" + realPath + ".ts";
 }
-/** Extract the real .vue file path from a virtual module ID */
-function fromVirtualId(virtualId) {
-	return normalizeVizeVirtualVueModuleId(virtualId).split("?")[0];
-}
-function normalizeVizeVirtualVueModuleId(id) {
-	const prefix = isVizeSsrVirtual(id) ? 10 : 1;
-	return id.slice(prefix).replace(/\.ts(?=\?|$)/, "");
-}
 function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -540,12 +523,6 @@ function toBrowserImportPrefix(replacement) {
 	if (path.isAbsolute(replacement) && fs.existsSync(replacement)) return `/@fs${normalized}`;
 	return normalized;
 }
-function normalizeFsIdForBuild(id) {
-	const [pathPart, queryPart] = id.split("?");
-	if (!pathPart.startsWith("/@fs/")) return id;
-	const normalizedPath = pathPart.slice(4);
-	return queryPart ? `${normalizedPath}?${queryPart}` : normalizedPath;
-}
 function rewriteDynamicTemplateImports(code, aliasRules) {
 	let rewritten = code;
 	for (const rule of aliasRules) {
@@ -877,31 +854,19 @@ function resolveVuePath(state, id, importer) {
 	else if (id.startsWith("/") && !fs.existsSync(id)) resolved = path.resolve(state.root, id.slice(1));
 	else if (path.isAbsolute(id)) resolved = id;
 	else if (importer) {
-		const realImporter = isVizeVirtual(importer) ? fromVirtualId(importer) : importer;
+		const importerRequest = classifyVitePluginRequest(importer);
+		const realImporter = importerRequest.vizeVirtualPath ?? importerRequest.strippedVirtualPath ?? importer;
 		resolved = path.resolve(path.dirname(realImporter), id);
 	} else resolved = path.resolve(state.root, id);
 	if (!path.isAbsolute(resolved)) resolved = path.resolve(state.root, resolved);
 	return path.normalize(resolved);
 }
-function hasQueryParam$1(id, name) {
-	const query = id.split("?")[1];
-	return query ? new URLSearchParams(query).has(name) : false;
-}
-function hasMacroQuery$1(id) {
-	const query = id.split("?")[1];
-	return query ? new URLSearchParams(query).get("macro") === "true" : false;
-}
-function isMacroVirtualId(id) {
-	return id.startsWith("\0") && (hasMacroQuery$1(id) || hasQueryParam$1(id, "definePage"));
-}
-function isVueSfcPath$1(id) {
-	return (id.split("?")[0] ?? id).endsWith(".vue");
-}
 function normalizeRequireBase(importer) {
 	if (!importer) return null;
 	let normalized = importer;
-	if (isVizeVirtual(normalized)) normalized = fromVirtualId(normalized);
-	else if (isMacroVirtualId(normalized)) normalized = normalized.slice(1).split("?")[0] ?? "";
+	const request = classifyVitePluginRequest(normalized);
+	if (request.vizeVirtualPath) normalized = request.vizeVirtualPath;
+	else if (request.isMacroVirtualId) normalized = request.strippedVirtualPath ?? "";
 	return normalized.split("?")[0] ?? null;
 }
 function splitIdQuery(id) {
@@ -1002,10 +967,12 @@ async function resolveAliasedVueImport(ctx, state, id, importer, isSsrRequest, h
 }
 async function resolveIdHook(ctx, state, id, importer, options) {
 	const isBuild = state.server === null;
-	const isSsrRequest = !!options?.ssr || (importer ? isVizeSsrVirtual(importer) : false);
+	const importerRequest = importer ? classifyVitePluginRequest(importer) : null;
+	const isSsrRequest = !!options?.ssr || (importerRequest?.isVizeSsrVirtual ?? false);
+	const request = classifyVitePluginRequest(id);
 	if (id.startsWith("\0")) {
-		if (isVizeVirtual(id)) {
-			if (isSsrRequest && !isVizeSsrVirtual(id)) return toVirtualId(fromVirtualId(id), true);
+		if (request.isVizeVirtual) {
+			if (isSsrRequest && !request.isVizeSsrVirtual && request.vizeVirtualPath) return toVirtualId(request.vizeVirtualPath, true);
 			return null;
 		}
 		if (id.startsWith("\0vize:")) {
@@ -1022,7 +989,7 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 			const querySuffix = queryPart ? `?${queryPart}` : "";
 			state.logger.log(`resolveId: redirecting \0-prefixed non-vue ID to ${pathPart}${querySuffix}`);
 			const redirected = pathPart + querySuffix;
-			return isBuild ? normalizeFsIdForBuild(redirected) : redirected;
+			return isBuild ? classifyVitePluginRequest(redirected).normalizedFsId ?? redirected : redirected;
 		}
 		return null;
 	}
@@ -1031,29 +998,24 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 		if (realPath.endsWith(".ts")) realPath = realPath.slice(0, -3);
 		state.logger.log(`resolveId: redirecting stale vize: ID to ${realPath}`);
 		const resolved = await ctx.resolve(realPath, importer, { skipSelf: true });
-		if (resolved && isBuild && resolved.id.startsWith("/@fs/")) return {
+		const normalizedFsId = resolved ? classifyVitePluginRequest(resolved.id).normalizedFsId : null;
+		if (resolved && isBuild && normalizedFsId) return {
 			...resolved,
-			id: normalizeFsIdForBuild(resolved.id)
+			id: normalizedFsId
 		};
 		return resolved;
 	}
 	if (id === "virtual:vize-styles") return RESOLVED_CSS_MODULE;
-	if (isBuild && id.startsWith("/@fs/")) return normalizeFsIdForBuild(id);
-	if ((hasMacroQuery$1(id) || hasQueryParam$1(id, "definePage")) && isVueSfcPath$1(id)) {
-		const filePath = id.split("?")[0];
-		const querySuffix = id.slice(id.indexOf("?"));
-		const resolved = resolveVuePath(state, filePath, importer);
-		if (resolved && fs.existsSync(resolved)) return `\0${resolved}${querySuffix}`;
+	if (isBuild && request.normalizedFsId) return request.normalizedFsId;
+	if ((request.hasMacroQuery || request.hasDefinePageQuery) && request.isVueSfcPath) {
+		const resolved = resolveVuePath(state, request.path, importer);
+		if (resolved && fs.existsSync(resolved)) return `\0${resolved}${request.querySuffix}`;
 	}
-	if (id.includes("?vue&type=style") || id.includes("?vue=&type=style")) {
-		const params = new URLSearchParams(id.split("?")[1]);
-		const lang = params.get("lang") || "css";
-		if (params.has("module")) return `\0${id}.module.${lang}`;
-		return `\0${id}.${lang}`;
-	}
-	const isMacroImporter = importer ? isMacroVirtualId(importer) : false;
-	if (importer && (isVizeVirtual(importer) || isMacroImporter)) {
-		const cleanImporter = isMacroImporter ? importer.slice(1).split("?")[0] : fromVirtualId(importer);
+	if (request.isVueStyleQuery && request.styleVirtualSuffix) return `\0${id}${request.styleVirtualSuffix}`;
+	const isMacroImporter = importerRequest?.isMacroVirtualId ?? false;
+	const isVizeVirtualImporter = importerRequest?.isVizeVirtual ?? false;
+	if (importer && (isVizeVirtualImporter || isMacroImporter)) {
+		const cleanImporter = isMacroImporter ? importerRequest?.strippedVirtualPath ?? "" : importerRequest?.vizeVirtualPath ?? "";
 		state.logger.log(`resolveId from virtual: id=${id}, cleanImporter=${cleanImporter}`);
 		if (id.startsWith("#")) try {
 			return await ctx.resolve(id, cleanImporter, { skipSelf: true });
@@ -1074,9 +1036,10 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 					const resolved = await ctx.resolve(id, cleanImporter, { skipSelf: true });
 					if (resolved) {
 						state.logger.log(`resolveId: resolved bare ${id} to ${resolved.id} via Vite resolver`);
-						if (isBuild && resolved.id.startsWith("/@fs/")) return {
+						const normalizedFsId = classifyVitePluginRequest(resolved.id).normalizedFsId;
+						if (isBuild && normalizedFsId) return {
 							...resolved,
-							id: normalizeFsIdForBuild(resolved.id)
+							id: normalizedFsId
 						};
 						const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter, resolved.id);
 						if (nodeResolved) {
@@ -1097,9 +1060,10 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 						const resolved = await ctx.resolve(aliasRequest, cleanImporter, { skipSelf: true });
 						if (resolved) {
 							state.logger.log(`resolveId: resolved aliased bare ${id} to ${resolved.id} via Vite resolver`);
-							if (isBuild && resolved.id.startsWith("/@fs/")) return {
+							const normalizedFsId = classifyVitePluginRequest(resolved.id).normalizedFsId;
+							if (isBuild && normalizedFsId) return {
 								...resolved,
-								id: normalizeFsIdForBuild(resolved.id)
+								id: normalizedFsId
 							};
 							const nodeResolved = resolveBareImportCandidatesWithNode(state, id, cleanImporter, resolved.id);
 							if (nodeResolved) {
@@ -1122,9 +1086,10 @@ async function resolveIdHook(ctx, state, id, importer, options) {
 				const resolved = await ctx.resolve(id, cleanImporter, { skipSelf: true });
 				if (resolved) {
 					state.logger.log(`resolveId: resolved ${id} to ${resolved.id} via Vite resolver`);
-					if (isBuild && resolved.id.startsWith("/@fs/")) return {
+					const normalizedFsId = classifyVitePluginRequest(resolved.id).normalizedFsId;
+					if (isBuild && normalizedFsId) return {
 						...resolved,
-						id: normalizeFsIdForBuild(resolved.id)
+						id: normalizedFsId
 					};
 					return resolved;
 				}
@@ -1203,8 +1168,9 @@ export default defineComponent({
 });
 `;
 function getBoundaryPlaceholderCode(realPath, ssr) {
-	if (ssr && realPath.endsWith(".client.vue")) return SERVER_PLACEHOLDER_CODE;
-	if (!ssr && realPath.endsWith(".server.vue")) return SERVER_PLACEHOLDER_CODE;
+	const boundaryKind = classifyVitePluginRequest(realPath).boundaryKind;
+	if (ssr && boundaryKind === "client") return SERVER_PLACEHOLDER_CODE;
+	if (!ssr && boundaryKind === "server") return SERVER_PLACEHOLDER_CODE;
 	return null;
 }
 function getOxcDumpPath(root, realPath) {
@@ -1222,26 +1188,9 @@ function getVirtualModuleDefines(state, ssr) {
 		...ssr ? state.serverViteDefine : state.clientViteDefine
 	};
 }
-function hasQueryParam(id, name) {
-	const query = id.split("?")[1];
-	return query ? new URLSearchParams(query).has(name) : false;
-}
-function hasMacroQuery(id) {
-	const query = id.split("?")[1];
-	return query ? new URLSearchParams(query).get("macro") === "true" : false;
-}
-function normalizeMacroRealPath(realPath) {
-	return realPath.endsWith(".vue.ts") ? realPath.slice(0, -3) : realPath;
-}
-function isVueSfcPath(realPath) {
-	return normalizeMacroRealPath(realPath).endsWith(".vue");
-}
-function stripVirtualQuery(id) {
-	return normalizeMacroRealPath(id.slice(1).split("?")[0] ?? "");
-}
 function findMacroArtifactModule(state, realPath, ssr, kind) {
 	const cache = getEnvironmentCache(state, ssr);
-	realPath = normalizeMacroRealPath(realPath);
+	realPath = classifyVitePluginRequest(realPath).normalizedVuePath;
 	let compiled = cache.get(realPath) ?? state.cache.get(realPath) ?? state.ssrCache.get(realPath);
 	if (!compiled && fs.existsSync(realPath)) {
 		const source = fs.readFileSync(realPath, "utf-8");
@@ -1265,19 +1214,17 @@ function loadDefinePageMetaArtifact(state, realPath, ssr) {
 }
 function loadHook(state, id, loadOptions) {
 	const currentBase = loadOptions?.ssr ? state.serverViteBase : state.clientViteBase;
+	const request = classifyVitePluginRequest(id);
 	if (id === "\0vize:all-styles.css") return Array.from(state.collectedCss.values()).join("\n\n");
 	let styleId = id;
 	if (id.startsWith("\0") && id.includes("?vue")) styleId = id.slice(1).replace(/\.module\.\w+$/, "").replace(/\.\w+$/, "");
-	if (styleId.includes("?vue&type=style") || styleId.includes("?vue=&type=style")) {
-		const [filename, queryString] = styleId.split("?");
-		const realPath = isVizeVirtual(filename) ? fromVirtualId(filename) : filename;
-		const params = new URLSearchParams(queryString);
-		const indexStr = params.get("index");
-		const lang = params.get("lang");
-		params.has("module");
-		const scoped = params.get("scoped");
+	const styleRequest = classifyVitePluginRequest(styleId);
+	if (styleRequest.isVueStyleQuery) {
+		const realPath = classifyVitePluginRequest(styleRequest.path).vizeVirtualPath ?? styleRequest.path;
+		const lang = styleRequest.styleLang ?? null;
+		const scoped = styleRequest.styleScoped ?? null;
 		const fallbackCompiled = state.cache.get(realPath) ?? state.ssrCache.get(realPath);
-		const blockIndex = indexStr !== null ? parseInt(indexStr, 10) : -1;
+		const blockIndex = styleRequest.styleIndex ?? -1;
 		if (fallbackCompiled?.styles && blockIndex >= 0 && blockIndex < fallbackCompiled.styles.length) {
 			const block = fallbackCompiled.styles[blockIndex];
 			let styleContent = block.content;
@@ -1302,13 +1249,13 @@ function loadHook(state, id, loadOptions) {
 		if (fallbackCompiled?.css) return resolveCssImports(fallbackCompiled.css, realPath, state.cssAliasRules, state.server !== null, currentBase);
 		return "";
 	}
-	if (id.startsWith("\0") && hasQueryParam(id, "definePage")) {
-		const realPath = stripVirtualQuery(id);
-		if (isVueSfcPath(realPath)) return loadDefinePageArtifact(state, realPath, !!loadOptions?.ssr);
+	if (id.startsWith("\0") && request.hasDefinePageQuery) {
+		const realPath = request.strippedVirtualPath ?? "";
+		if (request.isVueSfcPath) return loadDefinePageArtifact(state, realPath, !!loadOptions?.ssr);
 	}
-	if (id.startsWith("\0") && hasMacroQuery(id)) {
-		const realPath = stripVirtualQuery(id);
-		if (isVueSfcPath(realPath)) {
+	if (id.startsWith("\0") && request.hasMacroQuery) {
+		const realPath = request.strippedVirtualPath ?? "";
+		if (request.isVueSfcPath) {
 			const artifactLoad = loadDefinePageMetaArtifact(state, realPath, !!loadOptions?.ssr);
 			if (artifactLoad) return artifactLoad;
 			if (fs.existsSync(realPath)) {
@@ -1324,9 +1271,9 @@ function loadHook(state, id, loadOptions) {
 			};
 		}
 	}
-	if (isVizeVirtual(id)) {
-		const realPath = fromVirtualId(id);
-		const isSsr = isVizeSsrVirtual(id) || !!loadOptions?.ssr;
+	if (request.isVizeVirtual) {
+		const realPath = request.vizeVirtualPath ?? "";
+		const isSsr = request.isVizeSsrVirtual || !!loadOptions?.ssr;
 		if (!realPath.endsWith(".vue")) {
 			state.logger.log(`load: skipping non-vue virtual module ${realPath}`);
 			return null;
@@ -1371,9 +1318,9 @@ function loadHook(state, id, loadOptions) {
 	if (id.startsWith("\0")) {
 		const afterPrefix = id.startsWith("\0vize:") ? id.slice(6) : id.slice(1);
 		if (afterPrefix.includes("?commonjs-")) return null;
-		const [pathPart, queryPart] = afterPrefix.split("?");
-		const querySuffix = queryPart ? `?${queryPart}` : "";
-		const fsPath = pathPart.startsWith("/@fs/") ? pathPart.slice(4) : pathPart;
+		const leakedRequest = classifyVitePluginRequest(afterPrefix);
+		const fsPath = leakedRequest.normalizedFsId ? classifyVitePluginRequest(leakedRequest.normalizedFsId).path : leakedRequest.path;
+		const querySuffix = leakedRequest.querySuffix;
 		if (fsPath.startsWith("/") && fs.existsSync(fsPath) && fs.statSync(fsPath).isFile()) {
 			const importPath = state.server === null ? `${pathToFileURL(fsPath).href}${querySuffix}` : "/@fs" + fsPath + querySuffix;
 			state.logger.log(`load: proxying \0-prefixed file ${id} -> re-export from ${importPath}`);
@@ -1383,9 +1330,9 @@ function loadHook(state, id, loadOptions) {
 	return null;
 }
 async function transformHook(state, code, id, options) {
-	const isMacro = id.startsWith("\0") && (hasMacroQuery(id) || hasQueryParam(id, "definePage"));
-	if (isVizeVirtual(id) || isMacro) {
-		const realPath = isMacro ? stripVirtualQuery(id) : fromVirtualId(id);
+	const request = classifyVitePluginRequest(id);
+	if (request.isVizeVirtual || request.isMacroVirtualId) {
+		const realPath = request.isMacroVirtualId ? request.strippedVirtualPath ?? "" : request.vizeVirtualPath ?? "";
 		try {
 			const result = await transformWithOxc(code, realPath, {
 				lang: "ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/vite-plugin",
-  "version": "0.92.0",
+  "version": "0.94.0",
   "description": "High-performance native Vite plugin for Vue SFC compilation powered by Vize",
   "keywords": [
     "compiler",
@@ -33,9 +33,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vizejs/native": "0.92.0",
+    "@vizejs/native": "0.94.0",
     "tinyglobby": "0.2.16",
-    "vize": "0.92.0"
+    "vize": "0.94.0"
   },
   "devDependencies": {
     "@types/node": "25.7.0",