@deltares/fews-web-oc-utils 0.2.0 → 0.2.1-alpha.1
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/README.md +18 -8
- package/dist/fews-web-oc-utils.umd.js +1 -1
- package/lib/cjs/parser/index.js +2 -0
- package/lib/cjs/parser/index.js.map +1 -1
- package/lib/cjs/parser/plainTextParser.js +11 -0
- package/lib/cjs/parser/plainTextParser.js.map +1 -0
- package/lib/cjs/restservice/piRestService.js +31 -19
- package/lib/cjs/restservice/piRestService.js.map +1 -1
- package/lib/esm/parser/index.js +2 -0
- package/lib/esm/parser/index.js.map +1 -1
- package/lib/esm/parser/plainTextParser.js +7 -0
- package/lib/esm/parser/plainTextParser.js.map +1 -0
- package/lib/esm/restservice/piRestService.js +31 -19
- package/lib/esm/restservice/piRestService.js.map +1 -1
- package/lib/types/parser/index.d.ts +2 -0
- package/lib/types/parser/plainTextParser.d.ts +4 -0
- package/lib/types/restservice/dataRequestResult.d.ts +1 -0
- package/lib/types/restservice/piRestService.d.ts +8 -5
- package/package.json +9 -9
package/README.md
CHANGED
|
@@ -4,23 +4,33 @@
|
|
|
4
4
|
```
|
|
5
5
|
npm install
|
|
6
6
|
```
|
|
7
|
-
|
|
8
|
-
### Compiles and hot-reloads for development
|
|
9
|
-
```
|
|
10
|
-
npm run serve
|
|
11
|
-
```
|
|
12
|
-
|
|
13
7
|
### Compiles and minifies for production
|
|
14
8
|
```
|
|
15
9
|
npm run build
|
|
16
10
|
```
|
|
17
|
-
|
|
11
|
+
Build only esm bundle
|
|
12
|
+
```
|
|
13
|
+
npm run build:esm
|
|
14
|
+
```
|
|
15
|
+
Build only cjs bundle
|
|
16
|
+
```
|
|
17
|
+
npm run build:cjs
|
|
18
|
+
```
|
|
18
19
|
### Lints and fixes files
|
|
19
20
|
```
|
|
20
21
|
npm run lint
|
|
21
22
|
```
|
|
22
23
|
|
|
23
|
-
### Run
|
|
24
|
+
### Run tests
|
|
25
|
+
Get the coverage report
|
|
24
26
|
```
|
|
25
27
|
npm run test
|
|
26
28
|
```
|
|
29
|
+
Run only unit tests
|
|
30
|
+
```
|
|
31
|
+
npm run test:unit
|
|
32
|
+
```
|
|
33
|
+
Run only e2e tests
|
|
34
|
+
```
|
|
35
|
+
npm run test:e2e
|
|
36
|
+
```
|
|
@@ -1 +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,(
|
|
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,(()=>(()=>{"use strict";var e={d:(t,s)=>{for(var r in s)e.o(s,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:s[r]})},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:()=>a,PlainTextParser:()=>o,RequestOptions:()=>s});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 r{async parse(e){return await e.json()}}class a{webserviceUrl;transformRequest;constructor(e,t){if(this.webserviceUrl=e,void 0!==t)this.transformRequest=t;else{async function s(e){return e}this.transformRequest=s}}async getDataWithParser(e,t,s){const r=t.relativeUrl?this.webserviceUrl+e:e,a=new Request(r,{method:"GET"}),o=await fetch(await this.transformRequest(a));return await this.processResponse({},o,r,s)}async postDataWithParser(e,t,s,r,a){const o=t.relativeUrl?this.webserviceUrl+e:e,n={method:"POST"};n.body=r,n.headers=a;const i=new Request(o,n),c=await fetch(await this.transformRequest(i));return await this.processResponse({},c,o,s)}async getData(e){const t=new s;return t.relativeUrl=!e.startsWith("http"),this.getDataWithParser(e,t,new r)}async postData(e,t,a={"Content-Type":"application/json"}){const o=new s;return o.relativeUrl=!e.startsWith("http"),this.postDataWithParser(e,o,new r,t,a)}async processResponse(e,t,s,r){if(e.responseCode=t.status,e.contentType=t.headers.get("content-type"),200!=t.status)return e.errorMessage=t.statusText,e;try{e.data=await r.parse(t)}catch(e){throw e.message+=`\n When loading ${s}.`,e}return e}}class o{async parse(e){return await e.text()}}return t})()));
|
package/lib/cjs/parser/index.js
CHANGED
|
@@ -2,5 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./defaultParser.js"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./plainTextParser.js"), exports);
|
|
5
6
|
tslib_1.__exportStar(require("./responseParser.js"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./plainTextParser.js"), exports);
|
|
6
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,8DAAmC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,+DAAoC;AACpC,8DAAmC;AACnC,+DAAoC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PlainTextParser = void 0;
|
|
4
|
+
class PlainTextParser {
|
|
5
|
+
async parse(response) {
|
|
6
|
+
const text = await response.text();
|
|
7
|
+
return text;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.PlainTextParser = PlainTextParser;
|
|
11
|
+
//# sourceMappingURL=plainTextParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plainTextParser.js","sourceRoot":"","sources":["../../../src/parser/plainTextParser.ts"],"names":[],"mappings":";;;AAEA,MAAa,eAAe;IACxB,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC1B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,OAAO,IAAa,CAAC;IACzB,CAAC;CACJ;AALD,0CAKC"}
|
|
@@ -1,26 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PiRestService = void 0;
|
|
4
|
-
const defaultParser_js_1 = require("../parser/defaultParser.js");
|
|
5
4
|
const requestOptions_js_1 = require("./requestOptions.js");
|
|
5
|
+
const defaultParser_js_1 = require("../parser/defaultParser.js");
|
|
6
6
|
class PiRestService {
|
|
7
7
|
webserviceUrl;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
this._oauth2Token = value;
|
|
11
|
-
}
|
|
12
|
-
constructor(webserviceUrl) {
|
|
8
|
+
transformRequest;
|
|
9
|
+
constructor(webserviceUrl, transformRequestFn) {
|
|
13
10
|
this.webserviceUrl = webserviceUrl;
|
|
11
|
+
if (transformRequestFn !== undefined) {
|
|
12
|
+
this.transformRequest = transformRequestFn;
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
async function transformRequestFn(request) {
|
|
16
|
+
return request;
|
|
17
|
+
}
|
|
18
|
+
this.transformRequest = transformRequestFn;
|
|
19
|
+
}
|
|
14
20
|
}
|
|
15
21
|
async getDataWithParser(url, requestOption, parser) {
|
|
16
22
|
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
17
23
|
const dataRequestResult = {};
|
|
18
24
|
const requestParameters = {};
|
|
19
25
|
requestParameters.method = "GET";
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
26
|
+
const request = new Request(requestUrl, requestParameters);
|
|
27
|
+
const res = await fetch(await this.transformRequest(request));
|
|
28
|
+
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
29
|
+
}
|
|
30
|
+
async postDataWithParser(url, requestOption, parser, body, headers) {
|
|
31
|
+
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
32
|
+
const dataRequestResult = {};
|
|
33
|
+
const requestParameters = {};
|
|
34
|
+
requestParameters.method = "POST";
|
|
35
|
+
requestParameters.body = body;
|
|
36
|
+
requestParameters.headers = headers;
|
|
37
|
+
const request = new Request(requestUrl, requestParameters);
|
|
38
|
+
const res = await fetch(await this.transformRequest(request));
|
|
24
39
|
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
25
40
|
}
|
|
26
41
|
async getData(url) {
|
|
@@ -28,8 +43,14 @@ class PiRestService {
|
|
|
28
43
|
requestOption.relativeUrl = !url.startsWith("http");
|
|
29
44
|
return this.getDataWithParser(url, requestOption, new defaultParser_js_1.DefaultParser());
|
|
30
45
|
}
|
|
46
|
+
async postData(url, body, headers = { "Content-Type": "application/json" }) {
|
|
47
|
+
const requestOption = new requestOptions_js_1.RequestOptions();
|
|
48
|
+
requestOption.relativeUrl = !url.startsWith("http");
|
|
49
|
+
return this.postDataWithParser(url, requestOption, new defaultParser_js_1.DefaultParser(), body, headers);
|
|
50
|
+
}
|
|
31
51
|
async processResponse(dataRequestResult, res, url, parser) {
|
|
32
52
|
dataRequestResult.responseCode = res.status;
|
|
53
|
+
dataRequestResult.contentType = res.headers.get('content-type');
|
|
33
54
|
if (res.status != 200) {
|
|
34
55
|
dataRequestResult.errorMessage = res.statusText;
|
|
35
56
|
return dataRequestResult;
|
|
@@ -43,15 +64,6 @@ class PiRestService {
|
|
|
43
64
|
}
|
|
44
65
|
return dataRequestResult;
|
|
45
66
|
}
|
|
46
|
-
async getDataWithRequestInit(url, requestInit) {
|
|
47
|
-
const dataRequestResult = {};
|
|
48
|
-
if (this._oauth2Token !== undefined) {
|
|
49
|
-
const authorizationHeader = { "Authorization": "Bearer " + this._oauth2Token };
|
|
50
|
-
requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
|
|
51
|
-
}
|
|
52
|
-
const res = await fetch(url, requestInit);
|
|
53
|
-
return await this.processResponse(dataRequestResult, res, url, new defaultParser_js_1.DefaultParser());
|
|
54
|
-
}
|
|
55
67
|
}
|
|
56
68
|
exports.PiRestService = PiRestService;
|
|
57
69
|
//# sourceMappingURL=piRestService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/parser/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plainTextParser.js","sourceRoot":"","sources":["../../../src/parser/plainTextParser.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,eAAe;IACxB,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC1B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,OAAO,IAAa,CAAC;IACzB,CAAC;CACJ"}
|
|
@@ -1,23 +1,38 @@
|
|
|
1
|
-
import { DefaultParser } from "../parser/defaultParser.js";
|
|
2
1
|
import { RequestOptions } from "./requestOptions.js";
|
|
2
|
+
import { DefaultParser } from "../parser/defaultParser.js";
|
|
3
3
|
export class PiRestService {
|
|
4
4
|
webserviceUrl;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
this._oauth2Token = value;
|
|
8
|
-
}
|
|
9
|
-
constructor(webserviceUrl) {
|
|
5
|
+
transformRequest;
|
|
6
|
+
constructor(webserviceUrl, transformRequestFn) {
|
|
10
7
|
this.webserviceUrl = webserviceUrl;
|
|
8
|
+
if (transformRequestFn !== undefined) {
|
|
9
|
+
this.transformRequest = transformRequestFn;
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
async function transformRequestFn(request) {
|
|
13
|
+
return request;
|
|
14
|
+
}
|
|
15
|
+
this.transformRequest = transformRequestFn;
|
|
16
|
+
}
|
|
11
17
|
}
|
|
12
18
|
async getDataWithParser(url, requestOption, parser) {
|
|
13
19
|
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
14
20
|
const dataRequestResult = {};
|
|
15
21
|
const requestParameters = {};
|
|
16
22
|
requestParameters.method = "GET";
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
23
|
+
const request = new Request(requestUrl, requestParameters);
|
|
24
|
+
const res = await fetch(await this.transformRequest(request));
|
|
25
|
+
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
26
|
+
}
|
|
27
|
+
async postDataWithParser(url, requestOption, parser, body, headers) {
|
|
28
|
+
const requestUrl = requestOption.relativeUrl ? this.webserviceUrl + url : url;
|
|
29
|
+
const dataRequestResult = {};
|
|
30
|
+
const requestParameters = {};
|
|
31
|
+
requestParameters.method = "POST";
|
|
32
|
+
requestParameters.body = body;
|
|
33
|
+
requestParameters.headers = headers;
|
|
34
|
+
const request = new Request(requestUrl, requestParameters);
|
|
35
|
+
const res = await fetch(await this.transformRequest(request));
|
|
21
36
|
return await this.processResponse(dataRequestResult, res, requestUrl, parser);
|
|
22
37
|
}
|
|
23
38
|
async getData(url) {
|
|
@@ -25,8 +40,14 @@ export class PiRestService {
|
|
|
25
40
|
requestOption.relativeUrl = !url.startsWith("http");
|
|
26
41
|
return this.getDataWithParser(url, requestOption, new DefaultParser());
|
|
27
42
|
}
|
|
43
|
+
async postData(url, body, headers = { "Content-Type": "application/json" }) {
|
|
44
|
+
const requestOption = new RequestOptions();
|
|
45
|
+
requestOption.relativeUrl = !url.startsWith("http");
|
|
46
|
+
return this.postDataWithParser(url, requestOption, new DefaultParser(), body, headers);
|
|
47
|
+
}
|
|
28
48
|
async processResponse(dataRequestResult, res, url, parser) {
|
|
29
49
|
dataRequestResult.responseCode = res.status;
|
|
50
|
+
dataRequestResult.contentType = res.headers.get('content-type');
|
|
30
51
|
if (res.status != 200) {
|
|
31
52
|
dataRequestResult.errorMessage = res.statusText;
|
|
32
53
|
return dataRequestResult;
|
|
@@ -40,14 +61,5 @@ export class PiRestService {
|
|
|
40
61
|
}
|
|
41
62
|
return dataRequestResult;
|
|
42
63
|
}
|
|
43
|
-
async getDataWithRequestInit(url, requestInit) {
|
|
44
|
-
const dataRequestResult = {};
|
|
45
|
-
if (this._oauth2Token !== undefined) {
|
|
46
|
-
const authorizationHeader = { "Authorization": "Bearer " + this._oauth2Token };
|
|
47
|
-
requestInit.headers = { ...authorizationHeader, ...requestInit.headers };
|
|
48
|
-
}
|
|
49
|
-
const res = await fetch(url, requestInit);
|
|
50
|
-
return await this.processResponse(dataRequestResult, res, url, new DefaultParser());
|
|
51
|
-
}
|
|
52
64
|
}
|
|
53
65
|
//# sourceMappingURL=piRestService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"piRestService.js","sourceRoot":"","sources":["../../../src/restservice/piRestService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import DataRequestResult from "./dataRequestResult.js";
|
|
2
|
-
import { ResponseParser } from "../parser/responseParser.js";
|
|
3
2
|
import { RequestOptions } from "./requestOptions.js";
|
|
3
|
+
import { ResponseParser } from "../parser/responseParser.js";
|
|
4
|
+
export interface TransformRequestFunction {
|
|
5
|
+
(request: Request): Promise<Request>;
|
|
6
|
+
}
|
|
4
7
|
export declare class PiRestService {
|
|
5
8
|
private readonly webserviceUrl;
|
|
6
|
-
private
|
|
7
|
-
|
|
8
|
-
constructor(webserviceUrl: string);
|
|
9
|
+
private transformRequest;
|
|
10
|
+
constructor(webserviceUrl: string, transformRequestFn?: TransformRequestFunction);
|
|
9
11
|
getDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>): Promise<DataRequestResult<T>>;
|
|
12
|
+
postDataWithParser<T>(url: string, requestOption: RequestOptions, parser: ResponseParser<T>, body: any, headers: HeadersInit): Promise<DataRequestResult<T>>;
|
|
10
13
|
getData<T>(url: string): Promise<DataRequestResult<T>>;
|
|
14
|
+
postData<T>(url: string, body: any, headers?: HeadersInit): Promise<DataRequestResult<T>>;
|
|
11
15
|
private processResponse;
|
|
12
|
-
getDataWithRequestInit<T>(url: string, requestInit: RequestInit): Promise<DataRequestResult<T>>;
|
|
13
16
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deltares/fews-web-oc-utils",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.1-alpha.1",
|
|
4
4
|
"description": "Util Library for common Web OC functionality",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Werner Kramer",
|
|
@@ -35,26 +35,26 @@
|
|
|
35
35
|
"test": "jest --coverage"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@types/jest": "^
|
|
39
|
-
"@types/jsdom": "^
|
|
38
|
+
"@types/jest": "^29.5.0",
|
|
39
|
+
"@types/jsdom": "^21.1.1",
|
|
40
40
|
"@typescript-eslint/eslint-plugin": "^2.18.0",
|
|
41
41
|
"@typescript-eslint/parser": "^2.18.0",
|
|
42
42
|
"cross-fetch": "^3.1.5",
|
|
43
43
|
"dotenv": "^16.0.0",
|
|
44
44
|
"eslint": "^6.8.0",
|
|
45
45
|
"fetch-mock": "^9.11.0",
|
|
46
|
-
"jest": "^
|
|
47
|
-
"jest-environment-jsdom": "^29.0
|
|
46
|
+
"jest": "^29.5.0",
|
|
47
|
+
"jest-environment-jsdom": "^29.5.0",
|
|
48
48
|
"jest-junit": "^15.0.0",
|
|
49
49
|
"jest-teamcity-reporter": "^0.9.0",
|
|
50
|
-
"jsdom": "^
|
|
50
|
+
"jsdom": "^21.1.1",
|
|
51
51
|
"shx": "^0.3.2",
|
|
52
|
-
"ts-jest": "^
|
|
52
|
+
"ts-jest": "^29.1.0",
|
|
53
53
|
"ts-loader": "^9.3.1",
|
|
54
54
|
"typedoc": "^0.23.13",
|
|
55
55
|
"typescript": "^4.8.2",
|
|
56
|
-
"webpack": "^5.
|
|
57
|
-
"webpack-cli": "^
|
|
56
|
+
"webpack": "^5.79.0",
|
|
57
|
+
"webpack-cli": "^5.0.1"
|
|
58
58
|
},
|
|
59
59
|
"jest-junit": {
|
|
60
60
|
"outputDirectory": "reports/",
|