ng2-rest 19.0.3 → 19.0.5
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/README.md +135 -135
- package/browser/README.md +24 -24
- package/browser/fesm2022/ng2-rest.mjs +156 -26
- package/browser/fesm2022/ng2-rest.mjs.map +1 -1
- package/browser/package.json +1 -1
- package/client/README.md +24 -24
- package/client/fesm2022/ng2-rest.mjs +156 -26
- package/client/fesm2022/ng2-rest.mjs.map +1 -1
- package/client/package.json +1 -1
- package/index.js.map +1 -1
- package/lib/build-info._auto-generated_.d.ts +2 -1
- package/lib/build-info._auto-generated_.js +3 -2
- package/lib/build-info._auto-generated_.js.map +1 -1
- package/lib/content-type.js.map +1 -1
- package/lib/cookie.js.map +1 -1
- package/lib/helpers.d.ts +1 -1
- package/lib/helpers.js +4 -4
- package/lib/helpers.js.map +1 -1
- package/lib/index._auto-generated_.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/mapping.d.ts +1 -1
- package/lib/mapping.js +60 -60
- package/lib/mapping.js.map +1 -1
- package/lib/models.d.ts +1 -1
- package/lib/models.js +15 -15
- package/lib/models.js.map +1 -1
- package/lib/other/simple-resource.js.map +1 -1
- package/lib/params.js +6 -6
- package/lib/params.js.map +1 -1
- package/lib/request-cache.js +4 -4
- package/lib/request-cache.js.map +1 -1
- package/lib/resource-service.d.ts +1 -1
- package/lib/resource-service.js +4 -4
- package/lib/resource-service.js.map +1 -1
- package/lib/rest-headers.js.map +1 -1
- package/lib/rest-request.js +12 -12
- package/lib/rest-request.js.map +1 -1
- package/lib/rest.class.js +2 -2
- package/lib/rest.class.js.map +1 -1
- package/migrations/index.js.map +1 -1
- package/migrations/migrations_index._auto-generated_.js.map +1 -1
- package/package.json +1 -1
- package/tmp-environment.json +4 -4
- package/websql/README.md +24 -24
- package/websql/fesm2022/ng2-rest.mjs +156 -26
- package/websql/fesm2022/ng2-rest.mjs.map +1 -1
- package/websql/package.json +1 -1
- package/browser/esm2022/lib/content-type.mjs +0 -13
- package/browser/esm2022/lib/cookie.mjs +0 -29
- package/browser/esm2022/lib/helpers.mjs +0 -24
- package/browser/esm2022/lib/index.mjs +0 -13
- package/browser/esm2022/lib/mapping.mjs +0 -250
- package/browser/esm2022/lib/models.mjs +0 -172
- package/browser/esm2022/lib/other/simple-resource.mjs +0 -118
- package/browser/esm2022/lib/params.mjs +0 -279
- package/browser/esm2022/lib/request-cache.mjs +0 -101
- package/browser/esm2022/lib/resource-service.mjs +0 -220
- package/browser/esm2022/lib/rest-headers.mjs +0 -129
- package/browser/esm2022/lib/rest-request.mjs +0 -325
- package/browser/esm2022/lib/rest.class.mjs +0 -120
- package/browser/esm2022/ng2-rest.mjs +0 -5
- package/browser/esm2022/public-api.mjs +0 -2
- package/client/esm2022/lib/content-type.mjs +0 -13
- package/client/esm2022/lib/cookie.mjs +0 -29
- package/client/esm2022/lib/helpers.mjs +0 -24
- package/client/esm2022/lib/index.mjs +0 -13
- package/client/esm2022/lib/mapping.mjs +0 -250
- package/client/esm2022/lib/models.mjs +0 -172
- package/client/esm2022/lib/other/simple-resource.mjs +0 -118
- package/client/esm2022/lib/params.mjs +0 -279
- package/client/esm2022/lib/request-cache.mjs +0 -101
- package/client/esm2022/lib/resource-service.mjs +0 -220
- package/client/esm2022/lib/rest-headers.mjs +0 -129
- package/client/esm2022/lib/rest-request.mjs +0 -325
- package/client/esm2022/lib/rest.class.mjs +0 -120
- package/client/esm2022/ng2-rest.mjs +0 -5
- package/client/esm2022/public-api.mjs +0 -2
- package/websql/esm2022/lib/content-type.mjs +0 -13
- package/websql/esm2022/lib/cookie.mjs +0 -29
- package/websql/esm2022/lib/helpers.mjs +0 -24
- package/websql/esm2022/lib/index.mjs +0 -13
- package/websql/esm2022/lib/mapping.mjs +0 -250
- package/websql/esm2022/lib/models.mjs +0 -172
- package/websql/esm2022/lib/other/simple-resource.mjs +0 -118
- package/websql/esm2022/lib/params.mjs +0 -279
- package/websql/esm2022/lib/request-cache.mjs +0 -101
- package/websql/esm2022/lib/resource-service.mjs +0 -220
- package/websql/esm2022/lib/rest-headers.mjs +0 -129
- package/websql/esm2022/lib/rest-request.mjs +0 -325
- package/websql/esm2022/lib/rest.class.mjs +0 -120
- package/websql/esm2022/ng2-rest.mjs +0 -5
- package/websql/esm2022/public-api.mjs +0 -2
package/client/package.json
CHANGED
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CURRENT_PACKAGE_VERSION = exports.BUILD_FRAMEWORK_CLI_NAME = void 0;
|
|
3
|
+
exports.CURRENT_PACKAGE_VERSION = exports.PROJECT_NPM_NAME = exports.BUILD_FRAMEWORK_CLI_NAME = void 0;
|
|
4
4
|
// THIS FILE IS GENERATED - DO NOT MODIFY
|
|
5
5
|
exports.BUILD_FRAMEWORK_CLI_NAME = 'tnp';
|
|
6
|
-
exports.
|
|
6
|
+
exports.PROJECT_NPM_NAME = 'ng2-rest';
|
|
7
|
+
exports.CURRENT_PACKAGE_VERSION = '19.0.5';
|
|
7
8
|
// THIS FILE IS GENERATED - DO NOT MODIFY
|
|
8
9
|
//# sourceMappingURL=build-info._auto-generated_.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-info._auto-generated_.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"build-info._auto-generated_.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/build-info._auto-generated_.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAC5B,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAChD,yCAAyC"}
|
package/lib/content-type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-type.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"content-type.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/content-type.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAGhC,QAAA,YAAY,GAAG;IAC1B,gBAAgB,EAAE,0BAAW,CAAC,IAAI,CAAC;QACjC,cAAc,EAAE,kBAAkB;QAClC,QAAQ,EAAE,kBAAkB;KAC7B,CAAC;IACF,wBAAwB,EAAE,0BAAW,CAAC,IAAI,CAAC;QACzC,cAAc,EAAE,0BAA0B;QAC1C,QAAQ,EAAE,0BAA0B;KACrC,CAAC;CACH,CAAA"}
|
package/lib/cookie.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/cookie.ts"],"names":[],"mappings":";;;AAAA,MAAa,MAAM;IAER,MAAM,KAAK,QAAQ;QACtB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,CAAC,UAAU,GAAG,IAAI,MAAM,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,MAAM,CAAC,UAAiB,CAAC;IACpC,CAAC;IACO,MAAM,CAAC,UAAU,CAAC;IAE1B;IACA,CAAC;IAED,IAAI,CAAC,IAAY;QACb,IAAI,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClG,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,KAAa,EAAE,IAAa;QAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC;QACpB,CAAC;QAED,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAE5D,IAAI,OAAO,GAAG,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAEhD,QAAQ,CAAC,MAAM,GAAG,IAAI,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,GAAG,UAAU,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,IAAY;QACf,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CAEJ;AAnCD,wBAmCC"}
|
package/lib/helpers.d.ts
CHANGED
package/lib/helpers.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Helpers = void 0;
|
|
4
|
-
const
|
|
4
|
+
const lib_1 = require("tnp-core/lib");
|
|
5
5
|
const mapping_1 = require("./mapping");
|
|
6
|
-
const
|
|
6
|
+
const lib_2 = require("json10/lib");
|
|
7
7
|
// @ts-ignore
|
|
8
|
-
class Helpers extends
|
|
9
|
-
static JSON =
|
|
8
|
+
class Helpers extends lib_1.CoreHelpers {
|
|
9
|
+
static JSON = lib_2.JSON10;
|
|
10
10
|
static get Mapping() {
|
|
11
11
|
return {
|
|
12
12
|
encode(json, mapping) {
|
package/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/helpers.ts"],"names":[],"mappings":";;;AACA,sCAA2C;AAC3C,uCAAoC;AACpC,oCAAoC;AAEpC,aAAa;AACb,MAAa,OAAQ,SAAQ,iBAAW;IAEtC,MAAM,CAAC,IAAI,GAAG,YAAM,CAAC;IAErB,MAAM,KAAK,OAAO;QAChB,OAAO;YACL,MAAM,CAAe,IAAY,EAAE,OAAwB;gBACzD,OAAO,iBAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,CAAC,IAAY,EAAE,UAAU,GAAG,KAAK;gBACrC,OAAO,iBAAO,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;YACzC,CAAC;SACF,CAAA;IACH,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC9B,IAAI,KAAK,GAAG,6EAA6E,CAAC;QAC1F,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;;AAlBH,0BAsBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index._auto-generated_.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"index._auto-generated_.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/index._auto-generated_.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,8CAA8C;AAC9C,4BAA4B;AAC5B,uDAAuD;AACvD,uDAAuD"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,kDAAgC;AAChC,iDAA+B;AAC/B,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,mCAAkD;AAAzC,gHAAA,sBAAsB,OAAA"}
|
package/lib/mapping.d.ts
CHANGED
package/lib/mapping.js
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Mapping = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
4
|
+
const lib_1 = require("tnp-core/lib");
|
|
5
|
+
const lib_2 = require("tnp-core/lib");
|
|
6
|
+
const lib_3 = require("lodash-walk-object/lib");
|
|
7
|
+
const lib_4 = require("typescript-class-helpers/lib");
|
|
8
8
|
var Mapping;
|
|
9
9
|
(function (Mapping) {
|
|
10
10
|
function decode(json, autodetect = false) {
|
|
11
11
|
// console.log('DECODE isBrowser', HelpersLog.isBrowser)
|
|
12
|
-
if (
|
|
12
|
+
if (lib_1._.isUndefined(json)) {
|
|
13
13
|
return void 0;
|
|
14
14
|
}
|
|
15
|
-
let mapping = decodeFromDecorator(
|
|
15
|
+
let mapping = decodeFromDecorator(lib_1._.isArray(json) ? lib_1._.first(json) : json, !autodetect);
|
|
16
16
|
if (autodetect) {
|
|
17
|
-
mapping =
|
|
17
|
+
mapping = lib_1._.merge(getMappingNaive(json), mapping);
|
|
18
18
|
}
|
|
19
19
|
return mapping;
|
|
20
20
|
}
|
|
21
21
|
Mapping.decode = decode;
|
|
22
22
|
function encode(json, mapping, circular = []) {
|
|
23
|
-
if (
|
|
23
|
+
if (lib_1._.isString(json) || lib_1._.isBoolean(json) || lib_1._.isNumber(json)) {
|
|
24
24
|
return json;
|
|
25
25
|
}
|
|
26
26
|
if (mapping['']) {
|
|
27
|
-
const decoratorMapping = getModelsMapping(
|
|
28
|
-
mapping =
|
|
27
|
+
const decoratorMapping = getModelsMapping(lib_4.CLASS.getBy(mapping['']));
|
|
28
|
+
mapping = lib_1._.merge(mapping, decoratorMapping);
|
|
29
29
|
}
|
|
30
30
|
let res;
|
|
31
|
-
if (
|
|
31
|
+
if (lib_1._.isArray(circular) && circular.length > 0) {
|
|
32
32
|
res = setMappingCirc(json, mapping, circular);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
@@ -38,34 +38,34 @@ var Mapping;
|
|
|
38
38
|
}
|
|
39
39
|
Mapping.encode = encode;
|
|
40
40
|
function decodeFromDecorator(json, production = false) {
|
|
41
|
-
const entityClass =
|
|
41
|
+
const entityClass = lib_4.CLASS.getFromObject(json);
|
|
42
42
|
const mappings = getModelsMapping(entityClass);
|
|
43
43
|
return mappings;
|
|
44
44
|
}
|
|
45
45
|
function getModelsMapping(entity) {
|
|
46
|
-
if (!
|
|
46
|
+
if (!lib_1._.isFunction(entity) || entity === Object) {
|
|
47
47
|
return {};
|
|
48
48
|
}
|
|
49
|
-
const className =
|
|
49
|
+
const className = lib_4.CLASS.getName(entity);
|
|
50
50
|
// console.log(`getMaping for: '${className}' `)
|
|
51
|
-
let enityOWnMapping =
|
|
52
|
-
entity[
|
|
51
|
+
let enityOWnMapping = lib_1._.isArray(entity[lib_4.SYMBOL.MODELS_MAPPING]) ?
|
|
52
|
+
entity[lib_4.SYMBOL.MODELS_MAPPING] : [{ '': className }];
|
|
53
53
|
let res = {};
|
|
54
54
|
let parents = enityOWnMapping
|
|
55
|
-
.filter(m => !
|
|
55
|
+
.filter(m => !lib_1._.isUndefined(m['']) && m[''] !== className)
|
|
56
56
|
.map(m => m['']);
|
|
57
57
|
enityOWnMapping.reverse().forEach(m => {
|
|
58
|
-
m =
|
|
58
|
+
m = lib_1._.cloneDeep(m);
|
|
59
59
|
// console.log(`'${className}' m:`, m)
|
|
60
60
|
Object.keys(m).forEach(key => {
|
|
61
61
|
const v = m[key];
|
|
62
|
-
const isArr =
|
|
63
|
-
const model = isArr ?
|
|
62
|
+
const isArr = lib_1._.isArray(v);
|
|
63
|
+
const model = isArr ? lib_1._.first(v) : v;
|
|
64
64
|
if (parents.includes(model)) {
|
|
65
65
|
m[key] = isArr ? [className] : className;
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
|
-
res =
|
|
68
|
+
res = lib_1._.merge(res, m);
|
|
69
69
|
});
|
|
70
70
|
res[''] = className;
|
|
71
71
|
// console.log(`mapping for ${className} : ${JSON.stringify(res)}`)
|
|
@@ -75,18 +75,18 @@ var Mapping;
|
|
|
75
75
|
function add(o, path, mapping = {}) {
|
|
76
76
|
if (!o || Array.isArray(o) || typeof o !== 'object')
|
|
77
77
|
return;
|
|
78
|
-
const objectClassName =
|
|
79
|
-
const resolveClass =
|
|
78
|
+
const objectClassName = lib_4.CLASS.getName(Object.getPrototypeOf(o).constructor);
|
|
79
|
+
const resolveClass = lib_4.CLASS.getBy(objectClassName);
|
|
80
80
|
if (!resolveClass) {
|
|
81
81
|
if (objectClassName !== 'Object') {
|
|
82
|
-
if (
|
|
82
|
+
if (lib_2.Helpers.isBrowser) {
|
|
83
83
|
console.error(`Cannot resolve class "${objectClassName}" while mapping.`);
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
return;
|
|
87
87
|
}
|
|
88
88
|
if (!mapping[path])
|
|
89
|
-
mapping[path] =
|
|
89
|
+
mapping[path] = lib_4.CLASS.getName(resolveClass);
|
|
90
90
|
;
|
|
91
91
|
}
|
|
92
92
|
/**
|
|
@@ -124,7 +124,7 @@ var Mapping;
|
|
|
124
124
|
return mapping;
|
|
125
125
|
}
|
|
126
126
|
function getMappingPathFrom(pathLodhas) {
|
|
127
|
-
if (!
|
|
127
|
+
if (!lib_1._.isString(pathLodhas)) {
|
|
128
128
|
return void 0;
|
|
129
129
|
}
|
|
130
130
|
const regex = /\[([0-9a-zA-Z]|\'|\")*\]/g;
|
|
@@ -137,30 +137,30 @@ var Mapping;
|
|
|
137
137
|
return pathLodhas;
|
|
138
138
|
}
|
|
139
139
|
function setMappingCirc(json, mapping = {}, circular = []) {
|
|
140
|
-
const mainClassFn = !
|
|
140
|
+
const mainClassFn = !lib_1._.isArray(json) && lib_4.CLASS.getBy(mapping['']);
|
|
141
141
|
// console.log(mapping)
|
|
142
|
-
|
|
143
|
-
if (!
|
|
142
|
+
lib_3.walk.Object(json, (v, lodashPath, changeValue) => {
|
|
143
|
+
if (!lib_1._.isUndefined(v) && !lib_1._.isNull(v)) {
|
|
144
144
|
const mappingPath = getMappingPathFrom(lodashPath);
|
|
145
|
-
if (!
|
|
146
|
-
const isArray =
|
|
145
|
+
if (!lib_1._.isUndefined(mapping[mappingPath])) {
|
|
146
|
+
const isArray = lib_1._.isArray(mapping[mappingPath]);
|
|
147
147
|
if (!isArray) {
|
|
148
|
-
const className = isArray ?
|
|
149
|
-
const classFN =
|
|
150
|
-
if (
|
|
148
|
+
const className = isArray ? lib_1._.first(mapping[mappingPath]) : mapping[mappingPath];
|
|
149
|
+
const classFN = lib_4.CLASS.getBy(className);
|
|
150
|
+
if (lib_1._.isFunction(classFN)) {
|
|
151
151
|
// console.log(`mapping: '${mappingPath}', lp: '${lodashPath}' class: '${className}' , set `, v.location)
|
|
152
|
-
changeValue(
|
|
152
|
+
changeValue(lib_1._.merge(new classFN(), v));
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
157
|
});
|
|
158
158
|
circular.forEach(c => {
|
|
159
|
-
const ref =
|
|
160
|
-
|
|
159
|
+
const ref = lib_1._.get(json, c.circuralTargetPath);
|
|
160
|
+
lib_1._.set(json, c.pathToObj, ref);
|
|
161
161
|
});
|
|
162
|
-
if (
|
|
163
|
-
json =
|
|
162
|
+
if (lib_1._.isFunction(mainClassFn)) {
|
|
163
|
+
json = lib_1._.merge(new mainClassFn(), json);
|
|
164
164
|
}
|
|
165
165
|
return json;
|
|
166
166
|
}
|
|
@@ -171,20 +171,20 @@ var Mapping;
|
|
|
171
171
|
return setMapping(j, mapping);
|
|
172
172
|
});
|
|
173
173
|
}
|
|
174
|
-
const mainClassFn =
|
|
174
|
+
const mainClassFn = lib_4.CLASS.getBy(mapping['']);
|
|
175
175
|
for (const key in json) {
|
|
176
176
|
if (json.hasOwnProperty(key)) {
|
|
177
177
|
// if (mainClassFn && mainClassFn.name === 'Project') {
|
|
178
178
|
// // console.log(`OWn property: "${key}"`)
|
|
179
179
|
// }
|
|
180
|
-
if (
|
|
180
|
+
if (lib_1._.isArray(json[key])) {
|
|
181
181
|
json[key] = json[key].map(arrObj => {
|
|
182
|
-
const objMapping = getModelsMapping(
|
|
182
|
+
const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[key]));
|
|
183
183
|
return setMapping(arrObj, objMapping);
|
|
184
184
|
});
|
|
185
185
|
}
|
|
186
|
-
else if (
|
|
187
|
-
const objMapping = getModelsMapping(
|
|
186
|
+
else if (lib_1._.isObject(json[key])) {
|
|
187
|
+
const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[key]));
|
|
188
188
|
json[key] = setMapping(json[key], objMapping);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -199,30 +199,30 @@ var Mapping;
|
|
|
199
199
|
.filter(key => key !== '' && key.split('.').length >= 2)
|
|
200
200
|
.forEach(lodasPath => {
|
|
201
201
|
// console.log(`Loadsh path: ${lodasPath}`)
|
|
202
|
-
const objMapping = getModelsMapping(
|
|
203
|
-
const input =
|
|
204
|
-
if (!
|
|
202
|
+
const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[lodasPath]));
|
|
203
|
+
const input = lib_1._.get(json, lodasPath);
|
|
204
|
+
if (!lib_1._.isUndefined(input)) {
|
|
205
205
|
const res = setMapping(input, objMapping);
|
|
206
|
-
|
|
206
|
+
lib_1._.set(json, lodasPath, res);
|
|
207
207
|
}
|
|
208
208
|
});
|
|
209
209
|
if (!mainClassFn) {
|
|
210
210
|
return json;
|
|
211
211
|
}
|
|
212
|
-
return
|
|
212
|
+
return lib_1._.merge(new mainClassFn(), json);
|
|
213
213
|
}
|
|
214
214
|
function DefaultModelWithMapping(defaultModelValues, mapping) {
|
|
215
215
|
return function (target) {
|
|
216
|
-
if (!
|
|
217
|
-
target[
|
|
216
|
+
if (!lib_1._.isArray(target[lib_4.SYMBOL.MODELS_MAPPING])) {
|
|
217
|
+
target[lib_4.SYMBOL.MODELS_MAPPING] = [];
|
|
218
218
|
}
|
|
219
|
-
target[
|
|
220
|
-
if (
|
|
221
|
-
target[
|
|
219
|
+
target[lib_4.SYMBOL.MODELS_MAPPING].push({ '': lib_4.CLASS.getName(target) });
|
|
220
|
+
if (lib_1._.isObject(mapping)) {
|
|
221
|
+
target[lib_4.SYMBOL.MODELS_MAPPING] = target[lib_4.SYMBOL.MODELS_MAPPING].concat(mapping);
|
|
222
222
|
Object.keys(mapping)
|
|
223
223
|
.forEach(key => {
|
|
224
224
|
const v = mapping;
|
|
225
|
-
if (
|
|
225
|
+
if (lib_1._.isUndefined(v) || lib_1._.isFunction(v)) {
|
|
226
226
|
throw `
|
|
227
227
|
|
|
228
228
|
|
|
@@ -232,9 +232,9 @@ var Mapping;
|
|
|
232
232
|
}
|
|
233
233
|
});
|
|
234
234
|
}
|
|
235
|
-
if (
|
|
235
|
+
if (lib_1._.isObject(defaultModelValues)) {
|
|
236
236
|
const toMerge = {};
|
|
237
|
-
const describedTarget =
|
|
237
|
+
const describedTarget = lib_4.CLASS
|
|
238
238
|
.describeProperites(target)
|
|
239
239
|
.filter(prop => /^([a-zA-Z0-9]|\_|\#)+$/.test(prop));
|
|
240
240
|
// console.log(`describedTarget: ${describedTarget} for ${target.name}`)
|
|
@@ -253,15 +253,15 @@ var Mapping;
|
|
|
253
253
|
}
|
|
254
254
|
});
|
|
255
255
|
// console.log(`merge "${JSON.stringify(target.prototype)}" with "${JSON.stringify(defaultModelValues)}"`)
|
|
256
|
-
target[
|
|
256
|
+
target[lib_4.SYMBOL.DEFAULT_MODEL] = lib_1._.merge(toMerge, defaultModelValues);
|
|
257
257
|
const propsToOmmit = Object
|
|
258
|
-
.keys(target[
|
|
258
|
+
.keys(target[lib_4.SYMBOL.DEFAULT_MODEL])
|
|
259
259
|
.filter(key => {
|
|
260
260
|
const descriptor = Object
|
|
261
261
|
.getOwnPropertyDescriptor(target.prototype, key);
|
|
262
262
|
return !!descriptor;
|
|
263
263
|
});
|
|
264
|
-
|
|
264
|
+
lib_1._.merge(target.prototype, lib_1._.omit(target[lib_4.SYMBOL.DEFAULT_MODEL], propsToOmmit));
|
|
265
265
|
// console.log(`DEFAULT VALUE MERGE for ${target.name}`)
|
|
266
266
|
}
|
|
267
267
|
};
|
package/lib/mapping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["c:/Users/darek/projects/npm/taon-dev/ng2-rest/src/lib/mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/mapping.ts"],"names":[],"mappings":"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"}
|
package/lib/models.d.ts
CHANGED
package/lib/models.js
CHANGED
|
@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Models = void 0;
|
|
4
4
|
const cookie_1 = require("./cookie");
|
|
5
5
|
const mapping_1 = require("./mapping");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const lib_1 = require("typescript-class-helpers/lib");
|
|
7
|
+
const lib_2 = require("json10/lib");
|
|
8
8
|
const request_cache_1 = require("./request-cache");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const lib_3 = require("tnp-core/lib");
|
|
10
|
+
const lib_4 = require("tnp-core/lib");
|
|
11
11
|
//#endregion
|
|
12
12
|
// const log = Log.create('rest namespace', Level.__NOTHING)
|
|
13
13
|
var Models;
|
|
14
14
|
(function (Models) {
|
|
15
|
-
Models.MethodConfig =
|
|
16
|
-
Models.ClassConfig =
|
|
17
|
-
Models.ParamConfig =
|
|
15
|
+
Models.MethodConfig = lib_1.Models.MethodConfig;
|
|
16
|
+
Models.ClassConfig = lib_1.Models.ClassConfig;
|
|
17
|
+
Models.ParamConfig = lib_1.Models.ParamConfig;
|
|
18
18
|
[];
|
|
19
19
|
class BaseBody {
|
|
20
20
|
toJSON(data, isJSONArray = false) {
|
|
@@ -48,26 +48,26 @@ var Models;
|
|
|
48
48
|
return this.responseText;
|
|
49
49
|
}
|
|
50
50
|
get booleanValue() {
|
|
51
|
-
if (!
|
|
51
|
+
if (!lib_4.Helpers.isBlob(this.responseText)) {
|
|
52
52
|
return ['ok', 'true'].includes(this.responseText.trim());
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
get numericValue() {
|
|
56
|
-
if (!
|
|
56
|
+
if (!lib_4.Helpers.isBlob(this.responseText)) {
|
|
57
57
|
return Number(this.responseText?.trim());
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
get rawJson() {
|
|
61
|
-
if (!
|
|
61
|
+
if (!lib_4.Helpers.isBlob(this.responseText)) {
|
|
62
62
|
let res = this.toJSON(this.responseText, this.isArray);
|
|
63
63
|
if (this.circular && Array.isArray(this.circular)) {
|
|
64
|
-
res =
|
|
64
|
+
res = lib_2.JSON10.parse(JSON.stringify(res), this.circular);
|
|
65
65
|
}
|
|
66
66
|
return res;
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
get json() {
|
|
70
|
-
const isBlob =
|
|
70
|
+
const isBlob = lib_4.Helpers.isBlob(this.responseText);
|
|
71
71
|
if (isBlob) {
|
|
72
72
|
return void 0;
|
|
73
73
|
}
|
|
@@ -80,7 +80,7 @@ var Models;
|
|
|
80
80
|
}
|
|
81
81
|
let res = this.toJSON(this.responseText, this.isArray);
|
|
82
82
|
if (this.circular && Array.isArray(this.circular)) {
|
|
83
|
-
res =
|
|
83
|
+
res = lib_2.JSON10.parse(JSON.stringify(res), this.circular);
|
|
84
84
|
}
|
|
85
85
|
return res;
|
|
86
86
|
}
|
|
@@ -88,7 +88,7 @@ var Models;
|
|
|
88
88
|
* undefined when blob
|
|
89
89
|
*/
|
|
90
90
|
get text() {
|
|
91
|
-
if (!
|
|
91
|
+
if (!lib_4.Helpers.isBlob(this.responseText)) {
|
|
92
92
|
return this.responseText
|
|
93
93
|
.replace(/^\"/, '')
|
|
94
94
|
.replace(/\"$/, '');
|
|
@@ -175,7 +175,7 @@ var Models;
|
|
|
175
175
|
this.body = new HttpBody(this.responseText, this.isArray, this.entity, this.circular);
|
|
176
176
|
}
|
|
177
177
|
get cache() {
|
|
178
|
-
if (
|
|
178
|
+
if (lib_3._.isUndefined(this.rq)) {
|
|
179
179
|
this.rq = new request_cache_1.RequestCache(this);
|
|
180
180
|
}
|
|
181
181
|
return new request_cache_1.RequestCache(this);
|
package/lib/models.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-resource.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"simple-resource.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/ng2-rest/src/lib/other/simple-resource.ts"],"names":[],"mappings":"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"}
|
package/lib/params.js
CHANGED
|
@@ -13,10 +13,10 @@ exports.decodeUrl = decodeUrl;
|
|
|
13
13
|
exports.getParamsUrl = getParamsUrl;
|
|
14
14
|
exports.prepareUrlOldWay = prepareUrlOldWay;
|
|
15
15
|
const diff_1 = require("diff");
|
|
16
|
-
const
|
|
17
|
-
const
|
|
16
|
+
const lib_1 = require("tnp-core/lib");
|
|
17
|
+
const lib_2 = require("ng2-logger/lib");
|
|
18
18
|
const helpers_1 = require("./helpers");
|
|
19
|
-
const log =
|
|
19
|
+
const log = lib_2.Log.create('[ng2-rest] params', lib_2.Level.__NOTHING);
|
|
20
20
|
/** check if string is a valid pattern */
|
|
21
21
|
function isValid(pattern) {
|
|
22
22
|
return (new RegExp('\/:[a-zA-Z]*', 'g')).test(pattern.replace('://', ''));
|
|
@@ -115,7 +115,7 @@ function cutUrlModel(params, models, output) {
|
|
|
115
115
|
// log.i('cut param', param)
|
|
116
116
|
let model = m.match(/[a-zA-Z0-9]+\//)[0].replace('\/', '');
|
|
117
117
|
if (params === void 0 ||
|
|
118
|
-
(paramIsPath ?
|
|
118
|
+
(paramIsPath ? lib_1._.get(params, param) === void 0 : params[param] === void 0) ||
|
|
119
119
|
param === 'undefined') {
|
|
120
120
|
output.length = 0;
|
|
121
121
|
output.unshift(model);
|
|
@@ -124,7 +124,7 @@ function cutUrlModel(params, models, output) {
|
|
|
124
124
|
else {
|
|
125
125
|
if (paramIsPath) {
|
|
126
126
|
// log.i('param is path', param)
|
|
127
|
-
let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${
|
|
127
|
+
let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${lib_1._.get(params, param)}`);
|
|
128
128
|
output.unshift(mrep);
|
|
129
129
|
return cutUrlModel(params, models, output);
|
|
130
130
|
}
|
|
@@ -169,7 +169,7 @@ function interpolateParamsToUrl(params, url) {
|
|
|
169
169
|
let c = e.replace('\/:', '');
|
|
170
170
|
// log.i('c', c)
|
|
171
171
|
if (exports.regexisPath.test(c)) {
|
|
172
|
-
url = url.replace(e, `/${
|
|
172
|
+
url = url.replace(e, `/${lib_1._.get(params, c)}`);
|
|
173
173
|
}
|
|
174
174
|
else {
|
|
175
175
|
url = url.replace(e, `/${params[c]}`);
|