@tamagui/static 2.0.0-rc.9 → 2.0.0

package/dist/extractor/extractHelpers.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 extractHelpers_exports = {};
 __export(extractHelpers_exports, {
   attrStr: () => attrStr,
@@ -47,73 +49,134 @@ __export(extractHelpers_exports, {
   ternaryStr: () => ternaryStr
 });
 module.exports = __toCommonJS(extractHelpers_exports);
-var import_node_path = require("node:path"),
-  import_generator = __toESM(require("@babel/generator")),
-  t = __toESM(require("@babel/types")),
-  import_find_root = __toESM(require("find-root")),
-  import_memoize = require("../helpers/memoize.cjs");
+var import_node_path = require("node:path");
+var import_generator = __toESM(require("@babel/generator"));
+var t = __toESM(require("@babel/types"));
+var import_find_root = __toESM(require("find-root"));
+var import_memoize = require("../helpers/memoize.cjs");
 function isPresent(input) {
   return input != null;
 }
 function isSimpleSpread(node) {
   return t.isIdentifier(node.argument) || t.isMemberExpression(node.argument);
 }
-const attrStr = attr => attr ? attr.type === "attr" ? getNameAttr(attr.value) : attr.type === "ternary" ? `...${ternaryStr(attr.value)}` : `${attr.type}(${objToStr(attr.value)})` : "",
-  objToStr = (obj, spacer = ", ") => obj ? `{${Object.entries(obj).map(([k, v]) => `${k}:${Array.isArray(v) ? "[...]" : v && typeof v == "object" ? `${objToStr(v, ",")}` : JSON.stringify(v)}`).join(spacer)}}` : `${obj}`,
-  getNameAttr = attr => t.isJSXSpreadAttribute(attr) ? `...${attr.argument.name}` : "name" in attr ? attr.name.name : `unknown-${attr.type}`,
-  ternaryStr = x => ["ternary(", t.isIdentifier(x.test) ? x.test.name : t.isMemberExpression(x.test) ? [x.test.object.name, x.test.property.name] :
+const attrStr = attr => {
+  return !attr ? "" : attr.type === "attr" ? getNameAttr(attr.value) : attr.type === "ternary" ? `...${ternaryStr(attr.value)}` : `${attr.type}(${objToStr(attr.value)})`;
+};
+const objToStr = (obj, spacer = ", ") => {
+  if (!obj) {
+    return `${obj}`;
+  }
+  return `{${Object.entries(obj).map(([k, v]) => `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === "object" ? `${objToStr(v, ",")}` : JSON.stringify(v)}`).join(spacer)}}`;
+};
+const getNameAttr = attr => {
+  if (t.isJSXSpreadAttribute(attr)) {
+    return `...${attr.argument["name"]}`;
+  }
+  return "name" in attr ? attr.name.name : `unknown-${attr["type"]}`;
+};
+const ternaryStr = x => {
+  const conditional = t.isIdentifier(x.test) ? x.test.name : t.isMemberExpression(x.test) ? [x.test.object["name"], x.test.property["name"]] :
   // @ts-ignore
-  (0, import_generator.default)(x.test).code, isFilledObj(x.consequent) ? ` ? ${objToStr(x.consequent)}` : " ? \u{1F6AB}", isFilledObj(x.alternate) ? ` : ${objToStr(x.alternate)}` : " : \u{1F6AB}", ")"].flat().join(""),
-  isFilledObj = obj => obj && Object.keys(obj).length;
+  (0, import_generator.default)(x.test).code;
+  return ["ternary(", conditional, isFilledObj(x.consequent) ? ` ? ${objToStr(x.consequent)}` : " ? \u{1F6AB}", isFilledObj(x.alternate) ? ` : ${objToStr(x.alternate)}` : " : \u{1F6AB}", ")"].flat().join("");
+};
+const isFilledObj = obj => obj && Object.keys(obj).length;
 function findComponentName(scope) {
+  const componentName = "";
   let cur = scope.path;
-  for (; cur.parentPath && !t.isProgram(cur.parentPath.parent);) cur = cur.parentPath;
+  while (cur.parentPath && !t.isProgram(cur.parentPath.parent)) {
+    cur = cur.parentPath;
+  }
   let node = cur.parent;
-  if (t.isExportNamedDeclaration(node) && (node = node.declaration), t.isVariableDeclaration(node)) {
+  if (t.isExportNamedDeclaration(node)) {
+    node = node.declaration;
+  }
+  if (t.isVariableDeclaration(node)) {
     const [dec] = node.declarations;
-    if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) return dec.id.name;
+    if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) {
+      return dec.id.name;
+    }
+  }
+  if (t.isFunctionDeclaration(node)) {
+    return node.id?.name;
   }
-  return t.isFunctionDeclaration(node) ? node.id?.name : "";
+  return componentName;
 }
 function isValidThemeHook(props, jsxPath, n, sourcePath) {
-  if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return !1;
-  const binding = jsxPath.scope.getAllBindings()[n.object.name];
-  if (!binding?.path || !binding.path.isVariableDeclarator()) return !1;
+  if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false;
+  const bindings = jsxPath.scope.getAllBindings();
+  const binding = bindings[n.object.name];
+  if (!binding?.path) return false;
+  if (!binding.path.isVariableDeclarator()) return false;
   const init = binding.path.node.init;
-  if (!init || !t.isCallExpression(init) || !t.isIdentifier(init.callee) || init.callee.name !== "useTheme") return !1;
+  if (!init || !t.isCallExpression(init)) return false;
+  if (!t.isIdentifier(init.callee)) return false;
+  if (init.callee.name !== "useTheme") return false;
   const importNode = binding.scope.getBinding("useTheme")?.path.parent;
-  return !(!t.isImportDeclaration(importNode) || sourcePath && !isValidImport(props, sourcePath));
+  if (!t.isImportDeclaration(importNode)) return false;
+  if (sourcePath && !isValidImport(props, sourcePath)) {
+    return false;
+  }
+  return true;
 }
