@equinor/fusion-framework-module-app 2.2.0 → 2.4.0

package/dist/types/AppConfigBuilder.d.ts

@@ -0,0 +1,26 @@
+import { ModuleInitializerArgs, Modules, ModuleType } from '@equinor/fusion-framework-module';
+import { QueryFn, QueryCtorOptions } from '@equinor/fusion-query';
+import { AppModuleConfig, IAppConfigurator } from './AppConfigurator';
+import type { AppConfig, AppManifest, ModuleDeps } from './types';
+export type AppConfigBuilderCallback = (builder: AppConfigBuilder<ModuleInitializerArgs<IAppConfigurator, any>>) => void | Promise<void>;
+export declare class AppConfigBuilder<TInit extends ModuleInitializerArgs<IAppConfigurator, any> = ModuleInitializerArgs<IAppConfigurator, ModuleDeps>> {
+    #private;
+    config: Partial<AppModuleConfig>;
+    constructor(init: TInit, config?: Partial<AppModuleConfig>);
+    requireInstance<TKey extends string = Extract<keyof Modules, string>>(module: TKey): Promise<ModuleType<Modules[TKey]>>;
+    requireInstance<T>(module: string): Promise<T>;
+    setAppClient(client: {
+        getAppManifest: QueryFn<AppManifest, {
+            appKey: string;
+        }> | QueryCtorOptions<AppManifest, {
+            appKey: string;
+        }>;
+        getAppManifests: QueryFn<AppManifest[], void> | QueryCtorOptions<AppManifest[], void>;
+        getAppConfig: QueryFn<AppConfig, {
+            appKey: string;
+        }> | QueryCtorOptions<AppConfig, {
+            appKey: string;
+            tag?: string;
+        }>;
+    }, expire?: number): void;
+}

package/dist/types/AppConfigurator.d.ts

@@ -0,0 +1,28 @@
+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 { AppConfigBuilderCallback } from './AppConfigBuilder';
+import type { AppConfig, AppManifest } from './types';
+export interface AppModuleConfig {
+    client: {
+        getAppManifest: QueryCtorOptions<AppManifest, {
+            appKey: string;
+        }>;
+        getAppManifests: QueryCtorOptions<AppManifest[], void>;
+        getAppConfig: QueryCtorOptions<AppConfig, {
+            appKey: string;
+            tag?: string;
+        }>;
+    };
+}
+export interface IAppConfigurator {
+    addConfigBuilder: (init: AppConfigBuilderCallback) => void;
+}
+export declare class AppConfigurator implements IAppConfigurator {
+    #private;
+    defaultExpireTime: number;
+    addConfigBuilder(init: AppConfigBuilderCallback): void;
+    protected _createHttpClient(init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>): Promise<IHttpClient>;
+    createConfig(init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>): Promise<AppModuleConfig>;
+}

package/dist/types/AppModuleProvider.d.ts

@@ -4,7 +4,8 @@ import { Query } from '@equinor/fusion-query';
 import { EventModule } from '@equinor/fusion-framework-module-event';
 import type { AppConfig, AppManifest } from './types';
 import { App } from './app/App';
