@tamagui/static 1.0.0-alpha.6 → 1.0.0-alpha.63

package/dist/cjs/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/types.ts"],
+  "sourcesContent": ["import { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\n\nexport type ClassNameObject = t.StringLiteral | t.Expression\n\nexport interface CacheObject {\n  [key: string]: any\n}\n\nexport interface TamaguiOptions {\n  // module paths you want to compile with tamagui (for example ['tamagui'])\n  components: string[]\n  // your tamagui.config.ts\n  config?: string\n  evaluateVars?: boolean\n  importsWhitelist?: string[]\n  disableExtraction?: boolean\n  disableDebugAttr?: boolean\n  disableExtractInlineMedia?: boolean\n  disableExtractVariables?: boolean\n  exclude?: RegExp\n  logTimings?: boolean\n\n  // probably non user options\n  cssPath?: string\n  cssData?: any\n  deoptProps?: Set<string>\n  excludeProps?: string[]\n}\n\nexport type ExtractedAttrAttr = {\n  type: 'attr'\n  value: t.JSXAttribute | t.JSXSpreadAttribute\n}\n\nexport type ExtractedAttrStyle = {\n  type: 'style'\n  value: Object\n  attr?: t.JSXAttribute | t.JSXSpreadAttribute\n  name?: string\n}\n\nexport type ExtractedAttr =\n  | ExtractedAttrAttr\n  | { type: 'ternary'; value: Ternary }\n  | ExtractedAttrStyle\n\nexport type ExtractTagProps = {\n  attrs: ExtractedAttr[]\n  node: t.JSXOpeningElement\n  attemptEval: (exprNode: t.Node, evalFn?: ((node: t.Node) => any) | undefined) => any\n  jsxPath: NodePath<t.JSXElement>\n  programPath: NodePath<t.Program>\n  originalNodeName: string\n  lineNumbers: string\n  filePath: string\n  isFlattened: boolean\n}\n\nexport type ExtractorParseProps = TamaguiOptions & {\n  sourcePath?: string\n  shouldPrintDebug?: boolean\n  onExtractTag: (props: ExtractTagProps) => void\n  getFlattenedNode: (props: { isTextView: boolean; tag: string }) => string\n}\n\nexport interface Ternary {\n  test: t.Expression\n  // shorthand props that don't use hooks\n  inlineMediaQuery?: string\n  remove: Function\n  consequent: Object | null\n  alternate: Object | null\n}\n\nexport type StyleObject = {\n  property: string\n  value: string\n  className: string\n  identifier: string\n  rules: string[]\n}\n\nexport type ClassNameToStyleObj = {\n  [key: string]: StyleObject\n}\n\nexport interface PluginContext {\n  write: (path: string, rules: { [key: string]: string }) => any\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;",
+  "names": []
+}

package/dist/{constants.js → esm/constants.js}

@@ -2,8 +2,12 @@ import findCacheDir from "find-cache-dir";
 const CSS_FILE_NAME = "__snack.css";
 const MEDIA_SEP = "_";
 const cacheDir = findCacheDir({ name: "tamagui", create: true });
+const FAILED_EVAL = Symbol("failed_style_eval");
+const CONCAT_CLASSNAME_IMPORT = "concatClassName";
 export {
+  CONCAT_CLASSNAME_IMPORT,
   CSS_FILE_NAME,
+  FAILED_EVAL,
   MEDIA_SEP,
   cacheDir
 };

package/dist/{constants.js.map → esm/constants.js.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../src/constants.ts"],
-  "sourcesContent": ["import findCacheDir from 'find-cache-dir'\n\nexport const CSS_FILE_NAME = '__snack.css'\n\n// ENSURE THIS ISNT THE SAME AS THE SEPARATOR USED FOR STYLE KEYS\n// SEE matching one in concatClassName\nexport const MEDIA_SEP = '_'\n\n// ensure cache dir\nexport const cacheDir = findCacheDir({ name: 'tamagui', create: true })\n"],
-  "mappings": "AAAA;AAEO,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,WAAW,aAAa,EAAE,MAAM,WAAW,QAAQ;",
+  "sources": ["../../src/constants.ts"],
+  "sourcesContent": ["import findCacheDir from 'find-cache-dir'\n\nexport const CSS_FILE_NAME = '__snack.css'\n\n// ENSURE THIS ISNT THE SAME AS THE SEPARATOR USED FOR STYLE KEYS\n// SEE matching one in concatClassName\nexport const MEDIA_SEP = '_'\n\n// ensure cache dir\nexport const cacheDir = findCacheDir({ name: 'tamagui', create: true })\n\nexport const FAILED_EVAL = Symbol('failed_style_eval')\nexport const CONCAT_CLASSNAME_IMPORT = 'concatClassName'\n"],
+  "mappings": "AAAA;AAEO,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,WAAW,aAAa,EAAE,MAAM,WAAW,QAAQ;AAEzD,MAAM,cAAc,OAAO;AAC3B,MAAM,0BAA0B;",
   "names": []
 }

