@tamagui/static 1.0.1-beta.86 → 1.0.1-beta.89

package/dist/cjs/extractor/createExtractor.js

@@ -99,8 +99,8 @@ function createExtractor() {
   let loadedTamaguiConfig;
   let hasLogged = false;
   function isValidStyleKey(name, staticConfig) {
-    var _a;
-    return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!import_core_node.pseudoDescriptors[name] || loadedTamaguiConfig.shorthands[name] || (name[0] === "$" ? !!import_core_node.mediaQueryConfig[name.slice(1)] : false));
+    var _a, _b;
+    return !!(!!((_a = staticConfig.validStyles) == null ? void 0 : _a[name]) || !!import_core_node.pseudoDescriptors[name] || ((_b = staticConfig.variants) == null ? void 0 : _b[name]) || loadedTamaguiConfig.shorthands[name] || (name[0] === "$" ? !!import_core_node.mediaQueryConfig[name.slice(1)] : false));
   }
   return {
     getTamagui() {
@@ -249,6 +249,7 @@ function createExtractor() {
           }
         },
         CallExpression(path) {
+          var _a2;
           if (disable || disableExtraction || extractStyledDefinitions === false) {
             return;
           }
@@ -270,15 +271,14 @@ function createExtractor() {
           const componentSkipProps = /* @__PURE__ */ new Set([
             ...Component.staticConfig.inlineWhenUnflattened || [],
             ...Component.staticConfig.inlineProps || [],
-            ...Component.staticConfig.deoptProps || []
+            ...Component.staticConfig.deoptProps || [],
+            "variants",
+            "defaultVariants",
+            "fontFamily",
+            "name"
           ]);
           const skipped = [];
           const styles = {};
-          const skipProps = {
-            variants: true,
-            defaultVariants: true,
-            name: true
-          };
           const staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(path.scope, importsWhitelist, sourcePath, bindingCache, shouldPrintDebug);
           const attemptEval = !evaluateVars ? import_evaluateAstNode.evaluateAstNode : (0, import_createEvaluator.createEvaluator)({
             tamaguiConfig,
@@ -288,7 +288,7 @@ function createExtractor() {
           });
           const attemptEvalSafe = (0, import_createEvaluator.createSafeEvaluator)(attemptEval);
           for (const property of definition.properties) {
-            if (!t.isObjectProperty(property) || !t.isIdentifier(property.key) || skipProps[property.key.name] || !isValidStyleKey(property.key.name, Component.staticConfig) || componentSkipProps.has(property.key.name)) {
+            if (!t.isObjectProperty(property) || !t.isIdentifier(property.key) || !isValidStyleKey(property.key.name, Component.staticConfig) || ((_a2 = Component.staticConfig.variants) == null ? void 0 : _a2[property.key.name]) || componentSkipProps.has(property.key.name)) {
               skipped.push(property);
               continue;
             }
@@ -321,6 +321,9 @@ function createExtractor() {
           }
           definition.properties = skipped;
           for (const cn in classNames) {
+            if (componentSkipProps.has(cn)) {
+              continue;
+            }
             const val = classNames[cn];
             definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)));
           }
@@ -335,7 +338,7 @@ function createExtractor() {
           }
         },
         JSXElement(traversePath) {
-          var _a2, _b2, _c, _d, _e;
+          var _a2, _b2, _c, _d;
           tm.mark("jsx-element", shouldPrintDebug === "verbose");
           const node = traversePath.node.openingElement;
           const ogAttributes = node.attributes;
@@ -819,7 +822,7 @@ function createExtractor() {
             const variants = staticConfig.variants || {};
             const isTextView = staticConfig.isText || false;
             const validStyles = (staticConfig == null ? void 0 : staticConfig.validStyles) ?? {};
-            let tagName = ((_a2 = staticConfig.defaultProps) == null ? void 0 : _a2.tag) ?? (isTextView ? "span" : "div");
+            let tagName = staticConfig.defaultProps.tag ?? (isTextView ? "span" : "div");
             traversePath.get("openingElement").get("attributes").forEach((path) => {
               const attr = path.node;
               if (t.isJSXSpreadAttribute(attr))
@@ -977,7 +980,7 @@ function createExtractor() {
             let themeVal = inlined.get("theme");
             inlined.delete("theme");
             for (const [key] of [...inlined]) {
-              if (INLINE_EXTRACTABLE[key] || ((_b2 = staticConfig.variants) == null ? void 0 : _b2[key])) {
+              if (INLINE_EXTRACTABLE[key] || ((_a2 = staticConfig.variants) == null ? void 0 : _a2[key])) {
                 inlined.delete(key);
               }
             }
@@ -1008,7 +1011,7 @@ function createExtractor() {
                 t.jsxAttribute(t.jsxIdentifier("name"), themeVal.value)
               ]), t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")), [traversePath.node]));
             }
-            if (shouldFlatten && staticConfig.defaultProps) {
+            if (shouldFlatten) {
               const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap((key) => {
                 if (!isValidStyleKey(key, staticConfig)) {
                   return [];
@@ -1040,10 +1043,10 @@ function createExtractor() {
               for (const cur of attrs) {
                 if (cur.type === "style") {
                   for (const key in cur.value) {
-                    const shouldEnsureOverridden = !!((_c = staticConfig.ensureOverriddenProp) == null ? void 0 : _c[key]);
+                    const shouldEnsureOverridden = !!((_b2 = staticConfig.ensureOverriddenProp) == null ? void 0 : _b2[key]);
                     const isSetInAttrsAlready = attrs.some((x) => x.type === "attr" && x.value.type === "JSXAttribute" && x.value.name.name === key);
                     if (!isSetInAttrsAlready) {
-                      const isVariant = !!((_d = staticConfig.variants) == null ? void 0 : _d[cur.name || ""]);
+                      const isVariant = !!((_c = staticConfig.variants) == null ? void 0 : _c[cur.name || ""]);
                       if (isVariant || shouldEnsureOverridden) {
                         ensureOverridden[key] = true;
                       }
@@ -1303,7 +1306,7 @@ function createExtractor() {
                       if (INLINE_EXTRACTABLE[name]) {
                         attr.value.name.name = INLINE_EXTRACTABLE[name];
                       }
-                      if ((_e = staticConfig.variants) == null ? void 0 : _e[name]) {
+                      if ((_d = staticConfig.variants) == null ? void 0 : _d[name]) {
                         const expanded = getStyles({});
                       }
                     }