@tamagui/static 1.0.0-beta.153 → 1.0.0-beta.16

package/dist/cjs/patchReactNativeWeb.js

@@ -39,6 +39,8 @@ function patchReactNativeWeb() {
   }
   const patches = [
     {
+      id: "dom-props",
+      filePath: ["modules", "createDOMProps", "index.js"],
       replacee: `  if (dataSet != null) {`,
       replacer: `
   if (props.dataSet && props.dataSet.className) {
@@ -46,15 +48,25 @@ function patchReactNativeWeb() {
     classList = className
     dataSet = dataSetRest
   }
+  if (props.dataSet && props.dataSet.id) {
+    domProps['id'] = props.dataSet.id
+  }
   if (dataSet != null) {`
+    },
+    {
+      id: "forward-props",
+      filePath: ["modules", "forwardedProps", "index.js"],
+      replacee: `dataSet: true,`,
+      replacer: `id: true, dataSet: true,`
     }
   ];
-  const dataSetPath = ["modules", "createDOMProps", "index.js"];
-  const dataSetModulePath = import_path.default.join(rootDir, "dist", ...dataSetPath);
-  const dataSetCjsPath = import_path.default.join(rootDir, "dist", "cjs", ...dataSetPath);
-  for (const file of [dataSetModulePath, dataSetCjsPath]) {
-    const contents = fs.readFileSync(file, "utf-8");
-    for (const { replacee, replacer } of patches) {
+  for (const { filePath, replacee, replacer } of patches) {
+    const files = [
+      import_path.default.join(rootDir, "dist", ...filePath),
+      import_path.default.join(rootDir, "dist", "cjs", ...filePath)
+    ];
+    for (const file of files) {
+      const contents = fs.readFileSync(file, "utf-8");
       if (contents.includes(replacer)) {
         continue;
       }
@@ -66,7 +78,7 @@ function patchReactNativeWeb() {
         continue;
       }
       console.log("      | patch " + import_path.default.relative(rootDir, file));
-      fs.writeFileSync(file, contents.replaceAll(replacee, replacer));
+      fs.writeFileSync(file, contents.replace(replacee, replacer));
     }
   }
   const moduleEntry = import_path.default.join(rootDir, "dist", "index.js");
@@ -148,4 +160,8 @@ exports.useResponderEvents = require('./modules/useResponderEvents')
 const fwdProps = require('./modules/forwardedProps')
 exports.forwardedProps = ${forwardedPropsObj}
 `;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patchReactNativeWeb
+});
 //# sourceMappingURL=patchReactNativeWeb.js.map

package/dist/cjs/patchReactNativeWeb.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/patchReactNativeWeb.ts"],
-  "sourcesContent": ["import path from 'path'\n\nimport * as fs from 'fs-extra'\n\n// were patching react-native-web so we can use some internal methods\n// we do it this way because we need to rely on webpack or bundler config to determine cjs vs esm\n// so we can't just require it all directly\n// would be nice in the future to be able to eject from react-native-web entirely optionally\n\n// keep it sync\nexport function patchReactNativeWeb() {\n  const rootDir = require.resolve('react-native-web').replace(/\\/dist.*/, '')\n  const modulePath = path.join(rootDir, 'dist', 'tamagui-exports.js')\n  const cjsPath = path.join(rootDir, 'dist', 'cjs', 'tamagui-exports.js')\n  const shouldPatchExports =\n    fs.existsSync(modulePath) &&\n    fs.readFileSync(modulePath, 'utf-8') === moduleExports &&\n    fs.existsSync(cjsPath) &&\n    fs.readFileSync(cjsPath, 'utf-8') === cjsExports\n  if (!shouldPatchExports) {\n    console.log('      | patch ' + path.relative(rootDir, modulePath))\n    console.log('      | patch ' + path.relative(rootDir, cjsPath))\n    fs.writeFileSync(modulePath, moduleExports)\n    fs.writeFileSync(cjsPath, cjsExports)\n  }\n\n  // patch to allow className prop\n  const patches = [\n    {\n      replacee: `  if (dataSet != null) {`,\n      replacer: `\n  if (props.dataSet && props.dataSet.className) {\n    const { className, ...dataSetRest } = props.dataSet\n    classList = className\n    dataSet = dataSetRest\n  }\n  if (dataSet != null) {`,\n    },\n  ]\n\n  const dataSetPath = ['modules', 'createDOMProps', 'index.js']\n  const dataSetModulePath = path.join(rootDir, 'dist', ...dataSetPath)\n  const dataSetCjsPath = path.join(rootDir, 'dist', 'cjs', ...dataSetPath)\n\n  for (const file of [dataSetModulePath, dataSetCjsPath]) {\n    const contents = fs.readFileSync(file, 'utf-8')\n    for (const { replacee, replacer } of patches) {\n      if (contents.includes(replacer)) {\n        continue\n      }\n      if (!contents.includes(replacee)) {\n        console.warn(\n          `\u26A0\uFE0F Error: couldn't apply className patch! Maybe using incompatible react-native-web version.`,\n          {\n            replacee,\n            contents,\n          }\n        )\n        continue\n      }\n      console.log('      | patch ' + path.relative(rootDir, file))\n      fs.writeFileSync(file, contents.replaceAll(replacee, replacer))\n    }\n  }\n  // if entry files not patched, patch them:\n  const moduleEntry = path.join(rootDir, 'dist', 'index.js')\n  const moduleEntrySrc = fs.readFileSync(moduleEntry, 'utf-8')\n  if (!moduleEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      moduleEntry,\n      `${removePatch(moduleEntrySrc)}\n\n// tamagui-patch-v4\nimport * as TExports from './tamagui-exports'\nexport const TamaguiExports = TExports\n// tamagui-patch-end\n`\n    )\n  }\n  const cjsEntry = path.join(rootDir, 'dist', 'cjs', 'index.js')\n  const cjsEntrySrc = fs.readFileSync(cjsEntry, 'utf-8')\n  if (!cjsEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      cjsEntry,\n      `${removePatch(cjsEntrySrc)}\n\n// tamagui-patch-v4\nexports.TamaguiExports = _interopRequireDefault(require(\"./tamagui-exports\"));\n// tamagui-patch-end\n`\n    )\n  }\n}\n\nfunction removePatch(source: string) {\n  return source.replace(/\\/\\/ tamagui-patch([.\\s\\S]*)/g, '')\n}\n\n// view exports/View.ts\nconst forwardedPropsObj = `{\n  ...fwdProps.defaultProps,\n  ...fwdProps.accessibilityProps,\n  ...fwdProps.clickProps,\n  ...fwdProps.focusProps,\n  ...fwdProps.keyboardProps,\n  ...fwdProps.mouseProps,\n  ...fwdProps.touchProps,\n  ...fwdProps.styleProps,\n  href: true,\n  lang: true,\n  onScroll: true,\n  onWheel: true,\n  pointerEvents: true\n}\n`\n\nconst moduleExports = `\nexport { atomic } from './exports/StyleSheet/compile'\nexport { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'\nexport { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'\nexport { default as i18Style } from './exports/StyleSheet/i18nStyle'\nexport { default as createDOMProps } from './modules/createDOMProps'\nexport { default as AccessibilityUtil } from './modules/AccessibilityUtil'\nexport { default as createElement } from './exports/createElement'\nexport { default as css } from './exports/StyleSheet/css'\nexport { default as TextAncestorContext } from './exports/Text/TextAncestorContext'\nexport { default as pick } from './modules/pick'\nexport { default as useElementLayout } from './modules/useElementLayout'\nexport { default as useMergeRefs } from './modules/useMergeRefs'\nexport { default as usePlatformMethods } from './modules/usePlatformMethods'\nexport { default as useResponderEvents } from './modules/useResponderEvents'\nimport * as fwdProps from './modules/forwardedProps'\nexport const forwardedProps = ${forwardedPropsObj}\n`\n\nconst cjsExports = `\nexports.atomic = require('./exports/StyleSheet/compile').atomic\nexports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')\nexports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')\nexports.i18Style = require('./exports/StyleSheet/i18nStyle')\nexports.createDOMProps = require('./modules/createDOMProps')\nexports.AccessibilityUtil = require('./modules/AccessibilityUtil')\nexports.createElement = require('./exports/createElement')\nexports.css = require('./exports/StyleSheet/css')\nexports.TextAncestorContext = require('./exports/Text/TextAncestorContext')\nexports.pick = require('./modules/pick')\nexports.useElementLayout = require('./modules/useElementLayout')\nexports.useMergeRefs = require('./modules/useMergeRefs')\nexports.usePlatformMethods = require('./modules/usePlatformMethods')\nexports.useResponderEvents = require('./modules/useResponderEvents')\nconst fwdProps = require('./modules/forwardedProps')\nexports.forwardedProps = ${forwardedPropsObj}\n`\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,SAAoB;AAQb,+BAA+B;AACpC,QAAM,UAAU,AAAgB,oCAAoB,QAAQ,YAAY,EAAE;AAC1E,QAAM,aAAa,oBAAK,KAAK,SAAS,QAAQ,oBAAoB;AAClE,QAAM,UAAU,oBAAK,KAAK,SAAS,QAAQ,OAAO,oBAAoB;AACtE,QAAM,qBACJ,GAAG,WAAW,UAAU,KACxB,GAAG,aAAa,YAAY,OAAO,MAAM,iBACzC,GAAG,WAAW,OAAO,KACrB,GAAG,aAAa,SAAS,OAAO,MAAM;AACxC,MAAI,CAAC,oBAAoB;AACvB,YAAQ,IAAI,mBAAmB,oBAAK,SAAS,SAAS,UAAU,CAAC;AACjE,YAAQ,IAAI,mBAAmB,oBAAK,SAAS,SAAS,OAAO,CAAC;AAC9D,OAAG,cAAc,YAAY,aAAa;AAC1C,OAAG,cAAc,SAAS,UAAU;AAAA,EACtC;AAGA,QAAM,UAAU;AAAA,IACd;AAAA,MACE,UAAU;AAAA,MACV,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOZ;AAAA,EACF;AAEA,QAAM,cAAc,CAAC,WAAW,kBAAkB,UAAU;AAC5D,QAAM,oBAAoB,oBAAK,KAAK,SAAS,QAAQ,GAAG,WAAW;AACnE,QAAM,iBAAiB,oBAAK,KAAK,SAAS,QAAQ,OAAO,GAAG,WAAW;AAEvE,aAAW,QAAQ,CAAC,mBAAmB,cAAc,GAAG;AACtD,UAAM,WAAW,GAAG,aAAa,MAAM,OAAO;AAC9C,eAAW,EAAE,UAAU,cAAc,SAAS;AAC5C,UAAI,SAAS,SAAS,QAAQ,GAAG;AAC/B;AAAA,MACF;AACA,UAAI,CAAC,SAAS,SAAS,QAAQ,GAAG;AAChC,gBAAQ,KACN,0GACA;AAAA,UACE;AAAA,UACA;AAAA,QACF,CACF;AACA;AAAA,MACF;AACA,cAAQ,IAAI,mBAAmB,oBAAK,SAAS,SAAS,IAAI,CAAC;AAC3D,SAAG,cAAc,MAAM,SAAS,WAAW,UAAU,QAAQ,CAAC;AAAA,IAChE;AAAA,EACF;AAEA,QAAM,cAAc,oBAAK,KAAK,SAAS,QAAQ,UAAU;AACzD,QAAM,iBAAiB,GAAG,aAAa,aAAa,OAAO;AAC3D,MAAI,CAAC,eAAe,SAAS,qBAAqB,GAAG;AACnD,OAAG,cACD,aACA,GAAG,YAAY,cAAc;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,CAO/B;AAAA,EACF;AACA,QAAM,WAAW,oBAAK,KAAK,SAAS,QAAQ,OAAO,UAAU;AAC7D,QAAM,cAAc,GAAG,aAAa,UAAU,OAAO;AACrD,MAAI,CAAC,YAAY,SAAS,qBAAqB,GAAG;AAChD,OAAG,cACD,UACA,GAAG,YAAY,WAAW;AAAA;AAAA;AAAA;AAAA;AAAA,CAM5B;AAAA,EACF;AACF;AAlFgB;AAoFhB,qBAAqB,QAAgB;AACnC,SAAO,OAAO,QAAQ,iCAAiC,EAAE;AAC3D;AAFS;AAKT,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiB1B,MAAM,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAgBU;AAAA;AAGhC,MAAM,aAAa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAgBQ;AAAA;",
+  "sourcesContent": ["import path from 'path'\n\nimport * as fs from 'fs-extra'\n\n// were patching react-native-web so we can use some internal methods\n// we do it this way because we need to rely on webpack or bundler config to determine cjs vs esm\n// so we can't just require it all directly\n// would be nice in the future to be able to eject from react-native-web entirely optionally\n\n// keep it sync\nexport function patchReactNativeWeb() {\n  const rootDir = require.resolve('react-native-web').replace(/\\/dist.*/, '')\n  const modulePath = path.join(rootDir, 'dist', 'tamagui-exports.js')\n  const cjsPath = path.join(rootDir, 'dist', 'cjs', 'tamagui-exports.js')\n  const shouldPatchExports =\n    fs.existsSync(modulePath) &&\n    fs.readFileSync(modulePath, 'utf-8') === moduleExports &&\n    fs.existsSync(cjsPath) &&\n    fs.readFileSync(cjsPath, 'utf-8') === cjsExports\n  if (!shouldPatchExports) {\n    console.log('      | patch ' + path.relative(rootDir, modulePath))\n    console.log('      | patch ' + path.relative(rootDir, cjsPath))\n    fs.writeFileSync(modulePath, moduleExports)\n    fs.writeFileSync(cjsPath, cjsExports)\n  }\n\n  // patch to allow className prop\n  const patches = [\n    {\n      id: 'dom-props',\n      filePath: ['modules', 'createDOMProps', 'index.js'],\n      replacee: `  if (dataSet != null) {`,\n      replacer: `\n  if (props.dataSet && props.dataSet.className) {\n    const { className, ...dataSetRest } = props.dataSet\n    classList = className\n    dataSet = dataSetRest\n  }\n  if (props.dataSet && props.dataSet.id) {\n    domProps['id'] = props.dataSet.id\n  }\n  if (dataSet != null) {`,\n    },\n    {\n      id: 'forward-props',\n      filePath: ['modules', 'forwardedProps', 'index.js'],\n      replacee: `dataSet: true,`,\n      replacer: `id: true, dataSet: true,`,\n    },\n  ]\n\n  for (const { filePath, replacee, replacer } of patches) {\n    const files = [\n      path.join(rootDir, 'dist', ...filePath),\n      path.join(rootDir, 'dist', 'cjs', ...filePath),\n    ]\n    for (const file of files) {\n      const contents = fs.readFileSync(file, 'utf-8')\n      if (contents.includes(replacer)) {\n        continue\n      }\n      if (!contents.includes(replacee)) {\n        console.warn(\n          `\u26A0\uFE0F Error: couldn't apply className patch! Maybe using incompatible react-native-web version.`,\n          {\n            replacee,\n            contents,\n          }\n        )\n        continue\n      }\n      console.log('      | patch ' + path.relative(rootDir, file))\n      fs.writeFileSync(file, contents.replace(replacee, replacer))\n    }\n  }\n\n  // if entry files not patched, patch them:\n  const moduleEntry = path.join(rootDir, 'dist', 'index.js')\n  const moduleEntrySrc = fs.readFileSync(moduleEntry, 'utf-8')\n  if (!moduleEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      moduleEntry,\n      `${removePatch(moduleEntrySrc)}\n\n// tamagui-patch-v4\nimport * as TExports from './tamagui-exports'\nexport const TamaguiExports = TExports\n// tamagui-patch-end\n`\n    )\n  }\n  const cjsEntry = path.join(rootDir, 'dist', 'cjs', 'index.js')\n  const cjsEntrySrc = fs.readFileSync(cjsEntry, 'utf-8')\n  if (!cjsEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      cjsEntry,\n      `${removePatch(cjsEntrySrc)}\n\n// tamagui-patch-v4\nexports.TamaguiExports = _interopRequireDefault(require(\"./tamagui-exports\"));\n// tamagui-patch-end\n`\n    )\n  }\n}\n\nfunction removePatch(source: string) {\n  return source.replace(/\\/\\/ tamagui-patch([.\\s\\S]*)/g, '')\n}\n\n// view exports/View.ts\nconst forwardedPropsObj = `{\n  ...fwdProps.defaultProps,\n  ...fwdProps.accessibilityProps,\n  ...fwdProps.clickProps,\n  ...fwdProps.focusProps,\n  ...fwdProps.keyboardProps,\n  ...fwdProps.mouseProps,\n  ...fwdProps.touchProps,\n  ...fwdProps.styleProps,\n  href: true,\n  lang: true,\n  onScroll: true,\n  onWheel: true,\n  pointerEvents: true\n}\n`\n\nconst moduleExports = `\nexport { atomic } from './exports/StyleSheet/compile'\nexport { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'\nexport { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'\nexport { default as i18Style } from './exports/StyleSheet/i18nStyle'\nexport { default as createDOMProps } from './modules/createDOMProps'\nexport { default as AccessibilityUtil } from './modules/AccessibilityUtil'\nexport { default as createElement } from './exports/createElement'\nexport { default as css } from './exports/StyleSheet/css'\nexport { default as TextAncestorContext } from './exports/Text/TextAncestorContext'\nexport { default as pick } from './modules/pick'\nexport { default as useElementLayout } from './modules/useElementLayout'\nexport { default as useMergeRefs } from './modules/useMergeRefs'\nexport { default as usePlatformMethods } from './modules/usePlatformMethods'\nexport { default as useResponderEvents } from './modules/useResponderEvents'\nimport * as fwdProps from './modules/forwardedProps'\nexport const forwardedProps = ${forwardedPropsObj}\n`\n\nconst cjsExports = `\nexports.atomic = require('./exports/StyleSheet/compile').atomic\nexports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')\nexports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')\nexports.i18Style = require('./exports/StyleSheet/i18nStyle')\nexports.createDOMProps = require('./modules/createDOMProps')\nexports.AccessibilityUtil = require('./modules/AccessibilityUtil')\nexports.createElement = require('./exports/createElement')\nexports.css = require('./exports/StyleSheet/css')\nexports.TextAncestorContext = require('./exports/Text/TextAncestorContext')\nexports.pick = require('./modules/pick')\nexports.useElementLayout = require('./modules/useElementLayout')\nexports.useMergeRefs = require('./modules/useMergeRefs')\nexports.usePlatformMethods = require('./modules/usePlatformMethods')\nexports.useResponderEvents = require('./modules/useResponderEvents')\nconst fwdProps = require('./modules/forwardedProps')\nexports.forwardedProps = ${forwardedPropsObj}\n`\n"],
+  "mappings": "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",
   "names": []
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "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,EAGF;AAAA,EACA,YAAY;AACd,CAAC;AAED,MAAM,SAAS,YAAY,MAAM,KAAK,WAAW;AAE1C,oBAAoB,MAA4B;AACrD,SAAO,OAAO,KAAK,SAAS,GAAG,aAAa;AAC9C;AAFgB;",
+  "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  ],\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,EACF;AAAA,EACA,YAAY;AACd,CAAC;AAED,MAAM,SAAS,YAAY,MAAM,KAAK,WAAW;AAE1C,oBAAoB,MAA4B;AACrD,SAAO,OAAO,KAAK,SAAS,GAAG,aAAa;AAC9C;AAFgB;",
   "names": []
 }

package/dist/esm/extractor/createExtractor.js

@@ -1,10 +1,13 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { relative } from "path";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
 import {
   getSplitStyles,
   mediaQueryConfig,
+  normalizeStyleObject,
+  proxyThemeVariables,
   pseudos,
   rnw
 } from "@tamagui/core-node";
@@ -20,6 +23,7 @@ import { loadTamagui } from "./loadTamagui";
 import { logLines } from "./logLines";
 import { normalizeTernaries } from "./normalizeTernaries";
 import { removeUnusedHooks } from "./removeUnusedHooks";
+import { timer } from "./timer";
 import { validHTMLAttributes } from "./validHTMLAttributes";
 const UNTOUCHED_PROPS = {
   key: true,
@@ -47,10 +51,6 @@ function createExtractor() {
     process.exit(1);
   }
   const shouldAddDebugProp = !process.env.npm_package_dependencies_next && process.env.TAMAGUI_TARGET !== "native" && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS);
-  require("esbuild-register/dist/node").register({
-    target: "es2019",
-    format: "cjs"
-  });
   let loadedTamaguiConfig;
   let hasLogged = false;
   return {
@@ -83,12 +83,18 @@ function createExtractor() {
       if (!Array.isArray(props.components)) {
         throw new Error(`Must provide components array with list of Tamagui component modules`);
       }
+      const ogDebug = shouldPrintDebug;
+      const tm = timer();
       const { components, tamaguiConfig } = loadTamagui({
         config,
         components: props.components || ["tamagui"]
       });
+      if (shouldPrintDebug === "verbose") {
+        console.log("tamagui.config.ts:", { components, config });
+      }
+      tm.mark("load-tamagui", shouldPrintDebug === "verbose");
       loadedTamaguiConfig = tamaguiConfig;
-      const defaultTheme = tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]];
+      const defaultTheme = proxyThemeVariables(tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]]);
       const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
       const isInternalImport = /* @__PURE__ */ __name((importStr) => {
         return isInsideTamagui(sourcePath) && importStr[0] === ".";
@@ -100,6 +106,9 @@ function createExtractor() {
         obj[name] = components[name];
         return obj;
       }, {});
+      if (shouldPrintDebug === "verbose") {
+        console.log("validComponents", Object.keys(validComponents));
+      }
       let doesUseValidImport = false;
       let hasImportedTheme = false;
       for (const bodyPath of body) {
@@ -107,11 +116,16 @@ function createExtractor() {
           continue;
         const node = "node" in bodyPath ? bodyPath.node : bodyPath;
         const from = node.source.value;
-        if (props.components.includes(from) || isInternalImport(from)) {
-          if (node.specifiers.some((specifier) => {
+        const isValidImport = props.components.includes(from) || isInternalImport(from);
+        if (isValidImport) {
+          const isValidComponent = node.specifiers.some((specifier) => {
             const name = specifier.local.name;
             return validComponents[name] || validHooks[name];
-          })) {
+          });
+          if (shouldPrintDebug === "verbose") {
+            console.log("import from", from, { isValidComponent });
+          }
+          if (isValidComponent) {
             doesUseValidImport = true;
             break;
           }
@@ -123,6 +137,7 @@ function createExtractor() {
       if (!doesUseValidImport) {
         return null;
       }
+      tm.mark("import-check", shouldPrintDebug === "verbose");
       let couldntParse = false;
       const modifiedComponents = /* @__PURE__ */ new Set();
       const bindingCache = {};
@@ -144,6 +159,7 @@ function createExtractor() {
         },
         JSXElement(traversePath) {
           var _a, _b, _c, _d, _e;
+          tm.mark("jsx-element", shouldPrintDebug === "verbose");
           const node = traversePath.node.openingElement;
           const ogAttributes = node.attributes;
           const componentName = findComponentName(traversePath.scope);
@@ -170,13 +186,18 @@ function createExtractor() {
           }
           const originalNodeName = node.name.name;
           res.found++;
-          const filePath = sourcePath.replace(process.cwd(), ".");
+          const filePath = `./${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 preName = componentName ? `${componentName}.` : "";
-          const tagId = `${preName}${node.name.name}@${filePath.replace("./", "")}:${lineNumbers}`;
-          const hasBooleanDebugTrue = node.attributes.some((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug" && n.value === null);
-          if (hasBooleanDebugTrue) {
-            shouldPrintDebug = true;
+          const tagId = [componentName, `${node.name.name}`, `${filePath}:${lineNumbers}`].filter(Boolean);
+          const 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;
           }
           try {
             let isValidStyleKey = function(name) {
@@ -300,6 +321,10 @@ function createExtractor() {
                   }
                 }
               }
+              if (name === "theme") {
+                inlined.set("theme", attr.value);
+                return attr;
+              }
               const styleValue = attemptEvalSafe(value);
               if (!isValidStyleKey(name)) {
                 let keys = [name];
@@ -315,10 +340,6 @@ function createExtractor() {
                 let didInline = false;
                 const attributes = keys.map((key) => {
                   const val = out[key];
-                  if (key === "theme") {
-                    inlined.set(key, val);
-                    return attr;
-                  }
                   if (isValidStyleKey(key)) {
                     return {
                       type: "style",
@@ -395,14 +416,14 @@ function createExtractor() {
               }
               const staticConditional = getStaticConditional(value);
               if (staticConditional) {
-                if (shouldPrintDebug) {
-                  console.log(` static conditional ${name} = `, value);
+                if (shouldPrintDebug === "verbose") {
+                  console.log(` static conditional ${name}`, value);
                 }
                 return { type: "ternary", value: staticConditional };
               }
               const staticLogical = getStaticLogical(value);
               if (staticLogical) {
-                if (shouldPrintDebug) {
+                if (shouldPrintDebug === "verbose") {
                   console.log(` static ternary ${name} = `, value);
                 }
                 return { type: "ternary", value: staticLogical };
@@ -435,9 +456,6 @@ function createExtractor() {
               function getStaticConditional(value2) {
                 if (t.isConditionalExpression(value2)) {
                   try {
-                    if (shouldPrintDebug) {
-                      console.log("attempt", value2.alternate, value2.consequent);
-                    }
                     const aVal = attemptEval(value2.alternate);
                     const cVal = attemptEval(value2.consequent);
                     if (shouldPrintDebug) {
@@ -568,9 +586,15 @@ function createExtractor() {
                 });
               });
             }, mergeStyles = function(prev2, next) {
+              normalizeStyleObject(next);
               for (const key in next) {
                 if (pseudos[key]) {
                   prev2[key] = prev2[key] || {};
+                  if (shouldPrintDebug) {
+                    if (!next[key] || !prev2[key]) {
+                      console.log("warn: missing", key, prev2, next);
+                    }
+                  }
                   Object.assign(prev2[key], next[key]);
                 } else {
                   prev2[key] = next[key];
@@ -584,12 +608,13 @@ function createExtractor() {
             __name(mergeStyles, "mergeStyles");
             node.attributes.find((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug" && n.value === null);
             if (shouldPrintDebug) {
-              console.log(`
-<${originalNodeName} /> (${tagId})`);
+              console.log("\n");
+              console.log("\x1B[33m%s\x1B[0m", `${tagId[0]} | ${tagId[2]} -------------------`);
+              console.log("\x1B[1m", "\x1B[32m", `<${originalNodeName} />`);
             }
             if (shouldAddDebugProp && !disableDebugAttr) {
               res.modified++;
-              node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(tagId)));
+              node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(tagId.join(" "))));
             }
             const shouldLog = !hasLogged;
             if (shouldLog) {
@@ -680,6 +705,7 @@ function createExtractor() {
             if (couldntParse) {
               return;
             }
+            tm.mark("jsx-element-flattened", shouldPrintDebug === "verbose");
             node.attributes = flattenedAttrs;
             if (staticConfig.defaultProps) {
               for (const key in staticConfig.defaultProps) {
@@ -705,6 +731,7 @@ function createExtractor() {
             attrs = traversePath.get("openingElement").get("attributes").flatMap((path) => {
               try {
                 const res2 = evaluateAttribute(path);
+                tm.mark("jsx-element-evaluate-attr", shouldPrintDebug === "verbose");
                 if (!res2) {
                   path.remove();
                 }
@@ -767,73 +794,48 @@ function createExtractor() {
               out.push(cur);
               return out;
             }, []).flat();
-            const completeStaticProps = {
-              ...Object.keys(attrs).reduce((acc, index) => {
-                const cur = attrs[index];
-                if (cur.type === "style") {
-                  Object.assign(acc, cur.value);
-                }
-                if (cur.type === "attr") {
-                  if (t.isJSXSpreadAttribute(cur.value)) {
-                    return acc;
-                  }
-                  if (!t.isJSXIdentifier(cur.value.name)) {
-                    return acc;
-                  }
-                  const key = cur.value.name.name;
-                  const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
-                  if (value === FAILED_EVAL) {
-                    return acc;
-                  }
-                  acc[key] = value;
-                }
-                return acc;
-              }, {})
-            };
             const hasSpread = node.attributes.some((x) => t.isJSXSpreadAttribute(x));
             const hasOnlyStringChildren = !hasSpread && (node.selfClosing || traversePath.node.children && traversePath.node.children.every((x) => x.type === "JSXText"));
-            const themeVal = inlined.get("theme");
+            let themeVal = inlined.get("theme");
             inlined.delete("theme");
             const allOtherPropsExtractable = [...inlined].every(([k, v]) => INLINE_EXTRACTABLE[k]);
-            const shouldWrapInnerTheme = allOtherPropsExtractable && !!(hasOnlyStringChildren && themeVal);
-            const canFlattenProps = inlined.size === 0 || shouldWrapInnerTheme || allOtherPropsExtractable;
+            const shouldWrapThme = allOtherPropsExtractable && !!themeVal;
+            const canFlattenProps = inlined.size === 0 || shouldWrapThme || allOtherPropsExtractable;
             let shouldFlatten = !shouldDeopt && canFlattenProps && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
-            if (shouldFlatten && shouldWrapInnerTheme) {
-              if (typeof themeVal !== "string") {
-                console.warn("??");
-                return;
-              }
+            if (shouldPrintDebug) {
+              console.log(" - flatten?", objToStr({ hasSpread, shouldDeopt, shouldFlatten, canFlattenProps, shouldWrapThme, allOtherPropsExtractable, hasOnlyStringChildren }));
+            }
+            if (shouldFlatten && shouldWrapThme) {
               if (shouldPrintDebug) {
                 console.log("  - wrapping theme", allOtherPropsExtractable, themeVal);
               }
+              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"), t.stringLiteral(`${themeVal}`))
+                t.jsxAttribute(t.jsxIdentifier("name"), themeVal.value)
               ]), t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")), [traversePath.node]));
             }
             if (shouldFlatten && staticConfig.defaultProps) {
               const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap((key) => {
                 if (!isValidStyleKey(key)) {
-                  return;
+                  return [];
                 }
-                try {
-                  const serialize = require("babel-literal-to-ast");
-                  const val = staticConfig.defaultProps[key];
-                  const value = serialize(val);
-                  const name = tamaguiConfig.shorthands[key] || key;
-                  return {
-                    type: "style",
-                    name,
-                    value
-                  };
-                } catch (err) {
-                  console.warn(`\u26A0\uFE0F Error evaluating default style for component, prop ${key}
- error: ${err}`);
+                const value = staticConfig.defaultProps[key];
+                const name = tamaguiConfig.shorthands[key] || key;
+                if (value === void 0) {
+                  console.warn(`\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`);
                   shouldDeopt = true;
+                  return;
                 }
+                const attr = {
+                  type: "style",
+                  name,
+                  value: { [name]: value }
+                };
+                return attr;
               });
               if (defaultStyleAttrs.length) {
                 attrs = [...defaultStyleAttrs, ...attrs];
@@ -901,6 +903,7 @@ function createExtractor() {
               acc.push(cur);
               return acc;
             }, []);
+            tm.mark("jsx-element-expanded", shouldPrintDebug === "verbose");
             if (shouldPrintDebug) {
               console.log("  - attrs (expanded): \n", logLines(attrs.map(attrStr).join(", ")));
             }
@@ -937,54 +940,91 @@ function createExtractor() {
               acc.push(cur);
               return acc;
             }, []);
-            if (shouldPrintDebug) {
-              console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
-            }
+            const state = {
+              noClassNames: true,
+              focus: false,
+              hover: false,
+              mounted: true,
+              press: false,
+              pressIn: false
+            };
+            const completeStaticProps = Object.keys(attrs).reduce((acc, index) => {
+              const cur = attrs[index];
+              if (cur.type === "style") {
+                normalizeStyleObject(cur.value);
+                Object.assign(acc, cur.value);
+              }
+              if (cur.type === "attr") {
+                if (t.isJSXSpreadAttribute(cur.value)) {
+                  return acc;
+                }
+                if (!t.isJSXIdentifier(cur.value.name)) {
+                  return acc;
+                }
+                const key = cur.value.name.name;
+                const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
+                if (value === FAILED_EVAL) {
+                  return acc;
+                }
+                acc[key] = value;
+              }
+              return acc;
+            }, {});
             const completeProps = {
               ...staticConfig.defaultProps,
               ...completeStaticProps
             };
+            if (shouldPrintDebug) {
+              console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
+              console.log("  - defaultProps: \n", logLines(objToStr(staticConfig.defaultProps)));
+              console.log("  - completeStaticProps: \n", logLines(objToStr(completeStaticProps)));
+            }
             const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
-              if (!props2)
-                return;
-              if (!Object.keys(props2).length)
-                return;
+              if (!props2 || !Object.keys(props2).length) {
+                if (shouldPrintDebug)
+                  console.log(" getStyles() no props");
+                return {};
+              }
               if (excludeProps && !!excludeProps.size) {
                 for (const key in props2) {
                   if (excludeProps.has(key)) {
+                    if (shouldPrintDebug)
+                      console.log(" delete excluded", key);
                     delete props2[key];
                   }
                 }
               }
-              const out = getSplitStyles(props2, staticConfig, defaultTheme, {
-                noClassNames: true,
-                fallbackProps: completeProps,
-                focus: false,
-                hover: false,
-                mounted: true,
-                press: false,
-                pressIn: false
-              });
-              const outStyle = {
-                ...out.style,
-                ...out.pseudos
-              };
-              for (const key in outStyle) {
+              try {
+                const out = getSplitStyles(props2, staticConfig, defaultTheme, {
+                  ...state,
+                  fallbackProps: completeProps
+                });
+                const outStyle = {
+                  ...out.style,
+                  ...out.pseudos
+                };
                 if (staticConfig.validStyles) {
-                  if (!staticConfig.validStyles[key] && !pseudos[key]) {
-                    delete outStyle[key];
+                  for (const key in outStyle) {
+                    if (!staticConfig.validStyles[key] && !pseudos[key] && !/(hover|focus|press)Style$/.test(key)) {
+                      if (shouldPrintDebug)
+                        console.log(" delete invalid style", key);
+                      delete outStyle[key];
+                    }
                   }
                 }
-              }
-              if (shouldPrintDebug === "verbose") {
-                console.log(`       getStyles ${debugName} (props):
+                if (shouldPrintDebug) {
+                  console.log(`       getStyles ${debugName} (props):
 `, logLines(objToStr(props2)));
-                console.log(`       getStyles ${debugName} (out.viewProps):
+                  console.log(`       getStyles ${debugName} (out.viewProps):
 `, logLines(objToStr(out.viewProps)));
-                console.log(`       getStyles ${debugName} (out.style):
+                  console.log(`       getStyles ${debugName} (out.style):
 `, logLines(objToStr(outStyle || {}), true));
+                }
+                return outStyle;
+              } catch (err) {
+                console.log("error", err.message, err.stack);
+                return {};
               }
-              return outStyle;
             }, "getStyles");
             const completeStylesProcessed = getStyles(completeProps, "completeStylesProcessed");
             if (!completeStylesProcessed) {
@@ -1025,11 +1065,13 @@ function createExtractor() {
                       console.log("     => tern ", attrStr(attr));
                     continue;
                   case "style":
+                    if (shouldPrintDebug)
+                      console.log("  * styles in", logLines(objToStr(attr.value)));
                     const styles = getStyles(attr.value, "style");
+                    if (shouldPrintDebug)
+                      console.log("  * styles out", logLines(objToStr(styles)));
                     if (styles) {
                       attr.value = Object.fromEntries(Object.keys(styles).map((k) => [k, completeStylesProcessed[k]]));
-                    } else {
-                      console.warn("?????????");
                     }
                     continue;
                 }
@@ -1037,6 +1079,7 @@ function createExtractor() {
                 getStyleError = err;
               }
             }
+            tm.mark("jsx-element-styles", shouldPrintDebug === "verbose");
             if (getStyleError) {
               console.log(" \u26A0\uFE0F postprocessing error, deopt", getStyleError);
               node.attributes = ogAttributes;
@@ -1060,6 +1103,9 @@ function createExtractor() {
               if (attr.type === "style") {
                 for (const key in attr.value) {
                   if (existingStyleKeys.has(key)) {
+                    if (shouldPrintDebug) {
+                      console.log("  >> delete existing", key);
+                    }
                     delete attr.value[key];
                   } else {
                     existingStyleKeys.add(key);
@@ -1095,12 +1141,13 @@ function createExtractor() {
           } catch (err) {
             throw err;
           } finally {
-            if (hasBooleanDebugTrue) {
-              shouldPrintDebug = false;
+            if (debugPropValue) {
+              shouldPrintDebug = ogDebug;
             }
           }
         }
       });
+      tm.mark("jsx-done", shouldPrintDebug === "verbose");
       if (modifiedComponents.size) {
         const all = Array.from(modifiedComponents);
         if (shouldPrintDebug) {
@@ -1110,6 +1157,7 @@ function createExtractor() {
           removeUnusedHooks(comp, shouldPrintDebug);
         }
       }
+      tm.done(shouldPrintDebug === "verbose");
       return res;
     }
   };