@tamagui/static 2.0.0-rc.9 → 2.0.0

package/dist/extractor/concatClassName.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 concatClassName_exports = {};
 __export(concatClassName_exports, {
@@ -24,20 +26,21 @@ __export(concatClassName_exports, {
 });
 module.exports = __toCommonJS(concatClassName_exports);
 function concatClassName(_cn) {
-  const args = arguments,
-    usedPrefixes = /* @__PURE__ */new Set();
+  const args = arguments;
+  const 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);
+    if (!Array.isArray(cns) && typeof cns !== "string") {
+      propObjects = propObjects || [];
+      propObjects.push(cns);
       continue;
     }
-    const names = Array.isArray(cns) ? cns : cns.split(" "),
-      numNames = names.length;
+    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;
@@ -50,31 +53,69 @@ function concatClassName(_cn) {
         final = name + " " + final;
         continue;
       }
-      const isMediaQuery = name[splitIndex + 1] === "_",
-        styleKey = name.slice(1, name.indexOf("-")),
-        mediaStart = splitIndex + 2,
-        mediaEnd = name.indexOf("_", mediaStart),
-        mediaKey = isMediaQuery && mediaEnd > mediaStart ? name.slice(mediaStart, mediaEnd) : null,
-        uid = mediaKey ? styleKey + mediaKey : styleKey;
-      if (usedPrefixes.has(uid)) continue;
+      const styleKey = name.slice(1, name.indexOf("-"));
+      const {
+        mediaKey,
+        pseudoKey
+      } = getClassNameScope(name, splitIndex);
+      const uid = `${styleKey}${mediaKey ? `@${mediaKey}` : ""}${pseudoKey ? `:${pseudoKey}` : ""}`;
+      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;
+      if (propName && propObjects) {
+        if (propObjects.some(po => {
+          if (pseudoKey) {
+            const propKey = pseudoInvert[pseudoKey];
+            return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
+          }
+          const res = po && propName in po && po[propName] !== null;
+          return res;
+        })) {
+          continue;
         }
-        return po && propName in po && po[propName] !== null;
-      }) || (final = name + " " + final);
+      }
+      final = name + " " + final;
     }
   }
   return final.trim();
 }
+function getClassNameScope(name, splitIndex) {
+  let mediaKey = "";
+  let pseudoKey = "";
+  let valueStart = splitIndex + 1;
+  if (name[valueStart] === "_") {
+    const mediaEnd = name.indexOf("_", valueStart + 1);
+    if (mediaEnd > valueStart + 1) {
+      mediaKey = name.slice(valueStart + 1, mediaEnd);
+      valueStart = mediaEnd + 1;
+    }
+  }
+  if (name[valueStart] === "0") {
+    const pseudoStart = valueStart + 1;
+    for (const nextPseudoKey of pseudoKeys) {
+      if (name.startsWith(`${nextPseudoKey}-`, pseudoStart)) {
+        pseudoKey = nextPseudoKey;
+        break;
+      }
+    }
+  }
+  return {
+    mediaKey,
+    pseudoKey
+  };
+}
 const pseudoInvert = {
   hover: "hoverStyle",
+  active: "pressStyle",
   focus: "focusStyle",
-  press: "pressStyle",
+  "focus-visible": "focusVisibleStyle",
+  "focus-within": "focusWithinStyle",
   focusVisible: "focusVisibleStyle",
   focusWithin: "focusWithinStyle",
-  disabled: "disabledStyle"
-};
+  disabled: "disabledStyle",
+  enter: "enterStyle",
+  exit: "exitStyle"
+};
+const pseudoKeys = Object.keys(pseudoInvert).sort((a, b) => b.length - a.length);

package/dist/extractor/createEvaluator.cjs

@@ -2,45 +2,47 @@ 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 createEvaluator_exports = {};
 __export(createEvaluator_exports, {
   createEvaluator: () => createEvaluator,
   createSafeEvaluator: () => createSafeEvaluator
 });
 module.exports = __toCommonJS(createEvaluator_exports);
-var import_node_vm = __toESM(require("node:vm")),
-  import_generator = __toESM(require("@babel/generator")),
-  t = __toESM(require("@babel/types")),
-  import_esbuild = __toESM(require("esbuild")),
-  import_constants = require("../constants.cjs"),
-  import_evaluateAstNode = require("./evaluateAstNode.cjs");
+var import_node_vm = __toESM(require("node:vm"));
+var import_generator = __toESM(require("@babel/generator"));
+var t = __toESM(require("@babel/types"));
+var import_esbuild = __toESM(require("esbuild"));
+var import_constants = require("../constants.cjs");
+var import_evaluateAstNode = require("./evaluateAstNode.cjs");
 function createEvaluator({
   props,
   staticNamespace,
@@ -49,26 +51,37 @@ function createEvaluator({
   shouldPrintDebug
 }) {
   const evalFn = n => {
-    if (t.isIdentifier(n) && typeof staticNamespace[n.name] < "u") return staticNamespace[n.name];
-    const evalContext = import_node_vm.default.createContext(staticNamespace),
-      codeWithTypescriptAnnotations = `(${(0, import_generator.default)(n).code})`,
-      code = import_esbuild.default.transformSync(codeWithTypescriptAnnotations, {
-        loader: "tsx"
-      }).code.replace(/;\n$/, "");
-    shouldPrintDebug && console.info("evaluating", code);
-    const result1 = import_node_vm.default.runInContext(code, evalContext),
-      result2 = import_node_vm.default.runInContext(code, evalContext);
-    if (!(Object.is(result1, result2) || typeof result1 == "object" && typeof result2 == "object" && JSON.stringify(result1) === JSON.stringify(result2))) throw shouldPrintDebug && console.info("Bailing on non-deterministic expression:", code, `
-First result:`, result1, "Second result:", result2), new Error("Non-deterministic value, bailing");
+    if (t.isIdentifier(n) && typeof staticNamespace[n.name] !== "undefined") {
+      return staticNamespace[n.name];
+    }
+    const evalContext = import_node_vm.default.createContext(staticNamespace);
+    const codeWithTypescriptAnnotations = `(${(0, import_generator.default)(n).code})`;
+    const code = import_esbuild.default.transformSync(codeWithTypescriptAnnotations, {
+      loader: "tsx"
+    }).code.replace(/;\n$/, "");
+    if (shouldPrintDebug) {
+      console.info("evaluating", code);
+    }
+    const result1 = import_node_vm.default.runInContext(code, evalContext);
+    const result2 = import_node_vm.default.runInContext(code, evalContext);
+    const isDeterministic = Object.is(result1, result2) || typeof result1 === "object" && typeof result2 === "object" && JSON.stringify(result1) === JSON.stringify(result2);
+    if (!isDeterministic) {
+      if (shouldPrintDebug) {
+        console.info("Bailing on non-deterministic expression:", code, "\nFirst result:", result1, "Second result:", result2);
+      }
+      throw new Error(`Non-deterministic value, bailing`);
+    }
     return result1;
   };
-  return n => (0, import_evaluateAstNode.evaluateAstNode)(n, evalFn);
+  return n => {
+    return (0, import_evaluateAstNode.evaluateAstNode)(n, evalFn);
+  };
 }
 function createSafeEvaluator(attemptEval) {
   return n => {
     try {
       return attemptEval(n);
-    } catch {
+    } catch (err) {
       return import_constants.FAILED_EVAL;
     }
   };