@tamagui/cli 1.110.0 → 1.110.2

package/dist/utils.js

@@ -29,7 +29,7 @@ __export(utils_exports, {
   registerDispose: () => registerDispose
 });
 module.exports = __toCommonJS(utils_exports);
-var import_path = require("path"), import_static = require("@tamagui/static"), import_chalk = __toESM(require("chalk")), import_fs_extra = __toESM(require("fs-extra"));
+var import_static = require("@tamagui/static"), import_chalk = __toESM(require("chalk")), import_fs_extra = __toESM(require("fs-extra")), import_node_path = require("node:path");
 async function getOptions({
   root = process.cwd(),
   tsconfigPath = "tsconfig.json",
@@ -38,12 +38,12 @@ async function getOptions({
   debug,
   loadTamaguiOptions
 } = {}) {
-  const tsConfigFilePath = (0, import_path.join)(root, tsconfigPath);
+  const tsConfigFilePath = (0, import_node_path.join)(root, tsconfigPath);
   ensure(await import_fs_extra.default.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`);
-  const dotDir = (0, import_path.join)(root, ".tamagui");
+  const dotDir = (0, import_node_path.join)(root, ".tamagui");
   let pkgJson = {}, config = "";
   try {
-    config = await getDefaultTamaguiConfigPath(), pkgJson = await (0, import_fs_extra.readJSON)((0, import_path.join)(root, "package.json"));
+    config = await getDefaultTamaguiConfigPath(), pkgJson = await (0, import_fs_extra.readJSON)((0, import_node_path.join)(root, "package.json"));
   } catch {
   }
   const filledOptions = {
@@ -63,15 +63,15 @@ async function getOptions({
     paths: {
       root,
       dotDir,
-      conf: (0, import_path.join)(dotDir, "tamagui.config.json"),
-      types: (0, import_path.join)(dotDir, "types.json")
+      conf: (0, import_node_path.join)(dotDir, "tamagui.config.json"),
+      types: (0, import_node_path.join)(dotDir, "types.json")
     }
   };
 }
 function ensure(condition, message) {
   condition || (console.error(import_chalk.default.red.bold("Error:"), import_chalk.default.yellow(`${message}`)), process.exit(1));
 }
-const defaultPaths = ["tamagui.config.ts", (0, import_path.join)("src", "tamagui.config.ts")];
+const defaultPaths = ["tamagui.config.ts", (0, import_node_path.join)("src", "tamagui.config.ts")];
 let cachedPath = "";
 async function getDefaultTamaguiConfigPath() {
   if (cachedPath) return cachedPath;
@@ -80,15 +80,11 @@ async function getDefaultTamaguiConfigPath() {
     throw new Error("No found tamagui.config.ts");
   return cachedPath = found, found;
 }
-let cached = null;
-const loadTamagui = async (opts) => {
-  const loaded = await (0, import_static.loadTamagui)({
-    config: await getDefaultTamaguiConfigPath(),
-    components: ["tamagui"],
-    ...opts
-  });
-  return loaded && (cached = loaded), loaded;
-}, disposers = /* @__PURE__ */ new Set();
+const loadTamagui = async (opts) => await (0, import_static.loadTamagui)({
+  components: ["tamagui"],
+  ...opts,
+  config: opts.config ?? await getDefaultTamaguiConfigPath()
+}), disposers = /* @__PURE__ */ new Set();
 function registerDispose(cb) {
   disposers.add(cb);
 }

package/dist/utils.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/utils.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB,iBAGrB,gBAGO,4BAEP,eAAkB,2BAClB,kBAAyC;AAEzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,IAA6B,CAAC,GAAgC;AAC5D,QAAM,uBAAmB,kBAAK,MAAM,YAAY;AAChD,SAAO,MAAM,gBAAAA,QAAG,WAAW,gBAAgB,GAAG,sBAAsB,gBAAgB,EAAE;AACtF,QAAM,aAAS,kBAAK,MAAM,UAAU;AACpC,MAAI,UAAU,CAAC,GACX,SAAS;AACb,MAAI;AACF,aAAS,MAAM,4BAA4B,GAC3C,UAAU,UAAM,8BAAS,kBAAK,MAAM,cAAc,CAAC;AAAA,EACrD,QAAQ;AAAA,EAER;AAEA,QAAM,gBAAgB;AAAA,IACpB,UAAU;AAAA,IACV,YAAY,CAAC,SAAS;AAAA,IACtB;AAAA,IACA,GAAG;AAAA,EACL,GAEM,eAAe,yBACjB,0CAA2B,aAAa,IACxC;AAEJ,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA,MAAM,QAAQ;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,UAAM,kBAAK,QAAQ,qBAAqB;AAAA,MACxC,WAAO,kBAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,EAAK,cACH,QAAQ,MAAM,aAAAC,QAAM,IAAI,KAAK,QAAQ,GAAG,aAAAA,QAAM,OAAO,GAAG,OAAO,EAAE,CAAC,GAClE,QAAQ,KAAK,CAAC;AAElB;AAEA,MAAM,eAAe,CAAC,yBAAqB,kBAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI,WAAY,QAAO;AAEvB,QAAM,YADgB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC,CAAC,GACrD,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,GAC7C,QAAQ,aAAa,QAAQ;AACnC,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,4BAA4B;AAE9C,sBAAa,OACN;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OACzB,SACuC;AACvC,QAAM,SAAS,UAAM,cAAAC,aAAkB;AAAA,IACrC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACD,SAAI,WACF,SAAS,SAEJ;AACT,GAEM,YAAY,oBAAI,IAAc;AAE7B,SAAS,gBAAgB,IAAgB;AAC9C,YAAU,IAAI,EAAE;AAClB;AAEO,SAAS,aAAa;AAC3B,YAAU,QAAQ,CAAC,OAAO,GAAG,CAAC;AAChC;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAGO,4BAEP,eAAkB,2BAClB,kBAAyC,8BACzC,mBAAqB;AAErB,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,IAA6B,CAAC,GAAgC;AAC5D,QAAM,uBAAmB,uBAAK,MAAM,YAAY;AAChD,SAAO,MAAM,gBAAAA,QAAG,WAAW,gBAAgB,GAAG,sBAAsB,gBAAgB,EAAE;AACtF,QAAM,aAAS,uBAAK,MAAM,UAAU;AACpC,MAAI,UAAU,CAAC,GACX,SAAS;AACb,MAAI;AACF,aAAS,MAAM,4BAA4B,GAC3C,UAAU,UAAM,8BAAS,uBAAK,MAAM,cAAc,CAAC;AAAA,EACrD,QAAQ;AAAA,EAER;AAEA,QAAM,gBAAgB;AAAA,IACpB,UAAU;AAAA,IACV,YAAY,CAAC,SAAS;AAAA,IACtB;AAAA,IACA,GAAG;AAAA,EACL,GAEM,eAAe,yBACjB,0CAA2B,aAAa,IACxC;AAEJ,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA,MAAM,QAAQ;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,UAAM,uBAAK,QAAQ,qBAAqB;AAAA,MACxC,WAAO,uBAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,EAAK,cACH,QAAQ,MAAM,aAAAC,QAAM,IAAI,KAAK,QAAQ,GAAG,aAAAA,QAAM,OAAO,GAAG,OAAO,EAAE,CAAC,GAClE,QAAQ,KAAK,CAAC;AAElB;AAEA,MAAM,eAAe,CAAC,yBAAqB,uBAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AAEjB,eAAe,8BAA8B;AAC3C,MAAI,WAAY,QAAO;AAEvB,QAAM,YADgB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC,CAAC,GACrD,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,GAC7C,QAAQ,aAAa,QAAQ;AACnC,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,4BAA4B;AAE9C,sBAAa,OACN;AACT;AAEO,MAAM,cAAc,OACzB,SAEe,UAAM,cAAAC,aAAkB;AAAA,EACrC,YAAY,CAAC,SAAS;AAAA,EACtB,GAAG;AAAA,EACH,QAAQ,KAAK,UAAW,MAAM,4BAA4B;AAC5D,CAAC,GAIG,YAAY,oBAAI,IAAc;AAE7B,SAAS,gBAAgB,IAAgB;AAC9C,YAAU,IAAI,EAAE;AAClB;AAEO,SAAS,aAAa;AAC3B,YAAU,QAAQ,CAAC,OAAO,GAAG,CAAC;AAChC;",
   "names": ["fs", "chalk", "loadTamaguiStatic"]
 }

package/dist/utils.native.js

@@ -30,7 +30,7 @@ __export(utils_exports, {
   registerDispose: () => registerDispose
 });
 module.exports = __toCommonJS(utils_exports);
-var import_path = require("path"), import_static = require("@tamagui/static"), import_chalk = __toESM(require("chalk")), import_fs_extra = __toESM(require("fs-extra"));
+var import_static = require("@tamagui/static"), import_chalk = __toESM(require("chalk")), import_fs_extra = __toESM(require("fs-extra")), import_node_path = require("node:path");
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg), value = info.value;
@@ -65,15 +65,30 @@ function _define_property(obj, key, value) {
 }
 function _object_spread(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+    var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
+    typeof Object.getOwnPropertySymbols == "function" && (ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
       return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys.forEach(function(key) {
+    }))), ownKeys2.forEach(function(key) {
       _define_property(target, key, source[key]);
     });
   }
   return target;
 }
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _object_spread_props(target, source) {
+  return source = source ?? {}, Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+  }), target;
+}
 function _ts_generator(thisArg, body) {
   var f, y, t, g, _ = {
     label: 0,
@@ -169,7 +184,7 @@ function _getOptions() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          return _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, _ref_root = _ref.root, root = _ref_root === void 0 ? process.cwd() : _ref_root, _ref_tsconfigPath = _ref.tsconfigPath, tsconfigPath = _ref_tsconfigPath === void 0 ? "tsconfig.json" : _ref_tsconfigPath, tamaguiOptions = _ref.tamaguiOptions, host = _ref.host, debug = _ref.debug, loadTamaguiOptions = _ref.loadTamaguiOptions, tsConfigFilePath = (0, import_path.join)(root, tsconfigPath), [
+          return _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, _ref_root = _ref.root, root = _ref_root === void 0 ? process.cwd() : _ref_root, _ref_tsconfigPath = _ref.tsconfigPath, tsconfigPath = _ref_tsconfigPath === void 0 ? "tsconfig.json" : _ref_tsconfigPath, tamaguiOptions = _ref.tamaguiOptions, host = _ref.host, debug = _ref.debug, loadTamaguiOptions = _ref.loadTamaguiOptions, tsConfigFilePath = (0, import_node_path.join)(root, tsconfigPath), [
             4,
             import_fs_extra.default.pathExists(tsConfigFilePath)
           ];
@@ -177,7 +192,7 @@ function _getOptions() {
           ensure.apply(void 0, [
             _state.sent(),
             "No tsconfig found: ".concat(tsConfigFilePath)
-          ]), dotDir = (0, import_path.join)(root, ".tamagui"), pkgJson = {}, config = "", _state.label = 2;
+          ]), dotDir = (0, import_node_path.join)(root, ".tamagui"), pkgJson = {}, config = "", _state.label = 2;
         case 2:
           return _state.trys.push([
             2,
@@ -191,7 +206,7 @@ function _getOptions() {
         case 3:
           return config = _state.sent(), [
             4,
-            (0, import_fs_extra.readJSON)((0, import_path.join)(root, "package.json"))
+            (0, import_fs_extra.readJSON)((0, import_node_path.join)(root, "package.json"))
           ];
         case 4:
           return pkgJson = _state.sent(), [
@@ -223,8 +238,8 @@ function _getOptions() {
               paths: {
                 root,
                 dotDir,
-                conf: (0, import_path.join)(dotDir, "tamagui.config.json"),
-                types: (0, import_path.join)(dotDir, "types.json")
+                conf: (0, import_node_path.join)(dotDir, "tamagui.config.json"),
+                types: (0, import_node_path.join)(dotDir, "types.json")
               }
             }
           ];
@@ -237,7 +252,7 @@ function ensure(condition, message) {
 }
 var defaultPaths = [
   "tamagui.config.ts",
-  (0, import_path.join)("src", "tamagui.config.ts")
+  (0, import_node_path.join)("src", "tamagui.config.ts")
 ], cachedPath = "";
 function getDefaultTamaguiConfigPath() {
   return _getDefaultTamaguiConfigPath.apply(this, arguments);
@@ -270,30 +285,43 @@ function _getDefaultTamaguiConfigPath() {
     });
   }), _getDefaultTamaguiConfigPath.apply(this, arguments);
 }
-var cached = null, loadTamagui = function() {
+var loadTamagui = function() {
   var _ref = _async_to_generator(function(opts) {
-    var loaded, _tmp;
+    var _opts_config, loaded, _tmp, _tmp1, _tmp2;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          return _tmp = {}, [
+          return _tmp = [
+            _object_spread({
+              components: [
+                "tamagui"
+              ]
+            }, opts)
+          ], _tmp1 = {}, (_opts_config = opts.config) !== null && _opts_config !== void 0 ? (_tmp2 = _opts_config, [
+            3,
+            3
+          ]) : [
+            3,
+            1
+          ];
+        case 1:
+          return [
             4,
             getDefaultTamaguiConfigPath()
           ];
-        case 1:
+        case 2:
+          _tmp2 = _state.sent(), _state.label = 3;
+        case 3:
           return [
             4,
             import_static.loadTamagui.apply(void 0, [
-              _object_spread.apply(void 0, [
-                (_tmp.config = _state.sent(), _tmp.components = [
-                  "tamagui"
-                ], _tmp),
-                opts
-              ])
+              _object_spread_props.apply(void 0, _tmp.concat([
+                (_tmp1.config = _tmp2, _tmp1)
+              ]))
             ])
           ];
-        case 2:
-          return loaded = _state.sent(), loaded && (cached = loaded), [
+        case 4:
+          return loaded = _state.sent(), [
             2,
             loaded
           ];

package/dist/utils.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/Users/n8/tamagui/code/core/cli/src/utils.ts"],
-  "mappings": "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",
-  "names": ["getOptions", "root", "tsconfigPath", "tamaguiOptions", "host", "debug", "loadTamaguiOptions", "tsConfigFilePath", "dotDir", "pkgJson", "config", "filledOptions", "finalOptions", "process", "cwd", "join", "fs", "pathExists", "ensure", "getDefaultTamaguiConfigPath", "readJSON", "platform", "components", "loadTamaguiBuildConfigSync", "mode", "env", "NODE_ENV", "paths", "conf", "types", "condition", "message", "console", "error", "chalk", "red", "bold", "yellow", "exit", "defaultPaths", "cachedPath", "existingPaths", "existing", "found", "Promise", "all", "map", "path", "findIndex", "x", "Error", "cached", "loadTamagui", "opts", "loaded", "loadTamaguiStatic", "disposers", "Set", "registerDispose", "cb", "add", "disposeAll", "forEach"]
+  "mappings": "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",
+  "names": ["getOptions", "root", "tsconfigPath", "tamaguiOptions", "host", "debug", "loadTamaguiOptions", "tsConfigFilePath", "dotDir", "pkgJson", "config", "filledOptions", "finalOptions", "process", "cwd", "join", "fs", "pathExists", "ensure", "getDefaultTamaguiConfigPath", "readJSON", "platform", "components", "loadTamaguiBuildConfigSync", "mode", "env", "NODE_ENV", "paths", "conf", "types", "condition", "message", "console", "error", "chalk", "red", "bold", "yellow", "exit", "defaultPaths", "cachedPath", "existingPaths", "existing", "found", "Promise", "all", "map", "path", "findIndex", "x", "Error", "loadTamagui", "opts", "loaded", "loadTamaguiStatic", "disposers", "Set", "registerDispose", "cb", "add", "disposeAll", "forEach"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.110.0",
+  "version": "1.110.2",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist",
@@ -23,17 +23,17 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.110.0",
-    "@tamagui/generate-themes": "1.110.0",
-    "@tamagui/static": "1.110.0",
-    "@tamagui/types": "1.110.0",
-    "@tamagui/vite-plugin": "1.110.0",
+    "@tamagui/create-theme": "1.110.2",
+    "@tamagui/generate-themes": "1.110.2",
+    "@tamagui/static": "1.110.2",
+    "@tamagui/types": "1.110.2",
+    "@tamagui/vite-plugin": "1.110.2",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "chokidar": "^3.5.2",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
     "execa": "^5.0.0",
     "express": "^4.18.2",
     "fs-extra": "^11.2.0",
@@ -55,7 +55,7 @@
     "vite-plugin-entry-shaking": "^0.4.3"
   },
   "devDependencies": {
-    "@tamagui/build": "1.110.0",
+    "@tamagui/build": "1.110.2",
     "@types/chokidar": "^2.1.3",
     "@types/marked": "^5.0.0"
   }

package/src/utils.ts

@@ -1,5 +1,3 @@
-import { join } from 'path'
-
 import type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'
 import {
   loadTamaguiBuildConfigSync,
@@ -8,6 +6,7 @@ import {
 import type { CLIResolvedOptions, CLIUserOptions } from '@tamagui/types'
 import chalk from 'chalk'
 import fs, { pathExists, readJSON } from 'fs-extra'
+import { join } from 'node:path'
 
 export async function getOptions({
   root = process.cwd(),
@@ -66,6 +65,7 @@ export function ensure(condition: boolean, message: string) {
 
 const defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]
 let cachedPath = ''
+
 async function getDefaultTamaguiConfigPath() {
   if (cachedPath) return cachedPath
   const existingPaths = await Promise.all(defaultPaths.map((path) => pathExists(path)))
@@ -78,18 +78,14 @@ async function getDefaultTamaguiConfigPath() {
   return found
 }
 
-let cached: TamaguiProjectInfo | null = null
 export const loadTamagui = async (
   opts: Partial<TamaguiOptions>
 ): Promise<TamaguiProjectInfo | null> => {
   const loaded = await loadTamaguiStatic({
-    config: await getDefaultTamaguiConfigPath(),
     components: ['tamagui'],
     ...opts,
+    config: opts.config ?? (await getDefaultTamaguiConfigPath()),
   })
-  if (loaded) {
-    cached = loaded
-  }
   return loaded
 }
 

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAKzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIxE,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,EACL,kBAAkB,GACnB,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuC5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,SAChB,OAAO,CAAC,cAAc,CAAC,KAC5B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAUnC,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAKzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAKxE,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,EACL,kBAAkB,GACnB,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuC5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,SAChB,OAAO,CAAC,cAAc,CAAC,KAC5B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAOnC,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}