@equinor/fusion-framework-module-services 2.3.1 → 2.5.0
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/CHANGELOG.md +12 -0
- package/dist/esm/context/client.js +5 -0
- package/dist/esm/context/client.js.map +1 -1
- package/dist/esm/context/related/client.js +4 -0
- package/dist/esm/context/related/client.js.map +1 -0
- package/dist/esm/context/related/generate-endpoint.js +44 -0
- package/dist/esm/context/related/generate-endpoint.js.map +1 -0
- package/dist/esm/context/related/generate-parameters.js +7 -0
- package/dist/esm/context/related/generate-parameters.js.map +1 -0
- package/dist/esm/context/related/index.js +6 -0
- package/dist/esm/context/related/index.js.map +1 -0
- package/dist/esm/context/related/types.js +2 -0
- package/dist/esm/context/related/types.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/context/client.d.ts +2 -0
- package/dist/types/context/related/client.d.ts +4 -0
- package/dist/types/context/related/generate-endpoint.d.ts +3 -0
- package/dist/types/context/related/generate-parameters.d.ts +4 -0
- package/dist/types/context/related/index.d.ts +5 -0
- package/dist/types/context/related/types.d.ts +29 -0
- package/package.json +5 -2
- package/src/context/client.ts +23 -0
- package/src/context/related/client.ts +35 -0
- package/src/context/related/generate-endpoint.ts +62 -0
- package/src/context/related/generate-parameters.ts +23 -0
- package/src/context/related/index.ts +8 -0
- package/src/context/related/types.ts +63 -0
|
@@ -2,6 +2,7 @@ import { IHttpClient } from '@equinor/fusion-framework-module-http';
|
|
|
2
2
|
import { ClientMethod, ApiVersion } from '@equinor/fusion-framework-module-services/context';
|
|
3
3
|
import { GetContextFn, GetContextResponse, GetContextResult } from './get';
|
|
4
4
|
import { QueryContextFn, QueryContextResponse, QueryContextResult } from './query';
|
|
5
|
+
import { RelatedContextFn, RelatedContextResponse, RelatedContextResult } from './related';
|
|
5
6
|
export declare class ContextApiClient<TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient = IHttpClient> {
|
|
6
7
|
protected _client: TClient;
|
|
7
8
|
protected _method: TMethod;
|
|
@@ -9,5 +10,6 @@ export declare class ContextApiClient<TMethod extends keyof ClientMethod<unknown
|
|
|
9
10
|
constructor(_client: TClient, _method: TMethod);
|
|
10
11
|
get<TVersion extends string = keyof typeof ApiVersion, TResult = GetContextResponse<TVersion>>(version: TVersion, ...args: Parameters<GetContextFn<TVersion, TMethod, TClient, TResult>>): GetContextResult<TVersion, TMethod, TResult>;
|
|
11
12
|
query<TVersion extends string = keyof typeof ApiVersion, TResult = QueryContextResponse<TVersion>>(version: TVersion, ...args: Parameters<QueryContextFn<TVersion, TMethod, TClient, TResult>>): QueryContextResult<TVersion, TMethod, TResult>;
|
|
13
|
+
related<TVersion extends string = keyof typeof ApiVersion, TResult = RelatedContextResponse<TVersion>>(version: TVersion, ...args: Parameters<RelatedContextFn<TVersion, TMethod, TClient, TResult>>): RelatedContextResult<TVersion, TMethod, TResult>;
|
|
12
14
|
}
|
|
13
15
|
export default ContextApiClient;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
import type { RelatedContextArgs, RelatedContextResponse, RelatedContextResult, ClientMethod } from './types';
|
|
3
|
+
export declare const relatedContexts: <TVersion extends string = "v1" | "v2", TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>>(client: TClient, version: TVersion, method?: TMethod) => <T = RelatedContextResponse<TVersion>>(args: RelatedContextArgs<TVersion>, init?: ClientRequestInit<TClient, T> | undefined) => RelatedContextResult<TVersion, TMethod, T>;
|
|
4
|
+
export default relatedContexts;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
import type { RelatedContextArgs, ApiClientArguments } from './types';
|
|
3
|
+
export declare const generateParameters: <TResult, TVersion extends string = "v1" | "v2", TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>>(version: TVersion, args: RelatedContextArgs<TVersion>, init?: ClientRequestInit<TClient, TResult> | undefined) => ApiClientArguments<TClient, TResult>;
|
|
4
|
+
export default generateParameters;
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export { ApiVersion, ApiContextEntity } from '@equinor/fusion-framework-module-services/context';
|
|
2
|
+
export { generateEndpoint } from './generate-endpoint';
|
|
3
|
+
export { generateParameters } from './generate-parameters';
|
|
4
|
+
export * from './types';
|
|
5
|
+
export { relatedContexts, default } from './client';
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
import { ApiVersion, ApiContextEntity, ClientMethod } from '@equinor/fusion-framework-module-services/context';
|
|
3
|
+
export { ApiClientArguments, ClientMethod, } from '@equinor/fusion-framework-module-services/context';
|
|
4
|
+
export type RelatedContextOdataFilter = {
|
|
5
|
+
type?: string[];
|
|
6
|
+
};
|
|
7
|
+
export type RelatedContextOdataParameters = {
|
|
8
|
+
search?: string;
|
|
9
|
+
filter?: RelatedContextOdataFilter;
|
|
10
|
+
};
|
|
11
|
+
type RelatedContextArgs_v1 = {
|
|
12
|
+
id: string;
|
|
13
|
+
query?: string | RelatedContextOdataParameters;
|
|
14
|
+
};
|
|
15
|
+
type RelatedContextArgs_v2 = RelatedContextArgs_v1;
|
|
16
|
+
type RelatedContextArgTypes = {
|
|
17
|
+
[ApiVersion.v1]: RelatedContextArgs_v1;
|
|
18
|
+
[ApiVersion.v2]: RelatedContextArgs_v2;
|
|
19
|
+
};
|
|
20
|
+
export type RelatedContextArgs<T> = T extends keyof typeof ApiVersion ? RelatedContextArgTypes[(typeof ApiVersion)[T]] : {
|
|
21
|
+
id: string;
|
|
22
|
+
};
|
|
23
|
+
type RelatedContextResponseTypes = {
|
|
24
|
+
[ApiVersion.v1]: Array<ApiContextEntity<ApiVersion.v1>>;
|
|
25
|
+
[ApiVersion.v2]: Array<ApiContextEntity<ApiVersion.v2>>;
|
|
26
|
+
};
|
|
27
|
+
export type RelatedContextResponse<T> = T extends keyof typeof ApiVersion ? RelatedContextResponseTypes[(typeof ApiVersion)[T]] : unknown;
|
|
28
|
+
export type RelatedContextFn<TVersion extends string = keyof typeof ApiVersion, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient = IHttpClient, TResult = RelatedContextResponse<TVersion>> = (args: RelatedContextArgs<TVersion>, init?: ClientRequestInit<TClient, TResult>) => RelatedContextResult<TVersion, TMethod, TResult>;
|
|
29
|
+
export type RelatedContextResult<TVersion extends string = keyof typeof ApiVersion, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TResult = RelatedContextResponse<TVersion>> = ClientMethod<TResult>[TMethod];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-framework-module-services",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "dist/esm/index.js",
|
|
@@ -22,6 +22,9 @@
|
|
|
22
22
|
"context/query": [
|
|
23
23
|
"dist/types/context/query/index"
|
|
24
24
|
],
|
|
25
|
+
"context/related": [
|
|
26
|
+
"dist/types/context/related/index"
|
|
27
|
+
],
|
|
25
28
|
"bookmarks": [
|
|
26
29
|
"dist/types/bookmarks/index"
|
|
27
30
|
]
|
|
@@ -63,5 +66,5 @@
|
|
|
63
66
|
"@equinor/fusion-framework-module": ">=1.2.2",
|
|
64
67
|
"odata-query": "^7.0.3"
|
|
65
68
|
},
|
|
66
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "dd4ed92c8f1d020f3b537172b4fe7788aeae99e7"
|
|
67
70
|
}
|
package/src/context/client.ts
CHANGED
|
@@ -3,8 +3,16 @@ import { IHttpClient } from '@equinor/fusion-framework-module-http';
|
|
|
3
3
|
import { ClientMethod, ApiVersion } from '@equinor/fusion-framework-module-services/context';
|
|
4
4
|
|
|
5
5
|
import { getContext, GetContextFn, GetContextResponse, GetContextResult } from './get';
|
|
6
|
+
|
|
6
7
|
import { queryContext, QueryContextFn, QueryContextResponse, QueryContextResult } from './query';
|
|
7
8
|
|
|
9
|
+
import {
|
|
10
|
+
RelatedContextFn,
|
|
11
|
+
RelatedContextResponse,
|
|
12
|
+
RelatedContextResult,
|
|
13
|
+
relatedContexts,
|
|
14
|
+
} from './related';
|
|
15
|
+
|
|
8
16
|
export class ContextApiClient<
|
|
9
17
|
TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
|
|
10
18
|
TClient extends IHttpClient = IHttpClient
|
|
@@ -44,6 +52,21 @@ export class ContextApiClient<
|
|
|
44
52
|
const fn = queryContext<TVersion, TMethod, TClient>(this._client, version, this._method);
|
|
45
53
|
return fn<TResult>(...args);
|
|
46
54
|
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Query context service
|
|
58
|
+
* @see {@link query/client}
|
|
59
|
+
*/
|
|
60
|
+
public related<
|
|
61
|
+
TVersion extends string = keyof typeof ApiVersion,
|
|
62
|
+
TResult = RelatedContextResponse<TVersion>
|
|
63
|
+
>(
|
|
64
|
+
version: TVersion,
|
|
65
|
+
...args: Parameters<RelatedContextFn<TVersion, TMethod, TClient, TResult>>
|
|
66
|
+
): RelatedContextResult<TVersion, TMethod, TResult> {
|
|
67
|
+
const fn = relatedContexts<TVersion, TMethod, TClient>(this._client, version, this._method);
|
|
68
|
+
return fn<TResult>(...args);
|
|
69
|
+
}
|
|
47
70
|
}
|
|
48
71
|
|
|
49
72
|
export default ContextApiClient;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
|
|
3
|
+
import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
|
|
4
|
+
|
|
5
|
+
import { generateParameters } from './generate-parameters';
|
|
6
|
+
|
|
7
|
+
import type {
|
|
8
|
+
RelatedContextArgs,
|
|
9
|
+
RelatedContextResponse,
|
|
10
|
+
RelatedContextResult,
|
|
11
|
+
ClientMethod,
|
|
12
|
+
} from './types';
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Function for querying the context service
|
|
16
|
+
*/
|
|
17
|
+
export const relatedContexts =
|
|
18
|
+
<
|
|
19
|
+
TVersion extends string = keyof typeof ApiVersion,
|
|
20
|
+
TMethod extends keyof ClientMethod = keyof ClientMethod,
|
|
21
|
+
TClient extends IHttpClient = IHttpClient
|
|
22
|
+
>(
|
|
23
|
+
client: TClient,
|
|
24
|
+
version: TVersion,
|
|
25
|
+
method: TMethod = 'json' as TMethod
|
|
26
|
+
) =>
|
|
27
|
+
<T = RelatedContextResponse<TVersion>>(
|
|
28
|
+
args: RelatedContextArgs<TVersion>,
|
|
29
|
+
init?: ClientRequestInit<TClient, T>
|
|
30
|
+
): RelatedContextResult<TVersion, TMethod, T> =>
|
|
31
|
+
client[method](
|
|
32
|
+
...generateParameters<T, TVersion, TClient>(version, args, init)
|
|
33
|
+
) as RelatedContextResult<TVersion, TMethod, T>;
|
|
34
|
+
|
|
35
|
+
export default relatedContexts;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import buildOdataQuery from 'odata-query';
|
|
2
|
+
|
|
3
|
+
import { UnsupportedApiVersion } from '@equinor/fusion-framework-module-services/errors';
|
|
4
|
+
|
|
5
|
+
import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
|
|
6
|
+
|
|
7
|
+
import type {
|
|
8
|
+
RelatedContextArgs,
|
|
9
|
+
RelatedContextOdataFilter,
|
|
10
|
+
RelatedContextOdataParameters,
|
|
11
|
+
} from './types';
|
|
12
|
+
|
|
13
|
+
const buildOdataFilter = (filterObj: RelatedContextOdataFilter) => {
|
|
14
|
+
return Object.keys(filterObj).reduce((acc, key) => {
|
|
15
|
+
switch (key) {
|
|
16
|
+
case 'type':
|
|
17
|
+
return filterObj[key]?.length ? { ...acc, [key]: { in: filterObj[key] } } : acc;
|
|
18
|
+
default:
|
|
19
|
+
return { ...acc, [key]: filterObj[key as keyof typeof filterObj] };
|
|
20
|
+
}
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22
|
+
}, {} as any);
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
const buildOdataObject = (parameters: RelatedContextOdataParameters) => {
|
|
26
|
+
return Object.keys(parameters).reduce((acc, key) => {
|
|
27
|
+
switch (key) {
|
|
28
|
+
case 'filter':
|
|
29
|
+
return {
|
|
30
|
+
...acc,
|
|
31
|
+
[key]: buildOdataFilter(parameters['filter'] as RelatedContextOdataFilter),
|
|
32
|
+
};
|
|
33
|
+
default:
|
|
34
|
+
return { ...acc, [key]: parameters[key as keyof typeof parameters] };
|
|
35
|
+
}
|
|
36
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
37
|
+
}, {} as any);
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
const createSearchParameters = (args: string | RelatedContextOdataParameters) => {
|
|
41
|
+
return typeof args === 'string' ? args : buildOdataQuery(buildOdataObject(args));
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
export const generateEndpoint = <TVersion extends string = keyof typeof ApiVersion>(
|
|
45
|
+
version: TVersion,
|
|
46
|
+
args: RelatedContextArgs<TVersion>
|
|
47
|
+
) => {
|
|
48
|
+
const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
|
|
49
|
+
switch (apiVersion) {
|
|
50
|
+
case ApiVersion.v2:
|
|
51
|
+
throw new UnsupportedApiVersion(version);
|
|
52
|
+
case ApiVersion.v1:
|
|
53
|
+
default: {
|
|
54
|
+
const { id, query } = args as RelatedContextArgs<'v1'>;
|
|
55
|
+
const params = new URLSearchParams(createSearchParameters(query || ''));
|
|
56
|
+
params.append('api-version', apiVersion);
|
|
57
|
+
return `/contexts/${id}/relations?${String(params)}`;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
export default generateEndpoint;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
|
|
3
|
+
import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
|
|
4
|
+
|
|
5
|
+
import { generateEndpoint } from './generate-endpoint';
|
|
6
|
+
|
|
7
|
+
import type { RelatedContextArgs, ApiClientArguments } from './types';
|
|
8
|
+
|
|
9
|
+
/** Function for generating parameter for querying context service */
|
|
10
|
+
export const generateParameters = <
|
|
11
|
+
TResult,
|
|
12
|
+
TVersion extends string = keyof typeof ApiVersion,
|
|
13
|
+
TClient extends IHttpClient = IHttpClient
|
|
14
|
+
>(
|
|
15
|
+
version: TVersion,
|
|
16
|
+
args: RelatedContextArgs<TVersion>,
|
|
17
|
+
init?: ClientRequestInit<TClient, TResult>
|
|
18
|
+
): ApiClientArguments<TClient, TResult> => {
|
|
19
|
+
const path = generateEndpoint(version, args);
|
|
20
|
+
return [path, init];
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
export default generateParameters;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export { ApiVersion, ApiContextEntity } from '@equinor/fusion-framework-module-services/context';
|
|
2
|
+
|
|
3
|
+
export { generateEndpoint } from './generate-endpoint';
|
|
4
|
+
export { generateParameters } from './generate-parameters';
|
|
5
|
+
|
|
6
|
+
export * from './types';
|
|
7
|
+
|
|
8
|
+
export { relatedContexts, default } from './client';
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
ApiVersion,
|
|
5
|
+
ApiContextEntity,
|
|
6
|
+
ClientMethod,
|
|
7
|
+
} from '@equinor/fusion-framework-module-services/context';
|
|
8
|
+
|
|
9
|
+
export {
|
|
10
|
+
ApiClientArguments,
|
|
11
|
+
ClientMethod,
|
|
12
|
+
} from '@equinor/fusion-framework-module-services/context';
|
|
13
|
+
|
|
14
|
+
export type RelatedContextOdataFilter = {
|
|
15
|
+
type?: string[];
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export type RelatedContextOdataParameters = {
|
|
19
|
+
search?: string;
|
|
20
|
+
filter?: RelatedContextOdataFilter;
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
type RelatedContextArgs_v1 = {
|
|
24
|
+
/** context id */
|
|
25
|
+
id: string;
|
|
26
|
+
query?: string | RelatedContextOdataParameters;
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
type RelatedContextArgs_v2 = RelatedContextArgs_v1;
|
|
30
|
+
|
|
31
|
+
type RelatedContextArgTypes = {
|
|
32
|
+
[ApiVersion.v1]: RelatedContextArgs_v1;
|
|
33
|
+
[ApiVersion.v2]: RelatedContextArgs_v2;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
export type RelatedContextArgs<T> = T extends keyof typeof ApiVersion
|
|
37
|
+
? RelatedContextArgTypes[(typeof ApiVersion)[T]]
|
|
38
|
+
: { id: string };
|
|
39
|
+
|
|
40
|
+
type RelatedContextResponseTypes = {
|
|
41
|
+
[ApiVersion.v1]: Array<ApiContextEntity<ApiVersion.v1>>;
|
|
42
|
+
[ApiVersion.v2]: Array<ApiContextEntity<ApiVersion.v2>>;
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
export type RelatedContextResponse<T> = T extends keyof typeof ApiVersion
|
|
46
|
+
? RelatedContextResponseTypes[(typeof ApiVersion)[T]]
|
|
47
|
+
: unknown;
|
|
48
|
+
|
|
49
|
+
export type RelatedContextFn<
|
|
50
|
+
TVersion extends string = keyof typeof ApiVersion,
|
|
51
|
+
TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
|
|
52
|
+
TClient extends IHttpClient = IHttpClient,
|
|
53
|
+
TResult = RelatedContextResponse<TVersion>
|
|
54
|
+
> = (
|
|
55
|
+
args: RelatedContextArgs<TVersion>,
|
|
56
|
+
init?: ClientRequestInit<TClient, TResult>
|
|
57
|
+
) => RelatedContextResult<TVersion, TMethod, TResult>;
|
|
58
|
+
|
|
59
|
+
export type RelatedContextResult<
|
|
60
|
+
TVersion extends string = keyof typeof ApiVersion,
|
|
61
|
+
TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
|
|
62
|
+
TResult = RelatedContextResponse<TVersion>
|
|
63
|
+
> = ClientMethod<TResult>[TMethod];
|