-import { AppModuleConfig } from './configurator';
+import { AppModuleConfig } from './AppConfigurator';
+import { AppBundleStateInitial } from 'app/types';
 export declare class AppModuleProvider {
     #private;
     static compareAppManifest<T extends AppManifest>(a?: T, b?: T): boolean;
@@ -20,7 +21,8 @@ export declare class AppModuleProvider {
     getAppManifest(appKey: string): Observable<AppManifest>;
     getAllAppManifests(): Observable<AppManifest[]>;
     getAppConfig<TType = unknown>(appKey: string, tag?: string): Observable<AppConfig<TType>>;
-    setCurrentApp(appKey: string): void;
+    setCurrentApp(appKeyOrApp: string | App): void;
+    createApp(value: AppBundleStateInitial): App;
     dispose(): void;
 }
 export default AppModuleProvider;

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

@@ -4,6 +4,7 @@ import type { AppModuleProvider } from '../AppModuleProvider';
 import { OperatorFunction } from 'rxjs';
 import { EventModule } from '@equinor/fusion-framework-module-event';
 import { AnyModule, ModuleType } from '@equinor/fusion-framework-module';
+import { AppBundleStateInitial } from './types';
 import '../events';
 export declare function filterEmpty<T>(): OperatorFunction<T | null | undefined, T>;
 export declare class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unknown> {
@@ -16,7 +17,7 @@ export declare class App<TEnv = any, TModules extends Array<AnyModule> | unknown
     get manifest(): Promise<AppManifest>;
     get config(): Promise<AppConfig<TEnv>>;
     get instance(): AppModulesInstance<TModules> | undefined;
-    constructor(appKey: string, args: {
+    constructor(value: AppBundleStateInitial, args: {
         provider: AppModuleProvider;
         event?: ModuleType<EventModule>;
     });

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

@@ -1,3 +1,3 @@
-import { AppBundleState } from './types';
-export declare const createReducer: (appKey: string) => import("@equinor/fusion-observable").ReducerWithInitialState<AppBundleState<any, any>, import("@equinor/fusion-observable").AnyAction>;
+import { AppBundleState, AppBundleStateInitial } from './types';
+export declare const createReducer: (value: AppBundleStateInitial) => import("@equinor/fusion-observable").ReducerWithInitialState<AppBundleState<any, any>, import("@equinor/fusion-observable").AnyAction>;
 export default createReducer;

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

@@ -1,5 +1,5 @@
 import { FlowSubject } from '@equinor/fusion-observable';
 import type { Actions } from './actions';
-import type { AppBundleState } from './types';
+import type { AppBundleState, AppBundleStateInitial } from './types';
 import type { AppModuleProvider } from '../AppModuleProvider';
-export declare const createState: (appKey: string, provider: AppModuleProvider) => FlowSubject<AppBundleState, Actions>;
+export declare const createState: (value: AppBundleStateInitial, provider: AppModuleProvider) => FlowSubject<AppBundleState, Actions>;

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

@@ -7,3 +7,4 @@ export type AppBundleState<TConfig = any, TModules = any> = {
     modules?: AppScriptModule;
     instance?: AppModulesInstance<TModules>;
 };
+export type AppBundleStateInitial<TConfig = any, TModules = any> = Omit<AppBundleState<TConfig, TModules>, 'status'>;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { AppConfigurator, IAppConfigurator, AppModuleConfig as IAppModuleConfig, } from './configurator';
+export { AppModuleConfig, AppConfigurator, IAppConfigurator, AppModuleConfig as IAppModuleConfig, } from './AppConfigurator';
 export { AppModuleProvider } from './AppModuleProvider';
 export { App } from './app/App';
 export * from './events';

package/dist/types/module.d.ts

@@ -1,9 +1,9 @@
 import { IModulesConfigurator, Module } from '@equinor/fusion-framework-module';
 import { ModuleDeps } from './types';
-import { IAppConfigurator } from './configurator';
+import { IAppConfigurator } from './AppConfigurator';
 import { AppModuleProvider } from './AppModuleProvider';
 export declare const moduleKey = "app";
-export type AppModule = Module<typeof moduleKey, AppModuleProvider, IAppConfigurator<ModuleDeps>, ModuleDeps>;
+export type AppModule = Module<typeof moduleKey, AppModuleProvider, IAppConfigurator, ModuleDeps>;
 export declare const module: AppModule;
 export declare const enableAppModule: (configurator: IModulesConfigurator) => void;
 export default module;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/fusion-framework-module-app",
-    "version": "2.2.0",
+    "version": "2.4.0",
     "description": "",
     "main": "dist/esm/index.js",
     "exports": {
@@ -41,5 +41,5 @@
         "@equinor/fusion-framework-module-service-discovery": "^4.0.7",
         "typescript": "^4.9.3"
     },
-    "gitHead": "acfc1533fae1e5a95f8463cc2d6e3a2ad94c252e"
+    "gitHead": "a37a5380c885ba37e6462429f4ebc501aee64bb9"
 }

package/src/AppConfigBuilder.ts

@@ -0,0 +1,86 @@
+import { ModuleInitializerArgs, Modules, ModuleType } from '@equinor/fusion-framework-module';
+import { QueryFn, QueryCtorOptions } from '@equinor/fusion-query';
+
+import { AppModuleConfig, IAppConfigurator } from './AppConfigurator';
+
+import type { AppConfig, AppManifest, ModuleDeps } from './types';
+
+export type AppConfigBuilderCallback = (
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    builder: AppConfigBuilder<ModuleInitializerArgs<IAppConfigurator, any>>
+) => void | Promise<void>;
+
+export class AppConfigBuilder<
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    TInit extends ModuleInitializerArgs<IAppConfigurator, any> = ModuleInitializerArgs<
+        IAppConfigurator,
+        ModuleDeps
+    >
+> {
+    #init: TInit;
+    constructor(init: TInit, public config: Partial<AppModuleConfig> = {}) {
+        this.#init = init;
+    }
+
+    requireInstance<TKey extends string = Extract<keyof Modules, string>>(
+        module: TKey
+    ): Promise<ModuleType<Modules[TKey]>>;
+
+    requireInstance<T>(module: string): Promise<T>;
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    requireInstance(module: string): Promise<any> {
+        return this.#init.requireInstance(module);
+    }
+
+    setAppClient(
+        client: {
+            getAppManifest:
+                | QueryFn<AppManifest, { appKey: string }>
+                | QueryCtorOptions<AppManifest, { appKey: string }>;
+            getAppManifests: QueryFn<AppManifest[], void> | QueryCtorOptions<AppManifest[], void>;
+            getAppConfig:
+                | QueryFn<AppConfig, { appKey: string }>
+                | QueryCtorOptions<AppConfig, { appKey: string; tag?: string }>;
+        },
+        expire = 1 * 60 * 1000
+    ) {
+        client;
+        expire;
+
+        this.config.client = {
+            getAppManifest:
+                typeof client.getAppManifest === 'function'
+                    ? {
+                          key: ({ appKey }) => appKey,
+                          client: {
+                              fn: client.getAppManifest,
+                          },
+                          expire,
+                      }
+                    : client.getAppManifest,
+            getAppManifests:
+                typeof client.getAppManifests === 'function'
+                    ? {
+                          // TODO - might cast to checksum
+                          key: () => 'app_manifests',
+                          client: {
+                              fn: client.getAppManifests,
+                          },
+                          expire,
+                      }
+                    : client.getAppManifests,
+            getAppConfig:
+                typeof client.getAppConfig === 'function'
+                    ? {
+                          // TODO - might cast to checksum
+                          key: (args) => JSON.stringify(args),
+                          client: {
+                              fn: client.getAppConfig,
+                          },
+                          expire,
+                      }
+                    : client.getAppConfig,
+        };
+    }
+}

package/src/AppConfigurator.ts

@@ -0,0 +1,101 @@
+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 { AppConfigBuilder, AppConfigBuilderCallback } from './AppConfigBuilder';
+
+import { moduleKey } from './module';
+
+import type { AppConfig, AppManifest } from './types';
+
+export interface AppModuleConfig {
+    client: {
+        getAppManifest: QueryCtorOptions<AppManifest, { appKey: string }>;
+        getAppManifests: QueryCtorOptions<AppManifest[], void>;
+        getAppConfig: QueryCtorOptions<AppConfig, { appKey: string; tag?: string }>;
+    };
+}
+
+export interface IAppConfigurator {
+    addConfigBuilder: (init: AppConfigBuilderCallback) => void;
+}
+
+export class AppConfigurator implements IAppConfigurator {
+    defaultExpireTime = 1 * 60 * 1000;
+
+    #configBuilders: Array<AppConfigBuilderCallback> = [];
+
+    addConfigBuilder(init: AppConfigBuilderCallback): void {
+        this.#configBuilders.push(init);
+    }
+
+    /**
+     * WARNING: this function will be remove in future
+     */
+    protected async _createHttpClient(
+        init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>
+    ): Promise<IHttpClient> {
+        const http = await init.requireInstance('http');
+        /** 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 */
+            try {
+                return await serviceDiscovery.createClient('app');
+            } catch {
+                return await serviceDiscovery.createClient('portal');
+            }
+        }
+    }
+
+    public async createConfig(
+        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>));
+
+        // TODO - make less lazy
+        config.client ??= await (async (): Promise<AppModuleConfig['client']> => {
+            const httpClient = await this._createHttpClient(init);
+            return {
+                getAppManifest: {
+                    client: {
+                        fn: ({ appKey }) => httpClient.json$<AppManifest>(`/api/apps/${appKey}`),
+                    },
+                    key: ({ appKey }) => appKey,
+                    expire: this.defaultExpireTime,
+                },
+                getAppManifests: {
+                    client: {
+                        fn: () => httpClient.json$(`/api/apps`),
+                    },
+                    // TODO - might cast to checksum
+                    key: (args) => JSON.stringify(args),
+                    expire: this.defaultExpireTime,
+                },
+                getAppConfig: {
+                    client: {
+                        fn: ({ appKey, tag }) =>
+                            httpClient.json$(
+                                `/api/apps/${appKey}/config${tag ? `?tag=${tag}` : ''}`
+                            ),
+                    },
+                    key: (args) => JSON.stringify(args),
+                    expire: this.defaultExpireTime,
+                },
+            };
+        })();
+
+        return config as AppModuleConfig;
+    }
+}

