Upgrade to 1.2

WinUP · May 14, 2018 · f03a693 · f03a693
1 parent f00b34c
commit f03a693
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,6 @@ Resource provider for Angular HttpClient.
 | ```server.contentType``` | ```'application/json'``` | Default content type |
 | ```assets.address``` | ```''``` | Default address from ```assets``` protocol |
 
-```typescript
-SerializableNode.set(StorageProtocol.config, StorageProtocol.configKeys.root.cache, 'ROOT');
-SerializableNode.set(StorageProtocol.config, StorageProtocol.configKeys.root.local, 'DLCS');
-```
-
 ### Supported protocol
 
 * ```remote``` for access default server defined in Configuration.
@@ -65,10 +60,10 @@ resourceManager.registerProtocol(new AngularHttpProtocol(this.httpClient)); // A
 // Request data
 resourceManager.request.to(`http://www.google.com`).tag('google').send();
 // Request using default server
-SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.address, 'http://www.a.org');
+http.config.server.address = 'http://www.a.org';
 resourceManager.request.to(`remote:///test.txt`).tag('test').send();
 // Request static file
-SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.assets.address, '/assets');
+http.config.assets.address = '/assets';
 resourceManager.request.to(`assets:///test.txt`).tag('test_local').send();
 // POST data
 resourceManager.request.to(`http://www.test.org`).param({ method: XHRMethod.POST }).tag('google').send();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dlcs/provider-angular-http",
