@tamagui/static 1.132.16 → 1.132.18

package/dist/extractor/concatClassName.js

@@ -0,0 +1,69 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: !0 });
+}, __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var concatClassName_exports = {};
+__export(concatClassName_exports, {
+  concatClassName: () => concatClassName
+});
+module.exports = __toCommonJS(concatClassName_exports);
+function concatClassName(_cn) {
+  const args = arguments, usedPrefixes = [];
+  let final = "";
+  const len = args.length;
+  let propObjects = null;
+  for (let x = len; x >= 0; x--) {
+    const cns = args[x];
+    if (!cns) continue;
+    if (!Array.isArray(cns) && typeof cns != "string") {
+      propObjects = propObjects || [], propObjects.push(cns);
+      continue;
+    }
+    const names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length;
+    for (let i = numNames - 1; i >= 0; i--) {
+      const name = names[i];
+      if (!name || name === " ") continue;
+      if (name[0] !== "_") {
+        final = name + " " + final;
+        continue;
+      }
+      const splitIndex = name.indexOf("-");
+      if (splitIndex < 1) {
+        final = name + " " + final;
+        continue;
+      }
+      const isMediaQuery = name[splitIndex + 1] === "_", styleKey = name.slice(1, name.lastIndexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
+      if (usedPrefixes.indexOf(uid) > -1)
+        continue;
+      usedPrefixes.push(uid);
+      const propName = styleKey;
+      propName && propObjects && propObjects.some((po) => {
+        if (mediaKey) {
+          const propKey = pseudoInvert[mediaKey];
+          return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
+        }
+        return po && propName in po && po[propName] !== null;
+      }) || (final = name + " " + final);
+    }
+  }
+  return final;
+}
+const pseudoInvert = {
+  hover: "hoverStyle",
+  focus: "focusStyle",
+  press: "pressStyle",
+  focusVisible: "focusVisibleStyle",
+  focusWithin: "focusWithinStyle",
+  disabled: "disabledStyle"
+};
+//# sourceMappingURL=concatClassName.js.map

package/dist/extractor/concatClassName.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/extractor/concatClassName.ts"],
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAUO,SAAS,gBAAgB,KAAqD;AACnF,QAAM,OAAO,WACP,eAAyB,CAAC;AAChC,MAAI,QAAQ;AAEZ,QAAM,MAAM,KAAK;AACjB,MAAI,cAAmB;AACvB,WAAS,IAAI,KAAK,KAAK,GAAG,KAAK;AAC7B,UAAM,MAAM,KAAK,CAAC;AAElB,QAAI,CAAC,IAAK;AACV,QAAI,CAAC,MAAM,QAAQ,GAAG,KAAK,OAAO,OAAQ,UAAU;AAElD,oBAAc,eAAe,CAAC,GAC9B,YAAY,KAAK,GAAG;AACpB;AAAA,IACF;AAEA,UAAM,QAAQ,MAAM,QAAQ,GAAG,IAAI,MAAM,IAAI,MAAM,GAAG,GAChD,WAAW,MAAM;AACvB,aAAS,IAAI,WAAW,GAAG,KAAK,GAAG,KAAK;AACtC,YAAM,OAAO,MAAM,CAAC;AAEpB,UAAI,CAAC,QAAQ,SAAS,IAAK;AAC3B,UAAI,KAAK,CAAC,MAAM,KAAK;AAEnB,gBAAQ,OAAO,MAAM;AACrB;AAAA,MACF;AAEA,YAAM,aAAa,KAAK,QAAQ,GAAG;AACnC,UAAI,aAAa,GAAG;AAClB,gBAAQ,OAAO,MAAM;AAErB;AAAA,MACF;AAKA,YAAM,eAHW,KAAK,aAAa,CAAC,MAGF,KAK5B,WAAW,KAAK,MAAM,GAAG,KAAK,YAAY,GAAG,CAAC,GAE9C,WAAW,eAAe,KAAK,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,MACvE,MAAM,WAAW,WAAW,WAAW;AAG7C,UAAI,aAAa,QAAQ,GAAG,IAAI;AAE9B;AAEF,mBAAa,KAAK,GAAG;AAGrB,YAAM,WAAW;AACjB,MAAI,YAAY,eAEZ,YAAY,KAAK,CAAC,OAAO;AACvB,YAAI,UAAU;AACZ,gBAAM,UAAU,aAAa,QAAQ;AACrC,iBAAO,MAAM,GAAG,OAAO,KAAK,YAAY,GAAG,OAAO,KAAK,GAAG,OAAO,MAAM;AAAA,QACzE;AAEA,eADY,MAAM,YAAY,MAAM,GAAG,QAAQ,MAAM;AAAA,MAEvD,CAAC,MAOL,QAAQ,OAAO,MAAM;AAAA,IACvB;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,eAAe;AAAA,EACnB,OAAO;AAAA,EACP,OAAO;AAAA,EACP,OAAO;AAAA,EACP,cAAc;AAAA,EACd,aAAa;AAAA,EACb,UAAU;AACZ;",
+  "names": []
+}

