@tamagui/static 1.0.1-beta.103 → 1.0.1-beta.106

package/dist/cjs/constants.js

@@ -24,21 +24,25 @@ __export(constants_exports, {
   CSS_FILE_NAME: () => CSS_FILE_NAME,
   FAILED_EVAL: () => FAILED_EVAL,
   MEDIA_SEP: () => MEDIA_SEP,
+  SHOULD_DEBUG: () => SHOULD_DEBUG,
   cacheDir: () => cacheDir
 });
 module.exports = __toCommonJS(constants_exports);
 var import_find_cache_dir = __toESM(require("find-cache-dir"));
+var _a;
 const CSS_FILE_NAME = "__snack.css";
 const MEDIA_SEP = "_";
 const cacheDir = (0, import_find_cache_dir.default)({ name: "tamagui", create: true });
 const FAILED_EVAL = Symbol("failed_style_eval");
 const CONCAT_CLASSNAME_IMPORT = "concatClassName";
+const SHOULD_DEBUG = process.env.DEBUG === "*" || ((_a = process.env.DEBUG) == null ? void 0 : _a.startsWith("tamagui"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CONCAT_CLASSNAME_IMPORT,
   CSS_FILE_NAME,
   FAILED_EVAL,
   MEDIA_SEP,
+  SHOULD_DEBUG,
   cacheDir
 });
 //# sourceMappingURL=constants.js.map

