@tamagui/static 1.0.0-beta.189 → 1.0.0-beta.207

package/dist/jsx/extractor/createExtractor.js

@@ -26,6 +26,15 @@ const UNTOUCHED_PROPS = {
   style: true,
   className: true
 };
+const INLINE_EXTRACTABLE = {
+  ref: "ref",
+  key: "key",
+  onPress: "onClick",
+  onHoverIn: "onMouseEnter",
+  onHoverOut: "onMouseLeave",
+  onPressIn: "onMouseDown",
+  onPressOut: "onMouseUp"
+};
 const isAttr = /* @__PURE__ */ __name((x) => x.type === "attr", "isAttr");
 const validHooks = {
   useMedia: true,
@@ -33,6 +42,10 @@ const validHooks = {
 };
 const createTernary = /* @__PURE__ */ __name((x) => x, "createTernary");
 function createExtractor() {
+  if (!process.env.TAMAGUI_TARGET) {
+    console.log('\u26A0\uFE0F Please set process.env.TAMAGUI_TARGET to either "web" or "native"');
+    process.exit(1);
+  }
   const shouldAddDebugProp = !process.env.npm_package_dependencies_next && process.env.TAMAGUI_TARGET !== "native" && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS);
   require("esbuild-register/dist/node").register({
     target: "es2019",
@@ -88,6 +101,7 @@ function createExtractor() {
         return obj;
       }, {});
       let doesUseValidImport = false;
+      let hasImportedTheme = false;
       for (const bodyPath of body) {
         if (bodyPath.type !== "ImportDeclaration")
           continue;
@@ -156,16 +170,17 @@ function createExtractor() {
           }
           const originalNodeName = node.name.name;
           res.found++;
+          const filePath = sourcePath.replace(process.cwd(), ".");
+          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
+          const preName = componentName ? `${componentName}.` : "";
+          const tagId = `${preName}${node.name.name}@${filePath.replace("./", "")}:${lineNumbers}`;
           if (shouldPrintDebug) {
             console.log(`
-<${originalNodeName} />`);
+<${originalNodeName} /> (${tagId})`);
           }
-          const filePath = sourcePath.replace(process.cwd(), ".");
-          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
           if (shouldAddDebugProp && !disableDebugAttr) {
-            const preName = componentName ? `${componentName}.` : "";
             res.modified++;
-            node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(`${preName}${node.name.name}@${filePath.replace("./", "")}:${lineNumbers}`)));
+            node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(tagId)));
           }
           const shouldLog = !hasLogged;
           if (shouldLog) {
@@ -202,6 +217,7 @@ function createExtractor() {
             ...staticConfig.inlineProps || []
           ]);
           const deoptProps = /* @__PURE__ */ new Set([
+            "animation",
             ...props.deoptProps || [],
             ...staticConfig.deoptProps || []
           ]);
@@ -280,7 +296,7 @@ function createExtractor() {
           }
           let attrs = [];
           let shouldDeopt = false;
-          let inlinePropCount = 0;
+          const inlined = /* @__PURE__ */ new Map();
           let hasSetOptimized = false;
           attrs = traversePath.get("openingElement").get("attributes").flatMap((path) => {
             try {
@@ -332,7 +348,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log("  ! inlining, spread attr");
               }
-              inlinePropCount++;
+              inlined.set(`${Math.random()}`, "spread");
               return attr;
             }
             const name = attribute.name.name;
@@ -343,7 +359,7 @@ function createExtractor() {
               return null;
             }
             if (inlineProps.has(name)) {
-              inlinePropCount++;
+              inlined.set(name, name);
               if (shouldPrintDebug) {
                 console.log("  ! inlining, inline prop", name);
               }
@@ -351,7 +367,7 @@ function createExtractor() {
             }
             if (deoptProps.has(name)) {
               shouldDeopt = true;
-              inlinePropCount++;
+              inlined.set(name, name);
               if (shouldPrintDebug) {
                 console.log("  ! inlining, deopted prop", name);
               }
@@ -360,6 +376,10 @@ function createExtractor() {
             if (UNTOUCHED_PROPS[name]) {
               return attr;
             }
+            if (INLINE_EXTRACTABLE[name]) {
+              inlined.set(name, INLINE_EXTRACTABLE[name]);
+              return attr;
+            }
             if (name.startsWith("data-")) {
               return attr;
             }
@@ -397,7 +417,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log("  ! inlining, ref", name);
               }
-              inlinePropCount++;
+              inlined.set("ref", "ref");
               return attr;
             }
             if (name === "tag") {
@@ -412,7 +432,7 @@ function createExtractor() {
                   if (shouldPrintDebug) {
                     console.log(`  ! inlining, native disable extract: ${name} =`, value.value);
                   }
-                  inlinePropCount++;
+                  inlined.set(name, true);
                   return attr;
                 }
               }
@@ -429,19 +449,49 @@ function createExtractor() {
                   keys = Object.keys(out);
                 }
               }
+              let didInline = false;
               const attributes = keys.map((key) => {
                 const val = out[key];
-                if (!isValidStyleKey(key)) {
-                  if (validHTMLAttributes[key]) {
-                    return {
-                      type: "attr",
-                      value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(literalToAst(val)))
-                    };
-                  }
-                  if (shouldPrintDebug) {
-                    console.log("  ! inlining, non-static", key);
+                if (key === "theme") {
+                  inlined.set(key, val);
+                  return attr;
+                }
+                if (isValidStyleKey(key)) {
+                  return {
+                    type: "style",
+                    value: { [name]: styleValue },
+                    name,
+                    attr: path.node
+                  };
+                }
+                if (validHTMLAttributes[key]) {
+                  return attr;
+                }
+                if (shouldPrintDebug) {
+                  console.log("  ! inlining, non-static", key);
+                }
+                didInline = true;
+                inlined.set(key, val);
+                return val;
+              });
+              if (didInline) {
+                if (shouldPrintDebug) {
+                  console.log("  bailing flattening due to attributes", attributes);
+                }
+                return attr;
+              }
+              return attributes;
+            }
+            if (styleValue !== FAILED_EVAL) {
+              if (isValidStyleKey(name)) {
+                if (shouldPrintDebug) {
+                  console.log(`  style: ${name} =`, styleValue);
+                }
+                if (!(name in staticConfig.defaultProps)) {
+                  if (!hasSetOptimized) {
+                    res.optimized++;
+                    hasSetOptimized = true;
                   }
-                  inlinePropCount++;
                 }
                 return {
                   type: "style",
@@ -449,28 +499,10 @@ function createExtractor() {
                   name,
                   attr: path.node
                 };
-              });
-              if (inlinePropCount) {
+              } else {
+                inlined.set(name, true);
                 return attr;
               }
-              return attributes;
-            }
-            if (styleValue !== FAILED_EVAL) {
-              if (shouldPrintDebug) {
-                console.log(`  style: ${name} =`, styleValue);
-              }
-              if (!(name in staticConfig.defaultProps)) {
-                if (!hasSetOptimized) {
-                  res.optimized++;
-                  hasSetOptimized = true;
-                }
-              }
-              return {
-                type: "style",
-                value: { [name]: styleValue },
-                name,
-                attr: path.node
-              };
             }
             if (t.isBinaryExpression(value)) {
               if (shouldPrintDebug) {
@@ -495,7 +527,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log(`  evalBinaryExpression cant extract`);
               }
-              inlinePropCount++;
+              inlined.set(name, true);
               return attr;
             }
             const staticConditional = getStaticConditional(value);
@@ -512,12 +544,9 @@ function createExtractor() {
               }
               return { type: "ternary", value: staticLogical };
             }
+            inlined.set(name, true);
             if (shouldPrintDebug) {
-              console.log("  ! inline prop via no match", name, value.type);
-            }
-            inlinePropCount++;
-            if (shouldPrintDebug) {
-              console.log(` inlining ${name} = `, value);
+              console.log(` ! inline no match ${name}`, value);
             }
             return attr;
             function addBinaryConditional(operator, staticExpr, cond) {
@@ -750,7 +779,28 @@ function createExtractor() {
           };
           const hasSpread = node.attributes.some((x) => t.isJSXSpreadAttribute(x));
           const hasOnlyStringChildren = !hasSpread && (node.selfClosing || traversePath.node.children && traversePath.node.children.every((x) => x.type === "JSXText"));
-          const shouldFlatten = !shouldDeopt && inlinePropCount === 0 && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
+          const themeVal = inlined.get("theme");
+          inlined.delete("theme");
+          const allOtherPropsExtractable = [...inlined].every(([k, v]) => INLINE_EXTRACTABLE[k]);
+          const shouldWrapInnerTheme = allOtherPropsExtractable && !!(hasOnlyStringChildren && themeVal);
+          const canFlattenProps = inlined.size === 0 || shouldWrapInnerTheme || allOtherPropsExtractable;
+          let shouldFlatten = !shouldDeopt && canFlattenProps && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
+          if (shouldFlatten && shouldWrapInnerTheme) {
+            if (typeof themeVal !== "string") {
+              console.warn("??");
+              return;
+            }
+            if (shouldPrintDebug) {
+              console.log("  - wrapping theme", allOtherPropsExtractable, themeVal);
+            }
+            if (!hasImportedTheme) {
+              hasImportedTheme = true;
+              programPath.node.body.push(t.importDeclaration([t.importSpecifier(t.identifier("_TamaguiTheme"), t.identifier("Theme"))], t.stringLiteral("@tamagui/core")));
+            }
+            traversePath.replaceWith(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("_TamaguiTheme"), [
+              t.jsxAttribute(t.jsxIdentifier("name"), t.stringLiteral(`${themeVal}`))
+            ]), t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")), [traversePath.node]));
+          }
           if (shouldFlatten && staticConfig.defaultProps) {
             const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap((key) => {
               if (!isValidStyleKey(key)) {
@@ -805,8 +855,12 @@ function createExtractor() {
             if (!cur) {
               return acc;
             }
-            if (shouldFlatten && cur.type === "attr" && !t.isJSXSpreadAttribute(cur.value) && cur.value.name.name === "tag") {
-              return acc;
+            if (cur.type === "attr" && !t.isJSXSpreadAttribute(cur.value)) {
+              if (shouldFlatten) {
+                if (cur.value.name.name === "tag") {
+                  return acc;
+                }
+              }
             }
             if (cur.type !== "style") {
               acc.push(cur);
@@ -982,6 +1036,18 @@ function createExtractor() {
           const existingStyleKeys = /* @__PURE__ */ new Set();
           for (let i = attrs.length - 1; i >= 0; i--) {
             const attr = attrs[i];
+            if (shouldFlatten && canFlattenProps) {
+              if (attr.type === "attr") {
+                if (t.isJSXAttribute(attr.value)) {
+                  if (t.isJSXIdentifier(attr.value.name)) {
+                    const name = attr.value.name.name;
+                    if (INLINE_EXTRACTABLE[name]) {
+                      attr.value.name.name = INLINE_EXTRACTABLE[name];
+                    }
+                  }
+                }
+              }
+            }
             if (attr.type === "style") {
               for (const key in attr.value) {
                 if (existingStyleKeys.has(key)) {
@@ -1006,7 +1072,7 @@ function createExtractor() {
             }
           }
           if (shouldPrintDebug) {
-            console.log(` \u274A\u274A inline props (${inlinePropCount}):`, shouldDeopt ? " deopted" : "", hasSpread ? " has spread" : "", staticConfig.neverFlatten ? "neverFlatten" : "");
+            console.log(` \u274A\u274A inline props (${inlined.size}):`, shouldDeopt ? " deopted" : "", hasSpread ? " has spread" : "", staticConfig.neverFlatten ? "neverFlatten" : "");
             console.log("  - attrs (end):\n", logLines(attrs.map(attrStr).join(", ")));
           }
           onExtractTag({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-beta.189+64107267",
+  "version": "1.0.0-beta.207+3fd10ea6",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -57,10 +57,10 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.1.0",
-    "@tamagui/build": "^1.0.0-beta.189+64107267",
-    "@tamagui/core-node": "^1.0.0-beta.189+64107267",
-    "@tamagui/fake-react-native": "^1.0.0-beta.189+64107267",
-    "@tamagui/helpers": "^1.0.0-beta.189+64107267",
+    "@tamagui/build": "^1.0.0-beta.207+3fd10ea6",
+    "@tamagui/core-node": "^1.0.0-beta.207+3fd10ea6",
+    "@tamagui/fake-react-native": "^1.0.0-beta.207+3fd10ea6",
+    "@tamagui/helpers": "^1.0.0-beta.207+3fd10ea6",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.1.2",
@@ -68,10 +68,10 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-beta.189+64107267"
+    "tamagui": "^1.0.0-beta.207+3fd10ea6"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "6410726774260b4de48c270c81a17b168995a3b7"
+  "gitHead": "3fd10ea6d026fac0339fbc1a501ee304f4985b05"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AA0BjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAsBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EA42C3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAoCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBA2Bb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EAu6C3B"}

package/types/extractor/loadTamagui.d.ts

@@ -1,9 +1,9 @@
-import type { StaticComponent, TamaguiInternalConfig } from '@tamagui/core';
+import type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core';
 export declare function loadTamagui(props: {
     components: string[];
     config: string;
 }): {
-    components: Record<string, StaticComponent>;
+    components: Record<string, TamaguiComponent>;
     tamaguiConfig: TamaguiInternalConfig;
 };
 //# 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,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAK3E,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,eAAe,CAAC,CAAA;IAC3C,aAAa,EAAE,qBAAqB,CAAA;CACrC,CA0EA"}
+{"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,CA0EA"}