@tamagui/static 2.6.2 → 2.6.3

package/dist/extractor/concatClassName.cjs

@@ -44,6 +44,14 @@ function concatClassName(_cn) {
     for (let i = numNames - 1; i >= 0; i--) {
       const name = names[i];
       if (!name || name === " ") continue;
+      if (name.startsWith("font_")) {
+        if (usedPrefixes.has("fontFamily")) {
+          continue;
+        }
+        usedPrefixes.add("fontFamily");
+        final = name + " " + final;
+        continue;
+      }
       if (name[0] !== "_") {
         final = name + " " + final;
         continue;

package/dist/extractor/createExtractor.cjs

@@ -1477,6 +1477,13 @@ function createExtractor({
             out.push(cur);
             return out;
           }, []).flat();
+          const ternaryBranchProps = /* @__PURE__ */new Map();
+          const allTernaries = attrs.flatMap(attr => attr.type === "ternary" ? attr.value : []);
+          if (allTernaries.length > 1) {
+            for (const ternary of (0, import_normalizeTernaries.normalizeTernaries)(allTernaries)) {
+              ternaryBranchProps.set((0, import_normalizeTernaries.getTernaryKey)(ternary.test), ternary);
+            }
+          }
           if (themeVal) {
             if (!programPath) {
               console.warn(`No program path found, avoiding importing flattening / importing theme in ${sourcePath}`);
@@ -1610,7 +1617,7 @@ function createExtractor({
             logger.info(["  - attrs (expanded): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", "))].join(" "));
           }
           let prev = null;
-          const getProps = (props, includeProps = false, debugName = "") => {
+          const getProps = (props, includeProps = false, debugName = "", branchProps) => {
             if (!props) {
               if (shouldPrintDebug) logger.info([" getProps() no props"].join(" "));
               return {};
@@ -1626,6 +1633,10 @@ function createExtractor({
             const before = process.env.IS_STATIC;
             process.env.IS_STATIC = "is_static";
             try {
+              const fallbackProps = branchProps ? {
+                ...completeProps,
+                ...branchProps
+              } : completeProps;
               let extractedMediaLikeProps = null;
               let propsForSplit = props;
               for (const k in props) {
@@ -1647,7 +1658,7 @@ function createExtractor({
               const out = getSplitStyles(propsForSplit, staticConfig, defaultTheme, "", componentState, {
                 ...styleProps,
                 noClass: true,
-                fallbackProps: completeProps,
+                fallbackProps,
                 ...(platform2 === "native" && {
                   resolveValues: "except-theme"
                 })
@@ -1659,7 +1670,7 @@ function createExtractor({
                   const blockOut = getSplitStyles(block, staticConfig, defaultTheme, "", componentState, {
                     ...styleProps,
                     noClass: true,
-                    fallbackProps: completeProps
+                    fallbackProps
                   }, void 0, void 0, void 0, void 0, false, debugPropValue || shouldPrintDebug);
                   if (blockOut) {
                     extractedMediaLikeProps[k] = {
@@ -1758,8 +1769,9 @@ function createExtractor({
               switch (attr.type) {
                 case "ternary":
                   {
-                    const a = getProps(attr.value.alternate, false, "ternary.alternate");
-                    const c = getProps(attr.value.consequent, false, "ternary.consequent");
+                    const branchProps = ternaryBranchProps.get((0, import_normalizeTernaries.getTernaryKey)(attr.value.test));
+                    const a = getProps(attr.value.alternate, false, "ternary.alternate", branchProps?.alternate);
+                    const c = getProps(attr.value.consequent, false, "ternary.consequent", branchProps?.consequent);
                     if (a) attr.value.alternate = a;
                     if (c) attr.value.consequent = c;
                     if (shouldPrintDebug) logger.info(["     => tern ", (0, import_extractHelpers.attrStr)(attr)].join(" "));

package/dist/extractor/normalizeTernaries.cjs

@@ -33,6 +33,7 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var normalizeTernaries_exports = {};
 __export(normalizeTernaries_exports, {
+  getTernaryKey: () => getTernaryKey,
   normalizeTernaries: () => normalizeTernaries
 });
 module.exports = __toCommonJS(normalizeTernaries_exports);
@@ -41,6 +42,9 @@ var t = __toESM(require("@babel/types"));
 var import_web = require("@tamagui/web");
 var import_invariant = __toESM(require("invariant"));
 var import_propsToFontFamilyCache = require("./propsToFontFamilyCache.cjs");
+function getTernaryKey(test) {
+  return (0, import_generator.default)(test).code;
+}
 function normalizeTernaries(ternaries) {
   (0, import_invariant.default)(Array.isArray(ternaries), "extractStaticTernaries expects param 1 to be an array of ternaries");
   if (ternaries.length === 0) {
@@ -69,7 +73,7 @@ function normalizeTernaries(ternaries) {
         shouldSwap = true;
       }
     }
-    const key = (0, import_generator.default)(ternaryTest).code;
+    const key = getTernaryKey(ternaryTest);
     if (!ternariesByKey[key]) {
       ternariesByKey[key] = {
         ...rest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
@@ -50,19 +50,19 @@
     "@babel/template": "^7.25.0",
     "@babel/traverse": "^7.25.4",
     "@babel/types": "^7.25.4",
-    "@tamagui/cli-color": "2.6.2",
-    "@tamagui/config-default": "2.6.2",
-    "@tamagui/core": "2.6.2",
-    "@tamagui/fake-react-native": "2.6.2",
-    "@tamagui/generate-themes": "2.6.2",
-    "@tamagui/helpers": "2.6.2",
-    "@tamagui/helpers-node": "2.6.2",
-    "@tamagui/proxy-worm": "2.6.2",
-    "@tamagui/react-native-web-internals": "2.6.2",
-    "@tamagui/react-native-web-lite": "2.6.2",
-    "@tamagui/shorthands": "2.6.2",
-    "@tamagui/types": "2.6.2",
-    "@tamagui/web": "2.6.2",
+    "@tamagui/cli-color": "2.6.3",
+    "@tamagui/config-default": "2.6.3",
+    "@tamagui/core": "2.6.3",
+    "@tamagui/fake-react-native": "2.6.3",
+    "@tamagui/generate-themes": "2.6.3",
+    "@tamagui/helpers": "2.6.3",
+    "@tamagui/helpers-node": "2.6.3",
+    "@tamagui/proxy-worm": "2.6.3",
+    "@tamagui/react-native-web-internals": "2.6.3",
+    "@tamagui/react-native-web-lite": "2.6.3",
+    "@tamagui/shorthands": "2.6.3",
+    "@tamagui/types": "2.6.3",
+    "@tamagui/web": "2.6.3",
     "babel-literal-to-ast": "^2.1.0",
     "browserslist": "^4.28.1",
     "check-dependency-version-consistency": "^4.1.0",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.25.4",
-    "@tamagui/build": "2.6.2",
+    "@tamagui/build": "2.6.3",
     "@types/babel__core": "^7.20.5",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",

package/src/extractor/concatClassName.ts

@@ -32,6 +32,14 @@ export function concatClassName(_cn: Record<string, any> | null | undefined): st
       const name = names[i]
 
       if (!name || name === ' ') continue
+      if (name.startsWith('font_')) {
+        if (usedPrefixes.has('fontFamily')) {
+          continue
+        }
+        usedPrefixes.add('fontFamily')
+        final = name + ' ' + final
+        continue
+      }
       if (name[0] !== '_') {
         // not snack style (todo slightly stronger heuristic)
         final = name + ' ' + final

package/src/extractor/createExtractor.ts

@@ -46,7 +46,7 @@ import { cleanupBeforeExit, getStaticBindingsForScope } from './getStaticBinding
 import { literalToAst } from './literalToAst'
 import { loadTamagui, loadTamaguiSync } from './loadTamagui'
 import { logLines } from './logLines'
-import { normalizeTernaries } from './normalizeTernaries'
+import { getTernaryKey, normalizeTernaries } from './normalizeTernaries'
 import { setPropsToFontFamily } from './propsToFontFamilyCache'
 import { timer } from './timer'
 import { validHTMLAttributes } from './validHTMLAttributes'
@@ -2129,6 +2129,16 @@ export function createExtractor(
             }, [])
             .flat()
 
+          const ternaryBranchProps = new Map<string, Ternary>()
+          const allTernaries = attrs.flatMap((attr) =>
+            attr.type === 'ternary' ? attr.value : []
+          )
+          if (allTernaries.length > 1) {
+            for (const ternary of normalizeTernaries(allTernaries)) {
+              ternaryBranchProps.set(getTernaryKey(ternary.test), ternary)
+            }
+          }
+
           // wrap theme around children on flatten
           // account for shouldFlatten could change w the above block "if (disableExtractVariables)"
           if (themeVal) {
@@ -2397,7 +2407,8 @@ export function createExtractor(
           const getProps = (
             props: object | null,
             includeProps = false,
-            debugName = ''
+            debugName = '',
+            branchProps?: object | null
           ) => {
             if (!props) {
               if (shouldPrintDebug) logger.info([' getProps() no props'].join(' '))
@@ -2415,6 +2426,10 @@ export function createExtractor(
             const before = process.env.IS_STATIC
             process.env.IS_STATIC = 'is_static'
             try {
+              const fallbackProps = branchProps
+                ? { ...completeProps, ...branchProps }
+                : completeProps
+
               // $group-* / $theme-* keys carry block-form style objects that
               // getSplitStyles drops in static mode (no parent group context,
               // no theme value to read). Pluck them out so the atomic-CSS
@@ -2453,7 +2468,7 @@ export function createExtractor(
                 {
                   ...styleProps,
                   noClass: true,
-                  fallbackProps: completeProps,
+                  fallbackProps,
                   ...(platform === 'native' && {
                     resolveValues: 'except-theme',
                   }),
@@ -2484,7 +2499,7 @@ export function createExtractor(
                     {
                       ...styleProps,
                       noClass: true,
-                      fallbackProps: completeProps,
+                      fallbackProps,
                     },
                     undefined,
                     undefined,
@@ -2641,8 +2656,21 @@ export function createExtractor(
 
               switch (attr.type) {
                 case 'ternary': {
-                  const a = getProps(attr.value.alternate, false, 'ternary.alternate')
-                  const c = getProps(attr.value.consequent, false, 'ternary.consequent')
+                  const branchProps = ternaryBranchProps.get(
+                    getTernaryKey(attr.value.test)
+                  )
+                  const a = getProps(
+                    attr.value.alternate,
+                    false,
+                    'ternary.alternate',
+                    branchProps?.alternate
+                  )
+                  const c = getProps(
+                    attr.value.consequent,
+                    false,
+                    'ternary.consequent',
+                    branchProps?.consequent
+                  )
                   if (a) attr.value.alternate = a
                   if (c) attr.value.consequent = c
                   if (shouldPrintDebug)

package/src/extractor/normalizeTernaries.ts

@@ -5,6 +5,10 @@ import invariant from 'invariant'
 import type { Ternary } from '../types'
 import { forwardFontFamilyName } from './propsToFontFamilyCache'
 
+export function getTernaryKey(test: t.Node) {
+  return generate(test).code
+}
+
 export function normalizeTernaries(ternaries: Ternary[]) {
   invariant(
     Array.isArray(ternaries),
@@ -43,8 +47,7 @@ export function normalizeTernaries(ternaries: Ternary[]) {
       }
     }
 
-    // @ts-ignore
-    const key = generate(ternaryTest as any).code
+    const key = getTernaryKey(ternaryTest)
 
     if (!ternariesByKey[key]) {
       ternariesByKey[key] = {

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAmBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAoB,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAc1E,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAwB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AA6C9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAsJnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EAmjF1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAmBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAoB,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAc1E,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAwB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AA6C9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAsJnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EA+kF1D"}

package/types/extractor/normalizeTernaries.d.ts

@@ -1,3 +1,5 @@
+import * as t from '@babel/types';
 import type { Ternary } from '../types';
+export declare function getTernaryKey(test: t.Node): string;
 export declare function normalizeTernaries(ternaries: Ternary[]): Ternary[];
 //# sourceMappingURL=normalizeTernaries.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGvC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,aAmEtD"}
+{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGvC,wBAAgB,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,UAEzC;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,aAkEtD"}