@equinor/fusion-framework-module-bookmark 1.0.7 → 1.0.9

package/dist/types/version.d.ts

@@ -0,0 +1 @@
+export declare const version = "1.0.9";

package/package.json

@@ -1,48 +1,47 @@
 {
-    "name": "@equinor/fusion-framework-module-bookmark",
-    "version": "1.0.7",
-    "description": "",
-    "main": "./dist/esm/index.js",
-    "exports": {
-        ".": "./dist/esm/index.js",
-        "./package.json": "./package.json",
-        "./utils": "./dist/esm/utils/index.js"
-    },
-    "types": "./dist/types/index.d.ts",
-    "typesVersions": {
-        "*": {
-            "utils": [
-                "dist/types/utils/index.d.ts"
-            ]
-        }
-    },
-    "scripts": {
-        "build": "tsc -b",
-        "prepack": "yarn build"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "publishConfig": {
-        "access": "public"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/equinor/fusion-framework.git",
-        "directory": "packages/modules/context"
-    },
-    "dependencies": {
-        "@equinor/fusion-query": "^3.0.2"
-    },
-    "devDependencies": {
-        "@equinor/fusion-framework-module": "^4.2.1",
-        "@equinor/fusion-framework-module-event": "^4.0.2",
-        "@equinor/fusion-framework-module-services": "^3.1.3",
-        "rxjs": "^7.5.7",
-        "typescript": "^5.1.3"
-    },
-    "peerDependencies": {
-        "@equinor/fusion-framework-module": ">=1.2.5",
-        "rxjs": "^7.5.7"
+  "name": "@equinor/fusion-framework-module-bookmark",
+  "version": "1.0.9",
+  "description": "",
+  "main": "./dist/esm/index.js",
+  "exports": {
+    ".": "./dist/esm/index.js",
+    "./package.json": "./package.json",
+    "./utils": "./dist/esm/utils/index.js"
+  },
+  "types": "./dist/types/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "utils": [
+        "dist/types/utils/index.d.ts"
+      ]
     }
-}
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/equinor/fusion-framework.git",
+    "directory": "packages/modules/context"
+  },
+  "dependencies": {
+    "rxjs": "^7.8.1",
+    "@equinor/fusion-framework-module": "^4.2.3",
+    "@equinor/fusion-observable": "^8.1.0",
+    "@equinor/fusion-query": "^3.0.6"
+  },
+  "devDependencies": {
+    "typescript": "^5.1.3",
+    "@equinor/fusion-framework-module-app": "^5.2.3",
+    "@equinor/fusion-framework-module-context": "^4.0.12",
+    "@equinor/fusion-framework-module-event": "^4.0.4",
+    "@equinor/fusion-framework-module-http": "^5.0.5",
+    "@equinor/fusion-framework-module-services": "^3.1.4"
+  },
+  "scripts": {
+    "build": "tsc -b"
+  }
+}

package/src/bookmark-config-builder.ts

