angular2-cool-http - npm Package Compare versions

Comparing version 2.2.1 to 2.3.0

package.json

 {
   "name": "angular2-cool-http",
-  "version": "2.2.1",
-  "description": "Cool features over angular2 Http Client.",
+  "version": "2.3.0",
+  "description": "Cool features over angular Http Client.",
   "main": "index.js",
@@ -31,2 +31,3 @@ "jsnext:main": "esm/index.js",
     "angular2",
+    "angular",
     "http",
@@ -33,0 +34,0 @@ "httpclient",

src/cool-http.service.d.ts

@@ -35,3 +35,3 @@ import { Http, Response, RequestOptions } from '@angular/http';
     headAsync(url: string, options?: RequestOptions): Promise<any>;
-    private requestCoreAsync(url, method, data, options, action);
+    private _requestCoreAsync(url, method, data, options, action);
     getObservable(url: string, options?: RequestOptions): Observable<Response>;
@@ -43,10 +43,11 @@ postObservable(url: string, data: any, options?: RequestOptions): Observable<Response>;
     headObservable(url: string, options?: RequestOptions): Observable<Response>;
-    private requestCoreObservable(url, method, data, options, action);
-    private convertUrl(url);
-    private modifyOptions(options);
-    private appendGlobalHeaders(headers);
-    private tryAppendRegisteredCookiestoCustomHeaders(headers);
-    private invokeRequestInterceptorsAsync(url, method, data, headers);
-    private invokeResponseInterceptorsAsync(response, url, method, data, headers);
-    private convertAngularHeadersToHttpClientHeaders(headers);
+    private _requestCoreObservable(url, method, data, options, action);
+    private _convertUrl(url);
+    private _modifyOptions(options);
+    private _appendGlobalHeaders(headers);
+    private _tryAppendRegisteredCookiestoCustomHeaders(headers);
+    private _invokeRequestInterceptorsAsync(url, method, data, headers);
+    private _invokeResponseInterceptorsAsync(response, url, method, data, headers);
+    private _convertAngularHeadersToHttpClientHeaders(headers);
+    private _updateAngularHeadersFromHttpClientHeaders(httpClientHeaders, headers);
 }

src/cool-http.service.js

@@ -112,3 +112,3 @@ "use strict";
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'GET', null, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'GET', null, options, function (url, data, modOptions) {
                                 return that._http.get(url, modOptions);
@@ -129,3 +129,3 @@ })];
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'POST', data, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'POST', data, options, function (url, data, modOptions) {
                                 return that._http.post(url, data, modOptions);
@@ -146,3 +146,3 @@ })];
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'PUT', data, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'PUT', data, options, function (url, data, modOptions) {
                                 return that._http.put(url, data, modOptions);
@@ -163,3 +163,3 @@ })];
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'DELETE', null, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'DELETE', null, options, function (url, data, modOptions) {
                                 return that._http['delete'](url, modOptions);
@@ -180,3 +180,3 @@ })];
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'PATCH', data, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'PATCH', data, options, function (url, data, modOptions) {
                                 return that._http.patch(url, data, modOptions);
@@ -197,3 +197,3 @@ })];
                         that = this;
