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

package/dist/plugins/ignore-dynamic-requests.js

@@ -1,7 +1,9 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { DYNAMIC_IMPORT_PRESCAN, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray } from "./ast-utils.js";
-import { createTransformCache } from "./transform-cache.js";
+import { stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
+import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray, scriptParserLanguage, stringLiteralValue, unwrapExpression } from "./ast-utils.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, hasAstBinding, isFunctionNode } from "./ast-scope.js";
+import { createTransformCache } from "./transform-cache.js";
 import { parseAst } from "vite";
 import { fileURLToPath } from "node:url";
 import MagicString from "magic-string";
@@ -12,37 +14,9 @@ const DYNAMIC_REQUEST_PRESCAN = new RegExp(String.raw`(?:${REQUIRE_PRESCAN.sourc
 const MAX_CONSTANT_BINDING_DEPTH = 1500;
 const VINEXT_SOURCE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const PLUGIN_RSC_PATH = /[\\/]node_modules[\\/](?:\.pnpm[\\/][^/\\]+[\\/]node_modules[\\/])?@vitejs[\\/]plugin-rsc[\\/]/;
-const TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
-	".js",
-	".jsx",
-	".mjs",
-	".cjs",
-	".ts",
-	".tsx",
-	".mts",
-	".cts"
-]);
-const TRANSPARENT_EXPRESSIONS = /* @__PURE__ */ new Set([
-	"ChainExpression",
-	"ParenthesizedExpression",
-	"TSAsExpression",
-	"TSInstantiationExpression",
-	"TSNonNullExpression",
-	"TSSatisfiesExpression",
-	"TSTypeAssertion"
-]);
 function astNode(value) {
 	return isAstRecord(value) ? value : null;
 }
-function unwrapExpression(value) {
-	const node = astNode(value);
-	if (!node || !TRANSPARENT_EXPRESSIONS.has(node.type)) return node;
-	return unwrapExpression(node.expression);
-}
-function stringValue(node) {
-	if ((node.type === "Literal" || node.type === "StringLiteral") && typeof node.value === "string") return node.value;
-	return null;
-}
 function stringFromCharCodeValue(value, scope) {
 	const node = unwrapExpression(value);
 	if (node?.type !== "CallExpression") return null;
@@ -61,10 +35,10 @@ function stringFromCharCodeValue(value, scope) {
 function isUnboundNumericGlobal(node, scope) {
 	return node.type === "Identifier" && typeof node.name === "string" && !hasAstBinding(scope, node.name) && (isIdentifierNamed(node, "NaN") || isIdentifierNamed(node, "Infinity"));
 }
-function staticStringValue(value, scope, resolution) {
+function evaluateStaticString(value, scope, resolution) {
 	const node = unwrapExpression(value);
 	if (!node) return null;
-	const valueString = stringValue(node);
+	const valueString = stringLiteralValue(node);
 	if (valueString !== null) return valueString;
 	if (node.type === "TemplateLiteral" && nodeArray(node.expressions).length === 0) {
 		const quasiValue = astNode(nodeArray(node.quasis)[0])?.value;
@@ -73,19 +47,19 @@ function staticStringValue(value, scope, resolution) {
 		return typeof cooked === "string" ? cooked : typeof raw === "string" ? raw : null;
 	}
 	if (node.type === "BinaryExpression" && node.operator === "+") {
-		const left = staticStringValue(node.left, scope, resolution);
-		const right = staticStringValue(node.right, scope, resolution);
+		const left = evaluateStaticString(node.left, scope, resolution);
+		const right = evaluateStaticString(node.right, scope, resolution);
 		return left === null || right === null ? null : left + right;
 	}
 	if (node.type === "ConditionalExpression") {
 		const truthiness = staticTruthiness(node.test, scope, resolution);
-		if (truthiness !== null) return staticStringValue(truthiness ? node.consequent : node.alternate, scope, resolution);
-		const consequent = staticStringValue(node.consequent, scope, resolution);
-		const alternate = staticStringValue(node.alternate, scope, resolution);
+		if (truthiness !== null) return evaluateStaticString(truthiness ? node.consequent : node.alternate, scope, resolution);
+		const consequent = evaluateStaticString(node.consequent, scope, resolution);
+		const alternate = evaluateStaticString(node.alternate, scope, resolution);
 		return consequent !== null && consequent === alternate ? consequent : null;
 	}
-	if (node.type === "SequenceExpression") return staticStringValue(nodeArray(node.expressions).at(-1), scope, resolution);
-	if (node.type === "Identifier" && typeof node.name === "string") return resolveConstantBinding(scope, node.name, resolution, null, staticStringValue);
+	if (node.type === "SequenceExpression") return evaluateStaticString(nodeArray(node.expressions).at(-1), scope, resolution);
+	if (node.type === "Identifier" && typeof node.name === "string") return resolveConstantBinding(scope, node.name, resolution, null, evaluateStaticString);
 	return null;
 }
 function hasSignificantPathPart(value) {
@@ -196,7 +170,7 @@ function templateTruthiness(node, scope, resolution, useRaw = false) {
 	if (nodeArray(node.quasis).filter(isAstRecord).some((quasi) => templateElementValue(quasi, useRaw) !== "")) return true;
 	let hasUnknownExpression = false;
 	for (const expression of nodeArray(node.expressions)) {
-		const string = staticStringValue(expression, scope, resolution);
+		const string = evaluateStaticString(expression, scope, resolution);
 		if (string !== null) {
 			if (string !== "") return true;
 			continue;
@@ -218,7 +192,7 @@ function staticTruthiness(value, scope, resolution = createConstantResolution())
 		return quasi?.type === "TemplateLiteral" ? templateTruthiness(quasi, scope, resolution, true) : null;
 	}
 	if (node.type === "BinaryExpression" && node.operator === "+") {
-		const string = staticStringValue(node, scope, resolution);
+		const string = evaluateStaticString(node, scope, resolution);
 		return string === null ? null : Boolean(string);
 	}
 	if (isIdentifierNamed(node, "undefined") && !hasAstBinding(scope, "undefined")) return false;
@@ -272,7 +246,7 @@ function stringConcatHasStaticPart(node, scope, resolution) {
 	if (node.type !== "CallExpression") return null;
 	const callee = unwrapExpression(node.callee);
 	const property = callee?.type === "MemberExpression" ? unwrapExpression(callee.property) : null;
-	if (callee?.type !== "MemberExpression" || (callee.computed === true ? property === null || staticStringValue(property, scope, resolution) !== "concat" : !isIdentifierNamed(property, "concat"))) return null;
+	if (callee?.type !== "MemberExpression" || (callee.computed === true ? property === null || evaluateStaticString(property, scope, resolution) !== "concat" : !isIdentifierNamed(property, "concat"))) return null;
 	const receiver = unwrapExpression(callee.object);
 	if (!receiver || !isStaticStringExpression(receiver, scope, resolution)) return null;
 	if (requestHasStaticPart(receiver, scope, resolution)) return true;
@@ -284,7 +258,7 @@ function stringConcatHasStaticPart(node, scope, resolution) {
 function isStaticStringExpression(value, scope, resolution) {
 	const node = unwrapExpression(value);
 	if (!node) return false;
-	if (stringValue(node) !== null || node.type === "TemplateLiteral") return true;
+	if (stringLiteralValue(node) !== null || node.type === "TemplateLiteral") return true;
 	if (node.type === "Identifier" && typeof node.name === "string") return resolveConstantBinding(scope, node.name, resolution, false, isStaticStringExpression);
 	if (node.type === "BinaryExpression" && node.operator === "+") return additionContainsString(node, scope, resolution);
 	if (node.type === "ConditionalExpression") return isStaticStringExpression(node.consequent, scope, resolution) && isStaticStringExpression(node.alternate, scope, resolution);
@@ -295,7 +269,7 @@ function isStaticStringExpression(value, scope, resolution) {
 function additionContainsString(value, scope, resolution) {
 	const node = unwrapExpression(value);
 	if (!node) return false;
-	if (stringValue(node) !== null || node.type === "TemplateLiteral") return true;
+	if (stringLiteralValue(node) !== null || node.type === "TemplateLiteral") return true;
 	if (node.type === "Identifier" && typeof node.name === "string") return resolveConstantBinding(scope, node.name, resolution, false, additionContainsString);
 	if (node.type === "BinaryExpression" && node.operator === "+") return additionContainsString(node.left, scope, resolution) || additionContainsString(node.right, scope, resolution);
 	if (node.type === "ConditionalExpression") return additionContainsString(node.consequent, scope, resolution) && additionContainsString(node.alternate, scope, resolution);
@@ -305,7 +279,7 @@ function additionContainsString(value, scope, resolution) {
 function requestHasStaticPart(value, scope, resolution = createConstantResolution()) {
 	const node = unwrapExpression(value);
 	if (!node) return false;
-	const constantString = stringValue(node);
+	const constantString = stringLiteralValue(node);
 	if (constantString !== null) return constantString.replaceAll("\\", "/") !== "/";
 	if (node.type === "Literal") return true;
 	if (isUnboundNumericGlobal(node, scope)) return true;
@@ -325,8 +299,8 @@ function requestHasStaticPart(value, scope, resolution = createConstantResolutio
 		if (!additionContainsString(node, scope, resolution)) return false;
 		const left = unwrapExpression(node.left);
 		const right = unwrapExpression(node.right);
-		const leftString = left ? stringValue(left) : null;
-		const rightString = right ? stringValue(right) : null;
+		const leftString = left ? stringLiteralValue(left) : null;
+		const rightString = right ? stringLiteralValue(right) : null;
 		return leftString !== null && hasSignificantPathPart(leftString) || rightString !== null && hasSignificantPathPart(rightString) || leftString === null && requestHasStaticPart(left, scope, resolution) || rightString === null && requestHasStaticPart(right, scope, resolution);
 	}
 	if (node.type === "ConditionalExpression") {
@@ -401,8 +375,7 @@ function dynamicImportReplacement() {
 }
 function transformVeryDynamicRequests(code, id) {
 	if (!REQUIRE_PRESCAN.test(code) && !mayContainDynamicImport(code)) return null;
-	const extension = path.extname(id.split("?", 1)[0]);
-	const lang = extension === ".ts" || extension === ".mts" || extension === ".cts" ? "ts" : extension === ".tsx" ? "tsx" : extension === ".js" || extension === ".jsx" || extension === ".mjs" || extension === ".cjs" ? "jsx" : "js";
+	const lang = scriptParserLanguage(id) ?? "js";
 	let ast;
 	try {
 		ast = parseAst(code, { lang });
@@ -521,13 +494,10 @@ function transformVeryDynamicRequests(code, id) {
 	}
 	for (const statement of nodeArray(root.body)) if (isAstRecord(statement)) visit(statement, rootScope);
 	if (!changed) return null;
-	return {
-		code: output.toString(),
-		map: output.generateMap({
-			hires: "boundary",
-			source: id
-		})
-	};
+	return magicStringTransformResult(output, {
+		hires: "boundary",
+		source: id
+	});
 }
 function createIgnoreDynamicRequestsPlugin(getTranspiledPackages = () => []) {
 	const cached = createTransformCache();
@@ -536,12 +506,12 @@ function createIgnoreDynamicRequestsPlugin(getTranspiledPackages = () => []) {
 		enforce: "pre",
 		transform: {
 			filter: {
-				id: { include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/ },
+				id: { include: SCRIPT_MODULE_ID_RE },
 				code: DYNAMIC_REQUEST_PRESCAN
 			},
 			handler(code, id) {
-				const cleanId = id.split("?", 1)[0];
-				if (!TRANSFORMABLE_EXTENSIONS.has(path.extname(cleanId))) return null;
+				const cleanId = stripViteModuleQuery(id);
+				if (scriptParserLanguage(cleanId) === null) return null;
 				if (!shouldTransformVeryDynamicRequests(this.environment, cleanId, getTranspiledPackages())) return null;
 				const absoluteId = path.resolve(cleanId);
 				if (absoluteId === VINEXT_SOURCE_ROOT || absoluteId.startsWith(`${VINEXT_SOURCE_ROOT}/`) || PLUGIN_RSC_PATH.test(absoluteId)) return null;

package/dist/plugins/import-meta-url.d.ts

@@ -1,15 +1,21 @@
-import { Plugin } from "vite";
-import MagicString from "magic-string";
+import { MagicStringTransformResult } from "./transform-result.js";
+import { Plugin, ResolvedConfig } from "vite";
 //#region src/plugins/import-meta-url.d.ts
 type ImportMetaUrlEnvironment = "client" | "server";
-type RewriteResult = {
-  code: string;
-  map: ReturnType<MagicString["generateMap"]>;
+type ImportMetaUrlCapability = {
+  /** The Vite app plugin. Owns project, dependency, and emitted-chunk identity. */
+  vitePlugin: Plugin;
+  /** Thin adapter for Vite's independent dependency-optimizer Rolldown pipeline. */
+  optimizeDepsPlugin: Plugin;
+  /** Cached dependency identity/format classifier shared by both plugin pipelines. */
+  isBundledCommonJsDependencyId: (id: string) => boolean;
 };
+type EmittedModuleFileNameResolver = (environmentName: string | undefined, fileName: string) => string;
 declare function createImportMetaUrlPlugin(options: {
   getRoot: () => string | undefined;
-}): Plugin;
-declare function rewriteImportMetaUrl(code: string, id: string, root: string, environment: ImportMetaUrlEnvironment): RewriteResult | null;
-declare function rewriteServerCjsGlobals(code: string, id: string, root: string): RewriteResult | null;
+  createEmittedModuleFileNameResolver?: (config: ResolvedConfig) => EmittedModuleFileNameResolver | undefined;
+}): ImportMetaUrlCapability;
+declare function rewriteImportMetaUrl(code: string, id: string, root: string, environment: ImportMetaUrlEnvironment): MagicStringTransformResult | null;
+declare function rewriteServerCjsGlobals(code: string, id: string, root: string): MagicStringTransformResult | null;
 //#endregion
-export { createImportMetaUrlPlugin, rewriteImportMetaUrl, rewriteServerCjsGlobals };
+export { EmittedModuleFileNameResolver, ImportMetaUrlCapability, createImportMetaUrlPlugin, rewriteImportMetaUrl, rewriteServerCjsGlobals };