topkat-utils 1.2.45 → 1.2.46
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ErrorOptions } from
|
|
1
|
+
import { ErrorOptions } from './types';
|
|
2
2
|
export { type ErrorOptions } from './types';
|
|
3
3
|
export declare function errIfNotSet(objOfVarNamesWithValues: any): void;
|
|
4
4
|
export declare function err500IfNotSet(objOfVarNamesWithValues: any): void;
|
package/dist/src/error-utils.js
CHANGED
|
@@ -29,8 +29,8 @@ exports.errIfEmptyOrNotSet = errIfEmptyOrNotSet;
|
|
|
29
29
|
function err500IfEmptyOrNotSet(objOfVarNamesWithValues) { return errXXXIfNotSet(500, true, objOfVarNamesWithValues); }
|
|
30
30
|
exports.err500IfEmptyOrNotSet = err500IfEmptyOrNotSet;
|
|
31
31
|
function errXXXIfNotSet(errCode, checkEmpty, objOfVarNamesWithValues) {
|
|
32
|
-
|
|
33
|
-
for (
|
|
32
|
+
const missingVars = [];
|
|
33
|
+
for (const prop in objOfVarNamesWithValues) {
|
|
34
34
|
if (!(0, isset_1.isset)(objOfVarNamesWithValues[prop]) || (checkEmpty && (0, is_empty_1.isEmpty)(objOfVarNamesWithValues[prop])))
|
|
35
35
|
missingVars.push(prop);
|
|
36
36
|
}
|
|
@@ -39,8 +39,8 @@ function errXXXIfNotSet(errCode, checkEmpty, objOfVarNamesWithValues) {
|
|
|
39
39
|
}
|
|
40
40
|
exports.errXXXIfNotSet = errXXXIfNotSet;
|
|
41
41
|
function err422IfNotSet(o) {
|
|
42
|
-
|
|
43
|
-
for (
|
|
42
|
+
const m = [];
|
|
43
|
+
for (const p in o)
|
|
44
44
|
if (!(0, isset_1.isset)(o[p]))
|
|
45
45
|
m.push(p);
|
|
46
46
|
if (m.length)
|
|
@@ -96,7 +96,7 @@ class DescriptiveError extends Error {
|
|
|
96
96
|
}
|
|
97
97
|
parseError(forCli = false) {
|
|
98
98
|
const errorLogs = [];
|
|
99
|
-
const _a = this.options, { err,
|
|
99
|
+
const _a = this.options, { err, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault } = _a, extraInfosRaw = __rest(_a, ["err", "noStackTrace", "ressource", "extraInfosRenderer"]);
|
|
100
100
|
let { code } = this.options;
|
|
101
101
|
const extraInfos = Object.assign(Object.assign({}, extraInfosRaw), (this.options.extraInfos || {}));
|
|
102
102
|
this.code = code || 500;
|
|
@@ -150,7 +150,7 @@ class DescriptiveError extends Error {
|
|
|
150
150
|
}
|
|
151
151
|
log() {
|
|
152
152
|
if (!this.hasBeenLogged)
|
|
153
|
-
|
|
153
|
+
logger_utils_1.C.error(false, this.logs.join('\n'));
|
|
154
154
|
this.hasBeenLogged = true;
|
|
155
155
|
}
|
|
156
156
|
toString() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/error-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,cAAc;AACd,0CAA0C;AAC1C,qCAAmC;AACnC,mCAA+B;AAC/B,yCAAoC;AAEpC,2DAAqD;AACrD,iDAAkC;AAGlC,SAAgB,WAAW,CAAC,uBAAuB,IAAI,OAAO,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAAA,CAAC,CAAC;AAAnH,kCAAmH;AAEnH,SAAgB,cAAc,CAAC,uBAAuB,IAAI,OAAO,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAAA,CAAC,CAAC;AAAtH,wCAAsH;AAEtH,SAAgB,kBAAkB,CAAC,uBAAuB,IAAI,OAAO,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAA,CAAC,CAAC;AAAzH,gDAAyH;AAEzH,SAAgB,qBAAqB,CAAC,uBAAuB,IAAI,OAAO,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAA,CAAC,CAAC;AAA5H,sDAA4H;AAE5H,SAAgB,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,uBAAuB;IACvE,
|
|
1
|
+
{"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/error-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/error-utils.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
//----------------------------------------
|
|
2
2
|
// ERROR UTILS
|
|
3
3
|
//----------------------------------------
|
|
4
|
-
import { configFn } from
|
|
5
|
-
import { isset } from
|
|
6
|
-
import { isEmpty } from
|
|
7
|
-
import { ErrorOptions } from
|
|
8
|
-
import { cleanStackTrace } from
|
|
9
|
-
import { C } from
|
|
4
|
+
import { configFn } from './config'
|
|
5
|
+
import { isset } from './isset'
|
|
6
|
+
import { isEmpty } from './is-empty'
|
|
7
|
+
import { ErrorOptions } from './types'
|
|
8
|
+
import { cleanStackTrace } from './clean-stack-trace'
|
|
9
|
+
import { C } from './logger-utils'
|
|
10
10
|
export { type ErrorOptions } from './types'
|
|
11
11
|
|
|
12
12
|
export function errIfNotSet(objOfVarNamesWithValues) { return errXXXIfNotSet(422, false, objOfVarNamesWithValues) }
|
|
@@ -18,8 +18,8 @@ export function errIfEmptyOrNotSet(objOfVarNamesWithValues) { return errXXXIfNot
|
|
|
18
18
|
export function err500IfEmptyOrNotSet(objOfVarNamesWithValues) { return errXXXIfNotSet(500, true, objOfVarNamesWithValues) }
|
|
19
19
|
|
|
20
20
|
export function errXXXIfNotSet(errCode, checkEmpty, objOfVarNamesWithValues) {
|
|
21
|
-
|
|
22
|
-
for (
|
|
21
|
+
const missingVars: string[] = []
|
|
22
|
+
for (const prop in objOfVarNamesWithValues) {
|
|
23
23
|
if (!isset(objOfVarNamesWithValues[prop]) || (checkEmpty && isEmpty(objOfVarNamesWithValues[prop]))) missingVars.push(prop)
|
|
24
24
|
}
|
|
25
25
|
if (missingVars.length) throw new DescriptiveError(`requiredVariableEmptyOrNotSet`, { code: errCode, origin: 'Validator', varNames: missingVars.join(', ') })
|
|
@@ -27,13 +27,13 @@ export function errXXXIfNotSet(errCode, checkEmpty, objOfVarNamesWithValues) {
|
|
|
27
27
|
|
|
28
28
|
|
|
29
29
|
export function err422IfNotSet(o) {
|
|
30
|
-
|
|
31
|
-
for (
|
|
30
|
+
const m: any[] = []
|
|
31
|
+
for (const p in o) if (!isset(o[p])) m.push(p)
|
|
32
32
|
if (m.length) throw new DescriptiveError(`requiredVariableEmptyOrNotSet`, { code: 422, origin: 'Validator', varNames: m.join(', ') })
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/** Works natively with sync AND async functions */
|
|
36
|
-
export function tryCatch<T>(callback: () => T, onErr: Function = () => { }): T {
|
|
36
|
+
export function tryCatch<T>(callback: () => T, onErr: Function = () => { /** */ }): T {
|
|
37
37
|
try {
|
|
38
38
|
const result = callback()
|
|
39
39
|
if (result instanceof Promise) return result.catch(e => onErr(e)) as T
|
|
@@ -57,7 +57,7 @@ export class DescriptiveError extends Error {
|
|
|
57
57
|
code?: number
|
|
58
58
|
msg: string
|
|
59
59
|
options: ErrorOptions
|
|
60
|
-
hasBeenLogged
|
|
60
|
+
hasBeenLogged = false
|
|
61
61
|
logs: string[] = []
|
|
62
62
|
|
|
63
63
|
constructor(msg: string, options: ErrorOptions = {}) {
|
|
@@ -78,7 +78,7 @@ export class DescriptiveError extends Error {
|
|
|
78
78
|
if (!this.hasBeenLogged) this.log()
|
|
79
79
|
})
|
|
80
80
|
|
|
81
|
-
const { onError = () => { } } = configFn()
|
|
81
|
+
const { onError = () => { /** */ } } = configFn()
|
|
82
82
|
onError(msg, options)
|
|
83
83
|
|
|
84
84
|
}
|
|
@@ -86,7 +86,7 @@ export class DescriptiveError extends Error {
|
|
|
86
86
|
|
|
87
87
|
const errorLogs: string[] = []
|
|
88
88
|
|
|
89
|
-
const { err,
|
|
89
|
+
const { err, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault, ...extraInfosRaw } = this.options
|
|
90
90
|
let { code } = this.options
|
|
91
91
|
const extraInfos = {
|
|
92
92
|
...extraInfosRaw,
|
|
@@ -146,7 +146,7 @@ export class DescriptiveError extends Error {
|
|
|
146
146
|
return errorLogs
|
|
147
147
|
}
|
|
148
148
|
log() {
|
|
149
|
-
if (!this.hasBeenLogged)
|
|
149
|
+
if (!this.hasBeenLogged) C.error(false, this.logs.join('\n'))
|
|
150
150
|
this.hasBeenLogged = true
|
|
151
151
|
}
|
|
152
152
|
toString() {
|