@lakutata/core 1.0.57 → 1.0.58

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,13 +1,9 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.JSON = void 0;
7
4
  const Plugin_1 = require("../base/Plugin");
8
5
  const json_helpers_1 = require("json-helpers");
9
6
  const Exception_1 = require("../base/abstracts/Exception");
10
- const json5_1 = __importDefault(require("json5"));
11
7
  class ParseException extends Exception_1.Exception {
12
8
  constructor() {
13
9
  super('');
@@ -18,27 +14,26 @@ json_helpers_1.JSONParserV2.formatter({
18
14
  objectConstructor: Error,
19
15
  serialize: (t) => {
20
16
  if (t instanceof Exception_1.Exception) {
21
- return json5_1.default.stringify({
17
+ return {
22
18
  isException: true,
23
19
  appId: t.appId,
24
20
  appName: t.appName,
25
21
  errMsg: t.errMsg,
26
22
  err: t.err,
27
23
  errno: t.errno,
28
- stack: t.stack
29
- });
24
+ stack: Buffer.from(t.stack ? t.stack : '').toString('base64')
25
+ };
30
26
  }
31
27
  else {
32
- return json5_1.default.stringify({
28
+ return {
33
29
  isException: false,
34
30
  name: t.name,
35
31
  message: t.message,
36
- stack: t.stack
37
- });
32
+ stack: Buffer.from(t.stack ? t.stack : '').toString('base64')
33
+ };
38
34
  }
39
35
  },
40
- unserialize: (data) => {
41
- const parsedErrorObject = json5_1.default.parse(data);
36
+ unserialize: (parsedErrorObject) => {
42
37
  if (parsedErrorObject.isException) {
43
38
  const unSerializeException = class extends ParseException {
44
39
  get name() {
@@ -52,14 +47,14 @@ json_helpers_1.JSONParserV2.formatter({
52
47
  errMsg: parsedErrorObject.errMsg,
53
48
  err: parsedErrorObject.err,
54
49
  errno: parsedErrorObject.errno,
55
- stack: parsedErrorObject.stack
50
+ stack: Buffer.from(parsedErrorObject.stack, 'base64').toString()
56
51
  });
57
52
  }
58
53
  else {
59
54
  const unSerializeError = new Error();
60
55
  unSerializeError.name = parsedErrorObject.name;
61
56
  unSerializeError.message = parsedErrorObject.message;
62
- unSerializeError.stack = parsedErrorObject.stack;
57
+ unSerializeError.stack = Buffer.from(parsedErrorObject.stack, 'base64').toString();
63
58
  return unSerializeError;
64
59
  }
65
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"JSON.js","sourceRoot":"","sources":["../../src/plugins/JSON.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAqC;AACrC,+CAAyC;AACzC,2DAAqD;AACrD,kDAAyB;AAQzB,MAAM,cAAe,SAAQ,qBAAS;IACrC;QACC,KAAK,CAAC,EAAE,CAAC,CAAA;IACV,CAAC;CAID;AAED,2BAAY,CAAC,SAAS,CAAoB;IACzC,UAAU,EAAE,OAAO;IACnB,iBAAiB,EAAG,KAAsC;IAC1D,SAAS,EAAE,CAAC,CAAoB,EAAE,EAAE;QACnC,IAAI,CAAC,YAAY,qBAAS,EAAE;YAC3B,OAAO,eAAK,CAAC,SAAS,CAAC;gBACtB,WAAW,EAAE,IAAI;gBACjB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,KAAK,EAAE,CAAC,CAAC,KAAK;aACd,CAAC,CAAA;SACF;aAAM;YACN,OAAO,eAAK,CAAC,SAAS,CAAC;gBACtB,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;aACd,CAAC,CAAA;SACF;IACF,CAAC;IACD,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE;QAC7B,MAAM,iBAAiB,GAAG,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAI,iBAAiB,CAAC,WAAW,EAAE;YAClC,MAAM,oBAAoB,GAAG,KAAM,SAAQ,cAAc;gBACxD,IAAW,IAAI;oBACd,OAAO,iBAAiB,CAAC,GAAG,CAAA;gBAC7B,CAAC;aACD,CAAA;YACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,oBAAoB,EAAE,EAAE;gBAChD,OAAO,EAAE,iBAAiB,CAAC,MAAM;gBACjC,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,OAAO,EAAE,iBAAiB,CAAC,OAAO;gBAClC,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,GAAG,EAAE,iBAAiB,CAAC,GAAG;gBAC1B,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,KAAK,EAAE,iBAAiB,CAAC,KAAK;aAC9B,CAAC,CAAA;SACF;aAAM;YACN,MAAM,gBAAgB,GAAG,IAAI,KAAK,EAAE,CAAA;YACpC,gBAAgB,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAA;YAC9C,gBAAgB,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;YACpD,gBAAgB,CAAC,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAA;YAChD,OAAO,gBAAgB,CAAA;SACvB;IACF,CAAC;CACD,CAAC,CAAA;AAEF,MAAa,IAAK,SAAQ,eAAM;IACxB,SAAS,CAAU,KAAQ,EAAE,QAA2C,EAAE,KAAuB;QACvG,OAAO,2BAAY,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;IACtD,CAAC;IAEM,KAAK,CAAU,IAAY,EAAE,OAA0C;QAC7E,OAAO,2BAAY,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;CACD;AARD,oBAQC"}
1
+ {"version":3,"file":"JSON.js","sourceRoot":"","sources":["../../src/plugins/JSON.ts"],"names":[],"mappings":";;;AAAA,2CAAqC;AACrC,+CAAyC;AACzC,2DAAqD;AAQrD,MAAM,cAAe,SAAQ,qBAAS;IACrC;QACC,KAAK,CAAC,EAAE,CAAC,CAAA;IACV,CAAC;CAID;AAED,2BAAY,CAAC,SAAS,CAAoB;IACzC,UAAU,EAAE,OAAO;IACnB,iBAAiB,EAAG,KAAsC;IAC1D,SAAS,EAAE,CAAC,CAAoB,EAAE,EAAE;QACnC,IAAI,CAAC,YAAY,qBAAS,EAAE;YAC3B,OAAO;gBACN,WAAW,EAAE,IAAI;gBACjB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC7D,CAAA;SACD;aAAM;YACN,OAAO;gBACN,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC7D,CAAA;SACD;IACF,CAAC;IACD,WAAW,EAAE,CAAC,iBAAsB,EAAE,EAAE;QACvC,IAAI,iBAAiB,CAAC,WAAW,EAAE;YAClC,MAAM,oBAAoB,GAAG,KAAM,SAAQ,cAAc;gBACxD,IAAW,IAAI;oBACd,OAAO,iBAAiB,CAAC,GAAG,CAAA;gBAC7B,CAAC;aACD,CAAA;YACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,oBAAoB,EAAE,EAAE;gBAChD,OAAO,EAAE,iBAAiB,CAAC,MAAM;gBACjC,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,OAAO,EAAE,iBAAiB,CAAC,OAAO;gBAClC,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,GAAG,EAAE,iBAAiB,CAAC,GAAG;gBAC1B,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE;aAChE,CAAC,CAAA;SACF;aAAM;YACN,MAAM,gBAAgB,GAAG,IAAI,KAAK,EAAE,CAAA;YACpC,gBAAgB,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAA;YAC9C,gBAAgB,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;YACpD,gBAAgB,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAA;YAClF,OAAO,gBAAgB,CAAA;SACvB;IACF,CAAC;CACD,CAAC,CAAA;AAEF,MAAa,IAAK,SAAQ,eAAM;IACxB,SAAS,CAAU,KAAQ,EAAE,QAA2C,EAAE,KAAuB;QACvG,OAAO,2BAAY,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;IACtD,CAAC;IAEM,KAAK,CAAU,IAAY,EAAE,OAA0C;QAC7E,OAAO,2BAAY,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;CACD;AARD,oBAQC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lakutata/core",
3
- "version": "1.0.57",
3
+ "version": "1.0.58",
4
4
  "description": "Lakutata Framework Core",
5
5
  "main": "./build/Core.js",
6
6
  "types": "./build/Core.d.ts",
@@ -58,7 +58,6 @@
58
58
  "inversify": "^6.0.1",
59
59
  "is-ssh": "^1.4.0",
60
60
  "json-helpers": "^5.2.1",
61
- "json5": "^2.2.3",
62
61
  "lodash.mapvalues": "^4.6.0",
63
62
  "memfs": "^3.4.12",
64
63
  "merge-deep": "^3.0.3",
@@ -1,7 +1,6 @@
1
1
  import {Plugin} from '../base/Plugin'
2
2
  import {JSONParserV2} from 'json-helpers'
3
3
  import {Exception} from '../base/abstracts/Exception'
4
- import json5 from 'json5'
5
4
 
6
5
  declare module '../Core' {
7
6
  interface Application {
@@ -23,26 +22,25 @@ JSONParserV2.formatter<Exception | Error>({
23
22
  objectConstructor: (Error as unknown) as ObjectConstructor,
24
23
  serialize: (t: Exception | Error) => {
25
24
  if (t instanceof Exception) {
26
- return json5.stringify({
25
+ return {
27
26
  isException: true,
28
27
  appId: t.appId,
29
28
  appName: t.appName,
30
29
  errMsg: t.errMsg,
31
30
  err: t.err,
32
31
  errno: t.errno,
33
- stack: t.stack
34
- })
32
+ stack: Buffer.from(t.stack ? t.stack : '').toString('base64')
33
+ }
35
34
  } else {
36
- return json5.stringify({
35
+ return {
37
36
  isException: false,
38
37
  name: t.name,
39
38
  message: t.message,
40
- stack: t.stack
41
- })
39
+ stack: Buffer.from(t.stack ? t.stack : '').toString('base64')
40
+ }
42
41
  }
43
42
  },
44
- unserialize: (data: string) => {
45
- const parsedErrorObject = json5.parse(data)
43
+ unserialize: (parsedErrorObject: any) => {
46
44
  if (parsedErrorObject.isException) {
47
45
  const unSerializeException = class extends ParseException {
48
46
  public get name(): string {
@@ -56,13 +54,13 @@ JSONParserV2.formatter<Exception | Error>({
56
54
  errMsg: parsedErrorObject.errMsg,
57
55
  err: parsedErrorObject.err,
58
56
  errno: parsedErrorObject.errno,
59
- stack: parsedErrorObject.stack
57
+ stack: Buffer.from(parsedErrorObject.stack, 'base64').toString()
60
58
  })
61
59
  } else {
62
60
  const unSerializeError = new Error()
63
61
  unSerializeError.name = parsedErrorObject.name
64
62
  unSerializeError.message = parsedErrorObject.message
65
- unSerializeError.stack = parsedErrorObject.stack
63
+ unSerializeError.stack = Buffer.from(parsedErrorObject.stack, 'base64').toString()
66
64
  return unSerializeError
67
65
  }
68
66
  }