@equinor/fusion-framework-module-app 5.2.7 → 5.2.9

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

@@ -1,28 +1,36 @@
 import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
 import type { App } from './App';
-import type { AppConfig, AppManifest, AppModulesInstance } from '../types';
+import type { AppConfig, AppManifest, AppModulesInstance, AppScriptModule } from '../types';
 export type AppEventEventInit<TDetail extends Record<string, unknown> | unknown = unknown> = FrameworkEventInit<TDetail & {
     appKey: string;
 }, App>;
+export type AppEvent<TDetail extends Record<string, unknown> | unknown = unknown> = FrameworkEvent<AppEventEventInit<TDetail>>;
+export type AppEventFailure = FrameworkEvent<AppEventEventInit<{
+    error: AppConfig;
+}>>;
 declare module '@equinor/fusion-framework-module-event' {
     interface FrameworkEventMap {
-        onAppModulesLoaded: FrameworkEvent<AppEventEventInit<{
+        onAppModulesLoaded: AppEvent<{
             modules: AppModulesInstance;
-        }>>;
-        onAppManifestLoaded: FrameworkEvent<AppEventEventInit<{
+        }>;
+        onAppManifestLoad: AppEvent;
+        onAppManifestLoaded: AppEvent<{
             manifest: AppManifest;
-        }>>;
-        onAppConfigLoaded: FrameworkEvent<AppEventEventInit<{
+        }>;
+        onAppManifestFailure: AppEventFailure;
+        onAppConfigLoad: AppEvent;
+        onAppConfigLoaded: AppEvent<{
             config: AppConfig;
-        }>>;
-        onAppScriptLoaded: FrameworkEvent<AppEventEventInit<{
-            manifest: AppManifest;
-        }>>;
-        onAppInitialize: FrameworkEvent<AppEventEventInit>;
-        onAppInitialized: FrameworkEvent<AppEventEventInit>;
-        onAppInitializeFailed: FrameworkEvent<AppEventEventInit<{
-            error: unknown;
-        }>>;
+        }>;
+        onAppConfigFailure: AppEventFailure;
+        onAppScriptLoad: AppEvent;
+        onAppScriptLoaded: AppEvent<{
+            script: AppScriptModule;
+        }>;
+        onAppScriptFailure: AppEventFailure;
+        onAppInitialize: AppEvent;
+        onAppInitialized: AppEvent;
+        onAppInitializeFailure: AppEventFailure;
         onAppDispose: FrameworkEvent<AppEventEventInit>;
     }
 }

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.2.7";
+export declare const version = "5.2.9";

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@equinor/fusion-framework-module-app",
-  "version": "5.2.7",
+  "version": "5.2.9",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
     ".": "./dist/esm/index.js",
     "./errors.js": "./dist/esm/errors.js",
-    "./app": "./dist/esm/app/index.js"
+    "./app": "./dist/esm/app/index.js",
+    "./app/*.js": "./dist/esm/app/*.js"
   },
   "types": "dist/types/index.d.ts",
   "typesVersions": {
@@ -16,6 +17,9 @@
       ],
       "app": [
         "dist/types/app/index.d.ts"
+      ],
+      "app/*.js": [
+        "dist/types/app/*.d.ts"
       ]
     }
   },
@@ -34,15 +38,15 @@
     "immer": "^9.0.16",
     "rxjs": "^7.8.1",
     "@equinor/fusion-observable": "^8.1.2",
-    "@equinor/fusion-query": "^4.0.2"
+    "@equinor/fusion-query": "^4.0.3"
   },
   "devDependencies": {
     "typescript": "^5.1.3",
+    "@equinor/fusion-framework-module-msal": "^3.0.7",
     "@equinor/fusion-framework-module": "^4.2.5",
+    "@equinor/fusion-framework-module-service-discovery": "^7.0.13",
     "@equinor/fusion-framework-module-event": "^4.0.6",
-    "@equinor/fusion-framework-module-http": "^5.1.1",
-    "@equinor/fusion-framework-module-msal": "^3.0.7",
-    "@equinor/fusion-framework-module-service-discovery": "^7.0.12"
+    "@equinor/fusion-framework-module-http": "^5.1.1"
   },
   "scripts": {
     "build": "tsc -b"

package/src/app/App.ts

@@ -170,23 +170,59 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
     #registerEvents(event: ModuleType<EventModule>): void {
         const { appKey } = this;
 
+        this.#state.addEffect(actions.fetchManifest.type, (action) => {
+            event.dispatchEvent('onAppManifestLoad', {
+                detail: { appKey, manifest: action.payload },
+                source: this,
+            });
+        });
         this.#state.addEffect(actions.fetchManifest.success.type, (action) => {
             event.dispatchEvent('onAppManifestLoaded', {
                 detail: { appKey, manifest: action.payload },
                 source: this,
             });
         });
+        this.#state.addEffect(actions.fetchManifest.failure.type, (action) => {
+            event.dispatchEvent('onAppManifestFailure', {
+                detail: { appKey, manifest: action.payload },
+                source: this,
+            });
+        });
 
