@deltares/fews-web-oc-utils 0.1.8 → 0.1.10

package/dist/fews-web-oc-utils.umd.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["fews-web-oc-utils"]=t():e["fews-web-oc-utils"]=t()}(self,(function(){return(()=>{"use strict";var e={d:(t,o)=>{for(var s in o)e.o(o,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:o[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{DefaultParser:()=>s,PiRestService:()=>o});class o{webserviceUrl;_oauth2Token=void 0;set oauth2Token(e){this._oauth2Token=e}constructor(e){this.webserviceUrl=e}async getDataWithParser(e,t){const o={},s={method:"GET"};void 0!==this._oauth2Token&&(s.headers={Authorization:"Bearer "+this._oauth2Token});const a=await fetch(e,s);return o.data=await t.parse(a),o}async getData(e){const t={method:"GET"};void 0!==this._oauth2Token&&(t.headers={Authorization:"Bearer "+this._oauth2Token});const o=await fetch(e,t);return await this.processResponse({},o,e)}async processResponse(e,t,o){if(e.responseCode=t.status,200!=t.status)return e.errorMessage=t.statusText,e;try{e.data=await t.json()}catch(e){throw e.message+=`\n When loading ${o}.`,e}return e}async getDataWithRequestInit(e,t){if(void 0!==this._oauth2Token){const e={Authorization:"Bearer "+this._oauth2Token};t.headers={...e,...t.headers}}const o=await fetch(e,t);return await this.processResponse({},o,e)}}class s{async parse(e){return await e.json()}}return t})()}));
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["fews-web-oc-utils"]=t():e["fews-web-oc-utils"]=t()}(self,(function(){return(()=>{"use strict";var e={d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{DefaultParser:()=>r,PiRestService:()=>o,RequestOptions:()=>s});class r{async parse(e){return await e.json()}}class s{_mode="cors";_relativeUrl=!0;get relativeUrl(){return this._relativeUrl}set relativeUrl(e){this._relativeUrl=e}get mode(){return this._mode}set mode(e){this._mode=e}}class o{webserviceUrl;_oauth2Token=void 0;set oauth2Token(e){this._oauth2Token=e}constructor(e){this.webserviceUrl=e}async getDataWithParser(e,t,r){const s=t.relativeUrl?this.webserviceUrl+e:e,o={method:"GET"};void 0!==this._oauth2Token&&(o.headers={Authorization:"Bearer "+this._oauth2Token});const a=await fetch(s,o);return await this.processResponse({},a,s,r)}async getData(e){const t=new s;return t.relativeUrl=!1,this.getDataWithParser(e,t,new r)}async processResponse(e,t,r,s){if(e.responseCode=t.status,200!=t.status)return e.errorMessage=t.statusText,e;try{e.data=await s.parse(t)}catch(e){throw e.message+=`\n When loading ${r}.`,e}return e}async getDataWithRequestInit(e,t){if(void 0!==this._oauth2Token){const e={Authorization:"Bearer "+this._oauth2Token};t.headers={...e,...t.headers}}const s=await fetch(e,t);return await this.processResponse({},s,e,new r)}}return t})()}));

package/dist/lib/parser/defaultParser.js

@@ -1,7 +1,6 @@
 export class DefaultParser {
     async parse(response) {
-        const result = await response.json();
-        return result;
+        return await response.json();
     }
 }
 //# sourceMappingURL=defaultParser.js.map

package/dist/lib/parser/defaultParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultParser.js","sourceRoot":"","sources":["../../../src/parser/defaultParser.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;IACtB,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC1B,MAAM,MAAM,GAAM,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ"}
+{"version":3,"file":"defaultParser.js","sourceRoot":"","sources":["../../../src/parser/defaultParser.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;IACtB,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC1B,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAChC,CAAC;CACJ"}

package/dist/lib/restservice/piRestService.js

@@ -1,3 +1,5 @@
+import { DefaultParser } from "../parser";
+import { RequestOptions } from "./requestOptions";
 export class PiRestService {
     webserviceUrl;
     _oauth2Token = undefined;
@@ -7,35 +9,30 @@ export class PiRestService {
     constructor(webserviceUrl) {
         this.webserviceUrl = webserviceUrl;
     }
-    async getDataWithParser(url, parser) {
+    async getDataWithParser(url, requestOption, parser) {
+        const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
         const dataRequestResult = {};
         const requestParameters = {};
         requestParameters.method = "GET";
         if (this._oauth2Token !== undefined) {
             requestParameters.headers = { "Authorization": "Bearer " + this._oauth2Token };
         }
-        const res = await fetch(url, requestParameters);
-        dataRequestResult.data = await parser.parse(res);
-        return dataRequestResult;
+        const res = await fetch(requestUrl, requestParameters);
+        return await this.processResponse(dataRequestResult, res, requestUrl, parser);
     }
     async getData(url) {
-        const dataRequestResult = {};
-        const requestParameters = {};
-        requestParameters.method = "GET";
-        if (this._oauth2Token !== undefined) {
-            requestParameters.headers = { "Authorization": "Bearer " + this._oauth2Token };
-        }
-        const res = await fetch(url, requestParameters);
-        return await this.processResponse(dataRequestResult, res, url);
+        const requestOption = new RequestOptions();
+        requestOption.relativeUrl = false;
+        return this.getDataWithParser(url, requestOption, new DefaultParser());
     }
-    async processResponse(dataRequestResult, res, url) {
+    async processResponse(dataRequestResult, res, url, parser) {
         dataRequestResult.responseCode = res.status;
         if (res.status != 200) {
             dataRequestResult.errorMessage = res.statusText;
             return dataRequestResult;
         }
         try {
-            dataRequestResult.data = await res.json();
+            dataRequestResult.data = await parser.parse(res);
         }
         catch (e) {
             e.message += `\n When loading ${url}.`;
@@ -50,7 +47,7 @@ export class PiRestService {
             requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
         }
         const res = await fetch(url, requestInit);
-        return await this.processResponse(dataRequestResult, res, url);
+        return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
     }
 }
 //# sourceMappingURL=piRestService.js.map

package/dist/lib/restservice/piRestService.js.map

@@ -1 +1 @@
-{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,aAAa;IACL,aAAa,CAAS;IAC/B,YAAY,GAAuB,SAAS,CAAC;IAErD,IAAI,WAAW,CAAC,KAAa;QACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,YAAY,aAAqB;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAI,GAAW,EAAE,MAAyB;QACpE,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,MAAM,iBAAiB,GAAG,EAAiB,CAAC;QAC5C,iBAAiB,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,iBAAiB,CAAC,OAAO,GAAG,EAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,YAAY,EAAC,CAAA;SAC/E;QACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAC,iBAAiB,CAAC,CAAC;QAC/C,iBAAiB,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAI,GAAW;QAC/B,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,MAAM,iBAAiB,GAAG,EAAiB,CAAC;QAC5C,iBAAiB,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,iBAAiB,CAAC,OAAO,GAAG,EAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,YAAY,EAAC,CAAA;SAC/E;QAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAC,iBAAiB,CAAC,CAAC;QAC/C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAI,iBAAuC,EAAE,GAAa,EAAE,GAAW;QAChG,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;YACnB,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,UAAU,CAAC;YAChD,OAAO,iBAAiB,CAAC;SAC5B;QACD,IAAI;YACA,iBAAiB,CAAC,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;SAC7C;QAAC,OAAO,CAAM,EAAE;YACb,CAAC,CAAC,OAAO,IAAI,mBAAmB,GAAG,GAAG,CAAA;YACtC,MAAM,CAAC,CAAC;SACX;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAI,GAAW,EAAE,WAAwB;QACxE,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,MAAM,mBAAmB,GAAG,EAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,YAAY,EAAC,CAAC;YAC7E,WAAW,CAAC,OAAO,GAAG,EAAC,GAAG,mBAAmB,EAAE,GAAG,WAAW,CAAC,OAAO,EAAC,CAAC;SAC1E;QACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;CACJ"}
+{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AACxC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,MAAM,OAAO,aAAa;IACL,aAAa,CAAS;IAC/B,YAAY,GAAuB,SAAS,CAAC;IAErD,IAAI,WAAW,CAAC,KAAa;QACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,YAAY,aAAqB;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAI,GAAW,EAAE,aAA6B,EAAE,MAAyB;QACnG,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9E,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,MAAM,iBAAiB,GAAG,EAAiB,CAAC;QAC5C,iBAAiB,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,iBAAiB,CAAC,OAAO,GAAG,EAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,YAAY,EAAC,CAAA;SAC/E;QACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,KAAK,CAAC,OAAO,CAAI,GAAW;QAC/B,MAAM,aAAa,GAAG,IAAI,cAAc,EAAE,CAAA;QAC1C,aAAa,CAAC,WAAW,GAAG,KAAK,CAAA;QACjC,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,eAAe,CAAI,iBAAuC,EAAE,GAAa,EAAE,GAAW,EAAE,MAAyB;QAC3H,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;YACnB,iBAAiB,CAAC,YAAY,GAAG,GAAG,CAAC,UAAU,CAAC;YAChD,OAAO,iBAAiB,CAAC;SAC5B;QACD,IAAI;YACA,iBAAiB,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpD;QAAC,OAAO,CAAM,EAAE;YACb,CAAC,CAAC,OAAO,IAAI,mBAAmB,GAAG,GAAG,CAAA;YACtC,MAAM,CAAC,CAAC;SACX;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAI,GAAW,EAAE,WAAwB;QACxE,MAAM,iBAAiB,GAAG,EAA0B,CAAC;QACrD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,MAAM,mBAAmB,GAAG,EAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,YAAY,EAAC,CAAC;YAC7E,WAAW,CAAC,OAAO,GAAG,EAAC,GAAG,mBAAmB,EAAE,GAAG,WAAW,CAAC,OAAO,EAAC,CAAC;SAC1E;QACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC;IACxF,CAAC;CACJ"}

package/dist/lib/restservice/requestOptions.js

@@ -1,2 +1,17 @@
-export {};
+export class RequestOptions {
+    _mode = "cors";
+    _relativeUrl = true;
+    get relativeUrl() {
+        return this._relativeUrl;
+    }
+    set relativeUrl(value) {
+        this._relativeUrl = value;
+    }
+    get mode() {
+        return this._mode;
+    }
+    set mode(value) {
+        this._mode = value;
+    }
+}
 //# sourceMappingURL=requestOptions.js.map

package/dist/lib/restservice/requestOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestOptions.js","sourceRoot":"","sources":["../../../src/restservice/requestOptions.ts"],"names":[],"mappings":""}
+{"version":3,"file":"requestOptions.js","sourceRoot":"","sources":["../../../src/restservice/requestOptions.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,cAAc;IACf,KAAK,GAAG,MAAM,CAAC;IACf,YAAY,GAAG,IAAI,CAAC;IAG5B,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW,CAAC,KAAK;QACjB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,IAAI,CAAC,KAAa;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;CAEJ"}

package/dist/types/restservice/piRestService.d.ts

@@ -1,11 +1,12 @@
 import DataRequestResult from "./dataRequestResult";
 import { ResponseParser } from "../parser/responseParser";
+import { RequestOptions } from "./requestOptions";
 export declare class PiRestService {
     private readonly webserviceUrl;
     private _oauth2Token;
     set oauth2Token(value: string);
     constructor(webserviceUrl: string);
-    getDataWithParser<T>(url: string, parser: ResponseParser<T>): Promise<DataRequestResult<T>>;
+    getDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>): Promise<DataRequestResult<T>>;
     getData<T>(url: string): Promise<DataRequestResult<T>>;
     private processResponse;
     getDataWithRequestInit<T>(url: string, requestInit: RequestInit): Promise<DataRequestResult<T>>;

package/dist/types/restservice/requestOptions.d.ts

@@ -1,3 +1,8 @@
-export default interface RequestOptions {
-    cache: string;
+export declare class RequestOptions {
+    private _mode;
+    private _relativeUrl;
+    get relativeUrl(): boolean;
+    set relativeUrl(value: boolean);
+    get mode(): string;
+    set mode(value: string);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deltares/fews-web-oc-utils",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Util Library for common Web OC functionality",
   "author": {
     "name": "Werner Kramer",

package/src/parser/defaultParser.ts

@@ -1,8 +1,7 @@
-import { ResponseParser } from "../parser/responseParser";
+import {ResponseParser} from "../parser/responseParser";
 
 export class DefaultParser<T> implements ResponseParser<T> {
     async parse(response: Response): Promise<T> {
-        const result: T = await response.json();
-        return result
+        return await response.json()
     }
 }

package/src/restservice/piRestService.ts

@@ -1,5 +1,7 @@
 import DataRequestResult from "./dataRequestResult";
 import {ResponseParser} from "../parser/responseParser";
+import {DefaultParser} from "../parser";
+import {RequestOptions} from "./requestOptions";
 
 export class PiRestService {
     private readonly webserviceUrl: string;
@@ -13,38 +15,32 @@ export class PiRestService {
         this.webserviceUrl = webserviceUrl;
     }
 
-    public async getDataWithParser<T>(url: string, parser: ResponseParser<T>): Promise<DataRequestResult<T>> {
+    public async getDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>): Promise<DataRequestResult<T>> {
+        const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
         const dataRequestResult = {} as DataRequestResult<T>;
         const requestParameters = {} as RequestInit;
         requestParameters.method = "GET";
         if (this._oauth2Token !== undefined) {
             requestParameters.headers = {"Authorization": "Bearer " + this._oauth2Token}
         }
-        const res = await fetch(url,requestParameters);
-        dataRequestResult.data = await parser.parse(res);
-        return dataRequestResult;
+        const res = await fetch(requestUrl, requestParameters);
+        return await this.processResponse(dataRequestResult, res, requestUrl, parser);
     }
 
     public async getData<T>(url: string): Promise<DataRequestResult<T>> {
-        const dataRequestResult = {} as DataRequestResult<T>;
-        const requestParameters = {} as RequestInit;
-        requestParameters.method = "GET";
-        if (this._oauth2Token !== undefined) {
-            requestParameters.headers = {"Authorization": "Bearer " + this._oauth2Token}
-        }
-
-        const res = await fetch(url,requestParameters);
-        return await this.processResponse(dataRequestResult, res, url);
+        const requestOption = new RequestOptions()
+        requestOption.relativeUrl = false
+        return this.getDataWithParser(url, requestOption, new DefaultParser());
     }
 
-    private async processResponse<T>(dataRequestResult: DataRequestResult<T>, res: Response, url: string): Promise<DataRequestResult<T>> {
+    private async processResponse<T>(dataRequestResult: DataRequestResult<T>, res: Response, url: string, parser: ResponseParser<T>): Promise<DataRequestResult<T>> {
         dataRequestResult.responseCode = res.status;
         if (res.status != 200) {
             dataRequestResult.errorMessage = res.statusText;
             return dataRequestResult;
         }
         try {
-            dataRequestResult.data = await res.json();
+            dataRequestResult.data = await parser.parse(res);
         } catch (e: any) {
             e.message += `\n When loading ${url}.`
             throw e;
@@ -59,6 +55,6 @@ export class PiRestService {
             requestInit.headers = {...authorizationHeader, ...requestInit.headers};
         }
         const res = await fetch(url, requestInit);
-        return await this.processResponse(dataRequestResult, res, url);
+        return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
     }
 }

package/src/restservice/requestOptions.ts

@@ -1,3 +1,22 @@
-export default interface RequestOptions {
-    cache: string;
+export class RequestOptions {
+    private _mode = "cors";
+    private _relativeUrl = true;
+
+
+    get relativeUrl(): boolean {
+        return this._relativeUrl;
+    }
+
+    set relativeUrl(value) {
+        this._relativeUrl = value;
+    }
+
+    get mode(): string {
+        return this._mode;
+    }
+
+    set mode(value: string) {
+        this._mode = value;
+    }
+
 }