@tamagui/static 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/extractor/createLogger.cjs

@@ -3,43 +3,48 @@ 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 createLogger_exports = {};
 __export(createLogger_exports, {
   createLogger: () => createLogger
 });
 module.exports = __toCommonJS(createLogger_exports);
-var import_node_path = require("node:path"),
-  import_getPrefixLogs = require("./getPrefixLogs.cjs");
+var import_node_path = require("node:path");
+var import_getPrefixLogs = require("./getPrefixLogs.cjs");
 function createLogger(sourcePath, options) {
-  const shouldLogTiming = options.logTimings ?? !0,
-    start = Date.now(),
-    mem = process.env.TAMAGUI_SHOW_MEMORY_USAGE && shouldLogTiming ? process.memoryUsage() : null;
+  const shouldLogTiming = options.logTimings ?? true;
+  const start = Date.now();
+  const mem = process.env.TAMAGUI_SHOW_MEMORY_USAGE && shouldLogTiming ? process.memoryUsage() : null;
   return res => {
-    if (!shouldLogTiming) return;
-    const memUsed = mem ? Math.round((process.memoryUsage().heapUsed - mem.heapUsed) / 1024 / 1204 * 10) / 10 : 0,
-      path = (0, import_node_path.basename)(sourcePath || "").replace(/\.[jt]sx?$/, "").slice(0, 22).trim().padEnd(24),
-      numOptimized = `${res.optimized + res.styled}`.padStart(3),
-      numFound = `${res.found + res.styled}`.padStart(3),
-      numFlattened = `${res.flattened}`.padStart(3),
-      memory = memUsed ? ` ${memUsed}MB` : "",
-      timingStr = `${Date.now() - start}ms`.padStart(6),
-      pre = (0, import_getPrefixLogs.getPrefixLogs)(options),
-      memStr = memory ? `(${memory})` : "";
+    if (!shouldLogTiming) {
+      return;
+    }
+    const memUsed = mem ? Math.round((process.memoryUsage().heapUsed - mem.heapUsed) / 1024 / 1204 * 10) / 10 : 0;
+    const path = (0, import_node_path.basename)(sourcePath || "").replace(/\.[jt]sx?$/, "").slice(0, 22).trim().padEnd(24);
+    const numOptimized = `${res.optimized + res.styled}`.padStart(3);
+    const numFound = `${res.found + res.styled}`.padStart(3);
+    const numFlattened = `${res.flattened}`.padStart(3);
+    const memory = memUsed ? ` ${memUsed}MB` : "";
+    const timing = Date.now() - start;
+    const timingStr = `${timing}ms`.padStart(6);
+    const pre = (0, import_getPrefixLogs.getPrefixLogs)(options);
+    const memStr = memory ? `(${memory})` : "";
     console.info(`${pre} ${path}   \xB7  ${numFound} found   \xB7  ${numOptimized} opt   \xB7  ${numFlattened} flat  ${timingStr} ${memStr}`);
   };
 }

package/dist/extractor/detectModuleFormat.cjs

