@tamagui/static 1.132.17 → 1.132.19

package/dist/exports.js

@@ -23,6 +23,7 @@ __reExport(exports_exports, require("./types"), module.exports);
 var import_createExtractor = require("./extractor/createExtractor"), import_literalToAst = require("./extractor/literalToAst");
 __reExport(exports_exports, require("./constants"), module.exports);
 __reExport(exports_exports, require("./extractor/extractToClassNames"), module.exports);
+__reExport(exports_exports, require("./extractor/concatClassName"), module.exports);
 __reExport(exports_exports, require("./extractor/extractToNative"), module.exports);
 __reExport(exports_exports, require("./extractor/extractHelpers"), module.exports);
 __reExport(exports_exports, require("./extractor/loadTamagui"), module.exports);

package/dist/exports.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/exports.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAc,wBAAd;AACA,4BAAc,oBADd;AAEA,6BAAgC,wCAChC,sBAA6B;AAC7B,4BAAc,wBAJd;AAKA,4BAAc,4CALd;AAMA,4BAAc,wCANd;AAOA,4BAAc,uCAPd;AAQA,4BAAc,oCARd;AASA,4BAAc,2CATd;AAUA,4BAAc,qCAVd;AAWA,4BAAc,8BAXd;AAYA,4BAAc,+BAZd;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAc,wBAAd;AACA,4BAAc,oBADd;AAEA,6BAAgC,wCAChC,sBAA6B;AAC7B,4BAAc,wBAJd;AAKA,4BAAc,4CALd;AAMA,4BAAc,wCANd;AAOA,4BAAc,wCAPd;AAQA,4BAAc,uCARd;AASA,4BAAc,oCATd;AAUA,4BAAc,2CAVd;AAWA,4BAAc,qCAXd;AAYA,4BAAc,8BAZd;AAaA,4BAAc,+BAbd;",
   "names": []
 }

package/dist/exports.native.js

@@ -24,6 +24,7 @@ __reExport(exports_exports, require("./types"), module.exports);
 var import_createExtractor = require("./extractor/createExtractor"), import_literalToAst = require("./extractor/literalToAst");
 __reExport(exports_exports, require("./constants"), module.exports);
 __reExport(exports_exports, require("./extractor/extractToClassNames"), module.exports);
+__reExport(exports_exports, require("./extractor/concatClassName"), module.exports);
 __reExport(exports_exports, require("./extractor/extractToNative"), module.exports);
 __reExport(exports_exports, require("./extractor/extractHelpers"), module.exports);
 __reExport(exports_exports, require("./extractor/loadTamagui"), module.exports);
@@ -39,6 +40,7 @@ __reExport(exports_exports, require("./getPragmaOptions"), module.exports);
   ...require("./types"),
   ...require("./constants"),
   ...require("./extractor/extractToClassNames"),
+  ...require("./extractor/concatClassName"),
   ...require("./extractor/extractToNative"),
   ...require("./extractor/extractHelpers"),
   ...require("./extractor/loadTamagui"),

package/dist/exports.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/exports.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;4BAAc,wBAAd;AACA,4BAAc,oBADd;AAEA,6BAAgC,wCAChC,sBAA6B;AAC7B,4BAAc,wBAJd;AAKA,4BAAc,4CALd;AAMA,4BAAc,wCANd;AAOA,4BAAc,uCAPd;AAQA,4BAAc,oCARd;AASA,4BAAc,2CATd;AAUA,4BAAc,qCAVd;AAWA,4BAAc,8BAXd;AAYA,4BAAc,+BAZd;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;4BAAc,wBAAd;AACA,4BAAc,oBADd;AAEA,6BAAgC,wCAChC,sBAA6B;AAC7B,4BAAc,wBAJd;AAKA,4BAAc,4CALd;AAMA,4BAAc,wCANd;AAOA,4BAAc,wCAPd;AAQA,4BAAc,uCARd;AASA,4BAAc,oCATd;AAUA,4BAAc,2CAVd;AAWA,4BAAc,qCAXd;AAYA,4BAAc,8BAZd;AAaA,4BAAc,+BAbd;",
   "names": []
 }

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 = /* @__PURE__ */ new Set();
+  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.indexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
+      if (usedPrefixes.has(uid))
+        continue;
+      usedPrefixes.add(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.trim();
+}
+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,eAAe,oBAAI,IAAY;AACrC,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,QAAQ,GAAG,CAAC,GAE1C,WAAW,eAAe,KAAK,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,MACvE,MAAM,WAAW,WAAW,WAAW;AAG7C,UAAI,aAAa,IAAI,GAAG;AAEtB;AAEF,mBAAa,IAAI,GAAG;AAGpB,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,MAAM,KAAK;AACpB;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 = /* @__PURE__ */ new Set(), 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.indexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
+      if (usedPrefixes.has(uid))
+        return "continue";
+      usedPrefixes.add(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.trim();
+}
+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,eAAe,oBAAIC,IAAAA,GACrBC,QAAQ,IAENC,MAAML,KAAKM,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,KAAKI,QAAQ,GAAA,CAAA,GAEtCK,WAAWH,eAAeN,KAAKQ,MAAML,aAAa,GAAGA,aAAa,CAAA,IAAK,MACvEO,MAAMD,WAAWF,WAAWE,WAAWF;AAG7C,UAAId,aAAakB,IAAID,GAAAA;AAEnB,eAAA;AAEFjB,mBAAamB,IAAIF,GAAAA;AAGjB,UAAMG,WAAWN;AACjB,UAAIM,YAAYf,eAEZA,YAAYgB,KAAK,SAACC,IAAAA;AAChB,YAAIN,UAAU;AACZ,cAAMO,UAAUC,aAAaR,QAAAA;AAC7B,iBAAOM,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,MAAM5B,KAAKQ,CAAAA;AAEjB,QAAKoB,KACL;UAAI,CAACC,MAAMC,QAAQF,GAAAA,KAAQ,OAAOA,OAAQ,UAAU;AAElDrB,sBAAcA,eAAe,CAAA,GAC7BA,YAAYwB,KAAKH,GAAAA;AACjB;MACF;AAIA,eAFMlB,QAAQmB,MAAMC,QAAQF,GAAAA,IAAOA,MAAMA,IAAII,MAAM,GAAA,GAC7CC,WAAWvB,MAAMJ,QACdK,IAAIsB,WAAW,GAAGtB,KAAK,GAAGA,IAAAA,OAAAA,CAAAA;;EAyDrC;AAEA,SAAOP,MAAM8B,KAAI;AACnB;AAEA,IAAMR,eAAe;EACnBS,OAAO;EACPC,OAAO;EACPC,OAAO;EACPC,cAAc;EACdC,aAAa;EACbC,UAAU;AACZ;",
+  "names": ["concatClassName", "_cn", "args", "arguments", "usedPrefixes", "Set", "final", "len", "length", "propObjects", "x", "name", "names", "i", "splitIndex", "indexOf", "nextChar", "isMediaQuery", "styleKey", "slice", "mediaKey", "uid", "has", "add", "propName", "some", "po", "propKey", "pseudoInvert", "res", "cns", "Array", "isArray", "push", "split", "numNames", "trim", "hover", "focus", "press", "focusVisible", "focusWithin", "disabled"]
+}

