@equinor/fusion-framework-module-services 2.0.7 → 2.1.0

package/dist/types/bookmarks/api-models.d.ts

@@ -8,8 +8,8 @@ export interface ApiBookmarkEntityV1<TPayload> {
     context: Context;
     createdBy: CreatedBy;
     updatedBy: UpdatedBy;
-    created: Date;
-    updated: Date;
+    created: string;
+    updated: string;
     sourceSystem: SourceSystem;
 }
 export interface Context {

package/dist/types/bookmarks/client.d.ts

@@ -3,12 +3,16 @@ import { ClientMethod } from '@equinor/fusion-framework-module-services/context'
 import { DeleteBookmarkResult, DeleteBookmarksFn, DeleteBookmarksResult } from './delete/types';
 import { ApiVersions, GetBookmarkResult, GetBookmarksFn, GetBookmarksResult } from './get/types';
 import { PostBookmarkResult, PostBookmarkFn, PostBookmarksResult } from './post/types';
+import { PutBookmarkFn as PatchBookmarkFn, PutBookmarkResult as PatchBookmarkResult, PutBookmarksResult as PatchBookmarksResult } from './patch';
+import { GetAllBookmarkResult, GetAllBookmarksResult } from './getAll';
 export declare class BookmarksApiClient<TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient = IHttpClient, TPayload = unknown> {
     protected _client: TClient;
     protected _method: TMethod;
     constructor(_client: TClient, _method: TMethod);
     get<TVersion extends ApiVersions, TResult = GetBookmarkResult<TVersion, TPayload>>(version: TVersion, ...args: Parameters<GetBookmarksFn<TVersion, TMethod, TClient, TPayload, TResult>>): GetBookmarksResult<TVersion, TMethod, TPayload, TResult>;
+    getAll<TVersion extends ApiVersions, TResult = GetAllBookmarkResult<TVersion, TPayload>>(version: TVersion): GetAllBookmarksResult<TVersion, TMethod, TPayload, TResult>;
     post<TVersion extends ApiVersions, TResult = PostBookmarkResult<TVersion, TPayload>>(version: TVersion, ...args: Parameters<PostBookmarkFn<TVersion, TMethod, TClient, TPayload, TResult>>): PostBookmarksResult<TVersion, TMethod, TPayload, TResult>;
+    patch<TVersion extends ApiVersions, TResult = PatchBookmarkResult<TVersion, TPayload>>(version: TVersion, ...args: Parameters<PatchBookmarkFn<TVersion, TMethod, TClient, TPayload, TResult>>): PatchBookmarksResult<TVersion, TMethod, TPayload, TResult>;
     delete<TVersion extends ApiVersions, TResult = DeleteBookmarkResult<TVersion>>(version: TVersion, ...args: Parameters<DeleteBookmarksFn<TVersion, TMethod, TClient, TResult>>): DeleteBookmarksResult<TVersion, TMethod, TResult>;
 }
 export default BookmarksApiClient;

package/dist/types/bookmarks/getAll/client.d.ts

@@ -0,0 +1,5 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+import { GetAllBookmarkResult, GetAllBookmarksResult } from './types';
+export declare const getAllBookmarks: <TVersion extends "v1" = "v1", 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) => <TResult = GetAllBookmarkResult<TVersion, unknown>>(init?: ClientRequestInit<TClient, TResult> | undefined) => GetAllBookmarksResult<TVersion, TMethod, unknown, TResult>;
+export default getAllBookmarks;

package/dist/types/bookmarks/getAll/generate-endpoint.d.ts

@@ -0,0 +1 @@
+export declare const generateEndpoint: <TVersion extends "v1">(version: TVersion) => string;

package/dist/types/bookmarks/getAll/generate-parameters.d.ts

@@ -0,0 +1,3 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ApiClientArguments } from '../types';
+export declare const generateParameters: <TResult, TVersion extends "v1", TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>>(version: TVersion, init?: ClientRequestInit<TClient, TResult> | undefined) => ApiClientArguments<TClient, TResult>;

package/dist/types/bookmarks/getAll/index.d.ts

@@ -0,0 +1,4 @@
+export * from './types';
+export { getAllBookmarks, default } from './client';
+export { generateEndpoint } from './generate-endpoint';
+export { generateParameters } from './generate-parameters';

