@tamagui/static 1.0.1-beta.75 → 1.0.1-beta.78

package/dist/jsx/extractor/createExtractor.js

@@ -8,7 +8,7 @@ import {
   mediaQueryConfig,
   normalizeStyleObject,
   proxyThemeVariables,
-  pseudos,
+  pseudoDescriptors,
   rnw,
   stylePropsTransform
 } from "@tamagui/core-node";
@@ -56,7 +56,7 @@ function createExtractor() {
   let hasLogged = false;
   function isValidStyleKey(name, staticConfig) {
     var _a;
-    return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!pseudos[name] || loadedTamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
+    return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!pseudoDescriptors[name] || loadedTamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
   }
   return {
     getTamagui() {
@@ -251,6 +251,7 @@ function createExtractor() {
           const atomics = getStylesAtomic(out.style);
           for (const atomic of atomics) {
             for (const rule of atomic.rules) {
+              out.rulesToInsert = out.rulesToInsert || [];
               out.rulesToInsert.push([atomic.identifier, rule]);
             }
             classNames[atomic.property] = atomic.identifier;
@@ -260,8 +261,10 @@ function createExtractor() {
             const val = classNames[cn];
             definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)));
           }
-          for (const [identifier, rule] of out.rulesToInsert) {
-            onStyleRule == null ? void 0 : onStyleRule(identifier, [rule]);
+          if (out.rulesToInsert) {
+            for (const [identifier, rule] of out.rulesToInsert) {
+              onStyleRule == null ? void 0 : onStyleRule(identifier, [rule]);
+            }
           }
           res.styled++;
           if (shouldPrintDebug) {
@@ -709,7 +712,7 @@ function createExtractor() {
             }, mergeStyles = function(prev2, next) {
               normalizeStyleObject(next);
               for (const key in next) {
-                if (pseudos[key]) {
+                if (pseudoDescriptors[key]) {
                   prev2[key] = prev2[key] || {};
                   if (shouldPrintDebug) {
                     if (!next[key] || !prev2[key]) {
@@ -724,7 +727,7 @@ function createExtractor() {
             }, omitInvalidStyles = function(style) {
               if (staticConfig.validStyles) {
                 for (const key in style) {
-                  if (stylePropsTransform[key] || !staticConfig.validStyles[key] && !pseudos[key] && !/(hoverStyle|focusStyle|pressStyle)$/.test(key)) {
+                  if (stylePropsTransform[key] || !staticConfig.validStyles[key] && !pseudoDescriptors[key] && !/(hoverStyle|focusStyle|pressStyle)$/.test(key)) {
                     if (shouldPrintDebug)
                       console.log(" delete invalid style", key);
                     delete style[key];
@@ -1113,7 +1116,7 @@ function createExtractor() {
               if (cur.type === "style") {
                 const key = Object.keys(cur.value)[0];
                 const value = cur.value[key];
-                const shouldKeepOriginalAttr = !shouldFlatten && !validStyles[key] && !pseudos[key] && !key.startsWith("data-");
+                const shouldKeepOriginalAttr = !shouldFlatten && !validStyles[key] && !pseudoDescriptors[key] && !key.startsWith("data-");
                 if (shouldKeepOriginalAttr) {
                   if (shouldPrintDebug) {
                     console.log("     - keeping as non-style", key);

package/dist/jsx/extractor/extractToClassNames.js

@@ -263,8 +263,8 @@ function extractToClassNames({
     const numFlattened = `${res.flattened}`.padStart(3);
     const memory = process.env.DEBUG && memUsed > 10 ? ` ${memUsed}MB` : "";
     const timing = Date.now() - start;
-    const timingWarning = timing > 50 ? "\u26A0\uFE0F" : timing > 150 ? "\u2622\uFE0F" : "";
-    const timingStr = `${timing}ms${timingWarning}`.padStart(6);
+    const timingWarning = timing > 150 ? "\u26A0\uFE0F" : timing > 150 ? "\u2622\uFE0F" : "";
+    const timingStr = `${timing}ms ${timingWarning}`.padStart(6);
     const pre = getPrefixLogs(options);
     const memStr = memory ? `(${memory})` : "";
     console.log(`${pre} ${path2}  ${numFound} \xB7 ${numOptimized} \xB7 ${numFlattened} \xB7 ${numStyled}  ${timingStr} ${memStr}`);

package/dist/jsx/extractor/loadTamagui.js

@@ -6,7 +6,6 @@ function loadTamagui(props) {
     return loadedTamagui;
   }
   const configPath = join(process.cwd(), props.config);
-  const x = Math.random();
   const { unregister } = require("esbuild-register/dist/node").register({
     target: "es2019",
     format: "cjs"
@@ -20,7 +19,9 @@ function loadTamagui(props) {
     const rnw = require("react-native-web");
     const Mod = require("module");
     const og = Mod.prototype.require;
+    const nameToPaths = {};
     Mod.prototype.require = function(path) {
+      var _a, _b, _c;
       if (path.endsWith(".css")) {
         return {};
       }
@@ -31,7 +32,26 @@ function loadTamagui(props) {
         return rnw;
       }
       try {
-        return og.apply(this, arguments);
+        const out = og.apply(this, arguments);
+        if (!nameToPaths[path]) {
+          if (out && typeof out === "object") {
+            for (const key in out) {
+              try {
+                const conf = (_a = out[key]) == null ? void 0 : _a.staticConfig;
+                if (conf) {
+                  if (conf.componentName) {
+                    (_c = nameToPaths[_b = conf.componentName]) != null ? _c : nameToPaths[_b] = /* @__PURE__ */ new Set();
+                    const fullName = path.startsWith(".") ? join(`${this.path.replace(/dist(\/cjs)?/, "src")}`, path) : path;
+                    nameToPaths[conf.componentName].add(fullName);
+                  } else {
+                  }
+                }
+              } catch {
+              }
+            }
+          }
+        }
+        return out;
       } catch (err) {
         console.error("Tamagui error loading file:\n", path, err.message, "\n", err.stack);
         process.exit(1);
@@ -55,7 +75,8 @@ function loadTamagui(props) {
         const val = exported[Name];
         const staticConfig = val == null ? void 0 : val.staticConfig;
         if (staticConfig) {
-          Object.assign(components, { [Name]: { staticConfig } });
+          const { Component, reactNativeWebComponent, ...sc } = staticConfig;
+          Object.assign(components, { [Name]: { staticConfig: sc } });
         }
       }
     }
@@ -64,11 +85,12 @@ function loadTamagui(props) {
     createTamagui(tamaguiConfig);
     loadedTamagui = {
       components,
-      tamaguiConfig
+      tamaguiConfig,
+      nameToPaths
     };
     return loadedTamagui;
   } catch (err) {
-    console.log("err", err);
+    console.log("Error loading Tamagui", err);
     throw err;
   } finally {
     unregister();

package/dist/jsx/index.js

@@ -6,6 +6,7 @@ export * from "./constants";
 export * from "./extractor/extractToClassNames";
 export * from "./extractor/extractHelpers";
 export * from "@tamagui/patch-rnw";
+export * from "./extractor/loadTamagui";
 export {
   TamaguiOptions,
   createExtractor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.75",
+  "version": "1.0.1-beta.78",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -38,26 +38,26 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.75",
-    "@tamagui/core-node": "^1.0.1-beta.75",
-    "@tamagui/fake-react-native": "^1.0.1-beta.75",
-    "@tamagui/helpers": "^1.0.1-beta.75",
-    "@tamagui/patch-rnw": "^1.0.1-beta.75",
-    "@tamagui/proxy-worm": "^1.0.1-beta.75",
+    "@tamagui/build": "^1.0.1-beta.78",
+    "@tamagui/core-node": "^1.0.1-beta.78",
+    "@tamagui/fake-react-native": "^1.0.1-beta.78",
+    "@tamagui/helpers": "^1.0.1-beta.78",
+    "@tamagui/patch-rnw": "^1.0.1-beta.78",
+    "@tamagui/proxy-worm": "^1.0.1-beta.78",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
     "find-cache-dir": "^3.3.2",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.75"
+    "tamagui": "^1.0.1-beta.78"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
     "@babel/types": "^7.15.6",
     "@dish/babel-preset": "^0.0.6",
-    "@tamagui/config-base": "^1.0.1-beta.75",
+    "@tamagui/config-base": "^1.0.1-beta.78",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@types/jest": "*",
@@ -76,7 +76,7 @@
     "react-native-web": "^0.17.5",
     "react-test-renderer": "^18.2.0",
     "style-loader": "^3.3.1",
-    "typescript": "^4.7.2",
+    "typescript": "^4.7.4",
     "webpack": "^5.73.0"
   },
   "peerDependencies": {

package/src/extractor/createExtractor.ts

@@ -12,7 +12,7 @@ import {
   mediaQueryConfig,
   normalizeStyleObject,
   proxyThemeVariables,
-  pseudos,
+  pseudoDescriptors,
   rnw,
   stylePropsTransform,
 } from '@tamagui/core-node'
@@ -86,7 +86,7 @@ export function createExtractor() {
   function isValidStyleKey(name: string, staticConfig: StaticConfigParsed) {
     return !!(
       !!staticConfig.validStyles?.[name] ||
-      !!pseudos[name] ||
+      !!pseudoDescriptors[name] ||
       // disable variants because caching at the variant level = less work
       // and expanding variants can get huge, i'm betting cost of many props
       // is more than cost of expanding variants once for cache
@@ -370,6 +370,7 @@ export function createExtractor() {
           const atomics = getStylesAtomic(out.style)
           for (const atomic of atomics) {
             for (const rule of atomic.rules) {
+              out.rulesToInsert = out.rulesToInsert || []
               out.rulesToInsert.push([atomic.identifier, rule])
             }
             classNames[atomic.property] = atomic.identifier
@@ -384,8 +385,10 @@ export function createExtractor() {
             definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)))
           }
 
-          for (const [identifier, rule] of out.rulesToInsert) {
-            onStyleRule?.(identifier, [rule])
+          if (out.rulesToInsert) {
+            for (const [identifier, rule] of out.rulesToInsert) {
+              onStyleRule?.(identifier, [rule])
+            }
           }
 
           res.styled++
@@ -1570,7 +1573,7 @@ export function createExtractor() {
               normalizeStyleObject(next)
               for (const key in next) {
                 // merge pseudos
-                if (pseudos[key]) {
+                if (pseudoDescriptors[key]) {
                   prev[key] = prev[key] || {}
                   if (shouldPrintDebug) {
                     if (!next[key] || !prev[key]) {
@@ -1597,7 +1600,7 @@ export function createExtractor() {
                   // (stylePropsTransform[key] ||
                   // de-opt if non-style
                   !validStyles[key] &&
-                  !pseudos[key] &&
+                  !pseudoDescriptors[key] &&
                   !key.startsWith('data-')
 
                 if (shouldKeepOriginalAttr) {
@@ -1704,7 +1707,7 @@ export function createExtractor() {
                   if (
                     stylePropsTransform[key] ||
                     (!staticConfig.validStyles[key] &&
-                      !pseudos[key] &&
+                      !pseudoDescriptors[key] &&
                       !/(hoverStyle|focusStyle|pressStyle)$/.test(key))
                   ) {
                     if (shouldPrintDebug) console.log(' delete invalid style', key)

package/src/extractor/extractToClassNames.ts

@@ -378,8 +378,8 @@ export function extractToClassNames({
     const numFlattened = `${res.flattened}`.padStart(3)
     const memory = process.env.DEBUG && memUsed > 10 ? ` ${memUsed}MB` : ''
     const timing = Date.now() - start
-    const timingWarning = timing > 50 ? '⚠️' : timing > 150 ? '☢️' : ''
-    const timingStr = `${timing}ms${timingWarning}`.padStart(6)
+    const timingWarning = timing > 150 ? '⚠️' : timing > 150 ? '☢️' : ''
+    const timingStr = `${timing}ms ${timingWarning}`.padStart(6)
     const pre = getPrefixLogs(options)
     const memStr = memory ? `(${memory})` : ''
     console.log(

package/src/extractor/loadTamagui.ts

@@ -1,36 +1,27 @@
 import { join } from 'path'
 
-import type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'
+import type { StaticConfig, TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'
 import { createTamagui } from '@tamagui/core-node'
 
 let loadedTamagui: any = null
 
-export function loadTamagui(props: { components: string[]; config: string }): {
+type NameToPaths = {
+  [key: string]: Set<string>
+}
+
+export type TamaguiProjectInfo = {
   components: Record<string, TamaguiComponent>
   tamaguiConfig: TamaguiInternalConfig
-} {
+  nameToPaths: NameToPaths
+}
+
+export function loadTamagui(props: { components: string[]; config: string }): TamaguiProjectInfo {
   if (loadedTamagui) {
     return loadedTamagui
   }
 
   const configPath = join(process.cwd(), props.config)
 
-  // threaded caching avoiding 1s loading of large configs every save
-  // const cachePath = join(cacheDir, 'tamagui-conf-cached.json')
-  // const confStat = statSync(configPath)
-
-  // // TODO may want to disable, its pretty optimistic at caching...
-  // try {
-  //   const confCache = readFileSync(cachePath, 'utf-8')
-  //   const confParsed = JSON.parse(confCache)
-  //   if (confParsed && confParsed.mtime === confStat.mtime) {
-  //     return confParsed.value
-  //   }
-  // } catch {
-  //   // ok, no cache
-  // }
-
-  const x = Math.random()
   const { unregister } = require('esbuild-register/dist/node').register({
     target: 'es2019',
     format: 'cjs',
@@ -50,6 +41,8 @@ export function loadTamagui(props: { components: string[]; config: string }): {
     const rnw = require('react-native-web')
     const Mod = require('module')
     const og = Mod.prototype.require
+    const nameToPaths: NameToPaths = {}
+
     Mod.prototype.require = function (path: string) {
       if (path.endsWith('.css')) {
         return {}
@@ -69,7 +62,30 @@ export function loadTamagui(props: { components: string[]; config: string }): {
         return rnw
       }
       try {
-        return og.apply(this, arguments)
+        const out = og.apply(this, arguments)
+        if (!nameToPaths[path]) {
+          if (out && typeof out === 'object') {
+            for (const key in out) {
+              try {
+                const conf = out[key]?.staticConfig as StaticConfig
+                if (conf) {
+                  if (conf.componentName) {
+                    nameToPaths[conf.componentName] ??= new Set()
+                    const fullName = path.startsWith('.')
+                      ? join(`${this.path.replace(/dist(\/cjs)?/, 'src')}`, path)
+                      : path
+                    nameToPaths[conf.componentName].add(fullName)
+                  } else {
+                    // console.log('no name component', path)
+                  }
+                }
+              } catch {
+                // ok
+              }
+            }
+          }
+        }
+        return out
       } catch (err: any) {
         console.error('Tamagui error loading file:\n', path, err.message, '\n', err.stack)
         // avoid infinite loops
@@ -97,9 +113,11 @@ export function loadTamagui(props: { components: string[]; config: string }): {
       const exported = require(moduleName)
       for (const Name in exported) {
         const val = exported[Name]
-        const staticConfig = val?.staticConfig
+        const staticConfig = val?.staticConfig as StaticConfig | undefined
         if (staticConfig) {
-          Object.assign(components, { [Name]: { staticConfig } })
+          // remove non-stringifyable
+          const { Component, reactNativeWebComponent, ...sc } = staticConfig
+          Object.assign(components, { [Name]: { staticConfig: sc } })
         }
       }
     }
@@ -114,24 +132,12 @@ export function loadTamagui(props: { components: string[]; config: string }): {
     loadedTamagui = {
       components,
       tamaguiConfig,
+      nameToPaths,
     }
 
-    // save cache
-    // try {
-    //   writeFileSync(
-    //     cachePath,
-    //     JSON.stringify({
-    //       value: loadedTamagui,
-    //       mtime: confStat.mtime,
-    //     })
-    //   )
-    // } catch (err: any) {
-    //   console.log(`Error: tamagui config not stringifiable, caching disabled "${err.message}"`)
-    // }
-
     return loadedTamagui
   } catch (err) {
-    console.log('err', err)
+    console.log('Error loading Tamagui', err)
     throw err
   } finally {
     unregister()

package/src/index.ts

@@ -7,3 +7,4 @@ export * from './constants'
 export * from './extractor/extractToClassNames'
 export * from './extractor/extractHelpers'
 export * from '@tamagui/patch-rnw'
+export * from './extractor/loadTamagui'

package/types/extractor/createExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAUtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAkCb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,iSAoBrC,mBAAmB;;;;;;;EAswD3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAUtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAkCb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,iSAoBrC,mBAAmB;;;;;;;EAywD3B"}

package/types/extractor/loadTamagui.d.ts

@@ -1,9 +1,15 @@
 import type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core';
-export declare function loadTamagui(props: {
-    components: string[];
-    config: string;
-}): {
+declare type NameToPaths = {
+    [key: string]: Set<string>;
+};
+export declare type TamaguiProjectInfo = {
     components: Record<string, TamaguiComponent>;
     tamaguiConfig: TamaguiInternalConfig;
+    nameToPaths: NameToPaths;
 };
+export declare function loadTamagui(props: {
+    components: string[];
+    config: string;
+}): TamaguiProjectInfo;
+export {};
 //# sourceMappingURL=loadTamagui.d.ts.map

package/types/extractor/loadTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAK5E,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAC5E,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC5C,aAAa,EAAE,qBAAqB,CAAA;CACrC,CAgIA"}
+{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAK1F,aAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,oBAAY,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC5C,aAAa,EAAE,qBAAqB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CA+H/F"}

package/types/index.d.ts

@@ -5,4 +5,5 @@ export * from './constants';
 export * from './extractor/extractToClassNames';
 export * from './extractor/extractHelpers';
 export * from '@tamagui/patch-rnw';
+export * from './extractor/loadTamagui';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA"}