package/src/AppModuleProvider.ts

@@ -18,9 +18,10 @@ import { EventModule } from '@equinor/fusion-framework-module-event';
 import type { AppConfig, AppManifest } from './types';
 
 import { App, filterEmpty } from './app/App';
-import { AppModuleConfig } from './configurator';
+import { AppModuleConfig } from './AppConfigurator';
 import { HttpResponseError } from '@equinor/fusion-framework-module-http';
 import { AppConfigError, AppManifestError } from './errors';
+import { AppBundleStateInitial } from 'app/types';
 
 export class AppModuleProvider {
     static compareAppManifest<T extends AppManifest>(a?: T, b?: T): boolean {
@@ -57,9 +58,9 @@ export class AppModuleProvider {
 
         this.#current$ = new BehaviorSubject<App | undefined>(undefined);
 
-        this.appClient = new Query(config.getAppManifest);
-        this.#appsClient = new Query(config.getAppManifests);
-        this.#configClient = new Query(config.getAppConfig);
+        this.appClient = new Query(config.client.getAppManifest);
+        this.#appsClient = new Query(config.client.getAppManifests);
+        this.#configClient = new Query(config.client.getAppConfig);
 
         this.#subscription.add(() => this.appClient.complete());
         this.#subscription.add(() => this.#appsClient.complete());
@@ -147,8 +148,16 @@ export class AppModuleProvider {
      * set the current application, will internally resolve manifest
      * @param appKey - application key
      */
-    public setCurrentApp(appKey: string): void {
-        this.#current$.next(new App(appKey, { provider: this, event: this.#event }));
+    public setCurrentApp(appKeyOrApp: string | App): void {
+        const app = typeof appKeyOrApp === 'string' ? this.createApp({ appKey: appKeyOrApp }) : App;
+        this.#current$.next(app as App);
+    }
+
+    /**
+     * This should not be used, only for legacy creation backdoor
+     */
+    public createApp(value: AppBundleStateInitial): App {
+        return new App(value, { provider: this, event: this.#event });
     }
 
     public dispose() {

package/src/app/App.ts

@@ -16,7 +16,7 @@ import { EventModule } from '@equinor/fusion-framework-module-event';
 import { AnyModule, ModuleType } from '@equinor/fusion-framework-module';
 import { createState } from './create-state';
 import { actions, Actions } from './actions';
-import { AppBundleState } from './types';
+import { AppBundleState, AppBundleStateInitial } from './types';
 
 import '../events';
 
@@ -78,10 +78,15 @@ export class App<TEnv = any, TModules extends Array<AnyModule> | unknown = unkno
     }
 
     constructor(
-        appKey: string,
-        args: { provider: AppModuleProvider; event?: ModuleType<EventModule> }
+        value: AppBundleStateInitial,
+        args: {
+            provider: AppModuleProvider;
+            event?: ModuleType<EventModule>;
+        }
     ) {
-        this.#state = createState(appKey, args.provider);
+        this.#state = createState(value, args.provider);
+
+        const { appKey } = value;
 
         const subscriptions = new Subscription();
 

package/src/app/create-reducer.ts

@@ -11,10 +11,10 @@ enableMapSet();
 
 import { actions } from './actions';
 
-import { AppBundleState } from './types';
+import { AppBundleState, AppBundleStateInitial } from './types';
 
-export const createReducer = (appKey: string) =>
-    makeReducer({ appKey, status: new Set() } as AppBundleState, (builder) =>
+export const createReducer = (value: AppBundleStateInitial) =>
+    makeReducer({ ...value, status: new Set() } as AppBundleState, (builder) =>
         builder
             .addCase(actions.setManifest, (state, action) => {
                 state.manifest = action.payload;

package/src/app/create-state.ts

@@ -5,14 +5,14 @@ import { createReducer } from './create-reducer';
 import { handleFetchManifest, handleFetchConfig, handleImportApplication } from './flows';
 
 import type { Actions } from './actions';
-import type { AppBundleState } from './types';
+import type { AppBundleState, AppBundleStateInitial } from './types';
 import type { AppModuleProvider } from '../AppModuleProvider';
 
 export const createState = (
-    appKey: string,
-    provider: AppModuleProvider
+    value: AppBundleStateInitial,
+    provider: AppModuleProvider,
 ): FlowSubject<AppBundleState, Actions> => {
-    const reducer = createReducer(appKey);
+    const reducer = createReducer(value);
     const state = new FlowSubject<AppBundleState, Actions>(reducer);
     state.addFlow(handleFetchManifest(provider));
     state.addFlow(handleFetchConfig(provider));

package/src/app/types.ts

@@ -9,3 +9,8 @@ export type AppBundleState<TConfig = any, TModules = any> = {
     modules?: AppScriptModule;
     instance?: AppModulesInstance<TModules>;
 };
+
+export type AppBundleStateInitial<TConfig = any, TModules = any> = Omit<
+    AppBundleState<TConfig, TModules>,
+    'status'
+>;

package/src/index.ts

@@ -1,8 +1,9 @@
 export {
+    AppModuleConfig,
     AppConfigurator,
     IAppConfigurator,
     AppModuleConfig as IAppModuleConfig,
-} from './configurator';
+} from './AppConfigurator';
 export { AppModuleProvider } from './AppModuleProvider';
 
 export { App } from './app/App';

package/src/module.ts

@@ -1,23 +1,18 @@
 import { IModulesConfigurator, Module } from '@equinor/fusion-framework-module';
 import { ModuleDeps } from './types';
 
-import { IAppConfigurator, AppConfigurator } from './configurator';
+import { IAppConfigurator, AppConfigurator } from './AppConfigurator';
 import { AppModuleProvider } from './AppModuleProvider';
 
 export const moduleKey = 'app';
 
-export type AppModule = Module<
-    typeof moduleKey,
-    AppModuleProvider,
-    IAppConfigurator<ModuleDeps>,
-    ModuleDeps
->;
+export type AppModule = Module<typeof moduleKey, AppModuleProvider, IAppConfigurator, ModuleDeps>;
 
 export const module: AppModule = {
     name: moduleKey,
     configure: () => new AppConfigurator(),
     initialize: async (args) => {
-        const config = await args.config.createConfig(args);
+        const config = await (args.config as AppConfigurator).createConfig(args);
         const event = await args.requireInstance('event').catch(() => undefined);
         return new AppModuleProvider({ config, event });
     },

package/dist/esm/configurator.js

@@ -1,62 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { moduleKey } from './module';
-export class AppConfigurator {
-    constructor() {
-        this.defaultExpireTime = 1 * 60 * 1000;
-    }
-    _createHttpClient(init) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const http = yield init.requireInstance('http');
-            if (http.hasClient(moduleKey)) {
-                return http.createClient(moduleKey);
-            }
-            else {
-                const serviceDiscovery = yield init.requireInstance('serviceDiscovery');
-                try {
-                    return yield serviceDiscovery.createClient('app');
-                }
-                catch (_a) {
-                    return yield serviceDiscovery.createClient('portal');
-                }
-            }
-        });
-    }
-    createConfig(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const httpClient = yield this._createHttpClient(args);
-            const config = {
-                getAppManifest: {
-                    client: {
-                        fn: ({ appKey }) => httpClient.json$(`/api/apps/${appKey}`),
-                    },
-                    key: ({ appKey }) => appKey,
-                },
-                getAppManifests: {
-                    client: {
-                        fn: () => httpClient.json$(`/api/apps`),
-                    },
-                    key: () => 'apps',
-                },
-                getAppConfig: {
-                    client: {
-                        fn: ({ appKey, tag }) => httpClient.json$(`/api/apps/${appKey}/config${tag ? `?tag=${tag}` : ''}`),
-                    },
-                    key: (args) => JSON.stringify(args),
-                },
-            };
-            return this.processConfig(config);
-        });
-    }
-    processConfig(config) {
-        return config;
-    }
-}
-//# sourceMappingURL=configurator.js.map

package/dist/esm/configurator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"configurator.js","sourceRoot":"","sources":["../../src/configurator.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAiBrC,MAAM,OAAO,eAAe;IAA5B;QAGI,sBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IAyDtC,CAAC;IApDmB,iBAAiB,CAC7B,IAA2D;;YAE3D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAEhD,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;gBAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;aACvC;iBAAM;gBAEH,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;gBAIxE,IAAI;oBACA,OAAO,MAAM,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBACrD;gBAAC,WAAM;oBACJ,OAAO,MAAM,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBACxD;aACJ;QACL,CAAC;KAAA;IAEY,YAAY,CACrB,IAA2D;;YAE3D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,MAAM,GAAoB;gBAC5B,cAAc,EAAE;oBACZ,MAAM,EAAE;wBACJ,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAc,aAAa,MAAM,EAAE,CAAC;qBAC3E;oBACD,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM;iBAC9B;gBACD,eAAe,EAAE;oBACb,MAAM,EAAE;wBACJ,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;qBAC1C;oBACD,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM;iBACpB;gBACD,YAAY,EAAE;oBACV,MAAM,EAAE;wBACJ,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,CACpB,UAAU,CAAC,KAAK,CAAC,aAAa,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;qBAChF;oBACD,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;iBACtC;aACJ,CAAC;YACF,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;KAAA;IAEM,aAAa,CAAC,MAAuB;QACxC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}

package/dist/types/configurator.d.ts

@@ -1,24 +0,0 @@
-import { AnyModule, ModuleInitializerArgs } from '@equinor/fusion-framework-module';
-import { IHttpClient } from '@equinor/fusion-framework-module-http';
-import { QueryCtorOptions } from '@equinor/fusion-query';
-import type { AppConfig, AppManifest, ModuleDeps } from './types';
-export interface AppModuleConfig {
-    getAppManifest: QueryCtorOptions<AppManifest, {
-        appKey: string;
-    }>;
-    getAppManifests: QueryCtorOptions<AppManifest[], void>;
-    getAppConfig: QueryCtorOptions<AppConfig, {
-        appKey: string;
-        tag?: string;
-    }>;
-}
-export interface IAppConfigurator<TDeps extends Array<AnyModule>> {
-    createConfig: (args: ModuleInitializerArgs<IAppConfigurator<TDeps>, TDeps>) => Promise<AppModuleConfig>;
-    processConfig: (config: AppModuleConfig) => AppModuleConfig;
-}
-export declare class AppConfigurator<TDeps extends ModuleDeps = ModuleDeps> implements IAppConfigurator<TDeps> {
-    defaultExpireTime: number;
-    protected _createHttpClient(init: ModuleInitializerArgs<IAppConfigurator<TDeps>, TDeps>): Promise<IHttpClient>;
-    createConfig(args: ModuleInitializerArgs<IAppConfigurator<TDeps>, TDeps>): Promise<AppModuleConfig>;
-    processConfig(config: AppModuleConfig): AppModuleConfig;
-}