package/dist/extractor/extractToClassNames.js

@@ -25,7 +25,7 @@ __export(extractToClassNames_exports, {
   extractToClassNames: () => extractToClassNames
 });
 module.exports = __toCommonJS(extractToClassNames_exports);
-var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors");
+var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), import_concatClassName = require("./concatClassName");
 const remove = () => {
 }, spaceString = t.stringLiteral(" ");
 async function extractToClassNames({
@@ -155,20 +155,20 @@ async function extractToClassNames({
             else
               return [];
         }
-        const mergedAlternate = (0, import_web.mergeProps)(
+        let mergedAlternate, mergedConsequent;
+        return ternary.alternate && Object.keys(ternary.alternate).length && (mergedAlternate = (0, import_web.mergeProps)(
           mergeForwardBaseStyle || {},
           ternary.alternate || {}
-        ), mergedConsequent = (0, import_web.mergeProps)(
+        ), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.alternate, mergedAlternate, baseFontFamily)), ternary.consequent && Object.keys(ternary.consequent).length && (mergedConsequent = (0, import_web.mergeProps)(
           mergeForwardBaseStyle || {},
           ternary.consequent || {}
-        );
-        return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.alternate, mergedAlternate, baseFontFamily), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.consequent, mergedConsequent, baseFontFamily), {
+        ), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.consequent, mergedConsequent, baseFontFamily)), {
           ...ternary,
           alternate: mergedAlternate,
           consequent: mergedConsequent
         };
       }), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null;
