@idlebox/common 1.3.27 → 1.3.29
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.
- package/lib/cjs/__create_index.generated.d.cts +12 -3
- package/lib/cjs/error/known.cjs +23 -12
- package/lib/cjs/error/known.cjs.map +1 -1
- package/lib/cjs/error/pretty.cjs +22 -8
- package/lib/cjs/error/pretty.cjs.map +1 -1
- package/lib/cjs/path/normalizePath.cjs +1 -1
- package/lib/cjs/path/normalizePath.cjs.map +1 -1
- package/lib/esm/__create_index.generated.d.mts +12 -3
- package/lib/esm/error/known.mjs +23 -12
- package/lib/esm/error/known.mjs.map +1 -1
- package/lib/esm/error/pretty.mjs +22 -8
- package/lib/esm/error/pretty.mjs.map +1 -1
- package/lib/esm/path/normalizePath.mjs +1 -1
- package/lib/esm/path/normalizePath.mjs.map +1 -1
- package/package.json +1 -1
- package/src/error/known.ts +27 -14
- package/src/error/pretty.ts +24 -7
- package/src/path/normalizePath.ts +2 -2
|
@@ -432,6 +432,10 @@ export declare function ensureDisposeGlobal(): Promise<void>;
|
|
|
432
432
|
|
|
433
433
|
export declare function ensureGlobalObject<T>(symbol: string, constructor: () => T): T;
|
|
434
434
|
|
|
435
|
+
declare interface ErrorOptions_2 {
|
|
436
|
+
cause?: unknown;
|
|
437
|
+
}
|
|
438
|
+
|
|
435
439
|
/** @public */
|
|
436
440
|
export declare function escapeRegExp(str: string): string;
|
|
437
441
|
|
|
@@ -827,9 +831,14 @@ export declare interface IUniqueIdFactory<T> {
|
|
|
827
831
|
|
|
828
832
|
export declare const KnownError: typeof KnownErrorNode;
|
|
829
833
|
|
|
830
|
-
declare class
|
|
831
|
-
|
|
832
|
-
static
|
|
834
|
+
declare abstract class KnownErrorAbstract extends Error {
|
|
835
|
+
protected static debugMode: boolean;
|
|
836
|
+
static debug(enabled?: boolean): void;
|
|
837
|
+
static is(e: any): e is KnownErrorAbstract;
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
declare class KnownErrorNode extends KnownErrorAbstract {
|
|
841
|
+
constructor(message: string, consopt?: ErrorOptions_2);
|
|
833
842
|
}
|
|
834
843
|
|
|
835
844
|
/**
|
package/lib/cjs/error/known.cjs
CHANGED
|
@@ -2,24 +2,35 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.KnownError = void 0;
|
|
4
4
|
const os_1 = require("../platform/os.cjs");
|
|
5
|
-
class
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
super(message, consopt);
|
|
10
|
-
Error.stackTraceLimit = limit;
|
|
5
|
+
class KnownErrorAbstract extends Error {
|
|
6
|
+
static debugMode = false;
|
|
7
|
+
static debug(enabled = true) {
|
|
8
|
+
KnownErrorAbstract.debugMode = enabled;
|
|
11
9
|
}
|
|
12
10
|
static is(e) {
|
|
13
|
-
return e instanceof
|
|
11
|
+
return e instanceof KnownErrorAbstract;
|
|
14
12
|
}
|
|
15
13
|
}
|
|
16
|
-
class
|
|
14
|
+
class KnownErrorNode extends KnownErrorAbstract {
|
|
17
15
|
constructor(message, consopt) {
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
if (KnownErrorAbstract.debugMode) {
|
|
17
|
+
super(message, consopt);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
const limit = Error.stackTraceLimit;
|
|
21
|
+
Error.stackTraceLimit = 0;
|
|
22
|
+
super(message, consopt);
|
|
23
|
+
Error.stackTraceLimit = limit;
|
|
24
|
+
this.stack = message;
|
|
25
|
+
}
|
|
20
26
|
}
|
|
21
|
-
|
|
22
|
-
|
|
27
|
+
}
|
|
28
|
+
class KnownErrorCommon extends KnownErrorAbstract {
|
|
29
|
+
constructor(message, consopt) {
|
|
30
|
+
super(message, consopt);
|
|
31
|
+
if (!KnownErrorAbstract.debugMode) {
|
|
32
|
+
this.stack = message;
|
|
33
|
+
}
|
|
23
34
|
}
|
|
24
35
|
}
|
|
25
36
|
exports.KnownError = os_1.isNative ? KnownErrorNode : KnownErrorCommon;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/known.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,2CAA0C;
|
|
9
|
+
"mappings": ";;;AAAA,2CAA0C;AAM1C,MAAe,kBAAmB,SAAQ,KAAK;IACpC,MAAM,CAAC,SAAS,GAAY,KAAK,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,UAAmB,IAAI;QACnC,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAC;IACxC,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,kBAAkB,CAAC;IACxC,CAAC;;AAGF,MAAM,cAAe,SAAQ,kBAAkB;IAC9C,YAAY,OAAe,EAAE,OAAsB;QAClD,IAAI,kBAAkB,CAAC,SAAS,EAAE;YACjC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACxB;aAAM;YACN,MAAM,KAAK,GAAI,KAAa,CAAC,eAAe,CAAC;YAC5C,KAAa,CAAC,eAAe,GAAG,CAAC,CAAC;YACnC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvB,KAAa,CAAC,eAAe,GAAG,KAAK,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;SACrB;IACF,CAAC;CACD;AAED,MAAM,gBAAiB,SAAQ,kBAAkB;IAChD,YAAY,OAAe,EAAE,OAAsB;QAClD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;YAClC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;SACrB;IACF,CAAC;CACD;AAEY,QAAA,UAAU,GAAG,aAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC"
|
|
10
10
|
}
|
package/lib/cjs/error/pretty.cjs
CHANGED
|
@@ -51,7 +51,8 @@ function prettyPrintError(type, e) {
|
|
|
51
51
|
}
|
|
52
52
|
console.error(`------------------------------------------
|
|
53
53
|
[${type}] ${prettyFormatError(e)}`);
|
|
54
|
-
if (!notify_printed) {
|
|
54
|
+
if (!notify_printed && e.stack && e.message !== e.stack) {
|
|
55
|
+
// console.log(JSON.stringify(e.stack), JSON.stringify(e.message));
|
|
55
56
|
notify_printed = true;
|
|
56
57
|
console.error('\x1B[2muse env.DISABLE_PRETTY_ERROR=yes to see original error stack\x1B[0m');
|
|
57
58
|
}
|
|
@@ -68,7 +69,7 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
68
69
|
if (!e.stack) {
|
|
69
70
|
return red(e.message + '\n No stack trace');
|
|
70
71
|
}
|
|
71
|
-
const stackStr = e.stack.replace(/file
|
|
72
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
72
73
|
let first = stackStr.shift();
|
|
73
74
|
const stack = stackStr.map((line) => {
|
|
74
75
|
if (regNormal.test(line)) {
|
|
@@ -153,7 +154,9 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
153
154
|
if (fn) {
|
|
154
155
|
ret += fn;
|
|
155
156
|
}
|
|
156
|
-
if (file) {
|
|
157
|
+
if (file === '<anonymous>') {
|
|
158
|
+
}
|
|
159
|
+
else if (file) {
|
|
157
160
|
if (fn) {
|
|
158
161
|
ret += ' (';
|
|
159
162
|
}
|
|
@@ -179,15 +182,26 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
179
182
|
}
|
|
180
183
|
}
|
|
181
184
|
exports.prettyFormatError = prettyFormatError;
|
|
185
|
+
let alert = false;
|
|
182
186
|
function formatFileLine(schema, file, row, col) {
|
|
183
187
|
let rel = file;
|
|
184
188
|
if (schema !== 'node:') {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
rel
|
|
189
|
+
try {
|
|
190
|
+
rel = (0, normalizePath_1.relativePath)(root, file);
|
|
191
|
+
if (rel.startsWith('..')) {
|
|
192
|
+
rel = file;
|
|
193
|
+
}
|
|
194
|
+
else if (!rel.startsWith('.')) {
|
|
195
|
+
rel = './' + rel;
|
|
196
|
+
}
|
|
188
197
|
}
|
|
189
|
-
|
|
190
|
-
|
|
198
|
+
catch (e) {
|
|
199
|
+
if (!alert) {
|
|
200
|
+
debugger;
|
|
201
|
+
alert = true;
|
|
202
|
+
console.error('pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m', root, file, e.stack);
|
|
203
|
+
}
|
|
204
|
+
rel = file;
|
|
191
205
|
}
|
|
192
206
|
}
|
|
193
207
|
return `${schema || ''}${rel}${row ? `:${row}` : ''}${col ? `:${col}` : ''}`;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/pretty.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,uDAAgD;AAChD,6DAAqD;AACrD,+DAAwD;AACxD,2CAA0C;AAE1C,MAAM,SAAS,GAAG,qFAAqF,CAAC;AACxG,MAAM,OAAO,GAAG,2BAAY,CAAC,OAAO,CAAC;AACrC,MAAM,MAAM,GAAG,2BAAY,CAAC,MAAM,CAAC;AAEnC,IAAW,cAOV;AAPD,WAAW,cAAc;IACxB,+CAAM,CAAA;IACN,yDAAO,CAAA;IACP,+DAAU,CAAA;IACV,mDAAI,CAAA;IACJ,iDAAG,CAAA;IACH,uDAAM,CAAA;AACP,CAAC,EAPU,cAAc,KAAd,cAAc,QAOxB;AAED,MAAM,eAAe,GAAG,0CAA0C,CAAC;AAEnE,IAAW,gBAGV;AAHD,WAAW,gBAAgB;IAC1B,mDAAM,CAAA;IACN,6DAAO,CAAA;AACR,CAAC,EAHU,gBAAgB,KAAhB,gBAAgB,QAG1B;AAED,MAAM,WAAW,GAAG,8BAA8B,CAAC;AAEnD,IAAW,gBAIV;AAJD,WAAW,gBAAgB;IAC1B,uDAAQ,CAAA;IACR,qDAAG,CAAA;IACH,2DAAM,CAAA;AACP,CAAC,EAJU,gBAAgB,KAAhB,gBAAgB,QAI1B;AAED,MAAM,cAAc,GAAG,iCAAiC,CAAC;AAEzD,IAAW,mBAEV;AAFD,WAAW,mBAAmB;IAC7B,yDAAM,CAAA;AACP,CAAC,EAFU,mBAAmB,KAAnB,mBAAmB,QAE7B;AAED,IAAI,IAAI,GAAG,OAAO,EAAE,GAAG,EAAE,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAC;AAE7D,SAAgB,eAAe,CAAC,KAAa;IAC5C,IAAI,GAAG,KAAK,CAAC;AACd,CAAC;AAFD,0CAEC;AAaD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,SAAgB,gBAAgB,CAAC,IAAY,EAAE,CAAQ;IACtD,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE;QACtC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;KAChC;IAED,IAAI,2BAAY,CAAC,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO;KACP;IACD,OAAO,CAAC,KAAK,CAAC;GACZ,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnC,IAAI,CAAC,cAAc,EAAE;
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -107,7 +107,7 @@ function relativePath(from, to) {
|
|
|
107
107
|
const r1 = analyzePath(from);
|
|
108
108
|
const r2 = analyzePath(to);
|
|
109
109
|
if (r1.kind !== r2.kind)
|
|
110
|
-
throw new Error(`cannot relative path between different kind: "${PathKind[r1.kind]}::${
|
|
110
|
+
throw new Error(`cannot relative path between different kind: "${PathKind[r1.kind]}::${from}" * "${PathKind[r2.kind]}::${to}"`);
|
|
111
111
|
if (r1.prefix !== r2.prefix)
|
|
112
112
|
return to;
|
|
113
113
|
const p1arr = r1.path.split('/');
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/path/normalizePath.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "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
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -432,6 +432,10 @@ export declare function ensureDisposeGlobal(): Promise<void>;
|
|
|
432
432
|
|
|
433
433
|
export declare function ensureGlobalObject<T>(symbol: string, constructor: () => T): T;
|
|
434
434
|
|
|
435
|
+
declare interface ErrorOptions_2 {
|
|
436
|
+
cause?: unknown;
|
|
437
|
+
}
|
|
438
|
+
|
|
435
439
|
/** @public */
|
|
436
440
|
export declare function escapeRegExp(str: string): string;
|
|
437
441
|
|
|
@@ -827,9 +831,14 @@ export declare interface IUniqueIdFactory<T> {
|
|
|
827
831
|
|
|
828
832
|
export declare const KnownError: typeof KnownErrorNode;
|
|
829
833
|
|
|
830
|
-
declare class
|
|
831
|
-
|
|
832
|
-
static
|
|
834
|
+
declare abstract class KnownErrorAbstract extends Error {
|
|
835
|
+
protected static debugMode: boolean;
|
|
836
|
+
static debug(enabled?: boolean): void;
|
|
837
|
+
static is(e: any): e is KnownErrorAbstract;
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
declare class KnownErrorNode extends KnownErrorAbstract {
|
|
841
|
+
constructor(message: string, consopt?: ErrorOptions_2);
|
|
833
842
|
}
|
|
834
843
|
|
|
835
844
|
/**
|
package/lib/esm/error/known.mjs
CHANGED
|
@@ -1,22 +1,33 @@
|
|
|
1
1
|
import { isNative } from "../platform/os.mjs";
|
|
2
|
-
class
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
super(message, consopt);
|
|
7
|
-
Error.stackTraceLimit = limit;
|
|
2
|
+
class KnownErrorAbstract extends Error {
|
|
3
|
+
static debugMode = false;
|
|
4
|
+
static debug(enabled = true) {
|
|
5
|
+
KnownErrorAbstract.debugMode = enabled;
|
|
8
6
|
}
|
|
9
7
|
static is(e) {
|
|
10
|
-
return e instanceof
|
|
8
|
+
return e instanceof KnownErrorAbstract;
|
|
11
9
|
}
|
|
12
10
|
}
|
|
13
|
-
class
|
|
11
|
+
class KnownErrorNode extends KnownErrorAbstract {
|
|
14
12
|
constructor(message, consopt) {
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
if (KnownErrorAbstract.debugMode) {
|
|
14
|
+
super(message, consopt);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
const limit = Error.stackTraceLimit;
|
|
18
|
+
Error.stackTraceLimit = 0;
|
|
19
|
+
super(message, consopt);
|
|
20
|
+
Error.stackTraceLimit = limit;
|
|
21
|
+
this.stack = message;
|
|
22
|
+
}
|
|
17
23
|
}
|
|
18
|
-
|
|
19
|
-
|
|
24
|
+
}
|
|
25
|
+
class KnownErrorCommon extends KnownErrorAbstract {
|
|
26
|
+
constructor(message, consopt) {
|
|
27
|
+
super(message, consopt);
|
|
28
|
+
if (!KnownErrorAbstract.debugMode) {
|
|
29
|
+
this.stack = message;
|
|
30
|
+
}
|
|
20
31
|
}
|
|
21
32
|
}
|
|
22
33
|
export const KnownError = isNative ? KnownErrorNode : KnownErrorCommon;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/known.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAuB;
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAuB;AAM1C,MAAe,kBAAmB,SAAQ,KAAK;IACpC,MAAM,CAAC,SAAS,GAAY,KAAK,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,UAAmB,IAAI;QACnC,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAC;IACxC,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,kBAAkB,CAAC;IACxC,CAAC;;AAGF,MAAM,cAAe,SAAQ,kBAAkB;IAC9C,YAAY,OAAe,EAAE,OAAsB;QAClD,IAAI,kBAAkB,CAAC,SAAS,EAAE;YACjC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACxB;aAAM;YACN,MAAM,KAAK,GAAI,KAAa,CAAC,eAAe,CAAC;YAC5C,KAAa,CAAC,eAAe,GAAG,CAAC,CAAC;YACnC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvB,KAAa,CAAC,eAAe,GAAG,KAAK,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;SACrB;IACF,CAAC;CACD;AAED,MAAM,gBAAiB,SAAQ,kBAAkB;IAChD,YAAY,OAAe,EAAE,OAAsB;QAClD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;YAClC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;SACrB;IACF,CAAC;CACD;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC"
|
|
10
10
|
}
|
package/lib/esm/error/pretty.mjs
CHANGED
|
@@ -47,7 +47,8 @@ export function prettyPrintError(type, e) {
|
|
|
47
47
|
}
|
|
48
48
|
console.error(`------------------------------------------
|
|
49
49
|
[${type}] ${prettyFormatError(e)}`);
|
|
50
|
-
if (!notify_printed) {
|
|
50
|
+
if (!notify_printed && e.stack && e.message !== e.stack) {
|
|
51
|
+
// console.log(JSON.stringify(e.stack), JSON.stringify(e.message));
|
|
51
52
|
notify_printed = true;
|
|
52
53
|
console.error('\x1B[2muse env.DISABLE_PRETTY_ERROR=yes to see original error stack\x1B[0m');
|
|
53
54
|
}
|
|
@@ -63,7 +64,7 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
63
64
|
if (!e.stack) {
|
|
64
65
|
return red(e.message + '\n No stack trace');
|
|
65
66
|
}
|
|
66
|
-
const stackStr = e.stack.replace(/file
|
|
67
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
67
68
|
let first = stackStr.shift();
|
|
68
69
|
const stack = stackStr.map((line) => {
|
|
69
70
|
if (regNormal.test(line)) {
|
|
@@ -148,7 +149,9 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
148
149
|
if (fn) {
|
|
149
150
|
ret += fn;
|
|
150
151
|
}
|
|
151
|
-
if (file) {
|
|
152
|
+
if (file === '<anonymous>') {
|
|
153
|
+
}
|
|
154
|
+
else if (file) {
|
|
152
155
|
if (fn) {
|
|
153
156
|
ret += ' (';
|
|
154
157
|
}
|
|
@@ -173,15 +176,26 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
173
176
|
return stackOutput.join('\n');
|
|
174
177
|
}
|
|
175
178
|
}
|
|
179
|
+
let alert = false;
|
|
176
180
|
function formatFileLine(schema, file, row, col) {
|
|
177
181
|
let rel = file;
|
|
178
182
|
if (schema !== 'node:') {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
rel
|
|
183
|
+
try {
|
|
184
|
+
rel = relativePath(root, file);
|
|
185
|
+
if (rel.startsWith('..')) {
|
|
186
|
+
rel = file;
|
|
187
|
+
}
|
|
188
|
+
else if (!rel.startsWith('.')) {
|
|
189
|
+
rel = './' + rel;
|
|
190
|
+
}
|
|
182
191
|
}
|
|
183
|
-
|
|
184
|
-
|
|
192
|
+
catch (e) {
|
|
193
|
+
if (!alert) {
|
|
194
|
+
debugger;
|
|
195
|
+
alert = true;
|
|
196
|
+
console.error('pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m', root, file, e.stack);
|
|
197
|
+
}
|
|
198
|
+
rel = file;
|
|
185
199
|
}
|
|
186
200
|
}
|
|
187
201
|
return `${schema || ''}${rel}${row ? `:${row}` : ''}${col ? `:${col}` : ''}`;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/pretty.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,UAAU,EAAE,+BAA2B;AAChD,OAAO,EAAE,YAAY,EAAE,kCAA8B;AACrD,OAAO,EAAE,YAAY,EAAE,qCAAiC;AACxD,OAAO,EAAE,QAAQ,EAAE,2BAAuB;AAE1C,MAAM,SAAS,GAAG,qFAAqF,CAAC;AACxG,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;AACrC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;AAEnC,IAAW,cAOV;AAPD,WAAW,cAAc;IACxB,+CAAM,CAAA;IACN,yDAAO,CAAA;IACP,+DAAU,CAAA;IACV,mDAAI,CAAA;IACJ,iDAAG,CAAA;IACH,uDAAM,CAAA;AACP,CAAC,EAPU,cAAc,KAAd,cAAc,QAOxB;AAED,MAAM,eAAe,GAAG,0CAA0C,CAAC;AAEnE,IAAW,gBAGV;AAHD,WAAW,gBAAgB;IAC1B,mDAAM,CAAA;IACN,6DAAO,CAAA;AACR,CAAC,EAHU,gBAAgB,KAAhB,gBAAgB,QAG1B;AAED,MAAM,WAAW,GAAG,8BAA8B,CAAC;AAEnD,IAAW,gBAIV;AAJD,WAAW,gBAAgB;IAC1B,uDAAQ,CAAA;IACR,qDAAG,CAAA;IACH,2DAAM,CAAA;AACP,CAAC,EAJU,gBAAgB,KAAhB,gBAAgB,QAI1B;AAED,MAAM,cAAc,GAAG,iCAAiC,CAAC;AAEzD,IAAW,mBAEV;AAFD,WAAW,mBAAmB;IAC7B,yDAAM,CAAA;AACP,CAAC,EAFU,mBAAmB,KAAnB,mBAAmB,QAE7B;AAED,IAAI,IAAI,GAAG,OAAO,EAAE,GAAG,EAAE,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAC;AAE7D,MAAM,UAAU,eAAe,CAAC,KAAa;IAC5C,IAAI,GAAG,KAAK,CAAC;AACd,CAAC;AAaD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,CAAQ;IACtD,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE;QACtC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;KAChC;IAED,IAAI,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO;KACP;IACD,OAAO,CAAC,KAAK,CAAC;GACZ,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnC,IAAI,CAAC,cAAc,EAAE;
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -102,7 +102,7 @@ export function relativePath(from, to) {
|
|
|
102
102
|
const r1 = analyzePath(from);
|
|
103
103
|
const r2 = analyzePath(to);
|
|
104
104
|
if (r1.kind !== r2.kind)
|
|
105
|
-
throw new Error(`cannot relative path between different kind: "${PathKind[r1.kind]}::${
|
|
105
|
+
throw new Error(`cannot relative path between different kind: "${PathKind[r1.kind]}::${from}" * "${PathKind[r2.kind]}::${to}"`);
|
|
106
106
|
if (r1.prefix !== r2.prefix)
|
|
107
107
|
return to;
|
|
108
108
|
const p1arr = r1.path.split('/');
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/path/normalizePath.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "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
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
package/package.json
CHANGED
package/src/error/known.ts
CHANGED
|
@@ -1,26 +1,39 @@
|
|
|
1
1
|
import { isNative } from '../platform/os';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
(Error as any).stackTraceLimit = 0;
|
|
7
|
-
super(message, consopt);
|
|
8
|
-
(Error as any).stackTraceLimit = limit;
|
|
9
|
-
}
|
|
3
|
+
interface ErrorOptions {
|
|
4
|
+
cause?: unknown;
|
|
5
|
+
}
|
|
10
6
|
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
abstract class KnownErrorAbstract extends Error {
|
|
8
|
+
protected static debugMode: boolean = false;
|
|
9
|
+
static debug(enabled: boolean = true) {
|
|
10
|
+
KnownErrorAbstract.debugMode = enabled;
|
|
11
|
+
}
|
|
12
|
+
static is(e: any): e is KnownErrorAbstract {
|
|
13
|
+
return e instanceof KnownErrorAbstract;
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
|
|
16
|
-
class
|
|
17
|
+
class KnownErrorNode extends KnownErrorAbstract {
|
|
17
18
|
constructor(message: string, consopt?: ErrorOptions) {
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
if (KnownErrorAbstract.debugMode) {
|
|
20
|
+
super(message, consopt);
|
|
21
|
+
} else {
|
|
22
|
+
const limit = (Error as any).stackTraceLimit;
|
|
23
|
+
(Error as any).stackTraceLimit = 0;
|
|
24
|
+
super(message, consopt);
|
|
25
|
+
(Error as any).stackTraceLimit = limit;
|
|
26
|
+
this.stack = message;
|
|
27
|
+
}
|
|
20
28
|
}
|
|
29
|
+
}
|
|
21
30
|
|
|
22
|
-
|
|
23
|
-
|
|
31
|
+
class KnownErrorCommon extends KnownErrorAbstract {
|
|
32
|
+
constructor(message: string, consopt?: ErrorOptions) {
|
|
33
|
+
super(message, consopt);
|
|
34
|
+
if (!KnownErrorAbstract.debugMode) {
|
|
35
|
+
this.stack = message;
|
|
36
|
+
}
|
|
24
37
|
}
|
|
25
38
|
}
|
|
26
39
|
|
package/src/error/pretty.ts
CHANGED
|
@@ -67,7 +67,8 @@ export function prettyPrintError(type: string, e: Error) {
|
|
|
67
67
|
console.error(`------------------------------------------
|
|
68
68
|
[${type}] ${prettyFormatError(e)}`);
|
|
69
69
|
|
|
70
|
-
if (!notify_printed) {
|
|
70
|
+
if (!notify_printed && e.stack && e.message !== e.stack) {
|
|
71
|
+
// console.log(JSON.stringify(e.stack), JSON.stringify(e.message));
|
|
71
72
|
notify_printed = true;
|
|
72
73
|
console.error('\x1B[2muse env.DISABLE_PRETTY_ERROR=yes to see original error stack\x1B[0m');
|
|
73
74
|
}
|
|
@@ -85,7 +86,7 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
85
86
|
if (!e.stack) {
|
|
86
87
|
return red(e.message + '\n No stack trace');
|
|
87
88
|
}
|
|
88
|
-
const stackStr = e.stack.replace(/file
|
|
89
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
89
90
|
|
|
90
91
|
let first = stackStr.shift()!;
|
|
91
92
|
const stack: IInternalData[] = stackStr.map((line) => {
|
|
@@ -166,7 +167,8 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
166
167
|
if (fn) {
|
|
167
168
|
ret += fn;
|
|
168
169
|
}
|
|
169
|
-
if (file) {
|
|
170
|
+
if (file === '<anonymous>') {
|
|
171
|
+
} else if (file) {
|
|
170
172
|
if (fn) {
|
|
171
173
|
ret += ' (';
|
|
172
174
|
}
|
|
@@ -193,15 +195,30 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
193
195
|
}
|
|
194
196
|
}
|
|
195
197
|
|
|
198
|
+
let alert = false;
|
|
196
199
|
function formatFileLine(schema: string | undefined, file: string, row?: number, col?: number) {
|
|
197
200
|
let rel = file;
|
|
198
201
|
|
|
199
202
|
if (schema !== 'node:') {
|
|
200
|
-
|
|
201
|
-
|
|
203
|
+
try {
|
|
204
|
+
rel = relativePath(root, file);
|
|
205
|
+
if (rel.startsWith('..')) {
|
|
206
|
+
rel = file;
|
|
207
|
+
} else if (!rel.startsWith('.')) {
|
|
208
|
+
rel = './' + rel;
|
|
209
|
+
}
|
|
210
|
+
} catch (e: any) {
|
|
211
|
+
if (!alert) {
|
|
212
|
+
debugger;
|
|
213
|
+
alert = true;
|
|
214
|
+
console.error(
|
|
215
|
+
'pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m',
|
|
216
|
+
root,
|
|
217
|
+
file,
|
|
218
|
+
e.stack,
|
|
219
|
+
);
|
|
220
|
+
}
|
|
202
221
|
rel = file;
|
|
203
|
-
} else if (!rel.startsWith('.')) {
|
|
204
|
-
rel = './' + rel;
|
|
205
222
|
}
|
|
206
223
|
}
|
|
207
224
|
|
|
@@ -108,9 +108,9 @@ export function relativePath(from: string, to: string) {
|
|
|
108
108
|
const r2 = analyzePath(to);
|
|
109
109
|
if (r1.kind !== r2.kind)
|
|
110
110
|
throw new Error(
|
|
111
|
-
`cannot relative path between different kind: "${PathKind[r1.kind]}::${
|
|
111
|
+
`cannot relative path between different kind: "${PathKind[r1.kind]}::${from}" * "${
|
|
112
112
|
PathKind[r2.kind]
|
|
113
|
-
}::${
|
|
113
|
+
}::${to}"`,
|
|
114
114
|
);
|
|
115
115
|
|
|
116
116
|
if (r1.prefix !== r2.prefix) return to;
|