@tamagui/static 1.0.1-beta.130 → 1.0.1-beta.133

package/dist/cjs/extractor/createEvaluator.js

@@ -46,7 +46,6 @@ function createEvaluator({
       if (shouldPrintDebug) {
         console.log("    > found theme prop", key);
       }
-      console.log("SHOULD FIND THEME (NESTED NOW)", key);
       return (0, import_core_node.createCSSVariable)(key);
     }
     if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {

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-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;",
+  "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      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,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

@@ -730,8 +730,29 @@ function createExtractor() {
                   alternate: null
                 });
               });
+            }, splitVariants2 = function(style) {
+              var _a2;
+              const variants2 = {};
+              const styles = {};
+              for (const key in style) {
+                if ((_a2 = staticConfig.variants) == null ? void 0 : _a2[key]) {
+                  variants2[key] = style[key];
+                } else {
+                  styles[key] = style[key];
+                }
+              }
+              return {
+                variants: variants2,
+                styles
+              };
+            }, expandStylesWithoutVariants2 = function(style) {
+              const { variants: variants2, styles } = splitVariants2(style);
+              return {
+                ...(0, import_core_node.expandStyles)(styles),
+                ...variants2
+              };
             }, mergeStyles2 = function(prev2, nextIn) {
-              const next = (0, import_core_node.expandStyles)(nextIn);
+              const next = expandStylesWithoutVariants2(nextIn);
               for (const key in next) {
                 if (import_core_node.pseudoDescriptors[key]) {
                   prev2[key] = prev2[key] || {};
@@ -746,7 +767,7 @@ function createExtractor() {
                 }
               }
             };
-            var evaluateAttribute = evaluateAttribute2, isExtractable = isExtractable2, createTernariesFromObjectProperties = createTernariesFromObjectProperties2, mergeStyles = mergeStyles2;
+            var evaluateAttribute = evaluateAttribute2, isExtractable = isExtractable2, createTernariesFromObjectProperties = createTernariesFromObjectProperties2, splitVariants = splitVariants2, expandStylesWithoutVariants = expandStylesWithoutVariants2, mergeStyles = mergeStyles2;
             node.attributes.find((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug" && n.value === null);
             if (shouldPrintDebug) {
               console.log("\n");
@@ -929,7 +950,8 @@ function createExtractor() {
             const themeVal = inlined.get("theme");
             inlined.delete("theme");
             for (const [key] of [...inlined]) {
-              if (INLINE_EXTRACTABLE[key] || ((_a = staticConfig.variants) == null ? void 0 : _a[key])) {
+              const isExtractableVariant = ((_a = staticConfig.variants) == null ? void 0 : _a[key]) && variantValues.has(key);
+              if (INLINE_EXTRACTABLE[key] || isExtractableVariant) {
                 inlined.delete(key);
               }
             }
@@ -1022,7 +1044,7 @@ function createExtractor() {
               if (cur.type === "style") {
                 foundStaticProps = {
                   ...foundStaticProps,
-                  ...(0, import_core_node.expandStyles)(cur.value)
+                  ...expandStylesWithoutVariants2(cur.value)
                 };
                 continue;
               }
@@ -1262,14 +1284,18 @@ function createExtractor() {
               }
             }
             if (!shouldFlatten) {
-              if (Object.keys(inlineWhenUnflattenedOGVals).length) {
+              if (inlineWhenUnflattened.size) {
                 for (const [index, attr] of attrs.entries()) {
                   if (attr.type === "style") {
                     for (const key in attr.value) {
+                      if (!inlineWhenUnflattened.has(key))
+                        continue;
                       const val = inlineWhenUnflattenedOGVals[key];
                       if (val) {
                         delete attr.value[key];
                         attrs.splice(index - 1, 0, val.attr);
+                      } else {
+                        delete attr.value[key];
                       }
                     }
                   }
@@ -1299,7 +1325,9 @@ function createExtractor() {
               jsxPath: traversePath,
               originalNodeName,
               isFlattened: shouldFlatten,
-              programPath
+              programPath,
+              completeProps,
+              staticConfig
             });
           } finally {
             if (debugPropValue) {