@vxrn/vite-plugin-metro 2.13.8 → 2.13.10

package/dist/esm/transformer/metroNativeWorker.mjs

@@ -12,6 +12,21 @@ import { substituteExpoVirtualEnvSource } from "./expoVirtualEnv.mjs";
 import { rejectDOMDirective } from "./rejectDOMDirective.mjs";
 import { getPlatformEnv, metroPlatformToViteEnvironment } from "@vxrn/utils/platformEnv";
 
+function createTransformError(message, code, diagnostic) {
+	let loc = diagnostic.loc ?? diagnostic.errors?.[0]?.location;
+	const label = diagnostic.labels?.[0];
+	if (!loc && label) {
+		const lines = code.slice(0, label.start).split(/\r\n|[\n\r\u2028\u2029]/);
+		loc = {
+			line: lines.length,
+			column: lines.at(-1).length
+		};
+	}
+	return Object.assign(new Error(message), {
+		loc,
+		codeFrame: diagnostic.codeFrame ?? diagnostic.codeframe
+	});
+}
 function collectModuleLiteralBindings(program) {
 	const reassigned = /* @__PURE__ */ new Set();
 	const declCount = /* @__PURE__ */ new Map();
@@ -205,7 +220,7 @@ function resolveAliasSpecifier(specifier, filename, projectRoot, aliases) {
 function applyModuleResolverAliases(code, filename, projectRoot, aliases) {
 	const parsed = parseSync(filename, code, { lang: langForFilename(filename) });
 	if (parsed?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for alias resolution: ${parsed.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for alias resolution: ${parsed.errors[0].message}`, code, parsed.errors[0]);
 	}
 	if (!parsed?.program) return code;
 	const ms = new MagicString(code);
@@ -240,7 +255,7 @@ function applyModuleResolverAliases(code, filename, projectRoot, aliases) {
 function applyInlineEnvVars(code, filename, isProduction, env = {}) {
 	const parsed = parseSync(filename, code, { lang: langForFilename(filename) });
 	if (parsed?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for env inlining: ${parsed.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for env inlining: ${parsed.errors[0].message}`, code, parsed.errors[0]);
 	}
 	if (!parsed?.program) return code;
 	const processPublicEnv = Object.fromEntries(Object.entries(process.env).filter(([key]) => key.startsWith("ONE_PUBLIC_") || key.startsWith("EXPO_PUBLIC_")));
@@ -383,7 +398,7 @@ const GUARD_SPECIFIERS = /* @__PURE__ */ new Set([
 function applyEnvironmentGuard(code, filename) {
 	const parsed = parseSync(filename, code, { lang: langForFilename(filename) });
 	if (parsed?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for environment guards: ${parsed.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for environment guards: ${parsed.errors[0].message}`, code, parsed.errors[0]);
 	}
 	const body = parsed?.program?.body;
 	if (!body) return code;
@@ -408,7 +423,7 @@ function applyOneRouterMetro(code, filename, options) {
 	if (!isMetroEntry && !isEntryCtx) return code;
 	const parsed = parseSync(filename, code, { lang: langForFilename(filename) });
 	if (parsed?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for one-router-metro: ${parsed.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for one-router-metro: ${parsed.errors[0].message}`, code, parsed.errors[0]);
 	}
 	if (!parsed?.program) return code;
 	const ms = new MagicString(code);
@@ -699,10 +714,10 @@ function rewriteDependencyCalls(code, dependencies, depMapName = "_dependencyMap
 	try {
 		parsed = parseSync(filename, code, { lang: langForFilename(filename) });
 	} catch (err) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for dependency rewriting: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for dependency rewriting: ${err.message || err}`, code, err);
 	}
 	if (parsed?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for dependency rewriting: ${parsed.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for dependency rewriting: ${parsed.errors[0].message}`, code, parsed.errors[0]);
 	}
 	if (!parsed?.program) return emptyResult;
 	const contextLiteralBindings = collectModuleLiteralBindings(parsed.program);
@@ -843,10 +858,10 @@ function extractDependencies(code, filename, options) {
 	try {
 		parseResult = parseSync(filename, code, { lang: langForFilename(filename) });
 	} catch (err) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for dependency extraction: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for dependency extraction: ${err.message || err}`, code, err);
 	}
 	if (parseResult?.errors?.length) {
-		throw new Error(`[vxrn/metro] Failed to parse ${filename} for dependency extraction: ${parseResult.errors[0].message}`);
+		throw createTransformError(`[vxrn/metro] Failed to parse ${filename} for dependency extraction: ${parseResult.errors[0].message}`, code, parseResult.errors[0]);
 	}
 	if (!parseResult?.program) {
 		return [];
@@ -1118,7 +1133,7 @@ async function transform(config, projectRoot, filename, data, options) {
 				});
 				code2 = minified.code;
 			} catch (err) {
-				throw new Error(`[vxrn/metro] Minifier failed for ${filename}: ${err.message || err}`);
+				throw createTransformError(`[vxrn/metro] Minifier failed for ${filename}: ${err.message || err}`, code2, err);
 			}
 		}
 		const { lineCount: lineCount2, map: map2 } = countLinesAndTerminateMap(code2, []);
@@ -1231,7 +1246,7 @@ async function transform(config, projectRoot, filename, data, options) {
 			}
 		}
 	} catch (err) {
-		throw new Error(`[vxrn/metro] React Native codegen failed for ${filename}: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] React Native codegen failed for ${filename}: ${err.message || err}`, code, err);
 	}
 	if (shouldStripFlow(filename, code)) {
 		try {
@@ -1243,7 +1258,7 @@ async function transform(config, projectRoot, filename, data, options) {
 				}
 			}
 		} catch (err) {
-			throw new Error(`[vxrn/metro] Flow transform failed for ${filename}: ${err.message || err}`);
+			throw createTransformError(`[vxrn/metro] Flow transform failed for ${filename}: ${err.message || err}`, code, err);
 		}
 	}
 	const asyncRequirePath = config.asyncRequireModulePath || "metro-runtime/src/modules/asyncRequire";
@@ -1302,7 +1317,7 @@ async function transform(config, projectRoot, filename, data, options) {
 				}
 			}
 		} catch (err) {
-			throw new Error(`[vxrn/metro] React Compiler failed for ${filename}: ${err.message || err}`);
+			throw createTransformError(`[vxrn/metro] React Compiler failed for ${filename}: ${err.message || err}`, code, err);
 		}
 	}
 	if (shouldRunWorklets) {
@@ -1316,7 +1331,7 @@ async function transform(config, projectRoot, filename, data, options) {
 				}
 			}
 		} catch (err) {
-			throw new Error(`[vxrn/metro] Worklets transform failed for ${filename}: ${err.message || err}`);
+			throw createTransformError(`[vxrn/metro] Worklets transform failed for ${filename}: ${err.message || err}`, code, err);
 		}
 	}
 	const lang = langForFilename(filename);
@@ -1334,10 +1349,10 @@ async function transform(config, projectRoot, filename, data, options) {
 			sourcemap: true
 		});
 	} catch (err) {
-		throw new Error(`[vxrn/metro] Oxc transform failed for ${filename}: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] Oxc transform failed for ${filename}: ${err.message || err}`, code, err);
 	}
 	if (oxcRes.errors?.length) {
-		throw new Error(`[vxrn/metro] Oxc transform failed for ${filename}: ${oxcRes.errors[0].message || oxcRes.errors[0]}`);
+		throw createTransformError(`[vxrn/metro] Oxc transform failed for ${filename}: ${oxcRes.errors[0].message || oxcRes.errors[0]}`, code, oxcRes.errors[0]);
 	}
 	code = oxcRes.code || code;
 	if (oxcRes.map) {
@@ -1352,7 +1367,7 @@ async function transform(config, projectRoot, filename, data, options) {
 			}
 		}
 	} catch (err) {
-		throw new Error(`[vxrn/metro] native async/CJS lowering failed for ${filename}: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] native async/CJS lowering failed for ${filename}: ${err.message || err}`, code, err);
 	}
 	try {
 		const loopsRes = transformHermesLoops(code, filename);
@@ -1363,7 +1378,7 @@ async function transform(config, projectRoot, filename, data, options) {
 			}
 		}
 	} catch (err) {
-		throw new Error(`[vxrn/metro] Hermes loop-binding transform failed for ${filename}: ${err.message || err}`);
+		throw createTransformError(`[vxrn/metro] Hermes loop-binding transform failed for ${filename}: ${err.message || err}`, code, err);
 	}
 	const finalDeps = extractDependencies(code, filename, {
 		asyncRequireModulePath: asyncRequirePath,
@@ -1450,7 +1465,7 @@ var require = _$$_REQUIRE;
 				intermediateMaps.length = 0;
 			}
 		} catch (err) {
-			throw new Error(`[vxrn/metro] Minifier failed for ${filename}: ${err.message || err}`);
+			throw createTransformError(`[vxrn/metro] Minifier failed for ${filename}: ${err.message || err}`, code, err);
 		}
 	}
 	let rawMappings = [];