ng2-rest 13.1.13 → 13.2.2
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/app.js +3 -3
- package/browser/esm2020/lib/models.mjs +43 -20
- package/browser/esm2020/lib/request-cache.mjs +5 -1
- package/browser/esm2020/lib/resource.service.mjs +1 -1
- package/browser/esm2020/lib/rest-headers.mjs +1 -1
- package/browser/esm2020/lib/rest-request.mjs +6 -5
- package/browser/esm2020/lib/rest.class.mjs +6 -3
- package/browser/fesm2015/ng2-rest.mjs +55 -25
- package/browser/fesm2015/ng2-rest.mjs.map +1 -1
- package/browser/fesm2020/ng2-rest.mjs +55 -25
- package/browser/fesm2020/ng2-rest.mjs.map +1 -1
- package/browser/lib/models.d.ts +8 -6
- package/browser/lib/request-cache.d.ts +4 -0
- package/client/esm2020/lib/models.mjs +43 -20
- package/client/esm2020/lib/request-cache.mjs +5 -1
- package/client/esm2020/lib/resource.service.mjs +1 -1
- package/client/esm2020/lib/rest-headers.mjs +1 -1
- package/client/esm2020/lib/rest-request.mjs +6 -5
- package/client/esm2020/lib/rest.class.mjs +6 -3
- package/client/fesm2015/ng2-rest.mjs +55 -25
- package/client/fesm2015/ng2-rest.mjs.map +1 -1
- package/client/fesm2020/ng2-rest.mjs +55 -25
- package/client/fesm2020/ng2-rest.mjs.map +1 -1
- package/client/lib/models.d.ts +8 -6
- package/client/lib/request-cache.d.ts +4 -0
- package/lib/models.d.ts +8 -6
- package/lib/models.js +49 -23
- package/lib/models.js.map +1 -1
- package/lib/request-cache.d.ts +4 -0
- package/lib/request-cache.js +4 -0
- package/lib/request-cache.js.map +1 -1
- package/lib/resource.service.js.map +1 -1
- package/lib/rest-headers.js +8 -0
- package/lib/rest-headers.js.map +1 -1
- package/lib/rest-request.js +10 -6
- package/lib/rest-request.js.map +1 -1
- package/lib/rest.class.js +6 -2
- package/lib/rest.class.js.map +1 -1
- package/package.json +5 -5
- package/tmp-environment.json +43 -41
- package/websql/esm2020/lib/models.mjs +43 -20
- package/websql/esm2020/lib/request-cache.mjs +5 -1
- package/websql/esm2020/lib/resource.service.mjs +1 -1
- package/websql/esm2020/lib/rest-headers.mjs +1 -1
- package/websql/esm2020/lib/rest-request.mjs +6 -5
- package/websql/esm2020/lib/rest.class.mjs +6 -3
- package/websql/fesm2015/ng2-rest.mjs +55 -25
- package/websql/fesm2015/ng2-rest.mjs.map +1 -1
- package/websql/fesm2020/ng2-rest.mjs +55 -25
- package/websql/fesm2020/ng2-rest.mjs.map +1 -1
- package/websql/lib/models.d.ts +8 -6
- package/websql/lib/request-cache.d.ts +4 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getRestParams, getParamsUrl } from './params';
|
|
2
2
|
import { RestHeaders } from './rest-headers';
|
|
3
3
|
import { CONTENT_TYPE } from './content-type';
|
|
4
|
+
import { CLASS } from 'typescript-class-helpers/browser';
|
|
4
5
|
export class Rest {
|
|
5
6
|
constructor(endpoint, request, meta, customContentType) {
|
|
6
7
|
this.request = request;
|
|
@@ -67,9 +68,11 @@ export class Rest {
|
|
|
67
68
|
get headers() {
|
|
68
69
|
return this._headers;
|
|
69
70
|
}
|
|
70
|
-
req(method,
|
|
71
|
+
req(method, requestBody, params, doNotSerializeParams = false, isArray = false) {
|
|
71
72
|
const modelUrl = this.creatUrl(params, doNotSerializeParams);
|
|
72
|
-
const body =
|
|
73
|
+
const body = (CLASS.getNameFromObject(requestBody) === 'FormData')
|
|
74
|
+
? requestBody
|
|
75
|
+
: (requestBody ? JSON.stringify(requestBody) : void 0);
|
|
73
76
|
if (this.customContentType) {
|
|
74
77
|
const customHeaderKeys = this.customContentType.keys();
|
|
75
78
|
const currentHeaderKeys = this._headers.keys();
|
|
@@ -114,4 +117,4 @@ export class Rest {
|
|
|
114
117
|
}
|
|
115
118
|
;
|
|
116
119
|
({}); // @--end-of-file-for-module=ng2-rest lib/rest.class.ts
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rest.class.js","sourceRoot":"","sources":["../../../../tmp-libs-for-bundle/ng2-rest/projects/ng2-rest/src/lib/rest.class.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { Log, Level } from 'ng2-logger/browser';\n\n\nimport { Models } from './models';\nimport { getRestParams, getParamsUrl } from './params';\nimport { RestRequest } from './rest-request';\nimport { RestHeaders } from './rest-headers';\nimport { CONTENT_TYPE } from './content-type';\n\n\nexport class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T, TA> {\n\n  private mockHttp: Models.MockHttp;\n  mock(mock: Models.MockHttp): Models.FnMethodsHttp<T, TA> {\n    if ((typeof mock === 'function') || (typeof mock === 'object')) {\n      this.mockHttp = mock;\n    } else {\n      throw `[ng2-rest]\n      .model(...)\n      .mock( < BAD MOCK DATA > )\n      ...\n      `\n    }\n    return this;\n  }\n\n\n\n\n  private __meta_endpoint: string;\n  private _endpointRest: string;\n  private get endpoint() {\n    let e = this.__meta_endpoint;\n    if (this.restQueryParams !== void 0 && this._endpointRest !== void 0\n      && typeof this._endpointRest === 'string' && this._endpointRest.trim() !== '') e = this._endpointRest;\n    return e;\n  }\n  private restQueryParams: Object;\n  public set __rest_endpoint(endpoint) {\n    this._endpointRest = endpoint;\n    if (endpoint === void 0) {\n      this.restQueryParams = void 0;\n    } else {\n      this.restQueryParams = getRestParams(endpoint, this.__meta_endpoint);\n    }\n\n  }\n\n  private creatUrl(params: any, doNotSerializeParams: boolean = false) {\n    return `${this.endpoint}${getParamsUrl(params, doNotSerializeParams)}`;\n  }\n\n\n\n\n  private _headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);\n  get headers() {\n    return this._headers;\n  }\n  constructor(\n    endpoint: string,\n    private request: RestRequest,\n    private meta: Models.MetaRequest,\n    private customContentType: RestHeaders,\n  ) {\n    this.__meta_endpoint = endpoint;\n\n  }\n\n\n\n\n  private req(method: Models.HttpMethod,\n    item: T,\n    params?: Models.UrlParams[],\n    doNotSerializeParams: boolean = false,\n    isArray: boolean = false\n  ) {\n\n    const modelUrl = this.creatUrl(params, doNotSerializeParams);\n    const body = item ? JSON.stringify(item) : void 0;\n\n    if (this.customContentType) {\n      const customHeaderKeys = this.customContentType.keys();\n      const currentHeaderKeys = this._headers.keys();\n      currentHeaderKeys\n        .filter(key => !customHeaderKeys.includes(key))\n        .forEach(key => {\n          this.customContentType.set(key, this._headers.get(key));\n        });\n      this._headers = this.customContentType;\n    } else {\n      this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);\n    }\n\n    const result = this.request[method.toLowerCase()](\n      modelUrl,\n      body,\n      this.headers,\n      this.meta,\n      isArray,\n      this.mockHttp\n    );\n\n    this.mockHttp = void 0;\n    return result;\n  }\n\n\n\n\n\n  replay(method: Models.HttpMethod) {\n    this.request.replay(method, this.meta);\n  }\n\n\n  array = {\n    get: (params: Models.UrlParams[] = void 0, doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('get', void 0, params, doNotSerializeParams, true) as any\n    },\n    head: (params: Models.UrlParams[] = void 0, doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('head', void 0, params, doNotSerializeParams, true) as any\n    },\n    post: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('post', item as any, params, doNotSerializeParams, true) as any;\n    },\n    put: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('put', item as any, params, doNotSerializeParams, true) as any;\n    },\n    patch: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('patch', item as any, params, doNotSerializeParams, true) as any;\n    },\n    delete: (params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('delete', void 0, params, doNotSerializeParams, true) as any;\n    },\n    jsonp: (params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('jsonp', void 0, params, doNotSerializeParams, true) as any;\n    }\n  }\n\n  get(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('get', void 0, params, doNotSerializeParams) as any;\n  }\n\n  head(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('head', void 0, params, doNotSerializeParams) as any;\n  }\n\n  post(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('post', item, params, doNotSerializeParams);\n  }\n\n  put(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('put', item, params, doNotSerializeParams);\n  }\n\n  patch(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('patch', item, params, doNotSerializeParams);\n  }\n\n  delete(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('delete', void 0, params, doNotSerializeParams);\n  }\n\n  jsonp(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('jsonp', void 0, params, doNotSerializeParams);\n  }\n\n\n}\n\n ;({}); // @--end-of-file-for-module=ng2-rest lib/rest.class.ts"]}
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rest.class.js","sourceRoot":"","sources":["../../../../tmp-libs-for-bundle/ng2-rest/projects/ng2-rest/src/lib/rest.class.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { Log, Level } from 'ng2-logger/browser';\n\n\nimport { Models } from './models';\nimport { getRestParams, getParamsUrl } from './params';\nimport { RestRequest } from './rest-request';\nimport { RestHeaders } from './rest-headers';\nimport { CONTENT_TYPE } from './content-type';\nimport { CLASS } from 'typescript-class-helpers/browser';\n\n\nexport class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T, TA> {\n\n  private mockHttp: Models.MockHttp;\n  mock(mock: Models.MockHttp): Models.FnMethodsHttp<T, TA> {\n    if ((typeof mock === 'function') || (typeof mock === 'object')) {\n      this.mockHttp = mock;\n    } else {\n      throw `[ng2-rest]\n      .model(...)\n      .mock( < BAD MOCK DATA > )\n      ...\n      `\n    }\n    return this;\n  }\n\n\n\n\n  private __meta_endpoint: string;\n  private _endpointRest: string;\n  private get endpoint() {\n    let e = this.__meta_endpoint;\n    if (this.restQueryParams !== void 0 && this._endpointRest !== void 0\n      && typeof this._endpointRest === 'string' && this._endpointRest.trim() !== '') e = this._endpointRest;\n    return e;\n  }\n  private restQueryParams: Object;\n  public set __rest_endpoint(endpoint) {\n    this._endpointRest = endpoint;\n    if (endpoint === void 0) {\n      this.restQueryParams = void 0;\n    } else {\n      this.restQueryParams = getRestParams(endpoint, this.__meta_endpoint);\n    }\n\n  }\n\n  private creatUrl(params: any, doNotSerializeParams: boolean = false) {\n    return `${this.endpoint}${getParamsUrl(params, doNotSerializeParams)}`;\n  }\n\n\n\n\n  private _headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);\n  get headers() {\n    return this._headers;\n  }\n  constructor(\n    endpoint: string,\n    private request: RestRequest,\n    private meta: Models.MetaRequest,\n    private customContentType: RestHeaders,\n  ) {\n    this.__meta_endpoint = endpoint;\n\n  }\n\n\n\n\n  private req(method: Models.HttpMethod,\n    requestBody: T,\n    params?: Models.UrlParams[],\n    doNotSerializeParams: boolean = false,\n    isArray: boolean = false\n  ) {\n\n    const modelUrl = this.creatUrl(params, doNotSerializeParams);\n    const body = (CLASS.getNameFromObject(requestBody) === 'FormData')\n      ? requestBody\n      : (requestBody ? JSON.stringify(requestBody) : void 0);\n\n\n    if (this.customContentType) {\n      const customHeaderKeys = this.customContentType.keys();\n      const currentHeaderKeys = this._headers.keys();\n      currentHeaderKeys\n        .filter(key => !customHeaderKeys.includes(key))\n        .forEach(key => {\n          this.customContentType.set(key, this._headers.get(key));\n        });\n      this._headers = this.customContentType;\n    } else {\n      this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);\n    }\n\n\n\n    const result = this.request[method.toLowerCase()](\n      modelUrl,\n      body,\n      this.headers,\n      this.meta,\n      isArray,\n      this.mockHttp\n    );\n\n    this.mockHttp = void 0;\n    return result;\n  }\n\n\n\n\n\n  replay(method: Models.HttpMethod) {\n    this.request.replay(method, this.meta);\n  }\n\n\n  array = {\n    get: (params: Models.UrlParams[] = void 0, doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('get', void 0, params, doNotSerializeParams, true) as any\n    },\n    head: (params: Models.UrlParams[] = void 0, doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('head', void 0, params, doNotSerializeParams, true) as any\n    },\n    post: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('post', item as any, params, doNotSerializeParams, true) as any;\n    },\n    put: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('put', item as any, params, doNotSerializeParams, true) as any;\n    },\n    patch: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('patch', item as any, params, doNotSerializeParams, true) as any;\n    },\n    delete: (params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('delete', void 0, params, doNotSerializeParams, true) as any;\n    },\n    jsonp: (params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<TA>> => {\n      return this.req('jsonp', void 0, params, doNotSerializeParams, true) as any;\n    }\n  }\n\n  get(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('get', void 0, params, doNotSerializeParams) as any;\n  }\n\n  head(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('head', void 0, params, doNotSerializeParams) as any;\n  }\n\n  post(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('post', item, params, doNotSerializeParams);\n  }\n\n  put(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('put', item, params, doNotSerializeParams);\n  }\n\n  patch(item: T, params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('patch', item, params, doNotSerializeParams);\n  }\n\n  delete(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('delete', void 0, params, doNotSerializeParams);\n  }\n\n  jsonp(params?: Models.UrlParams[], doNotSerializeParams: boolean = false): Models.PromiseObservableMix<Models.HttpResponse<T>> {\n    return this.req('jsonp', void 0, params, doNotSerializeParams);\n  }\n\n\n}\n\n ;({}); // @--end-of-file-for-module=ng2-rest lib/rest.class.ts"]}
|
|
@@ -757,9 +757,11 @@ class Rest {
|
|
|
757
757
|
get headers() {
|
|
758
758
|
return this._headers;
|
|
759
759
|
}
|
|
760
|
-
req(method,
|
|
760
|
+
req(method, requestBody, params, doNotSerializeParams = false, isArray = false) {
|
|
761
761
|
const modelUrl = this.creatUrl(params, doNotSerializeParams);
|
|
762
|
-
const body =
|
|
762
|
+
const body = (CLASS.getNameFromObject(requestBody) === 'FormData')
|
|
763
|
+
? requestBody
|
|
764
|
+
: (requestBody ? JSON.stringify(requestBody) : void 0);
|
|
763
765
|
if (this.customContentType) {
|
|
764
766
|
const customHeaderKeys = this.customContentType.keys();
|
|
765
767
|
const currentHeaderKeys = this._headers.keys();
|
|
@@ -835,6 +837,10 @@ class Cookie {
|
|
|
835
837
|
({}); // @--end-of-file-for-module=ng2-rest lib/cookie.ts
|
|
836
838
|
|
|
837
839
|
const log$2 = Log.create('request-cache', Level.__NOTHING);
|
|
840
|
+
/**
|
|
841
|
+
* @deprecated
|
|
842
|
+
* there is Cache API for that
|
|
843
|
+
*/
|
|
838
844
|
class RequestCache {
|
|
839
845
|
constructor(response) {
|
|
840
846
|
this.response = response;
|
|
@@ -952,39 +958,50 @@ var Models;
|
|
|
952
958
|
}
|
|
953
959
|
Models.BaseBody = BaseBody;
|
|
954
960
|
class HttpBody extends BaseBody {
|
|
955
|
-
constructor(
|
|
961
|
+
constructor(responseText, isArray = false, entity, circular) {
|
|
956
962
|
super();
|
|
957
|
-
this.
|
|
963
|
+
this.responseText = responseText;
|
|
958
964
|
this.isArray = isArray;
|
|
959
965
|
this.entity = entity;
|
|
960
966
|
this.circular = circular;
|
|
961
967
|
}
|
|
968
|
+
get blob() {
|
|
969
|
+
return this.responseText;
|
|
970
|
+
}
|
|
962
971
|
get booleanValue() {
|
|
963
|
-
|
|
972
|
+
if (!isBlob(this.responseText)) {
|
|
973
|
+
return ['ok', 'true'].includes(this.responseText.trim());
|
|
974
|
+
}
|
|
964
975
|
}
|
|
965
976
|
get rawJson() {
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
977
|
+
if (!isBlob(this.responseText)) {
|
|
978
|
+
let res = this.toJSON(this.responseText, this.isArray);
|
|
979
|
+
if (this.circular && Array.isArray(this.circular)) {
|
|
980
|
+
res = JSON10.parse(JSON.stringify(res), this.circular);
|
|
981
|
+
}
|
|
982
|
+
return res;
|
|
969
983
|
}
|
|
970
|
-
return res;
|
|
971
984
|
}
|
|
972
985
|
get json() {
|
|
973
|
-
if (this.
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
986
|
+
if (!isBlob(this.responseText)) {
|
|
987
|
+
if (this.entity && typeof this.entity === 'function') {
|
|
988
|
+
return this.entity(); // @LAST
|
|
989
|
+
}
|
|
990
|
+
if (this.entity && typeof this.entity === 'object') {
|
|
991
|
+
const json = this.toJSON(this.responseText, this.isArray);
|
|
992
|
+
return Mapping.encode(json, this.entity, this.circular);
|
|
993
|
+
}
|
|
994
|
+
let res = this.toJSON(this.responseText, this.isArray);
|
|
995
|
+
if (this.circular && Array.isArray(this.circular)) {
|
|
996
|
+
res = JSON10.parse(JSON.stringify(res), this.circular);
|
|
997
|
+
}
|
|
998
|
+
return res;
|
|
983
999
|
}
|
|
984
|
-
return res;
|
|
985
1000
|
}
|
|
986
1001
|
get text() {
|
|
987
|
-
|
|
1002
|
+
if (!isBlob(this.responseText)) {
|
|
1003
|
+
return this.responseText.replace(/^\"/, '').replace(/\"$/, '');
|
|
1004
|
+
}
|
|
988
1005
|
}
|
|
989
1006
|
}
|
|
990
1007
|
Models.HttpBody = HttpBody;
|
|
@@ -1059,7 +1076,19 @@ var Models;
|
|
|
1059
1076
|
}
|
|
1060
1077
|
}
|
|
1061
1078
|
Models.HttpResponseError = HttpResponseError;
|
|
1079
|
+
/* */
|
|
1080
|
+
/* */
|
|
1081
|
+
/* */
|
|
1082
|
+
/* */
|
|
1083
|
+
/* */
|
|
1084
|
+
/* */
|
|
1062
1085
|
})(Models || (Models = {}));
|
|
1086
|
+
function isBlob(maybeBlob) {
|
|
1087
|
+
if (typeof Blob === 'undefined') { // OK because there is no Blob in node
|
|
1088
|
+
return false;
|
|
1089
|
+
}
|
|
1090
|
+
return maybeBlob instanceof Blob; // || toString.call(maybeBlob) === '[object Blob]';
|
|
1091
|
+
}
|
|
1063
1092
|
;
|
|
1064
1093
|
({}); // @--end-of-file-for-module=ng2-rest lib/models.ts
|
|
1065
1094
|
|
|
@@ -1101,7 +1130,6 @@ class RestRequest {
|
|
|
1101
1130
|
checkCache(sourceRequest, jobid) {
|
|
1102
1131
|
const existedInCache = RequestCache.findBy(sourceRequest);
|
|
1103
1132
|
if (existedInCache) {
|
|
1104
|
-
log$1.i('cache exists', existedInCache);
|
|
1105
1133
|
const success = Resource['_listenSuccess'];
|
|
1106
1134
|
success.next(existedInCache.response);
|
|
1107
1135
|
this.subjectInuUse[jobid].next(existedInCache);
|
|
@@ -1145,14 +1173,16 @@ class RestRequest {
|
|
|
1145
1173
|
};
|
|
1146
1174
|
}
|
|
1147
1175
|
}
|
|
1176
|
+
const headersJson = headers.toJSON();
|
|
1177
|
+
const responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
|
|
1148
1178
|
try {
|
|
1149
1179
|
if (!response) {
|
|
1150
1180
|
response = yield axios({
|
|
1151
1181
|
url,
|
|
1152
1182
|
method,
|
|
1153
1183
|
data: body,
|
|
1154
|
-
responseType
|
|
1155
|
-
headers:
|
|
1184
|
+
responseType,
|
|
1185
|
+
headers: headersJson,
|
|
1156
1186
|
cancelToken: source.token,
|
|
1157
1187
|
});
|
|
1158
1188
|
}
|
|
@@ -1162,7 +1192,7 @@ class RestRequest {
|
|
|
1162
1192
|
this.handlerResult({
|
|
1163
1193
|
res: {
|
|
1164
1194
|
code: response.status,
|
|
1165
|
-
data:
|
|
1195
|
+
data: response.data,
|
|
1166
1196
|
isArray,
|
|
1167
1197
|
jobid,
|
|
1168
1198
|
headers: RestHeaders.from(response.headers)
|