@equinor/fusion-framework-module-app 5.2.0 → 5.2.3

package/dist/types/AppConfigurator.d.ts

@@ -1,7 +1,7 @@
-import { ModuleInitializerArgs } from '@equinor/fusion-framework-module';
-import { HttpModule, IHttpClient } from '@equinor/fusion-framework-module-http';
-import { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
-import { QueryCtorOptions } from '@equinor/fusion-query';
+import type { ModuleInitializerArgs } from '@equinor/fusion-framework-module';
+import type { HttpModule, IHttpClient } from '@equinor/fusion-framework-module-http';
+import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
+import type { QueryCtorOptions } from '@equinor/fusion-query';
 import { AppConfigBuilderCallback } from './AppConfigBuilder';
 import type { AppConfig, AppManifest } from './types';
 export interface AppModuleConfig {

package/dist/types/app/flows.d.ts

@@ -1,7 +1,7 @@
 import type { Flow } from '@equinor/fusion-observable';
 import type { AppModuleProvider } from '../AppModuleProvider';
 import type { Actions } from './actions';
-import { AppBundleState } from './types';
+import type { AppBundleState } from './types';
 export declare const handleFetchManifest: (provider: AppModuleProvider) => Flow<Actions, AppBundleState>;
 export declare const handleFetchConfig: (provider: AppModuleProvider) => Flow<Actions, AppBundleState>;
 export declare const handleImportApplication: () => Flow<Actions, AppBundleState>;

package/dist/types/types.d.ts

@@ -1,7 +1,7 @@
 import { AnyModule, CombinedModules, ModulesInstance } from '@equinor/fusion-framework-module';
 import type { EventModule } from '@equinor/fusion-framework-module-event';
 import type { HttpModule } from '@equinor/fusion-framework-module-http';
-import { MsalModule } from '@equinor/fusion-framework-module-msal';
+import type { MsalModule } from '@equinor/fusion-framework-module-msal';
 import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
 import IApp from './app';
 type Fusion = any;

package/dist/types/version.d.ts

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

package/package.json

@@ -1,48 +1,50 @@
 {
-    "name": "@equinor/fusion-framework-module-app",
-    "version": "5.2.0",
-    "description": "",
-    "main": "dist/esm/index.js",
-    "exports": {
-        ".": "./dist/esm/index.js",
-        "./errors.js": "./dist/esm/errors.js",
-        "./app": "./dist/esm/app/index.js"
-    },
-    "types": "dist/types/index.d.ts",
-    "typesVersions": {
-        "*": {
-            "errors.js": [
-                "dist/types/errors.d.ts"
-            ],
-            "app": [
-                "dist/types/app/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/app"
-    },
-    "dependencies": {
-        "@equinor/fusion-query": "^3.0.2",
-        "rxjs": "^7.5.7"
-    },
-    "devDependencies": {
-        "@equinor/fusion-framework-module": "^4.2.0",
-        "@equinor/fusion-framework-module-event": "^4.0.1",
-        "@equinor/fusion-framework-module-http": "^5.0.3",
-        "@equinor/fusion-framework-module-service-discovery": "^7.0.4",
-        "typescript": "^5.0.4"
+  "name": "@equinor/fusion-framework-module-app",
+  "version": "5.2.3",
+  "description": "",
+  "main": "dist/esm/index.js",
+  "exports": {
+    ".": "./dist/esm/index.js",
+    "./errors.js": "./dist/esm/errors.js",
+    "./app": "./dist/esm/app/index.js"
+  },
+  "types": "dist/types/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "errors.js": [
+        "dist/types/errors.d.ts"
+      ],
+      "app": [
+        "dist/types/app/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/app"
+  },
+  "dependencies": {
+    "immer": "^9.0.16",
+    "rxjs": "^7.8.1",
+    "@equinor/fusion-observable": "^8.1.0",
+    "@equinor/fusion-query": "^3.0.6"
+  },
+  "devDependencies": {
+    "typescript": "^5.1.3",
+    "@equinor/fusion-framework-module": "^4.2.3",
+    "@equinor/fusion-framework-module-event": "^4.0.4",
+    "@equinor/fusion-framework-module-http": "^5.0.5",
+    "@equinor/fusion-framework-module-msal": "^3.0.5",
+    "@equinor/fusion-framework-module-service-discovery": "^7.0.7"
+  },
+  "scripts": {
+    "build": "tsc -b"
+  }
+}

package/src/AppConfigBuilder.ts

@@ -7,7 +7,7 @@ import type { AppConfig, AppManifest, ModuleDeps } from './types';
 
 export type AppConfigBuilderCallback = (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    builder: AppConfigBuilder<ModuleInitializerArgs<IAppConfigurator, any>>
+    builder: AppConfigBuilder<ModuleInitializerArgs<IAppConfigurator, any>>,
 ) => void | Promise<void>;
 
 export class AppConfigBuilder<
@@ -15,15 +15,18 @@ export class AppConfigBuilder<
     TInit extends ModuleInitializerArgs<IAppConfigurator, any> = ModuleInitializerArgs<
         IAppConfigurator,
         ModuleDeps
-    >
+    >,
 > {
     #init: TInit;
-    constructor(init: TInit, public config: Partial<AppModuleConfig> = {}) {
+    constructor(
+        init: TInit,
+        public config: Partial<AppModuleConfig> = {},
+    ) {
         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>;
@@ -43,7 +46,7 @@ export class AppConfigBuilder<
                 | QueryFn<AppConfig, { appKey: string }>
                 | QueryCtorOptions<AppConfig, { appKey: string; tag?: string }>;
         },
-        expire = 1 * 60 * 1000
+        expire = 1 * 60 * 1000,
     ) {
         client;
         expire;

package/src/AppConfigurator.ts

@@ -1,7 +1,7 @@
-import { ModuleInitializerArgs } from '@equinor/fusion-framework-module';
-import { HttpModule, IHttpClient } from '@equinor/fusion-framework-module-http';
-import { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
-import { QueryCtorOptions } from '@equinor/fusion-query';
+import type { ModuleInitializerArgs } from '@equinor/fusion-framework-module';
+import type { HttpModule, IHttpClient } from '@equinor/fusion-framework-module-http';
+import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
+import type { QueryCtorOptions } from '@equinor/fusion-query';
 
 import { AppConfigBuilder, AppConfigBuilderCallback } from './AppConfigBuilder';
 
@@ -34,7 +34,7 @@ export class AppConfigurator implements IAppConfigurator {
      * WARNING: this function will be remove in future
      */
     protected async _createHttpClient(
-        init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>
+        init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>,
     ): Promise<IHttpClient> {
         const http = await init.requireInstance('http');
         /** check if the http provider has configure a client */
@@ -55,14 +55,17 @@ export class AppConfigurator implements IAppConfigurator {
     }
 
     public async createConfig(
-        init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>
+        init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>,
     ): Promise<AppModuleConfig> {
-        const config = await this.#configBuilders.reduce(async (cur, cb) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const builder = new AppConfigBuilder(init, await cur);
-            await Promise.resolve(cb(builder));
-            return Object.assign(cur, builder.config);
-        }, Promise.resolve({} as Partial<AppModuleConfig>));
+        const config = await this.#configBuilders.reduce(
+            async (cur, cb) => {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const builder = new AppConfigBuilder(init, await cur);
+                await Promise.resolve(cb(builder));
+                return Object.assign(cur, builder.config);
+            },
+            Promise.resolve({} as Partial<AppModuleConfig>),
+        );
 
         // TODO - make less lazy
         config.client ??= await (async (): Promise<AppModuleConfig['client']> => {
@@ -87,7 +90,7 @@ export class AppConfigurator implements IAppConfigurator {
                     client: {
                         fn: ({ appKey, tag }) =>
                             httpClient.json$(
-                                `/api/apps/${appKey}/config${tag ? `?tag=${tag}` : ''}`
+                                `/api/apps/${appKey}/config${tag ? `?tag=${tag}` : ''}`,
                             ),
                     },
                     key: (args) => JSON.stringify(args),

package/src/AppModuleProvider.ts

@@ -53,7 +53,7 @@ export class AppModuleProvider {
                     return prev.appKey === next.appKey;
                 }
                 return prev === next;
-            })
+            }),
         );
     }
 
@@ -75,14 +75,14 @@ export class AppModuleProvider {
             this.current$
                 .pipe(
                     pairwise(),
-                    takeWhile(() => !!event)
+                    takeWhile(() => !!event),
                 )
                 .subscribe(([previous, next]) => {
                     event?.dispatchEvent('onCurrentAppChanged', {
                         source: this,
                         detail: { previous, next },
                     });
-                })
+                }),
         );
 
         this.#subscription.add(
@@ -90,9 +90,9 @@ export class AppModuleProvider {
                 .pipe(
                     pairwise(),
                     map(([previous]) => previous),
-                    filterEmpty()
+                    filterEmpty(),
                 )
-                .subscribe((app) => app.dispose())
+                .subscribe((app) => app.dispose()),
         );
     }
 
@@ -113,8 +113,8 @@ export class AppModuleProvider {
                         throw AppManifestError.fromHttpResponse(cause.response, { cause });
                     }
                     throw new AppManifestError('unknown', 'failed to load manifest', { cause });
-                })
-            )
+                }),
+            ),
         );
     }
 
