chyz 2.0.0-rc.40 → 2.0.0-rc.41
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/base/BaseError.d.ts +10 -0
- package/base/BaseError.d.ts.map +1 -1
- package/base/BaseError.js +11 -1
- package/base/Model.d.ts.map +1 -1
- package/base/Model.js +10 -3
- package/package.json +1 -1
package/base/BaseError.d.ts
CHANGED
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
*/
|
|
22
22
|
export declare class BaseError extends Error {
|
|
23
23
|
statusCode: number;
|
|
24
|
+
orginal: any;
|
|
24
25
|
private success;
|
|
25
26
|
constructor(message: any, statusCode?: number);
|
|
26
27
|
toString(): string;
|
|
@@ -29,6 +30,15 @@ export declare class BaseError extends Error {
|
|
|
29
30
|
code: number;
|
|
30
31
|
name: string;
|
|
31
32
|
message: string;
|
|
33
|
+
stack: string | undefined;
|
|
34
|
+
orginal: any;
|
|
35
|
+
} | {
|
|
36
|
+
success: boolean;
|
|
37
|
+
code: number;
|
|
38
|
+
name: string;
|
|
39
|
+
message: string;
|
|
40
|
+
stack?: undefined;
|
|
41
|
+
orginal?: undefined;
|
|
32
42
|
};
|
|
33
43
|
}
|
|
34
44
|
//# sourceMappingURL=BaseError.d.ts.map
|
package/base/BaseError.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseError.d.ts","sourceRoot":"","sources":["../../src/base/BaseError.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,OAAO,CAAU;gBAEb,OAAO,EAAE,GAAG,EAAE,UAAU,SAAM;
|
|
1
|
+
{"version":3,"file":"BaseError.d.ts","sourceRoot":"","sources":["../../src/base/BaseError.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,OAAO,CAAU;gBAEb,OAAO,EAAE,GAAG,EAAE,UAAU,SAAM;IAW1C,QAAQ;IAIR,MAAM;;;;;;;;;;;;;;;CAcT"}
|
package/base/BaseError.js
CHANGED
|
@@ -37,12 +37,22 @@ class BaseError extends Error {
|
|
|
37
37
|
this.name = this.constructor.name; // good practice
|
|
38
38
|
this.statusCode = statusCode; // error code for responding to client
|
|
39
39
|
//Error.captureStackTrace(this)
|
|
40
|
+
this.orginal = Utils_1.Utils.isString(message) ? message : message;
|
|
40
41
|
}
|
|
41
42
|
toString() {
|
|
42
43
|
return `${this.name}[${this.statusCode}] ${this.message}`;
|
|
43
44
|
}
|
|
44
45
|
toJSON() {
|
|
45
|
-
|
|
46
|
+
if (process.env.NODE_ENV == "development" || process.env.NODE_ENV == "dev") {
|
|
47
|
+
return { success: this.success, code: this === null || this === void 0 ? void 0 : this.statusCode, name: this.name.toString(),
|
|
48
|
+
message: this.message.toString(),
|
|
49
|
+
stack: this.stack,
|
|
50
|
+
orginal: this.orginal };
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
return { success: this.success, code: this === null || this === void 0 ? void 0 : this.statusCode, name: this.name.toString(),
|
|
54
|
+
message: this.message.toString() };
|
|
55
|
+
}
|
|
46
56
|
}
|
|
47
57
|
}
|
|
48
58
|
exports.BaseError = BaseError;
|
package/base/Model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/base/Model.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,EAKH,KAAK,IAAI,MAAM,EAQlB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAC,SAAS,EAAE,GAAG,EAAC,MAAM,WAAW,CAAC;AAGzC,MAAM,WAAW,QAAQ;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,eAAe,GAAG,WAAW,CAAC;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,KAAK,CAAC,EAAE,GAAG,CAAA;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,qBAAa,KAAM,SAAQ,SAAS;IAChC,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,WAAW,CAAW;IAC9B,OAAO,CAAC,OAAO,CAAU;gBAGb,SAAS,CAAC,EAAE,WAAW;IAmEnC;;;;;OAKG;IACI,KAAK;IAIL,eAAe;IAItB,IAAI,QAAQ,IAAI,GAAG,CAElB;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,GAAG,EAEtB;IAGD;;OAEG;IACH,IAAI,MAAM,IAAI,GAAG,CAEhB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,EAEpB;IAEM,IAAI;IAqCJ,KAAK;IAIL,SAAS;IAIT,QAAQ;IAIR,KAAK;IAKL,QAAQ,CAAC,KAAK,EAAE,GAAG;IAInB,KAAK;IAKC,IAAI,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAoC9B,UAAU,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAmC1C,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMhC,MAAM,CAAC,MAAM,KAAK,EAAE,OAAO,KAAK;IAMvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmKG;IACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,GAA2C;IAMzF;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAK9B,QAAQ;IAIf;;;;OAIG;IACI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYpC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAU;IAYxC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,UAAO;IAazC,UAAU;IAIjB;;;;;OAKG;IACI,SAAS,IAAI,QAAQ,EAAE;CAKjC"}
|
package/base/Model.js
CHANGED
|
@@ -109,9 +109,16 @@ class Model extends Component_1.Component {
|
|
|
109
109
|
// };
|
|
110
110
|
this._provider.query = function (sql, options) {
|
|
111
111
|
return sequelize_1.Sequelize.prototype.query.apply(this, [sql, options]).catch((err) => {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
112
|
+
if (process.env.NODE_ENV == "development" || process.env.NODE_ENV == "dev") {
|
|
113
|
+
// e.stack = e.original;
|
|
114
|
+
if (err instanceof sequelize_1.DatabaseError) {
|
|
115
|
+
// @ts-ignore
|
|
116
|
+
delete err.parent;
|
|
117
|
+
// @ts-ignore
|
|
118
|
+
delete err.original;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
throw new DataErrorDbException_1.DataErrorDbException(err);
|
|
115
122
|
});
|
|
116
123
|
// try {
|
|
117
124
|
// let r =
|