package/dist/{extractor → esm/extractor}/accessSafe.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../src/extractor/accessSafe.ts"],
+  "sources": ["../../../src/extractor/accessSafe.ts"],
   "sourcesContent": ["import * as t from '@babel/types'\n\n// accessSafe wraps memberExpressions in object/null checks\n// TODO: inject this as a function? this gets pretty repetitive\nexport function accessSafe(obj: t.Expression, member: string): t.LogicalExpression {\n  return t.logicalExpression(\n    '&&',\n    t.logicalExpression(\n      '&&',\n      // typeof obj === 'object\n      t.binaryExpression('===', t.unaryExpression('typeof', obj), t.stringLiteral('object')),\n      // obj !== null\n      t.binaryExpression('!==', obj, t.nullLiteral())\n    ),\n    // obj.member\n    t.memberExpression(obj, t.identifier(member), false)\n  )\n}\n"],
   "mappings": ";;AAAA;AAIO,oBAAoB,KAAmB,QAAqC;AACjF,SAAO,EAAE,kBACP,MACA,EAAE,kBACA,MAEA,EAAE,iBAAiB,OAAO,EAAE,gBAAgB,UAAU,MAAM,EAAE,cAAc,YAE5E,EAAE,iBAAiB,OAAO,KAAK,EAAE,iBAGnC,EAAE,iBAAiB,KAAK,EAAE,WAAW,SAAS;AAAA;AAXlC;",
   "names": []

package/dist/{extractor → esm/extractor}/babelParse.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../src/extractor/babelParse.ts"],
+  "sources": ["../../../src/extractor/babelParse.ts"],
   "sourcesContent": ["import * as babelParser from '@babel/parser'\n\nexport const parserOptions: babelParser.ParserOptions = Object.freeze({\n  plugins: [\n    'asyncGenerators',\n    'classProperties',\n    'dynamicImport',\n    'functionBind',\n    'jsx',\n    'numericSeparator',\n    'objectRestSpread',\n    'optionalCatchBinding',\n    'decorators-legacy',\n    'typescript',\n    'optionalChaining',\n    'nullishCoalescingOperator',\n    // 'objectRestSpread',\n    // 'dynamicImport'\n  ],\n  sourceType: 'module',\n})\n\nconst parser = babelParser.parse.bind(babelParser)\n\nexport function babelParse(code: string | Buffer): any {\n  return parser(code.toString(), parserOptions)\n}\n"],
   "mappings": ";;AAAA;AAEO,MAAM,gBAA2C,OAAO,OAAO;AAAA,EACpE,SAAS;AAAA,IACP;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,EAIF,YAAY;AAAA;AAGd,MAAM,SAAS,YAAY,MAAM,KAAK;AAE/B,oBAAoB,MAA4B;AACrD,SAAO,OAAO,KAAK,YAAY;AAAA;AADjB;",
   "names": []

