@tamagui/static 1.0.1-beta.190 → 1.0.1-beta.191

package/dist/constants.js

@@ -24,7 +24,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constants_exports = {};
 __export(constants_exports, {
-  CONCAT_CLASSNAME_IMPORT: () => CONCAT_CLASSNAME_IMPORT,
   CSS_FILE_NAME: () => CSS_FILE_NAME,
   FAILED_EVAL: () => FAILED_EVAL,
   MEDIA_SEP: () => MEDIA_SEP,
@@ -38,11 +37,9 @@ const CSS_FILE_NAME = "__snack.css";
 const MEDIA_SEP = "_";
 const cacheDir = (0, import_find_cache_dir.default)({ name: "tamagui", create: true });
 const FAILED_EVAL = Symbol("failed_style_eval");
-const CONCAT_CLASSNAME_IMPORT = "concatClassName";
 const SHOULD_DEBUG = process.env.DEBUG === "*" || ((_a = process.env.DEBUG) == null ? void 0 : _a.startsWith("tamagui"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CONCAT_CLASSNAME_IMPORT,
   CSS_FILE_NAME,
   FAILED_EVAL,
   MEDIA_SEP,

package/dist/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\nexport const FAILED_EVAL = Symbol('failed_style_eval')\nexport const CONCAT_CLASSNAME_IMPORT = 'concatClassName'\n\nexport const SHOULD_DEBUG = process.env.DEBUG === '*' || process.env.DEBUG?.startsWith('tamagui')\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AAAzB;AAEO,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,eAAW,sBAAAA,SAAa,EAAE,MAAM,WAAW,QAAQ,KAAK,CAAC;AAE/D,MAAM,cAAc,OAAO,mBAAmB;AAC9C,MAAM,0BAA0B;AAEhC,MAAM,eAAe,QAAQ,IAAI,UAAU,SAAO,aAAQ,IAAI,UAAZ,mBAAmB,WAAW;",
+  "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')\n\nexport const SHOULD_DEBUG = process.env.DEBUG === '*' || process.env.DEBUG?.startsWith('tamagui')\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyB;AAAzB;AAEO,MAAM,gBAAgB;AAItB,MAAM,YAAY;AAGlB,MAAM,eAAW,sBAAAA,SAAa,EAAE,MAAM,WAAW,QAAQ,KAAK,CAAC;AAE/D,MAAM,cAAc,OAAO,mBAAmB;AAE9C,MAAM,eAAe,QAAQ,IAAI,UAAU,SAAO,aAAQ,IAAI,UAAZ,mBAAmB,WAAW;",
   "names": ["findCacheDir"]
 }

package/dist/extractor/buildClassName.js

@@ -24,12 +24,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var buildClassName_exports = {};
 __export(buildClassName_exports, {
-  buildClassName: () => buildClassName
+  buildClassName: () => buildClassName,
+  buildClassNameLogic: () => buildClassNameLogic
 });
 module.exports = __toCommonJS(buildClassName_exports);
 var t = __toESM(require("@babel/types"));
-function buildClassName(classNameObjects) {
-  return classNameObjects.reduce((acc, val) => {
+var import_helpers = require("@tamagui/helpers");
+const buildClassName = (objectsIn, extras = "") => {
+  let objects = buildClassNameLogic(objectsIn);
+  if (!objects)
+    return null;
+  if (t.isStringLiteral(objects)) {
+    objects.value = (0, import_helpers.concatClassName)(objects.value);
+    objects.value = `${extras} ${objects.value}`;
+  } else {
+    objects = t.binaryExpression("+", t.stringLiteral(extras), objects);
+  }
+  return objects;
+};
+const buildClassNameLogic = (objects) => {
+  return objects.reduce((acc, val) => {
     if (acc == null) {
       if (t.isConditionalExpression(val) || t.isStringLiteral(val) || t.isNumericLiteral(val)) {
         return val;
@@ -71,9 +85,10 @@ function buildClassName(classNameObjects) {
     }
     return t.binaryExpression("+", acc, inner);
   }, null);
-}
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildClassName
+  buildClassName,
+  buildClassNameLogic
 });
 //# sourceMappingURL=buildClassName.js.map

package/dist/extractor/buildClassName.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/extractor/buildClassName.ts"],
-  "sourcesContent": ["import * as t from '@babel/types'\n\nimport type { ClassNameObject } from '../types.js'\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;AAAA;AAAA;AAAA;AAAA;AAAA,QAAmB;AAIZ,SAAS,eACd,kBACuC;AACvC,SAAO,iBAAiB,OAA4B,CAAC,KAAK,QAAQ;AAChE,QAAI,OAAO,MAAM;AACf,UAEE,EAAE,wBAAwB,GAAG,KAE7B,EAAE,gBAAgB,GAAG,KACrB,EAAE,iBAAiB,GAAG,GACtB;AACA,eAAO;AAAA,MACT;AACA,aAAO,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,IAC3D;AAEA,QAAI;AACJ,QAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAE1B,eAAO,EAAE,cAAc,GAAG,IAAI,SAAS,IAAI,OAAO;AAAA,MACpD;AACA,cAAQ,EAAE,cAAc,IAAI,IAAI,OAAO;AAAA,IACzC,WAAW,EAAE,UAAU,GAAG,GAAG;AAC3B,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,IAC3D,WAAW,EAAE,wBAAwB,GAAG,KAAK,EAAE,mBAAmB,GAAG,GAAG;AACtE,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,eAAO,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,IAAI,QAAQ,GAAG,GAAG;AAAA,MACtE;AACA,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,IAC3D,WAAW,EAAE,aAAa,GAAG,KAAK,EAAE,mBAAmB,GAAG,GAAG;AAE3D,cAAQ,EAAE;AAAA,QACR;AAAA,QACA,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,QACjD,EAAE,cAAc,EAAE;AAAA,MACpB;AAAA,IACF,OAAO;AACL,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,eAAO,EAAE;AAAA,UACP;AAAA,UACA,EAAE,cAAc,GAAG,IAAI,QAAQ;AAAA,UAC/B,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,QACpD;AAAA,MACF;AAEA,cAAQ,EAAE;AAAA,QACR;AAAA,QACA,EAAE,cAAc,GAAG;AAAA,QACnB,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,MACpD;AAAA,IACF;AAEA,WAAO,EAAE,iBAAiB,KAAK,KAAK,KAAK;AAAA,EAC3C,GAAG,IAAI;AACT;",
+  "sourcesContent": ["import * as t from '@babel/types'\nimport { concatClassName } from '@tamagui/helpers'\n\nimport type { ClassNameObject } from '../types.js'\n\ntype Builder = (\n  objects: ClassNameObject[],\n  extras?: string\n) => t.Expression | t.StringLiteral | null\n\nexport const buildClassName: Builder = (objectsIn, extras = '') => {\n  let objects = buildClassNameLogic(objectsIn)\n  if (!objects) return null\n  if (t.isStringLiteral(objects)) {\n    objects.value = concatClassName(objects.value)\n    objects.value = `${extras} ${objects.value}`\n  } else {\n    objects = t.binaryExpression('+', t.stringLiteral(extras), objects)\n  }\n  return objects\n}\n\nexport const buildClassNameLogic: Builder = (objects) => {\n  return objects.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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,QAAmB;AACnB,qBAAgC;AASzB,MAAM,iBAA0B,CAAC,WAAW,SAAS,OAAO;AACjE,MAAI,UAAU,oBAAoB,SAAS;AAC3C,MAAI,CAAC;AAAS,WAAO;AACrB,MAAI,EAAE,gBAAgB,OAAO,GAAG;AAC9B,YAAQ,YAAQ,gCAAgB,QAAQ,KAAK;AAC7C,YAAQ,QAAQ,GAAG,UAAU,QAAQ;AAAA,EACvC,OAAO;AACL,cAAU,EAAE,iBAAiB,KAAK,EAAE,cAAc,MAAM,GAAG,OAAO;AAAA,EACpE;AACA,SAAO;AACT;AAEO,MAAM,sBAA+B,CAAC,YAAY;AACvD,SAAO,QAAQ,OAA4B,CAAC,KAAK,QAAQ;AACvD,QAAI,OAAO,MAAM;AACf,UAEE,EAAE,wBAAwB,GAAG,KAE7B,EAAE,gBAAgB,GAAG,KACrB,EAAE,iBAAiB,GAAG,GACtB;AACA,eAAO;AAAA,MACT;AACA,aAAO,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,IAC3D;AAEA,QAAI;AACJ,QAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAE1B,eAAO,EAAE,cAAc,GAAG,IAAI,SAAS,IAAI,OAAO;AAAA,MACpD;AACA,cAAQ,EAAE,cAAc,IAAI,IAAI,OAAO;AAAA,IACzC,WAAW,EAAE,UAAU,GAAG,GAAG;AAC3B,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,IAC3D,WAAW,EAAE,wBAAwB,GAAG,KAAK,EAAE,mBAAmB,GAAG,GAAG;AACtE,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,eAAO,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,IAAI,QAAQ,GAAG,GAAG;AAAA,MACtE;AACA,cAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,IAC3D,WAAW,EAAE,aAAa,GAAG,KAAK,EAAE,mBAAmB,GAAG,GAAG;AAE3D,cAAQ,EAAE;AAAA,QACR;AAAA,QACA,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,QACjD,EAAE,cAAc,EAAE;AAAA,MACpB;AAAA,IACF,OAAO;AACL,UAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,eAAO,EAAE;AAAA,UACP;AAAA,UACA,EAAE,cAAc,GAAG,IAAI,QAAQ;AAAA,UAC/B,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,QACpD;AAAA,MACF;AAEA,cAAQ,EAAE;AAAA,QACR;AAAA,QACA,EAAE,cAAc,GAAG;AAAA,QACnB,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,MACpD;AAAA,IACF;AAEA,WAAO,EAAE,iBAAiB,KAAK,KAAK,KAAK;AAAA,EAC3C,GAAG,IAAI;AACT;",
   "names": []
 }

package/dist/extractor/createEvaluator.js

@@ -37,21 +37,21 @@ var import_constants = require("../constants.js");
 var import_evaluateAstNode = require("./evaluateAstNode.js");
 var import_extractHelpers = require("./extractHelpers.js");
 function createEvaluator({
-  tamaguiConfig,
+  props,
   staticNamespace,
   sourcePath,
   traversePath,
   shouldPrintDebug
 }) {
   const evalFn = (n) => {
-    if (t.isMemberExpression(n) && t.isIdentifier(n.property) && traversePath && (0, import_extractHelpers.isValidThemeHook)(traversePath, n, sourcePath)) {
+    if (t.isMemberExpression(n) && t.isIdentifier(n.property) && traversePath && (0, import_extractHelpers.isValidThemeHook)(props, traversePath, n, sourcePath)) {
       const key = n.property.name;
       if (shouldPrintDebug) {
         console.log("    > found theme prop", key);
       }
       return (0, import_core_node.createCSSVariable)(key);
     }
-    if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {
+    if (t.isIdentifier(n) && typeof staticNamespace[n.name] !== "undefined") {
       return staticNamespace[n.name];
     }
     const evalContext = import_vm.default.createContext(staticNamespace);

package/dist/extractor/createEvaluator.js.map

@@ -1,7 +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-node'\nimport { createCSSVariable } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\n\nimport { FAILED_EVAL } from '../constants.js'\nimport { evaluateAstNode } from './evaluateAstNode.js'\nimport { isValidThemeHook } from './extractHelpers.js'\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 | 'verbose'\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      traversePath &&\n      isValidThemeHook(traversePath, n, sourcePath)\n    ) {\n      const key = n.property.name\n      if (shouldPrintDebug) {\n        // eslint-disable-next-line no-console\n        console.log('    > found theme prop', key)\n      }\n      return createCSSVariable(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 codeWithTypescriptAnnotations = `(${generate(n as any).code})`\n    const code = esbuild\n      .transformSync(codeWithTypescriptAnnotations, { loader: 'tsx' })\n      .code.replace(/;\\n$/, '')\n\n    if (shouldPrintDebug) {\n      // eslint-disable-next-line no-console\n      console.log('evaluating', code)\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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AAEf,uBAAqB;AAErB,QAAmB;AAEnB,uBAAkC;AAClC,qBAAoB;AAEpB,uBAA4B;AAC5B,6BAAgC;AAChC,4BAAiC;AAE1B,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAMG;AAED,QAAM,SAAS,CAAC,MAAc;AAE5B,QACE,EAAE,mBAAmB,CAAC,KACtB,EAAE,aAAa,EAAE,QAAQ,KACzB,oBACA,wCAAiB,cAAc,GAAG,UAAU,GAC5C;AACA,YAAM,MAAM,EAAE,SAAS;AACvB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,0BAA0B,GAAG;AAAA,MAC3C;AACA,iBAAO,oCAAkB,GAAG;AAAA,IAC9B;AAEA,QAAI,EAAE,aAAa,CAAC,KAAK,gBAAgB,eAAe,EAAE,IAAI,GAAG;AAC/D,aAAO,gBAAgB,EAAE;AAAA,IAC3B;AACA,UAAM,cAAc,UAAAA,QAAG,cAAc,eAAe;AACpD,UAAM,gCAAgC,QAAI,iBAAAC,SAAS,CAAQ,EAAE;AAC7D,UAAM,OAAO,eAAAC,QACV,cAAc,+BAA+B,EAAE,QAAQ,MAAM,CAAC,EAC9D,KAAK,QAAQ,QAAQ,EAAE;AAE1B,QAAI,kBAAkB;AAEpB,cAAQ,IAAI,cAAc,IAAI;AAAA,IAChC;AACA,WAAO,UAAAF,QAAG,aAAa,MAAM,WAAW;AAAA,EAC1C;AAEA,SAAO,CAAC,MAAc;AACpB,eAAO,wCAAgB,GAAG,MAAM;AAAA,EAClC;AACF;AAEO,SAAS,oBAAoB,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY,CAAC;AAAA,IACtB,SAAS,KAAP;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "sourcesContent": ["import vm from 'vm'\n\nimport generate from '@babel/generator'\nimport { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport { createCSSVariable } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\n\nimport { FAILED_EVAL } from '../constants.js'\nimport { TamaguiOptionsWithFileInfo } from '../types.js'\nimport { evaluateAstNode } from './evaluateAstNode.js'\nimport { isValidThemeHook } from './extractHelpers.js'\n\nexport function createEvaluator({\n  props,\n  staticNamespace,\n  sourcePath,\n  traversePath,\n  shouldPrintDebug,\n}: {\n  props: TamaguiOptionsWithFileInfo\n  staticNamespace: Record<string, any>\n  sourcePath: string\n  traversePath?: NodePath<t.JSXElement>\n  shouldPrintDebug: boolean | 'verbose'\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      traversePath &&\n      isValidThemeHook(props, traversePath, n, sourcePath)\n    ) {\n      const key = n.property.name\n      if (shouldPrintDebug) {\n        // eslint-disable-next-line no-console\n        console.log('    > found theme prop', key)\n      }\n      return createCSSVariable(key)\n    }\n    // variable\n    if (t.isIdentifier(n) && typeof staticNamespace[n.name] !== 'undefined') {\n      return staticNamespace[n.name]\n    }\n    const evalContext = vm.createContext(staticNamespace)\n    const codeWithTypescriptAnnotations = `(${generate(n as any).code})`\n    const code = esbuild\n      .transformSync(codeWithTypescriptAnnotations, { loader: 'tsx' })\n      .code.replace(/;\\n$/, '')\n\n    if (shouldPrintDebug) {\n      // eslint-disable-next-line no-console\n      console.log('evaluating', code)\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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AAEf,uBAAqB;AAErB,QAAmB;AACnB,uBAAkC;AAClC,qBAAoB;AAEpB,uBAA4B;AAE5B,6BAAgC;AAChC,4BAAiC;AAE1B,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAMG;AAED,QAAM,SAAS,CAAC,MAAc;AAE5B,QACE,EAAE,mBAAmB,CAAC,KACtB,EAAE,aAAa,EAAE,QAAQ,KACzB,oBACA,wCAAiB,OAAO,cAAc,GAAG,UAAU,GACnD;AACA,YAAM,MAAM,EAAE,SAAS;AACvB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,0BAA0B,GAAG;AAAA,MAC3C;AACA,iBAAO,oCAAkB,GAAG;AAAA,IAC9B;AAEA,QAAI,EAAE,aAAa,CAAC,KAAK,OAAO,gBAAgB,EAAE,UAAU,aAAa;AACvE,aAAO,gBAAgB,EAAE;AAAA,IAC3B;AACA,UAAM,cAAc,UAAAA,QAAG,cAAc,eAAe;AACpD,UAAM,gCAAgC,QAAI,iBAAAC,SAAS,CAAQ,EAAE;AAC7D,UAAM,OAAO,eAAAC,QACV,cAAc,+BAA+B,EAAE,QAAQ,MAAM,CAAC,EAC9D,KAAK,QAAQ,QAAQ,EAAE;AAE1B,QAAI,kBAAkB;AAEpB,cAAQ,IAAI,cAAc,IAAI;AAAA,IAChC;AACA,WAAO,UAAAF,QAAG,aAAa,MAAM,WAAW;AAAA,EAC1C;AAEA,SAAO,CAAC,MAAc;AACpB,eAAO,wCAAgB,GAAG,MAAM;AAAA,EAClC;AACF;AAEO,SAAS,oBAAoB,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY,CAAC;AAAA,IACtB,SAAS,KAAP;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": ["vm", "generate", "esbuild"]
 }

package/dist/extractor/createExtractor.js

@@ -131,7 +131,7 @@ function createExtractor({ logger = console } = { logger: console }) {
       prefixLogs,
       excludeProps,
       target,
-      ...props
+      ...restProps
     } = options;
     let shouldPrintDebug = options.shouldPrintDebug || false;
     if (disable) {
@@ -146,6 +146,10 @@ function createExtractor({ logger = console } = { logger: console }) {
     const isTargetingHTML = target === "html";
     const ogDebug = shouldPrintDebug;
     const tm = (0, import_timer.timer)();
+    const propsWithFileInfo = {
+      ...options,
+      sourcePath
+    };
     if (shouldPrintDebug === "verbose") {
       console.log("tamagui.config.ts:", { components, config });
     }
@@ -163,9 +167,6 @@ function createExtractor({ logger = console } = { logger: console }) {
       }
     });
     const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
-    const isInternalImport = (importStr) => {
-      return (0, import_extractHelpers.isInsideTamagui)(sourcePath) && importStr[0] === ".";
-    };
     const validComponents = Object.keys(components).filter((key) => {
       var _a;
       return key[0].toUpperCase() === key[0] && !!((_a = components[key]) == null ? void 0 : _a.staticConfig);
@@ -189,9 +190,9 @@ function createExtractor({ logger = console } = { logger: console }) {
         continue;
       const node = "node" in bodyPath ? bodyPath.node : bodyPath;
       const from = node.source.value;
-      const isValidImport = props.components.includes(from) || isInternalImport(from) || from === "@tamagui/core" || from === "tamagui";
+      const valid = (0, import_extractHelpers.isValidImport)(propsWithFileInfo, from);
       if (extractStyledDefinitions) {
-        if (isValidImport) {
+        if (valid) {
           if (node.specifiers.some((specifier) => {
             return specifier.local.name === "styled";
           })) {
@@ -200,7 +201,7 @@ function createExtractor({ logger = console } = { logger: console }) {
           }
         }
       }
-      if (isValidImport) {
+      if (valid) {
         const names = node.specifiers.map((specifier) => specifier.local.name);
         const isValidComponent = names.some((name) => !!(validComponents[name] || validHooks[name]));
         if (shouldPrintDebug === "verbose") {
@@ -237,20 +238,20 @@ function createExtractor({ logger = console } = { logger: console }) {
     };
     callTraverse({
       Program: {
-        enter(path) {
-          programPath = path;
+        enter(path2) {
+          programPath = path2;
         }
       },
-      CallExpression(path) {
+      CallExpression(path2) {
         var _a, _b;
         if (disable || disableExtraction || extractStyledDefinitions === false) {
           return;
         }
-        if (!t.isIdentifier(path.node.callee) || path.node.callee.name !== "styled") {
+        if (!t.isIdentifier(path2.node.callee) || path2.node.callee.name !== "styled") {
           return;
         }
-        const name = t.isVariableDeclarator(path.parent) && t.isIdentifier(path.parent.id) ? path.parent.id.name : "unknown";
-        const definition = path.node.arguments[1];
+        const name = t.isVariableDeclarator(path2.parent) && t.isIdentifier(path2.parent.id) ? path2.parent.id.name : "unknown";
+        const definition = path2.node.arguments[1];
         if (!name || !definition || !t.isObjectExpression(definition)) {
           return;
         }
@@ -273,11 +274,13 @@ function createExtractor({ logger = console } = { logger: console }) {
               logger.info([`Loaded`, Object.keys(out2.components).join(", "), !!Component].join(" "));
             }
           } catch (err) {
-            logger.info(
-              `${(0, import_getPrefixLogs.getPrefixLogs)(
-                options
-              )} skip optimize styled(${name}), unable to pre-process (DEBUG=tamagui for more)`
-            );
+            if (shouldPrintDebug) {
+              logger.info(
+                `${(0, import_getPrefixLogs.getPrefixLogs)(
+                  options
+                )} skip optimize styled(${name}), unable to pre-process (DEBUG=tamagui for more)`
+              );
+            }
             if (process.env.DEBUG === "tamagui") {
               logger.info(
                 ` Disable this with "disableExtractFoundComponents" in your build-time configuration. 
@@ -302,14 +305,14 @@ function createExtractor({ logger = console } = { logger: console }) {
         const skipped = [];
         const styles = {};
         const staticNamespace = (0, import_getStaticBindingsForScope.getStaticBindingsForScope)(
-          path.scope,
+          path2.scope,
           importsWhitelist,
           sourcePath,
           bindingCache,
           shouldPrintDebug
         );
         const attemptEval = !evaluateVars ? import_evaluateAstNode.evaluateAstNode : (0, import_createEvaluator.createEvaluator)({
-          tamaguiConfig,
+          props: options,
           staticNamespace,
           sourcePath,
           shouldPrintDebug
@@ -379,18 +382,32 @@ function createExtractor({ logger = console } = { logger: console }) {
         const binding = traversePath.scope.getBinding(node.name.name);
         if (binding) {
           if (!t.isImportDeclaration(binding.path.parent)) {
+            if (shouldPrintDebug) {
+              logger.info(` - Binding not import declaration, skip`);
+            }
             return;
           }
           const source = binding.path.parent.source;
-          if (!props.components.includes(source.value) && !isInternalImport(source.value)) {
+          if (!(0, import_extractHelpers.isValidImport)(propsWithFileInfo, source.value)) {
+            if (shouldPrintDebug) {
+              logger.info(` - Binding not internal import or from components ${source.value}`);
+            }
             return;
           }
           if (!validComponents[binding.identifier.name]) {
+            if (shouldPrintDebug) {
+              logger.info(
+                ` - Binding not valid component (binding.identifier.name) ${binding.identifier.name}`
+              );
+            }
             return;
           }
         }
         const component = validComponents[node.name.name];
         if (!component || !component.staticConfig) {
+          if (shouldPrintDebug) {
+            logger.info(` - No Tamagui conf on this: ${node.name.name}`);
+          }
           return;
         }
         const originalNodeName = node.name.name;
@@ -438,8 +455,8 @@ function createExtractor({ logger = console } = { logger: console }) {
           return;
         }
         try {
-          let evaluateAttribute2 = function(path) {
-            const attribute = path.node;
+          let evaluateAttribute2 = function(path2) {
+            const attribute = path2.node;
             const attr = { type: "attr", value: attribute };
             if (t.isJSXSpreadAttribute(attribute)) {
               const arg = attribute.argument;
@@ -528,9 +545,9 @@ function createExtractor({ logger = console } = { logger: console }) {
             }
             const [value, valuePath] = (() => {
               if (t.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
-                return [attribute.value.expression, path.get("value")];
+                return [attribute.value.expression, path2.get("value")];
               } else {
-                return [attribute.value, path.get("value")];
+                return [attribute.value, path2.get("value")];
               }
             })();
             const remove = () => {
@@ -546,7 +563,7 @@ function createExtractor({ logger = console } = { logger: console }) {
             if (name === "tag") {
               return {
                 type: "attr",
-                value: path.node
+                value: path2.node
               };
             }
             if (disableExtractVariables === true) {
@@ -605,10 +622,10 @@ function createExtractor({ logger = console } = { logger: console }) {
                     type: "style",
                     value: { [key]: styleValue },
                     name: key,
-                    attr: path.node
+                    attr: path2.node
                   };
                 }
-                if (import_validHTMLAttributes.validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-")) {
+                if (import_validHTMLAttributes.validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-") || key === "__source" || key === "__self") {
                   return attr;
                 }
                 if (shouldPrintDebug) {
@@ -644,7 +661,7 @@ function createExtractor({ logger = console } = { logger: console }) {
                   type: "style",
                   value: { [name]: styleValue },
                   name,
-                  attr: path.node
+                  attr: path2.node
                 };
               } else {
                 if (variants[name]) {
@@ -899,8 +916,8 @@ function createExtractor({ logger = console } = { logger: console }) {
           const isTextView = staticConfig.isText || false;
           const validStyles = (staticConfig == null ? void 0 : staticConfig.validStyles) ?? {};
           let tagName = staticConfig.defaultProps.tag ?? (isTextView ? "span" : "div");
-          traversePath.get("openingElement").get("attributes").forEach((path) => {
-            const attr = path.node;
+          traversePath.get("openingElement").get("attributes").forEach((path2) => {
+            const attr = path2.node;
             if (t.isJSXSpreadAttribute(attr))
               return;
             if (attr.name.name !== "tag")
@@ -912,12 +929,12 @@ function createExtractor({ logger = console } = { logger: console }) {
           });
           const flatNode = getFlattenedNode == null ? void 0 : getFlattenedNode({ isTextView, tag: tagName });
           const inlineProps = /* @__PURE__ */ new Set([
-            ...props.inlineProps || [],
+            ...restProps.inlineProps || [],
             ...staticConfig.inlineProps || []
           ]);
           const deoptProps = /* @__PURE__ */ new Set([
             "animation",
-            ...props.deoptProps || [],
+            ...restProps.deoptProps || [],
             ...staticConfig.deoptProps || []
           ]);
           const inlineWhenUnflattened = /* @__PURE__ */ new Set([...staticConfig.inlineWhenUnflattened || []]);
@@ -929,7 +946,7 @@ function createExtractor({ logger = console } = { logger: console }) {
             shouldPrintDebug
           );
           const attemptEval = !evaluateVars ? import_evaluateAstNode.evaluateAstNode : (0, import_createEvaluator.createEvaluator)({
-            tamaguiConfig,
+            props: options,
             staticNamespace,
             sourcePath,
             traversePath,
@@ -940,8 +957,8 @@ function createExtractor({ logger = console } = { logger: console }) {
             logger.info(`  staticNamespace ${Object.keys(staticNamespace).join(", ")}`);
           }
           const flattenedAttrs = [];
-          traversePath.get("openingElement").get("attributes").forEach((path) => {
-            const attr = path.node;
+          traversePath.get("openingElement").get("attributes").forEach((path2) => {
+            const attr = path2.node;
             if (!t.isJSXSpreadAttribute(attr)) {
               flattenedAttrs.push(attr);
               return;
@@ -995,13 +1012,13 @@ function createExtractor({ logger = console } = { logger: console }) {
           const variantValues = /* @__PURE__ */ new Map();
           let hasSetOptimized = false;
           const inlineWhenUnflattenedOGVals = {};
-          attrs = traversePath.get("openingElement").get("attributes").flatMap((path) => {
+          attrs = traversePath.get("openingElement").get("attributes").flatMap((path2) => {
             var _a2;
             try {
-              const res2 = evaluateAttribute2(path);
+              const res2 = evaluateAttribute2(path2);
               tm.mark("jsx-element-evaluate-attr", !!shouldPrintDebug);
               if (!res2) {
-                path.remove();
+                path2.remove();
               }
               return res2;
             } catch (err) {
@@ -1014,13 +1031,13 @@ function createExtractor({ logger = console } = { logger: console }) {
                   ].join(" ")
                 );
                 if (shouldPrintDebug === "verbose") {
-                  logger.info(`node ${(_a2 = path.node) == null ? void 0 : _a2.type}`);
+                  logger.info(`node ${(_a2 = path2.node) == null ? void 0 : _a2.type}`);
                 }
               }
               inlined.set(`${Math.random()}`, "spread");
               return {
                 type: "attr",
-                value: path.node
+                value: path2.node
               };
             }
           }).flat(4).filter(import_extractHelpers.isPresent);
@@ -1375,24 +1392,24 @@ function createExtractor({ logger = console } = { logger: console }) {
             logger.info(["  - foundStaticProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(foundStaticProps))].join(" "));
             logger.info(["  - completeProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeProps))].join(" "));
           }
-          const getStyles = (props2, debugName = "") => {
-            if (!props2 || !Object.keys(props2).length) {
+          const getStyles = (props, debugName = "") => {
+            if (!props || !Object.keys(props).length) {
               if (shouldPrintDebug)
                 logger.info([" getStyles() no props"].join(" "));
               return {};
             }
             if (excludeProps && !!excludeProps.size) {
-              for (const key in props2) {
+              for (const key in props) {
                 if (excludeProps.has(key)) {
                   if (shouldPrintDebug)
                     logger.info([" delete excluded", key].join(" "));
-                  delete props2[key];
+                  delete props[key];
                 }
               }
             }
             try {
               const out = (0, import_core_node.getSplitStyles)(
-                props2,
+                props,
                 staticConfig,
                 defaultTheme,
                 {