@tamagui/static 1.0.1-rc.6 → 1.0.1-rc.7

package/dist/extractor/createExtractor.js

@@ -206,7 +206,9 @@ function createExtractor({ logger = console } = { logger: console }) {
     });
     const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
     if (Object.keys(components).length === 0) {
-      console.warn(`Warning: Tamagui didn't find any valid components (DEBUG=tamagui for more)`);
+      console.warn(
+        `Warning: Tamagui didn't find any valid components (DEBUG=tamagui for more)`
+      );
       if (process.env.DEBUG === "tamagui") {
         console.log(`components`, Object.keys(components), components);
       }
@@ -243,7 +245,9 @@ function createExtractor({ logger = console } = { logger: console }) {
         );
         if (shouldPrintDebug === "verbose") {
           logger.info(
-            `import ${names.join(", ")} from ${moduleName} isValidComponent ${isValidComponent}`
+            `import ${names.join(
+              ", "
+            )} from ${moduleName} isValidComponent ${isValidComponent}`
           );
         }
         if (isValidComponent) {
@@ -253,7 +257,9 @@ function createExtractor({ logger = console } = { logger: console }) {
       }
     }
     if (shouldPrintDebug) {
-      logger.info(`file: ${sourcePath} ${JSON.stringify({ doesUseValidImport, hasImportedTheme })}`);
+      logger.info(
+        `file: ${sourcePath} ${JSON.stringify({ doesUseValidImport, hasImportedTheme })}`
+      );
     }
     if (!doesUseValidImport) {
       return null;
@@ -265,7 +271,11 @@ function createExtractor({ logger = console } = { logger: console }) {
       if (!importDeclaration) {
         return null;
       }
-      return (0, import_extractHelpers.getValidImport)(propsWithFileInfo, importDeclaration.source.value, componentName);
+      return (0, import_extractHelpers.getValidImport)(
+        propsWithFileInfo,
+        importDeclaration.source.value,
+        componentName
+      );
     }
     tm.mark("import-check", !!shouldPrintDebug);
     let couldntParse = false;
@@ -379,7 +389,9 @@ function createExtractor({ logger = console } = { logger: console }) {
             continue;
           }
           const val = classNames[cn];
-          definition.properties.push(t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val)));
+          definition.properties.push(
+            t.objectProperty(t.stringLiteral(cn), t.stringLiteral(val))
+          );
         }
         if (out.rulesToInsert) {
           for (const { identifier, rules } of out.rulesToInsert) {
@@ -413,7 +425,9 @@ function createExtractor({ logger = console } = { logger: console }) {
           modulePath = binding.path.parent.source.value;
           if (!(0, import_extractHelpers.isValidImport)(propsWithFileInfo, modulePath, binding.identifier.name)) {
             if (shouldPrintDebug) {
-              logger.info(` - Binding not internal import or from components ${modulePath}`);
+              logger.info(
+                ` - Binding not internal import or from components ${modulePath}`
+              );
             }
             return;
           }
@@ -488,7 +502,10 @@ function createExtractor({ logger = console } = { logger: console }) {
                 }
                 return [
                   ...createTernariesFromObjectProperties2(test, alt) || [],
-                  ...cons && createTernariesFromObjectProperties2(t.unaryExpression("!", test), cons) || []
+                  ...cons && createTernariesFromObjectProperties2(
+                    t.unaryExpression("!", test),
+                    cons
+                  ) || []
                 ].map((ternary) => ({
                   type: "ternary",
                   value: ternary
@@ -589,7 +606,10 @@ function createExtractor({ logger = console } = { logger: console }) {
                 if (value.type === "StringLiteral" && value.value[0] === "$") {
                   if (shouldPrintDebug) {
                     logger.info(
-                      [`  ! inlining, native disable extract: ${name} =`, value.value].join(" ")
+                      [
+                        `  ! inlining, native disable extract: ${name} =`,
+                        value.value
+                      ].join(" ")
                     );
                   }
                   inlined.set(name, true);
@@ -698,7 +718,9 @@ function createExtractor({ logger = console } = { logger: console }) {
               const lVal = attemptEvalSafe(left);
               const rVal = attemptEvalSafe(right);
               if (shouldPrintDebug) {
-                logger.info(`  evalBinaryExpression lVal ${String(lVal)}, rVal ${String(rVal)}`);
+                logger.info(
+                  `  evalBinaryExpression lVal ${String(lVal)}, rVal ${String(rVal)}`
+                );
               }
               if (lVal !== import_constants.FAILED_EVAL && t.isConditionalExpression(right)) {
                 const ternary = addBinaryConditional(operator, left, right);
@@ -737,8 +759,12 @@ function createExtractor({ logger = console } = { logger: console }) {
             return attr;
             function addBinaryConditional(operator, staticExpr, cond) {
               if (getStaticConditional(cond)) {
-                const alt = attemptEval(t.binaryExpression(operator, staticExpr, cond.alternate));
-                const cons = attemptEval(t.binaryExpression(operator, staticExpr, cond.consequent));
+                const alt = attemptEval(
+                  t.binaryExpression(operator, staticExpr, cond.alternate)
+                );
+                const cons = attemptEval(
+                  t.binaryExpression(operator, staticExpr, cond.consequent)
+                );
                 if (shouldPrintDebug) {
                   logger.info(["  binaryConditional", cond.test, cons, alt].join(" "));
                 }
@@ -855,8 +881,12 @@ function createExtractor({ logger = console } = { logger: console }) {
               }
               if (t.isConditionalExpression(property.value)) {
                 const [truthy, falsy] = [
-                  t.objectExpression([t.objectProperty(property.key, property.value.consequent)]),
-                  t.objectExpression([t.objectProperty(property.key, property.value.alternate)])
+                  t.objectExpression([
+                    t.objectProperty(property.key, property.value.consequent)
+                  ]),
+                  t.objectExpression([
+                    t.objectProperty(property.key, property.value.alternate)
+                  ])
                 ].map((x) => attemptEval(x));
                 return [
                   createTernary({
@@ -881,7 +911,9 @@ function createExtractor({ logger = console } = { logger: console }) {
                   })
                 ];
               }
-              const obj = t.objectExpression([t.objectProperty(property.key, property.value)]);
+              const obj = t.objectExpression([
+                t.objectProperty(property.key, property.value)
+              ]);
               const consequent = attemptEval(obj);
               return createTernary({
                 remove() {
@@ -956,7 +988,9 @@ function createExtractor({ logger = console } = { logger: console }) {
             ...restProps.deoptProps || [],
             ...staticConfig.deoptProps || []
           ]);
-          const inlineWhenUnflattened = /* @__PURE__ */ new Set([...staticConfig.inlineWhenUnflattened || []]);
+          const inlineWhenUnflattened = /* @__PURE__ */ new Set([
+            ...staticConfig.inlineWhenUnflattened || []
+          ]);
           const staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
             traversePath.scope,
             importsWhitelist,
@@ -1067,7 +1101,9 @@ function createExtractor({ logger = console } = { logger: console }) {
           }
           if (couldntParse || shouldDeopt) {
             if (shouldPrintDebug) {
-              logger.info([`  avoid optimizing:`, { couldntParse, shouldDeopt }].join(" "));
+              logger.info(
+                [`  avoid optimizing:`, { couldntParse, shouldDeopt }].join(" ")
+              );
             }
             node.attributes = ogAttributes;
             return;
@@ -1162,7 +1198,12 @@ function createExtractor({ logger = console } = { logger: console }) {
                 hasImportedTheme = true;
                 programPath.node.body.push(
                   t.importDeclaration(
-                    [t.importSpecifier(t.identifier("_TamaguiTheme"), t.identifier("Theme"))],
+                    [
+                      t.importSpecifier(
+                        t.identifier("_TamaguiTheme"),
+                        t.identifier("Theme")
+                      )
+                    ],
                     t.stringLiteral("@tamagui/core")
                   )
                 );
@@ -1179,38 +1220,44 @@ function createExtractor({ logger = console } = { logger: console }) {
             }
           }
           if (shouldFlatten) {
-            const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap((key) => {
-              if (!isValidStyleKey(key, staticConfig)) {
-                return [];
-              }
-              const value = staticConfig.defaultProps[key];
-              const name = tamaguiConfig.shorthands[key] || key;
-              if (value === void 0) {
-                logger.warn(`\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`);
-                shouldDeopt = true;
-                return;
+            const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap(
+              (key) => {
+                if (!isValidStyleKey(key, staticConfig)) {
+                  return [];
+                }
+                const value = staticConfig.defaultProps[key];
+                const name = tamaguiConfig.shorthands[key] || key;
+                if (value === void 0) {
+                  logger.warn(
+                    `\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`
+                  );
+                  shouldDeopt = true;
+                  return;
+                }
+                const attr = {
+                  type: "style",
+                  name,
+                  value: { [name]: value }
+                };
+                return attr;
               }
-              const attr = {
-                type: "style",
-                name,
-                value: { [name]: value }
-              };
-              return attr;
-            });
+            );
             if (defaultStyleAttrs.length) {
               attrs = [...defaultStyleAttrs, ...attrs];
             }
           }
           if (shouldDeopt || !shouldFlatten) {
             if (shouldPrintDebug) {
-              logger.info(`Deopting`);
+              logger.info(`Deopting ${shouldDeopt} ${shouldFlatten}`);
             }
             node.attributes = ogAttributes;
             return;
           }
           if (shouldPrintDebug) {
             logger.info(
-              ["  - attrs (flattened): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")
+              ["  - attrs (flattened): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
+                " "
+              )
             );
           }
           const state = {
@@ -1345,7 +1392,9 @@ function createExtractor({ logger = console } = { logger: console }) {
           tm.mark("jsx-element-expanded", !!shouldPrintDebug);
           if (shouldPrintDebug) {
             logger.info(
-              ["  - attrs (expanded): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")
+              ["  - attrs (expanded): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
+                " "
+              )
             );
           }
           let prev = null;
@@ -1382,13 +1431,21 @@ function createExtractor({ logger = console } = { logger: console }) {
           }, []);
           if (shouldPrintDebug) {
             logger.info(
-              ["  - attrs (combined \u{1F500}): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")
+              [
+                "  - attrs (combined \u{1F500}): \n",
+                (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))
+              ].join(" ")
             );
             logger.info(
-              ["  - defaultProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(staticConfig.defaultProps))].join(" ")
+              [
+                "  - defaultProps: \n",
+                (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(staticConfig.defaultProps))
+              ].join(" ")
             );
             logger.info(["  - foundStaticProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(foundStaticProps))].join(" "));
-            logger.info(["  - completeProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeProps))].join(" "));
+            logger.info(
+              ["  - completeProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeProps))].join(" ")
+            );
           }
           const getStyles = (props, debugName = "") => {
             if (!props || !Object.keys(props).length) {