@actdim/utico 1.2.6 → 1.2.7

package/dist/utils.es.js

@@ -1,114 +1,168 @@
-import { v4 as f } from "uuid";
-const m = (e) => !e || !isFinite(e) ? 0 : e, d = /* @__PURE__ */ (() => {
-  const e = /* @__PURE__ */ new WeakMap();
-  return (...n) => {
-    const t = [];
-    for (const o of n) {
-      let r;
-      typeof o == "number" || typeof o == "string" || typeof o == "boolean" || o == null ? r = "" + o : (r = e.get(o), r || (r = f(), e.set(o, r))), t.push(r);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { v4 } from "uuid";
+const normalize = /* @__PURE__ */ __name((v) => !v || !isFinite(v) ? 0 : v, "normalize");
+const buildFuncArgCacheKey = /* @__PURE__ */ (() => {
+  const weakMap = /* @__PURE__ */ new WeakMap();
+  return (...args) => {
+    const keys = [];
+    for (const arg of args) {
+      let key = void 0;
+      if (typeof arg === "number" || typeof arg === "string" || typeof arg === "boolean" || arg == void 0) {
+        key = "" + arg;
+      } else {
+        key = weakMap.get(arg);
+        if (!key) {
+          key = v4();
+          weakMap.set(arg, key);
+        }
+      }
+      keys.push(key);
     }
-    return `"${t.join("/")}"`;
+    return `"${keys.join("/")}"`;
   };
-})(), u = (e, n) => new Promise((t, o) => {
-  if (n?.aborted) {
-    o(n.reason);
-    return;
-  }
-  const r = setTimeout(t, e);
-  n?.addEventListener("abort", () => {
-    clearTimeout(r), o(n.reason);
-  }, { once: !0 });
-}), c = async (e, n, t) => {
-  throw await u(e, t), n ? n() : new Error("Timeout exceeded");
-};
-function p(e, n, t) {
-  return Promise.race([c(n, void 0, t), e]);
+})();
+const delay = /* @__PURE__ */ __name((ms, abortSignal) => {
+  return new Promise((resolve, reject) => {
+    if (abortSignal?.aborted) {
+      reject(abortSignal.reason);
+      return;
+    }
+    const id = setTimeout(resolve, ms);
+    abortSignal?.addEventListener("abort", () => {
+      clearTimeout(id);
+      reject(abortSignal.reason);
+    }, { once: true });
+  });
+}, "delay");
+const delayError = /* @__PURE__ */ __name(async (ms, errFactory, abortSignal) => {
+  await delay(ms, abortSignal);
+  throw errFactory ? errFactory() : new Error("Timeout exceeded");
+}, "delayError");
+function withTimeout(promise, ms, abortSignal) {
+  return Promise.race([delayError(ms, void 0, abortSignal), promise]);
 }
-function l(e, n, t) {
-  if (e)
-    for (const o of e) {
-      if (n(o))
-        return o;
-      const r = l(t(o), n, t);
-      if (r)
-        return r;
+__name(withTimeout, "withTimeout");
+function searchTree(treeNodes, predicate, childSelector) {
+  if (!treeNodes) {
+    return void 0;
+  }
+  for (const treeNode of treeNodes) {
+    if (predicate(treeNode)) {
+      return treeNode;
     }
+    const node = searchTree(childSelector(treeNode), predicate, childSelector);
+    if (node) {
+      return node;
+    }
+  }
+  return void 0;
 }
-const y = (e) => {
-  const n = {}, t = [], o = [
+__name(searchTree, "searchTree");
+const suppressConsole = /* @__PURE__ */ __name((action) => {
+  const origConsole = {};
+  const result = [];
+  const keys = [
     "log"
     /*, "debug", "warn", "info"*/
   ];
-  for (const r of o)
-    n[r] = console[r], console[r] = function(...i) {
-      t.push({
-        method: r,
-        args: i
+  for (const key of keys) {
+    origConsole[key] = console[key];
+    console[key] = function(...args) {
+      result.push({
+        method: key,
+        args
       });
     };
+  }
   try {
-    e();
+    action();
   } finally {
-    for (const r of o)
-      console[r] = n[r];
+    for (const key of keys) {
+      console[key] = origConsole[key];
+    }
   }
-  return t;
-};
-function h(e, n) {
-  let t = !0;
-  for (; t; ) {
-    t = !1;
-    for (const o of n)
-      if (o && e.startsWith(o)) {
-        e = e.slice(o.length), t = !0;
+  return result;
+}, "suppressConsole");
+function removePrefix(str, prefixes) {
+  let removed = true;
+  while (removed) {
+    removed = false;
+    for (const prefix of prefixes) {
+      if (prefix && str.startsWith(prefix)) {
+        str = str.slice(prefix.length);
+        removed = true;
         break;
       }
+    }
   }
-  return e;
+  return str;
 }
-function k(e, n) {
-  let t = !0;
-  for (; t; ) {
-    t = !1;
-    for (const o of n)
-      if (o && e.endsWith(o)) {
-        e = e.slice(0, -o.length), t = !0;
+__name(removePrefix, "removePrefix");
+function removeSuffix(str, suffixes) {
+  let removed = true;
+  while (removed) {
+    removed = false;
+    for (const suffix of suffixes) {
+      if (suffix && str.endsWith(suffix)) {
+        str = str.slice(0, -suffix.length);
+        removed = true;
         break;
       }
+    }
   }
-  return e;
+  return str;
 }
-function v(e, n, t = (o, r) => o === r) {
-  let o, r = !1, i;
+__name(removeSuffix, "removeSuffix");
+function memoEffect(getValue, callback, comparator = (a, b) => a === b) {
+  let val;
+  let initialized = false;
+  let retVal;
   return () => {
-    const s = e();
-    return (!r || !t(s, o)) && (o = s, r = !0, i = n(s)), i;
+    const next = getValue();
+    if (!initialized || !comparator(next, val)) {
+      val = next;
+      initialized = true;
+      retVal = callback(next);
+    }
+    return retVal;
   };
 }
-function w(e) {
-  let n, t = !1;
-  return () => (t || (n = e(), t = !0), n);
+__name(memoEffect, "memoEffect");
+function lazy(factory) {
+  let instance;
+  let initialized = false;
+  return () => {
+    if (!initialized) {
+      instance = factory();
+      initialized = true;
+    }
+    return instance;
+  };
 }
-function b(e, n) {
-  let t = {};
-  for (const o of n)
-    t[o] = {
-      enumerable: !1
+__name(lazy, "lazy");
+function makeNonEnumerable(obj, propertyNames) {
+  let propertyDescriptorMap = {};
+  for (const propertyName of propertyNames) {
+    propertyDescriptorMap[propertyName] = {
+      enumerable: false
     };
-  Object.defineProperties(e, t);
+  }
+  Object.defineProperties(obj, propertyDescriptorMap);
 }
+__name(makeNonEnumerable, "makeNonEnumerable");
 export {
-  d as buildFuncArgCacheKey,
-  u as delay,
-  c as delayError,
-  w as lazy,
-  b as makeNonEnumerable,
-  v as memoEffect,
-  m as normalize,
-  h as removePrefix,
-  k as removeSuffix,
-  l as searchTree,
-  y as suppressConsole,
-  p as withTimeout
+  buildFuncArgCacheKey,
+  delay,
+  delayError,
+  lazy,
+  makeNonEnumerable,
+  memoEffect,
+  normalize,
+  removePrefix,
+  removeSuffix,
+  searchTree,
+  suppressConsole,
+  withTimeout
 };
 //# sourceMappingURL=utils.es.js.map

package/dist/utils.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.es.js","sources":["D:/Src/my/actdim/public/utico/src/utils.ts"],"sourcesContent":null,"names":["normalize","v","buildFuncArgCacheKey","weakMap","args","keys","arg","key","uuid","delay","ms","abortSignal","resolve","reject","id","delayError","errFactory","withTimeout","promise","searchTree","treeNodes","predicate","childSelector","treeNode","node","suppressConsole","action","origConsole","result","removePrefix","str","prefixes","removed","prefix","removeSuffix","suffixes","suffix","memoEffect","getValue","callback","comparator","a","b","val","initialized","retVal","next","lazy","factory","instance","makeNonEnumerable","obj","propertyNames","propertyDescriptorMap","propertyName"],"mappings":"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"}
+{"version":3,"file":"utils.es.js","sources":["D:/Src/my/actdim/public/utico/src/utils.ts"],"sourcesContent":["import { v4 as uuid } from \"uuid\";\r\n\r\n// @filename: util.ts\r\n\r\n// export function guid() {\r\n//     function s4() {\r\n//         return Math.floor((1 + Math.random()) * 0x10000)\r\n//             .toString(16)\r\n//             .substring(1);\r\n//     }\r\n//     return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();\r\n// }\r\n\r\nexport const normalize = (v: number) => (!v || !isFinite(v) ? 0 : v);\r\n\r\n// funcArgCacheKeyResolver(Provider/Builder)\r\nexport const buildFuncArgCacheKey = (() => {\r\n    const weakMap = new WeakMap<any, string>();\r\n    return (...args: any[]) => {\r\n        const keys: string[] = [];\r\n        for (const arg of args) {\r\n            let key: string = undefined;\r\n            if (typeof arg === \"number\" || typeof arg === \"string\" || typeof arg === \"boolean\" || arg == undefined) {\r\n                key = \"\" + arg;\r\n            } else {\r\n                key = weakMap.get(arg);\r\n                if (!key) {\r\n                    key = uuid();\r\n                    weakMap.set(arg, key);\r\n                }\r\n            }\r\n            keys.push(key);\r\n        }\r\n        return `\"${keys.join(\"/\")}\"`;\r\n    };\r\n})();\r\n\r\nexport const delay = (ms: number, abortSignal?: AbortSignal) => {\r\n    return new Promise<void>((resolve, reject) => {\r\n        if (abortSignal?.aborted) {\r\n            reject(abortSignal.reason);\r\n            return;\r\n        }\r\n        const id = setTimeout(resolve, ms);\r\n        abortSignal?.addEventListener(\"abort\", () => {\r\n            clearTimeout(id);\r\n            reject(abortSignal.reason);\r\n        }, { once: true });\r\n    });\r\n};\r\n\r\n// scheduleError\r\nexport const delayError = async (ms: number, errFactory?: () => Error, abortSignal?: AbortSignal): Promise<never> => {\r\n    await delay(ms, abortSignal);\r\n    throw errFactory ? errFactory() : new Error(\"Timeout exceeded\");\r\n};\r\n\r\nexport function withTimeout<T>(promise: Promise<T>, ms: number, abortSignal?: AbortSignal): Promise<T> {\r\n    return Promise.race([delayError(ms, undefined, abortSignal), promise]);\r\n}\r\n\r\n/**\r\n * Search node in a tree\r\n * @param predicate filter\r\n * @param childSelector\r\n * @param treeNodes\r\n */\r\nexport function searchTree<T>(treeNodes: T[], predicate: (item: T) => boolean, childSelector: (item: T) => T[]) {\r\n    if (!treeNodes) {\r\n        return undefined;\r\n    }\r\n    for (const treeNode of treeNodes) {\r\n        if (predicate(treeNode)) {\r\n            return treeNode;\r\n        }\r\n        const node = searchTree(childSelector(treeNode), predicate, childSelector);\r\n        if (node) {\r\n            return node;\r\n        }\r\n    }\r\n    return undefined;\r\n}\r\n\r\nexport const suppressConsole = (action: () => void) => {\r\n    const origConsole: any = {};\r\n    const result: {\r\n        method: keyof Console;\r\n        args: any[];\r\n    }[] = [];\r\n    const keys: (keyof Console)[] = [\"log\" /*, \"debug\", \"warn\", \"info\"*/];\r\n    for (const key of keys) {\r\n        origConsole[key] = console[key];\r\n        console[key] = function (...args: any[]) {\r\n            result.push({\r\n                method: key,\r\n                args: args\r\n            });\r\n        } as any;\r\n    }\r\n    try {\r\n        action();\r\n    } finally {\r\n        for (const key of keys) {\r\n            console[key] = origConsole[key];\r\n        }\r\n    }\r\n    return result;\r\n};\r\n\r\nexport function removePrefix(str: string, prefixes: string[]): string {\r\n    let removed = true;\r\n    while (removed) {\r\n        removed = false;\r\n        for (const prefix of prefixes) {\r\n            if (prefix && str.startsWith(prefix)) {\r\n                str = str.slice(prefix.length);\r\n                removed = true;\r\n                break;\r\n            }\r\n        }\r\n    }\r\n    return str;\r\n}\r\n\r\nexport function removeSuffix(str: string, suffixes: string[]): string {\r\n    let removed = true;\r\n    while (removed) {\r\n        removed = false;\r\n        for (const suffix of suffixes) {\r\n            if (suffix && str.endsWith(suffix)) {\r\n                str = str.slice(0, -suffix.length);\r\n                removed = true;\r\n                break;\r\n            }\r\n        }\r\n    }\r\n    return str;\r\n}\r\n\r\n// another comparator example\r\n// const deepEqual = (a: any, b: any) => JSON.stringify(a) === JSON.stringify(b);\r\n// depEffect\r\nexport function memoEffect<TDep, TResult>(\r\n    getValue: () => TDep, // getDep\r\n    callback: (v: TDep) => TResult, // onChange/action\r\n    comparator: (a: TDep, b: TDep) => boolean = (a, b) => a === b // equals\r\n) {\r\n    let val: TDep | undefined;\r\n    let initialized = false;\r\n    let retVal: TResult;\r\n    return () => {\r\n        const next = getValue();\r\n        if (!initialized || !comparator(next, val!)) {\r\n            val = next;\r\n            initialized = true;\r\n            retVal = callback(next);\r\n        }\r\n        return retVal;\r\n    };\r\n}\r\n\r\nexport function lazy<T>(factory: () => T): () => T {\r\n    let instance: T | undefined;\r\n    let initialized = false;\r\n\r\n    return () => {\r\n        if (!initialized) {\r\n            instance = factory();\r\n            initialized = true;\r\n        }\r\n        return instance!;\r\n    };\r\n}\r\n\r\nexport function makeNonEnumerable<T>(obj: T, propertyNames: (keyof T)[]) {\r\n    let propertyDescriptorMap: PropertyDescriptorMap = {};\r\n    for (const propertyName of propertyNames) {\r\n        propertyDescriptorMap[propertyName] = {\r\n            enumerable: false\r\n        };\r\n    }\r\n    Object.defineProperties(obj, propertyDescriptorMap);\r\n}\r\n\r\n// TODO:\r\n/*\r\nfunction getMetadata<T>(\r\n    store: WeakMap<object, Map<PropertyKey, T>>,\r\n    target: object,\r\n    prop: PropertyKey,\r\n): T | undefined {\r\n    return store.get(target)?.get(prop) as T | undefined;\r\n}\r\n\r\nfunction setMetadata<T>(\r\n    store: WeakMap<object, Map<PropertyKey, T>>,\r\n    target: object,\r\n    prop: PropertyKey,\r\n    value: T,\r\n) {\r\n    let propMap = store.get(target);\r\n    if (!propMap) {\r\n        propMap = new Map();\r\n        store.set(target, propMap);\r\n    }\r\n    propMap.set(prop, value);\r\n}\r\n\r\nfunction hasMetadata(\r\n    store: WeakMap<object, Map<PropertyKey, any>>,\r\n    target: object,\r\n    prop: PropertyKey,\r\n): boolean {\r\n    return store.get(target)?.has(prop) ?? false;\r\n}\r\n*/\r\n\r\n/*\r\nexport function memoizeThrottle<T extends Func>(\r\n    func: T,\r\n    wait = 0,\r\n    options?: Parameters<typeof _.throttle<T>>[2],\r\n    resolver?: Parameters<typeof _.memoize<(...args: Parameters<T>) => ReturnType<typeof _.throttle<T>>>>[1]\r\n) {\r\n    const mem = _.memoize<(...args: Parameters<T>) => ReturnType<typeof _.throttle<T>>>(() => {\r\n        return _.throttle<T>(func, wait, options);\r\n    }, resolver);\r\n\r\n    return (...args: Parameters<T>) => {\r\n        return mem(...args)(...args);\r\n    };\r\n}\r\n\r\nexport function memoizeDebounce<T extends Func>(\r\n    func: T,\r\n    wait = 0,\r\n    options?: Parameters<typeof _.debounce<T>>[2],\r\n    resolver?: Parameters<typeof _.memoize<(...args: Parameters<T>) => ReturnType<typeof _.debounce<T>>>>[1]\r\n) {\r\n    const mem = _.memoize<(...args: Parameters<T>) => ReturnType<typeof _.debounce<T>>>(() => {\r\n        return _.debounce<T>(func, wait, options);\r\n    }, resolver);\r\n\r\n    return (...args: Parameters<T>) => {\r\n        return mem(...args)(...args);\r\n    };\r\n}\r\n*/\r\n"],"names":["uuid"],"mappings":"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"}

package/dist/watchable.es.js

@@ -1,38 +1,61 @@
-function l(c) {
-  let s, n;
-  const e = new Promise((t, r) => {
-    s = t, n = r;
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+function watch(fn) {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
   });
-  return e.status = "pending", Object.defineProperty(e, "settled", {
-    get: () => e.status !== "pending"
-  }), (async () => {
+  promise.status = "pending";
+  Object.defineProperty(promise, "settled", {
+    get: /* @__PURE__ */ __name(() => promise.status !== "pending", "get")
+  });
+  (async () => {
     try {
-      const t = await Promise.resolve(c());
-      s(t), e.result = t, e.status = "fulfilled";
-    } catch (t) {
-      n(t), e.result = void 0, e.status = "rejected";
+      const retValue = await Promise.resolve(fn());
+      resolve(retValue);
+      promise.result = retValue;
+      promise.status = "fulfilled";
+    } catch (err) {
+      reject(err);
+      promise.result = void 0;
+      promise.status = "rejected";
     }
-  })(), e;
+  })();
+  return promise;
 }
-function i(c) {
-  let s;
-  const n = (e) => {
-    if (s.executing = !1, e)
-      throw e;
-  };
-  return s = (...e) => {
-    s.executing = !0;
-    let t = !1;
+__name(watch, "watch");
+function toWatchable(fn) {
+  let watchable;
+  const complete = /* @__PURE__ */ __name((err) => {
+    watchable.executing = false;
+    if (err) {
+      throw err;
+    }
+  }, "complete");
+  watchable = /* @__PURE__ */ __name((...args) => {
+    watchable.executing = true;
+    let isAsyncFn = false;
     try {
-      const r = c(...e);
-      return r instanceof Promise && (t = !0, r.catch(n), r.then(n)), r;
+      const fnResult = fn(...args);
+      if (fnResult instanceof Promise) {
+        isAsyncFn = true;
+        fnResult.catch(complete);
+        fnResult.then(complete);
+      }
+      return fnResult;
     } finally {
-      t || n();
+      if (!isAsyncFn) {
+        complete();
+      }
     }
-  }, s;
+  }, "watchable");
+  return watchable;
 }
+__name(toWatchable, "toWatchable");
 export {
-  i as toWatchable,
-  l as watch
+  toWatchable,
+  watch
 };
 //# sourceMappingURL=watchable.es.js.map

package/dist/watchable.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"watchable.es.js","sources":["D:/Src/my/actdim/public/utico/src/watchable.ts"],"sourcesContent":null,"names":["watch","fn","resolve","reject","promise","res","rej","retValue","err","toWatchable","watchable","complete","args","isAsyncFn","fnResult"],"mappings":"AAmBO,SAASA,EAAgBC,GAAiB;AAE7C,MAAIC,GAEAC;AAGJ,QAAMC,IAAiD,IAAI,QAAoB,CAACC,GAAKC,MAAQ;AACzF,IAAAJ,IAAUG,GACVF,IAASG;AAAA,EACb,CAAC;AAED,SAAAF,EAAQ,SAAS,WAEjB,OAAO,eAAeA,GAAS,WAA0C;AAAA,IACrE,KAAK,MAAMA,EAAQ,WAAW;AAAA,EAAA,CACjC,IAEA,YAAY;AACT,QAAI;AACA,YAAMG,IAAY,MAAM,QAAQ,QAAQN,GAAI;AAC5C,MAAAC,EAAQK,CAAQ,GAChBH,EAAQ,SAASG,GACjBH,EAAQ,SAAS;AAAA,IACrB,SAASI,GAAK;AACV,MAAAL,EAAOK,CAAG,GACVJ,EAAQ,SAAS,QACjBA,EAAQ,SAAS;AAAA,IACrB;AAAA,EACJ,GAAA,GAEOA;AACX;AAMO,SAASK,EAAmDR,GAA6C;AAE5G,MAAIS;AAGJ,QAAMC,IAAW,CAACH,MAAc;AAG5B,QAFAE,EAAU,YAAY,IAElBF;AAEA,YAAMA;AAAA,EAEd;AACA,SAAAE,IAAY,IAAIE,MAAS;AACrB,IAAAF,EAAU,YAAY;AACtB,QAAIG,IAAY;AAChB,QAAI;AACA,YAAMC,IAAWb,EAAG,GAAGW,CAAI;AAC3B,aAAIE,aAAoB,YACpBD,IAAY,IACZC,EAAS,MAAMH,CAAQ,GACvBG,EAAS,KAAKH,CAAQ,IAEnBG;AAAA,IACX,UAAA;AACI,MAAKD,KACDF,EAAA;AAAA,IAER;AAAA,EACJ,GACOD;AACX;"}
+{"version":3,"file":"watchable.es.js","sources":["D:/Src/my/actdim/public/utico/src/watchable.ts"],"sourcesContent":["import { Mutable, Executor, Func } from \"./typeCore\";\r\n\r\n// PromiseState\r\nexport type PromiseStatus = \"pending\" | \"fulfilled\" | \"rejected\";\r\n\r\n// TrackablePromise\r\nexport type WatchablePromise<T = void> = PromiseLike<T> & {\r\n    readonly status?: PromiseStatus;\r\n    readonly settled?: boolean;\r\n    readonly result?: T;\r\n};\r\n\r\n// WatchableFn\r\nexport type WatchableFunc<TArgs extends any[] = any[], T = any> = Func<TArgs, T> & {\r\n    executing?: boolean; // running/inProgress/pending\r\n};\r\n\r\n// we need promise wrapper because Promise [[PromiseState]] and [[PromiseResult]] symbols are not accessible\r\n// exec and watch/track\r\nexport function watch<T = void>(fn: Executor<T>) {\r\n    // type PromiseExecutorType = ConstructorParameters<typeof Promise<Awaited<T>>>[0];\r\n    let resolve!: (value: Awaited<T>) => void;\r\n    // let resolve: Parameters<PromiseExecutorType>[0];\r\n    let reject!: (reason: any) => void;\r\n    // let reject: Parameters<PromiseExecutorType>[1];\r\n\r\n    const promise: Mutable<WatchablePromise<Awaited<T>>> = new Promise<Awaited<T>>((res, rej) => {\r\n        resolve = res;\r\n        reject = rej;\r\n    });\r\n\r\n    promise.status = \"pending\";\r\n    // TODO: create type-safe defineProperty utility method\r\n    Object.defineProperty(promise, \"settled\" satisfies keyof typeof promise, {\r\n        get: () => promise.status !== \"pending\"\r\n    });\r\n\r\n    (async () => {\r\n        try {\r\n            const retValue = (await Promise.resolve(fn())) as Awaited<T>;\r\n            resolve(retValue);\r\n            promise.result = retValue;\r\n            promise.status = \"fulfilled\";\r\n        } catch (err) {\r\n            reject(err);\r\n            promise.result = undefined;\r\n            promise.status = \"rejected\";\r\n        }\r\n    })();\r\n\r\n    return promise as WatchablePromise<Awaited<T>>;\r\n}\r\n\r\n// TODO: add Promise.prototype.finally support\r\n\r\n// toTrackable\r\n/** wrap to watchable func */\r\nexport function toWatchable<TArgs extends any[] = any[], T = void>(fn: Func<TArgs, T>): WatchableFunc<TArgs, T> {\r\n    // result\r\n    let watchable: Func<TArgs, T> & {\r\n        executing?: boolean; // running/inProgress/pending\r\n    };\r\n    const complete = (err?: any) => {\r\n        watchable.executing = false;\r\n        // watchable result.executing;\r\n        if (err) {\r\n            // err instanceof Error\r\n            throw err; // need to rethrow!\r\n        }\r\n    };\r\n    watchable = (...args) => {\r\n        watchable.executing = true;\r\n        let isAsyncFn = false;\r\n        try {\r\n            const fnResult = fn(...args);\r\n            if (fnResult instanceof Promise) {\r\n                isAsyncFn = true;\r\n                fnResult.catch(complete);\r\n                fnResult.then(complete);\r\n            }\r\n            return fnResult;\r\n        } finally {\r\n            if (!isAsyncFn) {\r\n                complete();\r\n            }\r\n        }\r\n    };\r\n    return watchable;\r\n}\r\n"],"names":[],"mappings":";;AAmBO,SAAS,MAAgB,IAAiB;AAE7C,MAAI;AAEJ,MAAI;AAGJ,QAAM,UAAiD,IAAI,QAAoB,CAAC,KAAK,QAAQ;AACzF,cAAU;AACV,aAAS;AAAA,EACb,CAAC;AAED,UAAQ,SAAS;AAEjB,SAAO,eAAe,SAAS,WAA0C;AAAA,IACrE,KAAK,6BAAM,QAAQ,WAAW,WAAzB;AAAA,EAAyB,CACjC;AAED,GAAC,YAAY;AACT,QAAI;AACA,YAAM,WAAY,MAAM,QAAQ,QAAQ,IAAI;AAC5C,cAAQ,QAAQ;AAChB,cAAQ,SAAS;AACjB,cAAQ,SAAS;AAAA,IACrB,SAAS,KAAK;AACV,aAAO,GAAG;AACV,cAAQ,SAAS;AACjB,cAAQ,SAAS;AAAA,IACrB;AAAA,EACJ,GAAA;AAEA,SAAO;AACX;AAhCgB;AAsCT,SAAS,YAAmD,IAA6C;AAE5G,MAAI;AAGJ,QAAM,WAAW,wBAAC,QAAc;AAC5B,cAAU,YAAY;AAEtB,QAAI,KAAK;AAEL,YAAM;AAAA,IACV;AAAA,EACJ,GAPiB;AAQjB,cAAY,2BAAI,SAAS;AACrB,cAAU,YAAY;AACtB,QAAI,YAAY;AAChB,QAAI;AACA,YAAM,WAAW,GAAG,GAAG,IAAI;AAC3B,UAAI,oBAAoB,SAAS;AAC7B,oBAAY;AACZ,iBAAS,MAAM,QAAQ;AACvB,iBAAS,KAAK,QAAQ;AAAA,MAC1B;AACA,aAAO;AAAA,IACX,UAAA;AACI,UAAI,CAAC,WAAW;AACZ,iBAAA;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ,GAhBY;AAiBZ,SAAO;AACX;AA/BgB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@actdim/utico",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "description": "A modern foundation toolkit for complex TypeScript apps",
     "author": "Pavel Borodaev",
     "license": "Proprietary",
@@ -66,7 +66,7 @@
         "nvm:il": "nvm install lts",
         "format": "prettier --write .",
         "format:check": "prettier --check .",
-        "typecheck": "tsc -p tsconfig.json --noEmit"
+        "typecheck": "tsc -b tsconfig.json"
     },
     "peerDependencies": {
         "dexie": ">=4.2.0",