package/dist/cjs/constants.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/constants.ts"],
-  "sourcesContent": ["import findCacheDir from 'find-cache-dir'\n\nexport const CSS_FILE_NAME = '__snack.css'\n\n// ENSURE THIS ISNT THE SAME AS THE SEPARATOR USED FOR STYLE KEYS\n// SEE matching one in concatClassName\nexport const MEDIA_SEP = '_'\n\n// ensure cache dir\nexport const cacheDir = findCacheDir({ name: 'tamagui', create: true })\n\nexport const FAILED_EVAL = Symbol('failed_style_eval')\nexport const CONCAT_CLASSNAME_IMPORT = 'concatClassName'\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AAElB,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,WAAW,mCAAa,EAAE,MAAM,WAAW,QAAQ,KAAK,CAAC;AAE/D,MAAM,cAAc,OAAO,mBAAmB;AAC9C,MAAM,0BAA0B;",
+  "sourcesContent": ["import findCacheDir from 'find-cache-dir'\n\nexport const CSS_FILE_NAME = '__snack.css'\n\n// ENSURE THIS ISNT THE SAME AS THE SEPARATOR USED FOR STYLE KEYS\n// SEE matching one in concatClassName\nexport const MEDIA_SEP = '_'\n\n// ensure cache dir\nexport const cacheDir = findCacheDir({ name: 'tamagui', create: true })\n\nexport const FAILED_EVAL = Symbol('failed_style_eval')\nexport const CONCAT_CLASSNAME_IMPORT = 'concatClassName'\n\nexport const SHOULD_DEBUG = process.env.DEBUG === '*' || process.env.DEBUG?.startsWith('tamagui')\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AAAzB;AAEO,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,WAAW,mCAAa,EAAE,MAAM,WAAW,QAAQ,KAAK,CAAC;AAE/D,MAAM,cAAc,OAAO,mBAAmB;AAC9C,MAAM,0BAA0B;AAEhC,MAAM,eAAe,QAAQ,IAAI,UAAU,OAAO,eAAQ,IAAI,UAAZ,mBAAmB,WAAW;",
   "names": []
 }

package/dist/cjs/extractor/createEvaluator.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/extractor/createEvaluator.ts"],
-  "sourcesContent": ["import vm from 'vm'\n\nimport generate from '@babel/generator'\nimport { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport type { TamaguiConfig } from '@tamagui/core'\nimport { createCSSVariable } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\n\nimport { FAILED_EVAL } from '../constants'\nimport { evaluateAstNode } from './evaluateAstNode'\nimport { isValidThemeHook } from './extractHelpers'\n\nexport function createEvaluator({\n  tamaguiConfig,\n  staticNamespace,\n  sourcePath,\n  traversePath,\n  shouldPrintDebug,\n}: {\n  tamaguiConfig: TamaguiConfig\n  staticNamespace: Record<string, any>\n  sourcePath: string\n  traversePath?: NodePath<t.JSXElement>\n  shouldPrintDebug: boolean | 'verbose'\n}) {\n  // called when evaluateAstNode encounters a dynamic-looking prop\n  const evalFn = (n: t.Node) => {\n    // themes\n    if (\n      t.isMemberExpression(n) &&\n      t.isIdentifier(n.property) &&\n      traversePath &&\n      isValidThemeHook(traversePath, n, sourcePath)\n    ) {\n      const key = n.property.name\n      if (shouldPrintDebug) {\n        console.log('    > found theme prop', key)\n      }\n      console.log('SHOULD FIND THEME (NESTED NOW)', key) // tamaguiConfig.themes)\n      // if (!themeKeys.has(key)) {\n      //   throw new Error(`    > accessing non-existent theme key: ${key}`)\n      // }\n      return createCSSVariable(key)\n    }\n    // variable\n    if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {\n      return staticNamespace[n.name]\n    }\n    const evalContext = vm.createContext(staticNamespace)\n    const codeWithTypescriptAnnotations = `(${generate(n as any).code})`\n    const code = esbuild\n      .transformSync(codeWithTypescriptAnnotations, { loader: 'tsx' })\n      .code.replace(/;\\n$/, '')\n\n    if (shouldPrintDebug) {\n      console.log('evaluating', code)\n    }\n    return vm.runInContext(code, evalContext)\n  }\n\n  return (n: t.Node) => {\n    return evaluateAstNode(n, evalFn)\n  }\n}\n\nexport function createSafeEvaluator(attemptEval: (n: t.Node) => any) {\n  return (n: t.Node) => {\n    try {\n      return attemptEval(n)\n    } catch (err) {\n      return FAILED_EVAL\n    }\n  }\n}\n"],
+  "sourcesContent": ["import vm from 'vm'\n\nimport generate from '@babel/generator'\nimport { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport type { TamaguiConfig } from '@tamagui/core-node'\nimport { createCSSVariable } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\n\nimport { FAILED_EVAL } from '../constants'\nimport { evaluateAstNode } from './evaluateAstNode'\nimport { isValidThemeHook } from './extractHelpers'\n\nexport function createEvaluator({\n  tamaguiConfig,\n  staticNamespace,\n  sourcePath,\n  traversePath,\n  shouldPrintDebug,\n}: {\n  tamaguiConfig: TamaguiConfig\n  staticNamespace: Record<string, any>\n  sourcePath: string\n  traversePath?: NodePath<t.JSXElement>\n  shouldPrintDebug: boolean | 'verbose'\n}) {\n  // called when evaluateAstNode encounters a dynamic-looking prop\n  const evalFn = (n: t.Node) => {\n    // themes\n    if (\n      t.isMemberExpression(n) &&\n      t.isIdentifier(n.property) &&\n      traversePath &&\n      isValidThemeHook(traversePath, n, sourcePath)\n    ) {\n      const key = n.property.name\n      if (shouldPrintDebug) {\n        console.log('    > found theme prop', key)\n      }\n      console.log('SHOULD FIND THEME (NESTED NOW)', key) // tamaguiConfig.themes)\n      // if (!themeKeys.has(key)) {\n      //   throw new Error(`    > accessing non-existent theme key: ${key}`)\n      // }\n      return createCSSVariable(key)\n    }\n    // variable\n    if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {\n      return staticNamespace[n.name]\n    }\n    const evalContext = vm.createContext(staticNamespace)\n    const codeWithTypescriptAnnotations = `(${generate(n as any).code})`\n    const code = esbuild\n      .transformSync(codeWithTypescriptAnnotations, { loader: 'tsx' })\n      .code.replace(/;\\n$/, '')\n\n    if (shouldPrintDebug) {\n      console.log('evaluating', code)\n    }\n    return vm.runInContext(code, evalContext)\n  }\n\n  return (n: t.Node) => {\n    return evaluateAstNode(n, evalFn)\n  }\n}\n\nexport function createSafeEvaluator(attemptEval: (n: t.Node) => any) {\n  return (n: t.Node) => {\n    try {\n      return attemptEval(n)\n    } catch (err) {\n      return FAILED_EVAL\n    }\n  }\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AAEf,uBAAqB;AAErB,QAAmB;AAEnB,uBAAkC;AAClC,qBAAoB;AAEpB,uBAA4B;AAC5B,6BAAgC;AAChC,4BAAiC;AAE1B,yBAAyB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAOC;AAED,QAAM,SAAS,CAAC,MAAc;AAE5B,QACE,EAAE,mBAAmB,CAAC,KACtB,EAAE,aAAa,EAAE,QAAQ,KACzB,gBACA,4CAAiB,cAAc,GAAG,UAAU,GAC5C;AACA,YAAM,MAAM,EAAE,SAAS;AACvB,UAAI,kBAAkB;AACpB,gBAAQ,IAAI,0BAA0B,GAAG;AAAA,MAC3C;AACA,cAAQ,IAAI,kCAAkC,GAAG;AAIjD,aAAO,wCAAkB,GAAG;AAAA,IAC9B;AAEA,QAAI,EAAE,aAAa,CAAC,KAAK,gBAAgB,eAAe,EAAE,IAAI,GAAG;AAC/D,aAAO,gBAAgB,EAAE;AAAA,IAC3B;AACA,UAAM,cAAc,kBAAG,cAAc,eAAe;AACpD,UAAM,gCAAgC,IAAI,8BAAS,CAAQ,EAAE;AAC7D,UAAM,OAAO,uBACV,cAAc,+BAA+B,EAAE,QAAQ,MAAM,CAAC,EAC9D,KAAK,QAAQ,QAAQ,EAAE;AAE1B,QAAI,kBAAkB;AACpB,cAAQ,IAAI,cAAc,IAAI;AAAA,IAChC;AACA,WAAO,kBAAG,aAAa,MAAM,WAAW;AAAA,EAC1C;AAEA,SAAO,CAAC,MAAc;AACpB,WAAO,4CAAgB,GAAG,MAAM;AAAA,EAClC;AACF;AAEO,6BAA6B,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY,CAAC;AAAA,IACtB,SAAS,KAAP;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/cjs/extractor/createExtractor.js

@@ -56,7 +56,6 @@ var import_path = require("path");
 var import_traverse = __toESM(require("@babel/traverse"));
 var t = __toESM(require("@babel/types"));
 var import_core_node = require("@tamagui/core-node");
-var import_lodash = require("lodash");
 var import_constants = require("../constants");
 var import_createEvaluator = require("./createEvaluator");
 var import_evaluateAstNode = require("./evaluateAstNode");
@@ -313,10 +312,8 @@ function createExtractor() {
             console.log("Exctacting styled()", styles, out, "to", atomics);
           }
           for (const atomic of atomics) {
-            for (const rule of atomic.rules) {
-              out.rulesToInsert = out.rulesToInsert || [];
-              out.rulesToInsert.push([atomic.identifier, rule]);
-            }
+            out.rulesToInsert = out.rulesToInsert || [];
+            out.rulesToInsert.push(atomic);
             classNames[atomic.property] = atomic.identifier;
           }
           definition.properties = skipped;
@@ -328,8 +325,8 @@ function createExtractor() {
             definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)));
           }
           if (out.rulesToInsert) {
-            for (const [identifier, rule] of out.rulesToInsert) {
-              onStyleRule == null ? void 0 : onStyleRule(identifier, [rule]);
+            for (const { identifier, rules } of out.rulesToInsert) {
+              onStyleRule == null ? void 0 : onStyleRule(identifier, rules);
             }
           }
           res.styled++;
@@ -338,7 +335,7 @@ function createExtractor() {
           }
         },
         JSXElement(traversePath) {
-          var _a2, _b2, _c, _d;
+          var _a2, _b2, _c;
           tm.mark("jsx-element", shouldPrintDebug === "verbose");
           const node = traversePath.node.openingElement;
           const ogAttributes = node.attributes;
@@ -787,16 +784,6 @@ function createExtractor() {
                   prev2[key] = next[key];
                 }
               }
