vinext 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/plugins/action-owner-manifest.js

@@ -0,0 +1,84 @@
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { safeJsonStringify } from "../server/html.js";
+import { addClientActionReachability, buildActionOwnerManifest, collectRscActionReachability, resolveClientReferenceImportIds } from "../build/action-owner-manifest.js";
+import fs from "node:fs";
+//#region src/plugins/action-owner-manifest.ts
+const ACTION_OWNER_MANIFEST_ID = "virtual:vinext-action-owner-manifest";
+const RESOLVED_ACTION_OWNER_MANIFEST_ID = `\0${ACTION_OWNER_MANIFEST_ID}`;
+const ACTION_OWNER_MANIFEST_FILE = "__vinext_action_owner_manifest.js";
+function getModuleInfo(context, id) {
+	const info = context.getModuleInfo(id);
+	if (!info) return null;
+	return {
+		importedIds: info.importedIds,
+		dynamicallyImportedIds: info.dynamicallyImportedIds
+	};
+}
+function createActionOwnerManifestPlugin(options) {
+	let config;
+	let routeReachability = /* @__PURE__ */ new Map();
+	let manifest = {};
+	return {
+		name: "vinext:action-owner-manifest",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		resolveId(source) {
+			if (source !== "virtual:vinext-action-owner-manifest") return;
+			return this.environment.mode === "build" ? {
+				id: source,
+				external: true
+			} : RESOLVED_ACTION_OWNER_MANIFEST_ID;
+		},
+		load(id) {
+			if (id === RESOLVED_ACTION_OWNER_MANIFEST_ID) return "export default null";
+		},
+		async generateBundle() {
+			const manager = await options.getManager(config);
+			if (!manager) throw new Error("vinext: failed to access @vitejs/plugin-rsc through getPluginApi().");
+			if (manager.isScanBuild) return;
+			if (this.environment.name === "rsc") routeReachability = collectRscActionReachability({
+				canonicalizeModuleId: options.canonicalizeModuleId,
+				clientReferenceMetaMap: manager.clientReferenceMetaMap,
+				getModuleInfo: (id) => getModuleInfo(this, id),
+				routes: options.getRoutes(),
+				serverReferenceMetaMap: manager.serverReferences.metaMap,
+				sharedRoots: options.getSharedRoots()
+			});
+			else if (this.environment.name === "client") {
+				await resolveClientReferenceImportIds({
+					canonicalizeModuleId: options.canonicalizeModuleId,
+					resolveId: async (id) => (await this.resolve(id))?.id ?? null,
+					routeReachability
+				});
+				addClientActionReachability({
+					canonicalizeModuleId: options.canonicalizeModuleId,
+					clientReferenceMetaMap: manager.clientReferenceMetaMap,
+					getModuleInfo: (id) => getModuleInfo(this, id),
+					routeReachability,
+					serverReferenceMetaMap: manager.serverReferences.metaMap
+				});
+				manifest = buildActionOwnerManifest(routeReachability);
+			}
+		},
+		renderChunk(code, chunk) {
+			if (!code.includes("virtual:vinext-action-owner-manifest")) return;
+			let relativePath = path.posix.relative(path.posix.dirname(chunk.fileName), ACTION_OWNER_MANIFEST_FILE);
+			if (!relativePath.startsWith(".")) relativePath = `./${relativePath}`;
+			return { code: code.replaceAll(ACTION_OWNER_MANIFEST_ID, relativePath) };
+		},
+		buildApp: {
+			order: "post",
+			async handler(builder) {
+				const outDir = builder.config.environments.rsc.build.outDir;
+				await fs.promises.mkdir(outDir, { recursive: true });
+				await fs.promises.writeFile(path.join(outDir, ACTION_OWNER_MANIFEST_FILE), `export default ${safeJsonStringify(manifest)};\n`);
+				routeReachability = /* @__PURE__ */ new Map();
+				manifest = {};
+				options.onComplete?.();
+			}
+		}
+	};
+}
+//#endregion
+export { ACTION_OWNER_MANIFEST_ID, createActionOwnerManifestPlugin };

