@tamagui/generate-themes 1.121.12 → 1.122.1

package/dist/cjs/generate-themes.cjs

@@ -44,14 +44,15 @@ async function generateThemes(inputFile) {
   });
   const inputFilePath = inputFile[0] === "." ? (0, import_node_path.join)(process.cwd(), inputFile) : inputFile;
   purgeCache(inputFilePath);
-  let promise = null;
+  const promises = [];
   import_node_module.default.prototype.require = function (id) {
     const out = ogRequire.apply(this, arguments);
-    if (id === "@tamagui/theme-builder" && !promise) {
+    if (id === "@tamagui/theme-builder") {
       let resolve;
-      return promise = new Promise(res => {
+      const promise = new Promise(res => {
         resolve = res;
-      }), createThemeIntercept(out, {
+      });
+      return promises.push(promise), createThemeIntercept(out, {
         onComplete: result => {
           resolve?.(result.themeBuilder);
         }
@@ -59,28 +60,31 @@ async function generateThemes(inputFile) {
     }
     return out;
   };
+  let og = process.env.TAMAGUI_KEEP_THEMES;
+  process.env.TAMAGUI_KEEP_THEMES = "1", process.env.TAMAGUI_RUN_THEMEBUILDER = "1";
   try {
     const requiredThemes = require(inputFilePath),
       themes = requiredThemes.default || requiredThemes.themes || requiredThemes[Object.keys(requiredThemes)[0]],
       generatedThemes = generatedThemesToTypescript(themes);
     let tm;
-    if (promise) {
+    if (promises.length) {
       let finished = !1;
-      promise.then(() => {
+      await Promise.any(promises).then(() => {
         finished = !0;
       }), tm = setTimeout(() => {
         finished || console.warn("Warning: ThemeBuilder didn't finish after a couple seconds, did you forget to call .build()?");
       }, 2e3);
     }
-    const themeBuilder = promise ? await promise : null;
+    const themeBuilder = await Promise.any(promises);
     return clearTimeout(tm), {
       generated: generatedThemes,
       state: themeBuilder?.state
     };
   } catch (err) {
-    console.warn(` \u26A0\uFE0F Error running theme builder: ${err}`, err?.stack);
+    console.warn(` \u26A0\uFE0F Error running theme builder:
+`, err?.stack || err);
   } finally {
-    import_node_module.default.prototype.require = ogRequire;
+    process.env.TAMAGUI_KEEP_THEMES = og, import_node_module.default.prototype.require = ogRequire;
   }
 }
 const dedupedTokens = /* @__PURE__ */new Map();
@@ -111,11 +115,11 @@ ${baseKeys.map(([k]) => `  ${k}: string;
 function t(a: [number, number][]) {
   let res: Record<string,string> = {}
   for (const [ki, vi] of a) {
-    res[ks[ki] as string] = vs[vi] as string
+    res[ks[ki] as string] = colors[vi] as string
   }
   return res as Theme
 }
-`, out += `const vs = [
+`, out += `export const colors = [
 `;
   let index = 0;
   const valueToIndex = {};
@@ -131,7 +135,9 @@ function t(a: [number, number][]) {
 `), out += `]
 
 `;
-  let nameI = 0;
+  let nameI = 0,
+    themeTypes = "type ThemeNames =",
+    exported = "export const themes: Record<ThemeNames, Theme> = {";
   return dedupedThemes.forEach(theme => {
     nameI++;
     const key = JSON.stringify(theme),
@@ -139,13 +145,18 @@ function t(a: [number, number][]) {
       name = `n${nameI}`,
       baseTheme = `const ${name} = ${objectToJsString(theme, keys, valueToIndex)}`;
     out += `
-${baseTheme}`;
-    const duplicateThemes = names.map(n => `export const ${n} = ${name}`);
-    out += `
+${baseTheme}`, names.forEach(n => {
+      exported += `
+  ${n}: ${name},`, n.toLowerCase() === n && (themeTypes += `
+ | '${n}'`);
+    });
+  }), out += `
 
-` + duplicateThemes.join(`
-`);
-  }), out;
+${themeTypes}
+
+${exported}
+}
+`, out;
 }
 function objectToJsString(obj, keys, valueToIndex) {
   let arrItems = [];
@@ -180,16 +191,16 @@ function themeBuilderIntercept(themeBuilder, themeBuilderInterceptOpts) {
   });
 }
 function purgeCache(moduleName) {
-  searchCache(moduleName, function (mod) {
+  searchCache(moduleName, mod => {
     delete require.cache[mod.id];
-  }), Object.keys(module.constructor._pathCache).forEach(function (cacheKey) {
+  }), Object.keys(module.constructor._pathCache).forEach(cacheKey => {
     cacheKey.indexOf(moduleName) > 0 && delete module.constructor._pathCache[cacheKey];
   });
 }
 function searchCache(moduleName, callback) {
   let mod = require.resolve(moduleName);
   mod && (mod = require.cache[mod]) !== void 0 && function traverse(mod2, depth = 0) {
-    depth > 10 || (mod2.children.forEach(function (child) {
+    depth > 10 || (mod2.children.forEach(child => {
       traverse(child, depth + 1);
     }), callback(mod2));
   }(mod);

package/dist/cjs/generate-themes.js

@@ -34,14 +34,15 @@ async function generateThemes(inputFile) {
   });
   const inputFilePath = inputFile[0] === "." ? (0, import_node_path.join)(process.cwd(), inputFile) : inputFile;
   purgeCache(inputFilePath);
-  let promise = null;
+  const promises = [];
   import_node_module.default.prototype.require = function(id) {
     const out = ogRequire.apply(this, arguments);
-    if (id === "@tamagui/theme-builder" && !promise) {
+    if (id === "@tamagui/theme-builder") {
       let resolve;
-      return promise = new Promise((res) => {
+      const promise = new Promise((res) => {
         resolve = res;
-      }), createThemeIntercept(out, {
+      });
+      return promises.push(promise), createThemeIntercept(out, {
         onComplete: (result) => {
           resolve?.(result.themeBuilder);
         }
@@ -49,12 +50,14 @@ async function generateThemes(inputFile) {
     }
     return out;
   };
+  let og = process.env.TAMAGUI_KEEP_THEMES;
+  process.env.TAMAGUI_KEEP_THEMES = "1", process.env.TAMAGUI_RUN_THEMEBUILDER = "1";
   try {
     const requiredThemes = require(inputFilePath), themes = requiredThemes.default || requiredThemes.themes || requiredThemes[Object.keys(requiredThemes)[0]], generatedThemes = generatedThemesToTypescript(themes);
     let tm;
-    if (promise) {
+    if (promises.length) {
       let finished = !1;
-      promise.then(() => {
+      await Promise.any(promises).then(() => {
         finished = !0;
       }), tm = setTimeout(() => {
         finished || console.warn(
@@ -62,15 +65,16 @@ async function generateThemes(inputFile) {
         );
       }, 2e3);
     }
-    const themeBuilder = promise ? await promise : null;
+    const themeBuilder = await Promise.any(promises);
     return clearTimeout(tm), {
       generated: generatedThemes,
       state: themeBuilder?.state
     };
   } catch (err) {
-    console.warn(` \u26A0\uFE0F Error running theme builder: ${err}`, err?.stack);
+    console.warn(` \u26A0\uFE0F Error running theme builder:
+`, err?.stack || err);
   } finally {
-    import_node_module.default.prototype.require = ogRequire;
+    process.env.TAMAGUI_KEEP_THEMES = og, import_node_module.default.prototype.require = ogRequire;
   }
 }
 const dedupedTokens = /* @__PURE__ */ new Map();
@@ -101,11 +105,11 @@ ${baseKeys.map(([k]) => `  ${k}: string;
 function t(a: [number, number][]) {
   let res: Record<string,string> = {}
   for (const [ki, vi] of a) {
-    res[ks[ki] as string] = vs[vi] as string
+    res[ks[ki] as string] = colors[vi] as string
   }
   return res as Theme
 }
-`, out += `const vs = [
+`, out += `export const colors = [
 `;
   let index = 0;
   const valueToIndex = {};
@@ -121,18 +125,23 @@ function t(a: [number, number][]) {
 `), out += `]
 
 `;
-  let nameI = 0;
+  let nameI = 0, themeTypes = "type ThemeNames =", exported = "export const themes: Record<ThemeNames, Theme> = {";
   return dedupedThemes.forEach((theme) => {
     nameI++;
     const key = JSON.stringify(theme), names = dedupedThemeToNames.get(key), name = `n${nameI}`, baseTheme = `const ${name} = ${objectToJsString(theme, keys, valueToIndex)}`;
     out += `
-${baseTheme}`;
-    const duplicateThemes = names.map((n) => `export const ${n} = ${name}`);
-    out += `
+${baseTheme}`, names.forEach((n) => {
+      exported += `
+  ${n}: ${name},`, n.toLowerCase() === n && (themeTypes += `
+ | '${n}'`);
+    });
+  }), out += `
 
-` + duplicateThemes.join(`
-`);
-  }), out;
+${themeTypes}
+
+${exported}
+}
+`, out;
 }
 function objectToJsString(obj, keys, valueToIndex) {
   let arrItems = [];
@@ -166,16 +175,16 @@ function themeBuilderIntercept(themeBuilder, themeBuilderInterceptOpts) {
   });
 }
 function purgeCache(moduleName) {
-  searchCache(moduleName, function(mod) {
+  searchCache(moduleName, (mod) => {
     delete require.cache[mod.id];
-  }), Object.keys(module.constructor._pathCache).forEach(function(cacheKey) {
+  }), Object.keys(module.constructor._pathCache).forEach((cacheKey) => {
     cacheKey.indexOf(moduleName) > 0 && delete module.constructor._pathCache[cacheKey];
   });
 }
 function searchCache(moduleName, callback) {
   let mod = require.resolve(moduleName);
   mod && (mod = require.cache[mod]) !== void 0 && function traverse(mod2, depth = 0) {
-    depth > 10 || (mod2.children.forEach(function(child) {
+    depth > 10 || (mod2.children.forEach((child) => {
       traverse(child, depth + 1);
     }), callback(mod2));
   }(mod);

package/dist/cjs/generate-themes.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/generate-themes.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["Module", "key", "target", "mod"]
 }

package/dist/cjs/generate-themes.native.js

@@ -33,14 +33,14 @@ async function generateThemes(inputFile) {
   });
   var inputFilePath = inputFile[0] === "." ? (0, import_node_path.join)(process.cwd(), inputFile) : inputFile;
   purgeCache(inputFilePath);
-  var promise = null;
+  var promises = [];
   import_node_module.default.prototype.require = function(id) {
     var out = ogRequire.apply(this, arguments);
-    if (id === "@tamagui/theme-builder" && !promise) {
-      var resolve;
-      return promise = new Promise(function(res) {
+    if (id === "@tamagui/theme-builder") {
+      var resolve, promise = new Promise(function(res) {
         resolve = res;
-      }), createThemeIntercept(out, {
+      });
+      return promises.push(promise), createThemeIntercept(out, {
         onComplete: function(result) {
           resolve == null || resolve(result.themeBuilder);
         }
@@ -48,25 +48,28 @@ async function generateThemes(inputFile) {
     }
     return out;
   };
+  var og = process.env.TAMAGUI_KEEP_THEMES;
+  process.env.TAMAGUI_KEEP_THEMES = "1", process.env.TAMAGUI_RUN_THEMEBUILDER = "1";
   try {
     var requiredThemes = require(inputFilePath), themes = requiredThemes.default || requiredThemes.themes || requiredThemes[Object.keys(requiredThemes)[0]], generatedThemes = generatedThemesToTypescript(themes), tm;
-    if (promise) {
+    if (promises.length) {
       var finished = !1;
-      promise.then(function() {
+      await Promise.any(promises).then(function() {
         finished = !0;
       }), tm = setTimeout(function() {
         finished || console.warn("Warning: ThemeBuilder didn't finish after a couple seconds, did you forget to call .build()?");
       }, 2e3);
     }
-    var themeBuilder = promise ? await promise : null;
+    var themeBuilder = await Promise.any(promises);
     return clearTimeout(tm), {
       generated: generatedThemes,
       state: themeBuilder == null ? void 0 : themeBuilder.state
     };
   } catch (err) {
-    console.warn(` \u26A0\uFE0F Error running theme builder: ${err}`, err == null ? void 0 : err.stack);
+    console.warn(` \u26A0\uFE0F Error running theme builder:
+`, (err == null ? void 0 : err.stack) || err);
   } finally {
-    import_node_module.default.prototype.require = ogRequire;
+    process.env.TAMAGUI_KEEP_THEMES = og, import_node_module.default.prototype.require = ogRequire;
   }
 }
 var dedupedTokens = /* @__PURE__ */ new Map();
@@ -114,11 +117,11 @@ ${baseKeys.map(function(param) {
 function t(a: [number, number][]) {
   let res: Record<string,string> = {}
   for (const [ki, vi] of a) {
-    res[ks[ki] as string] = vs[vi] as string
+    res[ks[ki] as string] = colors[vi] as string
   }
   return res as Theme
 }
-`, out += `const vs = [
+`, out += `export const colors = [
 `;
   var index = 0, valueToIndex = {};
   dedupedTokens.forEach(function(name2, value2) {
@@ -138,20 +141,23 @@ function t(a: [number, number][]) {
 `), out += `]
 
 `;
-  var nameI = 0;
+  var nameI = 0, themeTypes = "type ThemeNames =", exported = "export const themes: Record<ThemeNames, Theme> = {";
   return dedupedThemes.forEach(function(theme2) {
     nameI++;
     var key2 = JSON.stringify(theme2), names = dedupedThemeToNames.get(key2), name2 = `n${nameI}`, baseTheme = `const ${name2} = ${objectToJsString(theme2, keys, valueToIndex)}`;
     out += `
-${baseTheme}`;
-    var duplicateThemes = names.map(function(n) {
-      return `export const ${n} = ${name2}`;
+${baseTheme}`, names.forEach(function(n) {
+      exported += `
+  ${n}: ${name2},`, n.toLowerCase() === n && (themeTypes += `
+ | '${n}'`);
     });
-    out += `
+  }), out += `
 
-` + duplicateThemes.join(`
-`);
-  }), out;
+${themeTypes}
+
+${exported}
+}
+`, out;
 }
 function objectToJsString(obj, keys, valueToIndex) {
   var arrItems = [];

package/dist/cjs/generate-themes.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/generate-themes/src/generate-themes.ts"],
-  "mappings": "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",
-  "names": ["ogRequire", "Module", "prototype", "require", "didRegisterOnce", "generateThemes", "inputFile", "register", "hookIgnoreNodeModules", "inputFilePath", "join", "process", "cwd", "purgeCache", "promise", "id", "out", "apply", "arguments", "resolve", "Promise", "res", "createThemeIntercept", "onComplete", "result", "themeBuilder", "requiredThemes", "themes", "Object", "keys", "generatedThemes", "generatedThemesToTypescript", "tm", "finished", "then", "setTimeout", "console", "warn", "clearTimeout", "generated", "state", "err", "dedupedTokens", "Map", "dedupedThemes", "dedupedThemeToNames", "i", "name", "theme", "j", "entries", "key", "value", "uniqueKey", "has", "set", "JSON", "stringify", "get", "Error", "baseKeys", "light", "baseTypeString", "map", "k", "index", "valueToIndex", "forEach", "nameI", "names", "baseTheme", "objectToJsString", "duplicateThemes", "n", "obj", "arrItems", "ki", "indexOf", "vi", "push", "createThemeExport", "themeBuilderInterceptOpts", "Proxy", "target", "Reflect", "thisArg", "argArray", "builder", "themeBuilderIntercept", "moduleName", "searchCache", "mod", "cache", "module", "constructor", "_pathCache", "cacheKey", "callback", "undefined", "traverse", "depth", "children", "child"]
+  "mappings": "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",
+  "names": ["ogRequire", "Module", "prototype", "require", "didRegisterOnce", "generateThemes", "inputFile", "register", "hookIgnoreNodeModules", "inputFilePath", "join", "process", "cwd", "purgeCache", "promises", "id", "out", "apply", "arguments", "resolve", "promise", "Promise", "res", "push", "createThemeIntercept", "onComplete", "result", "themeBuilder", "og", "env", "TAMAGUI_KEEP_THEMES", "TAMAGUI_RUN_THEMEBUILDER", "requiredThemes", "themes", "Object", "keys", "generatedThemes", "generatedThemesToTypescript", "tm", "length", "finished", "any", "then", "setTimeout", "console", "warn", "clearTimeout", "generated", "state", "err", "dedupedTokens", "Map", "dedupedThemes", "dedupedThemeToNames", "i", "name", "theme", "j", "entries", "key", "value", "uniqueKey", "has", "set", "JSON", "stringify", "get", "Error", "baseKeys", "light", "baseTypeString", "map", "k", "index", "valueToIndex", "forEach", "nameI", "themeTypes", "exported", "names", "baseTheme", "objectToJsString", "n", "toLowerCase", "obj", "arrItems", "ki", "indexOf", "vi", "createThemeExport", "themeBuilderInterceptOpts", "Proxy", "target", "Reflect", "thisArg", "argArray", "builder", "themeBuilderIntercept", "moduleName", "searchCache", "mod", "cache", "module", "constructor", "_pathCache", "cacheKey", "callback", "undefined", "traverse", "depth", "children", "child"]
 }

package/dist/cjs/write-generate-themes.cjs

@@ -34,7 +34,7 @@ __export(write_generate_themes_exports, {
   writeGeneratedThemes: () => writeGeneratedThemes
 });
 module.exports = __toCommonJS(write_generate_themes_exports);
-var import_path = require("path"),
+var import_node_path = require("node:path"),
   fs = __toESM(require("fs-extra"));
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   if (!generatedOutput) return;
@@ -43,9 +43,10 @@ async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
       state
     } = generatedOutput,
     tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir),
-    themeBuilderStatePath = (0, import_path.join)(tamaguiDotDir, "theme-builder.json");
+    themeBuilderStatePath = (0, import_node_path.join)(tamaguiDotDir, "theme-builder.json");
   process.env.DEBUG === "tamagui" && (console.info("Generated themes:", JSON.stringify(generatedOutput, null, 2)), console.info("Writing themes to", {
     outPath,
     themeBuilderStatePath
-  })), await Promise.all([fs.writeFile(outPath, generated), state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null]);
+  })), await Promise.all([fs.writeFile(outPath, `// @ts-nocheck
+` + generated), state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null]);
 }

package/dist/cjs/write-generate-themes.js

@@ -25,12 +25,13 @@ __export(write_generate_themes_exports, {
   writeGeneratedThemes: () => writeGeneratedThemes
 });
 module.exports = __toCommonJS(write_generate_themes_exports);
-var import_path = require("path"), fs = __toESM(require("fs-extra"));
+var import_node_path = require("node:path"), fs = __toESM(require("fs-extra"));
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   if (!generatedOutput) return;
-  const { generated, state } = generatedOutput, tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir), themeBuilderStatePath = (0, import_path.join)(tamaguiDotDir, "theme-builder.json");
+  const { generated, state } = generatedOutput, tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir), themeBuilderStatePath = (0, import_node_path.join)(tamaguiDotDir, "theme-builder.json");
   process.env.DEBUG === "tamagui" && (console.info("Generated themes:", JSON.stringify(generatedOutput, null, 2)), console.info("Writing themes to", { outPath, themeBuilderStatePath })), await Promise.all([
-    fs.writeFile(outPath, generated),
+    fs.writeFile(outPath, `// @ts-nocheck
+` + generated),
     state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
   ]);
 }

package/dist/cjs/write-generate-themes.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/write-generate-themes.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB,iBAErB,KAAoB;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,MAAI,CAAC,gBAAiB;AAEtB,QAAM,EAAE,WAAW,MAAM,IAAI,iBAEvB,sBAAsB,MAAM,GAAG,WAAW,aAAa,GACvD,4BAAwB,kBAAK,eAAe,oBAAoB;AAEtE,EAAI,QAAQ,IAAI,UAAU,cACxB,QAAQ,KAAK,qBAAqB,KAAK,UAAU,iBAAiB,MAAM,CAAC,CAAC,GAC1E,QAAQ,KAAK,qBAAqB,EAAE,SAAS,sBAAsB,CAAC,IAGtE,MAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,UAAU,SAAS,SAAS;AAAA,IAC/B,SAAS,sBACL,GAAG,UAAU,uBAAuB,KAAK,UAAU,KAAK,CAAC,IACzD;AAAA,EACN,CAAC;AACH;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sBAErB,KAAoB;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,MAAI,CAAC,gBAAiB;AAEtB,QAAM,EAAE,WAAW,MAAM,IAAI,iBAEvB,sBAAsB,MAAM,GAAG,WAAW,aAAa,GACvD,4BAAwB,uBAAK,eAAe,oBAAoB;AAEtE,EAAI,QAAQ,IAAI,UAAU,cACxB,QAAQ,KAAK,qBAAqB,KAAK,UAAU,iBAAiB,MAAM,CAAC,CAAC,GAC1E,QAAQ,KAAK,qBAAqB,EAAE,SAAS,sBAAsB,CAAC,IAGtE,MAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,UAAU,SAAS;AAAA,IAAqB,SAAS;AAAA,IACpD,SAAS,sBACL,GAAG,UAAU,uBAAuB,KAAK,UAAU,KAAK,CAAC,IACzD;AAAA,EACN,CAAC;AACH;",
   "names": []
 }

package/dist/cjs/write-generate-themes.native.js

@@ -26,15 +26,16 @@ __export(write_generate_themes_exports, {
   writeGeneratedThemes: () => writeGeneratedThemes
 });
 module.exports = __toCommonJS(write_generate_themes_exports);
-var import_path = require("path"), fs = __toESM(require("fs-extra"));
+var import_node_path = require("node:path"), fs = __toESM(require("fs-extra"));
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   if (generatedOutput) {
-    var { generated, state } = generatedOutput, tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir), themeBuilderStatePath = (0, import_path.join)(tamaguiDotDir, "theme-builder.json");
+    var { generated, state } = generatedOutput, tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir), themeBuilderStatePath = (0, import_node_path.join)(tamaguiDotDir, "theme-builder.json");
     process.env.DEBUG === "tamagui" && (console.info("Generated themes:", JSON.stringify(generatedOutput, null, 2)), console.info("Writing themes to", {
       outPath,
       themeBuilderStatePath
     })), await Promise.all([
-      fs.writeFile(outPath, generated),
+      fs.writeFile(outPath, `// @ts-nocheck
+` + generated),
       state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
     ]);
   }

package/dist/cjs/write-generate-themes.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/generate-themes/src/write-generate-themes.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;kBAAqB,iBAErB,KAAoB;AAIpB,eAAsBA,qBACpBC,eACAC,SACAC,iBAA2D;AAE3D,MAAKA,iBAEL;QAAM,EAAEC,WAAWC,MAAK,IAAKF,iBAEvBG,sBAAsB,MAAMC,GAAGC,WAAWP,aAAAA,GAC1CQ,4BAAwBC,kBAAKT,eAAe,oBAAoB;AAEtE,IAAIU,QAAQC,IAAIC,UAAU,cACxBC,QAAQC,KAAK,qBAAqBC,KAAKC,UAAUd,iBAAiB,MAAM,CAAA,CAAA,GACxEW,QAAQC,KAAK,qBAAqB;MAAEb;MAASO;IAAsB,CAAA,IAGrE,MAAMS,QAAQC,IAAI;MAChBZ,GAAGa,UAAUlB,SAASE,SAAAA;MACtBC,SAASC,sBACLC,GAAGa,UAAUX,uBAAuBO,KAAKC,UAAUZ,KAAAA,CAAAA,IACnD;KACL;;AACH;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sBAErB,KAAoB;AAIpB,eAAsBA,qBACpBC,eACAC,SACAC,iBAA2D;AAE3D,MAAKA,iBAEL;QAAM,EAAEC,WAAWC,MAAK,IAAKF,iBAEvBG,sBAAsB,MAAMC,GAAGC,WAAWP,aAAAA,GAC1CQ,4BAAwBC,uBAAKT,eAAe,oBAAoB;AAEtE,IAAIU,QAAQC,IAAIC,UAAU,cACxBC,QAAQC,KAAK,qBAAqBC,KAAKC,UAAUd,iBAAiB,MAAM,CAAA,CAAA,GACxEW,QAAQC,KAAK,qBAAqB;MAAEb;MAASO;IAAsB,CAAA,IAGrE,MAAMS,QAAQC,IAAI;MAChBZ,GAAGa,UAAUlB,SAAS;IAAqBE,SAAAA;MAC3CC,SAASC,sBACLC,GAAGa,UAAUX,uBAAuBO,KAAKC,UAAUZ,KAAAA,CAAAA,IACnD;KACL;;AACH;",
   "names": ["writeGeneratedThemes", "tamaguiDotDir", "outPath", "generatedOutput", "generated", "state", "tamaguiDotDirExists", "fs", "pathExists", "themeBuilderStatePath", "join", "process", "env", "DEBUG", "console", "info", "JSON", "stringify", "Promise", "all", "writeFile"]
 }

package/dist/esm/generate-themes.js

@@ -8,14 +8,15 @@ async function generateThemes(inputFile) {
   });
   const inputFilePath = inputFile[0] === "." ? join(process.cwd(), inputFile) : inputFile;
   purgeCache(inputFilePath);
-  let promise = null;
+  const promises = [];
   Module.prototype.require = function(id) {
     const out = ogRequire.apply(this, arguments);
-    if (id === "@tamagui/theme-builder" && !promise) {
+    if (id === "@tamagui/theme-builder") {
       let resolve;
-      return promise = new Promise((res) => {
+      const promise = new Promise((res) => {
         resolve = res;
-      }), createThemeIntercept(out, {
+      });
+      return promises.push(promise), createThemeIntercept(out, {
         onComplete: (result) => {
           resolve?.(result.themeBuilder);
         }
@@ -23,12 +24,14 @@ async function generateThemes(inputFile) {
     }
     return out;
   };
+  let og = process.env.TAMAGUI_KEEP_THEMES;
+  process.env.TAMAGUI_KEEP_THEMES = "1", process.env.TAMAGUI_RUN_THEMEBUILDER = "1";
   try {
     const requiredThemes = require(inputFilePath), themes = requiredThemes.default || requiredThemes.themes || requiredThemes[Object.keys(requiredThemes)[0]], generatedThemes = generatedThemesToTypescript(themes);
     let tm;
-    if (promise) {
+    if (promises.length) {
       let finished = !1;
-      promise.then(() => {
+      await Promise.any(promises).then(() => {
         finished = !0;
       }), tm = setTimeout(() => {
         finished || console.warn(
@@ -36,15 +39,16 @@ async function generateThemes(inputFile) {
         );
       }, 2e3);
     }
-    const themeBuilder = promise ? await promise : null;
+    const themeBuilder = await Promise.any(promises);
     return clearTimeout(tm), {
       generated: generatedThemes,
       state: themeBuilder?.state
     };
   } catch (err) {
-    console.warn(` \u26A0\uFE0F Error running theme builder: ${err}`, err?.stack);
+    console.warn(` \u26A0\uFE0F Error running theme builder:
+`, err?.stack || err);
   } finally {
-    Module.prototype.require = ogRequire;
+    process.env.TAMAGUI_KEEP_THEMES = og, Module.prototype.require = ogRequire;
   }
 }
 const dedupedTokens = /* @__PURE__ */ new Map();
@@ -75,11 +79,11 @@ ${baseKeys.map(([k]) => `  ${k}: string;
 function t(a: [number, number][]) {
   let res: Record<string,string> = {}
   for (const [ki, vi] of a) {
-    res[ks[ki] as string] = vs[vi] as string
+    res[ks[ki] as string] = colors[vi] as string
   }
   return res as Theme
 }
-`, out += `const vs = [
+`, out += `export const colors = [
 `;
   let index = 0;
   const valueToIndex = {};
@@ -95,18 +99,23 @@ function t(a: [number, number][]) {
 `), out += `]
 
 `;
-  let nameI = 0;
+  let nameI = 0, themeTypes = "type ThemeNames =", exported = "export const themes: Record<ThemeNames, Theme> = {";
   return dedupedThemes.forEach((theme) => {
     nameI++;
     const key = JSON.stringify(theme), names = dedupedThemeToNames.get(key), name = `n${nameI}`, baseTheme = `const ${name} = ${objectToJsString(theme, keys, valueToIndex)}`;
     out += `
-${baseTheme}`;
-    const duplicateThemes = names.map((n) => `export const ${n} = ${name}`);
-    out += `
+${baseTheme}`, names.forEach((n) => {
+      exported += `
+  ${n}: ${name},`, n.toLowerCase() === n && (themeTypes += `
+ | '${n}'`);
+    });
+  }), out += `
 
-` + duplicateThemes.join(`
-`);
-  }), out;
+${themeTypes}
+
+${exported}
+}
+`, out;
 }
 function objectToJsString(obj, keys, valueToIndex) {
   let arrItems = [];
@@ -140,16 +149,16 @@ function themeBuilderIntercept(themeBuilder, themeBuilderInterceptOpts) {
   });
 }
 function purgeCache(moduleName) {
-  searchCache(moduleName, function(mod) {
+  searchCache(moduleName, (mod) => {
     delete require.cache[mod.id];
-  }), Object.keys(module.constructor._pathCache).forEach(function(cacheKey) {
+  }), Object.keys(module.constructor._pathCache).forEach((cacheKey) => {
     cacheKey.indexOf(moduleName) > 0 && delete module.constructor._pathCache[cacheKey];
   });
 }
 function searchCache(moduleName, callback) {
   let mod = require.resolve(moduleName);
   mod && (mod = require.cache[mod]) !== void 0 && function traverse(mod2, depth = 0) {
-    depth > 10 || (mod2.children.forEach(function(child) {
+    depth > 10 || (mod2.children.forEach((child) => {
       traverse(child, depth + 1);
     }), callback(mod2));
   }(mod);