-const isInsideComponentPackage = (props, moduleName) => getValidComponentsPaths(props).some(path => moduleName.startsWith(path)),
-  isComponentPackage = (props, srcName) => getValidComponentsPaths(props).some(path => srcName.startsWith(path));
+const isInsideComponentPackage = (props, moduleName) => {
+  return getValidComponentsPaths(props).some(path => {
+    return moduleName.startsWith(path);
+  });
+};
+const isComponentPackage = (props, srcName) => {
+  return getValidComponentsPaths(props).some(path => {
+    return srcName.startsWith(path);
+  });
+};
 function getValidComponent(props, moduleName, componentName) {
-  if (componentName[0].toUpperCase() !== componentName[0]) return !1;
+  if (componentName[0].toUpperCase() !== componentName[0]) {
+    return false;
+  }
   for (const loaded of props.allLoadedComponents) {
     if (!loaded) continue;
-    const isInModule = moduleName === "*" || moduleName.startsWith(loaded.moduleName),
-      foundComponent = loaded.nameToInfo[componentName];
-    if (isInModule && foundComponent) return foundComponent;
+    const isInModule = moduleName === "*" || moduleName.startsWith(loaded.moduleName);
+    const foundComponent = loaded.nameToInfo[componentName];
+    if (isInModule && foundComponent) {
+      return foundComponent;
+    }
   }
   return null;
 }
 const isValidModule = (props, moduleName) => {
-    if (typeof moduleName != "string") throw new Error("No module name");
-    const isLocal = moduleName.startsWith(".");
-    return {
-      isLocal,
-      isValid: isLocal ? isInsideComponentPackage(props, moduleName) : isComponentPackage(props, moduleName)
-    };
-  },
-  getValidImport = (props, moduleName, componentName) => {
-    const {
-      isValid,
-      isLocal
-    } = isValidModule(props, moduleName);
-    return !isValid || !componentName ? null : getValidComponent(props, isLocal ? "*" : moduleName, componentName) || null;
-  },
-  isValidImport = (props, moduleName, componentName) => componentName ? !!getValidImport(props, moduleName, componentName) : isValidModule(props, moduleName).isValid,
-  getValidComponentPackages = (0, import_memoize.memoize)(props => [... /* @__PURE__ */new Set(["@tamagui/core", "tamagui", ...(props.components || [])])]),
-  getValidComponentsPaths = (0, import_memoize.memoize)(props => getValidComponentPackages(props).flatMap(pkg => {
+  if (typeof moduleName !== "string") {
+    throw new Error(`No module name`);
+  }
+  const isLocal = moduleName.startsWith(".");
+  return {
+    isLocal,
+    isValid: isLocal ? isInsideComponentPackage(props, moduleName) : isComponentPackage(props, moduleName)
+  };
+};
+const getValidImport = (props, moduleName, componentName) => {
+  const {
+    isValid,
+    isLocal
+  } = isValidModule(props, moduleName);
+  if (!isValid || !componentName) {
+    return null;
+  }
+  return getValidComponent(props, isLocal ? "*" : moduleName, componentName) || null;
+};
+const isValidImport = (props, moduleName, componentName) => {
+  if (!componentName) {
+    return isValidModule(props, moduleName).isValid;
+  }
+  return Boolean(getValidImport(props, moduleName, componentName));
+};
+const getValidComponentPackages = (0, import_memoize.memoize)(props => {
+  return [... /* @__PURE__ */new Set(["@tamagui/core", "tamagui", ...(props.components || [])])];
+});
+const getValidComponentsPaths = (0, import_memoize.memoize)(props => {
+  return getValidComponentPackages(props).flatMap(pkg => {
     const root = (0, import_find_root.default)(pkg);
-    return [(0, import_node_path.basename)(root), pkg].filter(Boolean);
-  }));
+    const based = (0, import_node_path.basename)(root);
+    return [based, pkg].filter(Boolean);
+  });
+});

