@equinor/fusion-framework-module-services 3.1.3 → 3.1.4

package/src/bookmarks/get/client.ts

@@ -13,18 +13,18 @@ export const getBookmark =
     <
         TVersion extends ApiVersions = ApiVersions,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <TResult = GetBookmarkResult<TVersion, unknown>>(
         args: GetBookmarkArgs<TVersion>,
-        init?: ClientRequestInit<TClient, TResult>
+        init?: ClientRequestInit<TClient, TResult>,
     ): GetBookmarksResult<TVersion, TMethod, unknown, TResult> =>
         client[method](
-            ...generateParameters<TResult, TVersion, TClient>(version, args, init)
+            ...generateParameters<TResult, TVersion, TClient>(version, args, init),
         ) as GetBookmarksResult<TVersion, TMethod, unknown, TResult>;
 
 export default getBookmark;

package/src/bookmarks/get/generate-endpoint.ts

@@ -5,7 +5,7 @@ import { ApiVersions, GetBookmarkArgs } from './types';
  */
 export const generateEndpoint = <TVersion extends ApiVersions>(
     version: TVersion,
-    args: GetBookmarkArgs<TVersion>
+    args: GetBookmarkArgs<TVersion>,
 ) => {
     switch (version) {
         case 'v1': {

package/src/bookmarks/get/generate-parameters.ts

@@ -7,11 +7,11 @@ import { ApiVersions, GetBookmarkArgs } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends ApiVersions,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
     args: GetBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
     return [path, init];

package/src/bookmarks/get/types.ts

@@ -5,7 +5,7 @@ import { ApiBookmarkEntityV1 } from '../api-models';
 
 export type GetBookmarkResult<
     TVersion extends ApiVersions,
-    TPayload
+    TPayload,
 > = GetBookmarksVersions<TPayload>[TVersion]['result'];
 
 /** Returns args for GetBookmark based on version*/
@@ -16,7 +16,7 @@ export type GetBookmarksResult<
     TVersion extends ApiVersions,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TPayload = unknown,
-    TResult = GetBookmarkResult<TVersion, TPayload>
+    TResult = GetBookmarkResult<TVersion, TPayload>,
 > = ClientMethod<TResult>[TMethod];
 
 export type GetBookmarksFn<
@@ -24,10 +24,10 @@ export type GetBookmarksFn<
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TClient extends IHttpClient = IHttpClient,
     TPayload = unknown,
-    TResult = GetBookmarkResult<TVersion, TPayload>
+    TResult = GetBookmarkResult<TVersion, TPayload>,
 > = (
     args: GetBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ) => GetBookmarksResult<TVersion, TMethod, TPayload, TResult>;
 
 type GetBookmarksArgsV1 = { id: string };

package/src/bookmarks/getAll/client.ts

@@ -14,17 +14,17 @@ export const getAllBookmarks =
     <
         TVersion extends ApiVersions = ApiVersions,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <TResult = GetAllBookmarkResult<TVersion, unknown>>(
-        init?: ClientRequestInit<TClient, TResult>
+        init?: ClientRequestInit<TClient, TResult>,
     ): GetAllBookmarksResult<TVersion, TMethod, unknown, TResult> =>
         client[method](
-            ...generateParameters<TResult, TVersion, TClient>(version, init)
+            ...generateParameters<TResult, TVersion, TClient>(version, init),
         ) as GetAllBookmarksResult<TVersion, TMethod, unknown, TResult>;
 
 export default getAllBookmarks;

package/src/bookmarks/getAll/generate-parameters.ts

@@ -8,10 +8,10 @@ import { ApiVersions } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends ApiVersions,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version);
     return [path, init];

package/src/bookmarks/getAll/types.ts

@@ -6,12 +6,12 @@ export type GetAllBookmarksResult<
     TVersion extends ApiVersions,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TPayload = unknown,
-    TResult = GetAllBookmarkResult<TVersion, TPayload>
+    TResult = GetAllBookmarkResult<TVersion, TPayload>,
 > = ClientMethod<TResult>[TMethod];
 
 export type GetAllBookmarkResult<
     TVersion extends ApiVersions,
-    TPayload
+    TPayload,
 > = GetAllBookmarksVersions<TPayload>[TVersion]['result'];
 
 export type GetAllBookmarksVersions<TPayload = unknown> = {

package/src/bookmarks/patch/client.ts

@@ -13,18 +13,18 @@ export const patchBookmark =
     <
         TClient extends IHttpClient = IHttpClient,
         TVersion extends ApiVersions = ApiVersions,
-        TMethod extends keyof ClientMethod = keyof ClientMethod
+        TMethod extends keyof ClientMethod = keyof ClientMethod,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <TResult = PatchBookmarkResult<TVersion, unknown>>(
         args: PatchBookmarkArgs<TVersion>,
-        init?: ClientRequestInit<TClient, TResult>
+        init?: ClientRequestInit<TClient, TResult>,
     ): PatchBookmarksResult<TVersion, TMethod, unknown, TResult> =>
         client[method](
-            ...generateParameters<TResult, TVersion, TClient>(version, args, init)
+            ...generateParameters<TResult, TVersion, TClient>(version, args, init),
         ) as PatchBookmarksResult<TVersion, TMethod, unknown, TResult>;
 
 export default patchBookmark;

package/src/bookmarks/patch/generate-endpoint.ts

@@ -5,7 +5,7 @@ import { ApiVersions, PatchBookmarkArgs } from './types';
  */
 export const generateEndpoint = <TVersion extends ApiVersions>(
     version: TVersion,
-    _args: PatchBookmarkArgs<TVersion>
+    _args: PatchBookmarkArgs<TVersion>,
 ) => {
     switch (version) {
         case 'v1':

package/src/bookmarks/patch/generate-parameters.ts

@@ -7,11 +7,11 @@ import { ApiVersions, PatchBookmarkArgs } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends ApiVersions,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
     args: PatchBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
 
@@ -21,7 +21,7 @@ export const generateParameters = <
     const requestParams: ClientRequestInit<TClient, TResult> = Object.assign(
         {},
         { method: 'patch', body: JSON.stringify(args), headers: headers },
-        init
+        init,
     );
 
     return [path, requestParams];

package/src/bookmarks/patch/types.ts

@@ -6,13 +6,13 @@ import { PostBookmarksArgsV1 } from '../post';
 
 export type PatchBookmarkResult<
     TVersion extends ApiVersions,
-    TPayload
+    TPayload,
 > = PatchBookmarksVersions<TPayload>[TVersion]['result'];
 
 /** Returns args for PutBookmark based on version*/
 export type PatchBookmarkArgs<
     TVersion extends ApiVersions,
-    TPayload = unknown
+    TPayload = unknown,
 > = PatchBookmarksVersions<TPayload>[TVersion]['args'];
 
 /**Gets result type for PutBookmark call based on version and method */
@@ -20,7 +20,7 @@ export type PatchBookmarksResult<
     TVersion extends ApiVersions,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TPayload = unknown,
-    TResult = PatchBookmarkResult<TVersion, TPayload>
+    TResult = PatchBookmarkResult<TVersion, TPayload>,
 > = ClientMethod<TResult>[TMethod];
 
 export type PatchBookmarkFn<
@@ -28,10 +28,10 @@ export type PatchBookmarkFn<
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TClient extends IHttpClient = IHttpClient,
     TPayload = unknown,
-    TResult = PatchBookmarkResult<TVersion, TPayload>
+    TResult = PatchBookmarkResult<TVersion, TPayload>,
 > = (
     args: PatchBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ) => PatchBookmarksResult<TVersion, TMethod, TPayload, TResult>;
 
 export interface PatchBookmarksArgsV1<T = unknown> extends Partial<PostBookmarksArgsV1<T>> {

package/src/bookmarks/post/client.ts

@@ -13,18 +13,18 @@ export const postBookmark =
     <
         TVersion extends ApiVersions = ApiVersions,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <TResult = PostBookmarkResult<TVersion, unknown>>(
         args: PostBookmarkArgs<TVersion>,
-        init?: ClientRequestInit<TClient, TResult>
+        init?: ClientRequestInit<TClient, TResult>,
     ): PostBookmarksResult<TVersion, TMethod, unknown, TResult> =>
         client[method](
-            ...generateParameters<TResult, TVersion, TClient>(version, args, init)
+            ...generateParameters<TResult, TVersion, TClient>(version, args, init),
         ) as PostBookmarksResult<TVersion, TMethod, unknown, TResult>;
 
 export default postBookmark;

package/src/bookmarks/post/generate-endpoint.ts

@@ -5,7 +5,7 @@ import { ApiVersions, PostBookmarkArgs } from './types';
  */
 export const generateEndpoint = <TVersion extends ApiVersions>(
     version: TVersion,
-    _args: PostBookmarkArgs<TVersion>
+    _args: PostBookmarkArgs<TVersion>,
 ) => {
     switch (version) {
         case 'v1':

package/src/bookmarks/post/generate-parameters.ts

@@ -7,11 +7,11 @@ import { ApiVersions, PostBookmarkArgs } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends ApiVersions,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
     args: PostBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
 
@@ -21,7 +21,7 @@ export const generateParameters = <
     const requestParams: ClientRequestInit<TClient, TResult> = Object.assign(
         {},
         { method: 'post', body: JSON.stringify(args), headers: headers },
-        init
+        init,
     );
 
     return [path, requestParams];

package/src/bookmarks/post/types.ts

@@ -5,13 +5,13 @@ import { ApiBookmarkEntityV1 } from '../api-models';
 
 export type PostBookmarkResult<
     TVersion extends ApiVersions,
-    TPayload
+    TPayload,
 > = PostBookmarksVersions<TPayload>[TVersion]['result'];
 
 /** Returns args for GetBookmark based on version*/
 export type PostBookmarkArgs<
     TVersion extends ApiVersions,
-    TPayload = unknown
+    TPayload = unknown,
 > = PostBookmarksVersions<TPayload>[TVersion]['args'];
 
 /**Gets result type for GetBookmark call based on version and method */
@@ -19,7 +19,7 @@ export type PostBookmarksResult<
     TVersion extends ApiVersions,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TPayload = unknown,
-    TResult = PostBookmarkResult<TVersion, TPayload>
+    TResult = PostBookmarkResult<TVersion, TPayload>,
 > = ClientMethod<TResult>[TMethod];
 
 export type PostBookmarkFn<
@@ -27,10 +27,10 @@ export type PostBookmarkFn<
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TClient extends IHttpClient = IHttpClient,
     TPayload = unknown,
-    TResult = PostBookmarkResult<TVersion, TPayload>
+    TResult = PostBookmarkResult<TVersion, TPayload>,
 > = (
     args: PostBookmarkArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ) => PostBookmarksResult<TVersion, TMethod, TPayload, TResult>;
 
 export interface PostBookmarksArgsV1<T = unknown> {

package/src/bookmarks/types.ts

@@ -1,5 +1 @@
-export {
-    ClientMethodType,
-    ClientMethod,
-    ApiClientArguments,
-} from '@equinor/fusion-framework-module-services';
+export { ClientMethodType, ClientMethod, ApiClientArguments } from '..';

package/src/context/client.ts

@@ -1,6 +1,7 @@
 import { IHttpClient } from '@equinor/fusion-framework-module-http';
 
-import { ClientMethod, ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import type { ClientMethod } from './types';
+import { ApiVersion } from './static';
 
 import { getContext, GetContextFn, GetContextResponse, GetContextResult } from './get';
 
@@ -15,13 +16,16 @@ import {
 
 export class ContextApiClient<
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 > {
     get Version(): typeof ApiVersion {
         return ApiVersion;
     }
 
-    constructor(protected _client: TClient, protected _method: TMethod) {}
+    constructor(
+        protected _client: TClient,
+        protected _method: TMethod,
+    ) {}
 
     /**
      * Fetch context by id
@@ -29,7 +33,7 @@ export class ContextApiClient<
      */
     public get<
         TVersion extends string = keyof typeof ApiVersion,
-        TResult = GetContextResponse<TVersion>
+        TResult = GetContextResponse<TVersion>,
     >(
         version: TVersion,
         ...args: Parameters<GetContextFn<TVersion, TMethod, TClient, TResult>>
@@ -44,7 +48,7 @@ export class ContextApiClient<
      */
     public query<
         TVersion extends string = keyof typeof ApiVersion,
-        TResult = QueryContextResponse<TVersion>
+        TResult = QueryContextResponse<TVersion>,
     >(
         version: TVersion,
         ...args: Parameters<QueryContextFn<TVersion, TMethod, TClient, TResult>>
@@ -59,7 +63,7 @@ export class ContextApiClient<
      */
     public related<
         TVersion extends string = keyof typeof ApiVersion,
-        TResult = RelatedContextResponse<TVersion>
+        TResult = RelatedContextResponse<TVersion>,
     >(
         version: TVersion,
         ...args: Parameters<RelatedContextFn<TVersion, TMethod, TClient, TResult>>

package/src/context/get/client.ts

@@ -1,6 +1,6 @@
 import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import { generateParameters } from './generate-parameters';
 
@@ -16,18 +16,18 @@ export const getContext =
     <
         TVersion extends string = keyof typeof ApiVersion,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <T = GetContextResponse<TVersion>>(
         args: GetContextArgs<TVersion>,
-        init?: ClientRequestInit<TClient, T>
+        init?: ClientRequestInit<TClient, T>,
     ): GetContextResult<TVersion, TMethod, T> =>
         client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init)
+            ...generateParameters<T, TVersion, TClient>(version, args, init),
         ) as GetContextResult<TVersion, TMethod, T>;
 
 export default getContext;

package/src/context/get/generate-endpoint.ts

@@ -1,5 +1,5 @@
-import { UnsupportedApiVersion } from '@equinor/fusion-framework-module-services/errors';
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { UnsupportedApiVersion } from '../../errors';
+import { ApiVersion } from '..';
 
 import type { GetContextArgs } from './types';
 
@@ -8,7 +8,7 @@ import type { GetContextArgs } from './types';
  */
 export const generateEndpoint = <TVersion extends string = keyof typeof ApiVersion>(
     version: TVersion,
-    args: GetContextArgs<TVersion>
+    args: GetContextArgs<TVersion>,
 ) => {
     const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
     switch (apiVersion) {

package/src/context/get/generate-parameters.ts

@@ -1,6 +1,6 @@
 import type { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import { generateEndpoint } from './generate-endpoint';
 
@@ -10,11 +10,11 @@ import type { ApiClientArguments, GetContextArgs } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends string = keyof typeof ApiVersion,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
     args: GetContextArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
     return [path, init];

package/src/context/get/index.ts

@@ -1,4 +1,4 @@
-export { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+export { ApiVersion } from '..';
 
 export { generateEndpoint } from './generate-endpoint';
 export { generateParameters } from './generate-parameters';

package/src/context/get/types.ts

@@ -1,15 +1,8 @@
 import { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
 
-import {
-    ApiVersion,
-    ApiContextEntity,
-    ClientMethod,
-} from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion, ApiContextEntity, ClientMethod } from '..';
 
-export {
-    ApiClientArguments,
-    ClientMethod,
-} from '@equinor/fusion-framework-module-services/context';
+export { ApiClientArguments, ClientMethod } from '..';
 
 type GetContextArgs_v1 = {
     id: string;
@@ -39,14 +32,14 @@ export type GetContextFn<
     TVersion extends string = keyof typeof ApiVersion,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TClient extends IHttpClient = IHttpClient,
-    TResult = GetContextResponse<TVersion>
+    TResult = GetContextResponse<TVersion>,
 > = (
     args: GetContextArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ) => GetContextResult<TVersion, TMethod, TResult>;
 
 export type GetContextResult<
     TVersion extends string = keyof typeof ApiVersion,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TResult = GetContextResponse<TVersion>
+    TResult = GetContextResponse<TVersion>,
 > = ClientMethod<TResult>[TMethod];

package/src/context/query/client.ts

@@ -1,6 +1,6 @@
 import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import { generateParameters } from './generate-parameters';
 
@@ -18,18 +18,18 @@ export const queryContext =
     <
         TVersion extends string = keyof typeof ApiVersion,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <T = QueryContextResponse<TVersion>>(
         args: QueryContextArgs<TVersion>,
-        init?: ClientRequestInit<TClient, T>
+        init?: ClientRequestInit<TClient, T>,
     ): QueryContextResult<TVersion, TMethod, T> =>
         client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init)
+            ...generateParameters<T, TVersion, TClient>(version, args, init),
         ) as QueryContextResult<TVersion, TMethod, T>;
 
 export default queryContext;

package/src/context/query/generate-endpoint.ts

@@ -1,8 +1,8 @@
 import buildOdataQuery from 'odata-query';
 
-import { UnsupportedApiVersion } from '@equinor/fusion-framework-module-services/errors';
+import { UnsupportedApiVersion } from '../../errors';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import type {
     QueryContextArgs,
@@ -45,7 +45,7 @@ const createSearchParameters = (args: string | QueryContextOdataParameters) => {
 
 export const generateEndpoint = <TVersion extends string = keyof typeof ApiVersion>(
     version: TVersion,
-    args: QueryContextArgs<TVersion>
+    args: QueryContextArgs<TVersion>,
 ) => {
     const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
     switch (apiVersion) {

package/src/context/query/generate-parameters.ts

@@ -1,6 +1,6 @@
 import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import { generateEndpoint } from './generate-endpoint';
 
@@ -10,11 +10,11 @@ import type { QueryContextArgs, ApiClientArguments } from './types';
 export const generateParameters = <
     TResult,
     TVersion extends string = keyof typeof ApiVersion,
-    TClient extends IHttpClient = IHttpClient
+    TClient extends IHttpClient = IHttpClient,
 >(
     version: TVersion,
     args: QueryContextArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
     return [path, init];

package/src/context/query/index.ts

@@ -1,4 +1,4 @@
-export { ApiVersion, ApiContextEntity } from '@equinor/fusion-framework-module-services/context';
+export { ApiVersion, ApiContextEntity } from '..';
 
 export { generateEndpoint } from './generate-endpoint';
 export { generateParameters } from './generate-parameters';

package/src/context/query/types.ts

@@ -1,15 +1,8 @@
 import { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
 
-import {
-    ApiVersion,
-    ApiContextEntity,
-    ClientMethod,
-} from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion, ApiContextEntity, ClientMethod } from '..';
 
-export {
-    ApiClientArguments,
-    ClientMethod,
-} from '@equinor/fusion-framework-module-services/context';
+export { ApiClientArguments, ClientMethod } from '..';
 
 export type QueryContextOdataFilter = {
     type?: string[];
@@ -50,14 +43,14 @@ export type QueryContextFn<
     TVersion extends string = keyof typeof ApiVersion,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
     TClient extends IHttpClient = IHttpClient,
-    TResult = QueryContextResponse<TVersion>
+    TResult = QueryContextResponse<TVersion>,
 > = (
     args: QueryContextArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>
+    init?: ClientRequestInit<TClient, TResult>,
 ) => QueryContextResult<TVersion, TMethod, TResult>;
 
 export type QueryContextResult<
     TVersion extends string = keyof typeof ApiVersion,
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TResult = QueryContextResponse<TVersion>
+    TResult = QueryContextResponse<TVersion>,
 > = ClientMethod<TResult>[TMethod];

package/src/context/related/client.ts

@@ -1,6 +1,6 @@
 import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
-import { ApiVersion } from '@equinor/fusion-framework-module-services/context';
+import { ApiVersion } from '..';
 
 import { generateParameters } from './generate-parameters';
 
@@ -18,18 +18,18 @@ export const relatedContexts =
     <
         TVersion extends string = keyof typeof ApiVersion,
         TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient
+        TClient extends IHttpClient = IHttpClient,
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'json' as TMethod,
     ) =>
     <T = RelatedContextResponse<TVersion>>(
         args: RelatedContextArgs<TVersion>,
-        init?: ClientRequestInit<TClient, T>
+        init?: ClientRequestInit<TClient, T>,
     ): RelatedContextResult<TVersion, TMethod, T> =>
         client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init)
+            ...generateParameters<T, TVersion, TClient>(version, args, init),
         ) as RelatedContextResult<TVersion, TMethod, T>;
 
 export default relatedContexts;