-            }, omitInvalidStyles = function(style) {
-              if (staticConfig.validStyles) {
-                for (const key in style) {
-                  if (import_core_node.stylePropsTransform[key] || !staticConfig.validStyles[key] && !import_core_node.pseudoDescriptors[key] && !/(hoverStyle|focusStyle|pressStyle)$/.test(key)) {
-                    if (shouldPrintDebug)
-                      console.log(" delete invalid style", key);
-                    delete style[key];
-                  }
-                }
-              }
             };
             node.attributes.find((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug" && n.value === null);
             if (shouldPrintDebug) {
@@ -1238,24 +1225,6 @@ function createExtractor() {
             if (!completeStyles) {
               throw new Error(`Impossible, no styles`);
             }
-            const addInitialStyleKeys = shouldFlatten ? (0, import_lodash.difference)(Object.keys(completeStyles), Object.keys(foundStaticProps)) : [];
-            if (addInitialStyleKeys.length) {
-              const toAdd = (0, import_lodash.pick)(completeStyles, ...addInitialStyleKeys);
-              const firstGroup = attrs.find((x) => x.type === "style");
-              if (shouldPrintDebug) {
-                console.log("    toAdd", (0, import_extractHelpers.objToStr)(toAdd));
-              }
-              if (!firstGroup) {
-                attrs.unshift({ type: "style", value: toAdd });
-              } else {
-                omitInvalidStyles(firstGroup.value);
-                Object.assign(firstGroup.value, toAdd);
-              }
-            }
-            if (shouldPrintDebug) {
-              if (shouldFlatten)
-                console.log("   -- addInitialStyleKeys", addInitialStyleKeys.join(", "));
-            }
             let getStyleError = null;
             for (const attr of attrs) {
               try {
@@ -1305,9 +1274,6 @@ function createExtractor() {
                       if (INLINE_EXTRACTABLE[name]) {
                         attr.value.name.name = INLINE_EXTRACTABLE[name];
                       }
-                      if ((_d = staticConfig.variants) == null ? void 0 : _d[name]) {
-                        const expanded = getStyles({});
-                      }
                     }
                   }
                 }