@tamagui/static 1.61.2 → 1.62.0

package/dist/cjs/extractor/createExtractor.js

@@ -1,20 +1,15 @@
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
+    __defProp(target, name, { get: all[name], enumerable: !0 });
+}, __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
     for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
@@ -22,92 +17,56 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
   mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var createExtractor_exports = {};
 __export(createExtractor_exports, {
   createExtractor: () => createExtractor
 });
 module.exports = __toCommonJS(createExtractor_exports);
-var import_path = require("path");
-var import_traverse = __toESM(require("@babel/traverse"));
-var t = __toESM(require("@babel/types"));
-var import_core_node = require("@tamagui/core-node");
-var import_react_native_web_internals = require("react-native-web-internals");
-var import_constants = require("../constants");
-var import_createEvaluator = require("./createEvaluator");
-var import_evaluateAstNode = require("./evaluateAstNode");
-var import_extractHelpers = require("./extractHelpers");
-var import_findTopmostFunction = require("./findTopmostFunction");
-var import_getStaticBindingsForScope = require("./getStaticBindingsForScope");
-var import_literalToAst = require("./literalToAst");
-var import_loadTamagui = require("./loadTamagui");
-var import_logLines = require("./logLines");
-var import_normalizeTernaries = require("./normalizeTernaries");
-var import_propsToFontFamilyCache = require("./propsToFontFamilyCache");
-var import_removeUnusedHooks = require("./removeUnusedHooks");
-var import_timer = require("./timer");
-var import_validHTMLAttributes = require("./validHTMLAttributes");
+var import_path = require("path"), import_traverse = __toESM(require("@babel/traverse")), t = __toESM(require("@babel/types")), import_react_native_web_internals = require("react-native-web-internals"), import_constants = require("../constants"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_createEvaluator = require("./createEvaluator"), import_evaluateAstNode = require("./evaluateAstNode"), import_extractHelpers = require("./extractHelpers"), import_findTopmostFunction = require("./findTopmostFunction"), import_getStaticBindingsForScope = require("./getStaticBindingsForScope"), import_literalToAst = require("./literalToAst"), import_loadTamagui = require("./loadTamagui"), import_logLines = require("./logLines"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_removeUnusedHooks = require("./removeUnusedHooks"), import_timer = require("./timer"), import_validHTMLAttributes = require("./validHTMLAttributes");
 const UNTOUCHED_PROPS = {
-  key: true,
-  style: true,
-  className: true
-};
-const INLINE_EXTRACTABLE = {
+  key: !0,
+  style: !0,
+  className: !0
+}, INLINE_EXTRACTABLE = {
   ref: "ref",
   key: "key",
-  ...process.env.TAMAGUI_TARGET === "web" && {
-    onPress: "onClick",
-    onHoverIn: "onMouseEnter",
-    onHoverOut: "onMouseLeave",
-    onPressIn: "onMouseDown",
-    onPressOut: "onMouseUp"
-  }
-};
-const validHooks = {
-  useMedia: true,
-  useTheme: true
-};
-const createTernary = (x) => x;
-let hasLoggedBaseInfo = false;
+  onPress: "onClick",
+  onHoverIn: "onMouseEnter",
+  onHoverOut: "onMouseLeave",
+  onPressIn: "onMouseDown",
+  onPressOut: "onMouseUp"
+}, validHooks = {
+  useMedia: !0,
+  useTheme: !0
+}, createTernary = (x) => x;
+let hasLoggedBaseInfo = !1;
 function isFullyDisabled(props) {
   return props.disableExtraction && props.disableDebugAttr;
 }
 function createExtractor({ logger = console } = { logger: console }) {
-  if (!process.env.TAMAGUI_TARGET) {
-    console.warn('\u26A0\uFE0F Please set process.env.TAMAGUI_TARGET to either "web" or "native"');
-    process.exit(1);
-  }
   const componentState = {
-    focus: false,
-    hover: false,
-    unmounted: true,
-    press: false,
-    pressIn: false
-  };
-  const styleProps = {
-    resolveVariablesAs: process.env.TAMAGUI_TARGET === "native" ? "value" : "variable",
-    noClassNames: false,
-    isAnimated: false
-  };
-  const shouldAddDebugProp = (
+    focus: !1,
+    hover: !1,
+    unmounted: !0,
+    press: !1,
+    pressIn: !1
+  }, styleProps = {
+    resolveVariablesAs: "variable",
+    noClassNames: !1,
+    isAnimated: !1
+  }, shouldAddDebugProp = (
     // really basic disable this for next.js because it messes with ssr
-    !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)
+    !process.env.npm_package_dependencies_next && !0 && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS)
   );
   let projectInfo = null;
   function loadSync(props) {
-    if (isFullyDisabled(props)) {
-      return null;
-    }
-    return projectInfo || (projectInfo = (0, import_loadTamagui.loadTamaguiSync)(props));
+    return isFullyDisabled(props) ? null : projectInfo ||= (0, import_loadTamagui.loadTamaguiSync)(props);
   }
   async function load(props) {
-    if (isFullyDisabled(props)) {
-      return null;
-    }
-    return projectInfo || (projectInfo = await (0, import_loadTamagui.loadTamagui)(props));
+    return isFullyDisabled(props) ? null : projectInfo ||= await (0, import_loadTamagui.loadTamagui)(props);
   }
   return {
     options: {
@@ -117,7 +76,7 @@ function createExtractor({ logger = console } = { logger: console }) {
     loadTamagui: load,
     loadTamaguiSync: loadSync,
     getTamagui() {
-      return projectInfo == null ? void 0 : projectInfo.tamaguiConfig;
+      return projectInfo?.tamaguiConfig;
     },
     parseSync: (f, props) => {
       const projectInfo2 = loadSync(props);
@@ -129,11 +88,10 @@ function createExtractor({ logger = console } = { logger: console }) {
     }
   };
   function parseWithConfig({ components, tamaguiConfig }, fileOrPath, options) {
-    var _a;
     const {
       config = "tamagui.config.ts",
       importsWhitelist = ["constants.js"],
-      evaluateVars = true,
+      evaluateVars = !0,
       sourcePath = "",
       onExtractTag,
       onStyleRule,
@@ -145,183 +103,111 @@ function createExtractor({ logger = console } = { logger: console }) {
       disableDebugAttr,
       disableExtractFoundComponents,
       includeExtensions = [".ts", ".tsx", ".jsx"],
-      extractStyledDefinitions = false,
+      extractStyledDefinitions = !1,
       prefixLogs,
       excludeProps,
       target,
       ...restProps
-    } = options;
-    let shouldPrintDebug = options.shouldPrintDebug || false;
-    if (disable === true || Array.isArray(disable) && disable.includes(sourcePath)) {
+    } = options, {
+      expandStylesAndRemoveNullishValues,
+      getSplitStyles,
+      mediaQueryConfig,
+      propMapper,
+      proxyThemeVariables,
+      pseudoDescriptors
+    } = (0, import_requireTamaguiCore.requireTamaguiCore)(target === "html" ? "web" : "native");
+    let shouldPrintDebug = options.shouldPrintDebug || !1;
+    if (disable === !0 || Array.isArray(disable) && disable.includes(sourcePath))
       return null;
-    }
-    if (!isFullyDisabled(options)) {
-      if (!components) {
-        throw new Error(`Must provide components`);
-      }
-    }
-    if (sourcePath && includeExtensions && !includeExtensions.some((ext) => sourcePath.endsWith(ext))) {
-      if (shouldPrintDebug) {
-        logger.info(
-          `Ignoring file due to includeExtensions: ${sourcePath}, includeExtensions: ${includeExtensions.join(
-            ", "
-          )}`
-        );
-      }
-      return null;
-    }
+    if (!isFullyDisabled(options) && !components)
+      throw new Error("Must provide components");
+    if (sourcePath && includeExtensions && !includeExtensions.some((ext) => sourcePath.endsWith(ext)))
+      return shouldPrintDebug && logger.info(
+        `Ignoring file due to includeExtensions: ${sourcePath}, includeExtensions: ${includeExtensions.join(
+          ", "
+        )}`
+      ), null;
     function isValidStyleKey(name, staticConfig) {
-      var _a2, _b, _c;
-      if (!projectInfo) {
-        throw new Error(`Tamagui extractor not loaded yet`);
-      }
-      if (target === "native" && name[0] === "$" && import_core_node.mediaQueryConfig[name.slice(1)]) {
-        return false;
-      }
-      return !!(((_a2 = staticConfig.validStyles) == null ? void 0 : _a2[name]) || import_core_node.pseudoDescriptors[name] || // dont disable variants or else you lose many things flattening
-      ((_b = staticConfig.variants) == null ? void 0 : _b[name]) || ((_c = projectInfo == null ? void 0 : projectInfo.tamaguiConfig) == null ? void 0 : _c.shorthands[name]) || (name[0] === "$" ? !!import_core_node.mediaQueryConfig[name.slice(1)] : false));
+      if (!projectInfo)
+        throw new Error("Tamagui extractor not loaded yet");
+      return target === "native" && name[0] === "$" && mediaQueryConfig[name.slice(1)] ? !1 : !!(staticConfig.validStyles?.[name] || pseudoDescriptors[name] || // dont disable variants or else you lose many things flattening
+      staticConfig.variants?.[name] || projectInfo?.tamaguiConfig?.shorthands[name] || name[0] === "$" && mediaQueryConfig[name.slice(1)]);
     }
-    const isTargetingHTML = target === "html";
-    const ogDebug = shouldPrintDebug;
-    const tm = (0, import_timer.timer)();
-    const propsWithFileInfo = {
+    const isTargetingHTML = target === "html", ogDebug = shouldPrintDebug, tm = (0, import_timer.timer)(), propsWithFileInfo = {
       ...options,
       sourcePath,
       allLoadedComponents: components ? [...components] : []
     };
-    if (!hasLoggedBaseInfo) {
-      hasLoggedBaseInfo = true;
-      if (shouldPrintDebug) {
-        logger.info(
-          [
-            "loaded components:",
-            propsWithFileInfo.allLoadedComponents.map((comp) => Object.keys(comp.nameToInfo).join(", ")).join(", ")
-          ].join(" ")
-        );
-      }
-      if ((_a = process.env.DEBUG) == null ? void 0 : _a.startsWith("tamagui")) {
-        logger.info(
-          [
-            "loaded:",
-            JSON.stringify(propsWithFileInfo.allLoadedComponents, null, 2)
-          ].join("\n")
-        );
-      }
-    }
-    tm.mark("load-tamagui", !!shouldPrintDebug);
-    if (!isFullyDisabled(options)) {
-      if (!(tamaguiConfig == null ? void 0 : tamaguiConfig.themes)) {
-        console.error(
-          `\u26D4\uFE0F Error: Missing "themes" in your tamagui.config file, this may be due to duplicated dependency versions. Try out https://github.com/bmish/check-dependency-version-consistency to see if there are mis-matches, or search your lockfile.`
-        );
-        console.log(`  Got config:`, tamaguiConfig);
-        process.exit(0);
-      }
-    }
-    const firstThemeName = Object.keys((tamaguiConfig == null ? void 0 : tamaguiConfig.themes) || {})[0];
-    const firstTheme = (tamaguiConfig == null ? void 0 : tamaguiConfig.themes[firstThemeName]) || {};
-    if (!firstTheme || typeof firstTheme !== "object") {
-      console.error(`Missing theme, an error occurred when importing your config`);
-      console.log(`Got config:`, tamaguiConfig);
-      console.log(`Looking for theme:`, firstThemeName);
-      process.exit(0);
-    }
-    const proxiedTheme = (0, import_core_node.proxyThemeVariables)(firstTheme);
-    const themeAccessListeners = /* @__PURE__ */ new Set();
-    const defaultTheme = new Proxy(proxiedTheme, {
+    hasLoggedBaseInfo || (hasLoggedBaseInfo = !0, shouldPrintDebug && logger.info(
+      [
+        "loaded components:",
+        propsWithFileInfo.allLoadedComponents.map((comp) => Object.keys(comp.nameToInfo).join(", ")).join(", ")
+      ].join(" ")
+    ), process.env.DEBUG?.startsWith("tamagui") && logger.info(
+      [
+        "loaded:",
+        JSON.stringify(propsWithFileInfo.allLoadedComponents, null, 2)
+      ].join(`
+`)
+    )), tm.mark("load-tamagui", !!shouldPrintDebug), isFullyDisabled(options) || tamaguiConfig?.themes || (console.error(
+      '\u26D4\uFE0F Error: Missing "themes" in your tamagui.config file, this may be due to duplicated dependency versions. Try out https://github.com/bmish/check-dependency-version-consistency to see if there are mis-matches, or search your lockfile.'
+    ), console.log("  Got config:", tamaguiConfig), process.exit(0));
+    const firstThemeName = Object.keys(tamaguiConfig?.themes || {})[0], firstTheme = tamaguiConfig?.themes[firstThemeName] || {};
+    (!firstTheme || typeof firstTheme != "object") && (console.error("Missing theme, an error occurred when importing your config"), console.log("Got config:", tamaguiConfig), console.log("Looking for theme:", firstThemeName), process.exit(0));
+    const proxiedTheme = proxyThemeVariables(firstTheme), themeAccessListeners = /* @__PURE__ */ new Set(), defaultTheme = new Proxy(proxiedTheme, {
       get(target2, key) {
-        if (Reflect.has(target2, key)) {
-          themeAccessListeners.forEach((cb) => cb(String(key)));
-        }
-        return Reflect.get(target2, key);
-      }
-    });
-    const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
-    if (!isFullyDisabled(options)) {
-      if (Object.keys(components || []).length === 0) {
-        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);
-        }
+        return Reflect.has(target2, key) && themeAccessListeners.forEach((cb) => cb(String(key))), Reflect.get(target2, key);
       }
-    }
-    if (shouldPrintDebug === "verbose") {
-      logger.info(
-        `allLoadedComponent modules ${propsWithFileInfo.allLoadedComponents.map((k) => k.moduleName).join(", ")}`
-      );
-    }
-    let doesUseValidImport = false;
-    let hasImportedTheme = false;
+    }), body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
+    isFullyDisabled(options) || Object.keys(components || []).length === 0 && (console.warn(
+      "Warning: Tamagui didn't find any valid components (DEBUG=tamagui for more)"
+    ), process.env.DEBUG === "tamagui" && console.log("components", Object.keys(components || []), components)), shouldPrintDebug === "verbose" && logger.info(
+      `allLoadedComponent modules ${propsWithFileInfo.allLoadedComponents.map((k) => k.moduleName).join(", ")}`
+    );
+    let doesUseValidImport = !1, hasImportedTheme = !1;
     const importDeclarations = [];
     for (const bodyPath of body) {
       if (bodyPath.type !== "ImportDeclaration")
         continue;
-      const node = "node" in bodyPath ? bodyPath.node : bodyPath;
-      const moduleName = node.source.value;
-      const valid = (0, import_extractHelpers.isValidImport)(propsWithFileInfo, moduleName);
-      if (valid) {
-        importDeclarations.push(node);
-      }
-      if (extractStyledDefinitions) {
-        if (valid) {
-          if (node.specifiers.some((specifier) => specifier.local.name === "styled")) {
-            doesUseValidImport = true;
-            break;
-          }
-        }
+      const node = "node" in bodyPath ? bodyPath.node : bodyPath, moduleName = node.source.value, valid = (0, import_extractHelpers.isValidImport)(propsWithFileInfo, moduleName);
+      if (valid && importDeclarations.push(node), extractStyledDefinitions && valid && node.specifiers.some((specifier) => specifier.local.name === "styled")) {
+        doesUseValidImport = !0;
+        break;
       }
       if (valid) {
-        const names = node.specifiers.map((specifier) => specifier.local.name);
-        const isValidComponent = names.some(
-          (name) => Boolean((0, import_extractHelpers.isValidImport)(propsWithFileInfo, moduleName, name) || validHooks[name])
+        const names = node.specifiers.map((specifier) => specifier.local.name), isValidComponent = names.some(
+          (name) => !!((0, import_extractHelpers.isValidImport)(propsWithFileInfo, moduleName, name) || validHooks[name])
         );
-        if (shouldPrintDebug === "verbose") {
-          logger.info(
-            ` - import ${isValidComponent ? "\u2705" : "\u21E3"} - ${names.join(
-              ", "
-            )} from '${moduleName}' - (valid: ${JSON.stringify(
-              (0, import_extractHelpers.getValidComponentsPaths)(propsWithFileInfo)
-            )})`
-          );
-        }
-        if (isValidComponent) {
-          doesUseValidImport = true;
+        if (shouldPrintDebug === "verbose" && logger.info(
+          ` - import ${isValidComponent ? "\u2705" : "\u21E3"} - ${names.join(
+            ", "
+          )} from '${moduleName}' - (valid: ${JSON.stringify(
+            (0, import_extractHelpers.getValidComponentsPaths)(propsWithFileInfo)
+          )})`
+        ), isValidComponent) {
+          doesUseValidImport = !0;
           break;
         }
       }
     }
-    if (shouldPrintDebug) {
-      logger.info(
-        `${JSON.stringify({ doesUseValidImport, hasImportedTheme }, null, 2)}
+    if (shouldPrintDebug && logger.info(
+      `${JSON.stringify({ doesUseValidImport, hasImportedTheme }, null, 2)}
 `
-      );
-    }
-    if (!doesUseValidImport) {
+    ), !doesUseValidImport)
       return null;
-    }
     function getValidImportedComponent(componentName) {
       const importDeclaration = importDeclarations.find(
         (dec) => dec.specifiers.some((spec) => spec.local.name === componentName)
       );
-      if (!importDeclaration) {
-        return null;
-      }
-      return (0, import_extractHelpers.getValidImport)(
+      return importDeclaration ? (0, import_extractHelpers.getValidImport)(
         propsWithFileInfo,
         importDeclaration.source.value,
         componentName
-      );
+      ) : null;
     }
     tm.mark("import-check", !!shouldPrintDebug);
-    let couldntParse = false;
-    const modifiedComponents = /* @__PURE__ */ new Set();
-    const bindingCache = {};
-    const callTraverse = (a) => {
-      return fileOrPath.type === "File" ? (0, import_traverse.default)(fileOrPath, a) : fileOrPath.traverse(a);
-    };
-    const shouldDisableExtraction = disableExtraction === true || Array.isArray(disableExtraction) && disableExtraction.includes(sourcePath);
+    let couldntParse = !1;
+    const modifiedComponents = /* @__PURE__ */ new Set(), bindingCache = {}, callTraverse = (a) => fileOrPath.type === "File" ? (0, import_traverse.default)(fileOrPath, a) : fileOrPath.traverse(a), shouldDisableExtraction = disableExtraction === !0 || Array.isArray(disableExtraction) && disableExtraction.includes(sourcePath);
     let programPath = null;
     const res = {
       styled: 0,
@@ -330,7 +216,7 @@ function createExtractor({ logger = console } = { logger: console }) {
       modified: 0,
       found: 0
     };
-    callTraverse({
+    if (callTraverse({
       // @ts-ignore
       Program: {
         enter(path) {
@@ -339,28 +225,17 @@ function createExtractor({ logger = console } = { logger: console }) {
       },
       // styled() calls
       CallExpression(path) {
-        var _a2;
-        if (disable || shouldDisableExtraction || extractStyledDefinitions === false) {
+        if (disable || shouldDisableExtraction || extractStyledDefinitions === !1 || !t.isIdentifier(path.node.callee) || path.node.callee.name !== "styled")
           return;
-        }
-        if (!t.isIdentifier(path.node.callee) || path.node.callee.name !== "styled") {
+        const variableName = t.isVariableDeclarator(path.parent) && t.isIdentifier(path.parent.id) ? path.parent.id.name : "unknown", parentNode = path.node.arguments[0];
+        if (!t.isIdentifier(parentNode))
           return;
-        }
-        const variableName = t.isVariableDeclarator(path.parent) && t.isIdentifier(path.parent.id) ? path.parent.id.name : "unknown";
-        const parentNode = path.node.arguments[0];
-        if (!t.isIdentifier(parentNode)) {
-          return;
-        }
-        const parentName = parentNode.name;
-        const definition = path.node.arguments[1];
-        if (!parentName || !definition || !t.isObjectExpression(definition)) {
+        const parentName = parentNode.name, definition = path.node.arguments[1];
+        if (!parentName || !definition || !t.isObjectExpression(definition))
           return;
-        }
         const Component = getValidImportedComponent(parentName);
         if (!Component) {
-          if (shouldPrintDebug) {
-            logger.info(` No component found`);
-          }
+          shouldPrintDebug && logger.info(" No component found");
           return;
         }
         const componentSkipProps = /* @__PURE__ */ new Set([
@@ -376,39 +251,30 @@ function createExtractor({ logger = console } = { logger: console }) {
           "focusStyle",
           "hoverStyle",
           "pressStyle"
-        ]);
-        const skipped = /* @__PURE__ */ new Set();
-        const styles = {};
-        const staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
+        ]), skipped = /* @__PURE__ */ new Set(), styles = {}, staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
           path.scope,
           importsWhitelist,
           sourcePath,
           bindingCache,
           shouldPrintDebug
-        );
-        const attemptEval = !evaluateVars ? import_evaluateAstNode.evaluateAstNode : (0, import_createEvaluator.createEvaluator)({
+        ), attemptEval = evaluateVars ? (0, import_createEvaluator.createEvaluator)({
           props: propsWithFileInfo,
           staticNamespace,
           sourcePath,
           shouldPrintDebug
-        });
-        const attemptEvalSafe = (0, import_createEvaluator.createSafeEvaluator)(attemptEval);
+        }) : import_evaluateAstNode.evaluateAstNode, attemptEvalSafe = (0, import_createEvaluator.createSafeEvaluator)(attemptEval);
         for (const property of definition.properties) {
           if (!t.isObjectProperty(property) || !t.isIdentifier(property.key) || !isValidStyleKey(property.key.name, Component.staticConfig) || // TODO make pseudos and variants work
           // skip pseudos
-          import_core_node.pseudoDescriptors[property.key.name] || // skip variants
-          ((_a2 = Component.staticConfig.variants) == null ? void 0 : _a2[property.key.name]) || componentSkipProps.has(property.key.name)) {
+          pseudoDescriptors[property.key.name] || // skip variants
+          Component.staticConfig.variants?.[property.key.name] || componentSkipProps.has(property.key.name)) {
             skipped.add(property);
             continue;
           }
           const out2 = attemptEvalSafe(property.value);
-          if (out2 === import_constants.FAILED_EVAL) {
-            skipped.add(property);
-          } else {
-            styles[property.key.name] = out2;
-          }
+          out2 === import_constants.FAILED_EVAL ? skipped.add(property) : styles[property.key.name] = out2;
         }
-        const out = (0, import_core_node.getSplitStyles)(
+        const out = getSplitStyles(
           styles,
           Component.staticConfig,
           defaultTheme,
@@ -419,134 +285,82 @@ function createExtractor({ logger = console } = { logger: console }) {
           void 0,
           void 0,
           shouldPrintDebug
-        );
-        const classNames = {
+        ), classNames = {
           ...out.classNames
         };
-        if (shouldPrintDebug) {
-          logger.info(
-            [
-              `Extracted styled(${variableName})
+        if (shouldPrintDebug && logger.info(
+          [
+            `Extracted styled(${variableName})
 `,
-              JSON.stringify(styles, null, 2),
-              "\n classNames:",
-              JSON.stringify(classNames, null, 2),
-              "\n  rulesToInsert:",
-              out.rulesToInsert.flatMap((rule) => rule.rules).join("\n")
-            ].join(" ")
-          );
-        }
-        definition.properties = definition.properties.map((prop) => {
-          if (skipped.has(prop) || !t.isObjectProperty(prop) || !t.isIdentifier(prop.key)) {
+            JSON.stringify(styles, null, 2),
+            `
+ classNames:`,
+            JSON.stringify(classNames, null, 2),
+            `
+  rulesToInsert:`,
+            out.rulesToInsert.flatMap((rule) => rule.rules).join(`
+`)
+          ].join(" ")
+        ), definition.properties = definition.properties.map((prop) => {
+          if (skipped.has(prop) || !t.isObjectProperty(prop) || !t.isIdentifier(prop.key))
             return prop;
-          }
-          const key = prop.key.name;
-          const value = classNames[key];
-          if (value) {
-            return t.objectProperty(t.stringLiteral(key), t.stringLiteral(value));
-          }
-          return prop;
-        });
-        if (out.rulesToInsert) {
-          for (const { identifier, rules } of out.rulesToInsert) {
-            onStyleRule == null ? void 0 : onStyleRule(identifier, rules);
-          }
-        }
-        res.styled++;
-        if (shouldPrintDebug) {
-          logger.info(`Extracted styled(${variableName})`);
-        }
+          const key = prop.key.name, value = classNames[key];
+          return value ? t.objectProperty(t.stringLiteral(key), t.stringLiteral(value)) : prop;
+        }), out.rulesToInsert)
+          for (const { identifier, rules } of out.rulesToInsert)
+            onStyleRule?.(identifier, rules);
+        res.styled++, shouldPrintDebug && logger.info(`Extracted styled(${variableName})`);
       },
       JSXElement(traversePath) {
-        var _a2;
         tm.mark("jsx-element", !!shouldPrintDebug);
-        const node = traversePath.node.openingElement;
-        const ogAttributes = node.attributes.map((attr) => ({ ...attr }));
-        const componentName = (0, import_extractHelpers.findComponentName)(traversePath.scope);
-        const closingElement = traversePath.node.closingElement;
-        if (t.isJSXMemberExpression(closingElement == null ? void 0 : closingElement.name) || !t.isJSXIdentifier(node.name)) {
+        const node = traversePath.node.openingElement, ogAttributes = node.attributes.map((attr) => ({ ...attr })), componentName = (0, import_extractHelpers.findComponentName)(traversePath.scope), closingElement = traversePath.node.closingElement;
+        if (t.isJSXMemberExpression(closingElement?.name) || !t.isJSXIdentifier(node.name))
           return;
-        }
         const binding = traversePath.scope.getBinding(node.name.name);
         let modulePath = "";
         if (binding) {
           if (!t.isImportDeclaration(binding.path.parent)) {
-            if (shouldPrintDebug) {
-              logger.info(` - Binding not import declaration, skip`);
-            }
+            shouldPrintDebug && logger.info(" - Binding not import declaration, skip");
             return;
           }
-          modulePath = binding.path.parent.source.value;
-          if (!(0, import_extractHelpers.isValidImport)(propsWithFileInfo, modulePath, binding.identifier.name)) {
-            if (shouldPrintDebug) {
-              logger.info(
-                ` - Binding for ${componentName} not internal import or from components ${binding.identifier.name} in ${modulePath}`
-              );
-            }
+          if (modulePath = binding.path.parent.source.value, !(0, import_extractHelpers.isValidImport)(propsWithFileInfo, modulePath, binding.identifier.name)) {
+            shouldPrintDebug && logger.info(
+              ` - Binding for ${componentName} not internal import or from components ${binding.identifier.name} in ${modulePath}`
+            );
             return;
           }
         }
         const component = (0, import_extractHelpers.getValidComponent)(propsWithFileInfo, modulePath, node.name.name);
         if (!component || !component.staticConfig) {
-          if (shouldPrintDebug) {
-            logger.info(` - No Tamagui conf on this: ${node.name.name}`);
-          }
+          shouldPrintDebug && logger.info(` - No Tamagui conf on this: ${node.name.name}`);
           return;
         }
         const originalNodeName = node.name.name;
         res.found++;
-        const filePath = `./${(0, import_path.relative)(process.cwd(), sourcePath)}`;
-        const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
-        const codePosition = `${filePath}:${lineNumbers}`;
-        const debugPropValue = node.attributes.filter(
+        const filePath = `./${(0, import_path.relative)(process.cwd(), sourcePath)}`, lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "", codePosition = `${filePath}:${lineNumbers}`, debugPropValue = node.attributes.filter(
           (n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug"
-        ).map((n) => {
-          if (n.value === null)
-            return true;
-          if (t.isStringLiteral(n.value))
-            return n.value.value;
-          return false;
-        })[0];
-        if (debugPropValue) {
-          shouldPrintDebug = debugPropValue;
-        }
-        if (shouldPrintDebug) {
-          logger.info("\n");
-          logger.info(
-            `\x1B[33m%s\x1B[0m ${componentName} | ${codePosition} -------------------`
-          );
-          logger.info(["\x1B[1m", "\x1B[32m", `<${originalNodeName} />`, disableDebugAttr ? "" : "\u{1F41B}"].join(" "));
-        }
-        if (shouldAddDebugProp && !disableDebugAttr) {
-          res.modified++;
-          node.attributes.unshift(
-            t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(node.name.name))
-          );
-          if (componentName) {
-            node.attributes.unshift(
-              t.jsxAttribute(t.jsxIdentifier("data-in"), t.stringLiteral(componentName))
-            );
-          }
-          node.attributes.unshift(
-            t.jsxAttribute(
-              t.jsxIdentifier("data-at"),
-              t.stringLiteral(`${(0, import_path.basename)(filePath)}:${lineNumbers}`)
-            )
-          );
-        }
-        if (shouldDisableExtraction) {
-          if (shouldPrintDebug === "verbose") {
-            console.log(` Extraction disabled`);
-          }
+        ).map((n) => n.value === null ? !0 : t.isStringLiteral(n.value) ? n.value.value : !1)[0];
+        if (debugPropValue && (shouldPrintDebug = debugPropValue), shouldPrintDebug && (logger.info(`
+`), logger.info(
+          `\x1B[33m%s\x1B[0m ${componentName} | ${codePosition} -------------------`
+        ), logger.info(["\x1B[1m", "\x1B[32m", `<${originalNodeName} />`, disableDebugAttr ? "" : "\u{1F41B}"].join(" "))), shouldAddDebugProp && !disableDebugAttr && (res.modified++, node.attributes.unshift(
+          t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(node.name.name))
+        ), componentName && node.attributes.unshift(
+          t.jsxAttribute(t.jsxIdentifier("data-in"), t.stringLiteral(componentName))
+        ), node.attributes.unshift(
+          t.jsxAttribute(
+            t.jsxIdentifier("data-at"),
+            t.stringLiteral(`${(0, import_path.basename)(filePath)}:${lineNumbers}`)
+          )
+        )), shouldDisableExtraction) {
+          shouldPrintDebug === "verbose" && console.log(" Extraction disabled");
           return;
         }
         try {
-          let evaluateAttribute2 = function(path) {
-            const attribute = path.node;
-            const attr = { type: "attr", value: attribute };
+          let evaluateAttribute = function(path) {
+            const attribute = path.node, attr = { type: "attr", value: attribute };
             if (t.isJSXSpreadAttribute(attribute)) {
-              const arg = attribute.argument;
-              const conditional = t.isConditionalExpression(arg) ? (
+              const arg = attribute.argument, conditional = t.isConditionalExpression(arg) ? (
                 // <YStack {...isSmall ? { color: 'red } : { color: 'blue }}
                 [arg.test, arg.consequent, arg.alternate]
               ) : t.isLogicalExpression(arg) && arg.operator === "&&" ? (
@@ -556,16 +370,10 @@ function createExtractor({ logger = console } = { logger: console }) {
               if (conditional) {
                 const [test, alt, cons] = conditional;
                 if (!test)
-                  throw new Error(`no test`);
-                if ([alt, cons].some((side) => side && !isStaticObject2(side))) {
-                  if (shouldPrintDebug) {
-                    logger.info(`not extractable ${alt} ${cons}`);
-                  }
-                  return attr;
-                }
-                return [
-                  ...createTernariesFromObjectProperties2(test, alt) || [],
-                  ...cons && createTernariesFromObjectProperties2(
+                  throw new Error("no test");
+                return [alt, cons].some((side) => side && !isStaticObject(side)) ? (shouldPrintDebug && logger.info(`not extractable ${alt} ${cons}`), attr) : [
+                  ...createTernariesFromObjectProperties(test, alt) || [],
+                  ...cons && createTernariesFromObjectProperties(
                     t.unaryExpression("!", test),
                     cons
                   ) || []
@@ -575,209 +383,92 @@ function createExtractor({ logger = console } = { logger: console }) {
                 }));
               }
             }
-            if (t.isJSXSpreadAttribute(attribute) || !attribute.name || typeof attribute.name.name !== "string") {
-              if (shouldPrintDebug) {
-                logger.info("  ! inlining, spread attr");
-              }
-              inlined.set(`${Math.random()}`, "spread");
-              return attr;
-            }
+            if (t.isJSXSpreadAttribute(attribute) || !attribute.name || typeof attribute.name.name != "string")
+              return shouldPrintDebug && logger.info("  ! inlining, spread attr"), inlined.set(`${Math.random()}`, "spread"), attr;
             const name = attribute.name.name;
-            if (excludeProps == null ? void 0 : excludeProps.has(name)) {
-              if (shouldPrintDebug) {
-                logger.info(["  excluding prop", name].join(" "));
-              }
-              return null;
-            }
-            if (inlineProps.has(name)) {
-              inlined.set(name, name);
-              if (shouldPrintDebug) {
-                logger.info(["  ! inlining, inline prop", name].join(" "));
-              }
-              return attr;
-            }
-            if (deoptProps.has(name)) {
-              shouldDeopt = true;
-              inlined.set(name, name);
-              if (shouldPrintDebug) {
-                logger.info(["  ! inlining, deopted prop", name].join(" "));
-              }
-              return attr;
-            }
-            if (UNTOUCHED_PROPS[name]) {
+            if (excludeProps?.has(name))
+              return shouldPrintDebug && logger.info(["  excluding prop", name].join(" ")), null;
+            if (inlineProps.has(name))
+              return inlined.set(name, name), shouldPrintDebug && logger.info(["  ! inlining, inline prop", name].join(" ")), attr;
+            if (deoptProps.has(name))
+              return shouldDeopt = !0, inlined.set(name, name), shouldPrintDebug && logger.info(["  ! inlining, deopted prop", name].join(" ")), attr;
+            if (UNTOUCHED_PROPS[name])
               return attr;
-            }
-            if (INLINE_EXTRACTABLE[name]) {
-              inlined.set(name, INLINE_EXTRACTABLE[name]);
-              return attr;
-            }
-            if (name.startsWith("data-")) {
+            if (INLINE_EXTRACTABLE[name])
+              return inlined.set(name, INLINE_EXTRACTABLE[name]), attr;
+            if (name.startsWith("data-"))
               return attr;
-            }
-            if (name[0] === "$" && t.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
+            if (name[0] === "$" && t.isJSXExpressionContainer(attribute?.value)) {
               const shortname = name.slice(1);
-              if (import_core_node.mediaQueryConfig[shortname]) {
-                if (target === "native") {
-                  shouldDeopt = true;
-                }
-                if (disableExtractInlineMedia) {
+              if (mediaQueryConfig[shortname]) {
+                if (target === "native" && (shouldDeopt = !0), disableExtractInlineMedia)
                   return attr;
-                }
                 const expression = attribute.value.expression;
                 if (!t.isJSXEmptyExpression(expression)) {
-                  const ternaries2 = createTernariesFromObjectProperties2(
+                  const ternaries2 = createTernariesFromObjectProperties(
                     t.stringLiteral(shortname),
                     expression,
                     {
                       inlineMediaQuery: shortname
                     }
                   );
-                  if (ternaries2) {
+                  if (ternaries2)
                     return ternaries2.map((value2) => ({
                       type: "ternary",
                       value: value2
                     }));
-                  }
                 }
               }
             }
-            const [value, valuePath] = (() => {
-              if (t.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
-                return [attribute.value.expression, path.get("value")];
-              } else {
-                return [attribute.value, path.get("value")];
-              }
-            })();
-            const remove = () => {
+            const [value, valuePath] = (() => t.isJSXExpressionContainer(attribute?.value) ? [attribute.value.expression, path.get("value")] : [attribute.value, path.get("value")])(), remove = () => {
               Array.isArray(valuePath) ? valuePath.map((p) => p.remove()) : valuePath.remove();
             };
-            if (name === "ref") {
-              if (shouldPrintDebug) {
-                logger.info(["  ! inlining, ref", name].join(" "));
-              }
-              inlined.set("ref", "ref");
-              return attr;
-            }
-            if (name === "tag") {
+            if (name === "ref")
+              return shouldPrintDebug && logger.info(["  ! inlining, ref", name].join(" ")), inlined.set("ref", "ref"), attr;
+            if (name === "tag")
               return {
                 type: "attr",
                 value: path.node
               };
-            }
-            if (disableExtractVariables === true) {
-              if (value) {
-                if (value.type === "StringLiteral" && value.value[0] === "$") {
-                  if (shouldPrintDebug) {
-                    logger.info(
-                      [
-                        `  ! inlining, native disable extract: ${name} =`,
-                        value.value
-                      ].join(" ")
-                    );
-                  }
-                  inlined.set(name, true);
-                  return attr;
-                }
-              }
-            }
-            if (name === "theme") {
-              inlined.set("theme", attr.value);
-              return attr;
-            }
+            if (disableExtractVariables === !0 && value && value.type === "StringLiteral" && value.value[0] === "$")
+              return shouldPrintDebug && logger.info(
+                [
+                  `  ! inlining, native disable extract: ${name} =`,
+                  value.value
+                ].join(" ")
+              ), inlined.set(name, !0), attr;
+            if (name === "theme")
+              return inlined.set("theme", attr.value), attr;
             const styleValue = attemptEvalSafe(value);
             if (!variants[name] && !isValidStyleKey(name, staticConfig)) {
-              let keys = [name];
-              let out = null;
-              out = (0, import_core_node.propMapper)(name, styleValue, propMapperStyleState);
-              if (out) {
-                if (!Array.isArray(out)) {
-                  logger.warn(`Error expected array but got`, out);
-                  couldntParse = true;
-                  shouldDeopt = true;
-                } else {
-                  out = Object.fromEntries(out);
-                  keys = Object.keys(out);
-                }
-              }
-              if (out) {
-                if (isTargetingHTML) {
-                  out = (0, import_react_native_web_internals.createDOMProps)(isTextView ? "span" : "div", out);
-                  delete out.className;
-                }
-                keys = Object.keys(out);
-              }
-              let didInline = false;
+              let keys = [name], out = null;
+              out = propMapper(name, styleValue, propMapperStyleState), out && (Array.isArray(out) ? (out = Object.fromEntries(out), keys = Object.keys(out)) : (logger.warn("Error expected array but got", out), couldntParse = !0, shouldDeopt = !0)), out && (isTargetingHTML && (out = (0, import_react_native_web_internals.createDOMProps)(isTextView ? "span" : "div", out), delete out.className), keys = Object.keys(out));
+              let didInline = !1;
               const attributes = keys.map((key) => {
                 const val = out[key];
-                const isStyle = isValidStyleKey(key, staticConfig);
-                if (isStyle) {
-                  return {
-                    type: "style",
-                    value: { [key]: styleValue },
-                    name: key,
-                    attr: path.node
-                  };
-                }
-                if (import_validHTMLAttributes.validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-") || // this is debug stuff added by vite / new jsx transform
-                key === "__source" || key === "__self") {
-                  return attr;
-                }
-                if (shouldPrintDebug) {
-                  logger.info("  ! inlining, non-static " + key);
-                }
-                didInline = true;
-                inlined.set(key, val);
-                return val;
-              });
-              if (didInline) {
-                if (shouldPrintDebug) {
-                  logger.info(`  bailing flattening due to attributes ${attributes}`);
-                }
-                return attr;
-              }
-              return attributes;
-            }
-            if (styleValue !== import_constants.FAILED_EVAL) {
-              if (inlineWhenUnflattened.has(name)) {
-                inlineWhenUnflattenedOGVals[name] = { styleValue, attr };
-              }
-              if (isValidStyleKey(name, staticConfig)) {
-                if (shouldPrintDebug) {
-                  logger.info(`  style: ${name} = ${styleValue}`);
-                }
-                if (!(name in defaultProps)) {
-                  if (!hasSetOptimized) {
-                    res.optimized++;
-                    hasSetOptimized = true;
-                  }
-                }
-                return {
+                return isValidStyleKey(key, staticConfig) ? {
                   type: "style",
-                  value: { [name]: styleValue },
-                  name,
+                  value: { [key]: styleValue },
+                  name: key,
                   attr: path.node
-                };
-              } else {
-                if (variants[name]) {
-                  variantValues.set(name, styleValue);
-                }
-                inlined.set(name, true);
-                return attr;
-              }
+                } : import_validHTMLAttributes.validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-") || // this is debug stuff added by vite / new jsx transform
+                key === "__source" || key === "__self" ? attr : (shouldPrintDebug && logger.info("  ! inlining, non-static " + key), didInline = !0, inlined.set(key, val), val);
+              });
+              return didInline ? (shouldPrintDebug && logger.info(`  bailing flattening due to attributes ${attributes}`), attr) : attributes;
             }
+            if (styleValue !== import_constants.FAILED_EVAL)
+              return inlineWhenUnflattened.has(name) && (inlineWhenUnflattenedOGVals[name] = { styleValue, attr }), isValidStyleKey(name, staticConfig) ? (shouldPrintDebug && logger.info(`  style: ${name} = ${styleValue}`), name in defaultProps || hasSetOptimized || (res.optimized++, hasSetOptimized = !0), {
+                type: "style",
+                value: { [name]: styleValue },
+                name,
+                attr: path.node
+              }) : (variants[name] && variantValues.set(name, styleValue), inlined.set(name, !0), attr);
             if (t.isBinaryExpression(value)) {
-              if (shouldPrintDebug) {
-                logger.info(` binary expression ${name} = ${value}`);
-              }
-              const { operator, left, right } = value;
-              const lVal = attemptEvalSafe(left);
-              const rVal = attemptEvalSafe(right);
-              if (shouldPrintDebug) {
-                logger.info(
-                  `  evalBinaryExpression lVal ${String(lVal)}, rVal ${String(rVal)}`
-                );
-              }
-              if (lVal !== import_constants.FAILED_EVAL && t.isConditionalExpression(right)) {
+              shouldPrintDebug && logger.info(` binary expression ${name} = ${value}`);
+              const { operator, left, right } = value, lVal = attemptEvalSafe(left), rVal = attemptEvalSafe(right);
+              if (shouldPrintDebug && logger.info(
+                `  evalBinaryExpression lVal ${String(lVal)}, rVal ${String(rVal)}`
+              ), lVal !== import_constants.FAILED_EVAL && t.isConditionalExpression(right)) {
                 const ternary = addBinaryConditional(operator, left, right);
                 if (ternary)
                   return ternary;
@@ -787,43 +478,23 @@ function createExtractor({ logger = console } = { logger: console }) {
                 if (ternary)
                   return ternary;
               }
-              if (shouldPrintDebug) {
-                logger.info(`  evalBinaryExpression cant extract`);
-              }
-              inlined.set(name, true);
-              return attr;
+              return shouldPrintDebug && logger.info("  evalBinaryExpression cant extract"), inlined.set(name, !0), attr;
             }
             const staticConditional = getStaticConditional(value);
-            if (staticConditional) {
-              if (shouldPrintDebug === "verbose") {
-                logger.info(` static conditional ${name} ${value}`);
-              }
-              return { type: "ternary", value: staticConditional };
-            }
+            if (staticConditional)
+              return shouldPrintDebug === "verbose" && logger.info(` static conditional ${name} ${value}`), { type: "ternary", value: staticConditional };
             const staticLogical = getStaticLogical(value);
-            if (staticLogical) {
-              if (shouldPrintDebug === "verbose") {
-                logger.info(` static ternary ${name} =  ${value}`);
-              }
-              return { type: "ternary", value: staticLogical };
-            }
-            inlined.set(name, true);
-            if (shouldPrintDebug) {
-              logger.info(` ! inline no match ${name} ${value}`);
-            }
-            return attr;
+            if (staticLogical)
+              return shouldPrintDebug === "verbose" && logger.info(` static ternary ${name} =  ${value}`), { type: "ternary", value: staticLogical };
+            return inlined.set(name, !0), shouldPrintDebug && logger.info(` ! inline no match ${name} ${value}`), attr;
             function addBinaryConditional(operator, staticExpr, cond) {
               if (getStaticConditional(cond)) {
                 const alt = attemptEval(
                   t.binaryExpression(operator, staticExpr, cond.alternate)
-                );
-                const cons = attemptEval(
+                ), cons = attemptEval(
                   t.binaryExpression(operator, staticExpr, cond.consequent)
                 );
-                if (shouldPrintDebug) {
-                  logger.info(["  binaryConditional", cond.test, cons, alt].join(" "));
-                }
-                return {
+                return shouldPrintDebug && logger.info(["  binaryConditional", cond.test, cons, alt].join(" ")), {
                   type: "ternary",
                   value: {
                     test: cond.test,
@@ -836,10 +507,9 @@ function createExtractor({ logger = console } = { logger: console }) {
               return null;
             }
             function getStaticConditional(value2) {
-              if (t.isConditionalExpression(value2)) {
+              if (t.isConditionalExpression(value2))
                 try {
-                  const aVal = attemptEval(value2.alternate);
-                  const cVal = attemptEval(value2.consequent);
+                  const aVal = attemptEval(value2.alternate), cVal = attemptEval(value2.consequent);
                   if (shouldPrintDebug) {
                     const type = value2.test.type;
                     logger.info(["      static ternary", type, cVal, aVal].join(" "));
@@ -851,89 +521,61 @@ function createExtractor({ logger = console } = { logger: console }) {
                     alternate: { [name]: aVal }
                   };
                 } catch (err) {
-                  if (shouldPrintDebug) {
-                    logger.info(["       cant eval ternary", err.message].join(" "));
-                  }
+                  shouldPrintDebug && logger.info(["       cant eval ternary", err.message].join(" "));
                 }
-              }
               return null;
             }
             function getStaticLogical(value2) {
-              if (t.isLogicalExpression(value2)) {
-                if (value2.operator === "&&") {
-                  try {
-                    const val = attemptEval(value2.right);
-                    if (shouldPrintDebug) {
-                      logger.info(["  staticLogical", value2.left, name, val].join(" "));
-                    }
-                    return {
-                      test: value2.left,
-                      remove,
-                      consequent: { [name]: val },
-                      alternate: null
-                    };
-                  } catch (err) {
-                    if (shouldPrintDebug) {
-                      logger.info(["  cant static eval logical", err].join(" "));
-                    }
-                  }
+              if (t.isLogicalExpression(value2) && value2.operator === "&&")
+                try {
+                  const val = attemptEval(value2.right);
+                  return shouldPrintDebug && logger.info(["  staticLogical", value2.left, name, val].join(" ")), {
+                    test: value2.left,
+                    remove,
+                    consequent: { [name]: val },
+                    alternate: null
+                  };
+                } catch (err) {
+                  shouldPrintDebug && logger.info(["  cant static eval logical", err].join(" "));
                 }
-              }
               return null;
             }
-          }, isStaticObject2 = function(obj) {
+          }, isStaticObject = function(obj) {
             return t.isObjectExpression(obj) && obj.properties.every((prop) => {
-              if (!t.isObjectProperty(prop)) {
-                logger.info(["not object prop", prop].join(" "));
-                return false;
-              }
-              const propName = prop.key["name"];
-              if (!isValidStyleKey(propName, staticConfig) && propName !== "tag") {
-                if (shouldPrintDebug) {
-                  logger.info(["  not a valid style prop!", propName].join(" "));
-                }
-                return false;
-              }
-              return true;
+              if (!t.isObjectProperty(prop))
+                return logger.info(["not object prop", prop].join(" ")), !1;
+              const propName = prop.key.name;
+              return !isValidStyleKey(propName, staticConfig) && propName !== "tag" ? (shouldPrintDebug && logger.info(["  not a valid style prop!", propName].join(" ")), !1) : !0;
             });
-          }, createTernariesFromObjectProperties2 = function(test, side, ternaryPartial = {}) {
-            if (!side) {
+          }, createTernariesFromObjectProperties = function(test, side, ternaryPartial = {}) {
+            if (!side)
               return null;
-            }
-            if (!isStaticObject2(side)) {
+            if (!isStaticObject(side))
               throw new Error("not extractable");
-            }
             return side.properties.flatMap((property) => {
-              if (!t.isObjectProperty(property)) {
+              if (!t.isObjectProperty(property))
                 throw new Error("expected object property");
-              }
               if (t.isIdentifier(property.key)) {
-                const key = property.key.name;
-                const mediaQueryKey = key.slice(1);
-                const isMediaQuery = key[0] === "$" && import_core_node.mediaQueryConfig[mediaQueryKey];
-                if (isMediaQuery) {
+                const key = property.key.name, mediaQueryKey = key.slice(1);
+                if (key[0] === "$" && mediaQueryConfig[mediaQueryKey])
                   if (t.isExpression(property.value)) {
-                    const ternaries2 = createTernariesFromObjectProperties2(
+                    const ternaries2 = createTernariesFromObjectProperties(
                       t.stringLiteral(mediaQueryKey),
                       property.value,
                       {
                         inlineMediaQuery: mediaQueryKey
                       }
                     );
-                    if (ternaries2) {
+                    if (ternaries2)
                       return ternaries2.map((value) => ({
                         ...ternaryPartial,
                         ...value,
                         // ensure media query test stays on left side (see getMediaQueryTernary)
                         test: t.logicalExpression("&&", value.test, test)
                       }));
-                    } else {
-                      logger.info(["\u26A0\uFE0F no ternaries?", property].join(" "));
-                    }
-                  } else {
+                    logger.info(["\u26A0\uFE0F no ternaries?", property].join(" "));
+                  } else
                     logger.info(["\u26A0\uFE0F not expression", property].join(" "));
-                  }
-                }
               }
               if (t.isConditionalExpression(property.value)) {
                 const [truthy, falsy] = [
@@ -969,8 +611,7 @@ function createExtractor({ logger = console } = { logger: console }) {
               }
               const obj = t.objectExpression([
                 t.objectProperty(property.key, property.value)
-              ]);
-              const consequent = attemptEval(obj);
+              ]), consequent = attemptEval(obj);
               return createTernary({
                 remove() {
                 },
@@ -980,103 +621,67 @@ function createExtractor({ logger = console } = { logger: console }) {
                 alternate: null
               });
             });
-          }, mergeToEnd2 = function(obj, key, val) {
-            if (key in obj) {
-              delete obj[key];
-            }
-            obj[key] = val;
-          }, expandStylesAndRemoveNullishValuesWithoutVariants2 = function(style) {
+          }, mergeToEnd = function(obj, key, val) {
+            key in obj && delete obj[key], obj[key] = val;
+          }, expandStylesAndRemoveNullishValuesWithoutVariants = function(style) {
             let res2 = {};
-            for (const key in style) {
-              if (staticConfig.variants && key in staticConfig.variants) {
-                mergeToEnd2(res2, key, style[key]);
-              } else {
-                const expanded = (0, import_core_node.expandStylesAndRemoveNullishValues)({ [key]: style[key] });
-                for (const key2 in expanded) {
-                  mergeToEnd2(res2, key2, expanded[key2]);
-                }
+            for (const key in style)
+              if (staticConfig.variants && key in staticConfig.variants)
+                mergeToEnd(res2, key, style[key]);
+              else {
+                const expanded = expandStylesAndRemoveNullishValues({ [key]: style[key] });
+                for (const key2 in expanded)
+                  mergeToEnd(res2, key2, expanded[key2]);
               }
-            }
             return res2;
-          }, mergeStyles2 = function(prev2, next) {
-            for (const key in next) {
-              if (import_core_node.pseudoDescriptors[key]) {
-                prev2[key] = prev2[key] || {};
-                Object.assign(prev2[key], next[key]);
-              } else {
-                mergeToEnd2(prev2, key, next[key]);
-              }
-            }
+          }, mergeStyles = function(prev2, next) {
+            for (const key in next)
+              pseudoDescriptors[key] ? (prev2[key] = prev2[key] || {}, Object.assign(prev2[key], next[key])) : mergeToEnd(prev2, key, next[key]);
           };
-          var evaluateAttribute = evaluateAttribute2, isStaticObject = isStaticObject2, createTernariesFromObjectProperties = createTernariesFromObjectProperties2, mergeToEnd = mergeToEnd2, expandStylesAndRemoveNullishValuesWithoutVariants = expandStylesAndRemoveNullishValuesWithoutVariants2, mergeStyles = mergeStyles2;
-          const { staticConfig } = component;
-          const defaultProps = { ...staticConfig.defaultProps || {} };
-          const variants = staticConfig.variants || {};
-          const isTextView = staticConfig.isText || false;
-          const validStyles = (staticConfig == null ? void 0 : staticConfig.validStyles) ?? {};
+          const { staticConfig } = component, defaultProps = { ...staticConfig.defaultProps || {} }, variants = staticConfig.variants || {}, isTextView = staticConfig.isText || !1, validStyles = staticConfig?.validStyles ?? {};
           let tagName = defaultProps.tag ?? (isTextView ? "span" : "div");
           traversePath.get("openingElement").get("attributes").forEach((path) => {
             const attr = path.node;
-            if (t.isJSXSpreadAttribute(attr))
-              return;
-            if (attr.name.name !== "tag")
+            if (t.isJSXSpreadAttribute(attr) || attr.name.name !== "tag")
               return;
             const val = attr.value;
-            if (!t.isStringLiteral(val))
-              return;
-            tagName = val.value;
-          });
-          if (shouldPrintDebug === "verbose") {
-            console.log(` Start tag ${tagName}`);
-          }
-          const flatNode = getFlattenedNode == null ? void 0 : getFlattenedNode({ isTextView, tag: tagName });
-          const inlineProps = /* @__PURE__ */ new Set([
+            t.isStringLiteral(val) && (tagName = val.value);
+          }), shouldPrintDebug === "verbose" && console.log(` Start tag ${tagName}`);
+          const flatNode = getFlattenedNode?.({ isTextView, tag: tagName }), inlineProps = /* @__PURE__ */ new Set([
             // adding some always inline props
             "dataSet",
             ...restProps.inlineProps || [],
             ...staticConfig.inlineProps || []
-          ]);
-          const deoptProps = /* @__PURE__ */ new Set([
+          ]), deoptProps = /* @__PURE__ */ new Set([
             // always de-opt animation these
             "animation",
             "disableOptimization",
             // when using a non-CSS driver, de-opt on enterStyle/exitStyle
-            ...(tamaguiConfig == null ? void 0 : tamaguiConfig.animations.isReactNative) ? ["enterStyle", "exitStyle"] : [],
+            ...tamaguiConfig?.animations.isReactNative ? ["enterStyle", "exitStyle"] : [],
             ...restProps.deoptProps || [],
             ...staticConfig.deoptProps || []
-          ]);
-          const inlineWhenUnflattened = /* @__PURE__ */ new Set([
+          ]), inlineWhenUnflattened = /* @__PURE__ */ new Set([
             ...staticConfig.inlineWhenUnflattened || []
-          ]);
-          const staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
+          ]), staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
             traversePath.scope,
             importsWhitelist,
             sourcePath,
             bindingCache,
             shouldPrintDebug
-          );
-          const attemptEval = !evaluateVars ? import_evaluateAstNode.evaluateAstNode : (0, import_createEvaluator.createEvaluator)({
+          ), attemptEval = evaluateVars ? (0, import_createEvaluator.createEvaluator)({
             props: propsWithFileInfo,
             staticNamespace,
             sourcePath,
             traversePath,
             shouldPrintDebug
-          });
-          const attemptEvalSafe = (0, import_createEvaluator.createSafeEvaluator)(attemptEval);
-          if (shouldPrintDebug) {
-            logger.info(`  staticNamespace ${Object.keys(staticNamespace).join(", ")}`);
-          }
-          if (couldntParse) {
+          }) : import_evaluateAstNode.evaluateAstNode, attemptEvalSafe = (0, import_createEvaluator.createSafeEvaluator)(attemptEval);
+          if (shouldPrintDebug && logger.info(`  staticNamespace ${Object.keys(staticNamespace).join(", ")}`), couldntParse)
             return;
-          }
           tm.mark("jsx-element-flattened", !!shouldPrintDebug);
-          let attrs = [];
-          let shouldDeopt = false;
-          const inlined = /* @__PURE__ */ new Map();
-          const variantValues = /* @__PURE__ */ new Map();
-          let hasSetOptimized = false;
-          const inlineWhenUnflattenedOGVals = {};
-          const propMapperStyleState = {
+          let attrs = [], shouldDeopt = !1;
+          const inlined = /* @__PURE__ */ new Map(), variantValues = /* @__PURE__ */ new Map();
+          let hasSetOptimized = !1;
+          const inlineWhenUnflattenedOGVals = {}, propMapperStyleState = {
             staticConfig,
             usedKeys: {},
             classNames: {},
@@ -1093,342 +698,217 @@ function createExtractor({ logger = console } = { logger: console }) {
             },
             debug: shouldPrintDebug
           };
-          attrs = traversePath.get("openingElement").get("attributes").flatMap((path) => {
-            var _a3;
+          if (attrs = traversePath.get("openingElement").get("attributes").flatMap((path) => {
             try {
-              const res2 = evaluateAttribute2(path);
-              tm.mark("jsx-element-evaluate-attr", !!shouldPrintDebug);
-              if (!res2) {
-                path.remove();
-              }
-              return res2;
+              const res2 = evaluateAttribute(path);
+              return tm.mark("jsx-element-evaluate-attr", !!shouldPrintDebug), res2 || path.remove(), res2;
             } catch (err) {
-              if (shouldPrintDebug) {
-                logger.info(
-                  [
-                    "Recoverable error extracting attribute",
-                    err.message,
-                    shouldPrintDebug === "verbose" ? err.stack : ""
-                  ].join(" ")
-                );
-                if (shouldPrintDebug === "verbose") {
-                  logger.info(`node ${(_a3 = path.node) == null ? void 0 : _a3.type}`);
-                }
-              }
-              inlined.set(`${Math.random()}`, "spread");
-              return {
+              return shouldPrintDebug && (logger.info(
+                [
+                  "Recoverable error extracting attribute",
+                  err.message,
+                  shouldPrintDebug === "verbose" ? err.stack : ""
+                ].join(" ")
+              ), shouldPrintDebug === "verbose" && logger.info(`node ${path.node?.type}`)), inlined.set(`${Math.random()}`, "spread"), {
                 type: "attr",
                 value: path.node
               };
             }
-          }).flat(4).filter(import_extractHelpers.isPresent);
-          if (shouldPrintDebug) {
-            logger.info(
-              ["  - attrs (before):\n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")
-            );
-          }
-          if (couldntParse || shouldDeopt) {
-            if (shouldPrintDebug) {
-              logger.info(
-                [`  avoid optimizing:`, { couldntParse, shouldDeopt }].join(" ")
-              );
-            }
-            node.attributes = ogAttributes;
+          }).flat(4).filter(import_extractHelpers.isPresent), shouldPrintDebug && logger.info(
+            [`  - attrs (before):
+`, (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")
+          ), couldntParse || shouldDeopt) {
+            shouldPrintDebug && logger.info(
+              ["  avoid optimizing:", { couldntParse, shouldDeopt }].join(" ")
+            ), node.attributes = ogAttributes;
             return;
           }
           const parentFn = (0, import_findTopmostFunction.findTopmostFunction)(traversePath);
-          if (parentFn) {
-            modifiedComponents.add(parentFn);
-          }
+          parentFn && modifiedComponents.add(parentFn);
           let ternaries = [];
           attrs = attrs.reduce((out, cur) => {
             const next = attrs[attrs.indexOf(cur) + 1];
-            if (cur.type === "ternary") {
-              ternaries.push(cur.value);
-            }
-            if ((!next || next.type !== "ternary") && ternaries.length) {
+            if (cur.type === "ternary" && ternaries.push(cur.value), (!next || next.type !== "ternary") && ternaries.length) {
               const normalized = (0, import_normalizeTernaries.normalizeTernaries)(ternaries).map(
-                ({ alternate, consequent, ...rest }) => {
-                  return {
-                    type: "ternary",
-                    value: {
-                      ...rest,
-                      alternate: alternate || null,
-                      consequent: consequent || null
-                    }
-                  };
-                }
+                ({ alternate, consequent, ...rest }) => ({
+                  type: "ternary",
+                  value: {
+                    ...rest,
+                    alternate: alternate || null,
+                    consequent: consequent || null
+                  }
+                })
               );
               try {
                 return [...out, ...normalized];
               } finally {
-                if (shouldPrintDebug) {
-                  logger.info(
-                    `    normalizeTernaries (${ternaries.length} => ${normalized.length})`
-                  );
-                }
-                ternaries = [];
+                shouldPrintDebug && logger.info(
+                  `    normalizeTernaries (${ternaries.length} => ${normalized.length})`
+                ), ternaries = [];
               }
             }
-            if (cur.type === "ternary") {
-              return out;
-            }
-            out.push(cur);
-            return out;
+            return cur.type === "ternary" || out.push(cur), out;
           }, []).flat();
           const hasSpread = attrs.some(
             (x) => x.type === "attr" && t.isJSXSpreadAttribute(x.value)
-          );
-          const hasOnlyStringChildren = !hasSpread && (node.selfClosing || traversePath.node.children && traversePath.node.children.every((x) => x.type === "JSXText"));
-          const themeVal = inlined.get("theme");
-          if (target !== "native") {
-            inlined.delete("theme");
-          }
+          ), hasOnlyStringChildren = !hasSpread && (node.selfClosing || traversePath.node.children && traversePath.node.children.every((x) => x.type === "JSXText")), themeVal = inlined.get("theme");
+          target !== "native" && inlined.delete("theme");
           for (const [key] of [...inlined]) {
-            const isStaticObjectVariant = ((_a2 = staticConfig.variants) == null ? void 0 : _a2[key]) && variantValues.has(key);
-            if (INLINE_EXTRACTABLE[key] || isStaticObjectVariant) {
-              inlined.delete(key);
-            }
+            const isStaticObjectVariant = staticConfig.variants?.[key] && variantValues.has(key);
+            (INLINE_EXTRACTABLE[key] || isStaticObjectVariant) && inlined.delete(key);
           }
           const canFlattenProps = inlined.size === 0;
-          let shouldFlatten = Boolean(
-            flatNode && !shouldDeopt && canFlattenProps && !hasSpread && !staticConfig.isStyledHOC && !staticConfig.isHOC && !staticConfig.isReactNative && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true)
-          );
-          const shouldWrapTheme = shouldFlatten && themeVal;
-          const usedThemeKeys = /* @__PURE__ */ new Set();
-          if (disableExtractVariables) {
-            themeAccessListeners.add((key) => {
-              shouldFlatten = false;
-              usedThemeKeys.add(key);
-              if (shouldPrintDebug === "verbose") {
-                logger.info([" ! accessing theme key, avoid flatten", key].join(" "));
-              }
-            });
-          }
-          if (shouldPrintDebug) {
+          let shouldFlatten = !!(flatNode && !shouldDeopt && canFlattenProps && !hasSpread && !staticConfig.isStyledHOC && !staticConfig.isHOC && !staticConfig.isReactNative && staticConfig.neverFlatten !== !0 && (staticConfig.neverFlatten !== "jsx" || hasOnlyStringChildren));
+          const shouldWrapTheme = shouldFlatten && themeVal, usedThemeKeys = /* @__PURE__ */ new Set();
+          if (disableExtractVariables && themeAccessListeners.add((key) => {
+            shouldFlatten = !1, usedThemeKeys.add(key), shouldPrintDebug === "verbose" && logger.info([" ! accessing theme key, avoid flatten", key].join(" "));
+          }), shouldPrintDebug)
             try {
               logger.info([" flatten?", shouldFlatten, (0, import_extractHelpers.objToStr)({ hasSpread, shouldDeopt, canFlattenProps, shouldWrapTheme, hasOnlyStringChildren }), "inlined", inlined.size, [...inlined]].join(" "));
             } catch {
             }
-          }
-          if (shouldFlatten && shouldWrapTheme) {
-            if (!programPath) {
-              console.warn(
-                `No program path found, avoiding importing flattening / importing theme in ${sourcePath}`
-              );
-            } else {
-              if (shouldPrintDebug) {
-                logger.info(["  - wrapping theme", themeVal].join(" "));
-              }
-              attrs = attrs.filter(
-                (x) => x.type === "attr" && t.isJSXAttribute(x.value) && x.value.name.name === "theme" ? false : true
-              );
-              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"), themeVal.value)
-                  ]),
-                  t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")),
-                  [traversePath.node]
+          if (shouldFlatten && shouldWrapTheme && (programPath ? (shouldPrintDebug && logger.info(["  - wrapping theme", themeVal].join(" ")), attrs = attrs.filter(
+            (x) => !(x.type === "attr" && t.isJSXAttribute(x.value) && x.value.name.name === "theme")
+          ), hasImportedTheme || (hasImportedTheme = !0, programPath.node.body.push(
+            t.importDeclaration(
+              [
+                t.importSpecifier(
+                  t.identifier("_TamaguiTheme"),
+                  t.identifier("Theme")
                 )
-              );
-            }
-          }
-          if (shouldFlatten) {
+              ],
+              t.stringLiteral("@tamagui/web")
+            )
+          )), traversePath.replaceWith(
+            t.jsxElement(
+              t.jsxOpeningElement(t.jsxIdentifier("_TamaguiTheme"), [
+                t.jsxAttribute(t.jsxIdentifier("name"), themeVal.value)
+              ]),
+              t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")),
+              [traversePath.node]
+            )
+          )) : console.warn(
+            `No program path found, avoiding importing flattening / importing theme in ${sourcePath}`
+          )), shouldFlatten) {
             const defaultStyleAttrs = Object.keys(defaultProps).flatMap((key) => {
-              if (!isValidStyleKey(key, staticConfig)) {
+              if (!isValidStyleKey(key, staticConfig))
                 return [];
-              }
-              const value = defaultProps[key];
-              const name = (tamaguiConfig == null ? void 0 : tamaguiConfig.shorthands[key]) || key;
+              const value = defaultProps[key], name = tamaguiConfig?.shorthands[key] || key;
               if (value === void 0) {
                 logger.warn(
                   `\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`
-                );
-                shouldDeopt = true;
+                ), shouldDeopt = !0;
                 return;
               }
-              const attr = {
+              return {
                 type: "style",
                 name,
                 value: { [name]: value }
               };
-              return attr;
             });
-            if (defaultStyleAttrs.length) {
-              attrs = [...defaultStyleAttrs, ...attrs];
-            }
+            defaultStyleAttrs.length && (attrs = [...defaultStyleAttrs, ...attrs]);
           }
           if (shouldDeopt || !shouldFlatten) {
-            if (shouldPrintDebug) {
-              logger.info(`Deopting ${shouldDeopt} ${shouldFlatten}`);
-            }
-            node.attributes = ogAttributes;
+            shouldPrintDebug && 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(
-                " "
-              )
-            );
-          }
+          shouldPrintDebug && logger.info(
+            [`  - attrs (flattened): 
+`, (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
+              " "
+            )
+          );
           let foundStaticProps = {};
           for (const key in attrs) {
             const cur = attrs[key];
             if (cur.type === "style") {
-              const expanded = expandStylesAndRemoveNullishValuesWithoutVariants2(
+              const expanded = expandStylesAndRemoveNullishValuesWithoutVariants(
                 cur.value
               );
-              for (const key2 in expanded) {
-                mergeToEnd2(foundStaticProps, key2, expanded[key2]);
-              }
+              for (const key2 in expanded)
+                mergeToEnd(foundStaticProps, key2, expanded[key2]);
               continue;
             }
             if (cur.type === "attr") {
-              if (t.isJSXSpreadAttribute(cur.value)) {
-                continue;
-              }
-              if (!t.isJSXIdentifier(cur.value.name)) {
+              if (t.isJSXSpreadAttribute(cur.value) || !t.isJSXIdentifier(cur.value.name))
                 continue;
-              }
-              const key2 = cur.value.name.name;
-              const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
-              if (value !== import_constants.FAILED_EVAL) {
-                mergeToEnd2(foundStaticProps, key2, value);
-              }
+              const key2 = cur.value.name.name, value = attemptEvalSafe(cur.value.value || t.booleanLiteral(!0));
+              value !== import_constants.FAILED_EVAL && mergeToEnd(foundStaticProps, key2, value);
             }
           }
           const completeProps = {};
-          for (const key in defaultProps) {
-            if (!(key in foundStaticProps)) {
-              completeProps[key] = defaultProps[key];
-            }
-          }
-          for (const key in foundStaticProps) {
+          for (const key in defaultProps)
+            key in foundStaticProps || (completeProps[key] = defaultProps[key]);
+          for (const key in foundStaticProps)
             completeProps[key] = foundStaticProps[key];
-          }
           attrs = attrs.reduce((acc, cur) => {
             if (!cur)
               return acc;
-            if (cur.type === "attr" && !t.isJSXSpreadAttribute(cur.value)) {
-              if (shouldFlatten) {
-                const name = cur.value.name.name;
-                if (typeof name === "string") {
-                  if (name === "tag") {
-                    return acc;
+            if (cur.type === "attr" && !t.isJSXSpreadAttribute(cur.value) && shouldFlatten) {
+              const name = cur.value.name.name;
+              if (typeof name == "string") {
+                if (name === "tag")
+                  return acc;
+                if (variants[name] && variantValues.has(name)) {
+                  const styleState = {
+                    ...propMapperStyleState,
+                    props: completeProps,
+                    curProps: completeProps
+                  };
+                  let out = Object.fromEntries(
+                    propMapper(name, variantValues.get(name), styleState) || []
+                  );
+                  if (out && isTargetingHTML) {
+                    const cn = out.className;
+                    out = (0, import_react_native_web_internals.createDOMProps)(isTextView ? "span" : "div", out), out.className = cn;
                   }
-                  if (variants[name] && variantValues.has(name)) {
-                    const styleState = {
-                      ...propMapperStyleState,
-                      props: completeProps,
-                      curProps: completeProps
-                    };
-                    let out = Object.fromEntries(
-                      (0, import_core_node.propMapper)(name, variantValues.get(name), styleState) || []
-                    );
-                    if (out && isTargetingHTML) {
-                      const cn = out.className;
-                      out = (0, import_react_native_web_internals.createDOMProps)(isTextView ? "span" : "div", out);
-                      out.className = cn;
-                    }
-                    if (shouldPrintDebug) {
-                      logger.info([" - expanded variant", name, out].join(" "));
-                    }
-                    for (const key2 in out) {
-                      const value2 = out[key2];
-                      if (isValidStyleKey(key2, staticConfig)) {
-                        acc.push({
-                          type: "style",
-                          value: { [key2]: value2 },
-                          name: key2,
-                          attr: cur.value
-                        });
-                      } else {
-                        acc.push({
-                          type: "attr",
-                          value: t.jsxAttribute(
-                            t.jsxIdentifier(key2),
-                            t.jsxExpressionContainer(
-                              typeof value2 === "string" ? t.stringLiteral(value2) : (0, import_literalToAst.literalToAst)(value2)
-                            )
-                          )
-                        });
-                      }
-                    }
+                  shouldPrintDebug && logger.info([" - expanded variant", name, out].join(" "));
+                  for (const key2 in out) {
+                    const value2 = out[key2];
+                    isValidStyleKey(key2, staticConfig) ? acc.push({
+                      type: "style",
+                      value: { [key2]: value2 },
+                      name: key2,
+                      attr: cur.value
+                    }) : acc.push({
+                      type: "attr",
+                      value: t.jsxAttribute(
+                        t.jsxIdentifier(key2),
+                        t.jsxExpressionContainer(
+                          typeof value2 == "string" ? t.stringLiteral(value2) : (0, import_literalToAst.literalToAst)(value2)
+                        )
+                      )
+                    });
                   }
                 }
               }
             }
-            if (cur.type !== "style") {
-              acc.push(cur);
-              return acc;
-            }
+            if (cur.type !== "style")
+              return acc.push(cur), acc;
             let key = Object.keys(cur.value)[0];
-            const value = cur.value[key];
-            const fullKey = tamaguiConfig == null ? void 0 : tamaguiConfig.shorthands[key];
-            if (fullKey) {
-              cur.value = { [fullKey]: value };
-              key = fullKey;
-            }
-            if (disableExtractVariables) {
-              if (value[0] === "$" && (usedThemeKeys.has(key) || usedThemeKeys.has(fullKey))) {
-                if (shouldPrintDebug) {
-                  logger.info([`   keeping variable inline: ${key} =`, value].join(" "));
-                }
-                acc.push({
-                  type: "attr",
-                  value: t.jsxAttribute(
-                    t.jsxIdentifier(key),
-                    t.jsxExpressionContainer(t.stringLiteral(value))
-                  )
-                });
-                return acc;
-              }
-            }
-            acc.push(cur);
-            return acc;
-          }, []);
-          tm.mark("jsx-element-expanded", !!shouldPrintDebug);
-          if (shouldPrintDebug) {
-            logger.info(
-              ["  - attrs (expanded): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
-                " "
+            const value = cur.value[key], fullKey = tamaguiConfig?.shorthands[key];
+            return fullKey && (cur.value = { [fullKey]: value }, key = fullKey), disableExtractVariables && value[0] === "$" && (usedThemeKeys.has(key) || usedThemeKeys.has(fullKey)) ? (shouldPrintDebug && logger.info([`   keeping variable inline: ${key} =`, value].join(" ")), acc.push({
+              type: "attr",
+              value: t.jsxAttribute(
+                t.jsxIdentifier(key),
+                t.jsxExpressionContainer(t.stringLiteral(value))
               )
-            );
-          }
+            }), acc) : (acc.push(cur), acc);
+          }, []), tm.mark("jsx-element-expanded", !!shouldPrintDebug), shouldPrintDebug && logger.info(
+            [`  - attrs (expanded): 
+`, (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
+              " "
+            )
+          );
           let prev = null;
-          const getProps = (props, includeProps = false, debugName = "") => {
-            if (!props) {
-              if (shouldPrintDebug)
-                logger.info([" getProps() no props"].join(" "));
-              return {};
-            }
-            if (excludeProps == null ? void 0 : excludeProps.size) {
-              for (const key in props) {
-                if (excludeProps.has(key)) {
-                  if (shouldPrintDebug)
-                    logger.info([" delete excluded", key].join(" "));
-                  delete props[key];
-                }
-              }
-            }
+          const getProps = (props, includeProps = !1, debugName = "") => {
+            if (!props)
+              return shouldPrintDebug && logger.info([" getProps() no props"].join(" ")), {};
+            if (excludeProps?.size)
+              for (const key in props)
+                excludeProps.has(key) && (shouldPrintDebug && logger.info([" delete excluded", key].join(" ")), delete props[key]);
             try {
-              const out = (0, import_core_node.getSplitStyles)(
+              const out = getSplitStyles(
                 props,
                 staticConfig,
                 defaultTheme,
@@ -1436,226 +916,124 @@ function createExtractor({ logger = console } = { logger: console }) {
                 componentState,
                 {
                   ...styleProps,
+                  noClassNames: !0,
                   fallbackProps: completeProps
                 },
                 void 0,
                 void 0,
                 void 0,
                 debugPropValue || shouldPrintDebug
-              );
-              const outProps = {
+              ), outProps = {
                 ...includeProps ? out.viewProps : {},
                 ...out.style,
                 ...out.pseudos
               };
-              if (shouldPrintDebug) {
-                logger.info(`(${debugName})`);
-                logger.info(`
-       getProps (props in): ${(0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(props))}`);
-                logger.info(`
-       getProps (outProps): ${(0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(outProps))}`);
-              }
-              if (out.fontFamily) {
-                (0, import_propsToFontFamilyCache.setPropsToFontFamily)(outProps, out.fontFamily);
-                if (shouldPrintDebug) {
-                  logger.info(`
-      \u{1F4AC} new font fam: ${out.fontFamily}`);
-                }
-              }
-              return outProps;
+              return shouldPrintDebug && (logger.info(`(${debugName})`), logger.info(`
+       getProps (props in): ${(0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(props))}`), logger.info(`
+       getProps (outProps): ${(0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(outProps))}`)), out.fontFamily && ((0, import_propsToFontFamilyCache.setPropsToFontFamily)(outProps, out.fontFamily), shouldPrintDebug && logger.info(`
+      \u{1F4AC} new font fam: ${out.fontFamily}`)), outProps;
             } catch (err) {
-              logger.info(["error", err.message, err.stack].join(" "));
-              return {};
+              return logger.info(["error", err.message, err.stack].join(" ")), {};
             }
           };
-          if (shouldFlatten) {
-            attrs.unshift({
-              type: "style",
-              value: defaultProps
-            });
-          }
-          attrs = attrs.reduce((acc, cur) => {
+          shouldFlatten && attrs.unshift({
+            type: "style",
+            value: defaultProps
+          }), attrs = attrs.reduce((acc, cur) => {
             if (cur.type === "style") {
-              const key = Object.keys(cur.value)[0];
-              const value = cur.value[key];
-              const shouldKeepOriginalAttr = (
+              const key = Object.keys(cur.value)[0], value = cur.value[key];
+              if (
                 // !isStyleAndAttr[key] &&
                 !shouldFlatten && // de-opt if non-style
-                !validStyles[key] && !import_core_node.pseudoDescriptors[key] && !(key.startsWith("data-") || key.startsWith("aria-"))
-              );
-              if (shouldKeepOriginalAttr) {
-                if (shouldPrintDebug) {
-                  logger.info(["     - keeping as non-style", key].join(" "));
-                }
-                prev = cur;
-                acc.push({
+                !validStyles[key] && !pseudoDescriptors[key] && !(key.startsWith("data-") || key.startsWith("aria-"))
+              )
+                return shouldPrintDebug && logger.info(["     - keeping as non-style", key].join(" ")), prev = cur, acc.push({
                   type: "attr",
                   value: t.jsxAttribute(
                     t.jsxIdentifier(key),
                     t.jsxExpressionContainer(
-                      typeof value === "string" ? t.stringLiteral(value) : (0, import_literalToAst.literalToAst)(value)
+                      typeof value == "string" ? t.stringLiteral(value) : (0, import_literalToAst.literalToAst)(value)
                     )
                   )
-                });
-                acc.push(cur);
-                return acc;
-              }
-              if ((prev == null ? void 0 : prev.type) === "style") {
-                mergeStyles2(prev.value, cur.value);
-                return acc;
-              }
+                }), acc.push(cur), acc;
+              if (prev?.type === "style")
+                return mergeStyles(prev.value, cur.value), acc;
             }
-            prev = cur;
-            acc.push(cur);
-            return acc;
-          }, []);
-          if (shouldPrintDebug) {
-            logger.info(
-              [
-                "  - attrs (combined \u{1F500}): \n",
-                (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))
-              ].join(" ")
-            );
-          }
+            return prev = cur, acc.push(cur), acc;
+          }, []), shouldPrintDebug && logger.info(
+            [
+              `  - attrs (combined \u{1F500}): 
+`,
+              (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))
+            ].join(" ")
+          );
           let getStyleError = null;
-          for (const attr of attrs) {
+          for (const attr of attrs)
             try {
-              if (shouldPrintDebug) {
-                console.log(`  Processing ${attr.type}:`);
-              }
-              switch (attr.type) {
+              switch (shouldPrintDebug && console.log(`  Processing ${attr.type}:`), attr.type) {
                 case "ternary": {
-                  const a = getProps(attr.value.alternate, false, "ternary.alternate");
-                  const c = getProps(attr.value.consequent, false, "ternary.consequent");
-                  if (a)
-                    attr.value.alternate = a;
-                  if (c)
-                    attr.value.consequent = c;
-                  if (shouldPrintDebug)
-                    logger.info(["     => tern ", (0, import_extractHelpers.attrStr)(attr)].join(" "));
+                  const a = getProps(attr.value.alternate, !1, "ternary.alternate"), c = getProps(attr.value.consequent, !1, "ternary.consequent");
+                  a && (attr.value.alternate = a), c && (attr.value.consequent = c), shouldPrintDebug && logger.info(["     => tern ", (0, import_extractHelpers.attrStr)(attr)].join(" "));
                   continue;
                 }
                 case "style": {
-                  const styles = getProps(attr.value, false, "style");
-                  if (styles) {
-                    attr.value = styles;
-                  }
-                  if (shouldPrintDebug)
-                    logger.info(["  * styles (in)", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(attr.value))].join(" "));
-                  if (shouldPrintDebug)
-                    logger.info(["  * styles (out)", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(styles))].join(" "));
+                  const styles = getProps(attr.value, !1, "style");
+                  styles && (attr.value = styles), shouldPrintDebug && logger.info(["  * styles (in)", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(attr.value))].join(" ")), shouldPrintDebug && logger.info(["  * styles (out)", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(styles))].join(" "));
                   continue;
                 }
-                case "attr": {
+                case "attr":
                   if (shouldFlatten && t.isJSXAttribute(attr.value)) {
                     const key = attr.value.name.name;
-                    if (key === "style" || key === "className" || key === "tag") {
+                    if (key === "style" || key === "className" || key === "tag")
                       continue;
-                    }
                     const value = attemptEvalSafe(
-                      attr.value.value || t.booleanLiteral(true)
+                      attr.value.value || t.booleanLiteral(!0)
                     );
                     if (value !== import_constants.FAILED_EVAL) {
-                      const outProps = getProps({ [key]: value }, true, `attr.${key}`);
-                      const outKey = Object.keys(outProps)[0];
+                      const outProps = getProps({ [key]: value }, !0, `attr.${key}`), outKey = Object.keys(outProps)[0];
                       if (outKey) {
                         const outVal = outProps[outKey];
                         attr.value = t.jsxAttribute(
                           t.jsxIdentifier(outKey),
                           t.jsxExpressionContainer(
-                            typeof outVal === "string" ? t.stringLiteral(outVal) : (0, import_literalToAst.literalToAst)(outVal)
+                            typeof outVal == "string" ? t.stringLiteral(outVal) : (0, import_literalToAst.literalToAst)(outVal)
                           )
                         );
                       }
                     }
                   }
-                }
               }
             } catch (err) {
               getStyleError = err;
             }
-          }
-          if (shouldPrintDebug) {
-            logger.info(["  - attrs (ternaries/combined):\n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" "));
-          }
-          tm.mark("jsx-element-styles", !!shouldPrintDebug);
-          if (getStyleError) {
-            logger.info([" \u26A0\uFE0F postprocessing error, deopt", getStyleError].join(" "));
-            node.attributes = ogAttributes;
-            return null;
-          }
+          if (shouldPrintDebug && logger.info([`  - attrs (ternaries/combined):
+`, (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" ")), tm.mark("jsx-element-styles", !!shouldPrintDebug), getStyleError)
+            return logger.info([" \u26A0\uFE0F postprocessing error, deopt", getStyleError].join(" ")), node.attributes = ogAttributes, null;
           const existingStyleKeys = /* @__PURE__ */ new Set();
           for (let i = attrs.length - 1; i >= 0; i--) {
             const attr = attrs[i];
-            if (shouldFlatten) {
-              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)) {
-                  if (shouldPrintDebug) {
-                    logger.info([`  >> delete existing ${key}`].join(" "));
-                  }
-                  delete attr.value[key];
-                } else {
-                  existingStyleKeys.add(key);
-                }
-              }
+            if (shouldFlatten && attr.type === "attr" && t.isJSXAttribute(attr.value) && t.isJSXIdentifier(attr.value.name)) {
+              const name = attr.value.name.name;
+              INLINE_EXTRACTABLE[name] && (attr.value.name.name = INLINE_EXTRACTABLE[name]);
             }
+            if (attr.type === "style")
+              for (const key in attr.value)
+                existingStyleKeys.has(key) ? (shouldPrintDebug && logger.info([`  >> delete existing ${key}`].join(" ")), delete attr.value[key]) : existingStyleKeys.add(key);
           }
-          if (!shouldFlatten) {
-            if (inlineWhenUnflattened.size) {
-              for (const [index, attr] of attrs.entries()) {
-                if (attr.type === "style") {
-                  for (const key in attr.value) {
-                    if (!inlineWhenUnflattened.has(key))
-                      continue;
-                    const val = inlineWhenUnflattenedOGVals[key];
-                    if (val) {
-                      delete attr.value[key];
-                      attrs.splice(index - 1, 0, val.attr);
-                    } else {
-                      delete attr.value[key];
-                    }
-                  }
+          if (!shouldFlatten && inlineWhenUnflattened.size) {
+            for (const [index, attr] of attrs.entries())
+              if (attr.type === "style")
+                for (const key in attr.value) {
+                  if (!inlineWhenUnflattened.has(key))
+                    continue;
+                  const val = inlineWhenUnflattenedOGVals[key];
+                  val ? (delete attr.value[key], attrs.splice(index - 1, 0, val.attr)) : delete attr.value[key];
                 }
-              }
-            }
-          }
-          if (shouldFlatten) {
-            if (shouldPrintDebug) {
-              logger.info(["  [\u2705] flattening", originalNodeName, flatNode].join(" "));
-            }
-            node.name.name = flatNode;
-            res.flattened++;
-            if (closingElement) {
-              closingElement.name.name = flatNode;
-            }
-          }
-          const isNativeNotFlat = !shouldFlatten && target === "native";
-          if (isNativeNotFlat) {
-            if (shouldPrintDebug) {
-              logger.info(`Disabled flattening except for simple cases on native for now`);
-            }
-            node.attributes = ogAttributes;
-            return null;
-          }
-          if (shouldPrintDebug) {
-            logger.info([` - inlined props (${inlined.size}):`, shouldDeopt ? " deopted" : "", hasSpread ? " has spread" : "", staticConfig.neverFlatten ? "neverFlatten" : ""].join(" "));
-            logger.info(`  - shouldFlatten/isFlattened: ${shouldFlatten}`);
-            logger.info(`  - attrs (end):
- ${(0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))}`);
           }
-          onExtractTag({
+          if (shouldFlatten && (shouldPrintDebug && logger.info(["  [\u2705] flattening", originalNodeName, flatNode].join(" ")), node.name.name = flatNode, res.flattened++, closingElement && (closingElement.name.name = flatNode)), !shouldFlatten && target === "native")
+            return shouldPrintDebug && logger.info("Disabled flattening except for simple cases on native for now"), node.attributes = ogAttributes, null;
+          shouldPrintDebug && (logger.info([` - inlined props (${inlined.size}):`, shouldDeopt ? " deopted" : "", hasSpread ? " has spread" : "", staticConfig.neverFlatten ? "neverFlatten" : ""].join(" ")), logger.info(`  - shouldFlatten/isFlattened: ${shouldFlatten}`), logger.info(`  - attrs (end):
+ ${(0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))}`)), onExtractTag({
             parserProps: propsWithFileInfo,
             attrs,
             node,
@@ -1671,27 +1049,18 @@ function createExtractor({ logger = console } = { logger: console }) {
             staticConfig
           });
         } catch (err) {
-          node.attributes = ogAttributes;
-          console.error(`@tamagui/static Error: ${err.message} ${err.stack}`);
+          node.attributes = ogAttributes, console.error(`@tamagui/static Error: ${err.message} ${err.stack}`);
         } finally {
-          if (debugPropValue) {
-            shouldPrintDebug = ogDebug;
-          }
+          debugPropValue && (shouldPrintDebug = ogDebug);
         }
       }
-    });
-    tm.mark("jsx-done", !!shouldPrintDebug);
-    if (modifiedComponents.size) {
+    }), tm.mark("jsx-done", !!shouldPrintDebug), modifiedComponents.size) {
       const all = Array.from(modifiedComponents);
-      if (shouldPrintDebug) {
-        logger.info(`  [\u{1FA9D}] hook check ${all.length}`);
-      }
-      for (const comp of all) {
+      shouldPrintDebug && logger.info(`  [\u{1FA9D}] hook check ${all.length}`);
+      for (const comp of all)
         (0, import_removeUnusedHooks.removeUnusedHooks)(comp, shouldPrintDebug);
-      }
     }
-    tm.done(shouldPrintDebug === "verbose");
-    return res;
+    return tm.done(shouldPrintDebug === "verbose"), res;
   }
 }
 // Annotate the CommonJS export names for ESM import in node: