@inrixia/helpers 3.20.1 → 3.20.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,6 +4,7 @@ export type Memoized<G extends AnyFn> = G & {
4
4
  };
5
5
  export interface MemoMap<K extends any[] = any[], V extends any = any> {
6
6
  get: (key: K) => V | undefined;
7
+ has: (key: K) => boolean;
7
8
  set: (key: K, value: V) => V;
8
9
  delete: (key: K) => boolean;
9
10
  clear: () => void;
@@ -1 +1 @@
1
- {"version":3,"file":"Memo.d.ts","sourceRoot":"","sources":["../../src/class/Memo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKnD,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,GAAG;IAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAA;CAAE,CAAC;AAG5F,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG;IACpE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAC/B,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,IAAI,CAAC;CAClB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,KAAG,CAiB7G,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CASrF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAA6C,CAAC;AAE7H;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAA+C,CAAC;AAErI;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAAkD,CAAC"}
1
+ {"version":3,"file":"Memo.d.ts","sourceRoot":"","sources":["../../src/class/Memo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKnD,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,GAAG;IAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAA;CAAE,CAAC;AAG5F,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG;IACpE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAC/B,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;IACzB,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,IAAI,CAAC;CAClB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,KAAG,CAwB7G,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAqBrF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAA6C,CAAC;AAE7H;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAA+C,CAAC;AAErI;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,KAAK,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAG,CAAkD,CAAC"}
@@ -12,14 +12,17 @@ export const withCache = (generator, cache) => {
12
12
  if (generator.length === 0)
13
13
  return memoizeArgless(generator);
14
14
  const _fn = ((...args) => {
15
- const cachedValue = cache.get(args);
16
- if (cachedValue !== undefined)
17
- return cachedValue;
15
+ if (cache.has(args))
16
+ return cache.get(args);
18
17
  const newValue = generator(...args);
19
18
  cache.set(args, newValue);
20
- // Dont cache errors!
21
- if (newValue instanceof Promise)
22
- newValue?.catch(() => cache.delete(args));
19
+ // Dont cache errored promises!
20
+ if (newValue instanceof Promise) {
21
+ newValue?.catch((e) => {
22
+ cache.delete(args);
23
+ throw e;
24
+ });
25
+ }
23
26
  return newValue;
24
27
  });
25
28
  _fn.clear = (...args) => {
@@ -37,11 +40,20 @@ export const withCache = (generator, cache) => {
37
40
  */
38
41
  export const memoizeArgless = (generator) => {
39
42
  let cache;
43
+ let cacheSet = false;
40
44
  const _fn = (() => {
41
- cache ??= generator();
42
- // Dont cache errors!
43
- if (cache instanceof Promise)
44
- cache?.catch(() => (cache = undefined));
45
+ if (cacheSet)
46
+ return cache;
47
+ cache = generator();
48
+ cacheSet = true;
49
+ // Dont cache errored promises!
50
+ if (cache instanceof Promise) {
51
+ cache?.catch((e) => {
52
+ cache = undefined;
53
+ cacheSet = false;
54
+ });
55
+ }
56
+ return cache;
45
57
  });
46
58
  _fn.clear = () => (cache = undefined);
47
59
  return _fn;
@@ -1 +1 @@
1
- {"version":3,"file":"Memo.js","sourceRoot":"","sources":["../../src/class/Memo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC,CAAC,mBAAmB;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAY9C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAA4D,SAAY,EAAE,KAAQ,EAAK,EAAE;IACjH,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;IAE7D,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,IAAmB,EAAE,EAAE;QACvC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,WAAW,KAAK,SAAS;YAAE,OAAO,WAAW,CAAC;QAClD,MAAM,QAAQ,GAAkB,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1B,qBAAqB;QACrB,IAAS,QAAQ,YAAY,OAAO;YAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAM,CAAC;IACR,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5C,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAyC,SAAY,EAAK,EAAE;IACzF,IAAI,KAAgC,CAAC;IACrC,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE;QACjB,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,qBAAqB;QACrB,IAAS,KAAK,YAAY,OAAO;YAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAM,CAAC;IACR,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,OAAO,EAAE,CAAM,CAAC;AAE7H;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,SAAS,EAAE,CAAM,CAAC;AAErI;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,YAAY,EAAE,CAAM,CAAC"}
1
+ {"version":3,"file":"Memo.js","sourceRoot":"","sources":["../../src/class/Memo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC,CAAC,mBAAmB;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAa9C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAA4D,SAAY,EAAE,KAAQ,EAAK,EAAE;IACjH,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;IAE7D,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,IAAmB,EAAE,EAAE;QACvC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAkB,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE1B,+BAA+B;QAC/B,IAAS,QAAQ,YAAY,OAAO,EAAE,CAAC;YACb,QAAS,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/C,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnB,MAAM,CAAC,CAAC;YACT,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAM,CAAC;IACR,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5C,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAyC,SAAY,EAAK,EAAE;IACzF,IAAI,KAAgC,CAAC;IACrC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE;QACjB,IAAI,QAAQ;YAAE,OAAO,KAAK,CAAC;QAE3B,KAAK,GAAG,SAAS,EAAE,CAAC;QACpB,QAAQ,GAAG,IAAI,CAAC;QAEhB,+BAA+B;QAC/B,IAAS,KAAK,YAAY,OAAO,EAAE,CAAC;YACV,KAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5C,KAAK,GAAG,SAAS,CAAC;gBAClB,QAAQ,GAAG,KAAK,CAAC;YAClB,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,CAAM,CAAC;IACR,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,OAAO,EAAE,CAAM,CAAC;AAE7H;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,SAAS,EAAE,CAAM,CAAC;AAErI;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAyC,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,YAAY,EAAE,CAAM,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@inrixia/helpers",
3
- "version": "3.20.1",
3
+ "version": "3.20.2",
4
4
  "description": "Helper functions for various projects",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",