package/dist/types/bookmarks/getAll/types.d.ts

@@ -0,0 +1,10 @@
+import { ApiBookmarkEntityV1 } from '../api-models';
+import { ClientMethod } from '../types';
+export type GetAllBookmarksResult<TVersion extends ApiVersions, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TPayload = unknown, TResult = GetAllBookmarkResult<TVersion, TPayload>> = ClientMethod<TResult>[TMethod];
+export type GetAllBookmarkResult<TVersion extends ApiVersions, TPayload> = GetAllBookmarksVersions<TPayload>[TVersion]['result'];
+export type GetAllBookmarksVersions<TPayload = unknown> = {
+    ['v1']: {
+        result: Array<ApiBookmarkEntityV1<TPayload>>;
+    };
+};
+export type ApiVersions = keyof GetAllBookmarksVersions<unknown>;

package/dist/types/bookmarks/patch/client.d.ts

@@ -0,0 +1,5 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+import { PutBookmarkArgs, PutBookmarkResult, PutBookmarksResult } from './types';
+export declare const putBookmark: <TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>, TVersion extends "v1" = "v1", TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>>(client: TClient, version: TVersion, method?: TMethod) => <TResult = PutBookmarkResult<TVersion, unknown>>(args: PutBookmarkArgs<TVersion, unknown>, init?: ClientRequestInit<TClient, TResult> | undefined) => PutBookmarksResult<TVersion, TMethod, unknown, TResult>;
+export default putBookmark;

package/dist/types/bookmarks/patch/generate-endpoint.d.ts

@@ -0,0 +1,2 @@
+import { PutBookmarkArgs } from './types';
+export declare const generateEndpoint: <TVersion extends "v1">(version: TVersion, _args: PutBookmarkArgs<TVersion, unknown>) => string;

package/dist/types/bookmarks/patch/generate-parameters.d.ts

@@ -0,0 +1,4 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ApiClientArguments } from '../..';
+import { PutBookmarkArgs } from './types';
+export declare const generateParameters: <TResult, TVersion extends "v1", 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: PutBookmarkArgs<TVersion, unknown>, init?: ClientRequestInit<TClient, TResult> | undefined) => ApiClientArguments<TClient, TResult>;

package/dist/types/bookmarks/patch/index.d.ts

@@ -0,0 +1,4 @@
+export * from './types';
+export { putBookmark, default } from './client';
+export { generateEndpoint as generatePutEndpoint } from './generate-endpoint';
+export { generateParameters as generatePutParameters } from './generate-parameters';

package/dist/types/bookmarks/patch/types.d.ts

