vinext 1.0.0-beta.8 → 1.0.0

package/dist/init.js

@@ -1,6 +1,6 @@
-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 { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
-import { setupCloudflarePlatform, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
+import { compactResourceName, cssModulesConfigSource, setupCloudflarePlatform, updateViteConfigForCssModules, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
 import { getReactUpgradeDeps } from "./utils/react-version.js";
 import fs from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
@@ -57,18 +57,47 @@ function inspectPnpmIgnoredBuilds(root) {
 	});
 	return `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
 }
-function generateViteConfig(_isAppRouter, prerender = false) {
+function generateViteConfig(_isAppRouter, prerender = false, hasCssModules = false) {
 	return `import vinext from "vinext";
-import { defineConfig } from "vite";
+import { defineConfig } from "vite";${hasCssModules ? "\nimport { createHash } from \"node:crypto\";\nimport path from \"node:path\";\nimport { patchCssModules } from \"vite-css-modules\";" : ""}
 
 export default defineConfig({
-  plugins: [${prerender ? `vinext({ prerender: { routes: "*" } })` : "vinext()"}],
+  plugins: [${hasCssModules ? "patchCssModules({ exportMode: \"default\" }), " : ""}${prerender ? `vinext({ prerender: { routes: "*" } })` : "vinext()"}],${hasCssModules ? cssModulesConfigSource() : ""}
 });
 `;
 }
+const CSS_MODULE_GLOBS = [
+	"**/*.module.{css,scss,sass}",
+	"**/.*.module.{css,scss,sass}",
+	"**/.*/**/*.module.{css,scss,sass}",
+	"**/.*/**/.*.module.{css,scss,sass}"
+];
+const CSS_MODULE_IGNORES = /* @__PURE__ */ new Set([
+	"node_modules",
+	".git",
+	".next",
+	".vinext",
+	".wrangler",
+	".cloudflare"
+]);
+const CSS_MODULE_ROOT_IGNORES = /* @__PURE__ */ new Set([
+	"dist",
+	"out",
+	"build",
+	"coverage"
+]);
+function scanCssModuleFiles(root) {
+	const canonicalRoot = path.resolve(root);
+	return fs.globSync(CSS_MODULE_GLOBS, {
+		cwd: root,
+		withFileTypes: true,
+		exclude: (entry) => entry.isDirectory() && (CSS_MODULE_IGNORES.has(entry.name) || toSlash(entry.parentPath) === canonicalRoot && CSS_MODULE_ROOT_IGNORES.has(entry.name))
+	}).some((entry) => /\.module\.(css|scss|sass)$/.test(entry.name));
+}
 /**
-* Add vinext scripts to package.json without overwriting existing scripts.
-* Returns the list of script names that were added.
+* Add Vite scripts to package.json without overwriting custom scripts.
+* Exact scripts generated by older vinext versions are migrated in place.
+* Returns the list of script names that were added or migrated.
 */
 function addScripts(root, port, platform = "node", options = {}) {
 	const pkgPath = path.join(root, "package.json");
@@ -78,23 +107,33 @@ function addScripts(root, port, platform = "node", options = {}) {
 		const pkg = JSON.parse(raw);
 		if (!pkg.scripts) pkg.scripts = {};
 		const added = [];
-		const addScript = (name, command) => {
+		const addScript = (name, command, legacyCommands = []) => {
 			const scriptName = options.scriptNames === "standard" ? name : `${name}:vinext`;
-			if (pkg.scripts[scriptName]) return;
+			const existing = pkg.scripts[scriptName];
+			if (existing && !legacyCommands.some((legacy) => typeof legacy === "string" ? existing === legacy : legacy.test(existing))) return;
+			if (existing === command) return;
 			pkg.scripts[scriptName] = command;
 			added.push(scriptName);
 		};
-		addScript("dev", port === false ? "vinext dev" : `vinext dev --port ${port}`);
-		addScript("build", "vinext build");
-		addScript("start", platform === "cloudflare" ? "wrangler dev --config dist/server/wrangler.json" : "vinext start");
-		if (platform === "cloudflare") addScript("deploy", options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
+		const devScriptName = options.scriptNames === "standard" ? "dev" : "dev:vinext";
+		const legacyDevScript = pkg.scripts[devScriptName];
+		addScript("dev", port === void 0 && typeof legacyDevScript === "string" && /^vinext dev(?: --port \d+)?$/.test(legacyDevScript) ? legacyDevScript.replace(/^vinext /, "vite ") : port === false ? "vite dev" : `vite dev --port ${port ?? 3001}`, ["vinext dev", /^vinext dev --port \d+$/]);
+		addScript("build", "vite build", ["vinext build"]);
+		addScript("start", platform === "cloudflare" ? !options.legacyWrangler ? "vite preview" : "wrangler dev --config dist/server/wrangler.json" : "vinext start");
+		if (platform === "cloudflare") {
+			addScript("deploy", !options.legacyWrangler ? options.warmCdnCache ? "vinext-cloudflare deploy --warm-cache" : "vinext-cloudflare deploy" : options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --warm-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
+			if (options.deployResponseStore && !pkg.scripts["deploy:response-store"]) {
+				pkg.scripts["deploy:response-store"] = !options.legacyWrangler ? `cf deploy --prebuilt --mode production --worker ${compactResourceName(detectProject(root).projectName, "-response-store", 63)}` : "wrangler deploy --config wrangler.response-store.jsonc";
+				added.push("deploy:response-store");
+			}
+		}
 		if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
 		return added;
 	} catch {
 		return [];
 	}
 }
-function getInitDependencyGroups(isAppRouter, platform) {
+function getInitDependencyGroups(isAppRouter, platform, cloudflare, hasCssModules = false) {
 	const dependencies = ["vinext"];
 	const devDependencies = ["vite", "@vitejs/plugin-react"];
 	if (isAppRouter) {
@@ -103,15 +142,20 @@ function getInitDependencyGroups(isAppRouter, platform) {
 	}
 	if (platform === "cloudflare") {
 		dependencies.push("@vinext/cloudflare");
-		devDependencies.push("@cloudflare/vite-plugin", "wrangler");
+		if (cloudflare?.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding") dependencies.push("@cloudflare/workers-response-store");
+		if (!cloudflare?.legacyWrangler) {
+			devDependencies[0] = "vite@8.3.0";
+			devDependencies.push("@cloudflare/vite-plugin@beta", "cf@latest");
+		} else devDependencies.push("@cloudflare/vite-plugin@1", "wrangler");
 	}
+	if (hasCssModules) devDependencies.push("vite-css-modules", "postcss");
 	return {
 		dependencies,
 		devDependencies
 	};
 }
-function getInitDeps(isAppRouter, platform) {
-	const groups = getInitDependencyGroups(isAppRouter, platform);
+function getInitDeps(isAppRouter, platform, cloudflare, hasCssModules = false) {
+	const groups = getInitDependencyGroups(isAppRouter, platform, cloudflare, hasCssModules);
 	return [...groups.dependencies, ...groups.devDependencies];
 }
 function isDepInstalled(root, dep) {
@@ -119,11 +163,13 @@ function isDepInstalled(root, dep) {
 	if (!fs.existsSync(pkgPath)) return false;
 	try {
 		const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-		return dep in {
+		const allDeps = {
 			...pkg.dependencies,
 			...pkg.devDependencies,
 			...pkg.peerDependencies
 		};
+		const { name, version, hasExplicitVersion } = parseDependencySpecifier(dep);
+		return name in allDeps && (!hasExplicitVersion || allDeps[name] === version);
 	} catch {
 		return false;
 	}
@@ -194,7 +240,7 @@ function addDependencyEntries(root, deps, { dev }) {
 async function installDeps(root, deps, exec, { dev = true } = {}) {
 	if (deps.length === 0) return "";
 	const baseCmd = detectPackageManager(root);
-	return await exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.join(" ")}`, {
+	return await exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.map((dep) => JSON.stringify(dep)).join(" ")}`, {
 		cwd: root,
 		stdio: "inherit"
 	}) ?? "";
@@ -204,7 +250,7 @@ async function installDeps(root, deps, exec, { dev = true } = {}) {
 * Creates the file if it doesn't exist. Returns true if the file was modified
 * (or created), false if all entries were already present.
 */
-function updateGitignore(root, platform = "node") {
+function updateGitignore(root, platform = "node", legacyWrangler = false) {
 	const gitignorePath = path.join(root, ".gitignore");
 	const entries = [
 		{
@@ -225,7 +271,7 @@ function updateGitignore(root, platform = "node") {
 				".vinext"
 			])
 		},
-		...platform === "cloudflare" ? [{
+		...platform === "cloudflare" && legacyWrangler ? [{
 			entry: ".wrangler/",
 			coveredBy: /* @__PURE__ */ new Set([
 				"/.wrangler/",
@@ -233,6 +279,15 @@ function updateGitignore(root, platform = "node") {
 				".wrangler/",
 				".wrangler"
 			])
+		}] : [],
+		...platform === "cloudflare" && !legacyWrangler ? [{
+			entry: ".cloudflare/",
+			coveredBy: /* @__PURE__ */ new Set([
+				"/.cloudflare/",
+				"/.cloudflare",
+				".cloudflare/",
+				".cloudflare"
+			])
 		}] : []
 	];
 	let content = "";
@@ -248,26 +303,45 @@ function updateGitignore(root, platform = "node") {
 	return true;
 }
 function setupNodePlatform(context) {
-	if (context.viteConfigExists && !context.force) return {
-		generatedViteConfig: false,
-		skippedViteConfig: true,
-		generatedPlatformFiles: [],
-		nextSteps: []
-	};
-	fs.writeFileSync(context.existingViteConfigPath ?? path.join(context.root, "vite.config.ts"), generateViteConfig(context.isAppRouter, context.prerender), "utf-8");
+	if (context.viteConfigExists && !context.force) {
+		if (context.hasCssModules && context.existingViteConfigPath) {
+			const current = fs.readFileSync(context.existingViteConfigPath, "utf-8");
+			const update = updateViteConfigForCssModules(context.existingViteConfigPath, current);
+			if (update.code !== current) fs.writeFileSync(context.existingViteConfigPath, update.code);
+			return {
+				generatedViteConfig: update.code !== current,
+				skippedViteConfig: update.code === current,
+				generatedPlatformFiles: [],
+				nextSteps: [],
+				preservedExistingGenerateScopedName: update.preservedExistingGenerateScopedName
+			};
+		}
+		return {
+			generatedViteConfig: false,
+			skippedViteConfig: true,
+			generatedPlatformFiles: [],
+			nextSteps: [],
+			preservedExistingGenerateScopedName: false
+		};
+	}
+	fs.writeFileSync(context.existingViteConfigPath ?? path.join(context.root, "vite.config.ts"), generateViteConfig(context.isAppRouter, context.prerender, context.hasCssModules), "utf-8");
 	return {
 		generatedViteConfig: true,
 		skippedViteConfig: false,
 		generatedPlatformFiles: [],
-		nextSteps: []
+		nextSteps: [],
+		preservedExistingGenerateScopedName: false
 	};
 }
 async function init(options) {
 	const root = path.resolve(options.root);
-	const port = options.port ?? 3001;
 	if (!options.platform) throw new Error("A deployment platform must be selected before running vinext init.");
 	const platform = options.platform;
 	if (platform === "cloudflare" && !options.cloudflare) throw new Error("Cloudflare init options must be resolved before running vinext init.");
+	const cloudflareOptions = platform === "cloudflare" && options.prerender ? {
+		...options.cloudflare,
+		prerender: true
+	} : options.cloudflare;
 	const exec = options._exec ?? ((cmd, opts) => new Promise((resolve, reject) => {
 		const child = spawn(cmd, {
 			cwd: opts.cwd,
@@ -312,15 +386,17 @@ async function init(options) {
 	}
 	const viteConfigExists = hasViteConfig(root);
 	const isApp = detectProject(root).isAppRouter;
+	const hasCssModules = !options.skipCssModules && scanCssModuleFiles(root);
 	const pmName = detectPackageManagerName(root);
 	const shouldInstall = options.install ?? true;
 	if (platform === "cloudflare") validateCloudflarePlatformSetup({
 		root,
 		isAppRouter: isApp,
 		existingViteConfigPath,
-		prerender: options.prerender,
+		hasCssModules,
 		today: options._today
-	}, options.cloudflare);
+	}, cloudflareOptions);
+	else if (hasCssModules && existingViteConfigPath && !options.force) updateViteConfigForCssModules(existingViteConfigPath, fs.readFileSync(existingViteConfigPath, "utf-8"));
 	if (!options.skipCheck) {
 		console.log("  Running compatibility check...\n");
 		const { runCheck, formatReport } = await import("./check.js");
@@ -336,30 +412,34 @@ async function init(options) {
 		existingViteConfigPath = renamedPath;
 	}
 	const addedTypeModule = ensureESModule(root);
-	const addedScripts = addScripts(root, port, platform, {
+	const addedScripts = addScripts(root, options.port, platform, {
+		deployResponseStore: options.cloudflare?.cdnCache === "response-store" && (options.cloudflare.responseStoreMode ?? "service-binding") === "service-binding",
 		warmCdnCache: options.cloudflare?.warmCdnCache ?? false,
+		legacyWrangler: options.cloudflare?.legacyWrangler,
 		scriptNames: options.scriptNames
 	});
 	const setupContext = {
 		root,
 		isAppRouter: isApp,
 		existingViteConfigPath,
+		packageManager: pmName,
 		viteConfigExists,
 		force: options.force ?? false,
 		prerender: options.prerender,
+		hasCssModules,
 		today: options._today
 	};
-	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, options.cloudflare) : setupNodePlatform(setupContext);
+	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, cloudflareOptions) : setupNodePlatform(setupContext);
 	const { generatedViteConfig, skippedViteConfig, generatedPlatformFiles } = platformSetup;
-	const updatedGitignore = updateGitignore(root, platform);
-	const neededDeps = getInitDependencyGroups(isApp, platform);
+	const updatedGitignore = updateGitignore(root, platform, options.cloudflare?.legacyWrangler);
+	const neededDeps = getInitDependencyGroups(isApp, platform, options.cloudflare, hasCssModules);
 	const missingDependencies = neededDeps.dependencies.filter((dep) => !isDepInstalled(root, dep));
 	const missingDevDependencies = neededDeps.devDependencies.filter((dep) => !isDepInstalled(root, dep));
 	let dependencyInstallNeedsApproval = false;
 	const dependencyEntriesAdded = [];
 	const devDependencyEntriesAdded = [];
-	if (isApp && missingDependencies.includes("react-server-dom-webpack")) {
-		const reactUpgrade = getReactUpgradeDeps(root);
+	if (isApp && (!shouldInstall || missingDependencies.includes("react-server-dom-webpack"))) {
+		const reactUpgrade = getReactUpgradeDeps(root, { fromManifest: !shouldInstall });
 		if (reactUpgrade.length > 0) {
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
@@ -426,16 +506,18 @@ async function init(options) {
 	if (dependencyInstallNeedsApproval) console.log(`    ${terminalStyle.yellow("!")} Dependency installation is waiting for build-script approval`);
 	if (addedTypeModule) console.log(`    ${terminalStyle.green("✓")} Added "type": "module" to package.json`);
 	for (const [oldName, newName] of renamedConfigs) console.log(`    ${terminalStyle.green("✓")} Renamed ${oldName} \u2192 ${newName}`);
-	for (const script of addedScripts) console.log(`    ${terminalStyle.green("✓")} Added ${script} script`);
+	for (const script of addedScripts) console.log(`    ${terminalStyle.green("✓")} Configured ${script} script`);
 	if (generatedViteConfig) console.log(`    ${terminalStyle.green("✓")} Generated vite.config.ts`);
 	for (const file of generatedPlatformFiles) console.log(`    ${terminalStyle.green("✓")} Generated ${file}`);
 	if (skippedViteConfig) console.log(`    ${terminalStyle.yellow("-")} Skipped vite.config.ts (already exists, use --force to overwrite)`);
 	if (updatedGitignore) console.log(`    ${terminalStyle.green("✓")} Added vinext output directories to .gitignore`);
+	if (hasCssModules) console.log(`    ${terminalStyle.green("✓")} Configured vite-css-modules for CSS Modules`);
+	if (platformSetup.preservedExistingGenerateScopedName) console.log(`    ${terminalStyle.yellow("!")} Preserved existing css.modules.generateScopedName; verify it produces identical class names in SSR and client builds`);
 	const nextSteps = [...platformSetup.nextSteps];
 	if (dependencyInstallNeedsApproval) nextSteps.push("Dependency installation is incomplete because pnpm blocked dependency build scripts:", "1. Review and approve the required build scripts:", "   pnpm approve-builds", "2. Finish installing dependencies:", "   pnpm install");
 	const scriptName = (name) => options.scriptNames === "standard" ? name : `${name}:vinext`;
 	const deployCommandStep = platform === "cloudflare" ? `    ${pmName} run ${scriptName("deploy")} Deploy to Cloudflare Workers\n` : "";
-	const startCommandDescription = platform === "cloudflare" ? "Start the built Worker locally with Wrangler" : "Start vinext production server";
+	const startCommandDescription = platform === "cloudflare" ? !options.cloudflare?.legacyWrangler ? "Preview the built Worker locally" : "Start the built Worker locally with Wrangler" : "Start vinext production server";
 	console.log(`
   ${terminalStyle.cyan(terminalStyle.bold("Next steps:"))}
 ${nextSteps.map((step) => `    ${step}`).join("\n")}${nextSteps.length > 0 ? "\n" : ""}
@@ -457,4 +539,4 @@ ${deployCommandStep}${options.scriptNames === "standard" ? "" : `    ${pmName} r
 	};
 }
 //#endregion
-export { addScripts, generateViteConfig, getInitDependencyGroups, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };
+export { addScripts, generateViteConfig, getInitDependencyGroups, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, scanCssModuleFiles, updateGitignore };

package/dist/plugins/action-owner-manifest.d.ts

@@ -2,13 +2,12 @@ import { AppRoute } from "../routing/app-route-graph.js";
 import { Plugin, ResolvedConfig } from "vite";
 import { RscPluginManager } from "@vitejs/plugin-rsc";
 //#region src/plugins/action-owner-manifest.d.ts
-declare const ACTION_OWNER_MANIFEST_ID = "virtual:vinext-action-owner-manifest";
-declare function createActionOwnerManifestPlugin(options: {
+export declare const ACTION_OWNER_MANIFEST_ID = "virtual:vinext-action-owner-manifest";
+export declare function createActionOwnerManifestPlugin(options: {
   canonicalizeModuleId: (id: string) => string;
   getManager: (config: ResolvedConfig) => Promise<RscPluginManager | undefined>;
   getRoutes: () => readonly AppRoute[];
   getSharedRoots: () => readonly string[];
   onComplete?: () => void;
 }): Plugin;
-//#endregion
-export { ACTION_OWNER_MANIFEST_ID, createActionOwnerManifestPlugin };
+//#endregion

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

@@ -18,6 +18,7 @@ function createActionOwnerManifestPlugin(options) {
 	let config;
 	let routeReachability = /* @__PURE__ */ new Map();
 	let manifest = {};
+	const rscOutputDirs = /* @__PURE__ */ new Set();
 	return {
 		name: "vinext:action-owner-manifest",
 		configResolved(resolvedConfig) {
@@ -33,6 +34,9 @@ function createActionOwnerManifestPlugin(options) {
 		load(id) {
 			if (id === RESOLVED_ACTION_OWNER_MANIFEST_ID) return "export default null";
 		},
+		outputOptions(output) {
+			if (this.environment.name === "rsc" && output.dir) rscOutputDirs.add(output.dir);
+		},
 		async generateBundle() {
 			const manager = await options.getManager(config);
 			if (!manager) throw new Error("vinext: failed to access @vitejs/plugin-rsc through getPluginApi().");
@@ -70,11 +74,14 @@ function createActionOwnerManifestPlugin(options) {
 		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`);
+				if (rscOutputDirs.size === 0) rscOutputDirs.add(builder.config.environments.rsc.build.outDir);
+				await Promise.all([...rscOutputDirs].map(async (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 = {};
+				rscOutputDirs.clear();
 				options.onComplete?.();
 			}
 		}

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

@@ -1,15 +1,14 @@
-import { AstRecord } from "./ast-utils.js";
+import { ESTree } from "vite";
 //#region src/plugins/ast-scope.d.ts
-type AstScope = {
+export type AstScope = {
   parent: AstScope | null;
   bindings: Set<string>;
 };
-declare function createAstScope<T extends AstScope>(parent: T | null): AstScope;
-declare function hasAstBinding(scope: AstScope, name: string): boolean;
-declare function isFunctionNode(node: AstRecord): boolean;
-declare function collectDirectScopeBindings(node: AstRecord, scope: AstScope, onVariableDeclarator?: (declaration: AstRecord, declarator: AstRecord) => void): void;
-declare function collectLoopScopeBindings(node: AstRecord, scope: AstScope, onVariableDeclarator?: (declaration: AstRecord, declarator: AstRecord) => void): void;
-declare function collectSwitchScopeBindings(node: AstRecord, scope: AstScope, onVariableDeclarator?: (declaration: AstRecord, declarator: AstRecord) => void): void;
-declare function collectVarScopeBindings(node: AstRecord, scope: AstScope, root?: boolean): void;
-//#endregion
-export { AstScope, collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode };
+export declare function createAstScope<T extends AstScope>(parent: T | null): AstScope;
+export declare function hasAstBinding(scope: AstScope, name: string): boolean;
+export declare function isFunctionNode(node: ESTree.Node): node is ESTree.Function | ESTree.ArrowFunctionExpression;
+export declare function collectDirectScopeBindings(node: ESTree.Node, scope: AstScope, onVariableDeclarator?: (declaration: ESTree.VariableDeclaration, declarator: ESTree.VariableDeclarator) => void): void;
+export declare function collectLoopScopeBindings(node: ESTree.ForStatement | ESTree.ForInStatement | ESTree.ForOfStatement, scope: AstScope, onVariableDeclarator?: (declaration: ESTree.VariableDeclaration, declarator: ESTree.VariableDeclarator) => void): void;
+export declare function collectSwitchScopeBindings(node: ESTree.SwitchStatement, scope: AstScope, onVariableDeclarator?: (declaration: ESTree.VariableDeclaration, declarator: ESTree.VariableDeclarator) => void): void;
+export declare function collectVarScopeBindings(node: ESTree.Node, scope: AstScope, root?: boolean): void;
+//#endregion

package/dist/plugins/ast-scope.js

@@ -1,4 +1,4 @@
-import { collectBindingNames, forEachAstChild, isAstRecord, nodeArray } from "./ast-utils.js";
+import { collectBindingNames, forEachAstChild } from "./ast-utils.js";
 //#region src/plugins/ast-scope.ts
 function createAstScope(parent) {
 	return {
@@ -14,17 +14,15 @@ function isFunctionNode(node) {
 	return node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
 }
 function collectDirectScopeBindings(node, scope, onVariableDeclarator) {
-	for (const statementValue of nodeArray(node.body)) {
-		const statement = isAstRecord(statementValue) ? statementValue : null;
-		if (!statement) continue;
-		const declaration = statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration" ? isAstRecord(statement.declaration) ? statement.declaration : null : statement;
+	const statements = node.type === "Program" || node.type === "BlockStatement" || node.type === "StaticBlock" || node.type === "TSModuleBlock" ? node.body : node.type === "SwitchCase" ? node.consequent : [];
+	for (const statement of statements) {
+		const declaration = statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration" ? statement.declaration : statement;
 		if (!declaration) continue;
 		if (declaration.type === "ImportDeclaration") {
 			if (declaration.importKind === "type") continue;
-			for (const specifier of nodeArray(declaration.specifiers)) if (isAstRecord(specifier) && specifier.importKind !== "type") collectBindingNames(specifier.local, scope.bindings);
+			for (const specifier of declaration.specifiers) if (specifier.type !== "ImportSpecifier" || specifier.importKind !== "type") collectBindingNames(specifier.local, scope.bindings);
 		} else if (declaration.type === "TSImportEqualsDeclaration" && declaration.importKind !== "type") collectBindingNames(declaration.id, scope.bindings);
-		else if (declaration.type === "VariableDeclaration" && declaration.declare !== true) for (const declarator of nodeArray(declaration.declarations)) {
-			if (!isAstRecord(declarator)) continue;
+		else if (declaration.type === "VariableDeclaration" && declaration.declare !== true) for (const declarator of declaration.declarations) {
 			collectBindingNames(declarator.id, scope.bindings);
 			onVariableDeclarator?.(declaration, declarator);
 		}
@@ -34,28 +32,18 @@ function collectDirectScopeBindings(node, scope, onVariableDeclarator) {
 }
 function collectLoopScopeBindings(node, scope, onVariableDeclarator) {
 	const declarationValue = node.type === "ForStatement" ? node.init : node.left;
-	if (!isAstRecord(declarationValue)) return;
-	if (declarationValue.type !== "VariableDeclaration" || declarationValue.declare === true) return;
-	for (const declarator of nodeArray(declarationValue.declarations)) {
-		if (!isAstRecord(declarator)) continue;
+	if (!declarationValue || declarationValue.type !== "VariableDeclaration" || declarationValue.declare === true) return;
+	for (const declarator of declarationValue.declarations) {
 		collectBindingNames(declarator.id, scope.bindings);
 		onVariableDeclarator?.(declarationValue, declarator);
 	}
 }
 function collectSwitchScopeBindings(node, scope, onVariableDeclarator) {
-	for (const caseValue of nodeArray(node.cases)) {
-		if (!isAstRecord(caseValue)) continue;
-		collectDirectScopeBindings({
-			type: "BlockStatement",
-			body: nodeArray(caseValue.consequent)
-		}, scope, onVariableDeclarator);
-	}
+	for (const switchCase of node.cases) collectDirectScopeBindings(switchCase, scope, onVariableDeclarator);
 }
 function collectVarScopeBindings(node, scope, root = true) {
 	if (!root && (isFunctionNode(node) || node.type === "StaticBlock" || node.type === "TSModuleBlock")) return;
-	if (node.type === "VariableDeclaration" && node.kind === "var" && node.declare !== true) {
-		for (const declarator of nodeArray(node.declarations)) if (isAstRecord(declarator)) collectBindingNames(declarator.id, scope.bindings);
-	}
+	if (node.type === "VariableDeclaration" && node.kind === "var" && node.declare !== true) for (const declarator of node.declarations) collectBindingNames(declarator.id, scope.bindings);
 	forEachAstChild(node, (child) => collectVarScopeBindings(child, scope, false));
 }
 //#endregion

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

@@ -1,16 +1,7 @@
+import { ESTree } from "vite";
 //#region src/plugins/ast-utils.d.ts
-type AstRecord = {
-  type: string;
-  start?: number;
-  end?: number;
-  [key: string]: unknown;
-};
-type AstRange = AstRecord & {
-  start: number;
-  end: number;
-};
-type ScriptParserLanguage = "js" | "jsx" | "ts" | "tsx";
-declare const SCRIPT_MODULE_ID_RE: RegExp;
+export type ScriptParserLanguage = "js" | "jsx" | "ts" | "tsx";
+export declare const SCRIPT_MODULE_ID_RE: RegExp;
 /**
  * Cheap pre-parse gate for plugins that only transform *dynamic* `import(...)`.
  *
@@ -30,13 +21,13 @@ declare const SCRIPT_MODULE_ID_RE: RegExp;
  * Usable directly as a Rolldown `transform.filter.code` regex, or via
  * {@link mayContainDynamicImport} for an in-handler prescan.
  */
-declare const DYNAMIC_IMPORT_PRESCAN: RegExp;
+export declare const DYNAMIC_IMPORT_PRESCAN: RegExp;
 /**
  * Whether `code` might contain a dynamic `import(...)` call. See
  * {@link DYNAMIC_IMPORT_PRESCAN} — a cheap, deliberately over-inclusive regex
  * gate used to avoid parsing static-import-only modules.
  */
-declare function mayContainDynamicImport(code: string): boolean;
+export declare function mayContainDynamicImport(code: string): boolean;
 /**
  * Select the OXC parser mode for a JavaScript/TypeScript module id.
  *
@@ -44,32 +35,28 @@ declare function mayContainDynamicImport(code: string): boolean;
  * 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;
+export declare function scriptParserLanguage(id: string): ScriptParserLanguage | null;
+export declare function isIdentifierNamed(value: ESTree.Node | null | undefined, name: string): boolean;
+export declare function getAstName(node: ESTree.Node | null | undefined): string | null;
 /** Remove syntax-only wrappers while preserving the underlying expression. */
-declare function unwrapExpression(value: unknown): AstRecord | null;
+export declare function unwrapExpression(node: ESTree.Node | null | undefined): ESTree.Node | null;
 /** Return the value of a string literal node, without evaluating expressions. */
-declare function stringLiteralValue(value: unknown): string | null;
+export declare function stringLiteralValue(node: ESTree.Node | null | undefined): string | null;
 /** Return the value of a boolean literal node, without evaluating expressions. */
-declare function booleanLiteralValue(value: unknown): boolean | null;
+export declare function booleanLiteralValue(node: ESTree.Node | null | undefined): 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;
+export declare function staticStringValue(node: ESTree.Node | null | undefined): string | null;
+export declare function forEachAstChild(node: ESTree.Node, callback: (child: ESTree.Node) => 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, SCRIPT_MODULE_ID_RE, ScriptParserLanguage, booleanLiteralValue, collectBindingNames, forEachAstChild, getAstName, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray, scriptParserLanguage, staticStringValue, stringLiteralValue, unwrapExpression, walkAst };
+export declare function walkAst(node: ESTree.Node, visitor: (node: ESTree.Node) => boolean | void): void;
+export declare function collectBindingNames(node: ESTree.Node | null | undefined, target: Set<string>): void;
+//#endregion