package/dist/extractor/extractMediaStyle.cjs

@@ -2,76 +2,98 @@ 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 extractMediaStyle_exports = {};
 __export(extractMediaStyle_exports, {
   extractMediaStyle: () => extractMediaStyle,
   isValidMediaCall: () => isValidMediaCall
 });
 module.exports = __toCommonJS(extractMediaStyle_exports);
-var t = __toESM(require("@babel/types")),
-  core = __toESM(require("@tamagui/core")),
-  import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs"),
-  import_extractHelpers = require("./extractHelpers.cjs");
-function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = !1) {
+var t = __toESM(require("@babel/types"));
+var core = __toESM(require("@tamagui/core"));
+var import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs");
+var import_extractHelpers = require("./extractHelpers.cjs");
+function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = false) {
   const {
-      getCSSStylesAtomic
-    } = (0, import_requireTamaguiCore.requireTamaguiCore)("web"),
-    mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
-  if (!mt) return null;
+    getCSSStylesAtomic
+  } = (0, import_requireTamaguiCore.requireTamaguiCore)("web");
+  const mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
+  if (!mt) {
+    return null;
+  }
   const {
     key
   } = mt;
-  if (!tamaguiConfig.media[key]) return console.error(`Media query "${key}" not found: ${Object.keys(tamaguiConfig.media)}`), null;
-  const getStyleObj = (styleObj, negate = !1) => styleObj ? {
+  const mq = tamaguiConfig.media[key];
+  if (!mq) {
+    console.error(`Media query "${key}" not found: ${Object.keys(tamaguiConfig.media)}`);
+    return null;
+  }
+  const getStyleObj = (styleObj, negate = false) => {
+    return styleObj ? {
       styleObj,
       negate
-    } : null,
-    styleOpts = [getStyleObj(ternary.consequent, !1), getStyleObj(ternary.alternate, !0)].filter(import_extractHelpers.isPresent);
-  if (shouldPrintDebug && !styleOpts.length) return console.info("  media query, no styles?"), null;
-  const mediaKeyPrecendence = Object.keys(tamaguiConfig.media).reduce((acc, cur, i) => (acc[cur] = new Array(importance + 1).fill(":root").join(""), acc), {});
+    } : null;
+  };
+  const styleOpts = [getStyleObj(ternary.consequent, false), getStyleObj(ternary.alternate, true)].filter(import_extractHelpers.isPresent);
+  if (shouldPrintDebug && !styleOpts.length) {
+    console.info("  media query, no styles?");
+    return null;
+  }
+  const mediaKeys = Object.keys(tamaguiConfig.media);
+  const mediaKeyPrecendence = mediaKeys.reduce((acc, cur, i) => {
+    acc[cur] = new Array(importance + 1).fill(":root").join("");
+    return acc;
+  }, {});
   let mediaStyles = [];
   for (const {
     styleObj,
     negate
   } of styleOpts) {
-    const singleMediaStyles = getCSSStylesAtomic(styleObj).map(style => {
-      const mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, !0, negate),
-        className = `.${mediaStyle[core.StyleObjectIdentifier]}`;
+    const styles = getCSSStylesAtomic(styleObj);
+    const singleMediaStyles = styles.map(style => {
+      const mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, true, negate);
+      const className = `.${mediaStyle[core.StyleObjectIdentifier]}`;
       return {
         ...mediaStyle,
         className
       };
     });
-    shouldPrintDebug === "verbose" && console.info("  media styles:", importance, styleObj, singleMediaStyles.map(x => x[core.StyleObjectIdentifier]).join(", ")), mediaStyles = [...mediaStyles, ...singleMediaStyles];
+    if (shouldPrintDebug === "verbose") {
+      console.info("  media styles:", importance, styleObj, singleMediaStyles.map(x => x[core.StyleObjectIdentifier]).join(", "));
+    }
+    mediaStyles = [...mediaStyles, ...singleMediaStyles];
   }