@@ -131,7 +131,7 @@ export class AppModuleProvider {
      */
     public getAppConfig<TType = unknown>(
         appKey: string,
-        tag?: string
+        tag?: string,
     ): Observable<AppConfig<TType>> {
         return Query.extractQueryValue(
             this.#configClient.query({ appKey, tag }).pipe(
@@ -145,8 +145,8 @@ export class AppModuleProvider {
                         throw AppConfigError.fromHttpResponse(cause.response, { cause });
                     }
                     throw new AppConfigError('unknown', 'failed to load config', { cause });
-                })
-            )
+                }),
+            ),
         );
     }
 

package/src/app/App.ts

@@ -73,28 +73,28 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
     get manifest$(): Observable<AppManifest> {
         return this.#state.pipe(
             map(({ manifest }) => manifest),
-            filterEmpty()
+            filterEmpty(),
         );
     }
 
     get config$(): Observable<AppConfig<TEnv>> {
         return this.#state.pipe(
             map(({ config }) => config),
-            filterEmpty()
+            filterEmpty(),
         );
     }
 
     get modules$(): Observable<AppScriptModule> {
         return this.#state.pipe(
             map(({ modules }) => modules),
-            filterEmpty()
+            filterEmpty(),
         );
     }
 
     get instance$(): Observable<AppModulesInstance<TModules>> {
         return this.#state.pipe(
             map(({ instance }) => instance as AppModulesInstance<TModules>),
-            filterEmpty()
+            filterEmpty(),
         );
     }
 
