@deltares/fews-web-oc-utils 0.1.11 → 0.2.1-alpha.0

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,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=!e.startsWith("http"),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})()}));
+!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;transformRequest;constructor(e,t){if(this.webserviceUrl=e,void 0!==t)this.transformRequest=t;else{async function r(e){return e}this.transformRequest=r}}async getDataWithParser(e,t,r){const s=t.relativeUrl?this.webserviceUrl+e:e,o=new Request(s,{method:"GET"}),a=await fetch(await this.transformRequest(o));return await this.processResponse({},a,s,r)}async getData(e){const t=new s;return t.relativeUrl=!e.startsWith("http"),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}}return t})()}));

package/lib/cjs/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./restservice/index.js"), exports);
+tslib_1.__exportStar(require("./parser/index.js"), exports);
+//# sourceMappingURL=index.js.map

package/lib/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,4DAAiC"}

package/lib/cjs/parser/defaultParser.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultParser = void 0;
+class DefaultParser {
+    async parse(response) {
+        return await response.json();
+    }
+}
+exports.DefaultParser = DefaultParser;
+//# sourceMappingURL=defaultParser.js.map

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

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

package/lib/cjs/parser/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./defaultParser.js"), exports);
+tslib_1.__exportStar(require("./responseParser.js"), exports);
+//# sourceMappingURL=index.js.map

package/lib/cjs/parser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,8DAAmC"}

package/lib/cjs/parser/responseParser.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=responseParser.js.map

package/lib/cjs/restservice/dataRequestResult.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=dataRequestResult.js.map

package/lib/cjs/restservice/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./dataRequestResult.js"), exports);
+tslib_1.__exportStar(require("./piRestService.js"), exports);
+tslib_1.__exportStar(require("./requestOptions.js"), exports);
+//# sourceMappingURL=index.js.map

package/lib/cjs/restservice/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/restservice/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,6DAAkC;AAClC,8DAAmC"}

package/lib/cjs/restservice/piRestService.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PiRestService = void 0;
+const defaultParser_js_1 = require("../parser/defaultParser.js");
+const requestOptions_js_1 = require("./requestOptions.js");
+class PiRestService {
+    webserviceUrl;
+    transformRequest;
+    constructor(webserviceUrl, transformRequestFn) {
+        this.webserviceUrl = webserviceUrl;
+        if (transformRequestFn !== undefined) {
+            this.transformRequest = transformRequestFn;
+        }
+        else {
+            async function transformRequestFn(request) {
+                return request;
+            }
+            this.transformRequest = transformRequestFn;
+        }
+    }
+    async getDataWithParser(url, requestOption, parser) {
+        const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
+        const dataRequestResult = {};
+        const requestParameters = {};
+        requestParameters.method = "GET";
+        const request = new Request(requestUrl, requestParameters);
+        const res = await fetch(await this.transformRequest(request));
+        return await this.processResponse(dataRequestResult, res, requestUrl, parser);
+    }
+    async getData(url) {
+        const requestOption = new requestOptions_js_1.RequestOptions();
+        requestOption.relativeUrl = !url.startsWith("http");
+        return this.getDataWithParser(url, requestOption, new defaultParser_js_1.DefaultParser());
+    }
+    async processResponse(dataRequestResult, res, url, parser) {
+        dataRequestResult.responseCode = res.status;
+        if (res.status != 200) {
+            dataRequestResult.errorMessage = res.statusText;
+            return dataRequestResult;
+        }
+        try {
+            dataRequestResult.data = await parser.parse(res);
+        }
+        catch (e) {
+            e.message += `\n When loading ${url}.`;
+            throw e;
+        }
+        return dataRequestResult;
+    }
+}
+exports.PiRestService = PiRestService;
+//# sourceMappingURL=piRestService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":";;;AAEA,iEAAyD;AACzD,2DAAmD;AAMnD,MAAa,aAAa;IACL,aAAa,CAAS;IAC/B,gBAAgB,CAA2B;IAEnD,YAAY,aAAqB,EAAE,kBAA6C;QAC5E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;aAAM;YACH,KAAK,UAAU,kBAAkB,CAAC,OAAgB;gBAC9C,OAAO,OAAO,CAAA;YAClB,CAAC;YACD,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;IACL,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,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,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,kCAAc,EAAE,CAAA;QAC1C,aAAa,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,gCAAa,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;CACJ;AA9CD,sCA8CC"}

package/lib/cjs/restservice/requestOptions.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestOptions = void 0;
+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;
+    }
+}
+exports.RequestOptions = RequestOptions;
+//# sourceMappingURL=requestOptions.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"requestOptions.js","sourceRoot":"","sources":["../../../src/restservice/requestOptions.ts"],"names":[],"mappings":";;;AAAA,MAAa,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;AArBD,wCAqBC"}