+        this.#state.addEffect(actions.fetchConfig.type, (action) => {
+            event.dispatchEvent('onAppConfigLoad', {
+                detail: { appKey, manifest: action.payload },
+                source: this,
+            });
+        });
         this.#state.addEffect(actions.fetchConfig.success.type, (action) => {
             event.dispatchEvent('onAppConfigLoaded', {
                 detail: { appKey, manifest: action.payload },
                 source: this,
             });
         });
+        this.#state.addEffect(actions.fetchConfig.failure.type, (action) => {
+            event.dispatchEvent('onAppConfigFailure', {
+                detail: { appKey, manifest: action.payload },
+                source: this,
+            });
+        });
 
+        this.#state.addEffect(actions.importApp.type, (action) => {
+            event.dispatchEvent('onAppScriptLoad', {
+                detail: { appKey, manifest: action.payload },
+                source: this,
+            });
+        });
         this.#state.addEffect(actions.importApp.success.type, (action) => {
             event.dispatchEvent('onAppScriptLoaded', {
-                detail: { appKey, manifest: action.payload },
+                detail: { appKey, script: action.payload },
+                source: this,
+            });
+        });
+        this.#state.addEffect(actions.importApp.failure.type, (action) => {
+            event.dispatchEvent('onAppScriptFailure', {
+                detail: { appKey, error: action.payload },
                 source: this,
             });
         });
@@ -206,7 +242,7 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
         });
 
         this.#state.addEffect(actions.initialize.failure.type, ({ payload }) => {
-            event.dispatchEvent('onAppInitializeFailed', {
+            event.dispatchEvent('onAppInitializeFailure', {
                 detail: { appKey, error: payload },
                 source: this,
             });

package/src/app/events.ts

@@ -2,7 +2,7 @@ import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framewo
 
 import type { App } from './App';
 
-import type { AppConfig, AppManifest, AppModulesInstance } from '../types';
+import type { AppConfig, AppManifest, AppModulesInstance, AppScriptModule } from '../types';
 
 /** base event type for applications */
 export type AppEventEventInit<TDetail extends Record<string, unknown> | unknown = unknown> =
@@ -13,53 +13,57 @@ export type AppEventEventInit<TDetail extends Record<string, unknown> | unknown
         App
     >;
 
+export type AppEvent<TDetail extends Record<string, unknown> | unknown = unknown> = FrameworkEvent<
+    AppEventEventInit<TDetail>
+>;
+
+export type AppEventFailure = FrameworkEvent<
+    AppEventEventInit<{
+        error: AppConfig;
+    }>
+>;
+
 declare module '@equinor/fusion-framework-module-event' {
     interface FrameworkEventMap {
         /** fired when the application has initiated its modules */
-        onAppModulesLoaded: FrameworkEvent<
-            AppEventEventInit<{
-                /** initiated modules for application */
-                modules: AppModulesInstance;
-            }>
-        >;
+        onAppModulesLoaded: AppEvent<{
+            /** initiated modules for application */
+            modules: AppModulesInstance;
+        }>;
 
+        onAppManifestLoad: AppEvent;
         /** fired when the application has loaded corresponding manifest */
-        onAppManifestLoaded: FrameworkEvent<
-            AppEventEventInit<{
-                manifest: AppManifest;
-            }>
-        >;
+        onAppManifestLoaded: AppEvent<{
+            manifest: AppManifest;
+        }>;
+        onAppManifestFailure: AppEventFailure;
 
+        onAppConfigLoad: AppEvent;
         /** fired when the application has loaded corresponding config */
-        onAppConfigLoaded: FrameworkEvent<
-            AppEventEventInit<{
-                config: AppConfig;
-            }>
-        >;
+        onAppConfigLoaded: AppEvent<{
+            config: AppConfig;
+        }>;
+        onAppConfigFailure: AppEventFailure;
 
         /** fired when the application has loaded corresponding javascript module */
-        onAppScriptLoaded: FrameworkEvent<
-            AppEventEventInit<{
-                manifest: AppManifest;
-            }>
-        >;
+        onAppScriptLoad: AppEvent;
+        onAppScriptLoaded: AppEvent<{
+            script: AppScriptModule;
+        }>;
+        onAppScriptFailure: AppEventFailure;
 
         /** fired before application loads manifest, config and script */
-        onAppInitialize: FrameworkEvent<AppEventEventInit>;
+        onAppInitialize: AppEvent;
 
         /**
          * fired after application has loaded manifest, config and script
          *
          * __note:__ not fired until all loaders has settled (last emit)
          */
-        onAppInitialized: FrameworkEvent<AppEventEventInit>;
+        onAppInitialized: AppEvent;
 
         /** fired when application fails to load either manifest, config and script */
-        onAppInitializeFailed: FrameworkEvent<
-            AppEventEventInit<{
-                error: unknown;
-            }>
-        >;
+        onAppInitializeFailure: AppEventFailure;
 
         /** fired when the application is disposed (unmounts) */
         onAppDispose: FrameworkEvent<AppEventEventInit>;

package/src/version.ts

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