@@ -0,0 +1,19 @@
+import { IHttpClient } from '@equinor/fusion-framework-module-http';
+import { ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+import { ApiBookmarkEntityV1 } from '../api-models';
+import { PostBookmarksArgsV1 } from '../post';
+export type PutBookmarkResult<TVersion extends ApiVersions, TPayload> = PutBookmarksVersions<TPayload>[TVersion]['result'];
+export type PutBookmarkArgs<TVersion extends ApiVersions, TPayload = unknown> = PutBookmarksVersions<TPayload>[TVersion]['args'];
+export type PutBookmarksResult<TVersion extends ApiVersions, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TPayload = unknown, TResult = PutBookmarkResult<TVersion, TPayload>> = ClientMethod<TResult>[TMethod];
+export type PutBookmarkFn<TVersion extends ApiVersions, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient = IHttpClient, TPayload = unknown, TResult = PutBookmarkResult<TVersion, TPayload>> = (args: PutBookmarkArgs<TVersion>, init?: ClientRequestInit<TClient, TResult>) => PutBookmarksResult<TVersion, TMethod, TPayload, TResult>;
+export interface PutBookmarksArgsV1<T = unknown> extends PostBookmarksArgsV1<T> {
+    id: string;
+}
+export type PutBookmarksVersions<TPayload = unknown> = {
+    ['v1']: {
+        args: PutBookmarksArgsV1<TPayload>;
+        result: ApiBookmarkEntityV1<TPayload>;
+    };
+};
+export type ApiVersions = keyof PutBookmarksVersions<unknown>;

package/dist/types/bookmarks/post/types.d.ts

@@ -6,7 +6,7 @@ export type PostBookmarkResult<TVersion extends ApiVersions, TPayload> = PostBoo
 export type PostBookmarkArgs<TVersion extends ApiVersions, TPayload = unknown> = PostBookmarksVersions<TPayload>[TVersion]['args'];
 export type PostBookmarksResult<TVersion extends ApiVersions, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TPayload = unknown, TResult = PostBookmarkResult<TVersion, TPayload>> = ClientMethod<TResult>[TMethod];
 export type PostBookmarkFn<TVersion extends ApiVersions, TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>, TClient extends IHttpClient = IHttpClient, TPayload = unknown, TResult = PostBookmarkResult<TVersion, TPayload>> = (args: PostBookmarkArgs<TVersion>, init?: ClientRequestInit<TClient, TResult>) => PostBookmarksResult<TVersion, TMethod, TPayload, TResult>;
-type PostBookmarksArgsV1<T = unknown> = {
+export interface PostBookmarksArgsV1<T = unknown> {
     name: string;
     description?: string;
     isShared: boolean;
@@ -18,7 +18,7 @@ type PostBookmarksArgsV1<T = unknown> = {
         name?: string;
         subSystem?: string;
     };
-};
+}
 export type PostBookmarksVersions<TPayload = unknown> = {
     ['v1']: {
         args: PostBookmarksArgsV1<TPayload>;
@@ -26,4 +26,3 @@ export type PostBookmarksVersions<TPayload = unknown> = {
     };
 };
 export type ApiVersions = keyof PostBookmarksVersions<unknown>;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/fusion-framework-module-services",
-    "version": "2.0.7",
+    "version": "2.1.0",
     "description": "",
     "sideEffects": false,
     "main": "dist/esm/index.js",
@@ -18,12 +18,16 @@
             ],
             "context/query": [
                 "dist/types/context/query/index"
+            ],
+            "bookmarks": [
+                "dist/types/bookmarks/index"
             ]
         }
     },
     "exports": {
         ".": "./dist/esm/index.js",
         "./context": "./dist/esm/context/index.js",
+        "./bookmark": "./dist/esm/bookmarks/index.js",
         "./context/get": "./dist/esm/context/get-context/index.js",
         "./errors": "./dist/esm/errors.js",
         "./package.json": "./package.json"
@@ -48,12 +52,12 @@
     },
     "devDependencies": {
         "@equinor/fusion-framework-module": "^2.0.1",
-        "@equinor/fusion-framework-module-http": "^4.0.1",
-        "@equinor/fusion-framework-module-service-discovery": "^6.0.7"
+        "@equinor/fusion-framework-module-http": "^4.0.2",
+        "@equinor/fusion-framework-module-service-discovery": "^6.0.8"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-module": ">=1.2.2",
         "odata-query": "^7.0.3"
     },
-    "gitHead": "a59959b7f25df08c9f93b05f1ea46980ff9e1303"
+    "gitHead": "d177e1925ca7b8692435b1fdefbcc0c8418d7625"
 }

package/src/bookmarks/api-models.ts

@@ -8,8 +8,8 @@ export interface ApiBookmarkEntityV1<TPayload> {
     context: Context;
     createdBy: CreatedBy;
     updatedBy: UpdatedBy;
-    created: Date;
-    updated: Date;
+    created: string;
+    updated: string;
     sourceSystem: SourceSystem;
 }
 

package/src/bookmarks/client.ts

@@ -7,6 +7,12 @@ import getBookmark from './get/client';
 import { ApiVersions, GetBookmarkResult, GetBookmarksFn, GetBookmarksResult } from './get/types';
 import { PostBookmarkResult, PostBookmarkFn, PostBookmarksResult } from './post/types';
 import postBookmark from './post/client';
+import patchBookmark, {
+    PutBookmarkFn as PatchBookmarkFn,
+    PutBookmarkResult as PatchBookmarkResult,
+    PutBookmarksResult as PatchBookmarksResult,
+} from './patch';
+import getAllBookmarks, { GetAllBookmarkResult, GetAllBookmarksResult } from './getAll';
 
 export class BookmarksApiClient<
     TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
