@equinor/fusion-framework-module-app 6.1.17 → 6.1.19

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

@@ -1,5 +1,5 @@
 import { type ActionInstanceMap, type ActionTypes } from '@equinor/fusion-observable';
-import type { AppConfig, AppManifest, AppScriptModule, AppSettings } from '../types';
+import type { AppConfig, AppManifest, AppModulesInstance, AppScriptModule, AppSettings } from '../types';
 declare const createActions: () => {
     /** Manifest loading */
     setManifest: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[manifest: AppManifest, update?: boolean | undefined], AppManifest, "set_manifest", never, {
@@ -42,7 +42,7 @@ declare const createActions: () => {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[module: AppScriptModule], AppScriptModule, "import_app::success", never, never>;
         failure: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[error: unknown], unknown, "import_app::failure", never, never>;
     };
-    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: any], any, "set_instance", never, never>;
+    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: AppModulesInstance], AppModulesInstance, "set_instance", never, never>;
     initialize: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[], null, "initialize_app::request", never, never> & {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[], null, "initialize_app::success", never, never>;
         failure: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[error: unknown], unknown, "initialize_app::failure", never, never>;
@@ -90,7 +90,7 @@ export declare const actions: {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[module: AppScriptModule], AppScriptModule, "import_app::success", never, never>;
         failure: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[error: unknown], unknown, "import_app::failure", never, never>;
     };
-    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: any], any, "set_instance", never, never>;
+    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: AppModulesInstance], AppModulesInstance, "set_instance", never, never>;
     initialize: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[], null, "initialize_app::request", never, never> & {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[], null, "initialize_app::success", never, never>;
         failure: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[error: unknown], unknown, "initialize_app::failure", never, never>;

package/dist/types/app/create-reducer.d.ts

@@ -34,7 +34,7 @@ export declare const createReducer: (value: AppBundleStateInitial) => import("@e
     payload: string;
     type: "import_app::request";
 } | {
-    payload: any;
+    payload: import("..").AppModulesInstance;
     type: "set_instance";
 } | {
     payload: null;

package/dist/types/errors.d.ts

@@ -1,4 +1,4 @@
-type AppErrorType = 'not_found' | 'unauthorized' | 'unknown';
+type AppErrorType = 'not_found' | 'unauthorized' | 'unknown' | 'deleted';
 /**
  * Represents an error that occurs when loading an application manifest.
  */

package/dist/types/types.d.ts

@@ -18,7 +18,7 @@ export type ModuleDeps = [HttpModule, ServiceDiscoveryModule, EventModule];
 export interface AppSettings {
     [key: string]: unknown;
 }
-export type AppType = 'standalone' | 'report' | 'launcher' | 'template';
+export type AppType = 'standalone' | 'report' | 'launcher' | 'template' | 'template-app' | 'landing-page';
 export type CurrentApp<TModules extends Array<AnyModule> = [], TEnv extends ConfigEnvironment = ConfigEnvironment> = IApp<TEnv, TModules> | null | undefined;
 type Nullable<T> = T | null | undefined;
 type AppPerson = {

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.1.17";
+export declare const version = "6.1.19";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-app",
-  "version": "6.1.17",
+  "version": "6.1.19",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -57,20 +57,20 @@
   },
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
-    "immer": "^9.0.16",
+    "immer": "^10.1.3",
     "rxjs": "^7.8.1",
-    "uuid": "^11.0.3",
+    "uuid": "^13.0.0",
     "zod": "^3.25.76",
-    "@equinor/fusion-query": "^5.2.11",
-    "@equinor/fusion-observable": "^8.5.1"
+    "@equinor/fusion-observable": "^8.5.3",
+    "@equinor/fusion-query": "^5.2.13"
   },
   "devDependencies": {
     "typescript": "^5.8.2",
-    "@equinor/fusion-framework-module": "^5.0.0",
-    "@equinor/fusion-framework-module-http": "^6.3.4",
     "@equinor/fusion-framework-module-event": "^4.3.7",
-    "@equinor/fusion-framework-module-service-discovery": "^8.0.18",
-    "@equinor/fusion-framework-module-msal": "^4.0.8"
+    "@equinor/fusion-framework-module": "^5.0.1",
+    "@equinor/fusion-framework-module-http": "^6.3.5",
+    "@equinor/fusion-framework-module-msal": "^4.1.0",
+    "@equinor/fusion-framework-module-service-discovery": "^8.0.18"
   },
   "scripts": {
     "build": "tsc -b"

package/src/AppClient.ts

@@ -3,7 +3,11 @@ import { catchError, map, type Observable, type ObservableInput, tap } from 'rxj
 import { Query } from '@equinor/fusion-query';
 import { queryValue } from '@equinor/fusion-query/operators';
 
-import { HttpResponseError, type IHttpClient } from '@equinor/fusion-framework-module-http';
+import {
+  HttpJsonResponseError,
+  HttpResponseError,
+  type IHttpClient,
+} from '@equinor/fusion-framework-module-http';
 import { jsonSelector } from '@equinor/fusion-framework-module-http/selectors';
 
 import { ApiApplicationSchema } from './schemas';
@@ -156,14 +160,16 @@ export class AppClient implements IAppClient {
     return this.#manifest.query(args).pipe(
       queryValue,
       catchError((err) => {
-        /** extract cause, since error will be a `QueryError` */
-        const { cause } = err;
+        const cause = err?.cause || err;
+
         if (cause instanceof AppManifestError) {
           throw cause;
         }
-        if (cause instanceof HttpResponseError) {
+
+        if (cause instanceof HttpJsonResponseError || cause instanceof HttpResponseError) {
           throw AppManifestError.fromHttpResponse(cause.response, { cause });
         }
+
         throw new AppManifestError('unknown', 'failed to load manifest', { cause });
       }),
     );
@@ -180,12 +186,13 @@ export class AppClient implements IAppClient {
     return this.#config.query(args).pipe(
       map((res) => res.value as AppConfig<TType>),
       catchError((err) => {
-        /** extract cause, since error will be a `QueryError` */
-        const { cause } = err;
+        /** handle both direct errors and errors wrapped in a `cause` property */
+        const cause = err?.cause || err;
+
         if (cause instanceof AppConfigError) {
           throw cause;
         }
-        if (cause instanceof HttpResponseError) {
+        if (cause instanceof HttpJsonResponseError || cause instanceof HttpResponseError) {
           throw AppConfigError.fromHttpResponse(cause.response, { cause });
         }
         throw new AppConfigError('unknown', 'failed to load config', { cause });
@@ -197,12 +204,13 @@ export class AppClient implements IAppClient {
     return this.#settings.query(args).pipe(
       queryValue,
       catchError((err) => {
-        /** extract cause, since error will be a `QueryError` */
-        const { cause } = err;
+        /** handle both direct errors and errors wrapped in a `cause` property */
+        const cause = err?.cause || err;
+
         if (cause instanceof AppSettingsError) {
           throw cause;
         }
-        if (cause instanceof HttpResponseError) {
+        if (cause instanceof HttpJsonResponseError || cause instanceof HttpResponseError) {
           throw AppSettingsError.fromHttpResponse(cause.response, { cause });
         }
         throw new AppSettingsError('unknown', 'failed to load settings', { cause });

package/src/errors.ts

@@ -1,4 +1,4 @@
-type AppErrorType = 'not_found' | 'unauthorized' | 'unknown';
+type AppErrorType = 'not_found' | 'unauthorized' | 'unknown' | 'deleted';
 
 /**
  * Represents an error that occurs when loading an application manifest.
@@ -20,6 +20,8 @@ export class AppManifestError extends Error {
         );
       case 404:
         return new AppManifestError('not_found', 'application manifest not found', options);
+      case 410:
+        return new AppManifestError('deleted', 'application manifest deleted', options);
     }
     return new AppManifestError(
       'unknown',
@@ -63,6 +65,8 @@ export class AppConfigError extends Error {
         );
       case 404:
         return new AppConfigError('not_found', 'application config not found', options);
+      case 410:
+        return new AppConfigError('deleted', 'application config deleted', options);
     }
     return new AppConfigError(
       'unknown',
@@ -106,6 +110,8 @@ export class AppSettingsError extends Error {
         );
       case 404:
         return new AppSettingsError('not_found', 'application not found', options);
+      case 410:
+        return new AppSettingsError('deleted', 'application settings deleted', options);
     }
     return new AppSettingsError(
       'unknown',

package/src/types.ts

@@ -28,7 +28,13 @@ export interface AppSettings {
 }
 
 // TODO: remove `report` and `launcher` when legacy apps are removed
-export type AppType = 'standalone' | 'report' | 'launcher' | 'template';
+export type AppType =
+  | 'standalone'
+  | 'report'
+  | 'launcher'
+  | 'template'
+  | 'template-app'
+  | 'landing-page';
 
 export type CurrentApp<
   TModules extends Array<AnyModule> = [],

package/src/version.ts

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