package/lib/esm/index.js

@@ -0,0 +1,3 @@
+export * from './restservice/index.js';
+export * from './parser/index.js';
+//# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA"}

package/lib/esm/parser/index.js

@@ -0,0 +1,3 @@
+export * from './defaultParser.js';
+export * from './responseParser.js';
+//# sourceMappingURL=index.js.map

package/lib/esm/parser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}

package/lib/esm/parser/responseParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"responseParser.js","sourceRoot":"","sources":["../../../src/parser/responseParser.ts"],"names":[],"mappings":""}

package/lib/esm/restservice/dataRequestResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataRequestResult.js","sourceRoot":"","sources":["../../../src/restservice/dataRequestResult.ts"],"names":[],"mappings":""}

package/lib/esm/restservice/index.js

@@ -0,0 +1,4 @@
+export * from './dataRequestResult.js';
+export * from './piRestService.js';
+export * from './requestOptions.js';
+//# sourceMappingURL=index.js.map

package/{dist/lib → lib/esm}/restservice/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/restservice/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/restservice/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}

package/{dist/lib → lib/esm}/restservice/piRestService.js

@@ -1,23 +1,27 @@
-import { DefaultParser } from "../parser";
-import { RequestOptions } from "./requestOptions";
+import { DefaultParser } from "../parser/defaultParser.js";
+import { RequestOptions } from "./requestOptions.js";
 export class PiRestService {
     webserviceUrl;
-    _oauth2Token = undefined;
-    set oauth2Token(value) {
-        this._oauth2Token = value;
-    }
-    constructor(webserviceUrl) {
+    transformRequest;
+    constructor(webserviceUrl, transformRequestFn) {
         this.webserviceUrl = webserviceUrl;
+        if (transformRequestFn !== undefined) {
+            this.transformRequest = transformRequestFn;
+        }
+        else {
+            async function transformRequestFn(request) {
+                return request;
+            }
+            this.transformRequest = transformRequestFn;
+        }
     }
     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(requestUrl, requestParameters);
+        const request = new Request(requestUrl, requestParameters);
+        const res = await fetch(await this.transformRequest(request));
         return await this.processResponse(dataRequestResult, res, requestUrl, parser);
     }
     async getData(url) {
@@ -40,14 +44,5 @@ export class PiRestService {
         }
         return dataRequestResult;
     }
-    async getDataWithRequestInit(url, requestInit) {
-        const dataRequestResult = {};
-        if (this._oauth2Token !== undefined) {
-            const authorizationHeader = { "Authorization": "Bearer " + this._oauth2Token };
-            requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
-        }
-        const res = await fetch(url, requestInit);
-        return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
-    }
 }
 //# sourceMappingURL=piRestService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAMnD,MAAM,OAAO,aAAa;IACL,aAAa,CAAS;IAC/B,gBAAgB,CAA2B;IAEnD,YAAY,aAAqB,EAAE,kBAA6C;QAC5E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;aAAM;YACH,KAAK,UAAU,kBAAkB,CAAC,OAAgB;gBAC9C,OAAO,OAAO,CAAA;YAClB,CAAC;YACD,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,CAAA;SAC7C;IACL,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,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,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,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,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;CACJ"}

package/lib/types/index.d.ts

@@ -0,0 +1,2 @@
+export * from './restservice/index.js';
+export * from './parser/index.js';

package/{dist → lib}/types/parser/defaultParser.d.ts

@@ -1,4 +1,4 @@
-import { ResponseParser } from "../parser/responseParser";
+import { ResponseParser } from "../parser/responseParser.js";
 export declare class DefaultParser<T> implements ResponseParser<T> {
     parse(response: Response): Promise<T>;
 }

package/lib/types/parser/index.d.ts

@@ -0,0 +1,2 @@
+export * from './defaultParser.js';
+export * from './responseParser.js';

package/lib/types/restservice/index.d.ts

@@ -0,0 +1,3 @@
+export * from './dataRequestResult.js';
+export * from './piRestService.js';
+export * from './requestOptions.js';

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

@@ -0,0 +1,14 @@
+import DataRequestResult from "./dataRequestResult.js";
+import { ResponseParser } from "../parser/responseParser.js";
+import { RequestOptions } from "./requestOptions.js";
+export interface TransformRequestFunction {
+    (request: Request): Promise<Request>;
+}
+export declare class PiRestService {
+    private readonly webserviceUrl;
+    private transformRequest;
+    constructor(webserviceUrl: string, transformRequestFn?: TransformRequestFunction);
+    getDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>): Promise<DataRequestResult<T>>;
+    getData<T>(url: string): Promise<DataRequestResult<T>>;
+    private processResponse;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deltares/fews-web-oc-utils",
-  "version": "0.1.11",
+  "version": "0.2.1-alpha.0",
   "description": "Util Library for common Web OC functionality",
   "author": {
     "name": "Werner Kramer",
@@ -13,12 +13,20 @@
     "Web OC"
   ],
   "license": "MIT",