-                        return [4 /*yield*/, that.requestCoreAsync(url, 'HEAD', null, options, function (url, data, modOptions) {
+                        return [4 /*yield*/, that._requestCoreAsync(url, 'HEAD', null, options, function (url, data, modOptions) {
                                 return that._http.head(url, modOptions);
@@ -206,3 +206,3 @@ })];
     };
-    CoolHttp.prototype.requestCoreAsync = function (url, method, data, options, action) {
+    CoolHttp.prototype._requestCoreAsync = function (url, method, data, options, action) {
         return __awaiter(this, void 0, void 0, function () {
@@ -214,8 +214,8 @@ var clientHeaders, shouldIntercept, response, errorResponse_1, returnValue;
                         options.headers = options.headers || new http_1.Headers();
-                        url = this.convertUrl(url);
-                        this.appendGlobalHeaders(options.headers);
-                        this.tryAppendRegisteredCookiestoCustomHeaders(options.headers);
-                        this.modifyOptions(options);
-                        clientHeaders = this.convertAngularHeadersToHttpClientHeaders(options.headers);
-                        return [4 /*yield*/, this.invokeRequestInterceptorsAsync(url, method, data, clientHeaders)];
+                        url = this._convertUrl(url);
+                        this._appendGlobalHeaders(options.headers);
+                        this._tryAppendRegisteredCookiestoCustomHeaders(options.headers);
+                        this._modifyOptions(options);
+                        clientHeaders = this._convertAngularHeadersToHttpClientHeaders(options.headers);
+                        return [4 /*yield*/, this._invokeRequestInterceptorsAsync(url, method, data, clientHeaders)];
                     case 1:
@@ -226,2 +226,3 @@ shouldIntercept = _a.sent();
                         }
+                        this._updateAngularHeadersFromHttpClientHeaders(clientHeaders, options.headers);
                         _a.label = 2;
@@ -238,3 +239,3 @@ case 2:
                         return [3 /*break*/, 5];
-                    case 5: return [4 /*yield*/, this.invokeResponseInterceptorsAsync(response, url, method, data, clientHeaders)];
+                    case 5: return [4 /*yield*/, this._invokeResponseInterceptorsAsync(response, url, method, data, clientHeaders)];
                     case 6:
@@ -262,3 +263,3 @@ shouldIntercept = _a.sent();
         var that = this;
-        return that.requestCoreObservable(url, 'GET', null, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'GET', null, options, function (url, data, modOptions) {
             return that._http.get(url, modOptions);
@@ -270,3 +271,3 @@ });
         var that = this;
-        return that.requestCoreObservable(url, 'POST', data, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'POST', data, options, function (url, data, modOptions) {
             return that._http.post(url, data, modOptions);
@@ -278,3 +279,3 @@ });
         var that = this;
-        return that.requestCoreObservable(url, 'PUT', data, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'PUT', data, options, function (url, data, modOptions) {
             return that._http.put(url, data, modOptions);
@@ -286,3 +287,3 @@ });
         var that = this;
-        return that.requestCoreObservable(url, 'DELETE', null, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'DELETE', null, options, function (url, data, modOptions) {
             return that._http['delete'](url, modOptions);
@@ -294,3 +295,3 @@ });
         var that = this;
-        return that.requestCoreObservable(url, 'PATCH', data, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'PATCH', data, options, function (url, data, modOptions) {
             return that._http.patch(url, data, modOptions);
@@ -302,10 +303,10 @@ });
         var that = this;
-        return that.requestCoreObservable(url, 'HEAD', null, options, function (url, data, modOptions) {
+        return that._requestCoreObservable(url, 'HEAD', null, options, function (url, data, modOptions) {
             return that._http.head(url, modOptions);
         });
     };
-    CoolHttp.prototype.requestCoreObservable = function (url, method, data, options, action) {
-        return Rx_1.Observable.fromPromise(this.requestCoreAsync(url, method, data, options, action));
+    CoolHttp.prototype._requestCoreObservable = function (url, method, data, options, action) {
+        return Rx_1.Observable.fromPromise(this._requestCoreAsync(url, method, data, options, action));
     };
-    CoolHttp.prototype.convertUrl = function (url) {
+    CoolHttp.prototype._convertUrl = function (url) {
         var returnUrl = url;
@@ -317,3 +318,3 @@ if (this._baseUrl) {
     };
-    CoolHttp.prototype.modifyOptions = function (options) {
+    CoolHttp.prototype._modifyOptions = function (options) {
         if (this._withCredentials) {
@@ -323,3 +324,3 @@ options.withCredentials = true;
     };
-    CoolHttp.prototype.appendGlobalHeaders = function (headers) {
+    CoolHttp.prototype._appendGlobalHeaders = function (headers) {
         for (var _i = 0, _a = this._globalHeaders; _i < _a.length; _i++) {
@@ -330,3 +331,3 @@ var registeredHeader = _a[_i];
     };
-    CoolHttp.prototype.tryAppendRegisteredCookiestoCustomHeaders = function (headers) {
+    CoolHttp.prototype._tryAppendRegisteredCookiestoCustomHeaders = function (headers) {
         for (var _i = 0, _a = this._customCookieToHeaders; _i < _a.length; _i++) {
@@ -340,3 +341,3 @@ var cookieToHeader = _a[_i];
     };
-    CoolHttp.prototype.invokeRequestInterceptorsAsync = function (url, method, data, headers) {
+    CoolHttp.prototype._invokeRequestInterceptorsAsync = function (url, method, data, headers) {
         return __awaiter(this, void 0, void 0, function () {
@@ -367,3 +368,3 @@ var _i, _a, requestInterceptor, shouldIntercept;
     };
-    CoolHttp.prototype.invokeResponseInterceptorsAsync = function (response, url, method, data, headers) {
+    CoolHttp.prototype._invokeResponseInterceptorsAsync = function (response, url, method, data, headers) {
         return __awaiter(this, void 0, void 0, function () {
@@ -394,3 +395,3 @@ var _i, _a, responseInterceptor, shouldIntercept;
     };
-    CoolHttp.prototype.convertAngularHeadersToHttpClientHeaders = function (headers) {
+    CoolHttp.prototype._convertAngularHeadersToHttpClientHeaders = function (headers) {
         return headers.keys().map(function (headerKey) {
@@ -403,2 +404,11 @@ var httpClientHeader = new http_header_model_1.HttpHeader();
     };
+    CoolHttp.prototype._updateAngularHeadersFromHttpClientHeaders = function (httpClientHeaders, headers) {
+        for (var _i = 0, httpClientHeaders_1 = httpClientHeaders; _i < httpClientHeaders_1.length; _i++) {
+            var clientHeader = httpClientHeaders_1[_i];
+            var headerValue = headers.get(clientHeader.key);
+            if (headerValue !== clientHeader.value) {
+                headers.set(clientHeader.key, clientHeader.value);
+            }
+        }
+    };
     return CoolHttp;
@@ -405,0 +415,0 @@ }());

src/cool-http.service.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":3,"metadata":{"Func":{"__symbolic":"interface"},"CoolHttp":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/http","name":"Http"}]}],"registerBaseUrl":[{"__symbolic":"method"}],"setWithCredentials":[{"__symbolic":"method"}],"registerGlobalHeader":[{"__symbolic":"method"}],"deregisterGlobalHeader":[{"__symbolic":"method"}],"removeAllRegisteredGlobalHeaders":[{"__symbolic":"method"}],"registerRequestInterceptor":[{"__symbolic":"method"}],"deregisterRequestInterceptor":[{"__symbolic":"method"}],"registerResponseInterceptor":[{"__symbolic":"method"}],"deregisterResponseInterceptor":[{"__symbolic":"method"}],"sendCookieValueInCustomHeader":[{"__symbolic":"method"}],"getAsync":[{"__symbolic":"method"}],"postAsync":[{"__symbolic":"method"}],"putAsync":[{"__symbolic":"method"}],"deleteAsync":[{"__symbolic":"method"}],"patchAsync":[{"__symbolic":"method"}],"headAsync":[{"__symbolic":"method"}],"requestCoreAsync":[{"__symbolic":"method"}],"getObservable":[{"__symbolic":"method"}],"postObservable":[{"__symbolic":"method"}],"putObservable":[{"__symbolic":"method"}],"deleteObservable":[{"__symbolic":"method"}],"patchObservable":[{"__symbolic":"method"}],"headObservable":[{"__symbolic":"method"}],"requestCoreObservable":[{"__symbolic":"method"}],"convertUrl":[{"__symbolic":"method"}],"modifyOptions":[{"__symbolic":"method"}],"appendGlobalHeaders":[{"__symbolic":"method"}],"tryAppendRegisteredCookiestoCustomHeaders":[{"__symbolic":"method"}],"invokeRequestInterceptorsAsync":[{"__symbolic":"method"}],"invokeResponseInterceptorsAsync":[{"__symbolic":"method"}],"convertAngularHeadersToHttpClientHeaders":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"Func":{"__symbolic":"interface"},"CoolHttp":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/http","name":"Http"}]}],"registerBaseUrl":[{"__symbolic":"method"}],"setWithCredentials":[{"__symbolic":"method"}],"registerGlobalHeader":[{"__symbolic":"method"}],"deregisterGlobalHeader":[{"__symbolic":"method"}],"removeAllRegisteredGlobalHeaders":[{"__symbolic":"method"}],"registerRequestInterceptor":[{"__symbolic":"method"}],"deregisterRequestInterceptor":[{"__symbolic":"method"}],"registerResponseInterceptor":[{"__symbolic":"method"}],"deregisterResponseInterceptor":[{"__symbolic":"method"}],"sendCookieValueInCustomHeader":[{"__symbolic":"method"}],"getAsync":[{"__symbolic":"method"}],"postAsync":[{"__symbolic":"method"}],"putAsync":[{"__symbolic":"method"}],"deleteAsync":[{"__symbolic":"method"}],"patchAsync":[{"__symbolic":"method"}],"headAsync":[{"__symbolic":"method"}],"requestCoreAsync":[{"__symbolic":"method"}],"getObservable":[{"__symbolic":"method"}],"postObservable":[{"__symbolic":"method"}],"putObservable":[{"__symbolic":"method"}],"deleteObservable":[{"__symbolic":"method"}],"patchObservable":[{"__symbolic":"method"}],"headObservable":[{"__symbolic":"method"}],"requestCoreObservable":[{"__symbolic":"method"}],"convertUrl":[{"__symbolic":"method"}],"modifyOptions":[{"__symbolic":"method"}],"appendGlobalHeaders":[{"__symbolic":"method"}],"tryAppendRegisteredCookiestoCustomHeaders":[{"__symbolic":"method"}],"invokeRequestInterceptorsAsync":[{"__symbolic":"method"}],"invokeResponseInterceptorsAsync":[{"__symbolic":"method"}],"convertAngularHeadersToHttpClientHeaders":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":3,"metadata":{"Func":{"__symbolic":"interface"},"CoolHttp":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/http","name":"Http"}]}],"registerBaseUrl":[{"__symbolic":"method"}],"setWithCredentials":[{"__symbolic":"method"}],"registerGlobalHeader":[{"__symbolic":"method"}],"deregisterGlobalHeader":[{"__symbolic":"method"}],"removeAllRegisteredGlobalHeaders":[{"__symbolic":"method"}],"registerRequestInterceptor":[{"__symbolic":"method"}],"deregisterRequestInterceptor":[{"__symbolic":"method"}],"registerResponseInterceptor":[{"__symbolic":"method"}],"deregisterResponseInterceptor":[{"__symbolic":"method"}],"sendCookieValueInCustomHeader":[{"__symbolic":"method"}],"getAsync":[{"__symbolic":"method"}],"postAsync":[{"__symbolic":"method"}],"putAsync":[{"__symbolic":"method"}],"deleteAsync":[{"__symbolic":"method"}],"patchAsync":[{"__symbolic":"method"}],"headAsync":[{"__symbolic":"method"}],"_requestCoreAsync":[{"__symbolic":"method"}],"getObservable":[{"__symbolic":"method"}],"postObservable":[{"__symbolic":"method"}],"putObservable":[{"__symbolic":"method"}],"deleteObservable":[{"__symbolic":"method"}],"patchObservable":[{"__symbolic":"method"}],"headObservable":[{"__symbolic":"method"}],"_requestCoreObservable":[{"__symbolic":"method"}],"_convertUrl":[{"__symbolic":"method"}],"_modifyOptions":[{"__symbolic":"method"}],"_appendGlobalHeaders":[{"__symbolic":"method"}],"_tryAppendRegisteredCookiestoCustomHeaders":[{"__symbolic":"method"}],"_invokeRequestInterceptorsAsync":[{"__symbolic":"method"}],"_invokeResponseInterceptorsAsync":[{"__symbolic":"method"}],"_convertAngularHeadersToHttpClientHeaders":[{"__symbolic":"method"}],"_updateAngularHeadersFromHttpClientHeaders":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"Func":{"__symbolic":"interface"},"CoolHttp":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/http","name":"Http"}]}],"registerBaseUrl":[{"__symbolic":"method"}],"setWithCredentials":[{"__symbolic":"method"}],"registerGlobalHeader":[{"__symbolic":"method"}],"deregisterGlobalHeader":[{"__symbolic":"method"}],"removeAllRegisteredGlobalHeaders":[{"__symbolic":"method"}],"registerRequestInterceptor":[{"__symbolic":"method"}],"deregisterRequestInterceptor":[{"__symbolic":"method"}],"registerResponseInterceptor":[{"__symbolic":"method"}],"deregisterResponseInterceptor":[{"__symbolic":"method"}],"sendCookieValueInCustomHeader":[{"__symbolic":"method"}],"getAsync":[{"__symbolic":"method"}],"postAsync":[{"__symbolic":"method"}],"putAsync":[{"__symbolic":"method"}],"deleteAsync":[{"__symbolic":"method"}],"patchAsync":[{"__symbolic":"method"}],"headAsync":[{"__symbolic":"method"}],"_requestCoreAsync":[{"__symbolic":"method"}],"getObservable":[{"__symbolic":"method"}],"postObservable":[{"__symbolic":"method"}],"putObservable":[{"__symbolic":"method"}],"deleteObservable":[{"__symbolic":"method"}],"patchObservable":[{"__symbolic":"method"}],"headObservable":[{"__symbolic":"method"}],"_requestCoreObservable":[{"__symbolic":"method"}],"_convertUrl":[{"__symbolic":"method"}],"_modifyOptions":[{"__symbolic":"method"}],"_appendGlobalHeaders":[{"__symbolic":"method"}],"_tryAppendRegisteredCookiestoCustomHeaders":[{"__symbolic":"method"}],"_invokeRequestInterceptorsAsync":[{"__symbolic":"method"}],"_invokeResponseInterceptorsAsync":[{"__symbolic":"method"}],"_convertAngularHeadersToHttpClientHeaders":[{"__symbolic":"method"}],"_updateAngularHeadersFromHttpClientHeaders":[{"__symbolic":"method"}]}}}}]

No alert changes

Improved metrics

Total package byte prevSize

67713

increased by2.74%

Lines of code

568

increased by1.97%

No dependency changes