topkat-utils 1.2.16 → 1.2.17

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 (8) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/dist/src/error-utils.d.ts +3 -2
  3. package/dist/src/error-utils.js +49 -47
  4. package/dist/src/error-utils.js.map +1 -1
  5. package/dist/src/types.d.ts +1 -1
  6. package/package.json +1 -1
  7. package/src/error-utils.ts +45 -42
  8. package/src/types.ts +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ### v1.2.17
2
+ * added a relevant toString method to DescriptiveError class
3
+ * improved error logging
4
+
1
5
  ### v1.2.16
2
6
  * ADD onError to config for custom error handling
3
7
  * improve logging
package/dist/src/error-utils.d.ts CHANGED
@@ -16,6 +16,7 @@ export declare class DescriptiveError extends Error {
16
16
  options: ErrorOptions;
17
17
  hasBeenLogged: boolean;
18
18
  constructor(msg: string, options?: ErrorOptions);
19
- log(doNotCountHasLogged?: boolean): void;
20
- toString(): void;
19
+ parseError(forCli?: boolean): string[];
20
+ log(): void;
21
+ toString(): string;
21
22
  }
package/dist/src/error-utils.js CHANGED
@@ -57,8 +57,10 @@ async function tryCatch(callback, onErr = () => { }) {
57
57
  }
58
58
  exports.tryCatch = tryCatch;
59
59
  function extraInfosRendererDefault(extraInfos) {
60
- logger_utils_1.C.error(false, '== EXTRA INFOS ==');
61
- logger_utils_1.C.error(false, JSON.stringify(extraInfos, null, 2));
60
+ return [
61
+ '== EXTRA INFOS ==',
62
+ JSON.stringify(extraInfos, null, 2)
63
+ ];
62
64
  }