package/dist/extractor/concatClassName.native.js

@@ -0,0 +1,69 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: !0 });
+}, __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var concatClassName_exports = {};
+__export(concatClassName_exports, {
+  concatClassName: () => concatClassName
+});
+module.exports = __toCommonJS(concatClassName_exports);
+function concatClassName(_cn) {
+  for (var args = arguments, usedPrefixes = [], final = "", len = args.length, propObjects = null, x = len; x >= 0; x--) {
+    var _loop = function(i2) {
+      var name = names[i2];
+      if (!name || name === " ") return "continue";
+      if (name[0] !== "_")
+        return final = name + " " + final, "continue";
+      var splitIndex = name.indexOf("-");
+      if (splitIndex < 1)
+        return final = name + " " + final, "continue";
+      var nextChar = name[splitIndex + 1], isMediaQuery = nextChar === "_", styleKey = name.slice(1, name.lastIndexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
+      if (usedPrefixes.indexOf(uid) > -1)
+        return "continue";
+      usedPrefixes.push(uid);
+      var propName = styleKey;
+      if (propName && propObjects && propObjects.some(function(po) {
+        if (mediaKey) {
+          var propKey = pseudoInvert[mediaKey];
+          return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
+        }
+        var res = po && propName in po && po[propName] !== null;
+        return res;
+      }))
+        return "continue";
+      final = name + " " + final;
+    }, cns = args[x];
+    if (cns) {
+      if (!Array.isArray(cns) && typeof cns != "string") {
+        propObjects = propObjects || [], propObjects.push(cns);
+        continue;
+      }
+      for (var names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length, i = numNames - 1; i >= 0; i--) _loop(i);
+    }
+  }
+  return final;
+}
+var pseudoInvert = {
+  hover: "hoverStyle",
+  focus: "focusStyle",
+  press: "pressStyle",
+  focusVisible: "focusVisibleStyle",
+  focusWithin: "focusWithinStyle",
+  disabled: "disabledStyle"
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  concatClassName
+});
+//# sourceMappingURL=concatClassName.js.map

package/dist/extractor/concatClassName.native.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/extractor/concatClassName.ts"],
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAUO,SAASA,gBAAgBC,KAA2C;AAOzE,WANMC,OAAOC,WACPC,eAAyB,CAAA,GAC3BC,QAAQ,IAENC,MAAMJ,KAAKK,QACbC,cAAmB,MACdC,IAAIH,KAAKG,KAAK,GAAGA,KAAK;;AAc3B,UAAMC,OAAOC,MAAMC,EAAAA;AAEnB,UAAI,CAACF,QAAQA,SAAS,IAAK,QAAA;AAC3B,UAAIA,KAAK,CAAA,MAAO;AAEdL,uBAAQK,OAAO,MAAML,OACrB;AAGF,UAAMQ,aAAaH,KAAKI,QAAQ,GAAA;AAChC,UAAID,aAAa;AACfR,uBAAQK,OAAO,MAAML,OAErB;AAGF,UAAMU,WAAWL,KAAKG,aAAa,CAAA,GAG7BG,eAAeD,aAAa,KAK5BE,WAAWP,KAAKQ,MAAM,GAAGR,KAAKS,YAAY,GAAA,CAAA,GAE1CC,WAAWJ,eAAeN,KAAKQ,MAAML,aAAa,GAAGA,aAAa,CAAA,IAAK,MACvEQ,MAAMD,WAAWH,WAAWG,WAAWH;AAG7C,UAAIb,aAAaU,QAAQO,GAAAA,IAAO;AAE9B,eAAA;AAEFjB,mBAAakB,KAAKD,GAAAA;AAGlB,UAAME,WAAWN;AACjB,UAAIM,YAAYf,eAEZA,YAAYgB,KAAK,SAACC,IAAAA;AAChB,YAAIL,UAAU;AACZ,cAAMM,UAAUC,aAAaP,QAAAA;AAC7B,iBAAOK,MAAMA,GAAGC,OAAAA,KAAYH,YAAYE,GAAGC,OAAAA,KAAYD,GAAGC,OAAAA,MAAa;QACzE;AACA,YAAME,MAAMH,MAAMF,YAAYE,MAAMA,GAAGF,QAAAA,MAAc;AACrD,eAAOK;MACT,CAAA;AAGA,eAAA;AAIJvB,cAAQK,OAAO,MAAML;IACvB,GApEMwB,MAAM3B,KAAKO,CAAAA;AAEjB,QAAKoB,KACL;UAAI,CAACC,MAAMC,QAAQF,GAAAA,KAAQ,OAAOA,OAAQ,UAAU;AAElDrB,sBAAcA,eAAe,CAAA,GAC7BA,YAAYc,KAAKO,GAAAA;AACjB;MACF;AAIA,eAFMlB,QAAQmB,MAAMC,QAAQF,GAAAA,IAAOA,MAAMA,IAAIG,MAAM,GAAA,GAC7CC,WAAWtB,MAAMJ,QACdK,IAAIqB,WAAW,GAAGrB,KAAK,GAAGA,IAAAA,OAAAA,CAAAA;;EAyDrC;AAEA,SAAOP;AACT;AAEA,IAAMsB,eAAe;EACnBO,OAAO;EACPC,OAAO;EACPC,OAAO;EACPC,cAAc;EACdC,aAAa;EACbC,UAAU;AACZ;",
+  "names": ["concatClassName", "_cn", "args", "arguments", "usedPrefixes", "final", "len", "length", "propObjects", "x", "name", "names", "i", "splitIndex", "indexOf", "nextChar", "isMediaQuery", "styleKey", "slice", "lastIndexOf", "mediaKey", "uid", "push", "propName", "some", "po", "propKey", "pseudoInvert", "res", "cns", "Array", "isArray", "split", "numNames", "hover", "focus", "press", "focusVisible", "focusWithin", "disabled"]
+}