package/dist/plugins/ast-utils.d.ts

@@ -9,6 +9,8 @@ type AstRange = AstRecord & {
   start: number;
   end: number;
 };
+type ScriptParserLanguage = "js" | "jsx" | "ts" | "tsx";
+declare const SCRIPT_MODULE_ID_RE: RegExp;
 /**
  * Cheap pre-parse gate for plugins that only transform *dynamic* `import(...)`.
  *
@@ -35,12 +37,39 @@ declare const DYNAMIC_IMPORT_PRESCAN: RegExp;
  * gate used to avoid parsing static-import-only modules.
  */
 declare function mayContainDynamicImport(code: string): boolean;
+/**
+ * Select the OXC parser mode for a JavaScript/TypeScript module id.
+ *
+ * JavaScript-family files intentionally use the JSX parser. Next.js accepts
+ * JSX in `.js` files, and every caller using this helper runs before JSX has
+ * necessarily been lowered.
+ */
+declare function scriptParserLanguage(id: string): ScriptParserLanguage | null;
 declare function isAstRecord(value: unknown): value is AstRecord;
 declare function nodeArray(value: unknown): unknown[];
 declare function hasRange(node: AstRecord | null): node is AstRange;
 declare function isIdentifierNamed(value: unknown, name: string): boolean;
 declare function getAstName(value: unknown): string | null;
+/** Remove syntax-only wrappers while preserving the underlying expression. */
+declare function unwrapExpression(value: unknown): AstRecord | null;
+/** Return the value of a string literal node, without evaluating expressions. */
+declare function stringLiteralValue(value: unknown): string | null;
+/** Return the value of a boolean literal node, without evaluating expressions. */
+declare function booleanLiteralValue(value: unknown): boolean | null;
+/**
+ * Return a statically known string literal, including an interpolation-free
+ * template literal. This deliberately does not fold concatenations or other
+ * expressions.
+ */
+declare function staticStringValue(value: unknown): string | null;
 declare function forEachAstChild(node: AstRecord, callback: (child: AstRecord) => void): void;
+/**
+ * Visit an AST in depth-first order. Returning `false` prunes the current
+ * node's subtree, which is useful once a transform has claimed a complete
+ * expression. Parent links and source-location metadata are skipped by
+ * {@link forEachAstChild}, so OXC's cyclic `parent` references are safe.
+ */
+declare function walkAst(value: unknown, visitor: (node: AstRecord) => boolean | void): void;
 declare function collectBindingNames(pattern: unknown, target: Set<string>): void;
 //#endregion
-export { AstRange, AstRecord, DYNAMIC_IMPORT_PRESCAN, collectBindingNames, forEachAstChild, getAstName, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray };
+export { AstRange, AstRecord, DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, ScriptParserLanguage, booleanLiteralValue, collectBindingNames, forEachAstChild, getAstName, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray, scriptParserLanguage, staticStringValue, stringLiteralValue, unwrapExpression, walkAst };

package/dist/plugins/ast-utils.js

@@ -1,4 +1,15 @@
 //#region src/plugins/ast-utils.ts
