ng2-rest 18.0.20 → 18.0.21
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/index.js +15 -2
- package/index.js.map +1 -1
- package/lib/build-info._auto-generated_.js.map +1 -1
- package/lib/content-type.js +1 -1
- package/lib/content-type.js.map +1 -1
- package/lib/cookie.js +16 -20
- package/lib/cookie.js.map +1 -1
- package/lib/helpers.js +18 -29
- package/lib/helpers.js.map +1 -1
- package/lib/index._auto-generated_.d.ts +1 -0
- package/lib/index._auto-generated_.js.map +1 -1
- package/lib/index.js +22 -9
- package/lib/index.js.map +1 -1
- package/lib/mapping.js +84 -81
- package/lib/mapping.js.map +1 -1
- package/lib/models.js +144 -181
- package/lib/models.js.map +1 -1
- package/lib/other/simple-resource.js +92 -94
- package/lib/other/simple-resource.js.map +1 -1
- package/lib/params.js +69 -70
- package/lib/params.js.map +1 -1
- package/lib/request-cache.js +37 -41
- package/lib/request-cache.js.map +1 -1
- package/lib/resource-service.js +98 -102
- package/lib/resource-service.js.map +1 -1
- package/lib/rest-headers.js +56 -61
- package/lib/rest-headers.js.map +1 -1
- package/lib/rest-request.js +232 -250
- package/lib/rest-request.js.map +1 -1
- package/lib/rest.class.js +101 -116
- package/lib/rest.class.js.map +1 -1
- package/migrations/index.js +15 -2
- package/migrations/index.js.map +1 -1
- package/migrations/migrations_index._auto-generated_.d.ts +1 -0
- package/migrations/migrations_index._auto-generated_.js.map +1 -1
- package/package.json +19 -73
- package/src.d.ts +1 -1
- package/tmp-environment.json +8 -406
- package/browser/package.json +0 -25
- package/taon.jsonc +0 -52
- package/websql/package.json +0 -25
package/lib/models.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Models = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
var tnp_core_2 = require("tnp-core");
|
|
4
|
+
const cookie_1 = require("./cookie");
|
|
5
|
+
const mapping_1 = require("./mapping");
|
|
6
|
+
const typescript_class_helpers_1 = require("typescript-class-helpers");
|
|
7
|
+
const json10_1 = require("json10");
|
|
8
|
+
const request_cache_1 = require("./request-cache");
|
|
9
|
+
const tnp_core_1 = require("tnp-core");
|
|
10
|
+
const tnp_core_2 = require("tnp-core");
|
|
12
11
|
//#endregion
|
|
13
12
|
// const log = Log.create('rest namespace', Level.__NOTHING)
|
|
14
13
|
var Models;
|
|
@@ -17,12 +16,9 @@ var Models;
|
|
|
17
16
|
Models.ClassConfig = typescript_class_helpers_1.Models.ClassConfig;
|
|
18
17
|
Models.ParamConfig = typescript_class_helpers_1.Models.ParamConfig;
|
|
19
18
|
[];
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
BaseBody.prototype.toJSON = function (data, isJSONArray) {
|
|
24
|
-
if (isJSONArray === void 0) { isJSONArray = false; }
|
|
25
|
-
var r = isJSONArray ? [] : {};
|
|
19
|
+
class BaseBody {
|
|
20
|
+
toJSON(data, isJSONArray = false) {
|
|
21
|
+
let r = isJSONArray ? [] : {};
|
|
26
22
|
if (typeof data === 'string') {
|
|
27
23
|
try {
|
|
28
24
|
r = JSON.parse(data);
|
|
@@ -33,205 +29,172 @@ var Models;
|
|
|
33
29
|
return data;
|
|
34
30
|
}
|
|
35
31
|
return r;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
}());
|
|
32
|
+
}
|
|
33
|
+
}
|
|
39
34
|
Models.BaseBody = BaseBody;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
get: function () {
|
|
69
|
-
var _a;
|
|
70
|
-
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
71
|
-
return Number((_a = this.responseText) === null || _a === void 0 ? void 0 : _a.trim());
|
|
72
|
-
}
|
|
73
|
-
},
|
|
74
|
-
enumerable: false,
|
|
75
|
-
configurable: true
|
|
76
|
-
});
|
|
77
|
-
Object.defineProperty(HttpBody.prototype, "rawJson", {
|
|
78
|
-
get: function () {
|
|
79
|
-
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
80
|
-
var res = this.toJSON(this.responseText, this.isArray);
|
|
81
|
-
if (this.circular && Array.isArray(this.circular)) {
|
|
82
|
-
res = json10_1.JSON10.parse(JSON.stringify(res), this.circular);
|
|
83
|
-
}
|
|
84
|
-
return res;
|
|
85
|
-
}
|
|
86
|
-
},
|
|
87
|
-
enumerable: false,
|
|
88
|
-
configurable: true
|
|
89
|
-
});
|
|
90
|
-
Object.defineProperty(HttpBody.prototype, "json", {
|
|
91
|
-
get: function () {
|
|
92
|
-
var isBlob = tnp_core_2.Helpers.isBlob(this.responseText);
|
|
93
|
-
if (isBlob) {
|
|
94
|
-
return void 0;
|
|
95
|
-
}
|
|
96
|
-
if (this.entity && typeof this.entity === 'function') {
|
|
97
|
-
return this.entity(); // @LAST
|
|
98
|
-
}
|
|
99
|
-
if (this.entity && typeof this.entity === 'object') {
|
|
100
|
-
var json = this.toJSON(this.responseText, this.isArray);
|
|
101
|
-
return mapping_1.Mapping.encode(json, this.entity, this.circular);
|
|
102
|
-
}
|
|
103
|
-
var res = this.toJSON(this.responseText, this.isArray);
|
|
35
|
+
class HttpBody extends BaseBody {
|
|
36
|
+
responseText;
|
|
37
|
+
isArray;
|
|
38
|
+
entity;
|
|
39
|
+
circular;
|
|
40
|
+
constructor(responseText, isArray = false, entity, circular) {
|
|
41
|
+
super();
|
|
42
|
+
this.responseText = responseText;
|
|
43
|
+
this.isArray = isArray;
|
|
44
|
+
this.entity = entity;
|
|
45
|
+
this.circular = circular;
|
|
46
|
+
}
|
|
47
|
+
get blob() {
|
|
48
|
+
return this.responseText;
|
|
49
|
+
}
|
|
50
|
+
get booleanValue() {
|
|
51
|
+
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
52
|
+
return ['ok', 'true'].includes(this.responseText.trim());
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
get numericValue() {
|
|
56
|
+
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
57
|
+
return Number(this.responseText?.trim());
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
get rawJson() {
|
|
61
|
+
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
62
|
+
let res = this.toJSON(this.responseText, this.isArray);
|
|
104
63
|
if (this.circular && Array.isArray(this.circular)) {
|
|
105
64
|
res = json10_1.JSON10.parse(JSON.stringify(res), this.circular);
|
|
106
65
|
}
|
|
107
66
|
return res;
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
get json() {
|
|
70
|
+
const isBlob = tnp_core_2.Helpers.isBlob(this.responseText);
|
|
71
|
+
if (isBlob) {
|
|
72
|
+
return void 0;
|
|
73
|
+
}
|
|
74
|
+
if (this.entity && typeof this.entity === 'function') {
|
|
75
|
+
return this.entity(); // @LAST
|
|
76
|
+
}
|
|
77
|
+
if (this.entity && typeof this.entity === 'object') {
|
|
78
|
+
const json = this.toJSON(this.responseText, this.isArray);
|
|
79
|
+
return mapping_1.Mapping.encode(json, this.entity, this.circular);
|
|
80
|
+
}
|
|
81
|
+
let res = this.toJSON(this.responseText, this.isArray);
|
|
82
|
+
if (this.circular && Array.isArray(this.circular)) {
|
|
83
|
+
res = json10_1.JSON10.parse(JSON.stringify(res), this.circular);
|
|
84
|
+
}
|
|
85
|
+
return res;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* undefined when blob
|
|
89
|
+
*/
|
|
90
|
+
get text() {
|
|
91
|
+
if (!tnp_core_2.Helpers.isBlob(this.responseText)) {
|
|
92
|
+
return this.responseText
|
|
93
|
+
.replace(/^\"/, '')
|
|
94
|
+
.replace(/\"$/, '');
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
128
98
|
Models.HttpBody = HttpBody;
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
});
|
|
143
|
-
Object.defineProperty(ErrorBody.prototype, "text", {
|
|
144
|
-
get: function () {
|
|
145
|
-
return this.data;
|
|
146
|
-
},
|
|
147
|
-
enumerable: false,
|
|
148
|
-
configurable: true
|
|
149
|
-
});
|
|
150
|
-
return ErrorBody;
|
|
151
|
-
}(BaseBody));
|
|
99
|
+
class ErrorBody extends BaseBody {
|
|
100
|
+
data;
|
|
101
|
+
constructor(data) {
|
|
102
|
+
super();
|
|
103
|
+
this.data = data;
|
|
104
|
+
}
|
|
105
|
+
get json() {
|
|
106
|
+
return this.toJSON(this.data);
|
|
107
|
+
}
|
|
108
|
+
get text() {
|
|
109
|
+
return this.data;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
152
112
|
Models.ErrorBody = ErrorBody;
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
113
|
+
class BaseResponse {
|
|
114
|
+
responseText;
|
|
115
|
+
headers;
|
|
116
|
+
statusCode;
|
|
117
|
+
isArray;
|
|
118
|
+
static cookies = cookie_1.Cookie.Instance;
|
|
119
|
+
get cookies() {
|
|
120
|
+
return BaseResponse.cookies;
|
|
121
|
+
}
|
|
122
|
+
constructor(responseText, headers, statusCode, isArray = false) {
|
|
156
123
|
this.responseText = responseText;
|
|
157
124
|
this.headers = headers;
|
|
158
125
|
this.statusCode = statusCode;
|
|
159
126
|
this.isArray = isArray;
|
|
160
127
|
}
|
|
161
|
-
|
|
162
|
-
get: function () {
|
|
163
|
-
return BaseResponse.cookies;
|
|
164
|
-
},
|
|
165
|
-
enumerable: false,
|
|
166
|
-
configurable: true
|
|
167
|
-
});
|
|
168
|
-
BaseResponse.cookies = cookie_1.Cookie.Instance;
|
|
169
|
-
return BaseResponse;
|
|
170
|
-
}());
|
|
128
|
+
}
|
|
171
129
|
Models.BaseResponse = BaseResponse;
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
130
|
+
class HttpResponse extends BaseResponse {
|
|
131
|
+
sourceRequest;
|
|
132
|
+
responseText;
|
|
133
|
+
headers;
|
|
134
|
+
statusCode;
|
|
135
|
+
entity;
|
|
136
|
+
circular;
|
|
137
|
+
jobid;
|
|
138
|
+
isArray;
|
|
139
|
+
body;
|
|
140
|
+
// public readonly TOTAL_COUNT_HEADER = 'X-Total-Count'.toLowerCase();
|
|
141
|
+
// public get totalElements(): number {
|
|
142
|
+
// return Number(this.headers.get(this.TOTAL_COUNT_HEADER));
|
|
143
|
+
// }
|
|
144
|
+
rq;
|
|
145
|
+
constructor(sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray = false) {
|
|
176
146
|
// console.log({
|
|
177
147
|
// sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray
|
|
178
148
|
// })
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
HttpResponse.prototype.init = function () {
|
|
192
|
-
var _a, _b;
|
|
149
|
+
super(responseText, headers, statusCode, isArray);
|
|
150
|
+
this.sourceRequest = sourceRequest;
|
|
151
|
+
this.responseText = responseText;
|
|
152
|
+
this.headers = headers;
|
|
153
|
+
this.statusCode = statusCode;
|
|
154
|
+
this.entity = entity;
|
|
155
|
+
this.circular = circular;
|
|
156
|
+
this.jobid = jobid;
|
|
157
|
+
this.isArray = isArray;
|
|
158
|
+
this.init();
|
|
159
|
+
}
|
|
160
|
+
init() {
|
|
193
161
|
if (typeof this.entity === 'string') {
|
|
194
162
|
// const headerWithMapping = headers.get(entity);
|
|
195
|
-
|
|
163
|
+
let entityJSON = this.headers?.getAll(this.entity);
|
|
196
164
|
if (!!entityJSON) {
|
|
197
165
|
this.entity = JSON.parse(entityJSON.join());
|
|
198
166
|
}
|
|
199
167
|
}
|
|
200
168
|
if (typeof this.circular === 'string') {
|
|
201
169
|
// const headerWithMapping = headers.get(circular);
|
|
202
|
-
|
|
170
|
+
let circuralJSON = this.headers?.getAll(this.circular);
|
|
203
171
|
if (!!circuralJSON) {
|
|
204
172
|
this.circular = JSON.parse(circuralJSON.join());
|
|
205
173
|
}
|
|
206
174
|
}
|
|
207
175
|
this.body = new HttpBody(this.responseText, this.isArray, this.entity, this.circular);
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
enumerable: false,
|
|
217
|
-
configurable: true
|
|
218
|
-
});
|
|
219
|
-
return HttpResponse;
|
|
220
|
-
}(BaseResponse));
|
|
176
|
+
}
|
|
177
|
+
get cache() {
|
|
178
|
+
if (tnp_core_1._.isUndefined(this.rq)) {
|
|
179
|
+
this.rq = new request_cache_1.RequestCache(this);
|
|
180
|
+
}
|
|
181
|
+
return new request_cache_1.RequestCache(this);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
221
184
|
Models.HttpResponse = HttpResponse;
|
|
222
|
-
|
|
223
|
-
|
|
185
|
+
class HttpResponseError extends BaseResponse {
|
|
186
|
+
message;
|
|
187
|
+
jobid;
|
|
188
|
+
body;
|
|
224
189
|
// public tryRecconect() {
|
|
225
190
|
// }
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
return HttpResponseError;
|
|
234
|
-
}(BaseResponse));
|
|
191
|
+
constructor(message, responseText, headers, statusCode, jobid) {
|
|
192
|
+
super(responseText, headers, statusCode);
|
|
193
|
+
this.message = message;
|
|
194
|
+
this.jobid = jobid;
|
|
195
|
+
this.body = new ErrorBody(responseText);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
235
198
|
Models.HttpResponseError = HttpResponseError;
|
|
236
199
|
// | 'json' - I am parsing json from text...
|
|
237
200
|
//#endregion
|
package/lib/models.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":[""],"names":[],"mappings":"
|
|
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,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SimpleResource = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
5
|
+
const resource_service_1 = require("../resource-service");
|
|
6
6
|
/**
|
|
7
7
|
*
|
|
8
8
|
* @export
|
|
@@ -15,82 +15,83 @@ var resource_service_1 = require("../resource-service");
|
|
|
15
15
|
* @template RP rest url parameters type
|
|
16
16
|
* @template QP query parameter type
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
class ExtendedResource {
|
|
19
|
+
endpoint;
|
|
20
|
+
path_model;
|
|
21
|
+
static doNotSerializeQueryParams = false;
|
|
22
|
+
static handlers = [];
|
|
23
|
+
rest;
|
|
24
|
+
/**
|
|
25
|
+
* Get model by rest params
|
|
26
|
+
*/
|
|
27
|
+
model = (restParams) => {
|
|
28
|
+
return {
|
|
29
|
+
get: (queryPrams) => {
|
|
30
|
+
return rxjs_1.Observable.create((observer) => {
|
|
31
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
32
|
+
.get([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
33
|
+
.observable
|
|
34
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
35
|
+
});
|
|
36
|
+
},
|
|
37
|
+
patch: (item, queryParams) => {
|
|
38
|
+
return rxjs_1.Observable.create((observer) => {
|
|
39
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
40
|
+
.put(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
41
|
+
.observable
|
|
42
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
43
|
+
});
|
|
44
|
+
},
|
|
45
|
+
head: (queryPrams) => {
|
|
46
|
+
return rxjs_1.Observable.create((observer) => {
|
|
47
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
48
|
+
.head([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
49
|
+
.observable
|
|
50
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
51
|
+
});
|
|
52
|
+
},
|
|
53
|
+
query: (queryPrams) => {
|
|
54
|
+
return rxjs_1.Observable.create((observer) => {
|
|
55
|
+
ExtendedResource.handlers.push(this.rest.model(restParams).
|
|
56
|
+
array
|
|
57
|
+
.get([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
58
|
+
.observable
|
|
59
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
60
|
+
});
|
|
61
|
+
},
|
|
62
|
+
post: (item, queryParams) => {
|
|
63
|
+
return rxjs_1.Observable.create((observer) => {
|
|
64
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
65
|
+
.post(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
66
|
+
.observable
|
|
67
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
68
|
+
});
|
|
69
|
+
},
|
|
70
|
+
put: (item, queryParams) => {
|
|
71
|
+
return rxjs_1.Observable.create((observer) => {
|
|
72
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
73
|
+
.put(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
74
|
+
.observable
|
|
75
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
76
|
+
});
|
|
77
|
+
},
|
|
78
|
+
delete: (queryPrams) => {
|
|
79
|
+
return rxjs_1.Observable.create((observer) => {
|
|
80
|
+
ExtendedResource.handlers.push(this.rest.model(restParams)
|
|
81
|
+
.delete([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
82
|
+
.observable
|
|
83
|
+
.subscribe(data => observer.next(data.body.json), err => observer.error(err), () => observer.complete()));
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
};
|
|
19
88
|
// add(endpoint: E, model: string, group?: string, name?: string, description?: string) { }
|
|
20
|
-
|
|
21
|
-
var _this = this;
|
|
89
|
+
constructor(endpoint, path_model) {
|
|
22
90
|
this.endpoint = endpoint;
|
|
23
91
|
this.path_model = path_model;
|
|
24
|
-
/**
|
|
25
|
-
* Get model by rest params
|
|
26
|
-
*/
|
|
27
|
-
this.model = function (restParams) {
|
|
28
|
-
return {
|
|
29
|
-
get: function (queryPrams) {
|
|
30
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
31
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
32
|
-
.get([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
33
|
-
.observable
|
|
34
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
35
|
-
});
|
|
36
|
-
},
|
|
37
|
-
patch: function (item, queryParams) {
|
|
38
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
39
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
40
|
-
.put(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
41
|
-
.observable
|
|
42
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
43
|
-
});
|
|
44
|
-
},
|
|
45
|
-
head: function (queryPrams) {
|
|
46
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
47
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
48
|
-
.head([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
49
|
-
.observable
|
|
50
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
51
|
-
});
|
|
52
|
-
},
|
|
53
|
-
query: function (queryPrams) {
|
|
54
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
55
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams).
|
|
56
|
-
array
|
|
57
|
-
.get([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
58
|
-
.observable
|
|
59
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
60
|
-
});
|
|
61
|
-
},
|
|
62
|
-
post: function (item, queryParams) {
|
|
63
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
64
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
65
|
-
.post(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
66
|
-
.observable
|
|
67
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
68
|
-
});
|
|
69
|
-
},
|
|
70
|
-
put: function (item, queryParams) {
|
|
71
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
72
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
73
|
-
.put(item, [queryParams], ExtendedResource.doNotSerializeQueryParams)
|
|
74
|
-
.observable
|
|
75
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
76
|
-
});
|
|
77
|
-
},
|
|
78
|
-
delete: function (queryPrams) {
|
|
79
|
-
return rxjs_1.Observable.create(function (observer) {
|
|
80
|
-
ExtendedResource.handlers.push(_this.rest.model(restParams)
|
|
81
|
-
.delete([queryPrams], ExtendedResource.doNotSerializeQueryParams)
|
|
82
|
-
.observable
|
|
83
|
-
.subscribe(function (data) { return observer.next(data.body.json); }, function (err) { return observer.error(err); }, function () { return observer.complete(); }));
|
|
84
|
-
});
|
|
85
|
-
}
|
|
86
|
-
};
|
|
87
|
-
};
|
|
88
92
|
this.rest = resource_service_1.Resource.create(endpoint, path_model);
|
|
89
93
|
}
|
|
90
|
-
|
|
91
|
-
ExtendedResource.handlers = [];
|
|
92
|
-
return ExtendedResource;
|
|
93
|
-
}());
|
|
94
|
+
}
|
|
94
95
|
/**
|
|
95
96
|
*
|
|
96
97
|
* @export
|
|
@@ -100,28 +101,25 @@ var ExtendedResource = /** @class */ (function () {
|
|
|
100
101
|
* @template RP rest parameters type
|
|
101
102
|
* @template QP query parameters type
|
|
102
103
|
*/
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
104
|
+
class SimpleResource {
|
|
105
|
+
model;
|
|
106
|
+
static _isSetQueryParamsSerialization = false;
|
|
107
|
+
static set doNotSerializeQueryParams(value) {
|
|
108
|
+
if (!SimpleResource._isSetQueryParamsSerialization) {
|
|
109
|
+
SimpleResource._isSetQueryParamsSerialization = true;
|
|
110
|
+
ExtendedResource.doNotSerializeQueryParams = value;
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
console.warn(`Query params serialization already set as
|
|
114
|
+
${ExtendedResource.doNotSerializeQueryParams},`);
|
|
115
|
+
}
|
|
116
|
+
static __destroy() {
|
|
117
|
+
ExtendedResource.handlers.forEach(h => h.unsubscribe());
|
|
118
|
+
}
|
|
119
|
+
constructor(endpoint, model) {
|
|
120
|
+
let rest = new ExtendedResource(endpoint, model);
|
|
106
121
|
this.model = rest.model;
|
|
107
122
|
}
|
|
108
|
-
|
|
109
|
-
set: function (value) {
|
|
110
|
-
if (!SimpleResource._isSetQueryParamsSerialization) {
|
|
111
|
-
SimpleResource._isSetQueryParamsSerialization = true;
|
|
112
|
-
ExtendedResource.doNotSerializeQueryParams = value;
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
console.warn("Query params serialization already set as\n ".concat(ExtendedResource.doNotSerializeQueryParams, ","));
|
|
116
|
-
},
|
|
117
|
-
enumerable: false,
|
|
118
|
-
configurable: true
|
|
119
|
-
});
|
|
120
|
-
SimpleResource.__destroy = function () {
|
|
121
|
-
ExtendedResource.handlers.forEach(function (h) { return h.unsubscribe(); });
|
|
122
|
-
};
|
|
123
|
-
SimpleResource._isSetQueryParamsSerialization = false;
|
|
124
|
-
return SimpleResource;
|
|
125
|
-
}());
|
|
123
|
+
}
|
|
126
124
|
exports.SimpleResource = SimpleResource;
|
|
127
125
|
//# sourceMappingURL=simple-resource.js.map
|