@tamagui/static 2.0.0-rc.8 → 2.0.0

package/dist/extractor/loadTamagui.cjs

@@ -2,33 +2,35 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var loadTamagui_exports = {};
 __export(loadTamagui_exports, {
   esbuildWatchFiles: () => esbuildWatchFiles,
@@ -41,19 +43,18 @@ __export(loadTamagui_exports, {
   resolveWebOrNativeSpecificEntry: () => resolveWebOrNativeSpecificEntry
 });
 module.exports = __toCommonJS(loadTamagui_exports);
-var import_node_path = require("node:path"),
-  import_cli_color = require("@tamagui/cli-color"),
-  import_esbuild = __toESM(require("esbuild")),
-  esbuildWasm = __toESM(require("esbuild-wasm")),
-  fsExtra = __toESM(require("fs-extra")),
-  import_constants = require("../constants.cjs"),
-  import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs"),
-  import_registerRequire = require("../registerRequire.cjs"),
-  import_bundleConfig = require("./bundleConfig.cjs"),
-  import_getTamaguiConfigPathFromOptionsConfig = require("./getTamaguiConfigPathFromOptionsConfig.cjs"),
-  import_regenerateConfig = require("./regenerateConfig.cjs");
+var import_node_path = require("node:path");
+var import_cli_color = require("@tamagui/cli-color");
+var import_esbuild = __toESM(require("esbuild"));
+var esbuildWasm = __toESM(require("esbuild-wasm"));
+var fsExtra = __toESM(require("fs-extra"));
+var import_constants = require("../constants.cjs");
+var import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs");
+var import_registerRequire = require("../registerRequire.cjs");
+var import_bundleConfig = require("./bundleConfig.cjs");
+var import_getTamaguiConfigPathFromOptionsConfig = require("./getTamaguiConfigPathFromOptionsConfig.cjs");
+var import_regenerateConfig = require("./regenerateConfig.cjs");
 const getFilledOptions = propsIn => ({
-  // defaults
   platform: "web",
   config: "tamagui.config.ts",
   components: ["tamagui"],
@@ -62,14 +63,20 @@ const getFilledOptions = propsIn => ({
 let isLoadingPromise;
 async function loadTamagui(propsIn) {
   if (isLoadingPromise) return await isLoadingPromise;
-  let resolvePromise, rejectPromise;
+  let resolvePromise;
+  let rejectPromise;
   isLoadingPromise = new Promise((res, rej) => {
-    resolvePromise = res, rejectPromise = rej;
+    resolvePromise = res;
+    rejectPromise = rej;
   });
   try {
-    const props = getFilledOptions(propsIn),
-      bundleInfo = await (0, import_bundleConfig.getBundledConfig)(props);
-    if (!bundleInfo) return console.warn("No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs."), resolvePromise(null), null;
+    const props = getFilledOptions(propsIn);
+    const bundleInfo = await (0, import_bundleConfig.getBundledConfig)(props);
+    if (!bundleInfo) {
+      console.warn(`No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs.`);
+      resolvePromise(null);
+      return null;
+    }
     await generateThemesAndLog(props);
     const maybeTamaguiConfig = bundleInfo.tamaguiConfig;
     if (maybeTamaguiConfig && !maybeTamaguiConfig.parsed) {
@@ -78,53 +85,71 @@ async function loadTamagui(propsIn) {
       } = (0, import_requireTamaguiCore.requireTamaguiCore)(props.platform || "web");
       bundleInfo.tamaguiConfig = createTamagui(bundleInfo.tamaguiConfig);
     }
-    return (0, import_bundleConfig.hasBundledConfigChanged)() ? (await (0, import_regenerateConfig.regenerateConfig)(props, bundleInfo), resolvePromise(bundleInfo), bundleInfo) : (resolvePromise(bundleInfo), bundleInfo);
+    if (!(0, import_bundleConfig.hasBundledConfigChanged)()) {
+      resolvePromise(bundleInfo);
+      return bundleInfo;
+    }
+    await (0, import_regenerateConfig.regenerateConfig)(props, bundleInfo);
+    resolvePromise(bundleInfo);
+    return bundleInfo;
   } catch (err) {
-    throw rejectPromise(), err;
+    rejectPromise();
+    throw err;
   } finally {
     isLoadingPromise = null;
   }
 }
-let waiting = !1;
-const generateThemesAndLog = async (options, force = !1) => {
-    if (!waiting && options.themeBuilder) try {
-      if (waiting = !0, await new Promise(res => setTimeout(res, 30)), (await (0, import_regenerateConfig.generateTamaguiThemes)(options, force)) && ((0, import_cli_color.colorLog)(import_cli_color.Color.FgYellow, `  \u27A1 [tamagui] generated themes: ${(0, import_node_path.relative)(process.cwd(), options.themeBuilder.output)}`), options.outputCSS)) {
+let waiting = false;
+const generateThemesAndLog = async (options, force = false) => {
+  if (waiting) return;
+  if (!options.themeBuilder) return;
+  try {
+    waiting = true;
+    await new Promise(res => setTimeout(res, 30));
+    if (await (0, import_regenerateConfig.generateTamaguiThemes)(options, force)) {
+      (0, import_cli_color.colorLog)(import_cli_color.Color.FgYellow, `  \u27A1 [tamagui] generated themes: ${(0, import_node_path.relative)(process.cwd(), options.themeBuilder.output)}`);
+      if (options.outputCSS) {
         const loadedConfig = (0, import_bundleConfig.getLoadedConfig)();
-        loadedConfig && (await (0, import_bundleConfig.writeTamaguiCSS)(options.outputCSS, loadedConfig));
+        if (loadedConfig) await (0, import_bundleConfig.writeTamaguiCSS)(options.outputCSS, loadedConfig);
       }
-    } finally {
-      waiting = !1;
     }
-  },
-  last = {},
-  lastVersion = {};
-let esbuildWasmInitialized = !1;
+  } finally {
+    waiting = false;
+  }
+};
+const last = {};
+const lastVersion = {};
+let esbuildWasmInitialized = false;
 async function loadTamaguiBuildConfigAsync(tamaguiOptions) {
-  const buildFilePath = tamaguiOptions?.buildFile ?? "./tamagui.build.ts",
-    absolutePath = buildFilePath[0] === "." ? (0, import_node_path.join)(process.cwd(), buildFilePath) : buildFilePath;
+  const buildFilePath = tamaguiOptions?.buildFile ?? "./tamagui.build.ts";
+  const absolutePath = buildFilePath[0] === "." ? (0, import_node_path.join)(process.cwd(), buildFilePath) : buildFilePath;
   if (fsExtra.existsSync(absolutePath)) try {
     const source = await fsExtra.readFile(absolutePath, "utf-8");
-    esbuildWasmInitialized || (await esbuildWasm.initialize({}), esbuildWasmInitialized = !0);
+    if (!esbuildWasmInitialized) {
+      await esbuildWasm.initialize({});
+      esbuildWasmInitialized = true;
+    }
     const result = await esbuildWasm.transform(source, {
-        loader: "ts",
-        format: "cjs",
-        target: "node18",
-        sourcefile: absolutePath
-      }),
-      module2 = {
-        exports: {}
-      };
+      loader: "ts",
+      format: "cjs",
+      target: "node18",
+      sourcefile: absolutePath
+    });
+    const module2 = {
+      exports: {}
+    };
     new Function("module", "exports", "require", "process", result.code)(module2, module2.exports, require, process);
     const out = module2.exports.default || module2.exports;
-    if (!out || typeof out != "object") throw new Error(`No default export found in ${buildFilePath}: ${out}`);
+    if (!out || typeof out !== "object") throw new Error(`No default export found in ${buildFilePath}: ${out}`);
     tamaguiOptions = {
       ...tamaguiOptions,
       ...out
     };
   } catch (err) {
-    throw console.error(`[tamagui] Error loading ${buildFilePath}:`, err), err;
+    console.error(`[tamagui] Error loading ${buildFilePath}:`, err);
+    throw err;
   }
-  if (!tamaguiOptions) throw new Error("No tamagui build options found either via input props or at tamagui.build.ts");
+  if (!tamaguiOptions) throw new Error(`No tamagui build options found either via input props or at tamagui.build.ts`);
   return {
     config: "tamagui.config.ts",
     components: ["tamagui", "@tamagui/core"],
@@ -146,7 +171,7 @@ function loadTamaguiBuildConfigSync(tamaguiOptions) {
       registered.unregister();
     }
   }
-  if (!tamaguiOptions) throw new Error("No tamagui build options found either via input props or at tamagui.build.ts");
+  if (!tamaguiOptions) throw new Error(`No tamagui build options found either via input props or at tamagui.build.ts`);
   return {
     config: "tamagui.config.ts",
     components: ["tamagui", "@tamagui/core"],
@@ -159,25 +184,29 @@ function loadTamaguiSync({
   ...propsIn
 }) {
   const key = JSON.stringify(propsIn);
-  if (last[key] && !(0, import_bundleConfig.hasBundledConfigChanged)() && (!lastVersion[key] || lastVersion[key] === cacheKey)) return last[key];
+  if (last[key] && !(0, import_bundleConfig.hasBundledConfigChanged)()) {
+    if (!lastVersion[key] || lastVersion[key] === cacheKey) return last[key];
+  }
   lastVersion[key] = cacheKey || "";
   const props = getFilledOptions(propsIn);
-  process.env.IS_STATIC = "is_static", process.env.TAMAGUI_IS_SERVER = "true";
+  process.env.IS_STATIC = "is_static";
+  process.env.TAMAGUI_IS_SERVER = "true";
   const {
     unregister
   } = (0, import_registerRequire.registerRequire)(props.platform || "web", {
     proxyWormImports: !!forceExports
   });
   try {
-    const devValueOG = globalThis.__DEV__;
-    globalThis.__DEV__ = process.env.NODE_ENV === "development";
+    const devValueOG = globalThis["__DEV__"];
+    globalThis["__DEV__"] = process.env.NODE_ENV === "development";
     try {
       let tamaguiConfig = null;
       if (propsIn.config) {
-        const configPath = (0, import_getTamaguiConfigPathFromOptionsConfig.getTamaguiConfigPathFromOptionsConfig)(propsIn.config),
-          exp = require(configPath);
-        if (!exp || exp._isProxyWorm) throw new Error("Got a empty / proxied config!");
-        if (tamaguiConfig = exp.default || exp.config || exp, !tamaguiConfig || !tamaguiConfig.parsed) {
+        const configPath = (0, import_getTamaguiConfigPathFromOptionsConfig.getTamaguiConfigPathFromOptionsConfig)(propsIn.config);
+        const exp = require(configPath);
+        if (!exp || exp._isProxyWorm) throw new Error(`Got a empty / proxied config!`);
+        tamaguiConfig = exp["default"] || exp["config"] || exp;
+        if (!tamaguiConfig || !tamaguiConfig.parsed) {
           const confPath = require.resolve(configPath);
           throw new Error(`Can't find valid config in ${confPath}:
           
@@ -190,9 +219,11 @@ function loadTamaguiSync({
           createTamagui(tamaguiConfig);
         }
       }
-      const components = (0, import_bundleConfig.loadComponents)(props, forceExports);
-      if (!components) throw new Error("No components loaded");
-      process.env.DEBUG === "tamagui" && console.info("components", components), process.env.IS_STATIC = void 0, globalThis.__DEV__ = devValueOG;
+      const components = (0, import_bundleConfig.loadComponentsSync)(props, forceExports);
+      if (!components) throw new Error(`No components loaded`);
+      if (process.env.DEBUG === "tamagui") console.info(`components`, components);
+      process.env.IS_STATIC = void 0;
+      globalThis["__DEV__"] = devValueOG;
       const info = {
         components,
         tamaguiConfig,
@@ -202,18 +233,26 @@ function loadTamaguiSync({
         const {
           outputCSS
         } = props;
-        outputCSS && (0, import_bundleConfig.writeTamaguiCSS)(outputCSS, tamaguiConfig), (0, import_regenerateConfig.regenerateConfigSync)(props, info);
+        if (outputCSS) (0, import_bundleConfig.writeTamaguiCSS)(outputCSS, tamaguiConfig);
+        (0, import_regenerateConfig.regenerateConfigSync)(props, info);
       }
-      return last[key] = {
+      last[key] = {
         ...info,
-        cached: !0
-      }, info;
+        cached: true
+      };
+      return info;
     } catch (err) {
-      return err instanceof Error ? !import_constants.SHOULD_DEBUG && !forceExports ? (console.warn("Error loading tamagui.config.ts (set DEBUG=tamagui to see full stack), running tamagui without custom config"), console.info(`
+      if (err instanceof Error) {
+        if (!import_constants.SHOULD_DEBUG && !forceExports) {
+          console.warn(`Error loading tamagui.config.ts (set DEBUG=tamagui to see full stack), running tamagui without custom config`);
+          console.info(`
 
     ${err.message}
 
-`)) : import_constants.SHOULD_DEBUG && console.error(err) : console.error("Error loading tamagui.config.ts", err), {
+`);
+        } else if (import_constants.SHOULD_DEBUG) console.error(err);
+      } else console.error(`Error loading tamagui.config.ts`, err);
+      return {
         components: [],
         tamaguiConfig: null,
         nameToPaths: {}
@@ -234,7 +273,7 @@ async function getOptions({
   let pkgJson = {};
   try {
     pkgJson = await fsExtra.readJSON((0, import_node_path.join)(root, "package.json"));
-  } catch {}
+  } catch (err) {}
   return {
     mode: process.env.NODE_ENV === "production" ? "production" : "development",
     root,
@@ -256,34 +295,39 @@ async function getOptions({
     }
   };
 }
-function resolveWebOrNativeSpecificEntry(entry) {
-  const workspaceRoot = (0, import_node_path.resolve)(),
-    resolved = require.resolve(entry, {
-      paths: [workspaceRoot]
-    }),
-    ext = (0, import_node_path.extname)(resolved),
-    fileName = (0, import_node_path.basename)(resolved).replace(ext, ""),
-    specificFile = (0, import_node_path.join)((0, import_node_path.dirname)(resolved), fileName + "." + "web" + ext);
-  return fsExtra.existsSync(specificFile) ? specificFile : entry;
+function resolveWebOrNativeSpecificEntry(entry, platform) {
+  const workspaceRoot = (0, import_node_path.resolve)();
+  const resolved = require.resolve(entry, {
+    paths: [workspaceRoot]
+  });
+  const ext = (0, import_node_path.extname)(resolved);
+  const fileName = (0, import_node_path.basename)(resolved).replace(ext, "");
+  const specificExt = (platform || "web") === "web" ? "web" : "native";
+  const specificFile = (0, import_node_path.join)((0, import_node_path.dirname)(resolved), fileName + "." + specificExt + ext);
+  if (fsExtra.existsSync(specificFile)) return specificFile;
+  return entry;
 }
 const defaultPaths = ["tamagui.config.ts", (0, import_node_path.join)("src", "tamagui.config.ts")];
-let hasWarnedOnce = !1;
+let hasWarnedOnce = false;
 async function getDefaultTamaguiConfigPath(root, configPath) {
   const searchPaths = [...new Set([configPath, ...defaultPaths].filter(Boolean).map(p => (0, import_node_path.join)(root, p)))];
   for (const path of searchPaths) if (await fsExtra.pathExists(path)) return path;
-  hasWarnedOnce || (hasWarnedOnce = !0, console.warn(`Warning: couldn't find tamagui.config.ts in the following paths given configuration "${configPath}":
+  if (!hasWarnedOnce) {
+    hasWarnedOnce = true;
+    console.warn(`Warning: couldn't find tamagui.config.ts in the following paths given configuration "${configPath}":
     ${searchPaths.join(`
   `)}
-  `));
+  `);
+  }
 }
 async function esbuildWatchFiles(entry, onChanged) {
-  let hasRunOnce = !1;
+  let hasRunOnce = false;
   const context = await import_esbuild.default.context({
-    bundle: !0,
+    bundle: true,
     entryPoints: [entry],
     resolveExtensions: [".ts", ".tsx", ".js", ".mjs"],
     logLevel: "silent",
-    write: !1,
+    write: false,
     alias: {
       "@react-native/normalize-color": "@tamagui/proxy-worm",
       "react-native-web": "@tamagui/react-native-web-lite",
@@ -300,7 +344,7 @@ async function esbuildWatchFiles(entry, onChanged) {
     //   },
     // },
     {
-      name: "on-rebuild",
+      name: `on-rebuild`,
       setup({
         onEnd,
         onResolve
@@ -309,14 +353,16 @@ async function esbuildWatchFiles(entry, onChanged) {
           filter: /^[^./]|^\.[^./]|^\.\.[^/]/
         }, args => ({
           path: args.path,
-          external: !0
-        })), onEnd(() => {
-          hasRunOnce ? onChanged() : hasRunOnce = !0;
+          external: true
+        }));
+        onEnd(() => {
+          if (!hasRunOnce) hasRunOnce = true;else onChanged();
         });
       }
     }]
   });
-  return context.watch(), () => {
+  context.watch();
+  return () => {
     context.dispose();
   };
 }

package/dist/extractor/logLines.cjs

@@ -3,33 +3,41 @@ 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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var logLines_exports = {};
 __export(logLines_exports, {
   logLines: () => logLines
 });
 module.exports = __toCommonJS(logLines_exports);
-const prefix = "           ",
-  logLines = (str, singleLine = !1) => {
-    if (singleLine) return prefix + str.split(" ").join(`
+const prefix = "           ";
+const logLines = (str, singleLine = false) => {
+  if (singleLine) {
+    return prefix + str.split(" ").join(`
 ${prefix}`);
-    const lines = [""],
-      items = str.split(" ");
-    for (const item of items) item.length + lines[lines.length - 1].length > 85 && lines.push(""), lines[lines.length - 1] += item + " ";
-    return lines.map((line, i) => prefix + (i == 0 ? "" : " ") + line.trim()).join(`
-`);
-  };
+  }
+  const lines = [""];
+  const items = str.split(" ");
+  for (const item of items) {
+    if (item.length + lines[lines.length - 1].length > 85) {
+      lines.push("");
+    }
+    lines[lines.length - 1] += item + " ";
+  }
+  return lines.map((line, i) => prefix + (i == 0 ? "" : " ") + line.trim()).join("\n");
+};

package/dist/extractor/normalizeTernaries.cjs

@@ -2,45 +2,50 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var normalizeTernaries_exports = {};
 __export(normalizeTernaries_exports, {
   normalizeTernaries: () => normalizeTernaries
 });
 module.exports = __toCommonJS(normalizeTernaries_exports);
-var import_generator = __toESM(require("@babel/generator")),
-  t = __toESM(require("@babel/types")),
-  import_web = require("@tamagui/web"),
-  import_invariant = __toESM(require("invariant")),
-  import_propsToFontFamilyCache = require("./propsToFontFamilyCache.cjs");
+var import_generator = __toESM(require("@babel/generator"));
+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 normalizeTernaries(ternaries) {
-  if ((0, import_invariant.default)(Array.isArray(ternaries), "extractStaticTernaries expects param 1 to be an array of ternaries"), ternaries.length === 0) return [];
+  (0, import_invariant.default)(Array.isArray(ternaries), "extractStaticTernaries expects param 1 to be an array of ternaries");
+  if (ternaries.length === 0) {
+    return [];
+  }
   const ternariesByKey = {};
   for (let idx = -1, len = ternaries.length; ++idx < len;) {
     const {
@@ -51,23 +56,40 @@ function normalizeTernaries(ternaries) {
       ...rest
     } = ternaries[idx];
     let ternaryTest = test;
-    t.isExpressionStatement(test) && (ternaryTest = test.expression);
-    let shouldSwap = !1;
-    t.isUnaryExpression(test) && test.operator === "!" ? (ternaryTest = test.argument, shouldSwap = !0) : t.isBinaryExpression(test) && (test.operator === "!==" || test.operator === "!=") && (ternaryTest = t.binaryExpression(test.operator.replace("!", "="), test.left, test.right), shouldSwap = !0);
+    if (t.isExpressionStatement(test)) {
+      ternaryTest = test.expression;
+    }
+    let shouldSwap = false;
+    if (t.isUnaryExpression(test) && test.operator === "!") {
+      ternaryTest = test.argument;
+      shouldSwap = true;
+    } else if (t.isBinaryExpression(test)) {
+      if (test.operator === "!==" || test.operator === "!=") {
+        ternaryTest = t.binaryExpression(test.operator.replace("!", "="), test.left, test.right);
+        shouldSwap = true;
+      }
+    }
     const key = (0, import_generator.default)(ternaryTest).code;
-    ternariesByKey[key] || (ternariesByKey[key] = {
-      ...rest,
-      alternate: {},
-      consequent: {},
-      test: ternaryTest,
-      remove
-    });
-    const altStyle = (shouldSwap ? consequent : alternate) ?? {},
-      consStyle = (shouldSwap ? alternate : consequent) ?? {},
-      nextAlt = ternariesByKey[key].alternate;
-    ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle, nextAlt), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(altStyle, ternariesByKey[key].alternate);
+    if (!ternariesByKey[key]) {
+      ternariesByKey[key] = {
+        ...rest,
+        alternate: {},
+        consequent: {},
+        test: ternaryTest,
+        remove
+      };
+    }
+    const altStyle = (shouldSwap ? consequent : alternate) ?? {};
+    const consStyle = (shouldSwap ? alternate : consequent) ?? {};
+    const nextAlt = ternariesByKey[key].alternate;
+    ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle, nextAlt);
+    (0, import_propsToFontFamilyCache.forwardFontFamilyName)(altStyle, ternariesByKey[key].alternate);
     const nextCons = ternariesByKey[key].consequent;
-    ternariesByKey[key].consequent = (0, import_web.mergeProps)(consStyle, nextCons), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(consStyle, ternariesByKey[key].consequent);
+    ternariesByKey[key].consequent = (0, import_web.mergeProps)(consStyle, nextCons);
+    (0, import_propsToFontFamilyCache.forwardFontFamilyName)(consStyle, ternariesByKey[key].consequent);
   }
-  return Object.keys(ternariesByKey).map(key => ternariesByKey[key]);
+  const ternaryExpression = Object.keys(ternariesByKey).map(key => {
+    return ternariesByKey[key];
+  });
+  return ternaryExpression;
 }

package/dist/extractor/propsToFontFamilyCache.cjs

@@ -3,20 +3,22 @@ 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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var propsToFontFamilyCache_exports = {};
 __export(propsToFontFamilyCache_exports, {
@@ -34,5 +36,7 @@ function getFontFamilyNameFromProps(props) {
 }
 function forwardFontFamilyName(prev, next, fallback) {
   const ff = getFontFamilyNameFromProps(prev) || fallback;
-  ff && setPropsToFontFamily(next, ff);
+  if (ff) {
+    setPropsToFontFamily(next, ff);
+  }
 }