vxrn 2.8.0 → 2.9.0

package/dist/utils/createNativeDevEngine.native.js

@@ -3,9 +3,11 @@ import { basename, dirname, extname, join, relative, resolve } from "path";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, watch, writeFileSync } from "fs";
 import { pathToFileURL } from "url";
 import micromatch from "micromatch";
+import { parseSync } from "oxc-parser";
 import { loadEnv, normalizePath } from "vite";
 import { shouldStripFlow, transformHermesAsync } from "@vxrn/compiler";
 import { resolvePath } from "@vxrn/resolve";
+import { nativeAppDefines } from "@vxrn/utils/nativeAppManifest";
 import { withExpoPublicEnvAliases } from "@vxrn/utils/publicEnv";
 import { DEFAULT_ASSET_EXTS } from "../constants/defaults.native.js";
 import { getNativePrelude } from "../runtime/native-prelude.native.js";
@@ -152,6 +154,7 @@ function getNativeTransformConfig(platform, dev, root) {
 		jsx: { runtime: "classic" },
 		define: {
 			...userDefines,
+			...nativeAppDefines(entryConfig.app),
 			...envDefines,
 			"process.env.NODE_ENV": JSON.stringify(mode),
 			"process.env.VXRN_REACT_19": "false",
@@ -179,7 +182,7 @@ function getNativeTransformConfig(platform, dev, root) {
 	};
 }
 function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, onAsset) {
-	var sourceMaps = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false, userPlugins = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : [];
+	var sourceMaps = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false, userPlugins = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : [], minify = arguments.length > 8 && arguments[8] !== void 0 ? arguments[8] : false;
 	var _globalThis___vxrnAddNativePlugins, _globalThis;
 	var context = {
 		root,
@@ -201,6 +204,7 @@ function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest,
 		rnCodegenPlugin({ projectRoot: root }),
 		flowStripPlugin(),
 		vxrnCompilerPlugin(platform, dev, root, sourceMaps),
+		mixedNativeModulePlugin(sourceMaps),
 		nativeAnimatedGuardPlugin(),
 		assetPlugin({
 			root,
@@ -208,7 +212,7 @@ function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest,
 			assetsDest,
 			onAsset
 		}),
-		hermesCompatSWCPlugin(dev, sourceMaps),
+		hermesCompatSWCPlugin(dev, sourceMaps, !minify),
 		hermesLoopsPlugin(sourceMaps),
 		...userPlugins,
 		nativeExportsPrecedencePlugin(root, platform),
@@ -228,11 +232,108 @@ function getNativeOutputOptions(prelude, sourcemap, minify) {
 		intro: prelude,
 		codeSplitting: false,
 		strictExecutionOrder: true,
-		minify: minify || "dce-only"
+		minify: minify || "dce-only",
+		keepNames: !minify
 	};
 }
 function normalizeNativeCommonJSInterop(code) {
-	return code.replace(/(\b__toESM(?:\$\d+)?\(\s*(?:require[\w$]*\(\)|[\w$]+|__rolldown_runtime__\.loadExports\("(?:\\.|[^"\\])*"\))\s*),\s*1(\s*\))/g, "$1$2");
+	if (!code.includes("__toESM")) return code;
+	var { program, errors } = parseSync("native-bundle.js", code, { lang: "js" });
+	if (errors.length) throw new Error(`[vxrn] cannot normalize native CommonJS interop: the bundle does not parse (${errors[0].message})`);
+	var deletions = [];
+	var stack = [program];
+	while (stack.length) {
+		var node = stack.pop();
+		if (Array.isArray(node)) {
+			for (var index = node.length - 1; index >= 0; index--) stack.push(node[index]);
+			continue;
+		}
+		if (!isInteropSyntaxNode(node)) continue;
+		if (node.type === "CallExpression") {
+			var span = interopNodeModeSpan(code, node);
+			if (span) deletions.push(span);
+		}
+		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+		try {
+			for (var _iterator = Object.keys(node)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+				var key = _step.value;
+				stack.push(node[key]);
+			}
+		} catch (err) {
+			_didIteratorError = true;
+			_iteratorError = err;
+		} finally {
+			try {
+				if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+			} finally {
+				if (_didIteratorError) throw _iteratorError;
+			}
+		}
+	}
+	deletions.sort(function(a, b) {
+		return b[0] - a[0];
+	});
+	var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+	try {
+		for (var _iterator1 = deletions[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+			var [start, end] = _step1.value;
+			code = code.slice(0, start) + code.slice(end);
+		}
+	} catch (err) {
+		_didIteratorError1 = true;
+		_iteratorError1 = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
+		} finally {
+			if (_didIteratorError1) throw _iteratorError1;
+		}
+	}
+	return code;
+}
+function isInteropSyntaxNode(node) {
+	if (!node || typeof node !== "object") return false;
+	var candidate = node;
+	return typeof candidate.type === "string" && typeof candidate.start === "number" && typeof candidate.end === "number";
+}
+var NATIVE_INTEROP_HELPER = /^__toESM(?:\$\d+)?$/;
+var NATIVE_INTEROP_REQUIRE = /^require[\w$]*$/;
+function interopNodeModeSpan(code, node) {
+	var callee = node["callee"];
+	if (!isInteropSyntaxNode(callee) || !isInteropHelperCallee(callee) || node["optional"] === true) return;
+	var args = node["arguments"];
+	if (!Array.isArray(args) || args.length !== 2) return void 0;
+	var [first, second] = args;
+	if (!isInteropSyntaxNode(first) || !isInteropSyntaxNode(second)) return void 0;
+	if (!isInteropFirstArgument(first)) return void 0;
+	if (second.type !== "Literal" || second["raw"] !== "1") return void 0;
+	var between = code.slice(first.end, second.start);
+	if (!/^\s*,\s*$/.test(between)) return void 0;
+	if (!/^\s*\)/.test(code.slice(second.end))) return void 0;
+	return [first.end + between.indexOf(","), second.end];
+}
+function isInteropHelperCallee(callee) {
+	if (callee.type === "Identifier") return typeof callee["name"] === "string" && NATIVE_INTEROP_HELPER.test(callee["name"]);
+	if ((callee.type === "MemberExpression" || callee.type === "StaticMemberExpression") && callee["computed"] !== true) {
+		var property = callee["property"];
+		return isInteropSyntaxNode(property) && property.type === "Identifier" && typeof property["name"] === "string" && NATIVE_INTEROP_HELPER.test(property["name"]);
+	}
+	return false;
+}
+function isInteropFirstArgument(node) {
+	if (node.type === "Identifier") return true;
+	if (node.type !== "CallExpression" || node["optional"] === true) return false;
+	var callee = node["callee"];
+	if (!isInteropSyntaxNode(callee)) return false;
+	var args = node["arguments"];
+	if (!Array.isArray(args)) return false;
+	if (callee.type === "Identifier") return typeof callee["name"] === "string" && NATIVE_INTEROP_REQUIRE.test(callee["name"]) && args.length === 0;
+	if ((callee.type === "MemberExpression" || callee.type === "StaticMemberExpression") && callee["computed"] !== true && callee["optional"] !== true) {
+		var object = callee["object"];
+		var property = callee["property"];
+		return isInteropSyntaxNode(object) && object.type === "Identifier" && object["name"] === "__rolldown_runtime__" && isInteropSyntaxNode(property) && property.type === "Identifier" && property["name"] === "loadExports" && args.length === 1 && isInteropSyntaxNode(args[0]) && args[0].type === "Literal" && typeof args[0]["value"] === "string";
+	}
+	return false;
 }
 function blankPreservingLines(match) {
 	var _ref;
@@ -476,9 +577,26 @@ try {
 		});
 		if (chunk && "code" in chunk) {
 			firstBuildError = null;
-			var code = postProcessNativeBundle(chunk.code);
-			code = await downlevelClassFieldsInBundle(code);
-			assertBundleLinesPreserved(chunk.code, code, "dev");
+			var code;
+			try {
+				code = postProcessNativeBundle(chunk.code);
+				code = await downlevelClassFieldsInBundle(code);
+				assertBundleLinesPreserved(chunk.code, code, "dev");
+			} catch (error) {
+				var failure = error instanceof Error ? error : new Error(String(error));
+				console.error("[vxrn] native bundle post-processing failed:", failure.message);
+				if (!currentBundle) {
+					firstBuildError = failure;
+					if (bundleReject) {
+						var reject1 = bundleReject;
+						bundleResolve = null;
+						bundleReject = null;
+						bundlePromise = null;
+						reject1(failure);
+					}
+				}
+				return;
+			}
 			code = wrapNativeBundleModuleScope(code);
 			if (!chunk.map) throw new Error("[vxrn] rolldown produced no source map for the dev bundle, so /symbolicate cannot resolve a frame");
 			currentBundle = {
@@ -584,7 +702,7 @@ async function buildNativeBundle(options) {
 				dev,
 				platform
 			}).plugin],
-			...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, void 0, sourcemap, userPlugins),
+			...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, void 0, sourcemap, userPlugins, minify),
 			nativeBundlePostProcessPlugin()
 		],
 		output: {
@@ -1317,6 +1435,16 @@ if (import.meta.hot) {
 		}
 	};
 }