@@ -134,7 +134,7 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
         args: {
             provider: AppModuleProvider;
             event?: ModuleType<EventModule>;
-        }
+        },
     ) {
         this.#state = createState(value, args.provider);
 
@@ -153,7 +153,7 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
                     if (e.detail.appKey === appKey) {
                         this.#state.next(actions.setInstance(e.detail.modules));
                     }
-                })
+                }),
             );
         }
 
@@ -253,7 +253,7 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
                         this.#state.next(actions.initialize.success());
                         observer.complete();
                     },
-                })
+                }),
             );
         });
     }
@@ -286,22 +286,22 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
             subscriber.add(
                 this.#state.addEffect('set_config', ({ payload }) => {
                     subscriber.next(payload);
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('fetch_config::success', ({ payload }) => {
                     subscriber.next(payload);
                     subscriber.complete();
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('fetch_config::failure', ({ payload }) => {
                     subscriber.error(
                         Error('failed to load application config', {
                             cause: payload,
-                        })
+                        }),
                     );
-                })
+                }),
             );
 
             this.loadConfig();
@@ -324,22 +324,22 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
             subscriber.add(
                 this.#state.addEffect('set_manifest', ({ payload }) => {
                     subscriber.next(payload);
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('fetch_manifest::success', ({ payload }) => {
                     subscriber.next(payload);
                     subscriber.complete();
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('fetch_manifest::failure', ({ payload }) => {
                     subscriber.error(
                         Error('failed to load application manifest', {
                             cause: payload,
-                        })
+                        }),
                     );
-                })
+                }),
             );
 
             this.loadManifest();