-  return ternary.remove(), {
+  ternary.remove();
+  return {
     mediaStyles,
     ternaryWithoutMedia: mt.ternaryWithoutMedia
   };
@@ -79,40 +101,52 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
 function getMediaQueryTernary(props, ternary, jsxPath, sourcePath) {
   if (t.isLogicalExpression(ternary.test) && ternary.test.operator === "&&") {
     const mediaLeft = getMediaInfoFromExpression(props, ternary.test.left, jsxPath, sourcePath, ternary.inlineMediaQuery);
-    if (mediaLeft) return {
-      ...mediaLeft,
-      ternaryWithoutMedia: {
-        ...ternary,
-        test: ternary.test.right
-      }
-    };
+    if (mediaLeft) {
+      return {
+        ...mediaLeft,
+        ternaryWithoutMedia: {
+          ...ternary,
+          test: ternary.test.right
+        }
+      };
+    }
   }
   const result = getMediaInfoFromExpression(props, ternary.test, jsxPath, sourcePath, ternary.inlineMediaQuery);
-  return result ? {
-    ...result,
-    ternaryWithoutMedia: null
-  } : null;
+  if (result) {
+    return {
+      ...result,
+      ternaryWithoutMedia: null
+    };
+  }
+  return null;
 }
 function getMediaInfoFromExpression(props, test, jsxPath, sourcePath, inlineMediaQuery) {
-  if (inlineMediaQuery) return {
-    key: inlineMediaQuery,
-    bindingName: inlineMediaQuery
-  };
+  if (inlineMediaQuery) {
+    return {
+      key: inlineMediaQuery,
+      bindingName: inlineMediaQuery
+    };
+  }
   if (t.isMemberExpression(test) && t.isIdentifier(test.object) && t.isIdentifier(test.property)) {
-    const name = test.object.name,
-      key = test.property.name,
-      binding = jsxPath.scope.getAllBindings()[name];
-    if (!binding) return !1;
+    const name = test.object["name"];
+    const key = test.property["name"];
+    const bindings = jsxPath.scope.getAllBindings();
+    const binding = bindings[name];
+    if (!binding) return false;
     const bindingNode = binding.path?.node;
-    return !t.isVariableDeclarator(bindingNode) || !bindingNode.init || !isValidMediaCall(props, jsxPath, bindingNode.init, sourcePath) ? !1 : {
+    if (!t.isVariableDeclarator(bindingNode) || !bindingNode.init) return false;
+    if (!isValidMediaCall(props, jsxPath, bindingNode.init, sourcePath)) return false;
+    return {
       key,
       bindingName: name
     };
   }
   if (t.isIdentifier(test)) {
-    const key = test.name,
-      node = jsxPath.scope.getBinding(test.name)?.path?.node;
-    return !t.isVariableDeclarator(node) || !node.init || !isValidMediaCall(props, jsxPath, node.init, sourcePath) ? !1 : {
+    const key = test.name;
+    const node = jsxPath.scope.getBinding(test.name)?.path?.node;
+    if (!t.isVariableDeclarator(node)) return false;
+    if (!node.init || !isValidMediaCall(props, jsxPath, node.init, sourcePath)) return false;
+    return {
       key,
       bindingName: key
     };
@@ -120,9 +154,16 @@ function getMediaInfoFromExpression(props, test, jsxPath, sourcePath, inlineMedi
   return null;
 }
 function isValidMediaCall(props, jsxPath, init, sourcePath) {
-  if (!init || !t.isCallExpression(init) || !t.isIdentifier(init.callee) || init.callee.name !== "useMedia") return !1;
-  const mediaBinding = jsxPath.scope.getAllBindings().useMedia;
-  if (!mediaBinding) return !1;
+  if (!init || !t.isCallExpression(init)) return false;
+  if (!t.isIdentifier(init.callee)) return false;
+  if (init.callee.name !== "useMedia") return false;
+  const bindings = jsxPath.scope.getAllBindings();
+  const mediaBinding = bindings["useMedia"];
+  if (!mediaBinding) return false;
   const useMediaImport = mediaBinding.path.parent;
-  return !(!t.isImportDeclaration(useMediaImport) || !(0, import_extractHelpers.isValidImport)(props, sourcePath));
+  if (!t.isImportDeclaration(useMediaImport)) return false;
+  if (!(0, import_extractHelpers.isValidImport)(props, sourcePath)) {
+    return false;
+  }
+  return true;
 }