json10 1.0.34 → 1.0.35

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 (40) hide show
  1. package/app.d.ts +0 -0
  2. package/app.js +2 -0
  3. package/app.js.map +1 -0
  4. package/browser/README.md +24 -0
  5. package/browser/esm2020/json10.mjs +5 -0
  6. package/browser/esm2020/lib/index.mjs +56 -0
  7. package/browser/esm2020/public-api.mjs +2 -0
  8. package/browser/{index.js → fesm2015/json10.mjs} +9 -2
  9. package/browser/fesm2015/json10.mjs.map +1 -0
  10. package/{client/index.js → browser/fesm2020/json10.mjs} +9 -2
  11. package/browser/fesm2020/json10.mjs.map +1 -0
  12. package/browser/json10.d.ts +5 -0
  13. package/browser/{index.d.ts → lib/index.d.ts} +0 -0
  14. package/browser/package.json +31 -0
  15. package/browser/public-api.d.ts +1 -0
  16. package/client/README.md +24 -0
  17. package/client/esm2020/json10.mjs +5 -0
  18. package/client/esm2020/lib/index.mjs +56 -0
  19. package/client/esm2020/public-api.mjs +2 -0
  20. package/client/fesm2015/json10.mjs +63 -0
  21. package/client/fesm2015/json10.mjs.map +1 -0
  22. package/client/fesm2020/json10.mjs +63 -0
  23. package/client/fesm2020/json10.mjs.map +1 -0
  24. package/client/json10.d.ts +5 -0
  25. package/client/{index.d.ts → lib/index.d.ts} +0 -0
  26. package/client/package.json +25 -23
  27. package/client/public-api.d.ts +1 -0
  28. package/index.d.ts +1 -15
  29. package/index.js +4 -63
  30. package/index.js.map +1 -1
  31. package/lib/index.d.ts +15 -0
  32. package/lib/index.js +66 -0
  33. package/lib/index.js.map +1 -0
  34. package/package.json +3 -3
  35. package/package.json_tnp.json +3 -2
  36. package/tmp-environment.json +68 -105
  37. package/browser/es5/index.js +0 -99
  38. package/browser/index.js.map +0 -1
  39. package/client/es5/index.js +0 -99
  40. package/client/index.js.map +0 -1