-      let baseClassNameStr = hasTernaries || !baseClassNames ? "" : baseClassNames.join(" ");
+      let baseClassNameStr = baseClassNames ? baseClassNames.join(" ") : "";
       !hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
       let base = staticConfig.componentName ? t.stringLiteral(
         `is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`
@@ -243,12 +243,16 @@ async function extractToClassNames({
           if (!ternary.consequent) continue;
           const classNames = addStyles(ternary.consequent);
           ternary.fontFamily && classNames.unshift(`font_${ternary.fontFamily}`);
-          const baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (baseString ? `${baseString} ` : "") + classNames.join(" "), classNameLiteral = t.stringLiteral(fullClassName);
+          const baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassNameWithDups = (baseString ? `${baseString} ` : "") + classNames.join(" "), fullClassName = (0, import_concatClassName.concatClassName)(fullClassNameWithDups), classNameLiteral = t.stringLiteral(fullClassName);
           ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(
             ternary.test,
             classNameLiteral,
             ternaryClassNameExpr
-          ) : ternaryClassNameExpr = classNameLiteral;
+          ) : ternaryClassNameExpr = t.conditionalExpression(
+            ternary.test,
+            classNameLiteral,
+            baseClassNameExpression
+          );
         }
       let finalExpression = ternaryClassNameExpr || baseClassNameExpression || null;
       if (finalExpression) {
@@ -298,9 +302,9 @@ async function extractToClassNames({
 function hoistClassNames(path2, expr) {
   if (t.isStringLiteral(expr))
     return hoistClassName(path2, expr.value);
-  if (t.isBinaryExpression(expr)) {
+  if (t.isLogicalExpression(expr)) {
     const left = t.isStringLiteral(expr.left) ? hoistClassName(path2, expr.left.value) : expr.left, right = t.isStringLiteral(expr.right) ? hoistClassName(path2, expr.right.value) : hoistClassNames(path2, expr.right);
-    return t.binaryExpression(expr.operator, left, right);
+    return t.logicalExpression(expr.operator, left, right);
   }
   if (t.isConditionalExpression(expr)) {
     const cons = t.isStringLiteral(expr.consequent) ? hoistClassName(path2, expr.consequent.value) : hoistClassNames(path2, expr.consequent), alt = t.isStringLiteral(expr.alternate) ? hoistClassName(path2, expr.alternate.value) : hoistClassNames(path2, expr.alternate);

package/dist/extractor/extractToClassNames.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/extractor/extractToClassNames.ts"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sCAErB,IAAmB,kCACnB,aAAoE,yBACpE,OAAsB,+BACtB,OAAsB,+BACtB,4BAAmC,0CAEnC,oBAA2B,yBAE3B,sBAA6B,2BAC7B,2BAAkC,gCAClC,4BAAmC,iCACnC,gCAGO,qCACP,eAAsB,oBACtB,gBAAsC,qBACtC,yBAAgC;AAqBhC,MAAM,SAAS,MAAM;AAAC,GAChB,cAAc,EAAE,cAAc,GAAG;AAEvC,eAAsB,oBAAoB;AAAA,EACxC;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb;AAAA,EACA;AACF,GAAgE;AAC9D,QAAM,SAAK,oBAAM,GACX,EAAE,oBAAoB,iBAAiB,QAAI,8CAAmB,KAAK;AAEzE,MAAI,WAAW,SAAS,cAAc;AACpC,WAAO;AAOT,MAJI,oBACF,QAAQ,KAAK,OAAO,UAAU;AAAA;AAAA,CAAW,GAGvC,OAAO,UAAW;AACpB,UAAM,IAAI,MAAM,yCAAyC;AAE3D,MAAI,CAAC,KAAK,WAAW,UAAU;AAC7B,UAAM,IAAI;AAAA,MACR,+DAA+D;AAAA,IACjE;AAGF,EAAK,aAAa,KAAK,cAAc,EAAE,KACrC,QAAQ,KAAK,GAAG,WAAW,MAAM,GAAG,GAAG,CAAC,kBAAkB,GAGxD,CAAC,QAAQ,qBAAqB,CAAC,QAAQ,uBAEzC,MAAM,UAAU,YAAY,OAAO;AAGrC,QAAM,eAAW,kCAAa,YAAY,OAAO;AAGjD,MAAI;AAEJ,MAAI;AACF,cAAM,8BAAW,QAAQ,UAAU;AAAA,EACrC,SAAS,KAAK;AACZ,kBAAQ,MAAM,sBAAsB,WAAW,MAAM,GAAG,GAAG,CAAC,GACtD;AAAA,EACR;AAEA,KAAG,KAAK,eAAe,qBAAqB,SAAS;AAErD,QAAM,SAAS,oBAAI,IAAqD,GAClE,gBAAgB,UAAU,WAAW,GAErC,MAAM,MAAM,UAAU,MAAM,KAAK;AAAA,IACrC;AAAA,IACA,GAAG;AAAA,IACH,UAAU;AAAA,IACV;AAAA,IACA,0BAA0B;AAAA,IAC1B,uBAAuB,YAAY,OAAO;AACxC,YAAM,MAAM,MAAM,KAAK,GAAG;AAC1B,MAAI,oBACF,QAAQ,KAAK,0BAA0B,UAAU,IAAI,GAAG,EAAE,GAE5D,OAAO,IAAI,IAAI,UAAU,IAAI,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC;AAAA,IACxD;AAAA,IACA,kBAAkB,CAAC,EAAE,IAAI,MAChB;AAAA,IAET,cAAc,CAAC;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,MAAM;AAEJ,UAAI,aAAa,qBAAqB;AACpC,cAAM,IAAI,oCAAsB;AA2BlC,YAAM,aAA+B,CAAC;AAEtC,UAAI,wBAAuC,MACvC,gBAAqC,MACrC,iBAAiB,IACjB,kBAAkB;AAEtB,YAAM,UAAU,KAAK;AAAA,QACnB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAEA,eAAS,SAAS,OAAoB;AACpC,cAAM,aAAa,MAAM,gCAAqB,GACxC,QAAQ,MAAM,2BAAgB,GAC9B,WAAW,IAAI,UAAU;AAC/B,eAAI,OAAO,IAAI,QAAQ,IACT,OAAO,IAAI,QAAQ,EAC3B,aAAa,KAAK,OAAO,IACpB,MAAM,UACf,OAAO,IAAI,UAAU;AAAA,UACnB,KAAK,MAAM,KAAK;AAAA,CAAI;AAAA,UACpB,cAAc,CAAC,OAAO;AAAA,QACxB,CAAC,GAEI;AAAA,MACT;AAEA,eAAS,UAAU,OAAe;AAChC,cAAM,YAAY,mBAAmB,KAAY,GAC3C,aAAuB,CAAC;AAE9B,mBAAWA,UAAS,WAAW;AAC7B,gBAAM,YAAYA,OAAM,CAAC,EAAE,MAAM,CAAC;AAClC,cAAI,cAAc,MAAM,SAAS,GAAG;AAClC,kBAAM,aAAa;AAAA,cACjBA;AAAA,cACA;AAAA,cACA,UAAU,WAAW,EAAG;AAAA,cACxB;AAAA,cACA;AAAA,cACA;AAAA,YACF,GACMC,cAAa,SAAS,UAAU;AACtC,uBAAW,KAAKA,WAAU;AAC1B;AAAA,UACF;AAEA,gBAAM,aAAa,SAASD,MAAK;AACjC,qBAAW,KAAK,UAAU;AAAA,QAC5B;AAEA,eAAO;AAAA,MACT;AAEA,YAAM,gBAA2B,MAAM,QAAQ,CAAC,SAAS;AACvD,YAAI,KAAK,SAAS,QAAQ;AACxB,gBAAM,QAAQ,KAAK;AAEnB,cAAI,EAAE,qBAAqB,KAAK;AAE9B,2BAAQ,MAAM,qBAAqB,GAC5B,CAAC;AAGV,cAAI,MAAM,KAAK,SAAS,aAAa;AACnC,gBAAI,QAAa,MAAM;AACvB,YAAI,EAAE,yBAAyB,KAAK,MAClC,QAAQ,MAAM;AAEhB,gBAAI;AACF,oBAAM,iBAAiB,QAAQ,YAAY,KAAK,IAAI;AACpD,cAAI,OAAO,kBAAmB,aAC5B,gBAAgB,EAAE,cAAc,cAAc;AAAA,YAElD,QAAY;AACV,cAAI,UACF,kBAAkB;AAAA,YAEtB;AACA,mBAAO,CAAC;AAAA,UACV;AAEA,4BAAW,KAAK,KAAK,GACd,CAAC;AAAA,QACV;AAEA,YAAI,KAAK,SAAS;AAChB,6CAAwB,uBAAW,yBAAyB,CAAC,GAAG,KAAK,KAAK,GAC1E,qBAAiB,0DAA2B,KAAK,KAAK,KAAK,IACpD,CAAC;AAGV,YAAI,UAAU,KAAK;AAEnB,YAAI,QAAQ,kBAAkB;AAC5B,gBAAM,sBAAkB;AAAA,YACtB;AAAA,YACA,KAAK;AAAA,YACL;AAAA,YACA,UAAU,WAAW;AAAA,YACrB,cAAc;AAAA,YACd;AAAA,YACA;AAAA,UACF;AAEA,cAAI;AAMF,gBALI,gBAAgB,gBAClB,4BAAwB,uBAAW,yBAAyB,CAAC,GAAG;AAAA,cAC9D,CAAC,IAAI,QAAQ,gBAAgB,EAAE,GAAG,KAAK,MAAM;AAAA,YAC/C,CAAC,IAEC,gBAAgB;AAClB,wBAAU,gBAAgB;AAAA;AAE1B,qBAAO,CAAC;AAAA,QAGd;AAEA,YAAI,iBACA;AAEJ,eAAI,QAAQ,aAAa,OAAO,KAAK,QAAQ,SAAS,EAAE,WACtD,sBAAkB;AAAA,UAChB,yBAAyB,CAAC;AAAA,UAC1B,QAAQ,aAAa,CAAC;AAAA,QACxB,OACA,qDAAsB,QAAQ,WAAW,iBAAiB,cAAc,IAGtE,QAAQ,cAAc,OAAO,KAAK,QAAQ,UAAU,EAAE,WACxD,uBAAmB;AAAA,UACjB,yBAAyB,CAAC;AAAA,UAC1B,QAAQ,cAAc,CAAC;AAAA,QACzB,OACA,qDAAsB,QAAQ,YAAY,kBAAkB,cAAc,IAIrE;AAAA,UACL,GAAG;AAAA,UACH,WAAW;AAAA,UACX,YAAY;AAAA,QACd;AAAA,MACF,CAAC,GAEK,eAAe,EAAQ,cAAc,QAErC,iBAAiB,wBACnB,UAAU,qBAAqB,IAC/B;AAEJ,UAAI,mBAAoB,iBAAsB,eAAe,KAAK,GAAG,IAA5B;AAEzC,MAAI,CAAC,gBAAgB,mBACnB,mBAAmB,QAAQ,cAAc,GAAG,mBAAmB,IAAI,gBAAgB,KAAK,EAAE;AAG5F,UAAI,OAAO,aAAa,gBACpB,EAAE;AAAA,QACA,MAAM,aAAa,aAAa,GAAG,mBAAmB,IAAI,gBAAgB,KAAK,EAAE;AAAA,MACnF,IACA,EAAE,cAAc,oBAAoB,EAAE;AAE1C,sBAAgB;AAEhB,YAAM,0BACA,gBACE,EAAE,gBAAgB,aAAa,IAC1B,EAAE;AAAA,QACP,KAAK,QAAQ,GAAG,KAAK,KAAK,IAAI,cAAc,KAAK,KAAK,cAAc;AAAA,MACtE,IAGO,EAAE;AAAA,QACP;AAAA,QACA,EAAE,iBAAiB,KAAK,eAAe,WAAW;AAAA,QAClD;AAAA,MACF,IAGG,MAGH,oBAA+B,CAAC;AAEtC,UAAI,cAAc,QAAQ;AAExB,cAAM,0BAAsB,8CAAmB,aAAa;AAE5D,mBAAW,WAAW,qBAAqB;AACzC,cAAI,CAAC,kBAAkB,QAAQ;AAC7B,0BAAc,OAAO;AACrB;AAAA,UACF;AACA,qBAAW,QAAQ,CAAC,GAAG,iBAAiB;AACtC,0BAAc,SAAS,IAAI;AAAA,QAE/B;AAAA,MACF;AAEA,eAAS,cAAc,SAAkB,MAAgB;AAEvD,YAAI,QAAQ,cAAc,OAAO,KAAK,QAAQ,UAAU,EAAE,QAAQ;AAChE,gBAAM,iBAAa,0DAA2B,QAAQ,UAAU;AAEhE,4BAAkB,KAAK;AAAA,YACrB;AAAA;AAAA,YAEA,MAAM,OACF,EAAE,kBAAkB,MAAM,KAAK,MAAM,QAAQ,IAAI,IACjD,QAAQ;AAAA,YACZ,YAAY,WACR,uBAAW,KAAK,YAAa,QAAQ,UAAU,IAC/C,QAAQ;AAAA,YACZ;AAAA,YACA,WAAW;AAAA,UACb,CAAC,GAEG,QACF,kBAAkB,KAAK;AAAA,YACrB;AAAA;AAAA,YAEA,MAAM,EAAE;AAAA,cACN;AAAA,cACA,EAAE,gBAAgB,KAAK,KAAK,IAAI;AAAA,cAChC,QAAQ;AAAA,YACV;AAAA,YACA,YAAY,QAAQ;AAAA,YACpB,WAAW;AAAA,YACX;AAAA,UACF,CAAC;AAAA,QAEL;AAEA,YAAI,QAAQ,aAAa,OAAO,KAAK,QAAQ,SAAS,EAAE,QAAQ;AAC9D,gBAAM,iBAAa,0DAA2B,QAAQ,SAAS,GACzD,UAAU,EAAE,gBAAgB,KAAK,QAAQ,IAAI;AACnD,4BAAkB,KAAK;AAAA,YACrB;AAAA;AAAA,YAEA,MAAM,OAAO,EAAE,kBAAkB,MAAM,KAAK,MAAM,OAAO,IAAI;AAAA,YAC7D,YAAY,WACR,uBAAW,KAAK,WAAY,QAAQ,SAAS,IAC7C,QAAQ;AAAA,YACZ;AAAA,YACA,WAAW;AAAA,UACb,CAAC,GAEG,QACF,kBAAkB,KAAK;AAAA,YACrB;AAAA,YACA,MAAM,EAAE;AAAA,cACN;AAAA,cACA,EAAE,gBAAgB,KAAK,KAAK,IAAI;AAAA,cAChC,QAAQ;AAAA,YACV;AAAA,YACA,YAAY,QAAQ;AAAA,YACpB;AAAA,YACA,WAAW;AAAA,UACb,CAAC;AAAA,QAEL;AAAA,MACF;AAEA,UAAI,uBAA4C;AAGhD,UAAI;AACF,mBAAW,WAAW,mBAAmB;AACvC,cAAI,CAAC,QAAQ,WAAY;AACzB,gBAAM,aAAa,UAAU,QAAQ,UAAU;AAC/C,UAAI,QAAQ,cACV,WAAW,QAAQ,QAAQ,QAAQ,UAAU,EAAE;AAEjD,gBAAM,aAAa,EAAE,gBAAgB,uBAAuB,IACxD,wBAAwB,QACxB,IAEE,yBACH,aAAa,GAAG,UAAU,MAAM,MAAM,WAAW,KAAK,GAAG,GAGtD,oBAAgB,wCAAgB,qBAAqB,GAErD,mBAAmB,EAAE,cAAc,aAAa;AAEtD,UAAK,uBAOH,uBAAuB,EAAE;AAAA,YACvB,QAAQ;AAAA,YACR;AAAA,YACA;AAAA,UACF,IAVA,uBAAuB,EAAE;AAAA,YACvB,QAAQ;AAAA,YACR;AAAA,YACA;AAAA,UACF;AAAA,QAQJ;AAGF,UAAI,kBACF,wBAAwB,2BAA2B;AAOrD,UAAI,iBAAiB;AAEnB,0BAAkB,gBAAgB,SAAS,eAAe;AAI1D,cAAM,gBAAgB,EAAE;AAAA,UACtB,EAAE,cAAc,WAAW;AAAA,UAC3B,EAAE,uBAAuB,eAAgB;AAAA,QAC3C;AACA,mBAAW,QAAQ,aAAa;AAAA,MAClC;AAEA,WAAK,aAAa;AAAA,IACpB;AAAA,EACF,CAAC;AAED,MAAI,CAAC,OAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,aAAa,CAAC,IAAI,aAAa,CAAC,IAAI;AACrE,WAAI,oBACF,QAAQ,KAAK,2BAA2B,GAAG,GAEtC;AAGT,QAAM,SAAS,MAAM,KAAK,OAAO,OAAO,CAAC,EACtC,IAAI,CAAC,MAAM,EAAE,GAAG,EAChB,KAAK;AAAA,CAAI,EACT,KAAK,GAGF,aAAS,iBAAAE;AAAA,IACb;AAAA,IACA;AAAA,MACE,SAAS;AAAA,MACT,UAAU;AAAA;AAAA,MAEV,aAAa;AAAA,MACb,gBAAgB;AAAA,MAChB,YAAY;AAAA,IACd;AAAA,IACA;AAAA,EACF;AAEA,SAAI,qBACF,QAAQ;AAAA,IACN;AAAA;AAAA;AAAA;AAAA,IACA,OAAO,KACJ,MAAM;AAAA,CAAI,EACV,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,IAAI,CAAC,EACjC,KAAK;AAAA,CAAI;AAAA,EACd,GACA,QAAQ,KAAK;AAAA;AAAA;AAAA,GAA0C,MAAM,IAG/D,SAAS,GAAG,GAEL;AAAA,IACL;AAAA,IACA;AAAA,IACA,IAAI,OAAO;AAAA,IACX,KAAK,OAAO;AAAA,EACd;AACF;AAEA,SAAS,gBAAgBC,OAA8B,MAAoB;AACzE,MAAI,EAAE,gBAAgB,IAAI;AACxB,WAAO,eAAeA,OAAM,KAAK,KAAK;AAGxC,MAAI,EAAE,oBAAoB,IAAI,GAAG;AAC/B,UAAM,OAAO,EAAE,gBAAgB,KAAK,IAAI,IACpC,eAAeA,OAAM,KAAK,KAAK,KAAK,IACpC,KAAK,MACH,QAAQ,EAAE,gBAAgB,KAAK,KAAK,IACtC,eAAeA,OAAM,KAAK,MAAM,KAAK,IACrC,gBAAgBA,OAAM,KAAK,KAAK;AACpC,WAAO,EAAE,kBAAkB,KAAK,UAAU,MAAM,KAAK;AAAA,EACvD;AAEA,MAAI,EAAE,wBAAwB,IAAI,GAAG;AACnC,UAAM,OAAO,EAAE,gBAAgB,KAAK,UAAU,IAC1C,eAAeA,OAAM,KAAK,WAAW,KAAK,IAC1C,gBAAgBA,OAAM,KAAK,UAAU,GAEnC,MAAM,EAAE,gBAAgB,KAAK,SAAS,IACxC,eAAeA,OAAM,KAAK,UAAU,KAAK,IACzC,gBAAgBA,OAAM,KAAK,SAAS;AAExC,WAAO,EAAE,sBAAsB,KAAK,MAAM,MAAM,GAAG;AAAA,EACrD;AAEA,SAAO;AACT;AAEA,SAAS,eAAeA,OAA8B,KAAa;AACjE,QAAM,MAAMA,MAAK,MAAM,sBAAsB,IAAI,GAC3C,SAASA,MAAK,WAAW,CAACA,UAASA,MAAK,UAAU,CAAC;AACzD,MAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,aAAa;AAC1C,QAAM,WAAW,EAAE,oBAAoB,SAAS;AAAA,IAC9C,EAAE,mBAAmB,KAAK,EAAE,cAAc,iBAAiB,GAAG,CAAC,CAAC;AAAA,EAClE,CAAC;AAED,gBAAO,iBAAiB,QAAQ,QAAQ,GACjC;AACT;AAEA,SAAS,iBAAiB,OAAe;AACvC,QAAM,MAAM,oBAAI,IAAY;AAC5B,aAAW,QAAQ,MAAM,MAAM,GAAG;AAChC,IAAI,SAAS,OACT,SAAS,WACb,IAAI,IAAI,IAAI;AAGd,SAAO,CAAC,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI;AAC9B;",
   "names": ["style", "identifier", "generate", "path"]
 }

package/dist/extractor/extractToClassNames.native.js

@@ -26,7 +26,7 @@ __export(extractToClassNames_exports, {
   extractToClassNames: () => extractToClassNames
 });
 module.exports = __toCommonJS(extractToClassNames_exports);
-var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), remove = function() {
+var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), import_concatClassName = require("./concatClassName"), remove = function() {
 }, spaceString = t.stringLiteral(" ");
 async function extractToClassNames(param) {
   var { extractor, source, sourcePath = "", options, shouldPrintDebug } = param, tm = (0, import_timer.timer)(), { getCSSStylesAtomic, createMediaStyle } = (0, import_requireTamaguiCore.requireTamaguiCore)("web");
@@ -138,13 +138,13 @@ async function extractToClassNames(param) {
             else
               return [];
         }
-        var mergedAlternate = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.alternate || {}), mergedConsequent = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.consequent || {});
-        return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.alternate, mergedAlternate, baseFontFamily), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.consequent, mergedConsequent, baseFontFamily), {
+        var mergedAlternate, mergedConsequent;
+        return ternary2.alternate && Object.keys(ternary2.alternate).length && (mergedAlternate = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.alternate || {}), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.alternate, mergedAlternate, baseFontFamily)), ternary2.consequent && Object.keys(ternary2.consequent).length && (mergedConsequent = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.consequent || {}), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.consequent, mergedConsequent, baseFontFamily)), {
           ...ternary2,
           alternate: mergedAlternate,
           consequent: mergedConsequent
         };
