@idlebox/common 1.3.23 → 1.3.26

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.
Files changed (57) hide show
  1. package/lib/cjs/__create_index.generated.cjs +73 -57
  2. package/lib/cjs/__create_index.generated.cjs.map +1 -1
  3. package/lib/cjs/__create_index.generated.d.cts +62 -5
  4. package/lib/cjs/debugging/tryInspect.cjs +4 -1
  5. package/lib/cjs/debugging/tryInspect.cjs.map +1 -1
  6. package/lib/cjs/error/pretty.cjs +235 -0
  7. package/lib/cjs/error/pretty.cjs.map +10 -0
  8. package/lib/cjs/lifecycle/dispose/disposedError.cjs +15 -2
  9. package/lib/cjs/lifecycle/dispose/disposedError.cjs.map +1 -1
  10. package/lib/cjs/lifecycle/dispose/lifecycle.async.cjs +9 -4
  11. package/lib/cjs/lifecycle/dispose/lifecycle.async.cjs.map +1 -1
  12. package/lib/cjs/lifecycle/dispose/lifecycle.sync.cjs +10 -2
  13. package/lib/cjs/lifecycle/dispose/lifecycle.sync.cjs.map +1 -1
  14. package/lib/cjs/path/normalizePath.cjs +116 -4
  15. package/lib/cjs/path/normalizePath.cjs.map +1 -1
  16. package/lib/cjs/promise/{promisePool.cjs → promiseCollection.cjs} +4 -4
  17. package/lib/cjs/promise/promiseCollection.cjs.map +10 -0
  18. package/lib/cjs/promise/{timeoutPromisePool.cjs → timeoutPromiseCollection.cjs} +5 -5
  19. package/lib/cjs/promise/timeoutPromiseCollection.cjs.map +10 -0
  20. package/lib/cjs/state/StateMachine.cjs +34 -0
  21. package/lib/cjs/state/StateMachine.cjs.map +10 -0
  22. package/lib/esm/__create_index.generated.d.mts +62 -5
  23. package/lib/esm/__create_index.generated.mjs +41 -32
  24. package/lib/esm/__create_index.generated.mjs.map +1 -1
  25. package/lib/esm/debugging/tryInspect.mjs +4 -1
  26. package/lib/esm/debugging/tryInspect.mjs.map +1 -1
  27. package/lib/esm/error/pretty.mjs +229 -0
  28. package/lib/esm/error/pretty.mjs.map +10 -0
  29. package/lib/esm/lifecycle/dispose/disposedError.mjs +15 -2
  30. package/lib/esm/lifecycle/dispose/disposedError.mjs.map +1 -1
  31. package/lib/esm/lifecycle/dispose/lifecycle.async.mjs +9 -4
  32. package/lib/esm/lifecycle/dispose/lifecycle.async.mjs.map +1 -1
  33. package/lib/esm/lifecycle/dispose/lifecycle.sync.mjs +10 -2
  34. package/lib/esm/lifecycle/dispose/lifecycle.sync.mjs.map +1 -1
  35. package/lib/esm/path/normalizePath.mjs +113 -3
  36. package/lib/esm/path/normalizePath.mjs.map +1 -1
  37. package/lib/esm/promise/{promisePool.mjs → promiseCollection.mjs} +2 -2
  38. package/lib/esm/promise/promiseCollection.mjs.map +10 -0
  39. package/lib/esm/promise/{timeoutPromisePool.mjs → timeoutPromiseCollection.mjs} +3 -3
  40. package/lib/esm/promise/timeoutPromiseCollection.mjs.map +10 -0
  41. package/lib/esm/state/StateMachine.mjs +30 -0
  42. package/lib/esm/state/StateMachine.mjs.map +10 -0
  43. package/package.json +4 -4
  44. package/src/debugging/tryInspect.ts +3 -1
  45. package/src/error/pretty.ts +249 -0
  46. package/src/lifecycle/dispose/disposedError.ts +20 -3
  47. package/src/lifecycle/dispose/lifecycle.async.ts +14 -3
  48. package/src/lifecycle/dispose/lifecycle.sync.ts +18 -4
  49. package/src/lifecycle/dispose/lifecycle.ts +1 -1
  50. package/src/path/normalizePath.ts +126 -3
  51. package/src/promise/{promisePool.ts → promiseCollection.ts} +1 -1
  52. package/src/promise/{timeoutPromisePool.ts → timeoutPromiseCollection.ts} +2 -2
  53. package/src/state/StateMachine.ts +52 -0
  54. package/lib/cjs/promise/promisePool.cjs.map +0 -10
  55. package/lib/cjs/promise/timeoutPromisePool.cjs.map +0 -10
  56. package/lib/esm/promise/promisePool.mjs.map +0 -10
  57. package/lib/esm/promise/timeoutPromisePool.mjs.map +0 -10