-  "version": "1.1.1",
-  "description": "Angular 5+ HttpClient provider for Deus Legem Creation System",
+  "version": "1.2.0",
+  "description": "Angular 6+ HttpClient provider for Deus Legem Creation System",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "private": false,
@@ -24,11 +24,11 @@
     "typescript": "2.8.3"
   },
   "dependencies": {
-    "@angular/common": ">=5.0.0",
-    "@angular/core": ">=5.0.0",
-    "@dlcs/core": "~1.1.0",
-    "@dlcs/tools": "~1.0.8",
-    "rxjs": "^5.5.10"
+    "@angular/common": ">=6.0.0",
+    "@angular/core": ">=6.0.0",
+    "@dlcs/core": "~1.2.0",
+    "@dlcs/tools": "~1.2.1",
+    "rxjs": ">=6.0.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/AngularHttpRequestParams.ts b/src/AngularHttpRequestParams.ts
@@ -20,7 +20,7 @@ export interface AngularHttpRequestParams {
     /**
      * Query parameters.
      */
-    querys?: { [key: string]: string };
+    queries?: { [key: string]: string };
     /**
      * Request body. Only affects POST/PUT/PATCH.
      */

diff --git a/src/angular-http.protocol.ts b/src/angular-http.protocol.ts
@@ -1,11 +1,8 @@
-import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse } from '@angular/common/http';
-import { SerializableNode, autoname, toPascalCase, isValueAvailable } from '@dlcs/tools';
+import { HttpClient, HttpHeaders, HttpParams, HttpErrorResponse } from '@angular/common/http';
 import { ResourceProtocol, ResourceRequest, InjectorTimepoint } from '@dlcs/core';
-import { TimeoutError } from 'rxjs/util/TimeoutError';
-import { catchError } from 'rxjs/operators/catchError';
-import { Observable } from 'rxjs/Observable';
-import { timeout } from 'rxjs/operators/timeout';
-import { _throw } from 'rxjs/observable/throw';
+import { Observable, throwError, TimeoutError } from 'rxjs';
+import { catchError, timeout } from 'rxjs/operators';
+import { isValueAvailable } from '@dlcs/tools';
 
 import { AngularHttpRequestParams } from './AngularHttpRequestParams';
 import { AngularHttpRequestData } from './AngularHttpRequestData';
@@ -15,7 +12,7 @@ import { XHRMethod } from './XHRMethod';
 /**
  * Configuration keys for StorageProtocol
  */
-export interface AngularHttpProtocolConfigKeys {
+export interface AngularHttpProtocolConfig {
     /**
      * Default server configuration for protocol ```remote```.
      */
@@ -29,7 +26,7 @@ export interface AngularHttpProtocolConfigKeys {
          * Default resposne type, only allows ```ResponseType``` value
          * @default ResponseType.JSON
          */
-        responseType: string,
+        responseType: ResponseType,
         /**
          * Default content type
          * @default 'application/json'
@@ -49,23 +46,14 @@ export interface AngularHttpProtocolConfigKeys {
 }
 
 export class AngularHttpProtocol extends ResourceProtocol {
-    private static _config: SerializableNode = SerializableNode.create('AngularHttpProtocol', undefined);
-    private static _configKeys: AngularHttpProtocolConfigKeys = {
-        server: { address: '', responseType: '', contentType: '' },
+    private _config: AngularHttpProtocolConfig = {
+        server: { address: '', responseType: ResponseType.JSON, contentType: '' },
         assets: { address: '' }
     };
 
-    public static initialize(): void {
-        autoname(AngularHttpProtocol._configKeys, '/', toPascalCase);
-        SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.address, '');
-        SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.contentType, 'application/json');
-        SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.responseType, ResponseType.JSON);
-        SerializableNode.set(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.assets.address, '');
-    }
-
     /**
      * Create new AngularHttpProtocol
-     * @param httpClient Angular 5+ HttpClient service
+     * @param httpClient Angular 6+ HttpClient service
      */
     public constructor(private httpClient: HttpClient) {
         super('remote', 'assets', 'http', 'https');
@@ -74,23 +62,16 @@ export class AngularHttpProtocol extends ResourceProtocol {
     /**
      * Get configuration
      */
-    public static get config(): SerializableNode {
-        return AngularHttpProtocol._config;
+    public get config(): AngularHttpProtocolConfig {
+        return this._config;
     }
 
-    /**
-     * Get configuration keys
-     */
-    public static get configKeys(): Readonly<AngularHttpProtocolConfigKeys> {
-        return AngularHttpProtocol._configKeys;
-    }
-
-    private static packRequest(raw: ResourceRequest): AngularHttpRequestData {
+    private packRequest(raw: ResourceRequest): AngularHttpRequestData {
         const request: { params: HttpParams, responseType: ResponseType, headers: HttpHeaders, observe: 'response' | 'body' } = {
             params: new HttpParams(),
             headers: new HttpHeaders(),
             observe: 'body',
-            responseType: SerializableNode.get<ResponseType>(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.responseType)
+            responseType: this.config.server.responseType
         };
         if (!isValueAvailable(request.responseType)) {
             request.responseType = ResponseType.JSON;
@@ -104,8 +85,7 @@ export class AngularHttpProtocol extends ResourceProtocol {
         if (rawParams.contentType) { // 请求格式
             request.headers = request.headers.set('Content-Type', rawParams.contentType);
         } else {
-            const defaultContentType =
-                SerializableNode.get<string>(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.contentType);
+            const defaultContentType = this.config.server.contentType;
             if (defaultContentType) {
                 request.headers = request.headers.append('Content-Type', defaultContentType);
             }
@@ -117,9 +97,9 @@ export class AngularHttpProtocol extends ResourceProtocol {
                 request.responseType = rawParams.responseType;
             }
         }
-        if (rawParams.querys) { // 查询参数
-            Object.keys(rawParams.querys).forEach(key => {
-                const value = rawParams.querys![key];
+        if (rawParams.queries) { // 查询参数
+            Object.keys(rawParams.queries).forEach(key => {
+                const value = rawParams.queries![key];
                 if (isValueAvailable(value)) {
                     request.params = request.params.set(key, value);
                 }
@@ -131,23 +111,23 @@ export class AngularHttpProtocol extends ResourceProtocol {
             body: rawParams.body,
             timeout: rawParams.timeout || 0,
             method: method,
-            url: AngularHttpProtocol.assembleUrl(raw, method)
+            url: this.assembleUrl(raw, method)
         };
     }
 
-    private static assembleUrl(request: ResourceRequest, method: XHRMethod): string {
+    private assembleUrl(request: ResourceRequest, method: XHRMethod): string {
         let url = request.protocol;
         if (request.protocol === 'assets') {
             if (method !== XHRMethod.GET) {
                 throw new TypeError(`Cannot request asset file ${request.address}: Only GET method is allowed for this protocol`);
             }
-            const base = SerializableNode.get<string>(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.assets.address);
+            const base = this.config.assets.address;
             if (!isValueAvailable(base)) {
                 throw new ReferenceError(`Cannot request asset file ${request.address}: No assets directory provided`);
             }
             url = `${base}${request.address}`;
         } else if (request.protocol === 'remote') {
-            const base = SerializableNode.get<string>(AngularHttpProtocol.config, AngularHttpProtocol.configKeys.server.address);
+            const base = this.config.server.address;
             if (!isValueAvailable(base)) {
                 throw new ReferenceError(`Cannot request asset file ${request.address}: No default server provided`);
             }
@@ -188,23 +168,21 @@ export class AngularHttpProtocol extends ResourceProtocol {
     }
 
     public request(request: ResourceRequest, injector: (data: any, timepoint: InjectorTimepoint) => any): Observable<any> {
-        let data = AngularHttpProtocol.packRequest(request);
+        let data = this.packRequest(request);
         injector && (data = injector(data, InjectorTimepoint.BeforeSend));
         let result: Observable<any> = this.makeRequest(data);
         result = result.pipe(catchError(e => {
             return e instanceof TimeoutError
-                ? _throw(new HttpErrorResponse({
+                ? throwError(new HttpErrorResponse({
                     error: e.message,
                     status: 408,
                     headers: data.info.headers,
                     statusText: e.name,
                     url: request.address
                 }))
-                : _throw(e);
+                : throwError(e);
         }));
         injector && (result = injector(result, InjectorTimepoint.AfterSent));
         return result;
     }
 }
-
-AngularHttpProtocol.initialize();