package/index.js CHANGED
@@ -1,65 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.JSON10 = void 0;
4
- var tnp_core_1 = require("tnp-core");
5
- var lodash_walk_object_1 = require("lodash-walk-object");
6
- var typescript_class_helpers_1 = require("typescript-class-helpers");
7
- // import { Log } from 'ng2-logger'
8
- // const log = Log.create('JSON10')
9
- // let counter = 0
10
- var JSON10 = /** @class */ (function () {
11
- function JSON10() {
12
- }
13
- JSON10.structureArray = function (anyJSON, options) {
14
- var pathes = [];
15
- var _a = options || {}, include = _a.include, exclude = _a.exclude;
16
- lodash_walk_object_1.walk.Object(anyJSON, function (value, lodashPath) {
17
- if (!tnp_core_1._.isUndefined(value)) {
18
- pathes.push(lodashPath);
19
- }
20
- }, { include: include, exclude: exclude, checkCircural: true });
21
- return pathes;
22
- };
23
- JSON10.cleaned = function (json, onCircs, options) {
24
- // console.log('BETTER SRUGUB', json)
25
- var result = tnp_core_1._.isArray(json) ? [] : {};
26
- var classFN = typescript_class_helpers_1.CLASS.OBJECT(json).isClassObject && typescript_class_helpers_1.CLASS.getFromObject(json);
27
- var _a = options || { exclude: [], include: [], breadthWalk: false }, exclude = _a.exclude, include = _a.include, breadthWalk = _a.breadthWalk;
28
- var circs = lodash_walk_object_1.walk.Object(json, function (value, lodashPath, changeValueTo, options) {
29
- if (tnp_core_1._.isObject(value) && options.isCircural) {
30
- tnp_core_1._.set(result, lodashPath, null);
31
- }
32
- else {
33
- tnp_core_1._.set(result, lodashPath, tnp_core_1._.cloneDeep(value));
34
- }
35
- }, { include: include, exclude: exclude, breadthWalk: breadthWalk, checkCircural: true }).circs;
36
- if (tnp_core_1._.isFunction(onCircs)) {
37
- onCircs(circs);
38
- }
39
- return tnp_core_1._.isFunction(classFN) ? tnp_core_1._.merge(new classFN(), result) : result;
40
- };
41
- JSON10.stringify = function (anyJSON, replace, spaces, onCircs) {
42
- var json = this.cleaned(anyJSON, onCircs);
43
- return JSON.stringify(json, replace, spaces);
44
- };
45
- JSON10.parse = function (json, circs) {
46
- if (circs === void 0) { circs = []; }
47
- var res = JSON.parse(json);
48
- if (tnp_core_1._.isArray(circs)) {
49
- circs.forEach(function (_a) {
50
- var circuralTargetPath = _a.circuralTargetPath, pathToObj = _a.pathToObj;
51
- if (circuralTargetPath === '') {
52
- tnp_core_1._.set(res, pathToObj, res);
53
- }
54
- else {
55
- var v = tnp_core_1._.get(res, circuralTargetPath);
56
- tnp_core_1._.set(res, pathToObj, v);
57
- }
58
- });
59
- }
60
- return res;
61
- };
62
- return JSON10;
63
- }());
64
- exports.JSON10 = JSON10;
65
- //# sourceMappingURL=index.js.map
3
+ var tslib_1 = require("tslib");
4
+ (0, tslib_1.__exportStar)(require("./lib"), exports);
5
+ //# sourceMappingURL=index.js.map
6
+ // @fixed
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qDAAsB"}
package/lib/index.d.ts ADDED
@@ -0,0 +1,15 @@
1
+ import { Models } from 'lodash-walk-object';
2
+ export declare type Circ = Models.Circ;
3
+ export declare class JSON10 {
4
+ static structureArray(anyJSON: Object, options?: {
5
+ include?: string[];
6
+ exclude?: string[];
7
+ }): any[];
8
+ static cleaned(json: any, onCircs?: (circs: Circ[]) => any, options?: {
9
+ exclude?: string[];
10
+ include?: string[];
11
+ breadthWalk?: boolean;
12
+ }): any;
13
+ static stringify(anyJSON: Object, replace?: any, spaces?: number, onCircs?: (circs: Circ[]) => any): string;
14
+ static parse(json: string, circs?: Circ[]): any;
15
+ }
package/lib/index.js ADDED
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.JSON10 = void 0;
4
+ var tnp_core_1 = require("tnp-core");
5
+ var lodash_walk_object_1 = require("lodash-walk-object");
6
+ var typescript_class_helpers_1 = require("typescript-class-helpers");
7
+ // import { Log } from 'ng2-logger'
8
+ // const log = Log.create('JSON10')
9
+ // let counter = 0
10
+ var JSON10 = /** @class */ (function () {
11
+ function JSON10() {
12
+ }
13
+ JSON10.structureArray = function (anyJSON, options) {
14
+ var pathes = [];
15
+ var _a = options || {}, include = _a.include, exclude = _a.exclude;
16
+ lodash_walk_object_1.walk.Object(anyJSON, function (value, lodashPath) {
17
+ if (!tnp_core_1._.isUndefined(value)) {
18
+ pathes.push(lodashPath);
19
+ }
20
+ }, { include: include, exclude: exclude, checkCircural: true });
21
+ return pathes;
22
+ };
23
+ JSON10.cleaned = function (json, onCircs, options) {
24
+ // console.log('BETTER SRUGUB', json)
25
+ var result = tnp_core_1._.isArray(json) ? [] : {};
26
+ var classFN = typescript_class_helpers_1.CLASS.OBJECT(json).isClassObject && typescript_class_helpers_1.CLASS.getFromObject(json);
27
+ var _a = options || { exclude: [], include: [], breadthWalk: false }, exclude = _a.exclude, include = _a.include, breadthWalk = _a.breadthWalk;
28
+ var circs = lodash_walk_object_1.walk.Object(json, function (value, lodashPath, changeValueTo, options) {
29
+ if (tnp_core_1._.isObject(value) && options.isCircural) {
30
+ tnp_core_1._.set(result, lodashPath, null);
31
+ }
32
+ else {
33
+ tnp_core_1._.set(result, lodashPath, tnp_core_1._.cloneDeep(value));
34
+ }
35
+ }, { include: include, exclude: exclude, breadthWalk: breadthWalk, checkCircural: true }).circs;
36
+ if (tnp_core_1._.isFunction(onCircs)) {
37
+ onCircs(circs);
38
+ }
39
+ return tnp_core_1._.isFunction(classFN) ? tnp_core_1._.merge(new classFN(), result) : result;
40
+ };
41
+ JSON10.stringify = function (anyJSON, replace, spaces, onCircs) {
42
+ var json = this.cleaned(anyJSON, onCircs);
43
+ return JSON.stringify(json, replace, spaces);
44
+ };
45
+ JSON10.parse = function (json, circs) {
46
+ if (circs === void 0) { circs = []; }
47
+ var res = JSON.parse(json);
48
+ if (tnp_core_1._.isArray(circs)) {
49
+ circs.forEach(function (_a) {
50
+ var circuralTargetPath = _a.circuralTargetPath, pathToObj = _a.pathToObj;
51
+ if (circuralTargetPath === '') {
52
+ tnp_core_1._.set(res, pathToObj, res);
53
+ }
54
+ else {
55
+ var v = tnp_core_1._.get(res, circuralTargetPath);
56
+ tnp_core_1._.set(res, pathToObj, v);
57
+ }
58
+ });
59
+ }
60
+ return res;
61
+ };
62
+ return JSON10;
63
+ }());
64
+ exports.JSON10 = JSON10;
65
+ //# sourceMappingURL=index.js.map
66
+ // @fixed
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,yDAAkD;AAElD,qEAAiD;AACjD,mCAAmC;AACnC,mCAAmC;AAEnC,kBAAkB;AAElB;IAAA;IAkEA,CAAC;IAhEe,qBAAc,GAA5B,UAA6B,OAAe,EAAE,OAAoD;QAChG,IAAI,MAAM,GAAG,EAAE,CAAA;QACT,IAAA,KAAuB,OAAO,IAAI,EAAS,EAAzC,OAAO,aAAA,EAAE,OAAO,aAAyB,CAAC;QAClD,yBAAI,CAAC,MAAM,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,UAAU;YAErC,IAAI,CAAC,YAAC,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;aACxB;QAEH,CAAC,EAAE,EAAE,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;QAC7C,OAAO,MAAM,CAAC;IAChB,CAAC;IAGa,cAAO,GAArB,UAAsB,IAAI,EAAE,OAAgC,EAAE,OAK3D;QACD,qCAAqC;QACrC,IAAM,MAAM,GAAG,YAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACxC,IAAM,OAAO,GAAG,gCAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,IAAI,gCAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAExE,IAAA,KAAoC,OAAO,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAA7F,OAAO,aAAA,EAAE,OAAO,aAAA,EAAE,WAAW,iBAAgE,CAAC;QAE9F,IAAA,KAAK,GAAK,yBAAI,CAAC,MAAM,CAAC,IAAI,EAAE,UAAC,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO;YAE5E,IAAI,YAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;gBAC3C,YAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;aAChC;iBAAM;gBACL,YAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,YAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;aAC9C;QAEH,CAAC,EAAE,EAAE,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,WAAW,aAAA,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,MAR7C,CAQ8C;QAE3D,IAAI,YAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO,CAAC,KAAK,CAAC,CAAA;SACf;QAED,OAAO,YAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAC,CAAC,KAAK,CAAC,IAAK,OAAe,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAClF,CAAC;IAEa,gBAAS,GAAvB,UAAwB,OAAe,EAAE,OAAa,EAAE,MAAe,EAAE,OAAgC;QACvG,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEa,YAAK,GAAnB,UAAoB,IAAY,EAAE,KAAkB;QAAlB,sBAAA,EAAA,UAAkB;QAClD,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,YAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,KAAK,CAAC,OAAO,CAAC,UAAC,EAAiC;oBAA/B,kBAAkB,wBAAA,EAAE,SAAS,eAAA;gBAE5C,IAAI,kBAAkB,KAAK,EAAE,EAAE;oBAC7B,YAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;iBAC3B;qBAAM;oBACL,IAAI,CAAC,GAAG,YAAC,CAAC,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;oBACvC,YAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;iBACzB;YAEH,CAAC,CAAC,CAAA;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACH,aAAC;AAAD,CAAC,AAlED,IAkEC;AAlEY,wBAAM"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "json10",
3
3
  "description": "Handle circural references, comments and many more inside JSON",