@@ -18,7 +18,10 @@ import {
 import { Bookmark, GetAllBookmarksParameters, GetBookmarkParameters, SourceSystem } from './types';
 
 export type BookmarkConfigBuilderCallback = <TDeps extends Array<AnyModule> = []>(
-    builder: BookmarkConfigBuilder<TDeps, ModuleInitializerArgs<IBookmarkModuleConfigurator, TDeps>>
+    builder: BookmarkConfigBuilder<
+        TDeps,
+        ModuleInitializerArgs<IBookmarkModuleConfigurator, TDeps>
+    >,
 ) => void | Promise<void>;
 
 export class BookmarkConfigBuilder<
@@ -27,15 +30,18 @@ export class BookmarkConfigBuilder<
     TInit extends ModuleInitializerArgs<any, any> = ModuleInitializerArgs<
         BookmarkModuleConfigurator,
         TModules
-    >
+    >,
 > {
     #init: TInit;
-    constructor(init: TInit, public config: Partial<BookmarkModuleConfig> = {}) {
+    constructor(
+        init: TInit,
+        public config: Partial<BookmarkModuleConfig> = {},
+    ) {
         this.#init = init;
     }
 
     requireInstance<TKey extends string = Extract<keyof Modules, string>>(
-        module: TKey
+        module: TKey,
     ): Promise<ModuleType<Modules[TKey]>>;
 
     requireInstance<T>(module: string): Promise<T>;
@@ -81,7 +87,7 @@ export class BookmarkConfigBuilder<
      * @memberof BookmarkConfigBuilder
      */
     serCustomBookmarkApiClient(
-        client: BookmarksApiClient<'fetch', IHttpClient, Bookmark<unknown>>
+        client: BookmarksApiClient<'fetch', IHttpClient, Bookmark<unknown>>,
     ) {
         if (this.config.clientConfiguration) {
             this.config.clientConfiguration.client = client;

package/src/bookmark-provider.ts

@@ -88,7 +88,7 @@ export interface IBookmarkModuleProvider {
      */
     updateBookmarkAsync<T>(
         bookmark: PatchBookmark<T>,
-        options?: UpdateBookmarkOptions
+        options?: UpdateBookmarkOptions,
     ): Promise<Bookmark<T> | undefined>;
 
     /**
@@ -195,7 +195,7 @@ export class BookmarkModuleProvider implements IBookmarkModuleProvider {
 
         if (this.#event) {
             this.#subscriptions.add(
-                this.#event.addEventListener('onCurrentAppChanged', this.#clearStateCreators)
+                this.#event.addEventListener('onCurrentAppChanged', this.#clearStateCreators),
             );
         }
     }
@@ -222,7 +222,7 @@ export class BookmarkModuleProvider implements IBookmarkModuleProvider {
 
     public async updateBookmarkAsync<T>(
         bookmark: PatchBookmark<T>,
-        options?: UpdateBookmarkOptions
+        options?: UpdateBookmarkOptions,
     ): Promise<Bookmark<T> | undefined> {
         if (this.#getAppKey() !== bookmark.appKey) {
             return;

package/src/client/bookmarkActions.ts

@@ -7,33 +7,33 @@ export const actions = {
         'getAll',
         (isValid: boolean) => ({ payload: isValid }),
         (bookmarks: Bookmark[]) => ({ payload: bookmarks }),
-        (err: unknown) => ({ payload: err })
+        (err: unknown) => ({ payload: err }),
     ),
     delete: createAsyncAction(
         'delete',
         (id: string) => ({ payload: id }),
-        (id: string) => ({ payload: id })
+        (id: string) => ({ payload: id }),
     ),
     addFavorite: createAsyncAction(
         'addFavorite',
         (bookmark: Bookmark) => ({ payload: bookmark }),
-        (bookmark: Bookmark) => ({ payload: bookmark })
+        (bookmark: Bookmark) => ({ payload: bookmark }),
     ),
     removeFavorite: createAsyncAction(
         'removeFavorite',
         (id: string) => ({ payload: id }),
-        (id: string) => ({ payload: id })
+        (id: string) => ({ payload: id }),
     ),
     update: createAsyncAction(
         'update',
         (bookmark: PatchBookmark) => ({ payload: bookmark }),
-        (bookmark: Bookmark) => ({ payload: bookmark })
+        (bookmark: Bookmark) => ({ payload: bookmark }),
     ),
     create: createAsyncAction(
         'create',
         (bookmark: CreateBookmark) => ({ payload: bookmark }),
         (bookmark: Bookmark) => ({ payload: bookmark }),
-        (err: unknown) => ({ payload: err })
+        (err: unknown) => ({ payload: err }),
     ),
 };
 

package/src/client/bookmarkClient.ts

@@ -6,8 +6,7 @@ import {
 import { IHttpClient } from '@equinor/fusion-framework-module-http';
 
 import { BookmarksApiClient } from '@equinor/fusion-framework-module-services/bookmarks';
-import { createState } from '@equinor/fusion-observable';
-import { FlowState } from '@equinor/fusion-observable/src/create-state';
+import { createState, FlowState } from '@equinor/fusion-observable';
 import Query, { type QueryCtorOptions } from '@equinor/fusion-query';
 
 import { BehaviorSubject, lastValueFrom, map, Observable, Subscription } from 'rxjs';
@@ -55,7 +54,7 @@ export class BookmarkClient {
     constructor(
         config: BookmarkClientConfig,
         sourceSystem: SourceSystem,
-        event?: IEventModuleProvider
+        event?: IEventModuleProvider,
     ) {
         this.#currentBookmark$ = new BehaviorSubject<Bookmark<unknown> | undefined>(undefined);
 
@@ -82,7 +81,7 @@ export class BookmarkClient {
                         canBubble: true,
                         source: this,
                     });
-                })
+                }),
             );
         }
     }
@@ -93,7 +92,7 @@ export class BookmarkClient {
 
     public get bookmarks$(): Observable<Bookmark[]> {
         return this.#state.subject.pipe(
-            map((state) => Object.values(state.bookmarks).map((bookmark) => bookmark))
+            map((state) => Object.values(state.bookmarks).map((bookmark) => bookmark)),
         );
     }
 
@@ -139,7 +138,7 @@ export class BookmarkClient {
             .pipe(
                 map((bookmark) => {
                     return bookmark.value;
-                })
+                }),
             ) as Observable<Bookmark<T>>;
     }
 
@@ -160,7 +159,7 @@ export class BookmarkClient {
                         detail: action.payload,
                         source: this,
                     });
-                })
+                }),
             );
         });
     }
@@ -182,18 +181,18 @@ export class BookmarkClient {
                 this.#state.subject.addEffect('create::success', (action) => {
                     subscriber.next(action.payload as Bookmark<unknown>);
                     subscriber.complete();
-                })
+                }),
             );
             subscriber.add(
                 this.#state.subject.addEffect('create::failure', (action) => {
                     subscriber.error(action.payload);
-                })
+                }),
             );
         });
     }
 
     public async createBookmarkAsync(
-        bookmark: CreateBookmark<unknown>
+        bookmark: CreateBookmark<unknown>,
     ): Promise<Bookmark<unknown>> {
         return lastValueFrom(this.createBookmark(bookmark));
     }
@@ -206,7 +205,7 @@ export class BookmarkClient {
                     subscriber.next(action.payload as Bookmark<T>);
                     subscriber.complete();
                     this.#queryBookmarkById.cache.invalidate(action.payload.id);
-                })
+                }),
             );
         });
     }
@@ -223,7 +222,7 @@ export class BookmarkClient {
                     subscriber.next(action.payload);
                     subscriber.complete();
                     this.#queryBookmarkById.cache.invalidate(action.payload);
-                })
+                }),
             );
         });
     }
@@ -295,20 +294,20 @@ export class BookmarkClient {
     #addSubjectFlows() {
         this.#subscriptions.add(
             this.#state.subject.addFlow(
-                handleBookmarkGetAll(this.#queryAllBookmarks, this.#sourceSystem.identifier)
-            )
+                handleBookmarkGetAll(this.#queryAllBookmarks, this.#sourceSystem.identifier),
+            ),
         );
         this.#subscriptions.add(
-            this.#state.subject.addFlow(handleCreateBookmark(this.#bookmarkAPiClient))
+            this.#state.subject.addFlow(handleCreateBookmark(this.#bookmarkAPiClient)),
         );
         this.#subscriptions.add(
-            this.#state.subject.addFlow(handleDeleteBookmark(this.#bookmarkAPiClient))
+            this.#state.subject.addFlow(handleDeleteBookmark(this.#bookmarkAPiClient)),
         );
         this.#subscriptions.add(
-            this.#state.subject.addFlow(handleUpdateBookmark(this.#bookmarkAPiClient))
+            this.#state.subject.addFlow(handleUpdateBookmark(this.#bookmarkAPiClient)),
         );
         this.#subscriptions.add(
-            this.#state.subject.addFlow(handleUpdateBookmark(this.#bookmarkAPiClient))
+            this.#state.subject.addFlow(handleUpdateBookmark(this.#bookmarkAPiClient)),
         );
     }
 }

package/src/client/bookmarkFlows.ts

@@ -10,7 +10,7 @@ import { actions, Actions } from './bookmarkActions';
 export const handleBookmarkGetAll =
     (
         queryAllBookmarks: Query<Array<Bookmark<unknown>>, GetAllBookmarksParameters>,
-        sourceSystemIdentifier: string
+        sourceSystemIdentifier: string,
     ) =>
     (action$: Observable<Actions>) =>
         action$.pipe(
@@ -22,13 +22,13 @@ export const handleBookmarkGetAll =
                         actions.getAll.success(
                             bookmarks.value.filter(
                                 (bookmark) =>
-                                    bookmark.sourceSystem.identifier === sourceSystemIdentifier
-                            )
-                        )
+                                    bookmark.sourceSystem.identifier === sourceSystemIdentifier,
+                            ),
+                        ),
                     ),
-                    catchError(() => EMPTY)
+                    catchError(() => EMPTY),
                 );
-            })
+            }),
         );
 
 export const handleCreateBookmark =
@@ -39,7 +39,7 @@ export const handleCreateBookmark =
             switchMap(async (action) => {
                 const response = await apiClient.post('v1', action.payload);
                 return actions.create.success(await response.json());
-            })
+            }),
         );
 
 export const handleUpdateBookmark =
@@ -51,7 +51,7 @@ export const handleUpdateBookmark =
                 // Should payload be partial? then api client wil need to change.
                 const response = await apiClient.patch('v1', action.payload);
                 return actions.update.success(await response.json());
-            })
+            }),
         );
 
 export const handleDeleteBookmark =
@@ -63,5 +63,5 @@ export const handleDeleteBookmark =
                 const response = await apiClient.delete('v1', { id: action.payload });
                 if (response.ok) return actions.delete.success(action.payload);
                 return actions.delete.success(action.payload);
-            })
+            }),
         );

package/src/configurator.ts

@@ -62,7 +62,7 @@ export type IBookmarkModuleConfigurator = {
             IBookmarkModuleConfigurator,
             [ServicesModule, AppModule, ContextModule]
         >,
-        parentProvider?: IBookmarkModuleProvider
+        parentProvider?: IBookmarkModuleProvider,
     ): Promise<BookmarkModuleConfig>;
 };
 
@@ -80,7 +80,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
             IBookmarkModuleConfigurator,
             [ServicesModule, AppModule, ContextModule]
         >,
-        parentProvider?: IBookmarkModuleProvider
+        parentProvider?: IBookmarkModuleProvider,
     ): Promise<BookmarkModuleConfig> {
         const config: Partial<BookmarkModuleConfig> = await this.#configBuilders.reduce(
             async (cur, cb) => {
@@ -89,7 +89,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
                 await Promise.resolve(cb(builder));
                 return Object.assign(cur, builder.config);
             },
-            Promise.resolve({} as Partial<BookmarkModuleConfig>)
+            Promise.resolve({} as Partial<BookmarkModuleConfig>),
         );
 
         const appProvider = await this._getAppProvider(init);
@@ -118,7 +118,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
 
         config.clientConfiguration = await this._createClientConfiguration(
             init,
-            config.clientConfiguration
+            config.clientConfiguration,
         );
 
         if (!config.sourceSystem) {
@@ -130,7 +130,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
 
     #applyParentProviderConfiguration(
         parentProvider: IBookmarkModuleProvider | undefined,
-        config: Partial<BookmarkModuleConfig>
+        config: Partial<BookmarkModuleConfig>,
     ) {
         if (parentProvider) {
             config.clientConfiguration = parentProvider.config.clientConfiguration;
@@ -145,7 +145,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
             IBookmarkModuleConfigurator,
             [ServicesModule, AppModule, ContextModule]
         >,
-        config: Partial<BookmarkClientConfig> = {}
+        config: Partial<BookmarkClientConfig> = {},
     ): Promise<BookmarkClientConfig> {
         if (!config.client) {
             const apiProvider = await this._getServiceProvider(init);
@@ -180,7 +180,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
     }
 
     protected async _getServiceProvider(
-        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [ServicesModule]>
+        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [ServicesModule]>,
     ): Promise<IApiProvider> {
         if (init.hasModule('services')) {
             return init.requireInstance('services');
@@ -195,7 +195,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
     }
 
     protected async _getContextProvider(
-        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [ContextModule]>
+        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [ContextModule]>,
     ): Promise<IContextProvider> {
         if (init.hasModule('context')) {
             return init.requireInstance('context');
@@ -209,7 +209,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
     }
 
     protected async _getAppProvider(
-        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [AppModule]>
+        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [AppModule]>,
     ): Promise<AppModuleProvider> {
         if (init.hasModule('app')) {
             return init.requireInstance('app');
@@ -222,7 +222,7 @@ export class BookmarkModuleConfigurator implements IBookmarkModuleConfigurator {
         }
     }
     protected async _getEventProvider(
-        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [EventModule]>
+        init: ModuleInitializerArgs<IBookmarkModuleConfigurator, [EventModule]>,
     ): Promise<IEventModuleProvider> {
         if (init.hasModule('event')) {
             return init.requireInstance('event');

package/src/enable-bookmark.ts

@@ -20,8 +20,8 @@ export const enableBookmark = (
         builder: BookmarkConfigBuilder<
             TDeps,
             ModuleInitializerArgs<IBookmarkModuleConfigurator, TDeps>
-        >
-    ) => void | Promise<void>
+        >,
+    ) => void | Promise<void>,
 ): void => {
     configurator.addConfig({
         module,

package/src/version.ts

@@ -0,0 +1,2 @@
+// Generated by genversion.
+export const version = '1.0.9';

package/tsconfig.json

@@ -4,7 +4,7 @@
     "outDir": "dist/esm",
     "rootDir": "src",
     "declarationDir": "./dist/types",
-    "baseUrl": "src",
+    
   },
   "references": [
     {