@tamagui/static 1.0.1-beta.61 → 1.0.1-beta.64

package/dist/esm/extractor/extractMediaStyle.js

@@ -43,7 +43,7 @@ function extractMediaStyle(ternary, jsxPath, tamaguiConfig, sourcePath, importan
       const screenStr = negate ? "not all" : "screen";
       const mediaQuery = `${screenStr} and ${mediaSelector}`;
       const precendencePrefix = mediaKeyPrecendence[key];
-      const styleInner = style.rules[0].replace(style.identifier, identifier);
+      const styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
       let styleRule = "";
       if (styleInner.includes("@media")) {
         styleRule = styleInner.replace("{", ` and ${mediaQuery} {`);

package/dist/esm/extractor/extractMediaStyle.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/extractor/extractMediaStyle.ts"],
-  "sourcesContent": ["import { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport { TamaguiInternalConfig, getStylesAtomic, mediaObjectToString } from '@tamagui/core-node'\nimport { ViewStyle } from 'react-native'\n\nimport { MEDIA_SEP } from '../constants'\nimport { StyleObject, Ternary } from '../types'\nimport { isInsideTamagui, isPresent } from './extractHelpers'\n\nexport function extractMediaStyle(\n  ternary: Ternary,\n  jsxPath: NodePath<t.JSXElement>,\n  tamaguiConfig: TamaguiInternalConfig,\n  sourcePath: string,\n  importance = 0,\n  shouldPrintDebug: boolean | 'verbose' = false\n) {\n  const mt = getMediaQueryTernary(ternary, jsxPath, sourcePath)\n  if (!mt) {\n    return null\n  }\n  const { key } = mt\n  const mq = tamaguiConfig.media[key]\n  if (!mq) {\n    console.error(`Media query \"${key}\" not found: ${Object.keys(tamaguiConfig.media)}`)\n    return null\n  }\n  const getStyleObj = (styleObj: ViewStyle | null, negate = false) => {\n    return styleObj ? { styleObj, negate } : null\n  }\n  const styleOpts = [\n    getStyleObj(ternary.consequent, false),\n    getStyleObj(ternary.alternate, true),\n  ].filter(isPresent)\n  if (shouldPrintDebug && !styleOpts.length) {\n    console.log('  media query, no styles?')\n    return null\n  }\n  // for now order first strongest\n  const mediaKeys = Object.keys(tamaguiConfig.media)\n  const mediaKeyPrecendence = mediaKeys.reduce((acc, cur, i) => {\n    acc[cur] = new Array(importance + 1).fill(':root').join('')\n    return acc\n  }, {})\n  let mediaStyles: StyleObject[] = []\n  for (const { styleObj, negate } of styleOpts) {\n    const styles = getStylesAtomic(styleObj)\n    const singleMediaStyles = styles.map((style) => {\n      const negKey = negate ? '0' : ''\n      const ogPrefix = style.identifier.slice(0, style.identifier.indexOf('-') + 1)\n      // adds an extra separator before and after to detect later in concatClassName\n      // so it goes from: \"_f-[hash]\"\n      // to: \"_f-_sm0_[hash]\" or \"_f-_sm_[hash]\"\n      const identifier = `${style.identifier.replace(\n        ogPrefix,\n        `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`\n      )}`\n      const className = `.${identifier}`\n      const mediaSelector = mediaObjectToString(tamaguiConfig.media[key])\n      const screenStr = negate ? 'not all' : 'screen'\n      const mediaQuery = `${screenStr} and ${mediaSelector}`\n      const precendencePrefix = mediaKeyPrecendence[key]\n      const styleInner = style.rules[0].replace(style.identifier, identifier)\n      // combines media queries if they already exist\n      let styleRule = ''\n      if (styleInner.includes('@media')) {\n        // combine\n        styleRule = styleInner.replace('{', ` and ${mediaQuery} {`)\n      } else {\n        styleRule = `@media ${mediaQuery} { ${precendencePrefix} ${styleInner} }`\n      }\n      return {\n        ...style,\n        identifier,\n        className,\n        rules: [styleRule],\n      }\n    })\n    if (shouldPrintDebug === 'verbose') {\n      // prettier-ignore\n      console.log('  media styles:', importance, styleObj, singleMediaStyles.map(x => x.identifier).join(', '))\n    }\n    // add to output\n    mediaStyles = [...mediaStyles, ...singleMediaStyles]\n  }\n  // filter out\n  ternary.remove()\n  return { mediaStyles, ternaryWithoutMedia: mt.ternaryWithoutMedia }\n}\n\nfunction getMediaQueryTernary(\n  ternary: Ternary,\n  jsxPath: NodePath<t.JSXElement>,\n  sourcePath: string\n): null | {\n  key: string\n  bindingName: string\n  ternaryWithoutMedia: Ternary | null\n} {\n  // this handles unwrapping logical && media query ternarys\n  // first, unwrap if it has media logicalExpression\n  if (t.isLogicalExpression(ternary.test) && ternary.test.operator === '&&') {\n    // *should* be normalized to always be on left side\n    const mediaLeft = getMediaInfoFromExpression(\n      ternary.test.left,\n      jsxPath,\n      sourcePath,\n      ternary.inlineMediaQuery\n    )\n    if (mediaLeft) {\n      return {\n        ...mediaLeft,\n        ternaryWithoutMedia: {\n          ...ternary,\n          test: ternary.test.right,\n        },\n      }\n    }\n  }\n  // const media = useMedia()\n  // ... media.sm\n  const result = getMediaInfoFromExpression(\n    ternary.test,\n    jsxPath,\n    sourcePath,\n    ternary.inlineMediaQuery\n  )\n  if (result) {\n    return {\n      ...result,\n      ternaryWithoutMedia: null,\n    }\n  }\n  return null\n}\n\nfunction getMediaInfoFromExpression(\n  test: t.Expression,\n  jsxPath: NodePath<t.JSXElement>,\n  sourcePath: string,\n  inlineMediaQuery?: string\n) {\n  if (inlineMediaQuery) {\n    return {\n      key: inlineMediaQuery,\n      bindingName: inlineMediaQuery,\n    }\n  }\n  if (t.isMemberExpression(test) && t.isIdentifier(test.object) && t.isIdentifier(test.property)) {\n    const name = test.object['name']\n    const key = test.property['name']\n    const bindings = jsxPath.scope.getAllBindings()\n    const binding = bindings[name]\n    if (!binding) return false\n    const bindingNode = binding.path?.node\n    if (!t.isVariableDeclarator(bindingNode) || !bindingNode.init) return false\n    if (!isValidMediaCall(jsxPath, bindingNode.init, sourcePath)) return false\n    return { key, bindingName: name }\n  }\n  if (t.isIdentifier(test)) {\n    const key = test.name\n    const node = jsxPath.scope.getBinding(test.name)?.path?.node\n    if (!t.isVariableDeclarator(node)) return false\n    if (!node.init || !isValidMediaCall(jsxPath, node.init, sourcePath)) return false\n    return { key, bindingName: key }\n  }\n  return null\n}\n\nexport function isValidMediaCall(\n  jsxPath: NodePath<t.JSXElement>,\n  init: t.Expression,\n  sourcePath: string\n) {\n  if (!t.isCallExpression(init)) return false\n  if (!t.isIdentifier(init.callee)) return false\n  // TODO could support renaming useMedia by looking up import first\n  if (init.callee.name !== 'useMedia') return false\n  const bindings = jsxPath.scope.getAllBindings()\n  const mediaBinding = bindings['useMedia']\n  if (!mediaBinding) return false\n  const useMediaImport = mediaBinding.path.parent\n  if (!t.isImportDeclaration(useMediaImport)) return false\n  if (useMediaImport.source.value !== 'tamagui') {\n    if (!isInsideTamagui(sourcePath)) {\n      return false\n    }\n  }\n  return true\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport { TamaguiInternalConfig, getStylesAtomic, mediaObjectToString } from '@tamagui/core-node'\nimport { ViewStyle } from 'react-native'\n\nimport { MEDIA_SEP } from '../constants'\nimport { StyleObject, Ternary } from '../types'\nimport { isInsideTamagui, isPresent } from './extractHelpers'\n\nexport function extractMediaStyle(\n  ternary: Ternary,\n  jsxPath: NodePath<t.JSXElement>,\n  tamaguiConfig: TamaguiInternalConfig,\n  sourcePath: string,\n  importance = 0,\n  shouldPrintDebug: boolean | 'verbose' = false\n) {\n  const mt = getMediaQueryTernary(ternary, jsxPath, sourcePath)\n  if (!mt) {\n    return null\n  }\n  const { key } = mt\n  const mq = tamaguiConfig.media[key]\n  if (!mq) {\n    console.error(`Media query \"${key}\" not found: ${Object.keys(tamaguiConfig.media)}`)\n    return null\n  }\n  const getStyleObj = (styleObj: ViewStyle | null, negate = false) => {\n    return styleObj ? { styleObj, negate } : null\n  }\n  const styleOpts = [\n    getStyleObj(ternary.consequent, false),\n    getStyleObj(ternary.alternate, true),\n  ].filter(isPresent)\n  if (shouldPrintDebug && !styleOpts.length) {\n    console.log('  media query, no styles?')\n    return null\n  }\n  // for now order first strongest\n  const mediaKeys = Object.keys(tamaguiConfig.media)\n  const mediaKeyPrecendence = mediaKeys.reduce((acc, cur, i) => {\n    acc[cur] = new Array(importance + 1).fill(':root').join('')\n    return acc\n  }, {})\n  let mediaStyles: StyleObject[] = []\n  for (const { styleObj, negate } of styleOpts) {\n    const styles = getStylesAtomic(styleObj)\n    const singleMediaStyles = styles.map((style) => {\n      const negKey = negate ? '0' : ''\n      const ogPrefix = style.identifier.slice(0, style.identifier.indexOf('-') + 1)\n      // adds an extra separator before and after to detect later in concatClassName\n      // so it goes from: \"_f-[hash]\"\n      // to: \"_f-_sm0_[hash]\" or \"_f-_sm_[hash]\"\n      const identifier = `${style.identifier.replace(\n        ogPrefix,\n        `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`\n      )}`\n      const className = `.${identifier}`\n      const mediaSelector = mediaObjectToString(tamaguiConfig.media[key])\n      const screenStr = negate ? 'not all' : 'screen'\n      const mediaQuery = `${screenStr} and ${mediaSelector}`\n      const precendencePrefix = mediaKeyPrecendence[key]\n      const styleInner = style.rules\n        .map((rule) => rule.replace(style.identifier, identifier))\n        .join(';')\n      // combines media queries if they already exist\n      let styleRule = ''\n      if (styleInner.includes('@media')) {\n        // combine\n        styleRule = styleInner.replace('{', ` and ${mediaQuery} {`)\n      } else {\n        styleRule = `@media ${mediaQuery} { ${precendencePrefix} ${styleInner} }`\n      }\n      return {\n        ...style,\n        identifier,\n        className,\n        rules: [styleRule],\n      }\n    })\n    if (shouldPrintDebug === 'verbose') {\n      // prettier-ignore\n      console.log('  media styles:', importance, styleObj, singleMediaStyles.map(x => x.identifier).join(', '))\n    }\n    // add to output\n    mediaStyles = [...mediaStyles, ...singleMediaStyles]\n  }\n  // filter out\n  ternary.remove()\n  return { mediaStyles, ternaryWithoutMedia: mt.ternaryWithoutMedia }\n}\n\nfunction getMediaQueryTernary(\n  ternary: Ternary,\n  jsxPath: NodePath<t.JSXElement>,\n  sourcePath: string\n): null | {\n  key: string\n  bindingName: string\n  ternaryWithoutMedia: Ternary | null\n} {\n  // this handles unwrapping logical && media query ternarys\n  // first, unwrap if it has media logicalExpression\n  if (t.isLogicalExpression(ternary.test) && ternary.test.operator === '&&') {\n    // *should* be normalized to always be on left side\n    const mediaLeft = getMediaInfoFromExpression(\n      ternary.test.left,\n      jsxPath,\n      sourcePath,\n      ternary.inlineMediaQuery\n    )\n    if (mediaLeft) {\n      return {\n        ...mediaLeft,\n        ternaryWithoutMedia: {\n          ...ternary,\n          test: ternary.test.right,\n        },\n      }\n    }\n  }\n  // const media = useMedia()\n  // ... media.sm\n  const result = getMediaInfoFromExpression(\n    ternary.test,\n    jsxPath,\n    sourcePath,\n    ternary.inlineMediaQuery\n  )\n  if (result) {\n    return {\n      ...result,\n      ternaryWithoutMedia: null,\n    }\n  }\n  return null\n}\n\nfunction getMediaInfoFromExpression(\n  test: t.Expression,\n  jsxPath: NodePath<t.JSXElement>,\n  sourcePath: string,\n  inlineMediaQuery?: string\n) {\n  if (inlineMediaQuery) {\n    return {\n      key: inlineMediaQuery,\n      bindingName: inlineMediaQuery,\n    }\n  }\n  if (t.isMemberExpression(test) && t.isIdentifier(test.object) && t.isIdentifier(test.property)) {\n    const name = test.object['name']\n    const key = test.property['name']\n    const bindings = jsxPath.scope.getAllBindings()\n    const binding = bindings[name]\n    if (!binding) return false\n    const bindingNode = binding.path?.node\n    if (!t.isVariableDeclarator(bindingNode) || !bindingNode.init) return false\n    if (!isValidMediaCall(jsxPath, bindingNode.init, sourcePath)) return false\n    return { key, bindingName: name }\n  }\n  if (t.isIdentifier(test)) {\n    const key = test.name\n    const node = jsxPath.scope.getBinding(test.name)?.path?.node\n    if (!t.isVariableDeclarator(node)) return false\n    if (!node.init || !isValidMediaCall(jsxPath, node.init, sourcePath)) return false\n    return { key, bindingName: key }\n  }\n  return null\n}\n\nexport function isValidMediaCall(\n  jsxPath: NodePath<t.JSXElement>,\n  init: t.Expression,\n  sourcePath: string\n) {\n  if (!t.isCallExpression(init)) return false\n  if (!t.isIdentifier(init.callee)) return false\n  // TODO could support renaming useMedia by looking up import first\n  if (init.callee.name !== 'useMedia') return false\n  const bindings = jsxPath.scope.getAllBindings()\n  const mediaBinding = bindings['useMedia']\n  if (!mediaBinding) return false\n  const useMediaImport = mediaBinding.path.parent\n  if (!t.isImportDeclaration(useMediaImport)) return false\n  if (useMediaImport.source.value !== 'tamagui') {\n    if (!isInsideTamagui(sourcePath)) {\n      return false\n    }\n  }\n  return true\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/jsx/extractor/createEvaluator.js

@@ -4,6 +4,7 @@ import vm from "vm";
 import generate from "@babel/generator";
 import * as t from "@babel/types";
 import { createCSSVariable } from "@tamagui/core-node";
+import esbuild from "esbuild";
 import { FAILED_EVAL } from "../constants";
 import { evaluateAstNode } from "./evaluateAstNode";
 import { isValidThemeHook } from "./extractHelpers";
@@ -27,7 +28,11 @@ function createEvaluator({
       return staticNamespace[n.name];
     }
     const evalContext = vm.createContext(staticNamespace);
-    const code = `(${generate(n).code})`;
+    const codeWithTypescriptAnnotations = `(${generate(n).code})`;
+    const code = esbuild.transformSync(codeWithTypescriptAnnotations, { loader: "tsx" }).code.replace(/;\n$/, "");
+    if (shouldPrintDebug) {
+      console.log("evaluating", code);
+    }
     return vm.runInContext(code, evalContext);
   }, "evalFn");
   return (n) => {

package/dist/jsx/extractor/createExtractor.js

@@ -4,6 +4,7 @@ import { relative } from "path";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
 import {
+  expandStyles,
   getSplitStyles,
   mediaQueryConfig,
   normalizeStyleObject,
@@ -342,7 +343,7 @@ function createExtractor() {
                 let keys = [name];
                 let out = null;
                 if (staticConfig.propMapper) {
-                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, { resolveVariablesAs: "auto" });
+                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, { resolveVariablesAs: "auto" }, void 0, shouldPrintDebug);
                   if (out) {
                     if (!Array.isArray(out)) {
                       console.warn(`Error expected array but got`, out);
@@ -371,7 +372,7 @@ function createExtractor() {
                       attr: path.node
                     };
                   }
-                  if (validHTMLAttributes[key]) {
+                  if (validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-")) {
                     return attr;
                   }
                   if (shouldPrintDebug) {
@@ -780,6 +781,7 @@ function createExtractor() {
                   console.log("Error extracting attribute", err.message, err.stack);
                   console.log("node", path.node);
                 }
+                inlined.set(`${Math.random()}`, "spread");
                 return {
                   type: "attr",
                   value: path.node
@@ -994,35 +996,47 @@ function createExtractor() {
               press: false,
               pressIn: false
             };
-            const completeStaticProps = Object.keys(attrs).reduce((acc, index) => {
-              const cur = attrs[index];
+            let foundStaticProps = {};
+            for (const key in attrs) {
+              const cur = attrs[key];
               if (cur.type === "style") {
                 normalizeStyleObject(cur.value);
-                Object.assign(acc, cur.value);
+                foundStaticProps = {
+                  ...foundStaticProps,
+                  ...expandStyles(cur.value)
+                };
+                continue;
               }
               if (cur.type === "attr") {
                 if (t.isJSXSpreadAttribute(cur.value)) {
-                  return acc;
+                  continue;
                 }
                 if (!t.isJSXIdentifier(cur.value.name)) {
-                  return acc;
+                  continue;
                 }
-                const key = cur.value.name.name;
+                const key2 = cur.value.name.name;
                 const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
-                if (value === FAILED_EVAL) {
-                  return acc;
+                if (value !== FAILED_EVAL) {
+                  foundStaticProps = {
+                    ...foundStaticProps,
+                    [key2]: value
+                  };
                 }
-                acc[key] = value;
               }
-              return acc;
-            }, {});
-            const completeProps = {
-              ...staticConfig.defaultProps,
-              ...completeStaticProps
-            };
+            }
+            const completeProps = {};
+            for (const key in staticConfig.defaultProps) {
+              if (!(key in foundStaticProps)) {
+                completeProps[key] = staticConfig.defaultProps[key];
+              }
+            }
+            for (const key in foundStaticProps) {
+              completeProps[key] = foundStaticProps[key];
+            }
             if (shouldPrintDebug) {
               console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
               console.log("  - defaultProps: \n", logLines(objToStr(staticConfig.defaultProps)));
+              console.log("  - foundStaticProps: \n", logLines(objToStr(foundStaticProps)));
               console.log("  - completeProps: \n", logLines(objToStr(completeProps)));
             }
             const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
@@ -1044,7 +1058,7 @@ function createExtractor() {
                 const out = getSplitStyles(props2, staticConfig, defaultTheme, {
                   ...state,
                   fallbackProps: completeProps
-                });
+                }, void 0, props2["debug"]);
                 const outStyle = {
                   ...out.style,
                   ...out.pseudos
@@ -1068,7 +1082,7 @@ function createExtractor() {
             if (!completeStyles) {
               throw new Error(`Impossible, no styles`);
             }
-            const addInitialStyleKeys = shouldFlatten ? difference(Object.keys(completeStyles), Object.keys(completeStaticProps)) : [];
+            const addInitialStyleKeys = shouldFlatten ? difference(Object.keys(completeStyles), Object.keys(foundStaticProps)) : [];
             if (addInitialStyleKeys.length) {
               const toAdd = pick(completeStyles, ...addInitialStyleKeys);
               const firstGroup = attrs.find((x) => x.type === "style");
@@ -1084,14 +1098,11 @@ function createExtractor() {
             }
             if (shouldPrintDebug) {
               console.log("   -- addInitialStyleKeys", addInitialStyleKeys.join(", "), { shouldFlatten });
-              console.log("   -- completeStaticProps:\n", logLines(objToStr(completeStaticProps)));
               console.log("   -- completeStyles:\n", logLines(objToStr(completeStyles)));
             }
             let getStyleError = null;
             for (const attr of attrs) {
               try {
-                if (shouldPrintDebug)
-                  console.log("  *", attrStr(attr));
                 switch (attr.type) {
                   case "ternary":
                     const a = getStyles(attr.value.alternate, "ternary.alternate");
@@ -1105,7 +1116,7 @@ function createExtractor() {
                     continue;
                   case "style":
                     if (shouldPrintDebug)
-                      console.log("  * styles in", logLines(objToStr(attr.value)));
+                      console.log("  * styles in", attr.value);
                     const styles = getStyles(attr.value, "style");
                     if (shouldPrintDebug)
                       console.log("  * styles out", logLines(objToStr(styles)));
@@ -1118,6 +1129,9 @@ function createExtractor() {
                 getStyleError = err;
               }
             }
+            if (shouldPrintDebug) {
+              console.log("  - attrs (ternaries/combined):\n", logLines(attrs.map(attrStr).join(", ")));
+            }
             tm.mark("jsx-element-styles", shouldPrintDebug === "verbose");
             if (getStyleError) {
               console.log(" \u26A0\uFE0F postprocessing error, deopt", getStyleError);

package/dist/jsx/extractor/extractMediaStyle.js

@@ -43,7 +43,7 @@ function extractMediaStyle(ternary, jsxPath, tamaguiConfig, sourcePath, importan
       const screenStr = negate ? "not all" : "screen";
       const mediaQuery = `${screenStr} and ${mediaSelector}`;
       const precendencePrefix = mediaKeyPrecendence[key];
-      const styleInner = style.rules[0].replace(style.identifier, identifier);
+      const styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
       let styleRule = "";
       if (styleInner.includes("@media")) {
         styleRule = styleInner.replace("{", ` and ${mediaQuery} {`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.61",
+  "version": "1.0.1-beta.64",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -36,11 +36,11 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.61",
-    "@tamagui/core-node": "^1.0.1-beta.61",
-    "@tamagui/fake-react-native": "^1.0.1-beta.61",
-    "@tamagui/helpers": "^1.0.1-beta.61",
-    "@tamagui/proxy-worm": "^1.0.1-beta.61",
+    "@tamagui/build": "^1.0.1-beta.64",
+    "@tamagui/core-node": "^1.0.1-beta.64",
+    "@tamagui/fake-react-native": "^1.0.1-beta.64",
+    "@tamagui/helpers": "^1.0.1-beta.64",
+    "@tamagui/proxy-worm": "^1.0.1-beta.64",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
@@ -48,7 +48,7 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.61"
+    "tamagui": "^1.0.1-beta.64"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",

package/src/extractor/createEvaluator.ts

@@ -5,6 +5,7 @@ import { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
 import type { TamaguiConfig } from '@tamagui/core'
 import { createCSSVariable } from '@tamagui/core-node'
+import esbuild from 'esbuild'
 
 import { FAILED_EVAL } from '../constants'
 import { evaluateAstNode } from './evaluateAstNode'
@@ -46,10 +47,14 @@ export function createEvaluator({
       return staticNamespace[n.name]
     }
     const evalContext = vm.createContext(staticNamespace)
-    const code = `(${generate(n as any).code})`
-    // if (shouldPrintDebug) {
-    //   console.log('evaluating', { n, code, evalContext })
-    // }
+    const codeWithTypescriptAnnotations = `(${generate(n as any).code})`
+    const code = esbuild
+      .transformSync(codeWithTypescriptAnnotations, { loader: 'tsx' })
+      .code.replace(/;\n$/, '')
+
+    if (shouldPrintDebug) {
+      console.log('evaluating', code)
+    }
     return vm.runInContext(code, evalContext)
   }
 

package/src/extractor/createExtractor.ts

@@ -6,6 +6,7 @@ import {
   PseudoStyles,
   StaticConfigParsed,
   TamaguiInternalConfig,
+  expandStyles,
   getSplitStyles,
   mediaQueryConfig,
   normalizeStyleObject,
@@ -538,6 +539,8 @@ export function createExtractor() {
                     console.log('Error extracting attribute', err.message, err.stack)
                     console.log('node', path.node)
                   }
+                  // dont flatten if we run into error
+                  inlined.set(`${Math.random()}`, 'spread')
                   return {
                     type: 'attr',
                     value: path.node,
@@ -735,7 +738,9 @@ export function createExtractor() {
                     styleValue,
                     defaultTheme,
                     staticConfig.defaultProps,
-                    { resolveVariablesAs: 'auto' }
+                    { resolveVariablesAs: 'auto' },
+                    undefined,
+                    shouldPrintDebug
                   )
                   if (out) {
                     if (!Array.isArray(out)) {
@@ -769,7 +774,11 @@ export function createExtractor() {
                       attr: path.node,
                     } as const
                   }
-                  if (validHTMLAttributes[key]) {
+                  if (
+                    validHTMLAttributes[key] ||
+                    key.startsWith('aria-') ||
+                    key.startsWith('data-')
+                  ) {
                     return attr
                   }
                   if (shouldPrintDebug) {
@@ -1404,38 +1413,52 @@ export function createExtractor() {
             }
 
             // evaluates all static attributes into a simple object
-            const completeStaticProps = Object.keys(attrs).reduce((acc, index) => {
-              const cur = attrs[index] as ExtractedAttr
+            let foundStaticProps = {}
+            for (const key in attrs) {
+              const cur = attrs[key]
               if (cur.type === 'style') {
                 normalizeStyleObject(cur.value)
-                Object.assign(acc, cur.value)
+                foundStaticProps = {
+                  ...foundStaticProps,
+                  ...expandStyles(cur.value),
+                }
+                continue
               }
               if (cur.type === 'attr') {
                 if (t.isJSXSpreadAttribute(cur.value)) {
-                  return acc
+                  continue
                 }
                 if (!t.isJSXIdentifier(cur.value.name)) {
-                  return acc
+                  continue
                 }
                 const key = cur.value.name.name
                 // undefined = boolean true
                 const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true))
-                if (value === FAILED_EVAL) {
-                  return acc
+                if (value !== FAILED_EVAL) {
+                  foundStaticProps = {
+                    ...foundStaticProps,
+                    [key]: value,
+                  }
                 }
-                acc[key] = value
               }
-              return acc
-            }, {})
+            }
 
-            const completeProps = {
-              ...staticConfig.defaultProps,
-              ...completeStaticProps,
+            // must preserve exact order
+            const completeProps = {}
+            for (const key in staticConfig.defaultProps) {
+              if (!(key in foundStaticProps)) {
+                completeProps[key] = staticConfig.defaultProps[key]
+              }
+            }
+            for (const key in foundStaticProps) {
+              completeProps[key] = foundStaticProps[key]
             }
 
             if (shouldPrintDebug) {
               console.log('  - attrs (combined 🔀): \n', logLines(attrs.map(attrStr).join(', ')))
               console.log('  - defaultProps: \n', logLines(objToStr(staticConfig.defaultProps)))
+              // prettier-ignore
+              console.log('  - foundStaticProps: \n', logLines(objToStr(foundStaticProps)))
               console.log('  - completeProps: \n', logLines(objToStr(completeProps)))
             }
 
@@ -1454,10 +1477,17 @@ export function createExtractor() {
                 }
               }
               try {
-                const out = getSplitStyles(props, staticConfig, defaultTheme, {
-                  ...state,
-                  fallbackProps: completeProps,
-                })
+                const out = getSplitStyles(
+                  props,
+                  staticConfig,
+                  defaultTheme,
+                  {
+                    ...state,
+                    fallbackProps: completeProps,
+                  },
+                  undefined,
+                  props['debug']
+                )
                 const outStyle = {
                   ...out.style,
                   ...out.pseudos,
@@ -1503,7 +1533,7 @@ export function createExtractor() {
 
             // any extra styles added in postprocess should be added to first group as they wont be overriden
             const addInitialStyleKeys = shouldFlatten
-              ? difference(Object.keys(completeStyles), Object.keys(completeStaticProps))
+              ? difference(Object.keys(completeStyles), Object.keys(foundStaticProps))
               : []
 
             if (addInitialStyleKeys.length) {
@@ -1525,8 +1555,6 @@ export function createExtractor() {
               // prettier-ignore
               console.log('   -- addInitialStyleKeys', addInitialStyleKeys.join(', '), { shouldFlatten })
               // prettier-ignore
-              console.log('   -- completeStaticProps:\n', logLines(objToStr(completeStaticProps)))
-              // prettier-ignore
               console.log('   -- completeStyles:\n', logLines(objToStr(completeStyles)))
             }
 
@@ -1535,7 +1563,6 @@ export function createExtractor() {
             // fix up ternaries, combine final style values
             for (const attr of attrs) {
               try {
-                if (shouldPrintDebug) console.log('  *', attrStr(attr))
                 switch (attr.type) {
                   case 'ternary':
                     const a = getStyles(attr.value.alternate, 'ternary.alternate')
@@ -1545,8 +1572,7 @@ export function createExtractor() {
                     if (shouldPrintDebug) console.log('     => tern ', attrStr(attr))
                     continue
                   case 'style':
-                    // prettier-ignore
-                    if (shouldPrintDebug) console.log('  * styles in', logLines(objToStr(attr.value)))
+                    if (shouldPrintDebug) console.log('  * styles in', attr.value)
                     // expand variants and such
                     // get the keys we need
                     const styles = getStyles(attr.value, 'style')
@@ -1567,6 +1593,11 @@ export function createExtractor() {
               }
             }
 
+            if (shouldPrintDebug) {
+              // prettier-ignore
+              console.log('  - attrs (ternaries/combined):\n', logLines(attrs.map(attrStr).join(', ')))
+            }
+
             tm.mark('jsx-element-styles', shouldPrintDebug === 'verbose')
 
             if (getStyleError) {

package/src/extractor/extractMediaStyle.ts

@@ -60,7 +60,9 @@ export function extractMediaStyle(
       const screenStr = negate ? 'not all' : 'screen'
       const mediaQuery = `${screenStr} and ${mediaSelector}`
       const precendencePrefix = mediaKeyPrecendence[key]
-      const styleInner = style.rules[0].replace(style.identifier, identifier)
+      const styleInner = style.rules
+        .map((rule) => rule.replace(style.identifier, identifier))
+        .join(';')
       // combines media queries if they already exist
       let styleRule = ''
       if (styleInner.includes('@media')) {

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

@@ -1 +1 @@
-{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAOlD,wBAAgB,eAAe,CAAC,EAC9B,aAAa,EACb,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACpC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,OA+BY,MAAM,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,OACtD,MAAM,SAOlB"}
+{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAQlD,wBAAgB,eAAe,CAAC,EAC9B,aAAa,EACb,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACpC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,OAmCY,MAAM,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,OACtD,MAAM,SAOlB"}

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,EAQtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,0PAkBrC,mBAAmB;;;;;;EAqjD3B"}
+{"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,EAStB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,0PAkBrC,mBAAmB;;;;;;EAmlD3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"extractMediaStyle.d.ts","sourceRoot":"","sources":["../../src/extractor/extractMediaStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAAE,qBAAqB,EAAwC,MAAM,oBAAoB,CAAA;AAIhG,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAG/C,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,MAAM,EAClB,UAAU,SAAI,EACd,gBAAgB,GAAE,OAAO,GAAG,SAAiB;;;SAyE9C;AAiFD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,IAAI,EAAE,CAAC,CAAC,UAAU,EAClB,UAAU,EAAE,MAAM,WAiBnB"}
+{"version":3,"file":"extractMediaStyle.d.ts","sourceRoot":"","sources":["../../src/extractor/extractMediaStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAAE,qBAAqB,EAAwC,MAAM,oBAAoB,CAAA;AAIhG,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAG/C,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,MAAM,EAClB,UAAU,SAAI,EACd,gBAAgB,GAAE,OAAO,GAAG,SAAiB;;;SA2E9C;AAiFD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,IAAI,EAAE,CAAC,CAAC,UAAU,EAClB,UAAU,EAAE,MAAM,WAiBnB"}

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

@@ -1 +1 @@
-{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAiB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CAyY3B"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAiB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CA4W3B"}