4
- "version": "1.0.34",
4
+ "version": "1.0.35",
5
5
  "scripts": {
6
6
  "test": "mocha --require ts-node/register src/**/*.spec.ts",
7
7
  "test:watch": "mocha --compilers ts-node/register src/**/*.spec.ts --watch"
@@ -21,9 +21,9 @@
21
21
  },
22
22
  "homepage": "https://github.com/darekf77/json10#readme",
23
23
  "dependencies": {
24
- "lodash-walk-object": "~1.0.35"
24
+ "lodash-walk-object": "~1.0.37"
25
25
  },
26
26
  "license": "MIT",
27
27
  "private": false,
28
- "lastBuildTagHash": "1f3b4bda57a394916cc92485304255af7d66b564"
28
+ "lastBuildTagHash": "e1b1a1b14addc2b3805bbc5845279e846dce596d"
29
29
  }
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "resources": [],
3
3
  "type": "isomorphic-lib",
4
- "version": "v2",
4
+ "version": "v3",
5
5
  "overrided": {
6
6
  "includeAsDev": "*",
7
7
  "includeOnly": [
@@ -30,5 +30,6 @@
30
30
  "ng2-rest",
31
31
  "docs",
32
32
  "documentation"
33
- ]
33
+ ],
34
+ "workerPlugins": {}
34
35
  }
