@equinor/fusion-framework-module-app 6.1.17-next.0 → 6.1.18

package/dist/types/AppConfig.d.ts

@@ -22,16 +22,6 @@ export type ConfigEndPoint = {
  *
  * console.log(config.getEndpoint('api')); // { url: 'https://api.example.com' }
  * ```
- *
- * @param {Object} config - The configuration object.
- * @param {TEnvironment} [config.environment] - The environment configuration.
- * @param {Record<string, ConfigEndPoint>} [config.endpoints] - The endpoints configuration.
- *
- * @property {TEnvironment} [environment] - The environment configuration.
- * @property {Record<string, string | undefined>} endpoints - The endpoints configuration (deprecated).
- *
- * @method getEndpoint
- * @param {string} key - The key of the endpoint to retrieve.
  */
 export declare class AppConfig<TEnvironment extends ConfigEnvironment = ConfigEnvironment> {
     #private;

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

@@ -181,6 +181,11 @@ export interface IApp<TEnv extends ConfigEnvironment = ConfigEnvironment, TModul
      */
     getAppModuleAsync(allow_cache?: boolean): Promise<AppScriptModule>;
 }
+export type AppInitializeResult = {
+    manifest: AppManifest;
+    script: AppScriptModule;
+    config: AppConfig;
+};
 export declare class App<TEnv extends ConfigEnvironment = ConfigEnvironment, TModules extends Array<AnyModule> | unknown = unknown> implements IApp<TEnv, TModules> {
     #private;
     get manifest$(): Observable<AppManifest>;
@@ -200,11 +205,7 @@ export declare class App<TEnv extends ConfigEnvironment = ConfigEnvironment, TMo
         provider: AppModuleProvider;
         event?: ModuleType<EventModule>;
     });
-    initialize(): Observable<{
-        manifest: AppManifest;
-        script: AppScriptModule;
-        config: AppConfig;
-    }>;
+    initialize(): Observable<AppInitializeResult>;
     loadConfig(): void;
     loadManifest(update?: boolean): void;
     updateManifest(manifest: AppManifest, replace?: false): void;

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

@@ -1,5 +1,5 @@
 import { type ActionInstanceMap, type ActionTypes } from '@equinor/fusion-observable';
-import type { AppConfig, AppManifest, AppModulesInstance, AppScriptModule, AppSettings } from '../types';
+import type { AppConfig, AppManifest, 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: AppModulesInstance], AppModulesInstance, "set_instance", never, never>;
+    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: any], any, "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: AppModulesInstance], AppModulesInstance, "set_instance", never, never>;
+    setInstance: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[instance: any], any, "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: import("..").AppModulesInstance;
+    payload: any;
     type: "set_instance";
 } | {
     payload: null;

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

@@ -1,2 +1,2 @@
-export { App, IApp } from './App';
+export { App, IApp, type AppInitializeResult } from './App';
 export { default } from './App';

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/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.1.17-next.0";
+export declare const version = "6.1.18";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-app",
-  "version": "6.1.17-next.0",
+  "version": "6.1.18",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -60,17 +60,17 @@
     "immer": "^9.0.16",
     "rxjs": "^7.8.1",
     "uuid": "^11.0.3",
-    "zod": "^3.23.8",
-    "@equinor/fusion-query": "^5.2.12-next.0",
-    "@equinor/fusion-observable": "^8.5.2-next.0"
+    "zod": "^3.25.76",
+    "@equinor/fusion-observable": "^8.5.1",
+    "@equinor/fusion-query": "^5.2.11"
   },
   "devDependencies": {
     "typescript": "^5.8.2",
-    "@equinor/fusion-framework-module": "^4.4.3-next.2",
-    "@equinor/fusion-framework-module-event": "^4.3.7-next.2",
-    "@equinor/fusion-framework-module-http": "^6.3.4-next.0",
-    "@equinor/fusion-framework-module-service-discovery": "^8.0.18-next.0",
-    "@equinor/fusion-framework-module-msal": "^4.0.8-next.0"
+    "@equinor/fusion-framework-module": "^5.0.0",
+    "@equinor/fusion-framework-module-http": "^6.3.4",
+    "@equinor/fusion-framework-module-msal": "^4.0.9",
+    "@equinor/fusion-framework-module-service-discovery": "^8.0.18",
+    "@equinor/fusion-framework-module-event": "^4.3.7"
   },
   "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/AppConfig.ts

@@ -38,16 +38,6 @@ export type ConfigEndPoint = {
  *
  * console.log(config.getEndpoint('api')); // { url: 'https://api.example.com' }
  * ```
- *
- * @param {Object} config - The configuration object.
- * @param {TEnvironment} [config.environment] - The environment configuration.
- * @param {Record<string, ConfigEndPoint>} [config.endpoints] - The endpoints configuration.
- *
- * @property {TEnvironment} [environment] - The environment configuration.
- * @property {Record<string, string | undefined>} endpoints - The endpoints configuration (deprecated).
- *
- * @method getEndpoint
- * @param {string} key - The key of the endpoint to retrieve.
  */
 export class AppConfig<TEnvironment extends ConfigEnvironment = ConfigEnvironment> {
   #endpoints: Record<string, ConfigEndPoint>;

package/src/AppConfigurator.ts

@@ -38,17 +38,18 @@ export class AppConfigurator
     init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>,
   ): Promise<IHttpClient> {
     const http = await init.requireInstance('http');
+    const serviceName = 'apps';
     /** check if the http provider has configure a client */
-    if (http.hasClient(moduleKey)) {
-      return http.createClient(moduleKey);
-    } else {
-      /** load service discovery module */
-      const serviceDiscovery = await init.requireInstance('serviceDiscovery');
-
-      // TODO - remove when refactor portal service!
-      /** resolve and create a client from discovery */
-      return await serviceDiscovery.createClient('apps');
+    if (http.hasClient(serviceName)) {
+      return http.createClient(serviceName);
     }
+
+    /** load service discovery module */
+    const serviceDiscovery = await init.requireInstance('serviceDiscovery');
+
+    // TODO - remove when refactor portal service!
+    /** resolve and create a client from discovery */
+    return await serviceDiscovery.createClient(serviceName);
   }
 
   public setClient(

package/src/app/App.ts

@@ -248,6 +248,12 @@ export interface IApp<
 
 const fallbackSettings: AppSettings = {};
 
+export type AppInitializeResult = {
+  manifest: AppManifest;
+  script: AppScriptModule;
+  config: AppConfig;
+};
+
 // TODO make streams distinct until changed from state
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export class App<
@@ -542,11 +548,7 @@ export class App<
     });
   }
 
-  public initialize(): Observable<{
-    manifest: AppManifest;
-    script: AppScriptModule;
-    config: AppConfig;
-  }> {
+  public initialize(): Observable<AppInitializeResult> {
     return new Observable((subscriber) => {
       // dispatch initialize action to indicate that the application is initializing
       this.#state.next(actions.initialize());

package/src/app/index.ts

@@ -1,3 +1,3 @@
-export { App, IApp } from './App';
+export { App, IApp, type AppInitializeResult } from './App';
 
 export { default } from './App';

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/version.ts

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