package/dist/{extractor → esm/extractor}/buildClassName.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../src/extractor/buildClassName.ts"],
+  "sources": ["../../../src/extractor/buildClassName.ts"],
   "sourcesContent": ["import * as t from '@babel/types'\n\nimport { ClassNameObject } from '../types'\n\nexport function buildClassName(\n  classNameObjects: ClassNameObject[]\n): t.Expression | t.StringLiteral | null {\n  return classNameObjects.reduce<t.Expression | null>((acc, val) => {\n    if (acc == null) {\n      if (\n        // pass conditional expressions through\n        t.isConditionalExpression(val) ||\n        // pass non-null literals through\n        t.isStringLiteral(val) ||\n        t.isNumericLiteral(val)\n      ) {\n        return val\n      }\n      return t.logicalExpression('||', val, t.stringLiteral(''))\n    }\n\n    let inner: t.Expression\n    if (t.isStringLiteral(val)) {\n      if (t.isStringLiteral(acc)) {\n        // join adjacent string literals\n        return t.stringLiteral(`${acc.value} ${val.value}`)\n      }\n      inner = t.stringLiteral(` ${val.value}`)\n    } else if (t.isLiteral(val)) {\n      inner = t.binaryExpression('+', t.stringLiteral(' '), val)\n    } else if (t.isConditionalExpression(val) || t.isBinaryExpression(val)) {\n      if (t.isStringLiteral(acc)) {\n        return t.binaryExpression('+', t.stringLiteral(`${acc.value} `), val)\n      }\n      inner = t.binaryExpression('+', t.stringLiteral(' '), val)\n    } else if (t.isIdentifier(val) || t.isMemberExpression(val)) {\n      // identifiers and member expressions make for reasonable ternaries\n      inner = t.conditionalExpression(\n        val,\n        t.binaryExpression('+', t.stringLiteral(' '), val),\n        t.stringLiteral('')\n      )\n    } else {\n      if (t.isStringLiteral(acc)) {\n        return t.binaryExpression(\n          '+',\n          t.stringLiteral(`${acc.value} `),\n          t.logicalExpression('||', val, t.stringLiteral(''))\n        )\n      }\n      // use a logical expression for more complex prop values\n      inner = t.binaryExpression(\n        '+',\n        t.stringLiteral(' '),\n        t.logicalExpression('||', val, t.stringLiteral(''))\n      )\n    }\n\n    return t.binaryExpression('+', acc, inner)\n  }, null)\n}\n"],
   "mappings": ";;AAAA;AAIO,wBACL,kBACuC;AACvC,SAAO,iBAAiB,OAA4B,CAAC,KAAK,QAAQ;AAChE,QAAI,OAAO,MAAM;AACf,UAEE,EAAE,wBAAwB,QAE1B,EAAE,gBAAgB,QAClB,EAAE,iBAAiB,MACnB;AACA,eAAO;AAAA;AAET,aAAO,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc;AAAA;AAGxD,QAAI;AACJ,QAAI,EAAE,gBAAgB,MAAM;AAC1B,UAAI,EAAE,gBAAgB,MAAM;AAE1B,eAAO,EAAE,cAAc,GAAG,IAAI,SAAS,IAAI;AAAA;AAE7C,cAAQ,EAAE,cAAc,IAAI,IAAI;AAAA,eACvB,EAAE,UAAU,MAAM;AAC3B,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,MAAM;AAAA,eAC7C,EAAE,wBAAwB,QAAQ,EAAE,mBAAmB,MAAM;AACtE,UAAI,EAAE,gBAAgB,MAAM;AAC1B,eAAO,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,IAAI,WAAW;AAAA;AAEnE,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,MAAM;AAAA,eAC7C,EAAE,aAAa,QAAQ,EAAE,mBAAmB,MAAM;AAE3D,cAAQ,EAAE,sBACR,KACA,EAAE,iBAAiB,KAAK,EAAE,cAAc,MAAM,MAC9C,EAAE,cAAc;AAAA,WAEb;AACL,UAAI,EAAE,gBAAgB,MAAM;AAC1B,eAAO,EAAE,iBACP,KACA,EAAE,cAAc,GAAG,IAAI,WACvB,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc;AAAA;AAInD,cAAQ,EAAE,iBACR,KACA,EAAE,cAAc,MAChB,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc;AAAA;AAInD,WAAO,EAAE,iBAAiB,KAAK,KAAK;AAAA,KACnC;AAAA;AAvDW;",
   "names": []

package/dist/{extractor → esm/extractor}/createEvaluator.js

@@ -3,7 +3,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import vm from "vm";
 import generate from "@babel/generator";
 import * as t from "@babel/types";