@@ -7,7 +7,7 @@
7
7
  "tnp": {
8
8
  "resources": [],
9
9
  "type": "isomorphic-lib",
10
- "version": "v2",
10
+ "version": "v3",
11
11
  "overrided": {
12
12
  "includeAsDev": "*",
13
13
  "includeOnly": [
@@ -36,11 +36,12 @@
36
36
  "ng2-rest",
37
37
  "docs",
38
38
  "documentation"
39
- ]
39
+ ],
40
+ "workerPlugins": {}
40
41
  },
41
42
  "name": "json10",
42
43
  "description": "Handle circural references, comments and many more inside JSON",
43
- "version": "1.0.34",
44
+ "version": "1.0.35",
44
45
  "scripts": {
45
46
  "test": "mocha --require ts-node/register src/**/*.spec.ts",
46
47
  "test:watch": "mocha --compilers ts-node/register src/**/*.spec.ts --watch"
@@ -60,36 +61,30 @@
60
61
  },
61
62
  "homepage": "https://github.com/darekf77/json10#readme",
62
63
  "devDependencies": {
63
- "@angular-devkit/build-angular": "0.901.3",
64
- "@angular-devkit/build-optimizer": "0.900.0-rc.7",
65
- "@angular-devkit/schematics": "9.0.0-rc.7",
66
- "@angular/animations": "9.1.3",
67
- "@angular/cdk": "9.2.1",
68
- "@angular/cli": "9.1.3",
69
- "@angular/common": "9.1.3",
70
- "@angular/compiler": "9.1.3",
71
- "@angular/compiler-cli": "9.1.3",
72
- "@angular/core": "9.1.3",
73
- "@angular/forms": "9.1.3",
74
- "@angular/http": "7.2.15",
75
- "@angular/language-service": "9.1.3",
76
- "@angular/material": "9.2.1",
77
- "@angular/platform-browser": "9.1.3",
78
- "@angular/platform-browser-dynamic": "9.1.3",
79
- "@angular/pwa": "0.900.0-rc.7",
80
- "@angular/router": "9.1.3",
81
- "@angular/service-worker": "9.1.3",
64
+ "@angular-devkit/build-angular": "~13.2.5",
65
+ "@angular/animations": "~13.2.0",
66
+ "@angular/cdk": "~13.2.4",
67
+ "@angular/cli": "~13.2.5",
68
+ "@angular/common": "~13.2.0",
69
+ "@angular/compiler": "~13.2.0",
70
+ "@angular/compiler-cli": "~13.2.0",
71
+ "@angular/core": "~13.2.0",
72
+ "@angular/forms": "~13.2.0",
73
+ "@angular/material": "~13.2.4",
74
+ "@angular/platform-browser": "~13.2.0",
75
+ "@angular/platform-browser-dynamic": "~13.2.0",
76
+ "@angular/pwa": "~13.2.5",
77
+ "@angular/router": "~13.2.0",
78
+ "@angular/service-worker": "~13.2.0",
82
79
  "@mdi/js": "5.8.55",
83
- "@ngx-formly/bootstrap": "5.5.6",
84
- "@ngx-formly/core": "5.5.6",
85
- "@ngx-formly/ionic": "5.5.6",
86
- "@ngx-formly/material": "5.5.6",
87
- "@ngx-loading-bar/core": "4.2.0",
88
- "@ngx-loading-bar/http": "4.2.0",
89
- "@ngx-loading-bar/router": "4.2.0",
90
- "@ngx-translate/core": "11.0.1",
91
- "@ngx-translate/http-loader": "4.0.0",
92
- "@swimlane/ngx-datatable": "16.0.2",
80
+ "@ngrx/component-store": "~13.0.2",
81
+ "@ngrx/data": "~13.0.2",
82
+ "@ngrx/effects": "~13.0.2",
83
+ "@ngrx/entity": "~13.0.2",
84
+ "@ngrx/router-store": "~13.0.2",
85
+ "@ngrx/schematics": "~13.0.2",
86
+ "@ngrx/store": "~13.0.2",
87
+ "@ngrx/store-devtools": "~13.0.2",
93
88
  "@types/chai": "4.1.2",
94
89
  "@types/chokidar": "2.1.3",
95
90
  "@types/dateformat": "1.0.1",
@@ -101,8 +96,7 @@
101
96
  "@types/http-proxy": "1.16.0",
102
97
  "@types/http-proxy-middleware": "0.19.2",
103
98
  "@types/inquirer": "7.3.1",
104
- "@types/jasmine": "3.5.0",
105
- "@types/jasminewd2": "2.0.3",
99
+ "@types/jasmine": "3.10.0",
106
100
  "@types/json-stringify-safe": "5.0.0",
107
101
  "@types/json5": "0.0.29",
108
102
  "@types/lockfile": "1.0.0",
@@ -114,23 +108,19 @@
114
108
  "@types/oauth2orize": "1.8.0",
115
109
  "@types/password-hash": "1.2.19",
116
110
  "@types/progress": "2.0.3",
117
- "@types/q": "1.0.3",
111
+ "@types/q": "1.5.5",
118
112
  "@types/rimraf": "2.0.2",
119
113
  "@types/systeminformation": "3.23.0",
120
114
  "@types/vinyl": "2.0.2",
121
115
  "@types/watch": "1.0.0",
122
116
  "accepts": "1.3.4",
123
- "angular-tree-component": "7.0.0",
124
117
  "axios": "0.17.1",
125
- "babel-cli": "6.26.0",
126
- "babel-preset-env": "1.7.0",
127
- "background-worker-process": "~0.0.34",
118
+ "background-worker-process": "~0.0.35",
128
119
  "bcryptjs": "2.4.3",
129
120
  "body-parser": "1.18.2",
130
- "bootstrap": "4.3.1",
131
- "bs4-breakpoint": "~2.0.40",
121
+ "bootstrap": "5.1.3",
122
+ "bs4-breakpoint": "~2.0.43",
132
123
  "buffer-shims": "1.0.0",
133
- "button-dropdown": "~1.0.45",
134
124
  "callsite-record": "4.1.3",
135
125
  "chai": "4.2.0",
136
126
  "chalk": "2.3.2",
@@ -138,14 +128,12 @@
138
128
  "cheerio": "1.0.0-rc.3",
139
129
  "chokidar": "3.5.1",
140
130
  "circular-json": "0.5.1",
141
- "codelyzer": "5.1.2",
142
131
  "command-exists": "1.2.2",
143
132
  "compression": "1.7.4",
144
133
  "concurrently": "3.5.1",
145
134
  "content-type": "1.0.4",
146
135
  "cookie-parser": "1.4.3",
147
136
  "copy-paste": "1.3.0",
148
- "core-js-compat": "3.4.0",
149
137
  "cors": "2.8.4",
150
138
  "cpr": "3.0.1",
151
139
  "cross-spawn": "7.0.3",
@@ -170,59 +158,44 @@
170
158
  "fuzzy": "0.1.3",
171
159
  "glob": "7.1.2",
172
160
  "gulp": "3.9.1",
173
- "hammerjs": "2.0.8",
174
161
  "hostile": "1.3.3",
175
- "html-webpack-plugin": "4.3.0",
176
162
  "http-proxy": "1.16.2",
177
163
  "http-proxy-middleware": "0.19.1",
178
164
  "http-server": "0.11.1",
179
- "incremental-compiler": "~1.1.52",
165
+ "incremental-compiler": "~1.1.53",
180
166
  "inquirer": "7.3.3",
181
167
  "inquirer-autocomplete-prompt": "1.3.0",
182
168
  "is-elevated": "3.0.0",
183
169
  "istanbul-instrumenter-loader": "2.0.0",
184
- "jasmine-core": "3.5.0",
185
- "jasmine-spec-reporter": "4.2.1",
170
+ "jasmine-core": "4.0.0",
186
171
  "json-stringify-safe": "5.0.1",
187
- "json10": "~1.0.33",
172
+ "json10": "~1.0.34",
188
173
  "json5": "2.1.3",
189
174
  "json5-writer": "0.2.0",
190
- "karma": "5.0.0",
175
+ "karma": "6.3.0",
191
176
  "karma-chrome-launcher": "3.1.0",
192
177
  "karma-cli": "1.0.1",
193
- "karma-coverage-istanbul-reporter": "2.1.0",
194
- "karma-jasmine": "3.0.1",
195
- "karma-jasmine-html-reporter": "1.4.2",
178
+ "karma-coverage": "2.1.0",
179
+ "karma-jasmine": "4.0.0",
180
+ "karma-jasmine-html-reporter": "1.7.0",
196
181
  "lnk": "1.0.1",
197
182
  "lockfile": "1.0.4",
198
183
  "lodash": "4.17.4",
199
184
  "lowdb": "1.0.0",
200
- "magic-renamer": "~0.0.19",
185
+ "magic-renamer": "~0.0.20",
201
186
  "material-design-icons": "3.0.1",
202
187
  "method-override": "2.3.10",
203
188
  "minimist": "1.2.0",
204
189
  "mkdirp": "0.5.1",
205
190
  "mocha": "5.2.0",
206
191
  "moment": "2.22.2",
207
- "morphi": "~4.0.53",
208
- "ng-modal-lib": "0.0.6",
209
- "ng-packagr": "5.7.1",
210
- "ng-talkback": "~2.4.24",
211
- "ng2-file-upload": "1.3.0",
212
- "ng2-logger": "~8.0.20",
213
- "ng2-rest": "~11.0.41",
214
- "ng4-icons": "~0.0.29",
215
- "ng4-modal": "~0.0.29",
216
- "ngx-bootstrap": "5.2.0",
217
- "ngx-breadcrumbs": "0.0.3",
218
- "ngx-editor": "4.1.0",
219
- "ngx-moment": "3.5.0",
220
- "ngx-pipes": "2.6.0",
221
- "ngx-store": "2.1.0",
222
- "ngx-toastr": "11.2.1",
223
- "ngx-wig": "8.0.0",
192
+ "morphi": "~4.0.54",
193
+ "ng-packagr": "13.0.0",
194
+ "ng-talkback": "~2.4.25",
195
+ "ng2-logger": "~8.0.26",
196
+ "ng2-rest": "~11.0.42",
224
197
  "node-cli-test": "0.0.2",
225
- "node-cli-tester": "~0.0.21",
198
+ "node-cli-tester": "~0.0.22",
226
199
  "node-localstorage": "2.1.6",
227
200
  "node-notifier": "6.0.0",
228
201
  "nodemon": "1.14.11",
@@ -235,65 +208,55 @@
235
208
  "passport-http-bearer": "1.0.1",
236
209
  "password-hash": "1.2.2",
237
210
  "portfinder": "1.0.21",
238
- "prettier": "2.3.2",
239
211
  "progress": "2.0.3",
240
212
  "prompts": "0.1.8",
241
- "protractor": "5.4.3",
242
213
  "ps-list": "6.1.0",
243
214
  "ps-node": "0.1.6",
244
215
  "q": "1.5.1",
245
216
  "randomcolor": "0.5.3",
246
- "record-replay-req-res-scenario": "~0.0.25",
217
+ "record-replay-req-res-scenario": "~0.0.26",
247
218
  "reflect-metadata": "0.1.10",
248
219
  "rimraf": "2.6.2",
249
- "rxjs": "6.5.4",
250
- "rxjs-compat": "6.5.3",
220
+ "rxjs": "~7.5.0",
251
221
  "simple-git": "1.96.0",
252
222
  "sloc": "0.2.0",
253
223
  "socket.io": "2.4.1",
254
224
  "sort-package-json": "1.11.0",
255
- "static-columns": "~2.0.12",
256
225
  "string-similarity": "4.0.2",
257
226
  "sudo-block": "3.0.0",
258
227
  "systeminformation": "3.45.7",
259
228
  "task.js": "0.1.5",
260
- "tnp-cli": "~2.0.20",
261
- "tnp-config": "~1.0.20",
262
- "tnp-core": "~1.0.34",
263
- "tnp-db": "~0.0.42",
264
- "tnp-helpers": "~0.0.70",
265
- "tnp-models": "~0.0.36",
266
- "tnp-tools": "~0.0.45",
267
- "tnp-ui": "~0.0.32",
268
- "ts-loader": "7.0.4",
269
- "ts-node": "8.3.0",
270
- "tsickle": "0.26.0",
271
- "tslib": "2.2.0",
272
- "tslint": "6.1.0",
229
+ "tnp-cli": "~2.0.23",
230
+ "tnp-config": "~1.0.24",
231
+ "tnp-core": "~1.0.38",
232
+ "tnp-db": "~0.0.44",
233
+ "tnp-helpers": "~0.0.73",
234
+ "tnp-models": "~0.0.37",
235
+ "tnp-tools": "~0.0.46",
236
+ "tnp-ui": "~0.0.33",
237
+ "tslib": "~2.3.0",
273
238
  "typeorm": "~0.2.7",
274
- "typescript": "4.1.5",
275
- "typescript-class-helpers": "~1.0.42",
276
- "typescript-formatter": "7.2.2",
277
- "uglifyjs-webpack-plugin": "2.2.0",
239
+ "typescript": "~4.5.2",
240
+ "typescript-class-helpers": "~1.0.45",
241
+ "typescript-formatter": "~7.2.2",
278
242
  "underscore": "1.9.1",
279
243
  "uuid": "8.3.2",
280
244
  "validator": "9.2.0",
281
- "vpn-split": "~0.0.17",
245
+ "vpn-split": "~0.0.18",
282
246
  "watch": "1.0.2",
283
- "webpack-cli": "3.3.11",
284
- "zone.js": "0.10.2"
247
+ "zone.js": "~0.11.4"
285
248
  },