@@ -0,0 +1,55 @@
+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: 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;
+};
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var detectModuleFormat_exports = {};
+__export(detectModuleFormat_exports, {
+  clearFormatCache: () => clearFormatCache,
+  detectModuleFormat: () => detectModuleFormat
+});
+module.exports = __toCommonJS(detectModuleFormat_exports);
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
+const formatCache = /* @__PURE__ */new Map();
+function detectModuleFormat(filePath) {
+  const ext = (0, import_node_path.extname)(filePath);
+  if (ext === ".mjs") return "esm";
+  if (ext === ".cjs") return "cjs";
+  let dir = (0, import_node_path.dirname)(filePath);
+  while (true) {
+    if (formatCache.has(dir)) {
+      return formatCache.get(dir);
+    }
+    try {
+      const pkg = JSON.parse((0, import_node_fs.readFileSync)((0, import_node_path.join)(dir, "package.json"), "utf-8"));
+      const format = pkg.type === "module" ? "esm" : "cjs";
+      formatCache.set(dir, format);
+      return format;
+    } catch {}
+    const parent = (0, import_node_path.dirname)(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return "cjs";
+}
+function clearFormatCache() {
+  formatCache.clear();
+}

package/dist/extractor/ensureImportingConcat.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 ensureImportingConcat_exports = {};
 __export(ensureImportingConcat_exports, {
   ensureImportingConcat: () => ensureImportingConcat
@@ -37,12 +39,16 @@ module.exports = __toCommonJS(ensureImportingConcat_exports);
 var t = __toESM(require("@babel/types"));
 const importConcatPkg = "@tamagui/helpers";
 function ensureImportingConcat(path) {
-  const imported = path.get("body").find(x => x.isImportDeclaration() && x.node.source.value === importConcatPkg),
-    importSpecifier = t.importSpecifier(t.identifier("concatClassName"), t.identifier("concatClassName"));
+  const bodyPath = path.get("body");
+  const imported = bodyPath.find(x => x.isImportDeclaration() && x.node.source.value === importConcatPkg);
+  const importSpecifier = t.importSpecifier(t.identifier("concatClassName"), t.identifier("concatClassName"));
   if (!imported) {
     path.node.body.push(t.importDeclaration([importSpecifier], t.stringLiteral(importConcatPkg)));
     return;
   }
   const specifiers = imported.node.specifiers;
-  specifiers.some(x => t.isImportSpecifier(x) && t.isIdentifier(x.imported) && x.imported.name === "concatClassName") || specifiers.push(t.importSpecifier(t.identifier("concatClassName"), t.identifier("concatClassName")));
+  const alreadyImported = specifiers.some(x => t.isImportSpecifier(x) && t.isIdentifier(x.imported) && x.imported.name === "concatClassName");
+  if (!alreadyImported) {
+    specifiers.push(t.importSpecifier(t.identifier("concatClassName"), t.identifier("concatClassName")));
+  }
 }

package/dist/extractor/errors.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 errors_exports = {};
 __export(errors_exports, {

package/dist/extractor/esbuildAliasPlugin.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 esbuildAliasPlugin_exports = {};
 __export(esbuildAliasPlugin_exports, {
@@ -28,16 +30,26 @@ const esbuildAliasPlugin = config => {
   return {
     name: "path-alias",
     setup(build) {
-      if (!alias || !alias.length) return;
-      const main = (k, args) => ({
-        path: config[k].replace(/\/$/, "")
-      });
+      if (!alias || !alias.length) {
+        return;
+      }
+      const main = (k, args) => {
+        const targetPath = config[k].replace(/\/$/, "");
+        return {
+          path: targetPath
+        };
+      };
       alias.forEach(k => {
         build.onResolve({
           filter: new RegExp(`^.*${k}$`)
-        }, args => main(k, args)), build.onResolve({
+        }, args => {
+          return main(k, args);
+        });
+        build.onResolve({
           filter: new RegExp(`^.*\\/${k}\\/.*$`)
-        }, args => main(k, args));
+        }, args => {
+          return main(k, args);
+        });
       });
     }
   };

package/dist/extractor/esbuildTsconfigPaths.cjs

@@ -2,41 +2,44 @@ 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 name2 in all) __defProp(target, name2, {
-      get: all[name2],
-      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 name2 in all) __defProp(target, name2, {
+    get: all[name2],
+    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 esbuildTsconfigPaths_exports = {};
 __export(esbuildTsconfigPaths_exports, {
-  TsconfigPathsPlugin: () => TsconfigPathsPlugin
+  TsconfigPathsPlugin: () => TsconfigPathsPlugin,
+  loadCompilerOptionsFromTsconfig: () => loadCompilerOptionsFromTsconfig
 });
 module.exports = __toCommonJS(esbuildTsconfigPaths_exports);
-var import_node_fs = __toESM(require("node:fs")),
-  import_node_path = __toESM(require("node:path")),
-  import_typescript = require("typescript");
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
+var import_typescript = require("typescript");
 const name = "tsconfig-paths";
 function TsconfigPathsPlugin() {
   const compilerOptions = loadCompilerOptionsFromTsconfig();
@@ -48,16 +51,27 @@ function TsconfigPathsPlugin() {
       onResolve({
         filter: /.*/
       }, args => {
+        if (args.path.startsWith("@tamagui/")) {
+          return null;
+        }
         const paths = compilerOptions.paths || {};
-        if (!Object.keys(paths).some(p => new RegExp(p.replace("*", "\\w*")).test(args.path))) return null;
+        const hasMatchingPath = Object.keys(paths).some(p => new RegExp(p.replace("*", "\\w*")).test(args.path));
+        if (!hasMatchingPath) {
+          return null;
+        }
         const {
           resolvedModule
         } = (0, import_typescript.nodeModuleNameResolver)(args.path, args.importer, compilerOptions, import_typescript.sys);
-        if (!resolvedModule) return null;
+        if (!resolvedModule) {
+          return null;
+        }
         const {
           resolvedFileName
         } = resolvedModule;
-        return !resolvedFileName || resolvedFileName.endsWith(".d.ts") ? null : {
+        if (!resolvedFileName || resolvedFileName.endsWith(".d.ts")) {
+          return null;
+        }
+        return {
           path: resolvedFileName
         };
       });
@@ -67,18 +81,28 @@ function TsconfigPathsPlugin() {
 function loadCompilerOptionsFromTsconfig(tsconfig) {
   if (!tsconfig) {
     const configPath = (0, import_typescript.findConfigFile)(process.cwd(), import_typescript.sys.fileExists, "tsconfig.json") || (0, import_typescript.findConfigFile)(process.cwd(), import_typescript.sys.fileExists, "jsconfig.json");
-    return configPath ? parseTsconfig(configPath) : {};
+    if (configPath) {
+      return parseTsconfig(configPath);
+    }
+    return {};
   }
-  if (typeof tsconfig == "string") {
-    if (import_node_fs.default.existsSync(tsconfig)) return parseTsconfig(tsconfig);
-    throw new Error(`Specified tsconfig file not found: ${tsconfig}`);
+  if (typeof tsconfig === "string") {
+    if (import_node_fs.default.existsSync(tsconfig)) {
+      return parseTsconfig(tsconfig);
+    } else {
+      throw new Error(`Specified tsconfig file not found: ${tsconfig}`);
+    }
   }
   const baseDir = process.cwd();
-  return (0, import_typescript.parseJsonConfigFileContent)(tsconfig, import_typescript.sys, baseDir).options;
+  const parsed = (0, import_typescript.parseJsonConfigFileContent)(tsconfig, import_typescript.sys, baseDir);
+  return parsed.options;
 }
 function parseTsconfig(configFilePath) {
   const configFile = (0, import_typescript.readConfigFile)(configFilePath, import_typescript.sys.readFile);
-  if (configFile.error) throw new Error(`Error reading tsconfig file '${configFilePath}': ${configFile.error.messageText}`);
+  if (configFile.error) {
+    throw new Error(`Error reading tsconfig file '${configFilePath}': ${configFile.error.messageText}`);
+  }
   const baseDir = import_node_path.default.dirname(configFilePath);
-  return (0, import_typescript.parseJsonConfigFileContent)(configFile.config, import_typescript.sys, baseDir).options;
+  const parsed = (0, import_typescript.parseJsonConfigFileContent)(configFile.config, import_typescript.sys, baseDir);
+  return parsed.options;
 }

package/dist/extractor/evaluateAstNode.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 evaluateAstNode_exports = {};
 __export(evaluateAstNode_exports, {
   evaluateAstNode: () => evaluateAstNode
@@ -36,48 +38,91 @@ __export(evaluateAstNode_exports, {
 module.exports = __toCommonJS(evaluateAstNode_exports);
 var t = __toESM(require("@babel/types"));
 function evaluateAstNode(exprNode, evalFn, shouldPrintDebug) {
-  if (exprNode !== void 0) {
-    if (exprNode === null) return !0;
-    if (t.isJSXExpressionContainer(exprNode)) return evaluateAstNode(exprNode.expression);
-    if (t.isObjectExpression(exprNode)) {
-      const ret = {};
-      for (let idx = -1, len = exprNode.properties.length; ++idx < len;) {
-        const value = exprNode.properties[idx];
-        if (!t.isObjectProperty(value)) throw new Error("evaluateAstNode can only evaluate object properties");
-        let key;
-        if (value.computed) {
-          if (typeof evalFn != "function") throw new Error("evaluateAstNode does not support computed keys unless an eval function is provided");
-          key = evaluateAstNode(value.key, evalFn);
-        } else if (t.isIdentifier(value.key)) key = value.key.name;else if (t.isStringLiteral(value.key) || t.isNumericLiteral(value.key)) key = value.key.value;else throw new Error("Unsupported key type: " + value.key.type);
-        if (typeof key != "string" && typeof key != "number") throw new Error("key must be either a string or a number");
-        ret[key] = evaluateAstNode(value.value, evalFn);
+  if (exprNode === void 0) {
+    return void 0;
+  }
+  if (exprNode === null) {
+    return true;
+  }
+  if (t.isJSXExpressionContainer(exprNode)) {
+    return evaluateAstNode(exprNode.expression);
+  }
+  if (t.isObjectExpression(exprNode)) {
+    const ret = {};
+    for (let idx = -1, len = exprNode.properties.length; ++idx < len;) {
+      const value = exprNode.properties[idx];
+      if (!t.isObjectProperty(value)) {
+        throw new Error("evaluateAstNode can only evaluate object properties");
       }
-      return ret;
+      let key;
+      if (value.computed) {
+        if (typeof evalFn !== "function") {
+          throw new Error("evaluateAstNode does not support computed keys unless an eval function is provided");
+        }
+        key = evaluateAstNode(value.key, evalFn);
+      } else if (t.isIdentifier(value.key)) {
+        key = value.key.name;
+      } else if (t.isStringLiteral(value.key) || t.isNumericLiteral(value.key)) {
+        key = value.key.value;
+      } else {
+        throw new Error("Unsupported key type: " + value.key.type);
+      }
+      if (typeof key !== "string" && typeof key !== "number") {
+        throw new Error("key must be either a string or a number");
+      }
+      ret[key] = evaluateAstNode(value.value, evalFn);
     }
-    if (t.isArrayExpression(exprNode)) return exprNode.elements.map(x => evaluateAstNode(x, evalFn));
-    if (t.isUnaryExpression(exprNode) && exprNode.operator === "-") {
-      const ret = evaluateAstNode(exprNode.argument, evalFn);
-      return ret == null ? null : -ret;
+    return ret;
+  }
+  if (t.isArrayExpression(exprNode)) {
+    return exprNode.elements.map(x => {
+      return evaluateAstNode(x, evalFn);
+    });
+  }
+  if (t.isUnaryExpression(exprNode) && exprNode.operator === "-") {
+    const ret = evaluateAstNode(exprNode.argument, evalFn);
+    if (ret == null) {
+      return null;
     }
-    if (t.isTemplateLiteral(exprNode)) {
-      if (typeof evalFn != "function") throw new Error("evaluateAstNode does not support template literals unless an eval function is provided");
-      let ret = "";
-      for (let idx = -1, len = exprNode.quasis.length; ++idx < len;) {
-        const quasi = exprNode.quasis[idx],
-          expr = exprNode.expressions[idx];
-        ret += quasi.value.raw, expr && (ret += evaluateAstNode(expr, evalFn));
+    return -ret;
+  }
+  if (t.isTemplateLiteral(exprNode)) {
+    if (typeof evalFn !== "function") {
+      throw new Error("evaluateAstNode does not support template literals unless an eval function is provided");
+    }
+    let ret = "";
+    for (let idx = -1, len = exprNode.quasis.length; ++idx < len;) {
+      const quasi = exprNode.quasis[idx];
+      const expr = exprNode.expressions[idx];
+      ret += quasi.value.raw;
+      if (expr) {
+        ret += evaluateAstNode(expr, evalFn);
       }
-      return ret;
     }
-    if (t.isNullLiteral(exprNode)) return null;
-    if (t.isNumericLiteral(exprNode) || t.isStringLiteral(exprNode) || t.isBooleanLiteral(exprNode)) return exprNode.value;
-    if (t.isBinaryExpression(exprNode)) {
-      if (exprNode.operator === "+") return evaluateAstNode(exprNode.left, evalFn) + evaluateAstNode(exprNode.right, evalFn);
-      if (exprNode.operator === "-") return evaluateAstNode(exprNode.left, evalFn) - evaluateAstNode(exprNode.right, evalFn);
-      if (exprNode.operator === "*") return evaluateAstNode(exprNode.left, evalFn) * evaluateAstNode(exprNode.right, evalFn);
-      if (exprNode.operator === "/") return evaluateAstNode(exprNode.left, evalFn) / evaluateAstNode(exprNode.right, evalFn);
+    return ret;
+  }
+  if (t.isNullLiteral(exprNode)) {
+    return null;
+  }
+  if (t.isNumericLiteral(exprNode) || t.isStringLiteral(exprNode) || t.isBooleanLiteral(exprNode)) {
+    return exprNode.value;
+  }
+  if (t.isBinaryExpression(exprNode)) {
+    if (exprNode.operator === "+") {
+      return evaluateAstNode(exprNode.left, evalFn) + evaluateAstNode(exprNode.right, evalFn);
     }
-    if (typeof evalFn != "function") throw new Error("evaluateAstNode does not support non-literal values unless an eval function is provided");
-    return evalFn(exprNode);
+    if (exprNode.operator === "-") {
+      return evaluateAstNode(exprNode.left, evalFn) - evaluateAstNode(exprNode.right, evalFn);
+    }
+    if (exprNode.operator === "*") {
+      return evaluateAstNode(exprNode.left, evalFn) * evaluateAstNode(exprNode.right, evalFn);
+    }
+    if (exprNode.operator === "/") {
+      return evaluateAstNode(exprNode.left, evalFn) / evaluateAstNode(exprNode.right, evalFn);
+    }
+  }
+  if (typeof evalFn !== "function") {
+    throw new Error("evaluateAstNode does not support non-literal values unless an eval function is provided");
   }
+  return evalFn(exprNode);
 }