@@ -23,9 +29,19 @@ export class BookmarksApiClient<
         version: TVersion,
         ...args: Parameters<GetBookmarksFn<TVersion, TMethod, TClient, TPayload, TResult>>
     ): GetBookmarksResult<TVersion, TMethod, TPayload, TResult> {
-        const fn = getBookmark<TVersion, TMethod, TClient>(this._client, version, this._method);
+        const fn = getBookmark(this._client, version, this._method);
         return fn<TResult>(...args);
     }
+    /**
+     * Fetch all bookmarks
+     * @see {@link get/client}
+     */
+    public getAll<TVersion extends ApiVersions, TResult = GetAllBookmarkResult<TVersion, TPayload>>(
+        version: TVersion
+    ): GetAllBookmarksResult<TVersion, TMethod, TPayload, TResult> {
+        const fn = getAllBookmarks(this._client, version, this._method);
+        return fn<TResult>();
+    }
 
     /**
      * Create a new bookmark
@@ -35,7 +51,19 @@ export class BookmarksApiClient<
         version: TVersion,
         ...args: Parameters<PostBookmarkFn<TVersion, TMethod, TClient, TPayload, TResult>>
     ): PostBookmarksResult<TVersion, TMethod, TPayload, TResult> {
-        const fn = postBookmark<TVersion, TMethod, TClient>(this._client, version, this._method);
+        const fn = postBookmark(this._client, version, this._method);
+        return fn<TResult>(...args);
+    }
+
+    /**
+     * Update a bookmark
+     * @see {@link get/client}
+     */
+    public patch<TVersion extends ApiVersions, TResult = PatchBookmarkResult<TVersion, TPayload>>(
+        version: TVersion,
+        ...args: Parameters<PatchBookmarkFn<TVersion, TMethod, TClient, TPayload, TResult>>
+    ): PatchBookmarksResult<TVersion, TMethod, TPayload, TResult> {
+        const fn = patchBookmark(this._client, version, this._method);
         return fn<TResult>(...args);
     }
 

package/src/bookmarks/delete/client.ts

@@ -22,7 +22,7 @@ export const deleteBookmark =
     >(
         client: TClient,
         version: TVersion,
-        method: TMethod = 'json' as TMethod
+        method: TMethod = 'fetch' as TMethod
     ) =>
     <TResult = DeleteBookmarkResult<TVersion>>(
         args: DeleteBookmarkArgs<TVersion>,

package/src/bookmarks/getAll/client.ts

@@ -0,0 +1,30 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+
+import { generateParameters } from './generate-parameters';
+import { ApiVersions, GetAllBookmarkResult, GetAllBookmarksResult } from './types';
+
+/**
+ * Method for fetching all bookmarks for the current user from bookmark service
+ * @param client - client for execution of request
+ * @param version - version of API to call
+ * @param method - client method to call
+ */
+export const getAllBookmarks =
+    <
+        TVersion extends ApiVersions = ApiVersions,
+        TMethod extends keyof ClientMethod = keyof ClientMethod,
+        TClient extends IHttpClient = IHttpClient
+    >(
+        client: TClient,
+        version: TVersion,
+        method: TMethod = 'json' as TMethod
+    ) =>
+    <TResult = GetAllBookmarkResult<TVersion, unknown>>(
+        init?: ClientRequestInit<TClient, TResult>
+    ): GetAllBookmarksResult<TVersion, TMethod, unknown, TResult> =>
+        client[method](
+            ...generateParameters<TResult, TVersion, TClient>(version, init)
+        ) as GetAllBookmarksResult<TVersion, TMethod, unknown, TResult>;
+
+export default getAllBookmarks;

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

@@ -0,0 +1,15 @@
+import { ApiVersions } from './types';
+
+/**
+ * Method for generating endpoint for getting all bookmarks
+ */
+export const generateEndpoint = <TVersion extends ApiVersions>(version: TVersion) => {
+    switch (version) {
+        case 'v1':
+        default: {
+            const params = new URLSearchParams();
+            params.append('api-version', version);
+            return `persons/me/bookmarks/?${String(params)}`;
+        }
+    }
+};

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

@@ -0,0 +1,18 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ApiClientArguments } from '../types';
+
+import { generateEndpoint } from './generate-endpoint';
+import { ApiVersions } from './types';
+
+/** function for creating http client arguments  */
+export const generateParameters = <
+    TResult,
+    TVersion extends ApiVersions,
+    TClient extends IHttpClient = IHttpClient
+>(
+    version: TVersion,
+    init?: ClientRequestInit<TClient, TResult>
+): ApiClientArguments<TClient, TResult> => {
+    const path = generateEndpoint(version);
+    return [path, init];
+};

