@tamagui/static 1.0.0-beta.187 → 1.0.0-beta.230

package/dist/cjs/extractor/createExtractor.js

@@ -74,6 +74,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,
@@ -81,6 +90,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",
@@ -151,6 +164,7 @@ function createExtractor() {
         return obj;
       }, {});
       let doesUseValidImport = false;
+      let hasImportedTheme = false;
       for (const bodyPath of body) {
         if (bodyPath.type !== "ImportDeclaration")
           continue;
@@ -219,16 +233,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) {
@@ -265,6 +280,7 @@ function createExtractor() {
             ...staticConfig.inlineProps || []
           ]);
           const deoptProps = /* @__PURE__ */ new Set([
+            "animation",
             ...props.deoptProps || [],
             ...staticConfig.deoptProps || []
           ]);
@@ -343,7 +359,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 {
@@ -395,7 +411,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log("  ! inlining, spread attr");
               }
-              inlinePropCount++;
+              inlined.set(`${Math.random()}`, "spread");
               return attr;
             }
             const name = attribute.name.name;
@@ -406,7 +422,7 @@ function createExtractor() {
               return null;
             }
             if (inlineProps.has(name)) {
-              inlinePropCount++;
+              inlined.set(name, name);
               if (shouldPrintDebug) {
                 console.log("  ! inlining, inline prop", name);
               }
@@ -414,7 +430,7 @@ function createExtractor() {
             }
             if (deoptProps.has(name)) {
               shouldDeopt = true;
-              inlinePropCount++;
+              inlined.set(name, name);
               if (shouldPrintDebug) {
                 console.log("  ! inlining, deopted prop", name);
               }
@@ -423,6 +439,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;
             }
@@ -460,7 +480,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log("  ! inlining, ref", name);
               }
-              inlinePropCount++;
+              inlined.set("ref", "ref");
               return attr;
             }
             if (name === "tag") {
@@ -475,7 +495,7 @@ function createExtractor() {
                   if (shouldPrintDebug) {
                     console.log(`  ! inlining, native disable extract: ${name} =`, value.value);
                   }
-                  inlinePropCount++;
+                  inlined.set(name, true);
                   return attr;
                 }
               }
@@ -485,26 +505,56 @@ function createExtractor() {
               let keys = [name];
               let out = null;
               if (staticConfig.propMapper) {
-                out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, staticConfig);
+                out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, "auto");
                 if (out) {
                   out = import_core_node.rnw.createDOMProps(isTextView ? "span" : "div", out);
                   delete out.className;
                   keys = Object.keys(out);
                 }
               }
+              let didInline = false;
               const attributes = keys.map((key) => {
                 const val = out[key];
-                if (!isValidStyleKey(key)) {
-                  if (import_validHTMLAttributes.validHTMLAttributes[key]) {
-                    return {
-                      type: "attr",
-                      value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer((0, import_literalToAst.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 (import_validHTMLAttributes.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 !== import_constants.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",
@@ -512,28 +562,10 @@ function createExtractor() {
                   name,
                   attr: path.node
                 };
-              });
-              if (inlinePropCount) {
+              } else {
+                inlined.set(name, true);
                 return attr;
               }
-              return attributes;
-            }
-            if (styleValue !== import_constants.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) {
@@ -558,7 +590,7 @@ function createExtractor() {
               if (shouldPrintDebug) {
                 console.log(`  evalBinaryExpression cant extract`);
               }
-              inlinePropCount++;
+              inlined.set(name, true);
               return attr;
             }
             const staticConditional = getStaticConditional(value);
@@ -575,12 +607,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) {
@@ -808,7 +837,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)) {
@@ -863,8 +913,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);
@@ -942,6 +996,7 @@ function createExtractor() {
           if (shouldPrintDebug) {
             console.log("  - attrs (combined \u{1F500}): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", ")));
           }
+          const completeProps = __spreadValues(__spreadValues({}, staticConfig.defaultProps), completeStaticProps);
           const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
             if (!props2)
               return;
@@ -955,9 +1010,22 @@ function createExtractor() {
               }
             }
             const out = (0, import_core_node.getSplitStyles)(props2, staticConfig, defaultTheme, {
-              noClassNames: true
+              noClassNames: true,
+              fallbackProps: completeProps,
+              focus: false,
+              hover: false,
+              mounted: true,
+              press: false,
+              pressIn: false
             });
             const outStyle = __spreadValues(__spreadValues({}, out.style), out.pseudos);
+            for (const key in outStyle) {
+              if (staticConfig.validStyles) {
+                if (!staticConfig.validStyles[key] && !import_core_node.pseudos[key]) {
+                  delete outStyle[key];
+                }
+              }
+            }
             if (shouldPrintDebug === "verbose") {
               console.log(`       getStyles ${debugName} (props):
 `, (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(props2)));
@@ -966,16 +1034,9 @@ function createExtractor() {
               console.log(`       getStyles ${debugName} (out.style):
 `, (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(outStyle || {}), true));
             }
-            for (const key in outStyle) {
-              if (staticConfig.validStyles) {
-                if (!staticConfig.validStyles[key] && !import_core_node.pseudos[key]) {
-                  delete outStyle[key];
-                }
-              }
-            }
             return outStyle;
           }, "getStyles");
-          const completeStylesProcessed = getStyles(__spreadValues(__spreadValues({}, staticConfig.defaultProps), completeStaticProps), "completeStylesProcessed");
+          const completeStylesProcessed = getStyles(completeProps, "completeStylesProcessed");
           if (!completeStylesProcessed) {
             throw new Error(`Impossible, no styles`);
           }
@@ -1034,6 +1095,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)) {
@@ -1044,9 +1117,6 @@ function createExtractor() {
               }
             }
           }
-          if (shouldPrintDebug) {
-            console.log("  - attrs (after):\n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", ")));
-          }
           if (shouldFlatten) {
             if (shouldPrintDebug) {
               console.log("  [\u2705] flattening", originalNodeName, flatNode);
@@ -1058,7 +1128,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", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", ")));
           }
           onExtractTag({