@tamagui/generate-themes 2.7.7 → 3.0.0-beta.643.1

package/src/generate-themes.ts

@@ -1,8 +1,13 @@
-import type { ThemeBuilder } from '@tamagui/theme-builder'
+import Module from 'node:module'
 import { join } from 'node:path'
 
-type ThemeBuilderInterceptOpts = {
-  onComplete: (result: { themeBuilder: ThemeBuilder<any> }) => void
+// resolver internals used to purge caches between invocations, absent from
+// @types/node and, in _pathCache's case, from bun. imported rather than read
+// off the ambient `module`, which does not exist when this package is loaded
+// as ESM.
+const ModuleInternals = Module as unknown as {
+  _resolveFilename(request: string, ...args: any[]): string
+  _pathCache?: Record<string, string>
 }
 
 let didRegisterOnce = false
@@ -12,17 +17,33 @@ export async function generateThemes(inputFile: string) {
 
   if (!didRegisterOnce) {
     didRegisterOnce = true
+    const nodeResolve = ModuleInternals._resolveFilename
     // the unregsiter does basically nothing and keeps a process running
     require('esbuild-register/dist/node').register({
       hookIgnoreNodeModules: false,
     })
+    // esbuild-register installs a tsconfig-paths hook that rewrites bare workspace
+    // workspace specifiers can resolve to source-tree directories that node cannot load.
+    // prefer real node
+    // resolution (package exports) for bare specifiers, falling back to the
+    // tsconfig-paths chain for packages whose dist isn't built.
+    const chained = ModuleInternals._resolveFilename
+    ModuleInternals._resolveFilename = function (request: string, ...args: any[]) {
+      if (request[0] !== '.' && !request.startsWith('/')) {
+        try {
+          return nodeResolve.call(this, request, ...args)
+        } catch {
+          // fall through to the tsconfig-paths chain
+        }
+      }
+      return chained.call(this, request, ...args)
+    }
   } else {
     purgeCache(inputFilePath)
   }
 
   let og = process.env.TAMAGUI_KEEP_THEMES
   process.env.TAMAGUI_KEEP_THEMES = '1'
-  process.env.TAMAGUI_RUN_THEMEBUILDER = '1'
 
   try {
     const requiredThemes = require(inputFilePath)
@@ -44,12 +65,10 @@ export async function generateThemes(inputFile: string) {
   }
 }
 
-/**
- * value -> name of variable
- */
-const dedupedTokens = new Map<string, string>()
-
 function generatedThemesToTypescript(themes: Record<string, any>) {
+  // value -> name of variable. per invocation: a process-wide map would emit
+  // the previous run's colors into this run's `colors` array.
+  const dedupedTokens = new Map<string, string>()
   const dedupedThemes = new Map<string, object>()
   const dedupedThemeToNames = new Map<string, string[]>()
 
@@ -90,7 +109,7 @@ function generatedThemesToTypescript(themes: Record<string, any>) {
   const baseTypeString = `export type Theme = {
 ${baseKeys
   .map(([k]) => {
-    return `  ${k}: string;\n`
+    return `  ${JSON.stringify(k)}: string;\n`
   })
   .join('')}
 }`
@@ -122,7 +141,7 @@ function t(a: [number, number][]) {
   // add all keys array
   const keys = baseKeys.map(([k]) => k)
   out += `const ks = [\n`
-  out += keys.map((k) => `'${k}'`).join(',\n')
+  out += keys.map((k) => JSON.stringify(k)).join(',\n')
   out += `]\n\n`
 
   // add all themes
@@ -176,19 +195,16 @@ function purgeCache(moduleName) {
     delete require.cache[mod.id]
   })
 
-  // @ts-ignore
-  if (!module.constructor || !module.constructor._pathCache) {
-    // bun doesn't have this
+  const pathCache = ModuleInternals._pathCache
+  if (!pathCache) {
     return
   }
 
   // Remove cached paths to the module.
   // Thanks to @bentael for pointing this out.
-  // @ts-ignore
-  Object.keys(module.constructor._pathCache).forEach((cacheKey) => {
+  Object.keys(pathCache).forEach((cacheKey) => {
     if (cacheKey.indexOf(moduleName) > 0) {
-      // @ts-ignore
-      delete module.constructor._pathCache[cacheKey]
+      delete pathCache[cacheKey]
     }
   })
 }

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

@@ -1 +1 @@
-{"version":3,"file":"generate-themes.d.ts","sourceRoot":"","sources":["../src/generate-themes.ts"],"names":[],"mappings":"AASA,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM;;eAmCrD"}
+{"version":3,"file":"generate-themes.d.ts","sourceRoot":"","sources":["../src/generate-themes.ts"],"names":[],"mappings":"AAcA,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM;;eAmDrD"}

package/dist/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.native.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}