package/dist/extractor/createEvaluator.js

@@ -38,7 +38,19 @@ function createEvaluator({
     if (t.isIdentifier(n) && typeof staticNamespace[n.name] < "u")
       return staticNamespace[n.name];
     const evalContext = import_node_vm.default.createContext(staticNamespace), codeWithTypescriptAnnotations = `(${(0, import_generator.default)(n).code})`, code = import_esbuild.default.transformSync(codeWithTypescriptAnnotations, { loader: "tsx" }).code.replace(/;\n$/, "");
-    return shouldPrintDebug && console.info("evaluating", code), import_node_vm.default.runInContext(code, evalContext);
+    shouldPrintDebug && console.info("evaluating", code);
+    const result1 = import_node_vm.default.runInContext(code, evalContext), result2 = import_node_vm.default.runInContext(code, evalContext);
+    if (!(Object.is(result1, result2) || typeof result1 == "object" && typeof result2 == "object" && JSON.stringify(result1) === JSON.stringify(result2)))
+      throw shouldPrintDebug && console.info(
+        "Bailing on non-deterministic expression:",
+        code,
+        `
+First result:`,
+        result1,
+        "Second result:",
+        result2
+      ), new Error("Non-deterministic value, bailing");
+    return result1;
   };
   return (n) => (0, import_evaluateAstNode.evaluateAstNode)(n, evalFn);
 }

package/dist/extractor/createEvaluator.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/extractor/createEvaluator.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAe,6BAEf,mBAAqB,sCAErB,IAAmB,kCACnB,iBAAoB,6BAEpB,mBAA4B,yBAE5B,yBAAgC;AAEzB,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAMG;AAED,QAAM,SAAS,CAAC,MAAc;AAE5B,QAAI,EAAE,aAAa,CAAC,KAAK,OAAO,gBAAgB,EAAE,IAAI,IAAM;AAC1D,aAAO,gBAAgB,EAAE,IAAI;AAE/B,UAAM,cAAc,eAAAA,QAAG,cAAc,eAAe,GAE9C,gCAAgC,QAAI,iBAAAC,SAAS,CAAQ,EAAE,IAAI,KAC3D,OAAO,eAAAC,QACV,cAAc,+BAA+B,EAAE,QAAQ,MAAM,CAAC,EAC9D,KAAK,QAAQ,QAAQ,EAAE;AAE1B,WAAI,oBACF,QAAQ,KAAK,cAAc,IAAI,GAE1B,eAAAF,QAAG,aAAa,MAAM,WAAW;AAAA,EAC1C;AAEA,SAAO,CAAC,UACC,wCAAgB,GAAG,MAAM;AAEpC;AAEO,SAAS,oBAAoB,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY,CAAC;AAAA,IACtB,QAAc;AACZ,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAe,6BAEf,mBAAqB,sCAErB,IAAmB,kCACnB,iBAAoB,6BAEpB,mBAA4B,yBAE5B,yBAAgC;AAEzB,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAMG;AAED,QAAM,SAAS,CAAC,MAAc;AAE5B,QAAI,EAAE,aAAa,CAAC,KAAK,OAAO,gBAAgB,EAAE,IAAI,IAAM;AAC1D,aAAO,gBAAgB,EAAE,IAAI;AAG/B,UAAM,cAAc,eAAAA,QAAG,cAAc,eAAe,GAE9C,gCAAgC,QAAI,iBAAAC,SAAS,CAAQ,EAAE,IAAI,KAC3D,OAAO,eAAAC,QACV,cAAc,+BAA+B,EAAE,QAAQ,MAAM,CAAC,EAC9D,KAAK,QAAQ,QAAQ,EAAE;AAE1B,IAAI,oBACF,QAAQ,KAAK,cAAc,IAAI;AAGjC,UAAM,UAAU,eAAAF,QAAG,aAAa,MAAM,WAAW,GAC3C,UAAU,eAAAA,QAAG,aAAa,MAAM,WAAW;AAQjD,QAAI,EALF,OAAO,GAAG,SAAS,OAAO,KACzB,OAAO,WAAY,YAClB,OAAO,WAAY,YACnB,KAAK,UAAU,OAAO,MAAM,KAAK,UAAU,OAAO;AAGpD,YAAI,oBACF,QAAQ;AAAA,QACN;AAAA,QACA;AAAA,QACA;AAAA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,GAEI,IAAI,MAAM,kCAAkC;AAGpD,WAAO;AAAA,EACT;AAEA,SAAO,CAAC,UACC,wCAAgB,GAAG,MAAM;AAEpC;AAEO,SAAS,oBAAoB,aAAiC;AACnE,SAAO,CAAC,MAAc;AACpB,QAAI;AACF,aAAO,YAAY,CAAC;AAAA,IACtB,QAAc;AACZ,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": ["vm", "generate", "esbuild"]
 }