286
249
  "dependencies": {
287
- "lodash-walk-object": "~1.0.35"
250
+ "lodash-walk-object": "~1.0.37"
288
251
  },
289
252
  "license": "MIT",
290
253
  "private": false,
291
- "lastBuildTagHash": "1f3b4bda57a394916cc92485304255af7d66b564"
254
+ "lastBuildTagHash": "e1b1a1b14addc2b3805bbc5845279e846dce596d"
292
255
  },
293
256
  "build": {
294
- "number": 127,
295
- "date": "2021-10-19T06:51:50.000Z",
296
- "hash": "0d64708f431249f7307aab86e0234cbc4e7c439a",
257
+ "number": 133,
258
+ "date": "2022-03-06T14:42:38.000Z",
259
+ "hash": "27c3c781fc1b60647288c8ca1636584ddb494be4",
297
260
  "options": {}
298
261
  },
299
262
  "currentProjectName": "json10",
@@ -301,7 +264,7 @@
301
264
  "currentProjectLaunchConfiguration": "{\"version\":\"0.2.0\",\"configurations\":[{\"type\":\"node\",\"request\":\"launch\",\"name\":\"Launch Server standalone\",\"program\":\"${workspaceFolder}/run.js\",\"args\":[\"--ENVoverride=%7B%0A%20%20%20%20%22clientProjectName%22%3A%20%22json10%22%0A%7D\"],\"runtimeArgs\":[\"--nolazy\",\"-r\",\"ts-node/register\",\"--experimental-worker\"]},{\"name\":\"Debugger with ng serve\",\"type\":\"chrome\",\"request\":\"launch\",\"preLaunchTask\":\"Ng Serve\",\"postDebugTask\":\"terminateall\",\"sourceMaps\":true,\"webRoot\":\"${workspaceFolder}\",\"sourceMapPathOverrides\":{\"webpack:/*\":\"${webRoot}/*\",\"/./*\":\"${webRoot}/*\",\"/tmp-src/*\":\"${webRoot}/*\",\"/*\":\"*\",\"/./~/*\":\"${webRoot}/node_modules/*\"}},{\"type\":\"node\",\"request\":\"attach\",\"name\":\"Attach to global cli tool\",\"port\":9229,\"skipFiles\":[\"<node_internals>/**\"]}],\"compounds\":[{\"name\":\"Debug backend/frontend\",\"configurations\":[\"Launch Server standalone\",\"Debugger with ng serve\"]}]}",