-      }), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr = hasTernaries || !baseClassNames ? "" : baseClassNames.join(" ");
+      }), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr = baseClassNames ? baseClassNames.join(" ") : "";
       !hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
       var base = staticConfig.componentName ? t.stringLiteral(`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`) : t.stringLiteral(baseClassNameStr || "");
       attrClassName = attrClassName;
@@ -224,8 +224,8 @@ async function extractToClassNames(param) {
             if (ternary1.consequent) {
               var classNames = addStyles(ternary1.consequent);
               ternary1.fontFamily && classNames.unshift(`font_${ternary1.fontFamily}`);
-              var baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (baseString ? `${baseString} ` : "") + classNames.join(" "), classNameLiteral = t.stringLiteral(fullClassName);
-              ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, ternaryClassNameExpr) : ternaryClassNameExpr = classNameLiteral;
+              var baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassNameWithDups = (baseString ? `${baseString} ` : "") + classNames.join(" "), fullClassName = (0, import_concatClassName.concatClassName)(fullClassNameWithDups), classNameLiteral = t.stringLiteral(fullClassName);
+              ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, ternaryClassNameExpr) : ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, baseClassNameExpression);
             }
           }
         } catch (err) {
@@ -281,9 +281,9 @@ async function extractToClassNames(param) {
 function hoistClassNames(path2, expr) {
   if (t.isStringLiteral(expr))
     return hoistClassName(path2, expr.value);
-  if (t.isBinaryExpression(expr)) {
+  if (t.isLogicalExpression(expr)) {
     var left = t.isStringLiteral(expr.left) ? hoistClassName(path2, expr.left.value) : expr.left, right = t.isStringLiteral(expr.right) ? hoistClassName(path2, expr.right.value) : hoistClassNames(path2, expr.right);
-    return t.binaryExpression(expr.operator, left, right);
+    return t.logicalExpression(expr.operator, left, right);
   }
   if (t.isConditionalExpression(expr)) {
     var cons = t.isStringLiteral(expr.consequent) ? hoistClassName(path2, expr.consequent.value) : hoistClassNames(path2, expr.consequent), alt = t.isStringLiteral(expr.alternate) ? hoistClassName(path2, expr.alternate.value) : hoistClassNames(path2, expr.alternate);

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/extractor/extractToClassNames.ts"],
-  "mappings": "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",
-  "names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "createMediaStyle", "requireTamaguiCore", "includes", "console", "warn", "Error", "path", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "printLog", "createLogger", "ast", "babelParse", "err", "error", "mark", "cssMap", "Map", "tamaguiConfig", "getTamagui", "res", "parse", "platform", "extractStyledDefinitions", "onStyledDefinitionRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "staticConfig", "acceptsClassName", "BailOptimizationError", "finalAttrs", "mergeForwardBaseStyle", "attrClassName", "baseFontFamily", "mediaStylesSeen", "comment", "util", "format", "addStyle", "style", "StyleObjectIdentifier", "StyleObjectRules", "selector", "has", "val", "get", "push", "length", "addStyles", "cssStyles", "classNames", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "mediaName", "media", "mediaStyle", "onlyTernaries", "flatMap", "attr", "type", "value", "isJSXSpreadAttribute", "name", "inner", "isJSXExpressionContainer", "expression", "evaluatedValue", "mergeProps", "getFontFamilyNameFromProps", "ternary", "inlineMediaQuery", "mediaExtraction", "extractMediaStyle", "mediaStyles", "consequent", "ternaryWithoutMedia", "mergedAlternate", "alternate", "mergedConsequent", "forwardFontFamilyName", "hasTernaries", "Boolean", "baseClassNames", "baseClassNameStr", "base", "componentName", "baseClassNameExpression", "isStringLiteral", "conditionalExpression", "binaryExpression", "expandedTernaries", "normalizedTernaries", "normalizeTernaries", "expandTernary", "prev", "Object", "keys", "fontFamily", "logicalExpression", "unaryExpression", "negated", "ternaryClassNameExpr", "unshift", "baseString", "fullClassName", "classNameLiteral", "finalExpression", "hoistClassNames", "classNameProp", "jsxAttribute", "jsxIdentifier", "jsxExpressionContainer", "attributes", "modified", "optimized", "flattened", "styled", "styles", "Array", "from", "values", "map", "x", "trim", "result", "generate", "concise", "filename", "retainLines", "sourceFileName", "sourceMaps", "code", "split", "filter", "startsWith", "js", "expr", "hoistClassName", "isBinaryExpression", "left", "right", "operator", "isConditionalExpression", "cons", "alt", "str", "uid", "scope", "generateUidIdentifier", "parent", "findParent", "isProgram", "variable", "variableDeclaration", "variableDeclarator", "cleanupClassName", "unshiftContainer", "inStr", "out", "Set", "part", "add"]
+  "mappings": "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",
+  "names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "createMediaStyle", "requireTamaguiCore", "includes", "console", "warn", "Error", "path", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "printLog", "createLogger", "ast", "babelParse", "err", "error", "mark", "cssMap", "Map", "tamaguiConfig", "getTamagui", "res", "parse", "platform", "extractStyledDefinitions", "onStyledDefinitionRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "staticConfig", "acceptsClassName", "BailOptimizationError", "finalAttrs", "mergeForwardBaseStyle", "attrClassName", "baseFontFamily", "mediaStylesSeen", "comment", "util", "format", "addStyle", "style", "StyleObjectIdentifier", "StyleObjectRules", "selector", "has", "val", "get", "push", "length", "addStyles", "cssStyles", "classNames", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "mediaName", "media", "mediaStyle", "onlyTernaries", "flatMap", "attr", "type", "value", "isJSXSpreadAttribute", "name", "inner", "isJSXExpressionContainer", "expression", "evaluatedValue", "mergeProps", "getFontFamilyNameFromProps", "ternary", "inlineMediaQuery", "mediaExtraction", "extractMediaStyle", "mediaStyles", "consequent", "ternaryWithoutMedia", "mergedAlternate", "mergedConsequent", "alternate", "Object", "keys", "forwardFontFamilyName", "hasTernaries", "Boolean", "baseClassNames", "baseClassNameStr", "base", "componentName", "baseClassNameExpression", "isStringLiteral", "conditionalExpression", "binaryExpression", "expandedTernaries", "normalizedTernaries", "normalizeTernaries", "expandTernary", "prev", "fontFamily", "logicalExpression", "unaryExpression", "negated", "ternaryClassNameExpr", "unshift", "baseString", "fullClassNameWithDups", "fullClassName", "concatClassName", "classNameLiteral", "finalExpression", "hoistClassNames", "classNameProp", "jsxAttribute", "jsxIdentifier", "jsxExpressionContainer", "attributes", "modified", "optimized", "flattened", "styled", "styles", "Array", "from", "values", "map", "x", "trim", "result", "generate", "concise", "filename", "retainLines", "sourceFileName", "sourceMaps", "code", "split", "filter", "startsWith", "js", "expr", "hoistClassName", "isLogicalExpression", "left", "right", "operator", "isConditionalExpression", "cons", "alt", "str", "uid", "scope", "generateUidIdentifier", "parent", "findParent", "isProgram", "variable", "variableDeclaration", "variableDeclarator", "cleanupClassName", "unshiftContainer", "inStr", "out", "Set", "part", "add"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.132.17",
+  "version": "1.132.19",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "type": "commonjs",
@@ -45,19 +45,19 @@
     "@babel/template": "^7.25.0",
     "@babel/traverse": "^7.25.4",
     "@babel/types": "^7.25.4",
-    "@tamagui/cli-color": "1.132.17",
-    "@tamagui/config-default": "1.132.17",
-    "@tamagui/core": "1.132.17",
-    "@tamagui/fake-react-native": "1.132.17",
-    "@tamagui/generate-themes": "1.132.17",
-    "@tamagui/helpers": "1.132.17",
-    "@tamagui/helpers-node": "1.132.17",
-    "@tamagui/proxy-worm": "1.132.17",
-    "@tamagui/react-native-web-internals": "1.132.17",
-    "@tamagui/react-native-web-lite": "1.132.17",
-    "@tamagui/shorthands": "1.132.17",
-    "@tamagui/types": "1.132.17",
-    "@tamagui/web": "1.132.17",
+    "@tamagui/cli-color": "1.132.19",
+    "@tamagui/config-default": "1.132.19",
+    "@tamagui/core": "1.132.19",
+    "@tamagui/fake-react-native": "1.132.19",
+    "@tamagui/generate-themes": "1.132.19",
+    "@tamagui/helpers": "1.132.19",
+    "@tamagui/helpers-node": "1.132.19",
+    "@tamagui/proxy-worm": "1.132.19",
+    "@tamagui/react-native-web-internals": "1.132.19",
+    "@tamagui/react-native-web-lite": "1.132.19",
+    "@tamagui/shorthands": "1.132.19",
+    "@tamagui/types": "1.132.19",
+    "@tamagui/web": "1.132.19",
     "babel-literal-to-ast": "^2.1.0",
     "browserslist": "^4.22.2",
     "check-dependency-version-consistency": "^4.1.0",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.25.4",
     "@expo/match-media": "^0.4.0",
-    "@tamagui/build": "1.132.17",
+    "@tamagui/build": "1.132.19",
     "@types/babel__core": "^7.20.5",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",

package/src/exports.ts

@@ -4,6 +4,7 @@ export { createExtractor } from './extractor/createExtractor'
 export { literalToAst } from './extractor/literalToAst'
 export * from './constants'
 export * from './extractor/extractToClassNames'
+export * from './extractor/concatClassName'
 export * from './extractor/extractToNative'
 export * from './extractor/extractHelpers'
 export * from './extractor/loadTamagui'

package/src/extractor/concatClassName.ts

@@ -0,0 +1,100 @@
+// perf sensitive so doing some weird stuff
+
+/**
+ * next - take objects:
+ *
+ * { _shorthand: 'postfix' }
+ *
+ */
+
+export function concatClassName(...args: any[]): any
+export function concatClassName(_cn: Record<string, any> | null | undefined): string {
+  const args = arguments
+  const usedPrefixes = new Set<string>()
+  let final = ''
+
+  const len = args.length
+  let propObjects: any = null
+  for (let x = len; x >= 0; x--) {
+    const cns = args[x]
+
+    if (!cns) continue
+    if (!Array.isArray(cns) && typeof cns !== 'string') {
+      // is prop object
+      propObjects = propObjects || []
+      propObjects.push(cns)
+      continue
+    }
+
+    const names = Array.isArray(cns) ? cns : cns.split(' ')
+    const numNames = names.length
+    for (let i = numNames - 1; i >= 0; i--) {
+      const name = names[i]
+
+      if (!name || name === ' ') continue
+      if (name[0] !== '_') {
+        // not snack style (todo slightly stronger heuristic)
+        final = name + ' ' + final
+        continue
+      }
+
+      const splitIndex = name.indexOf('-')
+      if (splitIndex < 1) {
+        final = name + ' ' + final
+        // if (shouldDebug) console.log('debug exclude:', name, final)
+        continue
+      }
+
+      const nextChar = name[splitIndex + 1]
+      // synced to static-ui constants
+      // MEDIA_SEP
+      const isMediaQuery = nextChar === '_'
+      // PSEUDO_SEP
+      // commenting out three things to make pseudos override properly
+      // (leave in for a bit to see if other bugs pop up later):
+      // 1. const isPseudoQuery = nextChar === '0'
+      const styleKey = name.slice(1, name.indexOf('-'))
+      // 2. isMediaQuery || isPseudoQuery
+      const mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null
+      const uid = mediaKey ? styleKey + mediaKey : styleKey
+      // 3. && !isPseudoQuery
+
+      if (usedPrefixes.has(uid)) {
+        // if (shouldDebug) console.log('debug exclude:', usedPrefixes, name)
+        continue
+      }
+      usedPrefixes.add(uid)
+
+      // overrides for full safety
+      const propName = styleKey
+      if (propName && propObjects) {
+        if (
+          propObjects.some((po) => {
+            if (mediaKey) {
+              const propKey = pseudoInvert[mediaKey]
+              return po && po[propKey] && propName in po[propKey] && po[propKey] !== null
+            }
+            const res = po && propName in po && po[propName] !== null
+            return res
+          })
+        ) {
+          // if (shouldDebug) console.log('debug exclude:', name)
+          continue
+        }
+      }
+
+      final = name + ' ' + final
+    }
+  }
+
+  return final.trim()
+}
+
+const pseudoInvert = {
+  hover: 'hoverStyle',
+  focus: 'focusStyle',
+  press: 'pressStyle',
+  focusVisible: 'focusVisibleStyle',
+  focusWithin: 'focusWithinStyle',
+  disabled: 'disabledStyle',
+}

package/src/extractor/extractToClassNames.ts

@@ -17,6 +17,7 @@ import {
 } from './propsToFontFamilyCache'
 import { timer } from './timer'
 import { BailOptimizationError } from './errors'
+import { concatClassName } from './concatClassName'
 
 export type ExtractedResponse = {
   js: string | Buffer
@@ -271,17 +272,24 @@ export async function extractToClassNames({
           }
         }
 
-        const mergedAlternate = mergeProps(
-          mergeForwardBaseStyle || {},
-          ternary.alternate || {}
-        )
-        const mergedConsequent = mergeProps(
-          mergeForwardBaseStyle || {},
-          ternary.consequent || {}
-        )
+        let mergedAlternate
+        let mergedConsequent
 
-        forwardFontFamilyName(ternary.alternate, mergedAlternate, baseFontFamily)
-        forwardFontFamilyName(ternary.consequent, mergedConsequent, baseFontFamily)
+        if (ternary.alternate && Object.keys(ternary.alternate).length) {
+          mergedAlternate = mergeProps(
+            mergeForwardBaseStyle || {},
+            ternary.alternate || {}
+          )
+          forwardFontFamilyName(ternary.alternate, mergedAlternate, baseFontFamily)
+        }
+
+        if (ternary.consequent && Object.keys(ternary.consequent).length) {
+          mergedConsequent = mergeProps(
+            mergeForwardBaseStyle || {},
+            ternary.consequent || {}
+          )
+          forwardFontFamilyName(ternary.consequent, mergedConsequent, baseFontFamily)
+        }
 
         // merge the base style forward into both sides
         return {
@@ -297,8 +305,7 @@ export async function extractToClassNames({
         ? addStyles(mergeForwardBaseStyle)
         : null
 
-      let baseClassNameStr =
-        hasTernaries || !baseClassNames ? '' : baseClassNames.join(' ')
+      let baseClassNameStr = !baseClassNames ? '' : baseClassNames.join(' ')
 
       if (!hasTernaries && baseFontFamily) {
         baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ''}`
@@ -424,12 +431,21 @@ export async function extractToClassNames({
           const baseString = t.isStringLiteral(baseClassNameExpression)
             ? baseClassNameExpression.value
             : ''
-          const fullClassName =
+
+          const fullClassNameWithDups =
             (baseString ? `${baseString} ` : '') + classNames.join(' ')
+
+          // we concat here as the base could be conditionally overriden by our classNames
+          const fullClassName = concatClassName(fullClassNameWithDups)
+
           const classNameLiteral = t.stringLiteral(fullClassName)
 
           if (!ternaryClassNameExpr) {
-            ternaryClassNameExpr = classNameLiteral
+            ternaryClassNameExpr = t.conditionalExpression(
+              ternary.test,
+              classNameLiteral,
+              baseClassNameExpression
+            )
           } else {
             ternaryClassNameExpr = t.conditionalExpression(
               ternary.test,
@@ -452,6 +468,8 @@ export async function extractToClassNames({
         // hoist to global variables
         finalExpression = hoistClassNames(jsxPath, finalExpression)
 
+        // console.log('finalExpression', finalExpression)
+
         const classNameProp = t.jsxAttribute(
           t.jsxIdentifier('className'),
           t.jsxExpressionContainer(finalExpression!)
@@ -515,14 +533,14 @@ function hoistClassNames(path: NodePath<t.JSXElement>, expr: t.Expression) {
     return hoistClassName(path, expr.value)
   }
 
-  if (t.isBinaryExpression(expr)) {
+  if (t.isLogicalExpression(expr)) {
     const left = t.isStringLiteral(expr.left)
       ? hoistClassName(path, expr.left.value)
       : expr.left
     const right = t.isStringLiteral(expr.right)
       ? hoistClassName(path, expr.right.value)
       : hoistClassNames(path, expr.right)
-    return t.binaryExpression(expr.operator, left, right)
+    return t.logicalExpression(expr.operator, left, right)
   }
 
   if (t.isConditionalExpression(expr)) {

package/types/exports.d.ts

@@ -4,6 +4,7 @@ export { createExtractor } from './extractor/createExtractor';
 export { literalToAst } from './extractor/literalToAst';
 export * from './constants';
 export * from './extractor/extractToClassNames';
+export * from './extractor/concatClassName';
 export * from './extractor/extractToNative';
 export * from './extractor/extractHelpers';
 export * from './extractor/loadTamagui';

package/types/exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}

package/types/extractor/concatClassName.d.ts

@@ -0,0 +1,8 @@
+/**
+ * next - take objects:
+ *
+ * { _shorthand: 'postfix' }
+ *
+ */
+export declare function concatClassName(...args: any[]): any;
+//# sourceMappingURL=concatClassName.d.ts.map

package/types/extractor/concatClassName.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"concatClassName.d.ts","sourceRoot":"","sources":["../../src/extractor/concatClassName.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,wBAAgB,eAAe,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA"}

package/types/extractor/extractToClassNames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAe,cAAc,EAAW,MAAM,UAAU,CAAA;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAWlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,CAAA;AAQD,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,MAAM,EACN,UAAe,EACf,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA8c9D"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAe,cAAc,EAAW,MAAM,UAAU,CAAA;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAYlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,CAAA;AAQD,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,MAAM,EACN,UAAe,EACf,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA+d9D"}