package/dist/extractor/createEvaluator.native.js

@@ -35,7 +35,12 @@ function createEvaluator(param) {
     var evalContext = import_node_vm.default.createContext(staticNamespace), codeWithTypescriptAnnotations = `(${(0, import_generator.default)(n).code})`, code = import_esbuild.default.transformSync(codeWithTypescriptAnnotations, {
       loader: "tsx"
     }).code.replace(/;\n$/, "");
-    return shouldPrintDebug && console.info("evaluating", code), import_node_vm.default.runInContext(code, evalContext);
+    shouldPrintDebug && console.info("evaluating", code);
+    var result1 = import_node_vm.default.runInContext(code, evalContext), result2 = import_node_vm.default.runInContext(code, evalContext), isDeterministic = Object.is(result1, result2) || typeof result1 == "object" && typeof result2 == "object" && JSON.stringify(result1) === JSON.stringify(result2);
+    if (!isDeterministic)
+      throw shouldPrintDebug && console.info("Bailing on non-deterministic expression:", code, `
+First result:`, result1, "Second result:", result2), new Error("Non-deterministic value, bailing");
+    return result1;
   };
   return function(n) {
     return (0, import_evaluateAstNode.evaluateAstNode)(n, evalFn);

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/extractor/createEvaluator.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;qBAAe,6BAEf,mBAAqB,sCAErB,IAAmB,kCACnB,iBAAoB,6BAEpB,mBAA4B,yBAE5B,yBAAgC;AAEzB,SAASA,gBAAgB,OAY/B;MAZ+B,EAC9BC,OACAC,iBACAC,YACAC,cACAC,iBAAgB,IALc,OAcxBC,SAAS,SAACC,GAAAA;AAEd,QAAIC,EAAEC,aAAaF,CAAAA,KAAM,OAAOL,gBAAgBK,EAAEG,IAAI,IAAM;AAC1D,aAAOR,gBAAgBK,EAAEG,IAAI;AAE/B,QAAMC,cAAcC,eAAAA,QAAGC,cAAcX,eAAAA,GAE/BY,gCAAgC,QAAIC,iBAAAA,SAASR,CAAAA,EAAUS,IAAI,KAC3DA,OAAOC,eAAAA,QACVC,cAAcJ,+BAA+B;MAAEK,QAAQ;IAAM,CAAA,EAC7DH,KAAKI,QAAQ,QAAQ,EAAA;AAExB,WAAIf,oBACFgB,QAAQC,KAAK,cAAcN,IAAAA,GAEtBJ,eAAAA,QAAGW,aAAaP,MAAML,WAAAA;EAC/B;AAEA,SAAO,SAACJ,GAAAA;AACN,eAAOiB,wCAAgBjB,GAAGD,MAAAA;EAC5B;AACF;AAEO,SAASmB,oBAAoBC,aAA+B;AACjE,SAAO,SAACnB,GAAAA;AACN,QAAI;AACF,aAAOmB,YAAYnB,CAAAA;IACrB,QAAc;AACZ,aAAOoB;IACT;EACF;AACF;",
-  "names": ["createEvaluator", "props", "staticNamespace", "sourcePath", "traversePath", "shouldPrintDebug", "evalFn", "n", "t", "isIdentifier", "name", "evalContext", "vm", "createContext", "codeWithTypescriptAnnotations", "generate", "code", "esbuild", "transformSync", "loader", "replace", "console", "info", "runInContext", "evaluateAstNode", "createSafeEvaluator", "attemptEval", "FAILED_EVAL"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;qBAAe,6BAEf,mBAAqB,sCAErB,IAAmB,kCACnB,iBAAoB,6BAEpB,mBAA4B,yBAE5B,yBAAgC;AAEzB,SAASA,gBAAgB,OAY/B;MAZ+B,EAC9BC,OACAC,iBACAC,YACAC,cACAC,iBAAgB,IALc,OAcxBC,SAAS,SAACC,GAAAA;AAEd,QAAIC,EAAEC,aAAaF,CAAAA,KAAM,OAAOL,gBAAgBK,EAAEG,IAAI,IAAM;AAC1D,aAAOR,gBAAgBK,EAAEG,IAAI;AAG/B,QAAMC,cAAcC,eAAAA,QAAGC,cAAcX,eAAAA,GAE/BY,gCAAgC,QAAIC,iBAAAA,SAASR,CAAAA,EAAUS,IAAI,KAC3DA,OAAOC,eAAAA,QACVC,cAAcJ,+BAA+B;MAAEK,QAAQ;IAAM,CAAA,EAC7DH,KAAKI,QAAQ,QAAQ,EAAA;AAExB,IAAIf,oBACFgB,QAAQC,KAAK,cAAcN,IAAAA;AAG7B,QAAMO,UAAUX,eAAAA,QAAGY,aAAaR,MAAML,WAAAA,GAChCc,UAAUb,eAAAA,QAAGY,aAAaR,MAAML,WAAAA,GAEhCe,kBACJC,OAAOC,GAAGL,SAASE,OAAAA,KAClB,OAAOF,WAAY,YAClB,OAAOE,WAAY,YACnBI,KAAKC,UAAUP,OAAAA,MAAaM,KAAKC,UAAUL,OAAAA;AAE/C,QAAI,CAACC;AACH,YAAIrB,oBACFgB,QAAQC,KACN,4CACAN,MACA;gBACAO,SACA,kBACAE,OAAAA,GAGE,IAAIM,MAAM,kCAAkC;AAGpD,WAAOR;EACT;AAEA,SAAO,SAAChB,GAAAA;AACN,eAAOyB,wCAAgBzB,GAAGD,MAAAA;EAC5B;AACF;AAEO,SAAS2B,oBAAoBC,aAA+B;AACjE,SAAO,SAAC3B,GAAAA;AACN,QAAI;AACF,aAAO2B,YAAY3B,CAAAA;IACrB,QAAc;AACZ,aAAO4B;IACT;EACF;AACF;",
+  "names": ["createEvaluator", "props", "staticNamespace", "sourcePath", "traversePath", "shouldPrintDebug", "evalFn", "n", "t", "isIdentifier", "name", "evalContext", "vm", "createContext", "codeWithTypescriptAnnotations", "generate", "code", "esbuild", "transformSync", "loader", "replace", "console", "info", "result1", "runInContext", "result2", "isDeterministic", "Object", "is", "JSON", "stringify", "Error", "evaluateAstNode", "createSafeEvaluator", "attemptEval", "FAILED_EVAL"]
 }

package/dist/extractor/createExtractor.js

@@ -25,7 +25,7 @@ __export(createExtractor_exports, {
   createExtractor: () => createExtractor
 });
 module.exports = __toCommonJS(createExtractor_exports);
-var import_traverse = __toESM(require("@babel/traverse")), t = __toESM(require("@babel/types")), import_cli_color = require("@tamagui/cli-color"), reactNativeWebInternals = __toESM(require("@tamagui/react-native-web-internals")), import_web = require("@tamagui/web"), import_node_path = require("node:path"), import_constants = require("../constants"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_createEvaluator = require("./createEvaluator"), import_evaluateAstNode = require("./evaluateAstNode"), import_extractHelpers = require("./extractHelpers"), import_findTopmostFunction = require("./findTopmostFunction"), import_getStaticBindingsForScope = require("./getStaticBindingsForScope"), import_literalToAst = require("./literalToAst"), import_loadTamagui = require("./loadTamagui"), import_logLines = require("./logLines"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_validHTMLAttributes = require("./validHTMLAttributes");
+var import_traverse = __toESM(require("@babel/traverse")), t = __toESM(require("@babel/types")), import_cli_color = require("@tamagui/cli-color"), reactNativeWebInternals = __toESM(require("@tamagui/react-native-web-internals")), import_web = require("@tamagui/web"), import_node_path = require("node:path"), import_constants = require("../constants"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_createEvaluator = require("./createEvaluator"), import_evaluateAstNode = require("./evaluateAstNode"), import_extractHelpers = require("./extractHelpers"), import_findTopmostFunction = require("./findTopmostFunction"), import_getStaticBindingsForScope = require("./getStaticBindingsForScope"), import_literalToAst = require("./literalToAst"), import_loadTamagui = require("./loadTamagui"), import_logLines = require("./logLines"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_validHTMLAttributes = require("./validHTMLAttributes"), import_errors = require("./errors");
 const UNTOUCHED_PROPS = {
   key: !0,
   style: !0,
@@ -98,11 +98,10 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
       evaluateVars = !0,
       sourcePath = "",
       onExtractTag,
-      onStyleRule,
+      onStyledDefinitionRule,
       getFlattenedNode,
       disable,
       disableExtraction,
-      disableExtractInlineMedia,
       disableExtractVariables,
       disableDebugAttr,
       enableDynamicEvaluation = !1,
@@ -366,7 +365,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
         }), out.rulesToInsert)
           for (const key in out.rulesToInsert) {
             const styleObject = out.rulesToInsert[key];
-            onStyleRule?.(
+            onStyledDefinitionRule?.(
               styleObject[import_web.StyleObjectIdentifier],
               styleObject[import_web.StyleObjectRules]
             );
@@ -439,11 +438,8 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
                 const [test, alt, cons] = conditional;
                 if (!test) throw new Error("no test");
                 return [alt, cons].some((side) => side && !isStaticObject(side)) ? (shouldPrintDebug && logger.info(`not extractable ${alt} ${cons}`), attr) : [
-                  ...createTernariesFromObjectProperties(test, alt) || [],
-                  ...cons && createTernariesFromObjectProperties(
-                    t.unaryExpression("!", test),
-                    cons
-                  ) || []
+                  ...flattenNestedTernaries(test, alt) || [],
+                  ...cons && flattenNestedTernaries(t.unaryExpression("!", test), cons) || []
                 ].map((ternary) => ({
                   type: "ternary",
                   value: ternary
@@ -470,11 +466,9 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             if (name[0] === "$" && t.isJSXExpressionContainer(attribute?.value)) {
               const shortname = name.slice(1);
               if (mediaQueryConfig[shortname]) {
-                if (platform2 === "native" && (shouldDeopt = !0), disableExtractInlineMedia)
-                  return attr;
                 const expression = attribute.value.expression;
                 if (!t.isJSXEmptyExpression(expression)) {
-                  const ternaries2 = createTernariesFromObjectProperties(
+                  const ternaries2 = flattenNestedTernaries(
                     t.stringLiteral(shortname),
                     expression,
                     {
@@ -562,12 +556,6 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             const staticLogical = getStaticLogical(value);
             if (staticLogical)
               return shouldPrintDebug === "verbose" && logger.info(` static ternary ${name} =  ${value}`), { type: "ternary", value: staticLogical };
-            if (options.experimentalFlattenDynamicValues && isValidStyleKey(name, staticConfig))
-              return {
-                type: "dynamic-style",
-                value,
-                name: tamaguiConfig?.shorthands[name] || name
-              };
             return inlined.set(name, !0), shouldPrintDebug && logger.info(` ! inline no match ${name} ${value}`), attr;
             function addBinaryConditional(operator, staticExpr, cond) {
               if (getStaticConditional(cond)) {
@@ -629,7 +617,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
               const propName = prop.key.name;
               return !isValidStyleKey(propName, staticConfig) && propName !== "tag" ? (shouldPrintDebug && logger.info(["  not a valid style prop!", propName].join(" ")), !1) : !0;
             });
-          }, createTernariesFromObjectProperties = function(test, side, ternaryPartial = {}) {
+          }, flattenNestedTernaries = function(test, side, ternaryPartial = {}) {
             if (!side)
               return null;
             if (!isStaticObject(side))
@@ -637,28 +625,6 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             return side.properties.flatMap((property) => {
               if (!t.isObjectProperty(property))
                 throw new Error("expected object property");
-              if (t.isIdentifier(property.key)) {
-                const key = property.key.name, mediaQueryKey = key.slice(1);
-                if (key[0] === "$" && mediaQueryConfig[mediaQueryKey])
-                  if (t.isExpression(property.value)) {
-                    const ternaries2 = createTernariesFromObjectProperties(
-                      t.stringLiteral(mediaQueryKey),
-                      property.value,
-                      {
-                        inlineMediaQuery: mediaQueryKey
-                      }
-                    );
-                    if (ternaries2)
-                      return ternaries2.map((value) => ({
-                        ...ternaryPartial,
-                        ...value,
-                        // ensure media query test stays on left side (see getMediaQueryTernary)
-                        test: t.logicalExpression("&&", value.test, test)
-                      }));
-                    logger.info(["\u26A0\uFE0F no ternaries?", property].join(" "));
-                  } else
-                    logger.info(["\u26A0\uFE0F not expression", property].join(" "));
-              }
               if (t.isConditionalExpression(property.value)) {
                 const [truthy, falsy] = [
                   t.objectExpression([
@@ -728,7 +694,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             const val = attr.value;
             t.isStringLiteral(val) && (tagName = val.value);
           }), shouldPrintDebug === "verbose" && console.info(` Start tag ${tagName}`);
-          const flatNode = getFlattenedNode?.({ isTextView, tag: tagName }), inlineProps = /* @__PURE__ */ new Set([
+          const flatNodeName = getFlattenedNode?.({ isTextView, tag: tagName }), inlineProps = /* @__PURE__ */ new Set([
             // adding some always inline props
             "dataSet",
             ...restProps.inlineProps || [],
@@ -823,46 +789,53 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             (INLINE_EXTRACTABLE[key] || isStaticObjectVariant) && inlined.delete(key);
           }
           const canFlattenProps = inlined.size === 0;
-          let shouldFlatten = !!(flatNode && !shouldDeopt && canFlattenProps && !hasSpread && !staticConfig.isStyledHOC && !staticConfig.isHOC && !staticConfig.isReactNative && staticConfig.neverFlatten !== !0 && (staticConfig.neverFlatten !== "jsx" || hasOnlyStringChildren));
+          let shouldFlatten = !!(flatNodeName && !shouldDeopt && canFlattenProps && !hasSpread && !staticConfig.isStyledHOC && !staticConfig.isHOC && !staticConfig.isReactNative && staticConfig.neverFlatten !== !0 && (staticConfig.neverFlatten !== "jsx" || hasOnlyStringChildren));
           const usedThemeKeys = /* @__PURE__ */ new Set();
           if (themeAccessListeners.add((key) => {
             disableExtractVariables && (usedThemeKeys.add(key), shouldFlatten = !1, shouldPrintDebug === "verbose" && logger.info([" ! accessing theme key, avoid flatten", key].join(" ")));
-          }), shouldFlatten) {
-            let skipMap = !1;
-            const defaultStyleAttrs = Object.keys(defaultProps).flatMap((key) => {
-              if (skipMap) return [];
-              const value = defaultProps[key];
-              if (key === "theme" && !themeVal)
-                return platform2 === "native" && (shouldFlatten = !1, skipMap = !0, inlined.set("theme", { value: t.stringLiteral(value) })), themeVal = { value: t.stringLiteral(value) }, [];
-              if (!isValidStyleKey(key, staticConfig))
-                return [];
-              const name = tamaguiConfig?.shorthands[key] || key;
-              if (value === void 0) {
-                logger.warn(
-                  `\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`
-                ), shouldDeopt = !0;
-                return;
-              }
-              return name[0] === "$" && mediaQueryConfig[name.slice(1)] ? (defaultProps[key] = void 0, evaluateAttribute({
-                node: t.jsxAttribute(
-                  t.jsxIdentifier(name),
-                  t.jsxExpressionContainer(
-                    t.objectExpression(
-                      Object.keys(value).filter((k) => typeof value[k] < "u").map((k) => t.objectProperty(
-                        t.identifier(k),
-                        (0, import_literalToAst.literalToAst)(value[k])
-                      ))
-                    )
+          }), !shouldFlatten) {
+            shouldPrintDebug && logger.info(
+              `Deopting ${JSON.stringify({
+                shouldFlatten,
+                shouldDeopt,
+                canFlattenProps,
+                hasSpread,
+                neverFlatten: staticConfig.neverFlatten
+              })}`
+            ), node.attributes = ogAttributes;
+            return;
+          }
+          let skipMap = !1;
+          const defaultStyleAttrs = Object.keys(defaultProps).flatMap((key) => {
+            if (skipMap) return [];
+            const value = defaultProps[key];
+            if (key === "theme" && !themeVal)
+              return platform2 === "native" && (shouldFlatten = !1, skipMap = !0, inlined.set("theme", { value: t.stringLiteral(value) })), themeVal = { value: t.stringLiteral(value) }, [];
+            if (!isValidStyleKey(key, staticConfig))
+              return [];
+            const name = tamaguiConfig?.shorthands[key] || key;
+            if (value === void 0) {
+              logger.warn(
+                `\u26A0\uFE0F Error evaluating default style for component, prop ${key} ${value}`
+              ), shouldDeopt = !0;
+              return;
+            }
+            return name[0] === "$" && mediaQueryConfig[name.slice(1)] ? (defaultProps[key] = void 0, evaluateAttribute({
+              node: t.jsxAttribute(
+                t.jsxIdentifier(name),
+                t.jsxExpressionContainer(
+                  t.objectExpression(
+                    Object.keys(value).filter((k) => typeof value[k] < "u").map((k) => t.objectProperty(t.identifier(k), (0, import_literalToAst.literalToAst)(value[k])))
                   )
                 )
-              })) : {
-                type: "style",
-                name,
-                value: { [name]: value }
-              };
-            });
-            skipMap || defaultStyleAttrs.length && (attrs = [...defaultStyleAttrs, ...attrs]);
-          }
+              )
+            })) : {
+              type: "style",
+              name,
+              value: { [name]: value }
+            };
+          });
+          skipMap || defaultStyleAttrs.length && (attrs = [...defaultStyleAttrs, ...attrs]);
           let ternaries = [];
           attrs = attrs.reduce((out, cur) => {
             const next = attrs[attrs.indexOf(cur) + 1];
@@ -886,9 +859,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
               }
             }
             return cur.type === "ternary" || out.push(cur), out;
-          }, []).flat();
-          const shouldWrapTheme = shouldFlatten && themeVal;
-          if (shouldWrapTheme && (programPath ? (shouldPrintDebug && logger.info(["  - wrapping theme", themeVal].join(" ")), attrs = attrs.filter(
+          }, []).flat(), themeVal && (programPath ? (shouldPrintDebug && logger.info(["  - wrapping theme", themeVal].join(" ")), attrs = attrs.filter(
             (x) => !(x.type === "attr" && t.isJSXAttribute(x.value) && x.value.name.name === "theme")
           ), hasImportedTheme || (hasImportedTheme = !0, programPath.node.body.push(
             t.importDeclaration(
@@ -910,31 +881,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             )
           )) : console.warn(
             `No program path found, avoiding importing flattening / importing theme in ${sourcePath}`
-          )), shouldPrintDebug)
-            try {
-              logger.info(
-                [
-                  " flatten?",
-                  shouldFlatten,
-                  (0, import_extractHelpers.objToStr)({
-                    hasSpread,
-                    shouldDeopt,
-                    canFlattenProps,
-                    shouldWrapTheme,
-                    hasOnlyStringChildren
-                  }),
-                  "inlined",
-                  inlined.size,
-                  [...inlined]
-                ].join(" ")
-              );
-            } catch {
-            }
-          if (shouldDeopt || !shouldFlatten) {
-            shouldPrintDebug && logger.info(`Deopting ${shouldDeopt} ${shouldFlatten}`), node.attributes = ogAttributes;
-            return;
-          }
-          shouldPrintDebug && logger.info(
+          )), shouldPrintDebug && logger.info(
             [`  - attrs (flattened): 
 `, (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(
               " "
@@ -1077,7 +1024,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
               process.env.IS_STATIC = before;
             }
           };
-          shouldFlatten && attrs.unshift({
+          attrs.unshift({
             type: "style",
             value: defaultProps
           }), attrs = attrs.reduce((acc, cur) => {
@@ -1169,7 +1116,6 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             if (attr.type === "style")
               for (const key in attr.value)
                 existingStyleKeys.has(key) ? (shouldPrintDebug && logger.info([`  >> delete existing ${key}`].join(" ")), delete attr.value[key]) : existingStyleKeys.add(key);
-            attr.type === "dynamic-style" && (existingStyleKeys.has(attr.name) ? attrs[i] = void 0 : existingStyleKeys.add(attr.name));
           }
           if (options.experimentalFlattenThemesOnNative && (attrs = attrs.filter(Boolean)), !shouldFlatten && inlineWhenUnflattened.size) {
             for (const [index, attr] of attrs.entries())
@@ -1180,11 +1126,11 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
                   val ? (delete attr.value[key], attrs.splice(index - 1, 0, val.attr)) : delete attr.value[key];
                 }
           }
-          if (attrs = attrs.filter((x) => !((x.type === "style" || x.type === "dynamic-style") && Object.keys(x.value).length === 0)), shouldFlatten && (shouldPrintDebug && logger.info(["  [\u2705] flattening", originalNodeName, flatNode].join(" ")), node.name.name = flatNode, res.flattened++, closingElement && (closingElement.name.name = flatNode)), !shouldFlatten && platform2 === "native")
+          if (attrs = attrs.filter((x) => !(x.type === "style" && Object.keys(x.value).length === 0)), !shouldFlatten && platform2 === "native")
             return shouldPrintDebug && logger.info(
               `Disabled flattening except for simple cases on native for now: ${JSON.stringify(
                 {
-                  flatNode,
+                  flatNode: flatNodeName,
                   shouldDeopt,
                   canFlattenProps,
                   hasSpread,
@@ -1204,7 +1150,7 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
               hasSpread ? " has spread" : "",
               staticConfig.neverFlatten ? "neverFlatten" : ""
             ].join(" ")
-          ), logger.info(`  - shouldFlatten/isFlattened: ${shouldFlatten}`), logger.info(`  - attrs (end):
+          ), logger.info(`  - attrs (end):
  ${(0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))}`)), onExtractTag({
             parserProps: propsWithFileInfo,
             attrs,
@@ -1212,18 +1158,18 @@ function createExtractor({ logger = console, platform = "web" } = { logger: cons
             lineNumbers,
             filePath,
             config: tamaguiConfig,
+            flatNodeName,
             attemptEval,
             jsxPath: traversePath,
             originalNodeName,
-            isFlattened: shouldFlatten,
             programPath,
             completeProps,
             staticConfig
-          });
+          }), shouldFlatten && (shouldPrintDebug && logger.info(["  [\u2705] flattened", originalNodeName, flatNodeName].join(" ")), node.name.name = flatNodeName, res.flattened++, closingElement && (closingElement.name.name = flatNodeName));
         } catch (err) {
-          node.attributes = ogAttributes, console.error(
+          node.attributes = ogAttributes, err instanceof import_errors.BailOptimizationError || (console.error(
             `@tamagui/static error, reverting optimization. In ${filePath} ${lineNumbers} on ${originalNodeName}: ${err.message}. For stack trace set environment TAMAGUI_DEBUG=1`
-          ), process.env.TAMAGUI_DEBUG === "1" && console.error(err.stack);
+          ), process.env.TAMAGUI_DEBUG === "1" && console.error(err.stack));
         } finally {
           debugPropValue && (shouldPrintDebug = ogDebug);
         }