@@ -362,28 +362,28 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
             subscriber.add(
                 this.#state.addEffect('set_module', ({ payload }) => {
                     subscriber.next(payload);
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('import_app::success', ({ payload }) => {
                     subscriber.next(payload);
                     subscriber.complete();
-                })
+                }),
             );
             subscriber.add(
                 this.#state.addEffect('import_app::failure', ({ payload }) => {
                     subscriber.error(
                         Error('failed to load application modules from script', {
                             cause: payload,
-                        })
+                        }),
                     );
-                })
+                }),
             );
 
             subscriber.add(
                 this.getManifest().subscribe((manifest) =>
-                    of(this.#state.next(actions.importApp(manifest.entry)))
-                )
+                    of(this.#state.next(actions.importApp(manifest.entry))),
+                ),
             );
         });
     }

package/src/app/actions.ts

@@ -21,7 +21,7 @@ const createActions = () => ({
         'fetch_manifest',
         (key: string, update?: boolean) => ({ payload: key, meta: { update } }),
         (manifest: AppManifest) => ({ payload: manifest }),
-        (error: unknown) => ({ payload: error })
+        (error: unknown) => ({ payload: error }),
     ),
     /** Config loading */
     setConfig: createAction('set_config', (config: AppConfig) => ({ payload: config })),
@@ -29,7 +29,7 @@ const createActions = () => ({
         'fetch_config',
         (key: string) => ({ payload: key }),
         (config: AppConfig) => ({ payload: config }),
-        (error: unknown) => ({ payload: error })
+        (error: unknown) => ({ payload: error }),
     ),
     /** App loading */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -38,7 +38,7 @@ const createActions = () => ({
         'import_app',
         (entrypoint: string) => ({ payload: entrypoint }),
         (module: AppScriptModule) => ({ payload: module }),
-        (error: unknown) => ({ payload: error })
+        (error: unknown) => ({ payload: error }),
     ),
 
     // App Instance
@@ -50,7 +50,7 @@ const createActions = () => ({
         'initialize_app',
         () => ({ payload: null }),
         () => ({ payload: null }),
-        (error: unknown) => ({ payload: error })
+        (error: unknown) => ({ payload: error }),
     ),
 });
 

package/src/app/create-reducer.ts

@@ -39,7 +39,7 @@ export const createReducer = (value: AppBundleStateInitial) =>
             /** clear status {{type}} */
             .addMatcher(isCompleteAction, (state, action) => {
                 state.status.delete(actionBaseType(action));
-            })
+            }),
     );
 
 export default createReducer;

package/src/app/create-state.ts

@@ -10,7 +10,7 @@ import type { AppModuleProvider } from '../AppModuleProvider';
 
 export const createState = (
     value: AppBundleStateInitial,
-    provider: AppModuleProvider
+    provider: AppModuleProvider,
 ): FlowSubject<AppBundleState, Actions> => {
     const reducer = createReducer(value);
     const state = new FlowSubject<AppBundleState, Actions>(reducer);

package/src/app/flows.ts

@@ -6,7 +6,7 @@ import { actions } from './actions';
 import type { Flow } from '@equinor/fusion-observable';
 import type { AppModuleProvider } from '../AppModuleProvider';
 import type { Actions } from './actions';
-import { AppBundleState } from './types';
+import type { AppBundleState } from './types';
 
 export const handleFetchManifest =
     (provider: AppModuleProvider): Flow<Actions, AppBundleState> =>
@@ -16,20 +16,20 @@ export const handleFetchManifest =
             switchMap(({ payload: appKey, meta: { update } }) => {
                 const fetch$ = from(provider.getAppManifest(appKey)).pipe(
                     filter((x) => !!x),
-                    map((manifest) => actions.setManifest(manifest, update))
+                    map((manifest) => actions.setManifest(manifest, update)),
                 );
                 return merge(
                     fetch$,
                     fetch$.pipe(
                         last(),
-                        map(({ payload }) => actions.fetchManifest.success(payload))
-                    )
+                        map(({ payload }) => actions.fetchManifest.success(payload)),
+                    ),
                 ).pipe(
                     catchError((err) => {
                         return of(actions.fetchManifest.failure(err));
-                    })
+                    }),
                 );