302
265
  "currentProjectTasksConfiguration": "{\"version\":\"2.0.0\",\"tasks\":[{\"label\":\"terminateall\",\"command\":\"echo ${input:terminate}\",\"type\":\"shell\",\"problemMatcher\":[]},{\"label\":\"Ng Serve\",\"type\":\"shell\",\"command\":\"tnp build\",\"isBackground\":true,\"presentation\":{\"reveal\":\"always\"},\"group\":{\"kind\":\"build\",\"isDefault\":true},\"problemMatcher\":{\"owner\":\"typescript\",\"source\":\"ts\",\"applyTo\":\"closedDocuments\",\"fileLocation\":[\"relative\",\"${cwd}\"],\"pattern\":\"$tsc\",\"background\":{\"activeOnStart\":true,\"beginsPattern\":{\"regexp\":\"(.*?)\"},\"endsPattern\":{\"regexp\":\"Compiled |Failed to compile.\"}}}}],\"inputs\":[{\"id\":\"terminate\",\"type\":\"command\",\"command\":\"workbench.action.tasks.terminate\",\"args\":\"terminateAll\"}]}",
303
266
  "currentProjectType": "isomorphic-lib",
304
- "currentFrameworkVersion": "0.0.158",
267
+ "currentFrameworkVersion": "0.0.159",
305
268
  "currentProjectIsStrictSite": false,
