@assistant-ui/metro 0.0.12 → 0.0.13

package/dist/index.cjs

@@ -41,8 +41,15 @@ function withAui(config) {
 	const self = require$1.resolve("@assistant-ui/metro/transformer");
 	const { aui, ...baseConfig } = config;
 	const upstream = config.transformer?.babelTransformerPath;
-	if (aui?.backendless) process.env[BACKENDLESS_ENV] = "1";
-	if (upstream && upstream !== self) process.env[UPSTREAM_TRANSFORMER_ENV] = upstream;
+	const isRewrap = upstream === self;
+	if (aui !== void 0 || !isRewrap) {
+		if (aui?.backendless) process.env[BACKENDLESS_ENV] = "1";
+		else delete process.env[BACKENDLESS_ENV];
+	}
+	if (!isRewrap) {
+		if (upstream) process.env[UPSTREAM_TRANSFORMER_ENV] = upstream;
+		else delete process.env[UPSTREAM_TRANSFORMER_ENV];
+	}
 	return {
 		...baseConfig,
 		transformer: {

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["require","createRequire"],"sources":["../src/index.ts"],"sourcesContent":["import { createRequire } from \"node:module\";\n\nconst require = createRequire(import.meta.url);\n\n/**\n * The shape of a Metro / Expo config `withAui` accepts. Typed loosely so this\n * package needs no hard dependency on `metro` or `expo`; the input shape is\n * preserved and only `transformer.babelTransformerPath` is augmented.\n */\nexport type MetroConfigLike = {\n  /** assistant-ui options, stripped from the config handed back to Metro. */\n  aui?: WithAuiOptions | undefined;\n  transformer?:\n    | {\n        babelTransformerPath?: string | undefined;\n        [key: string]: unknown;\n      }\n    | undefined;\n  [key: string]: unknown;\n};\n\n/**\n * Env var the transformer reads to delegate to the project's existing\n * (Expo / React Native) babel transformer. Metro forks its transform workers\n * after `metro.config` is evaluated, so they inherit this value.\n */\nexport const UPSTREAM_TRANSFORMER_ENV = \"AUI_METRO_UPSTREAM_TRANSFORMER\";\n\n/**\n * Env var carrying the `backendless` option to the transformer. Metro forks its\n * transform workers after `metro.config` is evaluated, so they inherit it.\n */\nexport const BACKENDLESS_ENV = \"AUI_METRO_BACKENDLESS\";\n\nexport interface WithAuiOptions {\n  /**\n   * The app has no backend importing the server builds of its `\"use generative\"`\n   * modules (e.g. cloud-hosted runs). Frontend/human tool schemas then stay\n   * uploadable from the client instead of being assumed backend-known.\n   */\n  backendless?: boolean;\n}\n\n/**\n * Wraps a Metro (or Expo) config so assistant-ui `\"use generative\"` modules are\n * compiled. Such a file colocates a tool's schema, its `execute`, and its\n * `render` via {@link https://www.assistant-ui.com/docs/tools/defining-tools | defineToolkit}.\n *\n * It points Metro's `babelTransformerPath` at this package's transformer, which\n * runs the `\"use generative\"` compiler and then delegates to your project's\n * existing transformer. The device (client) build keeps each tool's `render`\n * and any frontend `execute`; a server build (an Expo Router `+api` route)\n * keeps a server `execute` instead.\n *\n * ```js\n * // metro.config.js\n * const { getDefaultConfig } = require(\"expo/metro-config\");\n * const { withAui } = require(\"@assistant-ui/metro\");\n *\n * module.exports = withAui({\n *   ...getDefaultConfig(__dirname),\n *   aui: { backendless: true },\n * });\n * ```\n *\n * Authoring is identical to the web: a `\"use generative\"` file whose default\n * export is `defineToolkit({ ... })`, registered with `Tools({ toolkit })`.\n */\nexport function withAui<T extends MetroConfigLike>(config: T): T {\n  const self = require.resolve(\"@assistant-ui/metro/transformer\");\n  // Metro validates config keys it does not recognize, so `aui` must not\n  // survive into the returned config.\n  const { aui, ...baseConfig } = config;\n  const upstream = config.transformer?.babelTransformerPath;\n\n  if (aui?.backendless) process.env[BACKENDLESS_ENV] = \"1\";\n\n  // Guard against a double-wrap (`withAui(withAui(config))`, or a shared config\n  // already wrapped): if it already points at our transformer, keep the real\n  // upstream captured earlier rather than overwriting it with our own path,\n  // which would make `resolveUpstream()` return this transformer and recurse.\n  if (upstream && upstream !== self) {\n    process.env[UPSTREAM_TRANSFORMER_ENV] = upstream;\n  }\n\n  return {\n    ...baseConfig,\n    transformer: {\n      ...config.transformer,\n      babelTransformerPath: self,\n    },\n  } as T;\n}\n"],"mappings":";;AAEA,MAAMA,aAAAA,wBAAUC,CAAAA,CAAAA,cAAAA,CAAAA,QAAAA,KAAAA,CAAAA,CAAAA,cAAAA,UAAAA,CAAAA,CAAAA,IAA6B;;;;;;AAwB7C,MAAa,2BAA2B;;;;;AAMxC,MAAa,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;AAoC/B,SAAgB,QAAmC,QAAc;CAC/D,MAAM,OAAOD,UAAQ,QAAQ,iCAAiC;CAG9D,MAAM,EAAE,KAAK,GAAG,eAAe;CAC/B,MAAM,WAAW,OAAO,aAAa;CAErC,IAAI,KAAK,aAAa,QAAQ,IAAI,mBAAmB;CAMrD,IAAI,YAAY,aAAa,MAC3B,QAAQ,IAAI,4BAA4B;CAG1C,OAAO;EACL,GAAG;EACH,aAAa;GACX,GAAG,OAAO;GACV,sBAAsB;EACxB;CACF;AACF"}
+{"version":3,"file":"index.cjs","names":["require","createRequire"],"sources":["../src/index.ts"],"sourcesContent":["import { createRequire } from \"node:module\";\n\nconst require = createRequire(import.meta.url);\n\n/**\n * The shape of a Metro / Expo config `withAui` accepts. Typed loosely so this\n * package needs no hard dependency on `metro` or `expo`; the input shape is\n * preserved and only `transformer.babelTransformerPath` is augmented.\n */\nexport type MetroConfigLike = {\n  /** assistant-ui options, stripped from the config handed back to Metro. */\n  aui?: WithAuiOptions | undefined;\n  transformer?:\n    | {\n        babelTransformerPath?: string | undefined;\n        [key: string]: unknown;\n      }\n    | undefined;\n  [key: string]: unknown;\n};\n\n/**\n * Env var the transformer reads to delegate to the project's existing\n * (Expo / React Native) babel transformer. Metro forks its transform workers\n * after `metro.config` is evaluated, so they inherit this value.\n */\nexport const UPSTREAM_TRANSFORMER_ENV = \"AUI_METRO_UPSTREAM_TRANSFORMER\";\n\n/**\n * Env var carrying the `backendless` option to the transformer. Metro forks its\n * transform workers after `metro.config` is evaluated, so they inherit it.\n */\nexport const BACKENDLESS_ENV = \"AUI_METRO_BACKENDLESS\";\n\nexport interface WithAuiOptions {\n  /**\n   * The app has no backend importing the server builds of its `\"use generative\"`\n   * modules (e.g. cloud-hosted runs). Frontend/human tool schemas then stay\n   * uploadable from the client instead of being assumed backend-known.\n   */\n  backendless?: boolean;\n}\n\n/**\n * Wraps a Metro (or Expo) config so assistant-ui `\"use generative\"` modules are\n * compiled. Such a file colocates a tool's schema, its `execute`, and its\n * `render` via {@link https://www.assistant-ui.com/docs/tools/defining-tools | defineToolkit}.\n *\n * It points Metro's `babelTransformerPath` at this package's transformer, which\n * runs the `\"use generative\"` compiler and then delegates to your project's\n * existing transformer. The device (client) build keeps each tool's `render`\n * and any frontend `execute`; a server build (an Expo Router `+api` route)\n * keeps a server `execute` instead.\n *\n * ```js\n * // metro.config.js\n * const { getDefaultConfig } = require(\"expo/metro-config\");\n * const { withAui } = require(\"@assistant-ui/metro\");\n *\n * module.exports = withAui({\n *   ...getDefaultConfig(__dirname),\n *   aui: { backendless: true },\n * });\n * ```\n *\n * Authoring is identical to the web: a `\"use generative\"` file whose default\n * export is `defineToolkit({ ... })`, registered with `Tools({ toolkit })`.\n */\nexport function withAui<T extends MetroConfigLike>(config: T): T {\n  const self = require.resolve(\"@assistant-ui/metro/transformer\");\n  // Metro validates config keys it does not recognize, so `aui` must not\n  // survive into the returned config.\n  const { aui, ...baseConfig } = config;\n  const upstream = config.transformer?.babelTransformerPath;\n\n  // A double-wrap is a re-entry: the first call already captured the real\n  // upstream, and replacing it with our transformer would cause recursion.\n  // An explicit `aui` on a rewrap still replaces the backendless setting.\n  const isRewrap = upstream === self;\n\n  if (aui !== undefined || !isRewrap) {\n    if (aui?.backendless) process.env[BACKENDLESS_ENV] = \"1\";\n    else delete process.env[BACKENDLESS_ENV];\n  }\n\n  if (!isRewrap) {\n    if (upstream) process.env[UPSTREAM_TRANSFORMER_ENV] = upstream;\n    else delete process.env[UPSTREAM_TRANSFORMER_ENV];\n  }\n\n  return {\n    ...baseConfig,\n    transformer: {\n      ...config.transformer,\n      babelTransformerPath: self,\n    },\n  } as T;\n}\n"],"mappings":";;AAEA,MAAMA,aAAAA,wBAAUC,CAAAA,CAAAA,cAAAA,CAAAA,QAAAA,KAAAA,CAAAA,CAAAA,cAAAA,UAAAA,CAAAA,CAAAA,IAA6B;;;;;;AAwB7C,MAAa,2BAA2B;;;;;AAMxC,MAAa,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;AAoC/B,SAAgB,QAAmC,QAAc;CAC/D,MAAM,OAAOD,UAAQ,QAAQ,iCAAiC;CAG9D,MAAM,EAAE,KAAK,GAAG,eAAe;CAC/B,MAAM,WAAW,OAAO,aAAa;CAKrC,MAAM,WAAW,aAAa;CAE9B,IAAI,QAAQ,KAAA,KAAa,CAAC,UAAU;EAClC,IAAI,KAAK,aAAa,QAAQ,IAAI,mBAAmB;OAChD,OAAO,QAAQ,IAAI;CAC1B;CAEA,IAAI,CAAC,UAAU;EACb,IAAI,UAAU,QAAQ,IAAI,4BAA4B;OACjD,OAAO,QAAQ,IAAI;CAC1B;CAEA,OAAO;EACL,GAAG;EACH,aAAa;GACX,GAAG,OAAO;GACV,sBAAsB;EACxB;CACF;AACF"}

package/dist/transformer.cjs

@@ -26,6 +26,7 @@ const require_index = require("./index.cjs");
 let node_module = require("node:module");
 let node_fs = require("node:fs");
 let node_url = require("node:url");
+let node_crypto = require("node:crypto");
 let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 let _babel_parser = require("@babel/parser");
@@ -40,7 +41,7 @@ _babel_types = __toESM(_babel_types, 1);
 const DIRECTIVE = "use generative";
 //#endregion
 //#region ../x-generative-compiler/dist/package.js
-var version = "0.0.16";
+var version = "0.0.17";
 //#endregion
 //#region ../../node_modules/.pnpm/semver@7.8.5/node_modules/semver/internal/constants.js
 var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -1590,6 +1591,7 @@ function isLineTerminator(char) {
 * regions that target needs and pruning the imports the dropped regions used.
 */
 function compileGenerative(code, options) {
+	currentCompilePass++;
 	const { target, filename } = options;
 	const backendless = options.backendless ?? false;
 	const ast = (0, _babel_parser.parse)(code, {
@@ -2015,39 +2017,78 @@ function matchAliasPattern(pattern, source) {
 	if (source.length >= prefix.length + suffix.length && source.startsWith(prefix) && source.endsWith(suffix)) return source.slice(prefix.length, source.length - suffix.length);
 	return null;
 }
-/**
-* Memoizes resolved aliases per start directory. The compiler runs once per
-* file across a build, so without this every aliased spread re-walks and
-* re-parses the same `tsconfig.json`. Process-lifetime, like
-* `checkedCorePackageJsonPaths`.
-*/
 const tsconfigAliasesByDir = /* @__PURE__ */ new Map();
+let currentCompilePass = 0;
+function tsconfigFileVersion(content) {
+	return (0, node_crypto.createHash)("sha1").update(content).digest("hex");
+}
+function readTsconfigFile(state, path) {
+	const cached = state.fileContents.get(path);
+	if (cached !== void 0) return cached;
+	let content;
+	try {
+		content = (0, node_fs.readFileSync)(path, "utf8");
+	} catch {
+		content = null;
+	}
+	state.fileContents.set(path, content);
+	state.fileVersions.set(path, content === null ? null : tsconfigFileVersion(content));
+	return content;
+}
+function currentFileVersion(path) {
+	try {
+		return tsconfigFileVersion((0, node_fs.readFileSync)(path, "utf8"));
+	} catch {
+		return null;
+	}
+}
+function isTsconfigCacheCurrent(entry) {
+	for (const [path, version] of entry.fileVersions) if (currentFileVersion(path) !== version) return false;
+	return true;
+}
 /** Walks up from a directory to the nearest `tsconfig.json` that declares `paths`. */
 function loadTsconfigAliases(fromDir) {
 	const cached = tsconfigAliasesByDir.get(fromDir);
-	if (cached !== void 0) return cached;
+	if (cached) {
+		if (cached.validatedInPass === currentCompilePass || cached.reuseAcrossPasses && isTsconfigCacheCurrent(cached)) {
+			cached.validatedInPass = currentCompilePass;
+			return cached.aliases;
+		}
+	}
 	let aliases = null;
+	const state = {
+		fileVersions: /* @__PURE__ */ new Map(),
+		fileContents: /* @__PURE__ */ new Map(),
+		cacheable: true
+	};
 	let dir = fromDir;
 	for (;;) {
 		const tsconfigPath = node_path.join(dir, "tsconfig.json");
-		if ((0, node_fs.existsSync)(tsconfigPath)) {
-			aliases = readTsconfigAliases(tsconfigPath, /* @__PURE__ */ new Set());
+		if (readTsconfigFile(state, tsconfigPath) !== null) {
+			aliases = readTsconfigAliases(tsconfigPath, /* @__PURE__ */ new Set(), state);
 			if (aliases) break;
 		}
 		const parent = node_path.dirname(dir);
 		if (parent === dir) break;
 		dir = parent;
 	}
-	tsconfigAliasesByDir.set(fromDir, aliases);
+	tsconfigAliasesByDir.set(fromDir, {
+		aliases,
+		fileVersions: state.fileVersions,
+		validatedInPass: currentCompilePass,
+		reuseAcrossPasses: state.cacheable
+	});
 	return aliases;
 }
 /** Reads `baseUrl`/`paths` from a tsconfig, following a single `extends` chain. */
-function readTsconfigAliases(tsconfigPath, seen) {
+function readTsconfigAliases(tsconfigPath, seen, state) {
 	if (seen.has(tsconfigPath)) return null;
 	seen.add(tsconfigPath);
+	const raw = readTsconfigFile(state, tsconfigPath);
+	if (raw === null) return null;
 	let config;
 	try {
-		config = parseJsonc((0, node_fs.readFileSync)(tsconfigPath, "utf8"));
+		config = parseJsonc(raw);
 	} catch {
 		return null;
 	}
@@ -2062,23 +2103,30 @@ function readTsconfigAliases(tsconfigPath, seen) {
 	for (let i = extendsList.length - 1; i >= 0; i--) {
 		const entry = extendsList[i];
 		if (typeof entry !== "string") continue;
-		const extended = resolveExtendedTsconfig(entry, configDir);
+		const extended = resolveExtendedTsconfig(entry, configDir, state);
 		if (extended) {
-			const aliases = readTsconfigAliases(extended, seen);
+			const aliases = readTsconfigAliases(extended, seen, state);
 			if (aliases) return aliases;
 		}
 	}
 	return null;
 }
 /** Resolves a tsconfig `extends` value (relative path or installed package). */
-function resolveExtendedTsconfig(extendsValue, configDir) {
+function resolveExtendedTsconfig(extendsValue, configDir, state) {
 	if (extendsValue.startsWith(".")) {
 		const base = node_path.resolve(configDir, extendsValue);
-		return (node_path.extname(base) === ".json" ? [base] : [`${base}.json`, base]).find((candidate) => (0, node_fs.existsSync)(candidate)) ?? null;
+		const candidates = node_path.extname(base) === ".json" ? [base] : [`${base}.json`, base];
+		for (const candidate of candidates) if (readTsconfigFile(state, candidate) !== null) return candidate;
+		return null;
 	}
+	const request = extendsValue.endsWith(".json") ? extendsValue : `${extendsValue}.json`;
+	const requireFromConfig = (0, node_module.createRequire)(node_path.join(configDir, "package.json"));
 	try {
-		return (0, node_module.createRequire)(node_path.join(configDir, "package.json")).resolve(extendsValue.endsWith(".json") ? extendsValue : `${extendsValue}.json`);
+		const resolved = requireFromConfig.resolve(request);
+		readTsconfigFile(state, resolved);
+		return resolved;
 	} catch {
+		state.cacheable = false;
 		return null;
 	}
 }