@idlebox/common 1.3.27 → 1.3.28
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 +5 -1
- package/lib/cjs/error/known.cjs.map +1 -1
- package/lib/cjs/error/pretty.cjs +20 -7
- 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 +5 -1
- package/lib/esm/error/known.mjs.map +1 -1
- package/lib/esm/error/pretty.mjs +20 -7
- 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 +4 -0
- package/src/error/pretty.ts +22 -6
- 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
|
|
|
@@ -828,7 +832,7 @@ export declare interface IUniqueIdFactory<T> {
|
|
|
828
832
|
export declare const KnownError: typeof KnownErrorNode;
|
|
829
833
|
|
|
830
834
|
declare class KnownErrorNode extends Error {
|
|
831
|
-
constructor(message: string, consopt?:
|
|
835
|
+
constructor(message: string, consopt?: ErrorOptions_2);
|
|
832
836
|
static is(e: any): e is KnownErrorNode;
|
|
833
837
|
}
|
|
834
838
|
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/known.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,2CAA0C;
|
|
9
|
+
"mappings": ";;;AAAA,2CAA0C;AAM1C,MAAM,cAAe,SAAQ,KAAK;IACjC,YAAY,OAAe,EAAE,OAAsB;QAClD,MAAM,KAAK,GAAI,KAAa,CAAC,eAAe,CAAC;QAC5C,KAAa,CAAC,eAAe,GAAG,CAAC,CAAC;QACnC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvB,KAAa,CAAC,eAAe,GAAG,KAAK,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,cAAc,CAAC;IACpC,CAAC;CACD;AAED,MAAM,gBAAiB,SAAQ,KAAK;IACnC,YAAY,OAAe,EAAE,OAAsB;QAClD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,gBAAgB,CAAC;IACtC,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
|
@@ -68,7 +68,7 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
68
68
|
if (!e.stack) {
|
|
69
69
|
return red(e.message + '\n No stack trace');
|
|
70
70
|
}
|
|
71
|
-
const stackStr = e.stack.replace(/file
|
|
71
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
72
72
|
let first = stackStr.shift();
|
|
73
73
|
const stack = stackStr.map((line) => {
|
|
74
74
|
if (regNormal.test(line)) {
|
|
@@ -153,7 +153,9 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
153
153
|
if (fn) {
|
|
154
154
|
ret += fn;
|
|
155
155
|
}
|
|
156
|
-
if (file) {
|
|
156
|
+
if (file === '<anonymous>') {
|
|
157
|
+
}
|
|
158
|
+
else if (file) {
|
|
157
159
|
if (fn) {
|
|
158
160
|
ret += ' (';
|
|
159
161
|
}
|
|
@@ -179,15 +181,26 @@ function prettyFormatError(e, withMessage = true) {
|
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
exports.prettyFormatError = prettyFormatError;
|
|
184
|
+
let alert = false;
|
|
182
185
|
function formatFileLine(schema, file, row, col) {
|
|
183
186
|
let rel = file;
|
|
184
187
|
if (schema !== 'node:') {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
rel
|
|
188
|
+
try {
|
|
189
|
+
rel = (0, normalizePath_1.relativePath)(root, file);
|
|
190
|
+
if (rel.startsWith('..')) {
|
|
191
|
+
rel = file;
|
|
192
|
+
}
|
|
193
|
+
else if (!rel.startsWith('.')) {
|
|
194
|
+
rel = './' + rel;
|
|
195
|
+
}
|
|
188
196
|
}
|
|
189
|
-
|
|
190
|
-
|
|
197
|
+
catch (e) {
|
|
198
|
+
if (!alert) {
|
|
199
|
+
debugger;
|
|
200
|
+
alert = true;
|
|
201
|
+
console.error('pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m', root, file, e.stack);
|
|
202
|
+
}
|
|
203
|
+
rel = file;
|
|
191
204
|
}
|
|
192
205
|
}
|
|
193
206
|
return `${schema || ''}${rel}${row ? `:${row}` : ''}${col ? `:${col}` : ''}`;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/pretty.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "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
|
|
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
|
|
|
@@ -828,7 +832,7 @@ export declare interface IUniqueIdFactory<T> {
|
|
|
828
832
|
export declare const KnownError: typeof KnownErrorNode;
|
|
829
833
|
|
|
830
834
|
declare class KnownErrorNode extends Error {
|
|
831
|
-
constructor(message: string, consopt?:
|
|
835
|
+
constructor(message: string, consopt?: ErrorOptions_2);
|
|
832
836
|
static is(e: any): e is KnownErrorNode;
|
|
833
837
|
}
|
|
834
838
|
|
|
@@ -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,MAAM,cAAe,SAAQ,KAAK;IACjC,YAAY,OAAe,EAAE,OAAsB;QAClD,MAAM,KAAK,GAAI,KAAa,CAAC,eAAe,CAAC;QAC5C,KAAa,CAAC,eAAe,GAAG,CAAC,CAAC;QACnC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvB,KAAa,CAAC,eAAe,GAAG,KAAK,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,cAAc,CAAC;IACpC,CAAC;CACD;AAED,MAAM,gBAAiB,SAAQ,KAAK;IACnC,YAAY,OAAe,EAAE,OAAsB;QAClD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,CAAM;QACf,OAAO,CAAC,YAAY,gBAAgB,CAAC;IACtC,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
|
@@ -63,7 +63,7 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
63
63
|
if (!e.stack) {
|
|
64
64
|
return red(e.message + '\n No stack trace');
|
|
65
65
|
}
|
|
66
|
-
const stackStr = e.stack.replace(/file
|
|
66
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
67
67
|
let first = stackStr.shift();
|
|
68
68
|
const stack = stackStr.map((line) => {
|
|
69
69
|
if (regNormal.test(line)) {
|
|
@@ -148,7 +148,9 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
148
148
|
if (fn) {
|
|
149
149
|
ret += fn;
|
|
150
150
|
}
|
|
151
|
-
if (file) {
|
|
151
|
+
if (file === '<anonymous>') {
|
|
152
|
+
}
|
|
153
|
+
else if (file) {
|
|
152
154
|
if (fn) {
|
|
153
155
|
ret += ' (';
|
|
154
156
|
}
|
|
@@ -173,15 +175,26 @@ export function prettyFormatError(e, withMessage = true) {
|
|
|
173
175
|
return stackOutput.join('\n');
|
|
174
176
|
}
|
|
175
177
|
}
|
|
178
|
+
let alert = false;
|
|
176
179
|
function formatFileLine(schema, file, row, col) {
|
|
177
180
|
let rel = file;
|
|
178
181
|
if (schema !== 'node:') {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
rel
|
|
182
|
+
try {
|
|
183
|
+
rel = relativePath(root, file);
|
|
184
|
+
if (rel.startsWith('..')) {
|
|
185
|
+
rel = file;
|
|
186
|
+
}
|
|
187
|
+
else if (!rel.startsWith('.')) {
|
|
188
|
+
rel = './' + rel;
|
|
189
|
+
}
|
|
182
190
|
}
|
|
183
|
-
|
|
184
|
-
|
|
191
|
+
catch (e) {
|
|
192
|
+
if (!alert) {
|
|
193
|
+
debugger;
|
|
194
|
+
alert = true;
|
|
195
|
+
console.error('pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m', root, file, e.stack);
|
|
196
|
+
}
|
|
197
|
+
rel = file;
|
|
185
198
|
}
|
|
186
199
|
}
|
|
187
200
|
return `${schema || ''}${rel}${row ? `:${row}` : ''}${col ? `:${col}` : ''}`;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/error/pretty.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "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
|
|
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
package/src/error/pretty.ts
CHANGED
|
@@ -85,7 +85,7 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
85
85
|
if (!e.stack) {
|
|
86
86
|
return red(e.message + '\n No stack trace');
|
|
87
87
|
}
|
|
88
|
-
const stackStr = e.stack.replace(/file
|
|
88
|
+
const stackStr = e.stack.replace(/(file|http|https):\/\//gi, '').split(/\n/g);
|
|
89
89
|
|
|
90
90
|
let first = stackStr.shift()!;
|
|
91
91
|
const stack: IInternalData[] = stackStr.map((line) => {
|
|
@@ -166,7 +166,8 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
166
166
|
if (fn) {
|
|
167
167
|
ret += fn;
|
|
168
168
|
}
|
|
169
|
-
if (file) {
|
|
169
|
+
if (file === '<anonymous>') {
|
|
170
|
+
} else if (file) {
|
|
170
171
|
if (fn) {
|
|
171
172
|
ret += ' (';
|
|
172
173
|
}
|
|
@@ -193,15 +194,30 @@ export function prettyFormatError(e: Error, withMessage = true) {
|
|
|
193
194
|
}
|
|
194
195
|
}
|
|
195
196
|
|
|
197
|
+
let alert = false;
|
|
196
198
|
function formatFileLine(schema: string | undefined, file: string, row?: number, col?: number) {
|
|
197
199
|
let rel = file;
|
|
198
200
|
|
|
199
201
|
if (schema !== 'node:') {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
+
try {
|
|
203
|
+
rel = relativePath(root, file);
|
|
204
|
+
if (rel.startsWith('..')) {
|
|
205
|
+
rel = file;
|
|
206
|
+
} else if (!rel.startsWith('.')) {
|
|
207
|
+
rel = './' + rel;
|
|
208
|
+
}
|
|
209
|
+
} catch (e: any) {
|
|
210
|
+
if (!alert) {
|
|
211
|
+
debugger;
|
|
212
|
+
alert = true;
|
|
213
|
+
console.error(
|
|
214
|
+
'pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m',
|
|
215
|
+
root,
|
|
216
|
+
file,
|
|
217
|
+
e.stack,
|
|
218
|
+
);
|
|
219
|
+
}
|
|
202
220
|
rel = file;
|
|
203
|
-
} else if (!rel.startsWith('.')) {
|
|
204
|
-
rel = './' + rel;
|
|
205
221
|
}
|
|
206
222
|
}
|
|
207
223
|
|
|
@@ -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;
|