+const SCRIPT_MODULE_EXTENSION_RE = /^\.(?:[cm]?[jt]s|[jt]sx)$/i;
+const SCRIPT_MODULE_ID_RE = /\.(?:[cm]?[jt]s|[jt]sx)(?:[?#].*)?$/i;
+const TRANSPARENT_EXPRESSION_TYPES = /* @__PURE__ */ new Set([
+	"ChainExpression",
+	"ParenthesizedExpression",
+	"TSAsExpression",
+	"TSInstantiationExpression",
+	"TSNonNullExpression",
+	"TSSatisfiesExpression",
+	"TSTypeAssertion"
+]);
 /**
 * Cheap pre-parse gate for plugins that only transform *dynamic* `import(...)`.
 *
@@ -27,6 +38,23 @@ const DYNAMIC_IMPORT_PRESCAN = /\bimport\s*[(/]/;
 function mayContainDynamicImport(code) {
 	return DYNAMIC_IMPORT_PRESCAN.test(code);
 }
+/**
+* Select the OXC parser mode for a JavaScript/TypeScript module id.
+*
+* JavaScript-family files intentionally use the JSX parser. Next.js accepts
+* JSX in `.js` files, and every caller using this helper runs before JSX has
+* necessarily been lowered.
+*/
+function scriptParserLanguage(id) {
+	const cleanId = id.split(/[?#]/, 1)[0];
+	const extensionIndex = cleanId.lastIndexOf(".");
+	if (extensionIndex === -1) return null;
+	const extension = cleanId.slice(extensionIndex).toLowerCase();
+	if (!SCRIPT_MODULE_EXTENSION_RE.test(extension)) return null;
+	if (extension === ".ts" || extension === ".mts" || extension === ".cts") return "ts";
+	if (extension === ".tsx") return "tsx";
+	return "jsx";
+}
 const SKIP_CHILD_KEYS = /* @__PURE__ */ new Set([
 	"type",
 	"parent",
@@ -60,6 +88,42 @@ function getAstName(value) {
 	if (typeof node.value === "string") return node.value;
 	return null;
 }
+/** Remove syntax-only wrappers while preserving the underlying expression. */
+function unwrapExpression(value) {
+	const node = toAstRecord(value);
+	if (!node || !TRANSPARENT_EXPRESSION_TYPES.has(node.type)) return node;
+	return unwrapExpression(node.expression);
+}
+/** Return the value of a string literal node, without evaluating expressions. */
+function stringLiteralValue(value) {
+	const node = toAstRecord(value);
+	if ((node?.type === "Literal" || node?.type === "StringLiteral") && typeof node.value === "string") return node.value;
+	return null;
+}
+/** Return the value of a boolean literal node, without evaluating expressions. */
+function booleanLiteralValue(value) {
+	const node = toAstRecord(value);
+	return node?.type === "Literal" && typeof node.value === "boolean" ? node.value : null;
+}
+/**
+* Return a statically known string literal, including an interpolation-free
+* template literal. This deliberately does not fold concatenations or other
+* expressions.
+*/
+function staticStringValue(value) {
+	const node = toAstRecord(value);
+	if (!node) return null;
+	const literal = stringLiteralValue(node);
+	if (literal !== null) return literal;
+	if (node.type !== "TemplateLiteral" || nodeArray(node.expressions).length !== 0) return null;
+	const quasis = nodeArray(node.quasis);
+	if (quasis.length !== 1) return null;
+	const quasi = toAstRecord(quasis[0]);
+	if (quasi?.type !== "TemplateElement" || typeof quasi.value !== "object" || !quasi.value) return null;
+	const cooked = Reflect.get(quasi.value, "cooked");
+	const raw = Reflect.get(quasi.value, "raw");
+	return typeof cooked === "string" ? cooked : typeof raw === "string" ? raw : null;
+}
 function forEachAstChild(node, callback) {
 	for (const [key, value] of Object.entries(node)) {
 		if (SKIP_CHILD_KEYS.has(key)) continue;
@@ -74,6 +138,17 @@ function forEachAstChild(node, callback) {
 		}
 	}
 }
+/**
+* Visit an AST in depth-first order. Returning `false` prunes the current
+* node's subtree, which is useful once a transform has claimed a complete
+* expression. Parent links and source-location metadata are skipped by
+* {@link forEachAstChild}, so OXC's cyclic `parent` references are safe.
+*/
+function walkAst(value, visitor) {
+	const node = toAstRecord(value);
+	if (!node || visitor(node) === false) return;
+	forEachAstChild(node, (child) => walkAst(child, visitor));
+}
 function collectBindingNames(pattern, target) {
 	const node = toAstRecord(pattern);
 	if (!node) return;
@@ -106,4 +181,4 @@ function collectBindingNames(pattern, target) {
 	}
 }
 //#endregion
-export { DYNAMIC_IMPORT_PRESCAN, collectBindingNames, forEachAstChild, getAstName, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray };
+export { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, booleanLiteralValue, collectBindingNames, forEachAstChild, getAstName, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray, scriptParserLanguage, staticStringValue, stringLiteralValue, unwrapExpression, walkAst };

package/dist/plugins/css-module-imports.d.ts

@@ -1,8 +1,8 @@
+import { ScriptParserLanguage } from "./ast-utils.js";
 import { Plugin } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/css-module-imports.d.ts
-type ScriptLanguage = "js" | "jsx" | "ts" | "tsx";
-declare function rewriteCssModuleNamespaceImports(code: string, lang?: ScriptLanguage): {
+declare function rewriteCssModuleNamespaceImports(code: string, lang?: ScriptParserLanguage): {
   code: string;
   map: ReturnType<MagicString["generateMap"]>;
 } | null;

package/dist/plugins/css-module-imports.js

@@ -1,16 +1,11 @@
+import { magicStringTransformResult } from "./transform-result.js";
+import { SCRIPT_MODULE_ID_RE, scriptParserLanguage } from "./ast-utils.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/css-module-imports.ts
 const CSS_MODULE_RE = /\.module\.(?:css|scss|sass)$/i;
 const CSS_MODULE_HINT_RE = /\.module\.(?:css|scss|sass)/i;
-const SCRIPT_RE = /\.(?:[cm]?[jt]sx?)(?:[?#].*)?$/i;
 const MDX_RE = /\.mdx$/i;
-function scriptLanguage(id) {
-	const cleanId = id.split("?", 1)[0].toLowerCase();
-	if (cleanId.endsWith(".tsx")) return "tsx";
-	if (cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts")) return "ts";
-	return "jsx";
-}
 function rewriteCssModuleNamespaceImports(code, lang = "js") {
 	let ast;
 	try {
@@ -34,13 +29,10 @@ function rewriteCssModuleNamespaceImports(code, lang = "js") {
 		output.overwrite(specifier.start, specifier.end, specifier.local.name);
 	}
 	if (!output) return null;
-	return {
-		code: output.toString(),
-		map: output.generateMap({ hires: true })
-	};
+	return magicStringTransformResult(output, { hires: true });
 }
 function createCssModuleImportCompatibilityPlugin(options = {}) {
-	const idFilter = options.compiledMdx ? MDX_RE : SCRIPT_RE;
+	const idFilter = options.compiledMdx ? MDX_RE : SCRIPT_MODULE_ID_RE;
 	return {
 		name: options.compiledMdx ? "vinext:css-module-import-compatibility-mdx" : "vinext:css-module-import-compatibility",
 		enforce: options.compiledMdx ? "post" : "pre",
@@ -50,7 +42,7 @@ function createCssModuleImportCompatibilityPlugin(options = {}) {
 				code: CSS_MODULE_HINT_RE
 			},
 			handler(code, id) {
-				return rewriteCssModuleNamespaceImports(code, options.compiledMdx ? "jsx" : scriptLanguage(id));
+				return rewriteCssModuleNamespaceImports(code, options.compiledMdx ? "jsx" : scriptParserLanguage(id) ?? "jsx");
 			}
 		}
 	};

package/dist/plugins/dynamic-preload-metadata.js

@@ -1,6 +1,9 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { hasTrailingComma } from "../utils/has-trailing-comma.js";
+import { magicStringTransformResult } from "./transform-result.js";
+import { getAstName, stringLiteralValue, walkAst } from "./ast-utils.js";
 import { relativeWithinRoot, tryRealpathSync } from "../build/ssr-manifest.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
@@ -20,31 +23,10 @@ function getArray(node, key) {
 function getBoolean(node, key) {
 	return node[key] === true;
 }
-function nodeName(node) {
-	if (!isUnknownRecord(node)) return null;
-	const name = node.name;
-	if (typeof name === "string") return name;
-	const value = node.value;
-	return typeof value === "string" ? value : null;
-}
-function nodeStringValue(node) {
-	if (!isUnknownRecord(node)) return null;
-	const value = node.value;
-	return typeof value === "string" ? value : null;
-}
-function walkAst(value, visitor) {
-	if (!isUnknownRecord(value)) return;
-	visitor(value);
-	for (const [key, child] of Object.entries(value)) {
-		if (key === "parent") continue;
-		if (Array.isArray(child)) for (const item of child) walkAst(item, visitor);
-		else if (isUnknownRecord(child)) walkAst(child, visitor);
-	}
-}
 function importSource(node) {
 	const source = node.source;
 	if (!isUnknownRecord(source)) return null;
-	return nodeStringValue(source);
+	return stringLiteralValue(source);
 }
 function isNextDynamicSource(source) {
 	return source === "next/dynamic" || source === "next/dynamic.js";
@@ -59,7 +41,7 @@ function collectDynamicImportLocals(ast) {
 		for (const specifier of getArray(node, "specifiers")) {
 			if (!isUnknownRecord(specifier)) continue;
 			if (getString(specifier, "type") !== "ImportDefaultSpecifier") continue;
-			const local = nodeName(specifier.local);
+			const local = getAstName(specifier.local);
 			if (local) locals.add(local);
 		}
 	}
@@ -119,7 +101,7 @@ function collectBlockScopedBindingNames(body) {
 			continue;
 		}
 		if (type === "FunctionDeclaration" || type === "ClassDeclaration") {
-			const name = nodeName(statement.id);
+			const name = getAstName(statement.id);
 			if (name) names.add(name);
 		}
 	}
@@ -147,7 +129,7 @@ function collectVarBindingNames(value, names) {
 function collectFunctionScopeBindingNames(node) {
 	const names = /* @__PURE__ */ new Set();
 	if (getString(node, "type") === "FunctionExpression") {
-		const name = nodeName(node.id);
+		const name = getAstName(node.id);
 		if (name) names.add(name);
 	}
 	for (const param of getArray(node, "params")) addBindingName(param, names);
@@ -202,7 +184,7 @@ function visitDynamicCalls(value, dynamicLocals, visitor) {
 	}
 	if (type === "ClassDeclaration" || type === "ClassExpression") {
 		const names = /* @__PURE__ */ new Set();
-		const name = nodeName(value.id);
+		const name = getAstName(value.id);
 		if (name) names.add(name);
 		visitChildren(value, withoutBindings(dynamicLocals, names), visitor);
 		return;
@@ -225,7 +207,7 @@ function collectImportSpecifiers(node) {
 	const seen = /* @__PURE__ */ new Set();
 	walkAst(node, (item) => {
 		if (getString(item, "type") === "ImportExpression") {
-			const specifier = nodeStringValue(item.source);
+			const specifier = stringLiteralValue(item.source);
 			if (specifier && !seen.has(specifier)) {
 				seen.add(specifier);
 				specifiers.push(specifier);
@@ -236,7 +218,7 @@ function collectImportSpecifiers(node) {
 		const callee = item.callee;
 		if (!isUnknownRecord(callee) || getString(callee, "type") !== "Import") return;
 		const firstArg = getArray(item, "arguments")[0];
-		const specifier = nodeStringValue(firstArg);
+		const specifier = stringLiteralValue(firstArg);
 		if (specifier && !seen.has(specifier)) {
 			seen.add(specifier);
 			specifiers.push(specifier);
@@ -247,7 +229,7 @@ function collectImportSpecifiers(node) {
 function propertyKeyName(property) {
 	if (!isUnknownRecord(property)) return null;
 	if (getBoolean(property, "computed")) return null;
-	return nodeName(property.key);
+	return getAstName(property.key);
 }
 function objectProperties(node) {
 	if (!isUnknownRecord(node) || getString(node, "type") !== "ObjectExpression") return [];
@@ -294,7 +276,7 @@ function insertSecondOptionsArgument(output, code, callNode, firstArg, optionsLi
 function cleanResolvedId(id) {
 	let start = 0;
 	while (start < id.length && id.charCodeAt(start) === 0) start += 1;
-	return toSlash(id.slice(start).replace(/^\/@fs\//, "/").split("?")[0]);
+	return toSlash(stripViteModuleQuery(id.slice(start).replace(/^\/@fs\//, "/")));
 }
 const rootRealpathCache = /* @__PURE__ */ new Map();
 function cachedRootRealpath(root) {
@@ -377,10 +359,7 @@ async function transformNextDynamicPreloadMetadata(code, id, root, resolveDynami
 	});
 	await Promise.all(pending);
 	if (!changed) return null;
-	return {
-		code: output.toString(),
-		map: output.generateMap({ hires: "boundary" })
-	};
+	return magicStringTransformResult(output);
 }
 function createDynamicPreloadMetadataPlugin() {
 	let root = toSlash(process.cwd());

package/dist/plugins/environment.d.ts

@@ -0,0 +1,11 @@
+//#region src/plugins/environment.d.ts
+type PluginEnvironment = {
+  name: string;
+  config: {
+    consumer?: string;
+  };
+};
+/** Whether a Vite environment produces server-consumed output. */
+declare function isServerEnvironment(environment: PluginEnvironment): boolean;
+//#endregion
+export { isServerEnvironment };

package/dist/plugins/environment.js

@@ -0,0 +1,7 @@
+//#region src/plugins/environment.ts
+/** Whether a Vite environment produces server-consumed output. */
+function isServerEnvironment(environment) {
+	return environment.name !== "client" && environment.config.consumer !== "client";
+}
+//#endregion
+export { isServerEnvironment };

package/dist/plugins/extensionless-dynamic-import.js

@@ -1,7 +1,9 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
 import { isUnknownRecord } from "../utils/record.js";
-import { DYNAMIC_IMPORT_PRESCAN, forEachAstChild, hasRange, isAstRecord, nodeArray } from "./ast-utils.js";
+import { NODE_MODULES_PATH_RE } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
+import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, hasRange, isAstRecord, nodeArray, scriptParserLanguage, walkAst } from "./ast-utils.js";
 import { createTransformCache } from "./transform-cache.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -17,16 +19,6 @@ const MODULE_EXTENSIONS = [
 	".tsx",
 	".json"
 ];
-const TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
-	".mjs",
-	".js",
-	".mts",
-	".ts",
-	".jsx",
-	".tsx",
-	".cjs",
-	".cts"
-]);
 function createExtensionlessDynamicImportPlugin() {
 	let transformConfig = {
 		aliases: [],
@@ -50,8 +42,8 @@ function createExtensionlessDynamicImportPlugin() {
 		transform: {
 			filter: {
 				id: {
-					include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/i,
-					exclude: /[\\/]node_modules[\\/]/
+					include: SCRIPT_MODULE_ID_RE,
+					exclude: NODE_MODULES_PATH_RE
 				},
 				code: DYNAMIC_IMPORT_PRESCAN
 			},
@@ -68,7 +60,7 @@ function createExtensionlessDynamicImportPlugin() {
 	};
 }
 function transformExtensionlessImports(code, id, config) {
-	const lang = langForId(id);
+	const lang = scriptParserLanguage(id);
 	let ast;
 	try {
 		ast = parseAst(code, { lang });
@@ -82,33 +74,17 @@ function transformExtensionlessImports(code, id, config) {
 		const source = code.slice(dynamicImport.sourceStart, dynamicImport.sourceEnd);
 		output.overwrite(dynamicImport.start, dynamicImport.end, dynamicImport.kind === "package" ? buildPackageReplacement(source, dynamicImport.resolution) : buildReplacement(source, dynamicImport.globPattern, dynamicImport.moduleExtensions));
 	}
-	return {
-		code: output.toString(),
-		map: output.generateMap({ hires: "boundary" })
-	};
-}
-function langForId(id) {
-	const clean = id.split("?", 1)[0];
-	const dot = clean.lastIndexOf(".");
-	if (dot < 0) return null;
-	const ext = clean.slice(dot).toLowerCase();
-	if (!TRANSFORMABLE_EXTENSIONS.has(ext)) return null;
-	if (ext === ".ts" || ext === ".mts" || ext === ".cts") return "ts";
-	if (ext === ".tsx") return "tsx";
-	return "jsx";
+	return magicStringTransformResult(output);
 }
 function collectExtensionlessImports(ast, code, config, id) {
 	const imports = [];
-	function visit(value) {
-		if (!isAstRecord(value)) return;
-		const parsed = parseExtensionlessImport(value, code, config, id);
+	walkAst(ast, (node) => {
+		const parsed = parseExtensionlessImport(node, code, config, id);
 		if (parsed) {
 			imports.push(parsed);
-			return;
+			return false;
 		}
-		forEachAstChild(value, visit);
-	}
-	visit(ast);
+	});
 	return imports;
 }
 function parseExtensionlessImport(node, code, config, id) {

package/dist/plugins/fonts.js

@@ -1,7 +1,8 @@
-import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
 import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { lastSignificantChar } from "../utils/has-trailing-comma.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/google-fonts/fallback-metrics.js";
 import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
@@ -95,9 +96,10 @@ function formatGoogleFontsErrorBody(body) {
 * filesystems.
 */
 function _rewriteCachedFontCssToServedUrls(css, cacheDir, assetsDir = DEFAULT_ASSETS_DIR) {
-	if (!cacheDir || !css.includes(cacheDir)) return css;
+	const normalizedCacheDir = toSlash(cacheDir);
+	if (!normalizedCacheDir || !css.includes(normalizedCacheDir)) return css;
 	const prefix = assetsDir || DEFAULT_ASSETS_DIR;
-	return css.split(cacheDir).join(`/${prefix}/${VINEXT_FONT_URL_NAMESPACE}`);
+	return css.split(normalizedCacheDir).join(`/${prefix}/${VINEXT_FONT_URL_NAMESPACE}`);
 }
 /**
 * Default `build.assetsDir` — matches vinext's resolved default in
@@ -422,7 +424,7 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 		name: "vinext:google-fonts",
 		enforce: "pre",
 		configResolved(config) {
-			cacheDir = path.join(config.root, ".vinext", "fonts");
+			cacheDir = path.join(toSlash(config.root), ".vinext", "fonts");
 		},
 		configureServer(server) {
 			if (!cacheDir) return;
@@ -592,10 +594,7 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 					await injectSelfHostedCss(callStart, callEnd, optionsStr, propertyNameToGoogleFontFamily(propName), `${objectName}.${propName}`);
 				}
 				if (!hasChanges) return null;
-				return {
-					code: s.toString(),
-					map: s.generateMap({ hires: "boundary" })
-				};
+				return magicStringTransformResult(s);
 			}
 		},
 		writeBundle: {
@@ -699,10 +698,7 @@ function createLocalFontsPlugin(shimsDir) {
 				}
 				if (!hasChanges) return null;
 				if (imports.length > 0) s.prepend(imports.join("\n") + "\n");
-				return {
-					code: s.toString(),
-					map: s.generateMap({ hires: "boundary" })
-				};
+				return magicStringTransformResult(s);
 			}
 		}
 	};

package/dist/plugins/ignore-dynamic-requests.d.ts

@@ -1,9 +1,7 @@
+import { MagicStringTransformResult } from "./transform-result.js";
 import { Plugin } from "vite";
 //#region src/plugins/ignore-dynamic-requests.d.ts
-declare function transformVeryDynamicRequests(code: string, id: string): {
-  code: string;
-  map: import("magic-string").SourceMap;
-} | null;
+declare function transformVeryDynamicRequests(code: string, id: string): MagicStringTransformResult | null;
 declare function createIgnoreDynamicRequestsPlugin(getTranspiledPackages?: () => readonly string[]): Plugin;
 declare const _transformVeryDynamicRequests: typeof transformVeryDynamicRequests;
 //#endregion