63
65
  class DescriptiveError extends Error {
64
66
  constructor(msg, options = {}) {
@@ -80,58 +82,58 @@ class DescriptiveError extends Error {
80
82
  const { onError = () => { } } = (0, config_1.configFn)();
81
83
  onError(msg, options);
82
84
  }
83
- log(doNotCountHasLogged = false) {
84
- if (!this.hasBeenLogged) {
85
- const _a = this.options, { err, doNotThrow = false, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault, notifyOnSlackChannel = false, originalMessage } = _a, extraInfosRaw = __rest(_a, ["err", "doNotThrow", "noStackTrace", "ressource", "extraInfosRenderer", "notifyOnSlackChannel", "originalMessage"]);
86
- let { code } = this.options;
87
- const extraInfos = Object.assign(Object.assign({}, extraInfosRaw), (this.options.extraInfos || {}));
88
- if (!(0, isset_1.isset)(extraInfos.value) && this.options.hasOwnProperty('value'))
89
- extraInfos.value = 'undefined';
90
- if (!(0, isset_1.isset)(extraInfos.gotValue) && this.options.hasOwnProperty('gotValue'))
91
- extraInfos.gotValue = 'undefined';
92
- if ((0, isset_1.isset)(ressource)) {
93
- code = 404;
94
- if (this.msg === '404')
95
- this.msg = `Ressource ${ressource} not found`;
96
- extraInfos.ressource = ressource;
97
- }
98
- logger_utils_1.C.error(false, this.msg || this.message);
99
- if (Object.keys(extraInfos).length > 0)
100
- extraInfosRenderer(extraInfos);
101
- if (err) {
102
- logger_utils_1.C.error(false, '== ORIGINAL ERROR ==');
103
- if (err.log) {
104
- err.hasBeenLogged = false;
105
- err.log();
106
- }
107
- else {
108
- logErr(noStackTrace, err);
109
- if (err.extraInfos)
110
- logErr(noStackTrace, err.extraInfos);
111
- }
85
+ parseError(forCli = false) {
86
+ const errorLogs = [];
87
+ const _a = this.options, { err, doNotThrow = false, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault, notifyOnSlackChannel = false, originalMessage } = _a, extraInfosRaw = __rest(_a, ["err", "doNotThrow", "noStackTrace", "ressource", "extraInfosRenderer", "notifyOnSlackChannel", "originalMessage"]);
88
+ let { code } = this.options;
89
+ const extraInfos = Object.assign(Object.assign({}, extraInfosRaw), (this.options.extraInfos || {}));
90
+ this.code = code || 500;
91
+ if (this.options.doNotDisplayCode || (this.options.hasOwnProperty('code') && !(0, isset_1.isset)(this.options.code)))
92
+ delete this.code;
93
+ if (!(0, isset_1.isset)(extraInfos.value) && this.options.hasOwnProperty('value'))
94
+ extraInfos.value = 'undefined';
95
+ if (!(0, isset_1.isset)(extraInfos.gotValue) && this.options.hasOwnProperty('gotValue'))
96
+ extraInfos.gotValue = 'undefined';
97
+ if ((0, isset_1.isset)(ressource)) {
98
+ code = 404;
99
+ if (this.msg === '404')
100
+ this.msg = `Ressource ${ressource} not found`;
101
+ extraInfos.ressource = ressource;
102
+ }
103
+ errorLogs.push(this.msg || this.message);
104
+ if (Object.keys(extraInfos).length > 0)
105
+ extraInfosRenderer(extraInfos);
106
+ if (err) {
107
+ errorLogs.push('== ORIGINAL ERROR ==');
108
+ if (typeof err.parseError === 'function') {
109
+ err.hasBeenLogged = false;
110
+ const logFromOtherErr = err.parseError(forCli);
111
+ errorLogs.push(...logFromOtherErr);
112
112
  }
113
113
  else {
114
- if (!noStackTrace)
115
- logger_utils_1.C.error(false, logger_utils_1.C.dim((0, clean_stack_trace_1.cleanStackTrace)(extraInfosRaw.stack || this.stack)));
114
+ errorLogs.push(err.toString());
115
+ if (!noStackTrace && err.stack)
116
+ errorLogs.push(err.stack);
117
+ if (err.extraInfos)
118
+ errorLogs.push(err.extraInfos);
119
+ }
120
+ }
121
+ else {
122
+ if (!noStackTrace) {
123
+ const stackTranceClean = (0, clean_stack_trace_1.cleanStackTrace)(extraInfosRaw.stack || this.stack);
124
+ errorLogs.push(forCli ? logger_utils_1.C.dim(stackTranceClean) : stackTranceClean);
116
125
  }
117
- this.code = code || 500;
118
- if (this.options.doNotDisplayCode || (this.options.hasOwnProperty('code') && !(0, isset_1.isset)(this.options.code)))
119
- delete this.code;
120
- this.errorDescription = Object.assign({ msg: this.msg, code,
121
- ressource }, extraInfos);
122
126
  }
123
- if (!doNotCountHasLogged)
124
- this.hasBeenLogged = true;
127
+ return errorLogs;
128
+ }
129
+ log() {
130
+ if (!this.hasBeenLogged)
131
+ this.parseError().forEach(errLine => logger_utils_1.C.error(false, errLine));
132
+ this.hasBeenLogged = true;
125
133
  }
126
134
  toString() {
127
- return this.log(true);
135
+ return this.parseError().join('\n');
128
136
  }
129
137
  }
130
138
  exports.DescriptiveError = DescriptiveError;
131
- function logErr(noStackTrace, ...params) {
132
- if (noStackTrace)
133
- logger_utils_1.C.error(false, ...params);
134
- else
135
- logger_utils_1.C.error(...params);
136
- }
137
139
  //# sourceMappingURL=error-utils.js.map
package/dist/src/error-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/error-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/error-utils.ts"],"names":[],"mappings":"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"}
package/dist/src/types.d.ts CHANGED
@@ -9,7 +9,7 @@ export declare type ErrorOptions = {
9
9
  code?: number;
10
10
  doNotDisplayCode?: boolean;
11
11
  notifyOnSlackChannel?: boolean;
12
- extraInfosRenderer?: (extraInfosObj: ObjectGeneric) => void;
12
+ extraInfosRenderer?: (extraInfosObj: ObjectGeneric) => string[];
13
13
  doNotWaitOneFrameForLog?: boolean;
14
14
  noStackTrace?: boolean;
15
15
  [k: string]: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "topkat-utils",
3
- "version": "1.2.16",
3
+ "version": "1.2.17",
4
4
  "type": "commonjs",
5
5
  "types": "index.ts",
6
6
  "main": "dist",
package/src/error-utils.ts CHANGED
@@ -44,8 +44,10 @@ export async function tryCatch(callback: Function, onErr: Function = () => { })
44
44
 
45
45
 
46
46
  function extraInfosRendererDefault(extraInfos) {
47
- C.error(false, '== EXTRA INFOS ==')
48
- C.error(false, JSON.stringify(extraInfos, null, 2))
47
+ return [
48
+ '== EXTRA INFOS ==',
49
+ JSON.stringify(extraInfos, null, 2)
50
+ ]
49
51
  }
50
52
 
51
53
  export class DescriptiveError extends Error {
@@ -71,52 +73,53 @@ export class DescriptiveError extends Error {
71
73
  const { onError = () => { } } = configFn()
72
74
  onError(msg, options)
73
75
  }
74
- log(doNotCountHasLogged = false) {
75
- if (!this.hasBeenLogged) {
76
- const { err, doNotThrow = false, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault, notifyOnSlackChannel = false, originalMessage, ...extraInfosRaw } = this.options
77
- let { code } = this.options
78
- const extraInfos = { ...extraInfosRaw, ...(this.options.extraInfos || {}) }
79
-
80
- if (!isset(extraInfos.value) && this.options.hasOwnProperty('value')) extraInfos.value = 'undefined'
81
- if (!isset(extraInfos.gotValue) && this.options.hasOwnProperty('gotValue')) extraInfos.gotValue = 'undefined'
82
-
83
- if (isset(ressource)) {
84
- code = 404
85
- if (this.msg === '404') this.msg = `Ressource ${ressource} not found`
86
- extraInfos.ressource = ressource
87
- }
76
+ parseError(forCli = false) {
77
+
78
+ const errorLogs: string[] = []
79
+
80
+ const { err, doNotThrow = false, noStackTrace = false, ressource, extraInfosRenderer = extraInfosRendererDefault, notifyOnSlackChannel = false, originalMessage, ...extraInfosRaw } = this.options
81
+ let { code } = this.options
82
+ const extraInfos = { ...extraInfosRaw, ...(this.options.extraInfos || {}) }
88
83
 
89
- C.error(false, this.msg || this.message)
90
- if (Object.keys(extraInfos).length > 0) extraInfosRenderer(extraInfos)
91
- if (err) {
92
- C.error(false, '== ORIGINAL ERROR ==')
93
- if (err.log) {
94
- err.hasBeenLogged = false
95
- err.log()
96
- } else {
97
- logErr(noStackTrace, err)
98
- if (err.extraInfos) logErr(noStackTrace, err.extraInfos)
99
- }
84
+ this.code = code || 500
85
+ if (this.options.doNotDisplayCode || (this.options.hasOwnProperty('code') && !isset(this.options.code))) delete this.code
86
+
87
+ if (!isset(extraInfos.value) && this.options.hasOwnProperty('value')) extraInfos.value = 'undefined'
88
+ if (!isset(extraInfos.gotValue) && this.options.hasOwnProperty('gotValue')) extraInfos.gotValue = 'undefined'
89
+
90
+ if (isset(ressource)) {
91
+ code = 404
92
+ if (this.msg === '404') this.msg = `Ressource ${ressource} not found`
93
+ extraInfos.ressource = ressource
94
+ }
95
+
96
+ errorLogs.push(this.msg || this.message)
97
+ if (Object.keys(extraInfos).length > 0) extraInfosRenderer(extraInfos)
98
+ if (err) {
99
+ errorLogs.push('== ORIGINAL ERROR ==')
100
+ if (typeof err.parseError === 'function') {
101
+ err.hasBeenLogged = false
102
+ const logFromOtherErr = err.parseError(forCli)
103
+ errorLogs.push(...logFromOtherErr)
100
104
  } else {
101
- if (!noStackTrace) C.error(false, C.dim(cleanStackTrace(extraInfosRaw.stack || this.stack)))
105
+ errorLogs.push(err.toString())
106
+ if (!noStackTrace && err.stack) errorLogs.push(err.stack)
107
+ if (err.extraInfos) errorLogs.push(err.extraInfos)
102
108
  }
103
- this.code = code || 500
104
- if (this.options.doNotDisplayCode || (this.options.hasOwnProperty('code') && !isset(this.options.code))) delete this.code
105
- this.errorDescription = {
106
- msg: this.msg,
107
- code,
108
- ressource,
109
- ...extraInfos,
109
+ } else {
110
+ if (!noStackTrace) {
111
+ const stackTranceClean = cleanStackTrace(extraInfosRaw.stack || this.stack)
112
+ errorLogs.push(forCli ? C.dim(stackTranceClean) : stackTranceClean)
110
113
  }
111
114
  }
112
- if (!doNotCountHasLogged) this.hasBeenLogged = true
115
+
116
+ return errorLogs
117
+ }
118
+ log() {
119
+ if (!this.hasBeenLogged) this.parseError().forEach(errLine => C.error(false, errLine))
120
+ this.hasBeenLogged = true
113
121
  }
114
122
  toString() {
115
- return this.log(true)
123
+ return this.parseError().join('\n')
116
124
  }
117
- }
118
-
119
- function logErr(noStackTrace: boolean, ...params: any[]) {
120
- if (noStackTrace) C.error(false, ...params)
121
- else C.error(...params)
122
125
  }
package/src/types.ts CHANGED
@@ -11,7 +11,7 @@ export type ErrorOptions = {
11
11
  code?: number
12
12
  doNotDisplayCode?: boolean
13
13
  notifyOnSlackChannel?: boolean
14
- extraInfosRenderer?: (extraInfosObj: ObjectGeneric) => void
14
+ extraInfosRenderer?: (extraInfosObj: ObjectGeneric) => string[]
15
15
  doNotWaitOneFrameForLog?: boolean
16
16
  noStackTrace?: boolean
17
17
  [k: string]: any