@lakutata/core 1.0.58 → 1.0.60

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 (4) hide show
  1. package/build/base/abstracts/Exception.js +24 -14
  2. package/build/base/abstracts/Exception.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/base/abstracts/Exception.ts +21 -13
package/build/base/abstracts/Exception.js CHANGED
@@ -10,25 +10,35 @@ class Exception extends Error {
10
10
  this.appName = process.env.appName ? process.env.appName : 'Unknown';
11
11
  const _errArgs = Array.isArray(errArgs) ? errArgs : [errArgs];
12
12
  this.message = (() => {
13
- const argumentRegExs = [];
14
- for (const errArg of _errArgs) {
15
- argumentRegExs.push(new RegExp(errArg));
16
- }
17
13
  let errorMessage = null;
18
- for (const template of this.templates()) {
19
- const str = pupa(template, _errArgs);
20
- let satisfied = true;
21
- argumentRegExs.forEach(argumentRegEx => {
14
+ try {
15
+ const argumentRegExs = [];
16
+ for (const errArg of _errArgs) {
17
+ argumentRegExs.push(new RegExp(errArg));
18
+ }
19
+ for (const template of this.templates()) {
20
+ const str = pupa(template, _errArgs);
21
+ let satisfied = true;
22
+ try {
23
+ argumentRegExs.forEach(argumentRegEx => {
24
+ if (satisfied) {
25
+ if (!argumentRegEx.test(str))
26
+ satisfied = false;
27
+ }
28
+ });
29
+ }
30
+ catch (e) {
31
+ satisfied = false;
32
+ }
22
33
  if (satisfied) {
23
- if (!argumentRegEx.test(str))
24
- satisfied = false;
34
+ errorMessage = str;
35
+ break;
25
36
  }
26
- });
27
- if (satisfied) {
28
- errorMessage = str;
29
- break;
30
37
  }
31
38
  }
39
+ catch (e) {
40
+ errorMessage = null;
41
+ }
32
42
  if (errorMessage) {
33
43
  return errorMessage;
34
44
  }
package/build/base/abstracts/Exception.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Exception.js","sourceRoot":"","sources":["../../../src/base/abstracts/Exception.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAA2B;AAE3B,MAAsB,SAAU,SAAQ,KAAK;IAQ5C,YAAY,OAA0B;QACrC,KAAK,EAAE,CAAA;QANQ,UAAK,GAAW,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;QACjE,YAAO,GAAW,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;QAMtF,MAAM,QAAQ,GAAa,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvE,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE;YACpB,MAAM,cAAc,GAAa,EAAE,CAAA;YACnC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;gBAC9B,cAAc,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;aACvC;YACD,IAAI,YAAY,GAAkB,IAAI,CAAA;YACtC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;gBACxC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACpC,IAAI,SAAS,GAAY,IAAI,CAAA;gBAC7B,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;oBACtC,IAAI,SAAS,EAAE;wBACd,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;4BAAE,SAAS,GAAG,KAAK,CAAA;qBAC/C;gBACF,CAAC,CAAC,CAAA;gBACF,IAAI,SAAS,EAAE;oBACd,YAAY,GAAG,GAAG,CAAA;oBAClB,MAAK;iBACL;aACD;YACD,IAAI,YAAY,EAAE;gBACjB,OAAO,YAAY,CAAA;aACnB;iBAAM;gBACN,OAAO,aAAM,CAAC,KAAK,CAAC,aAAM,EAAE,QAAQ,CAAC,CAAA;aACrC;QACF,CAAC,CAAC,EAAE,CAAA;QACJ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAA;IACrB,CAAC;IAMD,IAAW,IAAI;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAC7B,CAAC;IAOS,SAAS;QAClB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AAxDD,8BAwDC"}
1
+ {"version":3,"file":"Exception.js","sourceRoot":"","sources":["../../../src/base/abstracts/Exception.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAA2B;AAE3B,MAAsB,SAAU,SAAQ,KAAK;IAQ5C,YAAY,OAA0B;QACrC,KAAK,EAAE,CAAA;QANQ,UAAK,GAAW,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;QACjE,YAAO,GAAW,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;QAMtF,MAAM,QAAQ,GAAa,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvE,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE;YACpB,IAAI,YAAY,GAAkB,IAAI,CAAA;YACtC,IAAI;gBACH,MAAM,cAAc,GAAa,EAAE,CAAA;gBACnC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;oBAC9B,cAAc,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;iBACvC;gBACD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;oBACxC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;oBACpC,IAAI,SAAS,GAAY,IAAI,CAAA;oBAC7B,IAAI;wBACH,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;4BACtC,IAAI,SAAS,EAAE;gCACd,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;oCAAE,SAAS,GAAG,KAAK,CAAA;6BAC/C;wBACF,CAAC,CAAC,CAAA;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACX,SAAS,GAAG,KAAK,CAAA;qBACjB;oBACD,IAAI,SAAS,EAAE;wBACd,YAAY,GAAG,GAAG,CAAA;wBAClB,MAAK;qBACL;iBACD;aACD;YAAC,OAAO,CAAC,EAAE;gBACX,YAAY,GAAG,IAAI,CAAA;aACnB;YACD,IAAI,YAAY,EAAE;gBACjB,OAAO,YAAY,CAAA;aACnB;iBAAM;gBACN,OAAO,aAAM,CAAC,KAAK,CAAC,aAAM,EAAE,QAAQ,CAAC,CAAA;aACrC;QACF,CAAC,CAAC,EAAE,CAAA;QACJ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAA;IACrB,CAAC;IAMD,IAAW,IAAI;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAC7B,CAAC;IAOS,SAAS;QAClB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AAhED,8BAgEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lakutata/core",
3
- "version": "1.0.58",
3
+ "version": "1.0.60",
4
4
  "description": "Lakutata Framework Core",
5
5
  "main": "./build/Core.js",
6
6
  "types": "./build/Core.d.ts",
package/src/base/abstracts/Exception.ts CHANGED
@@ -13,23 +13,31 @@ export abstract class Exception extends Error {
13
13
  super()
14
14
  const _errArgs: string[] = Array.isArray(errArgs) ? errArgs : [errArgs]
15
15
  this.message = (() => {
16
- const argumentRegExs: RegExp[] = []
17
- for (const errArg of _errArgs) {
18
- argumentRegExs.push(new RegExp(errArg))
19
- }
20
16
  let errorMessage: string | null = null
21
- for (const template of this.templates()) {
22
- const str = pupa(template, _errArgs)
23
- let satisfied: boolean = true
24
- argumentRegExs.forEach(argumentRegEx => {
17
+ try {
18
+ const argumentRegExs: RegExp[] = []
19
+ for (const errArg of _errArgs) {
20
+ argumentRegExs.push(new RegExp(errArg))
21
+ }
22
+ for (const template of this.templates()) {
23
+ const str = pupa(template, _errArgs)
24
+ let satisfied: boolean = true
25
+ try {
26
+ argumentRegExs.forEach(argumentRegEx => {
27
+ if (satisfied) {
28
+ if (!argumentRegEx.test(str)) satisfied = false
29
+ }
30
+ })
31
+ } catch (e) {
32
+ satisfied = false
33
+ }
25
34
  if (satisfied) {
26
- if (!argumentRegEx.test(str)) satisfied = false
35
+ errorMessage = str
36
+ break
27
37
  }
28
- })
29
- if (satisfied) {
30
- errorMessage = str
31
- break
32
38
  }
39
+ } catch (e) {
40
+ errorMessage = null
33
41
  }
34
42
  if (errorMessage) {
35
43
  return errorMessage