package/src/bookmarks/getAll/index.ts

@@ -0,0 +1,6 @@
+export * from './types';
+
+export { getAllBookmarks, default } from './client';
+
+export { generateEndpoint } from './generate-endpoint';
+export { generateParameters } from './generate-parameters';

package/src/bookmarks/getAll/types.ts

@@ -0,0 +1,21 @@
+import { ApiBookmarkEntityV1 } from '../api-models';
+import { ClientMethod } from '../types';
+
+/**Gets result type for GetAllBookmark call based on version and method */
+export type GetAllBookmarksResult<
+    TVersion extends ApiVersions,
+    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+    TPayload = unknown,
+    TResult = GetAllBookmarkResult<TVersion, TPayload>
+> = ClientMethod<TResult>[TMethod];
+
+export type GetAllBookmarkResult<
+    TVersion extends ApiVersions,
+    TPayload
+> = GetAllBookmarksVersions<TPayload>[TVersion]['result'];
+
+export type GetAllBookmarksVersions<TPayload = unknown> = {
+    ['v1']: { result: Array<ApiBookmarkEntityV1<TPayload>> };
+};
+
+export type ApiVersions = keyof GetAllBookmarksVersions<unknown>;

package/src/bookmarks/patch/client.ts

@@ -0,0 +1,30 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+import { generateParameters } from './generate-parameters';
+import { ApiVersions, PutBookmarkArgs, PutBookmarkResult, PutBookmarksResult } from './types';
+
+/**
+ * Method for updating bookmark
+ * @param client - client for execution of request
+ * @param version - version of API to call
+ * @param method - client method to call
+ */
+export const putBookmark =
+    <
+        TClient extends IHttpClient = IHttpClient,
+        TVersion extends ApiVersions = ApiVersions,
+        TMethod extends keyof ClientMethod = keyof ClientMethod
+    >(
+        client: TClient,
+        version: TVersion,
+        method: TMethod = 'json' as TMethod
+    ) =>
+    <TResult = PutBookmarkResult<TVersion, unknown>>(
+        args: PutBookmarkArgs<TVersion>,
+        init?: ClientRequestInit<TClient, TResult>
+    ): PutBookmarksResult<TVersion, TMethod, unknown, TResult> =>
+        client[method](
+            ...generateParameters<TResult, TVersion, TClient>(version, args, init)
+        ) as PutBookmarksResult<TVersion, TMethod, unknown, TResult>;
+
+export default putBookmark;

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

@@ -0,0 +1,18 @@
+import { ApiVersions, PutBookmarkArgs } from './types';
+
+/**
+ * Method for generating endpoint for getting bookmark by id
+ */
+export const generateEndpoint = <TVersion extends ApiVersions>(
+    version: TVersion,
+    _args: PutBookmarkArgs<TVersion>
+) => {
+    switch (version) {
+        case 'v1':
+        default: {
+            const params = new URLSearchParams();
+            params.append('api-version', version);
+            return `/bookmarks/${_args.id}?${String(params)}`;
+        }
+    }
+};

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

@@ -0,0 +1,28 @@
+import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { ApiClientArguments } from '../..';
+import { generateEndpoint } from './generate-endpoint';
+import { ApiVersions, PutBookmarkArgs } from './types';
+
+/** function for creating http client arguments  */
+export const generateParameters = <
+    TResult,
+    TVersion extends ApiVersions,
+    TClient extends IHttpClient = IHttpClient
+>(
+    version: TVersion,
+    args: PutBookmarkArgs<TVersion>,
+    init?: ClientRequestInit<TClient, TResult>
+): ApiClientArguments<TClient, TResult> => {
+    const path = generateEndpoint(version, args);
+
+    const headers = new Headers();
+    headers.append('content-type', 'application/json');
+
+    const requestParams: ClientRequestInit<TClient, TResult> = Object.assign(
+        {},
+        { method: 'patch', body: JSON.stringify(args), headers: headers },
+        init
+    );
+
+    return [path, requestParams];
+};