-import { FAILED_EVAL } from "./createExtractor";
+import { FAILED_EVAL } from "../constants";
 import { evaluateAstNode } from "./evaluateAstNode";
 import { isValidThemeHook } from "./extractHelpers";
 function createEvaluator({

package/dist/esm/extractor/createEvaluator.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/extractor/createEvaluator.ts"],
+  "sourcesContent": ["import vm from 'vm'\n\nimport generate from '@babel/generator'\nimport { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport type { TamaguiConfig } from '@tamagui/core'\n\nimport { FAILED_EVAL } from '../constants'\nimport { evaluateAstNode } from './evaluateAstNode'\nimport { isValidThemeHook } from './extractHelpers'\n\nexport function createEvaluator({\n  tamaguiConfig,\n  staticNamespace,\n  sourcePath,\n  traversePath,\n  shouldPrintDebug,\n}: {\n  tamaguiConfig: TamaguiConfig\n  staticNamespace: Record<string, any>\n  sourcePath: string\n  traversePath: NodePath<t.JSXElement>\n  shouldPrintDebug: boolean\n}) {\n  // called when evaluateAstNode encounters a dynamic-looking prop\n  const evalFn = (n: t.Node) => {\n    // themes\n    if (\n      t.isMemberExpression(n) &&\n      t.isIdentifier(n.property) &&\n      isValidThemeHook(traversePath, n, sourcePath)\n    ) {\n      const key = n.property.name\n      if (shouldPrintDebug) {\n        console.log('    > found theme prop', key)\n      }\n      console.log('SHOULD FIND THEME (NESTED NOW)', key) // tamaguiConfig.themes)\n      // if (!themeKeys.has(key)) {\n      //   throw new Error(`    > accessing non-existent theme key: ${key}`)\n      // }\n      return `var(--${key})`\n    }\n    // variable\n    if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {\n      return staticNamespace[n.name]\n    }\n    const evalContext = vm.createContext(staticNamespace)\n    const code = `(${generate(n as any).code})`\n    // if (shouldPrintDebug) {\n    //   console.log('evaluating', { n, code, evalContext })\n    // }\n    return vm.runInContext(code, evalContext)\n  }\n\n  return (n: t.Node) => {\n    return evaluateAstNode(n, evalFn)\n  }\n}\n\nexport function createSafeEvaluator(attemptEval: (n: t.Node) => any) {\n  return (n: t.Node) => {\n    try {\n      return attemptEval(n)\n    } catch (err) {\n      return FAILED_EVAL\n    }\n  }\n}\n"],
+  "mappings": ";;AAAA;AAEA;AAEA;AAGA;AACA;AACA;AAEO,yBAAyB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAOC;AAED,QAAM,SAAS,wBAAC,MAAc;AAE5B,QACE,EAAE,mBAAmB,MACrB,EAAE,aAAa,EAAE,aACjB,iBAAiB,cAAc,GAAG,aAClC;AACA,YAAM,MAAM,EAAE,SAAS;AACvB,UAAI,kBAAkB;AACpB,gBAAQ,IAAI,0BAA0B;AAAA;AAExC,cAAQ,IAAI,kCAAkC;AAI9C,aAAO,SAAS;AAAA;AAGlB,QAAI,EAAE,aAAa,MAAM,gBAAgB,eAAe,EAAE,OAAO;AAC/D,aAAO,gBAAgB,EAAE;AAAA;AAE3B,UAAM,cAAc,GAAG,cAAc;AACrC,UAAM,OAAO,IAAI,SAAS,GAAU;AAIpC,WAAO,GAAG,aAAa,MAAM;AAAA,KA1BhB;AA6Bf,SAAO,CAAC,MAAc;AACpB,WAAO,gBAAgB,GAAG;AAAA;AAAA;AA5Cd;AAgDT,6BAA6B,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY;AAAA,aACZ,KAAP;AACA,aAAO;AAAA;AAAA;AAAA;AALG;",
+  "names": []
+}

package/dist/{extractor → esm/extractor}/createExtractor.js

@@ -2,9 +2,10 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
-import * as CoreNode from "@tamagui/core-node";
+import { mediaQueryConfig, postProcessStyles, pseudos } from "@tamagui/core-node";
 import { stylePropsTransform } from "@tamagui/helpers";
 import { difference, pick } from "lodash";
+import { FAILED_EVAL } from "../constants";
 import { createEvaluator, createSafeEvaluator } from "./createEvaluator";
 import { evaluateAstNode } from "./evaluateAstNode";
 import { attrStr, findComponentName, isInsideTamagui, isPresent, objToStr } from "./extractHelpers";
@@ -12,10 +13,9 @@ import { findTopmostFunction } from "./findTopmostFunction";
 import { getStaticBindingsForScope } from "./getStaticBindingsForScope";
 import { literalToAst } from "./literalToAst";
 import { loadTamagui } from "./loadTamagui";
+import { logLines } from "./logLines";
 import { normalizeTernaries } from "./normalizeTernaries";
 import { removeUnusedHooks } from "./removeUnusedHooks";
-const { mediaQueryConfig, postProcessStyles, pseudos } = CoreNode;
-const FAILED_EVAL = Symbol("failed_style_eval");
 const UNTOUCHED_PROPS = {
   key: true,
   style: true,
@@ -36,7 +36,7 @@ function createExtractor() {
   let loadedTamaguiConfig;
   let hasLogged = false;
   return {
-    getTamaguiConfig() {
+    getTamagui() {
       return loadedTamaguiConfig;
     },
     parse: (fileOrPath, {
@@ -48,6 +48,8 @@ function createExtractor() {
       onExtractTag,
       getFlattenedNode,
       disableExtraction,
+      disableExtractInlineMedia,
+      disableExtractVariables,
       disableDebugAttr,
       ...props
     }) => {
@@ -64,8 +66,13 @@ function createExtractor() {
       loadedTamaguiConfig = tamaguiConfig;
       const defaultTheme = tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]];
       const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
-      const isInternalImport = /* @__PURE__ */ __name((importStr) => isInsideTamagui(sourcePath) && importStr[0] === ".", "isInternalImport");
-      const validComponents = Object.keys(components).filter((key) => !!components[key]?.staticConfig).reduce((obj, name) => {
+      const isInternalImport = /* @__PURE__ */ __name((importStr) => {
+        return isInsideTamagui(sourcePath) && importStr[0] === ".";
+      }, "isInternalImport");
+      const validComponents = Object.keys(components).filter((key) => {
+        var _a;
+        return key[0].toUpperCase() === key[0] && !!((_a = components[key]) == null ? void 0 : _a.staticConfig);
+      }).reduce((obj, name) => {
         obj[name] = components[name];
         return obj;
       }, {});
@@ -92,7 +99,7 @@ function createExtractor() {
         return null;
       }
       let couldntParse = false;
-      const modifiedComponents = new Set();
+      const modifiedComponents = /* @__PURE__ */ new Set();
       const bindingCache = {};
       const callTraverse = /* @__PURE__ */ __name((a) => {
         return fileOrPath.type === "File" ? traverse(fileOrPath, a) : fileOrPath.traverse(a);
@@ -110,11 +117,12 @@ function createExtractor() {
           }
         },
         JSXElement(traversePath) {
+          var _a, _b, _c, _d, _e, _f;
           const node = traversePath.node.openingElement;
           const ogAttributes = node.attributes;
           const componentName = findComponentName(traversePath.scope);
           const closingElement = traversePath.node.closingElement;
-          if (t.isJSXMemberExpression(closingElement?.name) || !t.isJSXIdentifier(node.name)) {
+          if (t.isJSXMemberExpression(closingElement == null ? void 0 : closingElement.name) || !t.isJSXIdentifier(node.name)) {
             return;
           }
           const binding = traversePath.scope.getBinding(node.name.name);
@@ -155,8 +163,8 @@ function createExtractor() {
           }
           const { staticConfig } = component;
           const isTextView = staticConfig.isText || false;
-          const validStyles = staticConfig?.validStyles ?? {};
-          let tagName = staticConfig.defaultProps?.tag ?? (isTextView ? "span" : "div");
+          const validStyles = (_a = staticConfig == null ? void 0 : staticConfig.validStyles) != null ? _a : {};
+          let tagName = (_c = (_b = staticConfig.defaultProps) == null ? void 0 : _b.tag) != null ? _c : isTextView ? "span" : "div";
           traversePath.get("openingElement").get("attributes").forEach((path) => {
             const attr = path.node;
             if (t.isJSXSpreadAttribute(attr))
@@ -169,11 +177,11 @@ function createExtractor() {
             tagName = val.value;
           });
           const flatNode = getFlattenedNode({ isTextView, tag: tagName });
-          const deoptProps = new Set([
-            ...props.deoptProps ?? [],
-            ...staticConfig.deoptProps ?? []
+          const deoptProps = /* @__PURE__ */ new Set([
+            ...(_d = props.deoptProps) != null ? _d : [],
+            ...(_e = staticConfig.deoptProps) != null ? _e : []
           ]);
-          const excludeProps = new Set(props.excludeProps ?? []);
+          const excludeProps = new Set((_f = props.excludeProps) != null ? _f : []);
           const isExcludedProp = /* @__PURE__ */ __name((name) => {
             const res2 = excludeProps.has(name);
             if (res2 && shouldPrintDebug)
@@ -198,9 +206,6 @@ function createExtractor() {
           if (shouldPrintDebug) {
             console.log("  staticNamespace", Object.keys(staticNamespace).join(", "));
           }
-          const hasDeopt = /* @__PURE__ */ __name((obj) => {
-            return Object.keys(obj).some(isDeoptedProp);
-          }, "hasDeopt");
           const flattenedAttrs = [];
           traversePath.get("openingElement").get("attributes").forEach((path) => {
             const attr = path.node;
@@ -247,9 +252,19 @@ function createExtractor() {
           node.attributes = flattenedAttrs;
           if (staticConfig.defaultProps) {
             for (const key in staticConfig.defaultProps) {
+              if (key === "StyleSheet") {
+                continue;
+              }
               const serialize = require("babel-literal-to-ast");
               const val = staticConfig.defaultProps[key];
-              node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier(key), typeof val === "string" ? t.stringLiteral(val) : t.jsxExpressionContainer(serialize(val))));
+              try {
+                const serializedDefaultProp = serialize(val);
+                node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier(key), typeof val === "string" ? t.stringLiteral(val) : t.jsxExpressionContainer(serializedDefaultProp)));
+              } catch (err) {
+                console.warn(`\u26A0\uFE0F Error evaluating default prop for component ${node.name.name}, prop ${key}
+ error: ${err}
+ value:`, val, "\n defaultProps:", staticConfig.defaultProps);
+              }
             }
           }
           let attrs = [];
@@ -264,16 +279,22 @@ function createExtractor() {
               }
               return res2;
             } catch (err) {
-              console.log("Error extracting attribute", err.message, err.stack);
-              console.log("node", path.node);
+              if (shouldPrintDebug) {
+                console.log("Error extracting attribute", err.message, err.stack);
+                console.log("node", path.node);
+              }
               return {
                 type: "attr",
                 value: path.node
               };
             }
           }).flat(4).filter(isPresent);
+          if (shouldPrintDebug) {
+            console.log("  - attrs (before):\n", logLines(attrs.map(attrStr).join(", ")));
+          }
           function isStaticAttributeName(name) {
-            return !!(!!validStyles[name] || staticConfig.validPropsExtra?.[name] || !!pseudos[name] || staticConfig.variants?.[name] || tamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
+            var _a2, _b2;
+            return !!(!!validStyles[name] || ((_a2 = staticConfig.validPropsExtra) == null ? void 0 : _a2[name]) || !!pseudos[name] || ((_b2 = staticConfig.variants) == null ? void 0 : _b2[name]) || tamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
           }
           __name(isStaticAttributeName, "isStaticAttributeName");
           function isExtractable(obj) {
@@ -304,6 +325,29 @@ function createExtractor() {
               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] === "$" && mediaQueryConfig[mediaQueryKey];
+                if (isMediaQuery) {
+                  if (t.isExpression(property.value)) {
+                    const ternaries2 = createTernariesFromObjectProperties(t.stringLiteral(mediaQueryKey), property.value, {
+                      inlineMediaQuery: mediaQueryKey
+                    });
+                    if (ternaries2) {
+                      return ternaries2.map((value) => ({
+                        ...ternaryPartial,
+                        ...value,
+                        test: t.logicalExpression("&&", value.test, test)
+                      }));
+                    } else {
+                      console.log("\u26A0\uFE0F no ternaries?", property);
+                    }
+                  } else {
+                    console.log("\u26A0\uFE0F not expression", property);
+                  }
+                }
+              }
               if (t.isConditionalExpression(property.value)) {
                 const [truthy, falsy] = [
                   t.objectExpression([t.objectProperty(property.key, property.value.consequent)]),
@@ -367,10 +411,16 @@ function createExtractor() {
               }
             }
             if (t.isJSXSpreadAttribute(attribute) || !attribute.name || typeof attribute.name.name !== "string") {
+              if (shouldPrintDebug) {
+                console.log("  ! inlining, spread attr");
+              }
               inlinePropCount++;
               return attr;
             }
             const name = attribute.name.name;
+            if (name.startsWith("data-")) {
+              return attr;
+            }
             if (isExcludedProp(name)) {
               return null;
             }
@@ -384,7 +434,10 @@ function createExtractor() {
             if (UNTOUCHED_PROPS[name]) {
               return attr;
             }
-            if (name[0] === "$" && t.isJSXExpressionContainer(attribute?.value)) {
+            if (name[0] === "$" && t.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
+              if (disableExtractInlineMedia) {
+                return attr;
+              }
               const shortname = name.slice(1);
               if (mediaQueryConfig[shortname]) {
                 const expression = attribute.value.expression;
@@ -402,7 +455,7 @@ function createExtractor() {
               }
             }
             const [value, valuePath] = (() => {
-              if (t.isJSXExpressionContainer(attribute?.value)) {
+              if (t.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
                 return [attribute.value.expression, path.get("value")];
               } else {
                 return [attribute.value, path.get("value")];
@@ -424,6 +477,17 @@ function createExtractor() {
                 value: path.node
               };
             }
+            if (disableExtractVariables) {
+              if (value) {
+                if (value.type === "StringLiteral" && value.value[0] === "$") {
+                  if (shouldPrintDebug) {
+                    console.log(`  ! inlining, native disable extract: ${name} =`, value.value);
+                  }
+                  inlinePropCount++;
+                  return attr;
+                }
+              }
+            }
             const styleValue = attemptEvalSafe(value);
             if (!isStaticAttributeName(name)) {
               let keys = [name];
@@ -433,21 +497,33 @@ function createExtractor() {
                   keys = Object.keys(out);
                 }
               }
-              if (keys.some((k) => !isStaticAttributeName(k) && k !== "tag")) {
-                if (shouldPrintDebug) {
-                  console.log("  ! inlining, not static attribute name", name);
+              for (const key of keys) {
+                if (!isStaticAttributeName(key)) {
+                  if (shouldPrintDebug) {
+                    console.log("  ! inlining, non-static", key);
+                  }
+                  inlinePropCount++;
                 }
-                inlinePropCount++;
+              }
+              if (inlinePropCount) {
                 return attr;
               }
             }
             if (styleValue !== FAILED_EVAL) {
+              if (shouldPrintDebug) {
+                console.log(`  style: ${name} =`, styleValue);
+              }
               return {
                 type: "style",
-                value: { [name]: styleValue }
+                value: { [name]: styleValue },
+                name,
+                attr: path.node
               };
             }
             if (t.isBinaryExpression(value)) {
+              if (shouldPrintDebug) {
+                console.log(` binary expression ${name} = `, value);
+              }
               const { operator, left, right } = value;
               const lVal = attemptEvalSafe(left);
               const rVal = attemptEvalSafe(right);
@@ -472,16 +548,25 @@ function createExtractor() {
             }
             const staticConditional = getStaticConditional(value);
             if (staticConditional) {
+              if (shouldPrintDebug) {
+                console.log(` static conditional ${name} = `, value);
+              }
               return { type: "ternary", value: staticConditional };
             }
             const staticLogical = getStaticLogical(value);
             if (staticLogical) {
+              if (shouldPrintDebug) {
+                console.log(` static ternary ${name} = `, value);
+              }
               return { type: "ternary", value: staticLogical };
             }
             if (shouldPrintDebug) {
               console.log("  ! inline prop via no match", name, value.type);
             }
             inlinePropCount++;
+            if (shouldPrintDebug) {
+              console.log(` inlining ${name} = `, value);
+            }
             return attr;
             function addBinaryConditional(operator, staticExpr, cond) {
               if (getStaticConditional(cond)) {
@@ -556,9 +641,6 @@ function createExtractor() {
             __name(getStaticLogical, "getStaticLogical");
           }
           __name(evaluateAttribute, "evaluateAttribute");
-          if (shouldPrintDebug) {
-            console.log("  - attrs (before): ", attrs.map(attrStr).join(", "));
-          }
           node.attributes = attrs.filter(isAttr).map((x) => x.value);
           if (couldntParse) {
             if (shouldPrintDebug) {
@@ -631,16 +713,19 @@ function createExtractor() {
           const shouldFlatten = !shouldDeopt && inlinePropCount === 0 && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
           if (!shouldFlatten) {
             attrs = attrs.reduce((acc, cur) => {
+              var _a2, _b2;
               if (cur.type === "style") {
                 for (const key in cur.value) {
-                  const shouldInsertNull = !!staticConfig.ensureOverriddenProp?.[key];
+                  const shouldEnsureOverridden = !!((_a2 = staticConfig.ensureOverriddenProp) == null ? void 0 : _a2[key]);
                   const isSetInAttrsAlready = attrs.some((x) => x.type === "attr" && x.value.type === "JSXAttribute" && x.value.name.name === key);
-                  const shouldInsertNullOverride = shouldInsertNull && !isSetInAttrsAlready;
-                  if (shouldInsertNullOverride) {
-                    acc.push({
-                      type: "attr",
-                      value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(t.nullLiteral()))
-                    });
+                  if (!isSetInAttrsAlready) {
+                    const isVariant = !!((_b2 = staticConfig.variants) == null ? void 0 : _b2[cur.name || ""]);
+                    if (isVariant || shouldEnsureOverridden) {
+                      acc.push({
+                        type: "attr",
+                        value: cur.attr || t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(t.nullLiteral()))
+                      });
+                    }
                   }
                 }
               }
@@ -649,16 +734,35 @@ function createExtractor() {
             }, []);
           }
           if (shouldPrintDebug) {
-            console.log("  - attrs (flattened):  ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (flattened): \n", logLines(attrs.map(attrStr).join(", ")));
           }
           attrs = attrs.reduce((acc, cur) => {
-            if (cur.type !== "attr" || !t.isJSXAttribute(cur.value) || typeof cur.value.name.name !== "string") {
-              if (cur.type === "style") {
-                const key = Object.keys(cur.value)[0];
-                if (!validStyles[key] && !pseudos[key]) {
+            if (cur.type === "style") {
+              let key = Object.keys(cur.value)[0];
+              let value = cur.value[key];
+              const nonShortKey = tamaguiConfig.shorthands[key];
+              if (nonShortKey) {
+                cur.value = { [nonShortKey]: value };
+                key = nonShortKey;
+              }
+              if (!shouldFlatten) {
+                if (stylePropsTransform[key] || !validStyles[key] && !pseudos[key] && !key.startsWith("data-")) {
+                  acc.push({
+                    type: "attr",
+                    value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(typeof value === "string" ? t.stringLiteral(value) : literalToAst(value)))
+                  });
+                  return acc;
+                }
+              }
+              if (disableExtractVariables) {
+                if (value[0] === "$") {
                   if (shouldPrintDebug) {
-                    console.log(" \u274C excluding", key);
+                    console.log(`   keeping variable inline: ${key} =`, value);
                   }
+                  acc.push({
+                    type: "attr",
+                    value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(t.stringLiteral(value)))
+                  });
                   return acc;
                 }
               }
@@ -667,12 +771,12 @@ function createExtractor() {
             return acc;
           }, []);
           if (shouldPrintDebug) {
-            console.log("  - attrs (evaluated styles):  ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (evaluated): \n", logLines(attrs.map(attrStr).join(", ")));
           }
           let prev = null;
           attrs = attrs.reduce((acc, cur) => {
             if (cur.type === "style") {
-              if (prev?.type === "style") {
+              if ((prev == null ? void 0 : prev.type) === "style") {
                 Object.assign(prev.value, cur.value);
                 return acc;
               }
@@ -682,9 +786,10 @@ function createExtractor() {
             return acc;
           }, []);
           if (shouldPrintDebug) {
-            console.log("  - attrs (combined \u{1F500}):  ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
           }
           const getStyles = /* @__PURE__ */ __name((props2) => {
+            var _a2;
             if (!props2)
               return;
             if (!!excludeProps.size) {
@@ -693,15 +798,21 @@ function createExtractor() {
                   delete props2[key];
               }
             }
+            if (shouldPrintDebug) {
+              props2["debug"] = true;
+            }
             const out = postProcessStyles(props2, staticConfig, defaultTheme);
-            const next = out?.style ?? props2;
             if (shouldPrintDebug) {
-              console.log("    >> getStyles: ", objToStr(props2), "==>>", objToStr(next));
-              console.log("    >>     style: ", objToStr(out.style));
-              console.log("    >>     viewp: ", objToStr(out.viewProps));
+              delete props2["debug"];
             }
-            if (staticConfig.validStyles) {
-              for (const key in next) {
+            const next = (_a2 = out == null ? void 0 : out.style) != null ? _a2 : props2;
+            if (shouldPrintDebug) {
+              console.log("    -- viewProps:\n", logLines(objToStr(out.viewProps)));
+              console.log("    -- props:\n", logLines(objToStr(props2)));
+              console.log("    -- next:\n", logLines(objToStr(next)));
+            }
+            for (const key in next) {
+              if (staticConfig.validStyles) {
                 if (!staticConfig.validStyles[key] && !pseudos[key]) {
                   delete next[key];
                 }
@@ -709,9 +820,6 @@ function createExtractor() {
             }
             return next;
           }, "getStyles");
-          if (shouldPrintDebug) {
-            console.log("  staticConfig.defaultProps", staticConfig.defaultProps);
-          }
           const completeStylesProcessed = getStyles({
             ...staticConfig.defaultProps,
             ...completeStaticProps
@@ -721,7 +829,6 @@ function createExtractor() {
             const toAdd = pick(completeStylesProcessed, ...stylesToAddToInitialGroup);
             const firstGroup = attrs.find((x) => x.type === "style");
             if (shouldPrintDebug) {
-              console.log("    stylesToAddToInitialGroup", stylesToAddToInitialGroup.join(", "));
               console.log("    toAdd", objToStr(toAdd));
             }
             if (!firstGroup) {
@@ -731,9 +838,10 @@ function createExtractor() {
             }
           }
           if (shouldPrintDebug) {
-            console.log("    completeStaticProps", objToStr(completeStaticProps));
-            console.log("    completeStylesProcessed", objToStr(completeStylesProcessed));
+            console.log("   completeStaticProps:", completeStaticProps);
+            console.log("   completeStylesProcessed:", completeStylesProcessed);
           }
+          let getStyleError = null;
           for (const attr of attrs) {
             try {
               switch (attr.type) {
@@ -742,32 +850,35 @@ function createExtractor() {
                   const c = getStyles(attr.value.consequent);
                   attr.value.alternate = a;
                   attr.value.consequent = c;
-                  if (shouldPrintDebug) {
+                  if (shouldPrintDebug)
                     console.log("     => tern ", attrStr(attr));
-                  }
-                  break;
+                  continue;
                 case "style":
-                  const next = {};
-                  for (const key in attr.value) {
-                    if (key in stylePropsTransform) {
-                      next["transform"] = completeStylesProcessed["transform"];
-                    } else {
-                      next[key] = completeStylesProcessed[key] ?? attr.value[key];
-                    }
+                  for (const keyIn in attr.value) {
+                    const [key, value] = (() => {
+                      var _a2;
+                      if (keyIn in stylePropsTransform) {
+                        return ["transform", completeStylesProcessed["transform"]];
+                      } else {
+                        return [keyIn, (_a2 = completeStylesProcessed[keyIn]) != null ? _a2 : attr.value[keyIn]];
+                      }
+                    })();
+                    delete attr.value[keyIn];
+                    attr.value[key] = value;
                   }
-                  attr.value = next;
-                  break;
+                  continue;
               }
             } catch (err) {
-              if (shouldPrintDebug) {
-                console.log(" postprocessing error, deopt", err);
-                node.attributes = ogAttributes;
-                return node;
-              }
+              getStyleError = err;
             }
           }
+          if (getStyleError) {
+            console.log(" \u26A0\uFE0F postprocessing error, deopt", getStyleError);
+            node.attributes = ogAttributes;
+            return node;
+          }
           if (shouldPrintDebug) {
-            console.log("  - attrs (after): ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (after):\n", logLines(attrs.map(attrStr).join(", ")));
           }
           if (shouldFlatten) {
             if (shouldPrintDebug) {
@@ -782,7 +893,7 @@ function createExtractor() {
           }
           if (shouldPrintDebug) {
             console.log("  [\u274A] inline props ", inlinePropCount, shouldDeopt ? " deopted" : "", hasSpread ? " spread" : "", "!flatten", staticConfig.neverFlatten);
-            console.log("  - attrs (end): ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (end):\n", logLines(attrs.map(attrStr).join(", ")));
           }
           res.optimized++;
           onExtractTag({
@@ -813,7 +924,6 @@ function createExtractor() {
 }
 __name(createExtractor, "createExtractor");
 export {
-  FAILED_EVAL,
   createExtractor
 };
 //# sourceMappingURL=createExtractor.js.map