-  "main": "./dist/fews-web-oc-utils.umd.js",
-  "typings": "./dist/types/index.d.ts",
+  "type": "module",
+  "exports": {
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js"
+  },
+  "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
+  "typings": "./lib/types/index.d.ts",
   "private": false,
   "scripts": {
-    "build": "npm run clean && tsc && webpack",
-    "clean": "shx rm -rf dist",
+    "build": "npm run clean && npm run build:esm && npm run build:cjs && webpack",
+    "build:esm": "tsc",
+    "build:cjs": "tsc --module commonjs --outDir lib/cjs",
+    "clean": "shx rm -rf lib dist",
     "doc": "typedoc --out doc src",
     "lint": "eslint src/**.ts",
     "lint:fix": "eslint src/**.ts --fix",
@@ -57,7 +65,7 @@
   },
   "files": [
     "dist/*",
-    "src/*"
+    "lib/*"
   ],
   "repository": {
     "type": "git",

package/dist/lib/index.js

@@ -1,3 +0,0 @@
-export * from './restservice';
-export * from './parser';
-//# sourceMappingURL=index.js.map

package/dist/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA"}

package/dist/lib/parser/index.js

@@ -1,3 +0,0 @@
-export * from './defaultParser';
-export * from './responseParser';
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA"}

package/dist/lib/restservice/index.js

@@ -1,4 +0,0 @@
-export * from './dataRequestResult';
-export * from './piRestService';
-export * from './requestOptions';
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"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,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,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/types/index.d.ts

@@ -1,2 +0,0 @@
-export * from './restservice';
-export * from './parser';

package/dist/types/parser/index.d.ts

@@ -1,2 +0,0 @@
-export * from './defaultParser';
-export * from './responseParser';

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

@@ -1,3 +0,0 @@
-export * from './dataRequestResult';
-export * from './piRestService';
-export * from './requestOptions';

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

@@ -1,13 +0,0 @@
-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, 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/src/index.ts

@@ -1,2 +0,0 @@
-export * from './restservice'
-export * from './parser'

package/src/parser/defaultParser.ts

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

package/src/parser/index.ts

@@ -1,2 +0,0 @@
-export * from './defaultParser'
-export * from './responseParser'

package/src/parser/responseParser.ts

@@ -1,3 +0,0 @@
-export interface ResponseParser<T> {
-    parse(response: Response): Promise<T>;
-}

package/src/restservice/dataRequestResult.ts

@@ -1,6 +0,0 @@
-export default interface DataRequestResult<T> {
-    responseCode: number;
-    errorMessage: string;
-    data: T;
-
-}

package/src/restservice/index.ts

@@ -1,3 +0,0 @@
-export * from './dataRequestResult'
-export * from './piRestService'
-export * from './requestOptions'

package/src/restservice/piRestService.ts

@@ -1,60 +0,0 @@
-import DataRequestResult from "./dataRequestResult";
-import {ResponseParser} from "../parser/responseParser";
-import {DefaultParser} from "../parser";
-import {RequestOptions} from "./requestOptions";
-
-export class PiRestService {
-    private readonly webserviceUrl: string;
-    private _oauth2Token: string | undefined = undefined;
-
-    set oauth2Token(value: string) {
-        this._oauth2Token = value;
-    }
-
-    constructor(webserviceUrl: string) {
-        this.webserviceUrl = webserviceUrl;
-    }
-
-    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(requestUrl, requestParameters);
-        return await this.processResponse(dataRequestResult, res, requestUrl, parser);
-    }
-
-    public async getData<T>(url: string): Promise<DataRequestResult<T>> {
-        const requestOption = new RequestOptions()
-        requestOption.relativeUrl = !url.startsWith("http")
-        return this.getDataWithParser(url, requestOption, new DefaultParser());
-    }
-
-    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 parser.parse(res);
-        } catch (e: any) {
-            e.message += `\n When loading ${url}.`
-            throw e;
-        }
-        return dataRequestResult;
-    }
-
-    public async getDataWithRequestInit<T>(url: string, requestInit: RequestInit): Promise<DataRequestResult<T>> {
-        const dataRequestResult = {} as DataRequestResult<T>;
-        if (this._oauth2Token !== undefined) {
-            const authorizationHeader = {"Authorization": "Bearer " + this._oauth2Token};
-            requestInit.headers = {...authorizationHeader, ...requestInit.headers};
-        }
-        const res = await fetch(url, requestInit);
-        return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
-    }
-}

package/src/restservice/requestOptions.ts

@@ -1,22 +0,0 @@
-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;
-    }
-
-}