@@ -23,14 +23,19 @@ export class AsyncDisposable {
23
23
  throw new DisposedError(this, this._disposed);
24
24
  }
25
25
  }
26
- /**
27
- * register a disposable object
28
- */
29
- _register(d) {
26
+ _register(d, deref) {
30
27
  this.assertNotDisposed();
31
28
  this._disposables.unshift(d);
29
+ if (deref) {
30
+ d.onBeforeDispose(() => {
31
+ this._unregister(d);
32
+ });
33
+ }
32
34
  return d;
33
35
  }
36
+ _unregister(d) {
37
+ return this._disposables.splice(this._disposables.indexOf(d), 1).length > 0;
38
+ }
34
39
  async dispose() {
35
40
  if (this._disposed) {
36
41
  console.warn(new DisposedError(this, this._disposed).message);
@@ -6,5 +6,5 @@
6
6
  "../../../../src/lifecycle/dispose/lifecycle.async.ts"
7
7
  ],
8
8
  "names": [],
9
- "mappings": "AAAA,OAAO,EAAE,mBAAmB,EAAE,uCAAmC;AACjE,OAAO,EAAE,OAAO,EAAiB,2BAAuB;AACxD,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAGhD;;;GAGG;AACH,MAAM,OAAO,eAAe;IACV,YAAY,GAAuB,EAAE,CAAC;IAEpC,eAAe,GAAG,IAAI,OAAO,EAAS,CAAC;IAC1C,cAAc,GAAyB,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;IAElE,gBAAgB,GAAG,IAAI,OAAO,EAAQ,CAAC;IAC1C,eAAe,GAAwB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IAE9E,SAAS,CAAS;IAE1B,IAAW,WAAW;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,iBAAiB;QACvB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9C;IACF,CAAC;IAED;;OAEG;IACI,SAAS,CAA6B,CAAI;QAChD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,CAAC,CAAC;IACV,CAAC;IAEM,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7C,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE;YACnC,IAAI;gBACH,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;aACnB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD;SACD;IACF,CAAC;CACD"
9
+ "mappings": "AAAA,OAAO,EAAE,mBAAmB,EAAE,uCAAmC;AACjE,OAAO,EAAE,OAAO,EAAiB,2BAAuB;AACxD,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAGhD;;;GAGG;AACH,MAAM,OAAO,eAAe;IACV,YAAY,GAAuB,EAAE,CAAC;IAEpC,eAAe,GAAG,IAAI,OAAO,EAAS,CAAC;IAC1C,cAAc,GAAyB,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;IAElE,gBAAgB,GAAG,IAAI,OAAO,EAAQ,CAAC;IAC1C,eAAe,GAAwB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IAE9E,SAAS,CAAS;IAE1B,IAAW,WAAW;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,iBAAiB;QACvB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9C;IACF,CAAC;IAOM,SAAS,CAAsE,CAAI,EAAE,KAAe;QAC1G,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,EAAE;YACT,CAAuB,CAAC,eAAe,CAAC,GAAG,EAAE;gBAC7C,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;SACH;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAEM,WAAW,CAAC,CAAmB;QACrC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7C,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE;YACnC,IAAI;gBACH,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;aACnB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD;SACD;IACF,CAAC;CACD"
10
10
  }
@@ -1,5 +1,5 @@
1
- import { DisposedError } from "./disposedError.mjs";
2
1
  import { Emitter } from "../event/event.mjs";
2
+ import { DisposedError } from "./disposedError.mjs";
3
3
  export class DisposableOnce {
4
4
  _disposed;
5
5
  get hasDisposed() {
@@ -35,11 +35,19 @@ export class Disposable {
35
35
  throw new DisposedError(this, this._disposed);
36
36
  }
37
37
  }
38
- _register(d) {
38
+ _register(d, autoDereference) {
39
39
  this.assertNotDisposed();
40
40
  this._disposables.unshift(d);
41
+ if (autoDereference) {
42
+ d.onBeforeDispose(() => {
43
+ this._unregister(d);
44
+ });
45
+ }
41
46
  return d;
42
47
  }
48
+ _unregister(d) {
49
+ return this._disposables.splice(this._disposables.indexOf(d), 1).length > 0;
50
+ }
43
51
  dispose() {
44
52
  if (this._disposed) {
45
53
  console.warn(new DisposedError(this, this._disposed).message);
@@ -6,5 +6,5 @@
6
6
  "../../../../src/lifecycle/dispose/lifecycle.sync.ts"
7
7
  ],
8
8
  "names": [],
9
- "mappings": "AAAA,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,OAAO,EAAiB,2BAAuB;AAGxD,MAAM,OAAgB,cAAc;IAC3B,SAAS,CAAS;IAE1B,IAAW,WAAW;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IACM,OAAO;QACb,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjB,CAAC;CAGD;AAED;;GAEG;AACH,MAAM,OAAO,UAAU;IACL,YAAY,GAAkB,EAAE,CAAC;IAE/B,eAAe,GAAG,IAAI,OAAO,EAAS,CAAC;IAC1C,cAAc,GAAyB,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;IAElE,gBAAgB,GAAG,IAAI,OAAO,EAAQ,CAAC;IAC1C,eAAe,GAAwB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IAE9E,SAAS,CAAS;IAE1B,IAAW,WAAW;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,iBAAiB;QACvB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9C;IACF,CAAC;IAEM,SAAS,CAAwB,CAAI;QAC3C,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,CAAC,CAAC;IACV,CAAC;IAEM,OAAO;QACb,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;YAC9C,IAAI;gBACH,IAAI,CAAC,OAAO,EAAE,CAAC;aACf;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,YAAY,KAAK,EAAE;oBACvB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAC7B;qBAAM;oBACN,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC;oBACjD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC7C;aACD;SACD;IACF,CAAC;CACD"
9
+ "mappings": "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"
10
10
  }
@@ -1,12 +1,122 @@
1
+ const schema = /^[a-z]{2,}:\/\//i;
2
+ const unc = /^[\/\\]{1,2}\?[\/\\]UNC[\/\\]/i;
3
+ const winSp = /^[\/\\]{1,2}\?[\/\\]([a-z]:[\/\\])/i;
4
+ const winLetter = /^[a-z]:\//i;
5
+ const doubleSlash = /^[\/\\]{2}[^\/\\]/i;
6
+ export var PathKind;
7
+ (function (PathKind) {
8
+ PathKind[PathKind["url"] = 0] = "url";
9
+ PathKind[PathKind["unc"] = 1] = "unc";
10
+ PathKind[PathKind["win"] = 2] = "win";
11
+ PathKind[PathKind["cifs"] = 3] = "cifs";
12
+ PathKind[PathKind["unix"] = 4] = "unix";
13
+ PathKind[PathKind["relative"] = 5] = "relative";
14
+ })(PathKind || (PathKind = {}));
15
+ export function analyzePath(p) {
16
+ const inp = p;
17
+ let r;
18
+ if (schema.test(p)) {
19
+ const u = new URL(p);
20
+ r = {
21
+ kind: PathKind.url,
22
+ prefix: u.protocol + '//' + u.host,
23
+ path: u.pathname.slice(1),
24
+ url: u,
25
+ };
26
+ }
27
+ else if (unc.test(p)) {
28
+ p = p.replace(unc, '').replace(/^[\/\\]+/, '');
29
+ const i = /[\///]/.exec(p)?.index ?? -1;
30
+ if (i <= 0)
31
+ throw new Error('invalid unc path: ' + inp);
32
+ r = {
33
+ kind: PathKind.unc,
34
+ prefix: '//?/UNC/' + p.slice(0, i),
35
+ path: p.slice(i + 1),
36
+ };
37
+ }
38
+ else if (winSp.test(p) || winLetter.test(p)) {
39
+ p = p.replace(winSp, '$1');
40
+ r = {
41
+ kind: PathKind.win,
42
+ prefix: p.slice(0, 2),
43
+ path: p.slice(4),
44
+ };
45
+ }
46
+ else if (doubleSlash.test(p)) {
47
+ p = p.replace(/^[\/\\]+/, '');
48
+ const i = /[\///]/.exec(p)?.index ?? -1;
49
+ if (i <= 0)
50
+ throw new Error('invalid cifs url: ' + inp);
51
+ r = {
52
+ kind: PathKind.cifs,
53
+ prefix: '//' + p.slice(0, i),
54
+ path: p.slice(i + 1),
55
+ };
56
+ }
57
+ else if (p.startsWith('/')) {
58
+ r = {
59
+ kind: PathKind.unix,
60
+ prefix: '',
61
+ path: p,
62
+ };
63
+ }
64
+ else {
65
+ const st = p.startsWith('..') ? '..' : '.';
66
+ r = {
67
+ kind: PathKind.relative,
68
+ prefix: st,
69
+ path: p,
70
+ };
71
+ }
72
+ const path = r.path.replace(/\\/g, '/');
73
+ const st = [];
74
+ for (const item of path.split('/')) {
75
+ if (!item || item === '.')
76
+ continue;
77
+ if (item === '..') {
78
+ st.pop();
79
+ }
80
+ else {
81
+ st.push(item);
82
+ }
83
+ }
84
+ r.path = st.join('/');
85
+ return r;
86
+ }
1
87
  /**
2
88
  * replace // to /
3
89
  * replace \ to /
4
90
  * remove ending /
5
91
  */
6
92
  export function normalizePath(p) {
7
- if (p.startsWith('file:')) {
8
- throw new Error('normalizePath not support file url.');
93
+ const r = analyzePath(p);
94
+ if (r.prefix === undefined) {
95
+ return r.path;
9
96
  }
10
- return p.replace(/\\+/g, '/').replace(/\/\/+/g, '/').replace(/\/+$/, '');
97
+ else {
98
+ return `${r.prefix}/${r.path}`;
99
+ }
100
+ }
101
+ export function relativePath(from, to) {
102
+ const r1 = analyzePath(from);
103
+ const r2 = analyzePath(to);
104
+ if (r1.kind !== r2.kind)
105
+ throw new Error(`cannot relative path between different kind: "${PathKind[r1.kind]}::${r1.prefix}" * "${PathKind[r2.kind]}::${r2.prefix}"`);
106
+ if (r1.prefix !== r2.prefix)
107
+ return to;
108
+ const p1arr = r1.path.split('/');
109
+ const p2arr = r2.path.split('/');
110
+ // find same prefix
111
+ let i = 0;
112
+ while (i < p1arr.length && i < p2arr.length && p1arr[i] === p2arr[i])
113
+ i++;
114
+ // remove same prefix
115
+ p1arr.splice(0, i);
116
+ p2arr.splice(0, i);
117
+ // add ..
118
+ const p1 = p1arr.length > 0 ? p1arr.map(() => '..').join('/') + '/' : '';
119
+ const p2 = p2arr.join('/');
120
+ return p1 + p2;
11
121
  }
12
122
  //# sourceMappingURL=normalizePath.mjs.map
@@ -6,5 +6,5 @@
6
6
  "../../../src/path/normalizePath.ts"
7
7
  ],
8
8
  "names": [],
9
- "mappings": "AAAA;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,CAAS;IACtC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACvD;IACD,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC1E,CAAC"
9
+ "mappings": "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"
10
10
  }
@@ -1,6 +1,6 @@
1
1
  import { CanceledError } from "../lifecycle/promise/cancel.mjs";
2
2
  import { DeferredPromise } from "../lifecycle/promise/deferredPromise.mjs";
3
- export class PromisePool {
3
+ export class PromiseCollection {
4
4
  promiseList = {};
5
5
  size() {
6
6
  return Object.keys(this.promiseList).length;
@@ -31,4 +31,4 @@ export class PromisePool {
31
31
  }
32
32
  }
33
33
  }
34
- //# sourceMappingURL=promisePool.mjs.map
34
+ //# sourceMappingURL=promiseCollection.mjs.map
@@ -0,0 +1,10 @@
1
+ {
2
+ "version": 3,
3
+ "file": "promiseCollection.mjs",
4
+ "sourceRoot": "",
5
+ "sources": [
6
+ "../../../src/promise/promiseCollection.ts"
7
+ ],
8
+ "names": [],
9
+ "mappings": "AAAA,OAAO,EAAE,aAAa,EAAE,wCAAoC;AAC5D,OAAO,EAAE,eAAe,EAAE,iDAA6C;AAEvE,MAAM,OAAO,iBAAiB;IACV,WAAW,GAAyC,EAAE,CAAC;IAE1E,IAAI;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,EAAU;QAChB,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;SACnD;QACD,MAAM,GAAG,GAAG,IAAI,eAAe,EAAO,CAAC;QACvC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;QAC3B,OAAO,GAAG,CAAC,CAAC,CAAC;IACd,CAAC;IAED,GAAG,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,EAAU,EAAE,IAAS;QACzB,IAAI,CAAC,WAAW,CAAC,EAAE,CAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,EAAU,EAAE,CAAQ;QACzB,IAAI,CAAC,WAAW,CAAC,EAAE,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO;QACN,MAAM,CAAC,GAAG,IAAI,aAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/C,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SAClB;IACF,CAAC;CACD"
10
+ }
@@ -1,6 +1,6 @@
1
1
  import { TimeoutError } from "../lifecycle/timeout/timeoutError.mjs";
2
- import { PromisePool } from "./promisePool.mjs";
3
- export class TimeoutPromisePool extends PromisePool {
2
+ import { PromiseCollection } from "./promiseCollection.mjs";
3
+ export class TimeoutPromiseCollection extends PromiseCollection {
4
4
  defaultTimeoutMs;
5
5
  constructor(defaultTimeoutMs = 50000) {
6
6
  super();
@@ -17,4 +17,4 @@ export class TimeoutPromisePool extends PromisePool {
17
17
  return p;
18
18
  }
19
19
  }
20
- //# sourceMappingURL=timeoutPromisePool.mjs.map
20
+ //# sourceMappingURL=timeoutPromiseCollection.mjs.map
@@ -0,0 +1,10 @@
1
+ {
2
+ "version": 3,
3
+ "file": "timeoutPromiseCollection.mjs",
4
+ "sourceRoot": "",
5
+ "sources": [
6
+ "../../../src/promise/timeoutPromiseCollection.ts"
7
+ ],
8
+ "names": [],
9
+ "mappings": "AAAA,OAAO,EAAE,YAAY,EAAE,8CAA0C;AACjE,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AAExD,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;IACjC;IAA7B,YAA6B,mBAAmB,KAAK;QACpD,KAAK,EAAE,CAAC;QADoB,qBAAgB,GAAhB,gBAAgB,CAAQ;IAErD,CAAC;IAEQ,MAAM,CAAC,EAAU,EAAE,YAAoB,IAAI,CAAC,gBAAgB,EAAE,UAAmB;QACzF,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE3B,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QACzD,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC;IACV,CAAC;CACD"
10
+ }
@@ -0,0 +1,30 @@
1
+ import { Emitter } from "../lifecycle/event/event.mjs";
2
+ export class SimpleStateMachine {
3
+ rules;
4
+ _onStateChange = new Emitter();
5
+ onStateChange = this._onStateChange.register;
6
+ constructor(rules, init_state) {
7
+ this.rules = rules;
8
+ this.moveTo(init_state);
9
+ }
10
+ moveTo(state) {
11
+ if (!this.rules.has(state))
12
+ throw new Error(`missing state "${state}"`);
13
+ this.currentState = state;
14
+ }
15
+ getName() {
16
+ return this.currentState;
17
+ }
18
+ change(event) {
19
+ const state = this.rules.get(this.currentState);
20
+ const next = state.get(event);
21
+ if (typeof next === 'undefined') {
22
+ throw new Error(`no event "${event} (${typeof event})" on state "${this.currentState} (${typeof this
23
+ .currentState})" (has ${[...state.keys()].map((v) => `"${v} (${typeof v})"`).join(', ')})`);
24
+ }
25
+ const last = this.currentState;
26
+ this.moveTo(next);
27
+ this._onStateChange.fireNoError({ from: last, to: next, reason: event });
28
+ }
29
+ }
30
+ //# sourceMappingURL=StateMachine.mjs.map
@@ -0,0 +1,10 @@
1
+ {
2
+ "version": 3,
3
+ "file": "StateMachine.mjs",
4
+ "sourceRoot": "",
5
+ "sources": [
6
+ "../../../src/state/StateMachine.ts"
7
+ ],
8
+ "names": [],
9
+ "mappings": "AAAA,OAAO,EAAE,OAAO,EAAE,qCAAiC;AAenD,MAAM,OAAO,kBAAkB;IAEX,KAAK,CAAoC;IAE3C,cAAc,GAAG,IAAI,OAAO,EAA2C,CAAC;IACzE,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IAE7D,YAAY,KAAwC,EAAE,UAAqB;QAC1E,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAES,MAAM,CAAC,KAAgB;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,GAAG,CAAC,CAAC;QAExE,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,OAAO;QACN,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAgB;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAE,CAAC;QACjD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE;YAChC,MAAM,IAAI,KAAK,CACd,aAAa,KAAK,KAAK,OAAO,KAAK,gBAAgB,IAAI,CAAC,YAAY,KAAK,OAAO,IAAI;iBAClF,YAAY,WAAW,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC3F,CAAC;SACF;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,CAAC;CACD"
10
+ }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@idlebox/common",
3
3
  "type": "module",
4
- "version": "1.3.23",
4
+ "version": "1.3.26",
5
5
  "license": "MIT",
6
6
  "main": "./lib/cjs/__create_index.generated.cjs",
7
7
  "module": "./lib/esm/__create_index.generated.mjs",
@@ -20,9 +20,9 @@
20
20
  "devDependencies": {
21
21
  "@rushstack/heft": "^0.57.1",
22
22
  "source-map-support": "^0.5.21",
23
- "@internal/dualstack-rig": "^1.0.1",
24
- "@build-script/single-dog-asset": "^1.0.27",
25
- "@idlebox/itypes": "^1.0.4"
23
+ "@build-script/single-dog-asset": "^1.0.28",
24
+ "@idlebox/itypes": "^1.0.5",
25
+ "@internal/dualstack-rig": "^1.0.1"
26
26
  },
27
27
  "scripts": {
28
28
  "test": "heft test",
@@ -31,7 +31,9 @@ export function tryInspect(object: any) {
31
31
  return object[Symbol.toStringTag]();
32
32
  } else if (object.toJSON) {
33
33
  return object.toJSON();
34
+ } else if (object.constructor?.name) {
35
+ return `unknown: ${object.constructor.name}`;
34
36
  } else {
35
- return '' + object;
37
+ return 'unknown: ' + object;
36
38
  }
37
39
  }
@@ -0,0 +1,249 @@
1
+ import { isAbsolute } from '../path/isAbsolute';
2
+ import { relativePath } from '../path/normalizePath';
3
+ import { globalObject } from '../platform/globalObject';
4
+ import { isNative } from '../platform/os';
5
+
6
+ const regNormal = /^\s+at ([^\/\s]+)(?: \[as ([^\]]+)])? \(((?:node|file):\/*)?([^:]+)(:\d+)?(:\d+)\)$/;
7
+ const process = globalObject.process;
8
+ const window = globalObject.window;
9
+
10
+ const enum regNormalMatch {
11
+ fn = 1,
12
+ fnAlias,
13
+ fileSchema,
14
+ file,
15
+ row,
16
+ column,
17
+ }
18
+
19
+ const regFunctionOnly = /^\s+at ([^\/\\\s]+(?: \[as ([^\]]+)])?)$/;
20
+
21
+ const enum regFunctionMatch {
22
+ fn = 1,
23
+ fnAlias,
24
+ }
25
+
26
+ const regFileOnly = /^\s+at ([^:]+)(:\d+)?(:\d+)$/;
27
+
28
+ const enum regFileOnlyMatch {
29
+ file = 1,
30
+ row,
31
+ column,
32
+ }
33
+
34
+ const regSimpleFrame = /^\s+at ([^(]+) \(<anonymous>\)$/;
35
+
36
+ const enum regSimpleFrameMatch {
37
+ fn = 1,
38
+ }
39
+
40
+ let root = process?.cwd() ?? window?.location?.domain ?? '/';
41
+
42
+ export function setErrorLogRoot(_root: string) {
43
+ root = _root;
44
+ }
45
+
46
+ interface IInternalData {
47
+ raw?: string;
48
+ fn?: string;
49
+ as?: string;
50
+ file?: string;
51
+ fileSchema?: string; // 'node' | 'file';
52
+ line?: number;
53
+ col?: number;
54
+ abs?: boolean;
55
+ }
56
+
57
+ let notify_printed = false;
58
+ export function prettyPrintError(type: string, e: Error) {
59
+ if (globalObject.process?.env?.DISABLE_PRETTY_ERROR) {
60
+ console.error('[${type}] %s', e.stack || e.message);
61
+ return;
62
+ }
63
+ console.error(`------------------------------------------
64
+ [${type}] ${prettyFormatError(e)}`);
65
+
66
+ if (!notify_printed) {
67
+ notify_printed = true;
68
+ console.error('\x1B[2muse env.DISABLE_PRETTY_ERROR=yes to see original error stack\x1B[0m');
69
+ }
70
+ }
71
+
72
+ function red(s: string) {
73
+ return isNative ? `\x1B[38;5;9m${s}\x1B[0m` : '';
74
+ }
75
+
76
+ export function prettyFormatError(e: Error, withMessage = true) {
77
+ if (!e || typeof e.message !== 'string') {
78
+ console.error(e);
79
+ return red('Unknown Error') + '\n' + new Error().stack?.split('\n').slice(3).join('\n');
80
+ }
81
+ if (!e.stack) {
82
+ return red(e.message + '\nNo stack trace');
83
+ }
84
+ const stackStr = e.stack.replace(/file:\/\//, '').split(/\n/g);
85
+
86
+ let first = stackStr.shift()!;
87
+ const stack: IInternalData[] = stackStr.map((line) => {
88
+ if (regNormal.test(line)) {
89
+ const m = regNormal.exec(line)!;
90
+ return {
91
+ fn: m[regNormalMatch.fn],
92
+ as: m[regNormalMatch.fnAlias],
93
+ fileSchema: m[regNormalMatch.fileSchema],
94
+ file: m[regNormalMatch.file],
95
+ line: parseInt(m[regNormalMatch.row].slice(1)),
96
+ col: parseInt(m[regNormalMatch.column].slice(1)),
97
+ abs: isAbsolute(m[regNormalMatch.file]),
98
+ };
99
+ } else if (regFunctionOnly.test(line)) {
100
+ const m = regFunctionOnly.exec(line)!;
101
+ return {
102
+ fn: m[regFunctionMatch.fn],
103
+ as: m[regFunctionMatch.fnAlias],
104
+ file: undefined,
105
+ line: undefined,
106
+ col: undefined,
107
+ abs: false,
108
+ };
109
+ } else if (regFileOnly.test(line)) {
110
+ const m = regFileOnly.exec(line)!;
111
+ return {
112
+ fn: undefined,
113
+ as: undefined,
114
+ file: m[regFileOnlyMatch.file],
115
+ line: parseInt(m[regFileOnlyMatch.row].slice(1)),
116
+ col: parseInt(m[regFileOnlyMatch.column].slice(1)),
117
+ abs: isAbsolute(m[regFileOnlyMatch.file]),
118
+ };
119
+ } else if (regSimpleFrame.test(line)) {
120
+ const m = regSimpleFrame.exec(line)!;
121
+ return {
122
+ fn: m[regSimpleFrameMatch.fn],
123
+ as: undefined,
124
+ file: '<anonymous>',
125
+ line: undefined,
126
+ col: undefined,
127
+ abs: false,
128
+ };
129
+ } else {
130
+ return { raw: line.replace(/^ /, '') };
131
+ }
132
+ });
133
+ const stackOutput = stack
134
+ .filter(ignoreSomeFiles)
135
+ .map(translateFunction)
136
+ .map(({ raw, fn, file, as, abs, line, col, fileSchema }) => {
137
+ let ret;
138
+ if (raw) {
139
+ return raw;
140
+ }
141
+
142
+ if (abs) {
143
+ const isNodeModule = file?.includes('/node_modules/');
144
+ const color = fn ? (isNodeModule ? '4' : '14') : '8';
145
+ ret = ` at \x1b[38;5;${color}m`;
146
+ if (as && fn && fn.startsWith('Object.')) {
147
+ ret += as + ' [export]';
148
+ } else {
149
+ ret += formatFunctionName(fn, as);
150
+ }
151
+ ret += '\x1b[0m';
152
+ if (file) {
153
+ ret += ' (';
154
+ if (!isNodeModule) {
155
+ ret += '\x1b[38;5;2m';
156
+ }
157
+ ret += formatFileLine(fileSchema, file, line, col);
158
+ ret += '\x1B[0m)';
159
+ }
160
+ } else {
161
+ ret = '\x1B[2m at ';
162
+ if (fn) {
163
+ ret += fn;
164
+ }
165
+ if (file) {
166
+ if (fn) {
167
+ ret += ' (';
168
+ }
169
+ ret += formatFileLine(fileSchema, file, line, col);
170
+ if (fn) {
171
+ ret += ')';
172
+ }
173
+ }
174
+ ret += '\x1B[0m';
175
+ }
176
+ return ret;
177
+ });
178
+
179
+ if (withMessage) {
180
+ if ((e as any).code) {
181
+ first = first.replace(/^(\S+):/, (_, name) => {
182
+ return `${name}(code ${(e as any).code}):`;
183
+ });
184
+ }
185
+
186
+ return first + '\n' + stackOutput.join('\n');
187
+ } else {
188
+ return stackOutput.join('\n');
189
+ }
190
+ }
191
+
192
+ function formatFileLine(schema: string | undefined, file: string, row?: number, col?: number) {
193
+ let rel = file;
194
+
195
+ if (schema !== 'node:') {
196
+ rel = relativePath(root, file);
197
+ if (rel.startsWith('..')) {
198
+ rel = file;
199
+ } else if (!rel.startsWith('.')) {
200
+ rel = './' + rel;
201
+ }
202
+ }
203
+
204
+ return `${schema || ''}${rel}${row ? `:${row}` : ''}${col ? `:${col}` : ''}`;
205
+ }
206
+
207
+ function formatFunctionName(fn?: string, as?: string) {
208
+ if (fn) {
209
+ if (as) {
210
+ return `${fn} [as ${as}]`;
211
+ } else {
212
+ return fn;
213
+ }
214
+ } else {
215
+ return '[anonymous]';
216
+ }
217
+ }
218
+
219
+ function translateFunction(data: IInternalData): IInternalData {
220
+ if (!data.fn) {
221
+ return data;
222
+ }
223
+ if (data.fn === 'Timeout._onTimeout') {
224
+ data.fn = 'setTimeout';
225
+ }
226
+ if (data.fn.startsWith('Timeout.') && data.as === '_onTimeout') {
227
+ data.fn = 'setTimeout->' + data.fn.slice(8);
228
+ delete data.as;
229
+ }
230
+ return data;
231
+ }
232
+
233
+ function ignoreSomeFiles({ file }: IInternalData): boolean {
234
+ if (!file) {
235
+ return true;
236
+ }
237
+ if (file === 'internal/timers.js') {
238
+ return false;
239
+ }
240
+ if (file.startsWith('internal/modules/cjs/loader')) {
241
+ return false;
242
+ }
243
+ if (!file.includes('/')) {
244
+ if (file.startsWith('_stream_')) {
245
+ return false;
246
+ }
247
+ }
248
+ return true;
249
+ }
@@ -1,13 +1,30 @@
1
- import { getErrorFrame } from '../../error/getFrame';
2
1
  import { tryInspect } from '../../debugging/tryInspect';
2
+ import { getErrorFrame } from '../../error/getFrame';
3
+ import { prettyFormatError } from '../../error/pretty';
3
4
 
4
5
  /**
5
6
  * Error when call dispose() twice
6
7
  */
7
8
  export class DisposedError extends Error {
8
- constructor(object: any, previous: Error) {
9
- super(`Object [${tryInspect(object)}] has already disposed at ${getErrorFrame(previous, 2)}.`);
9
+ public readonly inspectString: string;
10
+ constructor(
11
+ object: any,
12
+ public readonly previous: Error,
13
+ ) {
14
+ const insp = tryInspect(object);
15
+ super(`Object [${insp}] has already disposed ${getErrorFrame(previous, 2)}.`);
16
+
17
+ this.inspectString = insp;
10
18
  this.name = 'Warning';
19
+
20
+ this.tryCreateConsoleWarning().catch(() => {});
21
+ }
22
+
23
+ public async tryCreateConsoleWarning() {
24
+ console.error('DisposedWarning: duplicate dispose.');
25
+ console.error(' * first dispose:\n%s', prettyFormatError(this.previous, false));
26
+ console.error(' * current dispose:\n%s', prettyFormatError(this, false));
27
+ console.error(' * Object: %s', this.inspectString);
11
28
  }
12
29
  }
13
30