+function mixedNativeModulePlugin(sourceMaps) {
+	return {
+		name: "vxrn:mixed-native-module",
+		async transform(code, id) {
+			if (!/\.[cm]?[jt]sx?$/.test(id) || id.includes("\0")) return;
+			var { transformMixedNativeModule } = await import("@vxrn/compiler");
+			return transformMixedNativeModule(code, id, sourceMaps);
+		}
+	};
+}
 function flowStripPlugin() {
 	return {
 		name: "vxrn:flow-strip",
@@ -1485,7 +1613,7 @@ async function getNativeAssetData(id, root, platform) {
 	};
 	if (NATIVE_IMAGE_EXTS.has(requested.type)) try {
 		var { imageSize } = await import("image-size");
-		var dims = imageSize(files[0]);
+		var dims = imageSize(readFileSync(files[0]));
 		assetData.width = dims.width === void 0 ? void 0 : dims.width / scales[0];
 		assetData.height = dims.height === void 0 ? void 0 : dims.height / scales[0];
 	} catch (unused) {}
@@ -1550,7 +1678,7 @@ function copyNativeAssetFiles(asset, assetsDest, platform) {
 	}
 }
 function hermesCompatSWCPlugin(dev) {
-	var sourceMaps = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+	var sourceMaps = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, keepNames = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
 	var oxc = null;
 	return {
 		name: "vxrn:hermes-compat",
@@ -1599,7 +1727,7 @@ ${err.codeframe}` : ""));
 					output = classes;
 				}
 			}
-			var lowered = await transformHermesAsync((_ref = output === null || output === void 0 ? void 0 : output.code) !== null && _ref !== void 0 ? _ref : code, id, sourceMaps);
+			var lowered = await transformHermesAsync((_ref = output === null || output === void 0 ? void 0 : output.code) !== null && _ref !== void 0 ? _ref : code, id, sourceMaps, void 0, keepNames);
 			if (!lowered) return output;
 			if (lowered.map && (output === null || output === void 0 ? void 0 : output.map)) {
 				var remapping1 = (await import("@jridgewell/remapping")).default;
@@ -1775,6 +1903,10 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
       if (!this.isExecuted(changedId)) continue;
       if (!this.findBoundaries(changedId, traversed, updateSet, boundaries)) return false;
     }
+    // register the patch's factories even when no changed module has run yet,
+    // so a later first import executes the edited code rather than a stale one
+    if (globalThis.globalEvalWithSourceUrl) globalThis.globalEvalWithSourceUrl(code);
+    else (0, eval)(code);
     if (boundaries.length === 0) return true;
 
     var callbacks = boundaries.map(function(item) {
@@ -1795,9 +1927,6 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
       };
     }, this);
 
-    if (globalThis.globalEvalWithSourceUrl) globalThis.globalEvalWithSourceUrl(code);
-    else (0, eval)(code);
-
     var modulesToReplace = Array.from(updateSet);
     for (var j = 0; j < modulesToReplace.length; j++) {
       if (!this.hasFactory(modulesToReplace[j])) return false;