package/src/bookmarks/patch/index.ts

@@ -0,0 +1,6 @@
+export * from './types';
+
+export { putBookmark, default } from './client';
+
+export { generateEndpoint as generatePutEndpoint } from './generate-endpoint';
+export { generateParameters as generatePutParameters } from './generate-parameters';

package/src/bookmarks/patch/types.ts

@@ -0,0 +1,45 @@
+import { IHttpClient } from '@equinor/fusion-framework-module-http';
+import { ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
+import { ClientMethod } from '../..';
+import { ApiBookmarkEntityV1 } from '../api-models';
+import { PostBookmarksArgsV1 } from '../post';
+
+export type PutBookmarkResult<
+    TVersion extends ApiVersions,
+    TPayload
+> = PutBookmarksVersions<TPayload>[TVersion]['result'];
+
+/** Returns args for PutBookmark based on version*/
+export type PutBookmarkArgs<
+    TVersion extends ApiVersions,
+    TPayload = unknown
+> = PutBookmarksVersions<TPayload>[TVersion]['args'];
+
+/**Gets result type for PutBookmark call based on version and method */
+export type PutBookmarksResult<
+    TVersion extends ApiVersions,
+    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+    TPayload = unknown,
+    TResult = PutBookmarkResult<TVersion, TPayload>
+> = ClientMethod<TResult>[TMethod];
+
+export type PutBookmarkFn<
+    TVersion extends ApiVersions,
+    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+    TClient extends IHttpClient = IHttpClient,
+    TPayload = unknown,
+    TResult = PutBookmarkResult<TVersion, TPayload>
+> = (
+    args: PutBookmarkArgs<TVersion>,
+    init?: ClientRequestInit<TClient, TResult>
+) => PutBookmarksResult<TVersion, TMethod, TPayload, TResult>;
+
+export interface PutBookmarksArgsV1<T = unknown> extends PostBookmarksArgsV1<T> {
+    id: string;
+}
+
+export type PutBookmarksVersions<TPayload = unknown> = {
+    ['v1']: { args: PutBookmarksArgsV1<TPayload>; result: ApiBookmarkEntityV1<TPayload> };
+};
+
+export type ApiVersions = keyof PutBookmarksVersions<unknown>;

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

@@ -8,11 +8,7 @@ export const generateEndpoint = <TVersion extends ApiVersions>(
     _args: PostBookmarkArgs<TVersion>
 ) => {
     switch (version) {
-        case 'v1': {
-            const params = new URLSearchParams();
-            params.append('api-version', '1.0');
-            return `/bookmarks?${String(params)}`;
-        }
+        case 'v1':
         default: {
             const params = new URLSearchParams();
             params.append('api-version', version);

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

@@ -14,9 +14,7 @@ export const generateParameters = <
     init?: ClientRequestInit<TClient, TResult>
 ): ApiClientArguments<TClient, TResult> => {
     const path = generateEndpoint(version, args);
-    //add versions switch case later
 
-    //Not sure why this is needed, defaults to application/problem+json failing the request
     const headers = new Headers();
     headers.append('content-type', 'application/json');
 

package/src/bookmarks/post/types.ts

@@ -33,7 +33,7 @@ export type PostBookmarkFn<
     init?: ClientRequestInit<TClient, TResult>
 ) => PostBookmarksResult<TVersion, TMethod, TPayload, TResult>;
 
-type PostBookmarksArgsV1<T = unknown> = {
+export interface PostBookmarksArgsV1<T = unknown> {
     /** Display name of the bookmark */
     name: string;
     description?: string;
@@ -49,7 +49,7 @@ type PostBookmarksArgsV1<T = unknown> = {
         name?: string;
         subSystem?: string;
     };
-};
+}
 
 export type PostBookmarksVersions<TPayload = unknown> = {
     ['v1']: { args: PostBookmarksArgsV1<TPayload>; result: ApiBookmarkEntityV1<TPayload> };