306
269
  "currentProjectIsDependencySite": false,
307
270
  "currentProjectIsStatic": false,
@@ -1,99 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.JSON10 = undefined;
7
-
8
- var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
9
-
10
- var _browser = require('tnp-core/browser');
11
-
12
- var _browser2 = require('lodash-walk-object/browser');
13
-
14
- var _browser3 = require('typescript-class-helpers/browser');
15
-
16
- function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
17
-
18
- // import { Log } from 'ng2-logger/browser'
19
- // const log = Log.create('JSON10')
20
- // let counter = 0
21
- var JSON10 = exports.JSON10 = function () {
22
- function JSON10() {
23
- _classCallCheck(this, JSON10);
24
- }
25
-
26
- _createClass(JSON10, null, [{
27
- key: 'structureArray',
28
- value: function structureArray(anyJSON, options) {
29
- var pathes = [];
30
-
31
- var _ref = options || {},
32
- include = _ref.include,
33
- exclude = _ref.exclude;
34
-
35
- _browser2.walk.Object(anyJSON, function (value, lodashPath) {
36
- if (!_browser._.isUndefined(value)) {
37
- pathes.push(lodashPath);
38
- }
39
- }, { include: include, exclude: exclude, checkCircural: true });
40
- return pathes;
41
- }
42
- }, {
43
- key: 'cleaned',
44
- value: function cleaned(json, onCircs, options) {
45
- // console.log('BETTER SRUGUB', json)
46
- var result = _browser._.isArray(json) ? [] : {};
47
- var classFN = _browser3.CLASS.OBJECT(json).isClassObject && _browser3.CLASS.getFromObject(json);
48
-
49
- var _ref2 = options || { exclude: [], include: [], breadthWalk: false },
50
- exclude = _ref2.exclude,
51
- include = _ref2.include,
52
- breadthWalk = _ref2.breadthWalk;
53
-
54
- var _walk$Object = _browser2.walk.Object(json, function (value, lodashPath, changeValueTo, options) {
55
- if (_browser._.isObject(value) && options.isCircural) {
56
- _browser._.set(result, lodashPath, null);
57
- } else {
58
- _browser._.set(result, lodashPath, _browser._.cloneDeep(value));
59
- }
60
- }, { include: include, exclude: exclude, breadthWalk: breadthWalk, checkCircural: true }),
61
- circs = _walk$Object.circs;
62
-
63
- if (_browser._.isFunction(onCircs)) {
64
- onCircs(circs);
65
- }
66
- return _browser._.isFunction(classFN) ? _browser._.merge(new classFN(), result) : result;
67
- }
68
- }, {
69
- key: 'stringify',
70
- value: function stringify(anyJSON, replace, spaces, onCircs) {
71
- var json = this.cleaned(anyJSON, onCircs);
72
- return JSON.stringify(json, replace, spaces);
73
- }
74
- }, {
75
- key: 'parse',
76
- value: function parse(json) {
77
- var circs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
78
-
79
- var res = JSON.parse(json);
80
- if (_browser._.isArray(circs)) {
81
- circs.forEach(function (_ref3) {
82
- var circuralTargetPath = _ref3.circuralTargetPath,
83
- pathToObj = _ref3.pathToObj;
84
-
85
- if (circuralTargetPath === '') {
86
- _browser._.set(res, pathToObj, res);
87
- } else {
88
- var v = _browser._.get(res, circuralTargetPath);
89
- _browser._.set(res, pathToObj, v);
90
- }
91
- });
92
- }
93
- return res;
94
- }
95
- }]);
96
-
97
- return JSON10;
98
- }();
99
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../tmp-src-bundle/index.ts"],"names":[],"mappings":"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"}