-            })
+            }),
         );
 
 export const handleFetchConfig =
@@ -43,10 +43,10 @@ export const handleFetchConfig =
                     fetch$,
                     fetch$.pipe(
                         last(),
-                        map(({ payload }) => actions.fetchConfig.success(payload))
-                    )
+                        map(({ payload }) => actions.fetchConfig.success(payload)),
+                    ),
                 ).pipe(catchError((err) => of(actions.fetchConfig.failure(err))));
-            })
+            }),
         );
 
 export const handleImportApplication = (): Flow<Actions, AppBundleState> => (action$) =>
@@ -55,7 +55,7 @@ export const handleImportApplication = (): Flow<Actions, AppBundleState> => (act
         switchMap(({ payload }) => {
             return from(import(payload)).pipe(
                 map(actions.importApp.success),
-                catchError((err) => of(actions.importApp.failure(err)))
+                catchError((err) => of(actions.importApp.failure(err))),
             );
-        })
+        }),
     );

package/src/enable-app-module.ts

@@ -10,7 +10,7 @@ import { module } from './module';
 export const enableAppModule = (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     configurator: IModulesConfigurator<any, any>,
-    builder?: AppConfigBuilderCallback
+    builder?: AppConfigBuilderCallback,
 ): void => {
     configurator.addConfig({
         module,

package/src/errors.ts

@@ -7,7 +7,7 @@ export class AppManifestError extends Error {
                 return new AppManifestError(
                     'unauthorized',
                     'failed to load application manifest, request not authorized',
-                    options
+                    options,
                 );
             case 404:
                 return new AppManifestError('not_found', 'application manifest not found', options);
@@ -15,10 +15,14 @@ export class AppManifestError extends Error {
         return new AppManifestError(
             'unknown',
             `failed to load application manifest, status code ${response.status}`,
-            options
+            options,
         );
     }
-    constructor(public readonly type: AppErrorType, message?: string, options?: ErrorOptions) {
+    constructor(
+        public readonly type: AppErrorType,
+        message?: string,
+        options?: ErrorOptions,
+    ) {
         super(message, options);
     }
 }
@@ -30,7 +34,7 @@ export class AppConfigError extends Error {
                 return new AppConfigError(
                     'unauthorized',
                     'failed to load application config, request not authorized',
-                    options
+                    options,
                 );
             case 404:
                 return new AppConfigError('not_found', 'application config not found', options);
@@ -38,16 +42,24 @@ export class AppConfigError extends Error {
         return new AppConfigError(
             'unknown',
             `failed to load application config, status code ${response.status}`,
-            options
+            options,
         );
     }
-    constructor(public readonly type: AppErrorType, message?: string, options?: ErrorOptions) {
+    constructor(
+        public readonly type: AppErrorType,
+        message?: string,
+        options?: ErrorOptions,
+    ) {
         super(message, options);
     }
 }
 
 export class AppScriptModuleError extends Error {
-    constructor(public readonly type: AppErrorType, message?: string, options?: ErrorOptions) {
+    constructor(
+        public readonly type: AppErrorType,
+        message?: string,
+        options?: ErrorOptions,
+    ) {
         super(message, options);
     }
 }

package/src/types.ts

@@ -1,7 +1,7 @@
 import { AnyModule, CombinedModules, ModulesInstance } from '@equinor/fusion-framework-module';
 import type { EventModule } from '@equinor/fusion-framework-module-event';
 import type { HttpModule } from '@equinor/fusion-framework-module-http';
-import { MsalModule } from '@equinor/fusion-framework-module-msal';
+import type { MsalModule } from '@equinor/fusion-framework-module-msal';
 import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
 import IApp from './app';
 

package/src/version.ts

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

package/tsconfig.json

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