@tamagui/generate-themes 1.39.4 → 1.39.6

package/dist/cjs/generate-themes.js

@@ -68,17 +68,24 @@ async function generateThemes(inputFile) {
     import_module.default.prototype.require = ogRequire;
   }
 }
+const dedupedTokens = /* @__PURE__ */ new Map();
 function generatedThemesToTypescript(themes) {
-  const deduped = /* @__PURE__ */ new Map();
-  const dedupedToNames = /* @__PURE__ */ new Map();
+  const dedupedThemes = /* @__PURE__ */ new Map();
+  const dedupedThemeToNames = /* @__PURE__ */ new Map();
   for (const name in themes) {
     const theme = themes[name];
+    for (const [key2, value] of Object.entries(theme)) {
+      const uniqueKey = `${name}_${key2}`;
+      if (!dedupedTokens.has(value)) {
+        dedupedTokens.set(value, uniqueKey);
+      }
+    }
     const key = JSON.stringify(theme);
-    if (deduped.has(key)) {
-      dedupedToNames.set(key, [...dedupedToNames.get(key), name]);
+    if (dedupedThemes.has(key)) {
+      dedupedThemeToNames.set(key, [...dedupedThemeToNames.get(key), name]);
     } else {
-      deduped.set(key, theme);
-      dedupedToNames.set(key, [name]);
+      dedupedThemes.set(key, theme);
+      dedupedThemeToNames.set(key, [name]);
     }
   }
   const baseTypeString = `type Theme = {
@@ -89,9 +96,14 @@ ${Object.entries(themes.light || themes[Object.keys(themes)[0]]).map(([k]) => {
 }`;
   let themesString = `${baseTypeString}
 `;
-  deduped.forEach((theme) => {
+  dedupedTokens.forEach((names, value) => {
+    themesString += `const ${names} = '${value}'
+`;
+  });
+  themesString += "\n";
+  dedupedThemes.forEach((theme) => {
     const key = JSON.stringify(theme);
-    const [baseName, ...restNames] = dedupedToNames.get(key);
+    const [baseName, ...restNames] = dedupedThemeToNames.get(key);
     const baseTheme = `export const ${baseName} = ${objectToJsString(theme)} as Theme`;
     themesString += `
 ${baseTheme}`;
@@ -109,7 +121,10 @@ ${baseTheme}`;
 function objectToJsString(obj, indent = 4) {
   const whitespace = new Array(indent).fill(" ").join("");
   return `{
-${Object.entries(obj).map(([k, v]) => `${whitespace}${k}: '${v}'`).join(",\n")}
+${Object.entries(obj).map(([k, v]) => {
+    const variableName = dedupedTokens.get(v);
+    return `${whitespace}${k}: ${variableName}`;
+  }).join(",\n")}
 }`;
 }
 function createThemeIntercept(createThemeExport, themeBuilderInterceptOpts) {

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

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

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

@@ -35,6 +35,7 @@ var import_path = require("path");
 var fs = __toESM(require("fs-extra"));
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   const { generated, state } = generatedOutput;
+  const tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir);
   const themeBuilderStatePath = (0, import_path.join)(tamaguiDotDir, `theme-builder.json`);
   if (process.env.DEBUG === "tamagui") {
     console.log(`Generated themes:`, JSON.stringify({ generated, state }, null, 2));
@@ -42,7 +43,7 @@ async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   }
   await Promise.all([
     fs.writeFile(outPath, generated),
-    state ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
+    state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
   ]);
 }
 // Annotate the CommonJS export names for ESM import in node:

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;AAErB,SAAoB;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,4BAAwB,kBAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,UAAU,SAAS,SAAS;AAAA,IAC/B,QAAQ,GAAG,UAAU,uBAAuB,KAAK,UAAU,KAAK,CAAC,IAAI;AAAA,EACvE,CAAC;AACH;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAErB,SAAoB;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,sBAAsB,MAAM,GAAG,WAAW,aAAa;AAC7D,QAAM,4BAAwB,kBAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,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;",
   "names": []
 }

package/dist/esm/generate-themes.js

@@ -35,17 +35,24 @@ async function generateThemes(inputFile) {
     Module.prototype.require = ogRequire;
   }
 }
+const dedupedTokens = /* @__PURE__ */ new Map();
 function generatedThemesToTypescript(themes) {
-  const deduped = /* @__PURE__ */ new Map();
-  const dedupedToNames = /* @__PURE__ */ new Map();
+  const dedupedThemes = /* @__PURE__ */ new Map();
+  const dedupedThemeToNames = /* @__PURE__ */ new Map();
   for (const name in themes) {
     const theme = themes[name];
+    for (const [key2, value] of Object.entries(theme)) {
+      const uniqueKey = `${name}_${key2}`;
+      if (!dedupedTokens.has(value)) {
+        dedupedTokens.set(value, uniqueKey);
+      }
+    }
     const key = JSON.stringify(theme);
-    if (deduped.has(key)) {
-      dedupedToNames.set(key, [...dedupedToNames.get(key), name]);
+    if (dedupedThemes.has(key)) {
+      dedupedThemeToNames.set(key, [...dedupedThemeToNames.get(key), name]);
     } else {
-      deduped.set(key, theme);
-      dedupedToNames.set(key, [name]);
+      dedupedThemes.set(key, theme);
+      dedupedThemeToNames.set(key, [name]);
     }
   }
   const baseTypeString = `type Theme = {
@@ -56,9 +63,14 @@ ${Object.entries(themes.light || themes[Object.keys(themes)[0]]).map(([k]) => {
 }`;
   let themesString = `${baseTypeString}
 `;
-  deduped.forEach((theme) => {
+  dedupedTokens.forEach((names, value) => {
+    themesString += `const ${names} = '${value}'
+`;
+  });
+  themesString += "\n";
+  dedupedThemes.forEach((theme) => {
     const key = JSON.stringify(theme);
-    const [baseName, ...restNames] = dedupedToNames.get(key);
+    const [baseName, ...restNames] = dedupedThemeToNames.get(key);
     const baseTheme = `export const ${baseName} = ${objectToJsString(theme)} as Theme`;
     themesString += `
 ${baseTheme}`;
@@ -76,7 +88,10 @@ ${baseTheme}`;
 function objectToJsString(obj, indent = 4) {
   const whitespace = new Array(indent).fill(" ").join("");
   return `{
-${Object.entries(obj).map(([k, v]) => `${whitespace}${k}: '${v}'`).join(",\n")}
+${Object.entries(obj).map(([k, v]) => {
+    const variableName = dedupedTokens.get(v);
+    return `${whitespace}${k}: ${variableName}`;
+  }).join(",\n")}
 }`;
 }
 function createThemeIntercept(createThemeExport, themeBuilderInterceptOpts) {

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

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

package/dist/esm/generate-themes.mjs

@@ -35,17 +35,24 @@ async function generateThemes(inputFile) {
     Module.prototype.require = ogRequire;
   }
 }
+const dedupedTokens = /* @__PURE__ */ new Map();
 function generatedThemesToTypescript(themes) {
-  const deduped = /* @__PURE__ */ new Map();
-  const dedupedToNames = /* @__PURE__ */ new Map();
+  const dedupedThemes = /* @__PURE__ */ new Map();
+  const dedupedThemeToNames = /* @__PURE__ */ new Map();
   for (const name in themes) {
     const theme = themes[name];
+    for (const [key2, value] of Object.entries(theme)) {
+      const uniqueKey = `${name}_${key2}`;
+      if (!dedupedTokens.has(value)) {
+        dedupedTokens.set(value, uniqueKey);
+      }
+    }
     const key = JSON.stringify(theme);
-    if (deduped.has(key)) {
-      dedupedToNames.set(key, [...dedupedToNames.get(key), name]);
+    if (dedupedThemes.has(key)) {
+      dedupedThemeToNames.set(key, [...dedupedThemeToNames.get(key), name]);
     } else {
-      deduped.set(key, theme);
-      dedupedToNames.set(key, [name]);
+      dedupedThemes.set(key, theme);
+      dedupedThemeToNames.set(key, [name]);
     }
   }
   const baseTypeString = `type Theme = {
@@ -56,9 +63,14 @@ ${Object.entries(themes.light || themes[Object.keys(themes)[0]]).map(([k]) => {
 }`;
   let themesString = `${baseTypeString}
 `;
-  deduped.forEach((theme) => {
+  dedupedTokens.forEach((names, value) => {
+    themesString += `const ${names} = '${value}'
+`;
+  });
+  themesString += "\n";
+  dedupedThemes.forEach((theme) => {
     const key = JSON.stringify(theme);
-    const [baseName, ...restNames] = dedupedToNames.get(key);
+    const [baseName, ...restNames] = dedupedThemeToNames.get(key);
     const baseTheme = `export const ${baseName} = ${objectToJsString(theme)} as Theme`;
     themesString += `
 ${baseTheme}`;
@@ -76,7 +88,10 @@ ${baseTheme}`;
 function objectToJsString(obj, indent = 4) {
   const whitespace = new Array(indent).fill(" ").join("");
   return `{
-${Object.entries(obj).map(([k, v]) => `${whitespace}${k}: '${v}'`).join(",\n")}
+${Object.entries(obj).map(([k, v]) => {
+    const variableName = dedupedTokens.get(v);
+    return `${whitespace}${k}: ${variableName}`;
+  }).join(",\n")}
 }`;
 }
 function createThemeIntercept(createThemeExport, themeBuilderInterceptOpts) {

package/dist/esm/generate-themes.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/generate-themes.ts"],
-  "mappings": "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",
-  "names": ["target"]
+  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAS,YAAY;AAQrB,eAAsB,eAAe,WAAmB;AACtD,UAAQ,4BAA4B,EAAE,SAAS;AAE/C,MAAI,UAAoD;AAExD,QAAM,YAAY,OAAO,UAAU;AAEnC,SAAO,UAAU,UAAU,SAAU,IAAI;AAEvC,UAAM,MAAM,UAAU,MAAM,MAAM,SAAS;AAC3C,QAAI,OAAO,yCAAyC,OAAO,0BAA0B;AACnF,UAAI,CAAC,SAAS;AACZ,YAAI;AACJ,kBAAU,IAAI,QAAQ,CAAC,QAAQ;AAC7B,oBAAU;AAAA,QACZ,CAAC;AACD,eAAO,qBAAqB,KAAK;AAAA,UAC/B,YAAY,CAAC,WAAW;AACtB,+CAAU,OAAO;AAAA,UACnB;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,MAAI;AACF,UAAM,gBACJ,UAAU,CAAC,MAAM,MAAM,KAAK,QAAQ,IAAI,GAAG,SAAS,IAAI;AAC1D,UAAM,iBAAiB,QAAQ,aAAa;AAC5C,UAAM,SAAS,eAAe,SAAS,KAAK,eAAe,QAAQ;AACnE,UAAM,kBAAkB,4BAA4B,MAAM;AAC1D,UAAM,eAAe,UAAU,MAAM,UAAU;AAC/C,WAAO;AAAA,MACL,WAAW;AAAA,MACX,OAAO,6CAAc;AAAA,IACvB;AAAA,EACF,UAAE;AACA,WAAO,UAAU,UAAU;AAAA,EAC7B;AACF;AAKA,MAAM,gBAAgB,oBAAI,IAAoB;AAE9C,SAAS,4BAA4B,QAA6B;AAChE,QAAM,gBAAgB,oBAAI,IAAoB;AAC9C,QAAM,sBAAsB,oBAAI,IAAsB;AAEtD,aAAW,QAAQ,QAAQ;AACzB,UAAM,QAAgC,OAAO,IAAI;AAGjD,eAAW,CAACA,MAAK,KAAK,KAAK,OAAO,QAAQ,KAAK,GAAG;AAChD,YAAM,YAAY,GAAG,QAAQA;AAC7B,UAAI,CAAC,cAAc,IAAI,KAAK,GAAG;AAC7B,sBAAc,IAAI,OAAO,SAAS;AAAA,MACpC;AAAA,IACF;AAEA,UAAM,MAAM,KAAK,UAAU,KAAK;AAChC,QAAI,cAAc,IAAI,GAAG,GAAG;AAC1B,0BAAoB,IAAI,KAAK,CAAC,GAAG,oBAAoB,IAAI,GAAG,GAAI,IAAI,CAAC;AAAA,IACvE,OAAO;AACL,oBAAc,IAAI,KAAK,KAAK;AAC5B,0BAAoB,IAAI,KAAK,CAAC,IAAI,CAAC;AAAA,IACrC;AAAA,EACF;AAEA,QAAM,iBAAiB;AAAA,EACvB,OAAO,QAAQ,OAAO,SAAS,OAAO,OAAO,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAC5D,IAAI,CAAC,CAAC,CAAC,MAAM;AACZ,WAAO,KAAK;AAAA;AAAA,EACd,CAAC,EACA,KAAK,EAAE;AAAA;AAGR,MAAI,eAAe,GAAG;AAAA;AAItB,gBAAc,QAAQ,CAAC,OAAO,UAAU;AACtC,oBAAgB,SAAS,YAAY;AAAA;AAAA,EACvC,CAAC;AACD,kBAAgB;AAEhB,gBAAc,QAAQ,CAAC,UAAU;AAC/B,UAAM,MAAM,KAAK,UAAU,KAAK;AAChC,UAAM,CAAC,UAAU,GAAG,SAAS,IAAI,oBAAoB,IAAI,GAAG;AAC5D,UAAM,YAAY,gBAAgB,cAAc,iBAAiB,KAAK;AACtE,oBAAgB;AAAA,EAAK;AAErB,QAAI,UAAU,QAAQ;AACpB,YAAM,kBAAkB,UAAU;AAAA,QAChC,CAAC,SAAS,gBAAgB,UAAU;AAAA,MACtC;AACA,sBAAgB;AAAA;AAAA,IAAS,gBAAgB,KAAK,IAAI;AAAA,IACpD;AAAA,EACF,CAAC;AAED,SAAO;AACT;AAEA,SAAS,iBAAiB,KAAa,SAAS,GAAG;AACjD,QAAM,aAAa,IAAI,MAAM,MAAM,EAAE,KAAK,GAAG,EAAE,KAAK,EAAE;AACtD,SAAO;AAAA,EACP,OAAO,QAAQ,GAAG,EACjB,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AACf,UAAM,eAAe,cAAc,IAAI,CAAC;AACxC,WAAO,GAAG,aAAa,MAAM;AAAA,EAC/B,CAAC,EACA,KAAK,KAAK;AAAA;AAEb;AAEA,SAAS,qBACP,mBACA,2BACA;AACA,SAAO,IAAI,MAAM,mBAAmB;AAAA,IAClC,IAAI,QAAQ,KAAK;AACf,YAAM,MAAM,QAAQ,IAAI,QAAQ,GAAG;AACnC,UAAI,QAAQ,sBAAsB;AAChC,eAAO,IAAI,MAAM,KAAK;AAAA,UACpB,MAAMC,SAAQ,SAAS,UAAU;AAC/B,kBAAM,UAAU,QAAQ,MAAMA,SAAQ,SAAS,QAAQ;AACvD,mBAAO,sBAAsB,SAAS,yBAAyB;AAAA,UACjE;AAAA,QACF,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AACH;AAEA,SAAS,sBACP,cACA,2BACA;AACA,SAAO,IAAI,MAAM,cAAc;AAAA,IAC7B,IAAI,QAAQ,KAAK;AACf,YAAM,MAAM,QAAQ,IAAI,QAAQ,GAAG;AACnC,UAAI,QAAQ,SAAS;AAEnB,kCAA0B,WAAW;AAAA,UACnC;AAAA,QACF,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT;AAAA,EACF,CAAC;AACH;",
+  "names": ["key", "target"]
 }

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

@@ -2,6 +2,7 @@ import { join } from "path";
 import * as fs from "fs-extra";
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   const { generated, state } = generatedOutput;
+  const tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir);
   const themeBuilderStatePath = join(tamaguiDotDir, `theme-builder.json`);
   if (process.env.DEBUG === "tamagui") {
     console.log(`Generated themes:`, JSON.stringify({ generated, state }, null, 2));
@@ -9,7 +10,7 @@ async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   }
   await Promise.all([
     fs.writeFile(outPath, generated),
-    state ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
+    state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
   ]);
 }
 export {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/write-generate-themes.ts"],
-  "mappings": "AAAA,SAAS,YAAY;AAErB,YAAY,QAAQ;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,wBAAwB,KAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,UAAU,SAAS,SAAS;AAAA,IAC/B,QAAQ,GAAG,UAAU,uBAAuB,KAAK,UAAU,KAAK,CAAC,IAAI;AAAA,EACvE,CAAC;AACH;",
+  "mappings": "AAAA,SAAS,YAAY;AAErB,YAAY,QAAQ;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,sBAAsB,MAAM,GAAG,WAAW,aAAa;AAC7D,QAAM,wBAAwB,KAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,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;",
   "names": []
 }

package/dist/esm/write-generate-themes.mjs

@@ -2,6 +2,7 @@ import { join } from "path";
 import * as fs from "fs-extra";
 async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   const { generated, state } = generatedOutput;
+  const tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir);
   const themeBuilderStatePath = join(tamaguiDotDir, `theme-builder.json`);
   if (process.env.DEBUG === "tamagui") {
     console.log(`Generated themes:`, JSON.stringify({ generated, state }, null, 2));
@@ -9,7 +10,7 @@ async function writeGeneratedThemes(tamaguiDotDir, outPath, generatedOutput) {
   }
   await Promise.all([
     fs.writeFile(outPath, generated),
-    state ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
+    state && tamaguiDotDirExists ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null
   ]);
 }
 export {

package/dist/esm/write-generate-themes.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/write-generate-themes.ts"],
-  "mappings": "AAAA,SAAS,YAAY;AAErB,YAAY,QAAQ;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,wBAAwB,KAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,UAAU,SAAS,SAAS;AAAA,IAC/B,QAAQ,GAAG,UAAU,uBAAuB,KAAK,UAAU,KAAK,CAAC,IAAI;AAAA,EACvE,CAAC;AACH;",
+  "mappings": "AAAA,SAAS,YAAY;AAErB,YAAY,QAAQ;AAIpB,eAAsB,qBACpB,eACA,SACA,iBACA;AACA,QAAM,EAAE,WAAW,MAAM,IAAI;AAC7B,QAAM,sBAAsB,MAAM,GAAG,WAAW,aAAa;AAC7D,QAAM,wBAAwB,KAAK,eAAe,oBAAoB;AAEtE,MAAI,QAAQ,IAAI,UAAU,WAAW;AAEnC,YAAQ,IAAI,qBAAqB,KAAK,UAAU,EAAE,WAAW,MAAM,GAAG,MAAM,CAAC,CAAC;AAE9E,YAAQ,IAAI,qBAAqB,EAAE,SAAS,sBAAsB,CAAC;AAAA,EACrE;AAEA,QAAM,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;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/generate-themes",
-  "version": "1.39.4",
+  "version": "1.39.6",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -28,12 +28,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.39.4",
-    "@tamagui/types": "1.39.4",
+    "@tamagui/create-theme": "1.39.6",
+    "@tamagui/types": "1.39.6",
     "esbuild-register": "^3.4.2",
     "fs-extra": "^11.1.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.39.4"
+    "@tamagui/build": "1.39.6"
   }
 }

package/src/generate-themes.ts

@@ -49,18 +49,32 @@ export async function generateThemes(inputFile: string) {
   }
 }
 
+/**
+ * value -> name of variable
+ */
+const dedupedTokens = new Map<string, string>()
+
 function generatedThemesToTypescript(themes: Record<string, any>) {
-  const deduped = new Map<string, Object>()
-  const dedupedToNames = new Map<string, string[]>()
+  const dedupedThemes = new Map<string, Object>()
+  const dedupedThemeToNames = new Map<string, string[]>()
 
   for (const name in themes) {
-    const theme = themes[name]
+    const theme: Record<string, string> = themes[name]
+
+    // go through all tokens in current theme and add the new values to dedupedTokens map
+    for (const [key, value] of Object.entries(theme)) {
+      const uniqueKey = `${name}_${key}`
+      if (!dedupedTokens.has(value)) {
+        dedupedTokens.set(value, uniqueKey)
+      }
+    }
+
     const key = JSON.stringify(theme)
-    if (deduped.has(key)) {
-      dedupedToNames.set(key, [...dedupedToNames.get(key)!, name])
+    if (dedupedThemes.has(key)) {
+      dedupedThemeToNames.set(key, [...dedupedThemeToNames.get(key)!, name])
     } else {
-      deduped.set(key, theme)
-      dedupedToNames.set(key, [name])
+      dedupedThemes.set(key, theme)
+      dedupedThemeToNames.set(key, [name])
     }
   }
 
@@ -74,9 +88,16 @@ ${Object.entries(themes.light || themes[Object.keys(themes)[0]])
 
   let themesString = `${baseTypeString}\n`
 
-  deduped.forEach((theme) => {
+  // add all token variables
+
+  dedupedTokens.forEach((names, value) => {
+    themesString += `const ${names} = '${value}'\n`
+  })
+  themesString += '\n'
+
+  dedupedThemes.forEach((theme) => {
     const key = JSON.stringify(theme)
-    const [baseName, ...restNames] = dedupedToNames.get(key)!
+    const [baseName, ...restNames] = dedupedThemeToNames.get(key)!
     const baseTheme = `export const ${baseName} = ${objectToJsString(theme)} as Theme`
     themesString += `\n${baseTheme}`
 
@@ -95,7 +116,10 @@ function objectToJsString(obj: Object, indent = 4) {
   const whitespace = new Array(indent).fill(' ').join('')
   return `{
 ${Object.entries(obj)
-  .map(([k, v]) => `${whitespace}${k}: '${v}'`)
+  .map(([k, v]) => {
+    const variableName = dedupedTokens.get(v)
+    return `${whitespace}${k}: ${variableName}`
+  })
   .join(',\n')}
 }`
 }

package/src/write-generate-themes.ts

@@ -10,6 +10,7 @@ export async function writeGeneratedThemes(
   generatedOutput: Awaited<ReturnType<typeof generateThemes>>
 ) {
   const { generated, state } = generatedOutput
+  const tamaguiDotDirExists = await fs.pathExists(tamaguiDotDir)
   const themeBuilderStatePath = join(tamaguiDotDir, `theme-builder.json`)
 
   if (process.env.DEBUG === 'tamagui') {
@@ -21,6 +22,8 @@ export async function writeGeneratedThemes(
 
   await Promise.all([
     fs.writeFile(outPath, generated),
-    state ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state)) : null,
+    state && tamaguiDotDirExists
+      ? fs.writeFile(themeBuilderStatePath, JSON.stringify(state))
+      : null,
   ])
 }

package/types/write-generate-themes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-generate-themes.d.ts","sourceRoot":"","sources":["../src/write-generate-themes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,iBAgB5D"}
+{"version":3,"file":"write-generate-themes.d.ts","sourceRoot":"","sources":["../src/write-generate-themes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,iBAmB5D"}