@equinor/fusion-framework-app 10.0.0 → 10.1.0

package/dist/types/__tests__/AppConfigurator.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.0.0";
+export declare const version = "10.1.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-app",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "",
   "main": "dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -45,19 +45,21 @@
     "directory": "packages/app"
   },
   "dependencies": {
-    "@equinor/fusion-framework": "^7.3.19",
-    "@equinor/fusion-framework-module": "^5.0.1",
-    "@equinor/fusion-framework-module-app": "^7.0.0",
+    "rxjs": "^7.8.1",
+    "@equinor/fusion-framework": "^7.4.0",
+    "@equinor/fusion-framework-module-app": "^7.0.2",
+    "@equinor/fusion-framework-module": "^5.0.3",
+    "@equinor/fusion-framework-module-http": "^7.0.2",
+    "@equinor/fusion-framework-module-msal": "^5.0.1",
     "@equinor/fusion-framework-module-event": "^4.3.7",
-    "@equinor/fusion-framework-module-msal": "^5.0.0",
-    "@equinor/fusion-framework-module-http": "^7.0.0"
+    "@equinor/fusion-framework-module-telemetry": "^4.2.0"
   },
   "devDependencies": {
     "typescript": "^5.8.2",
-    "@equinor/fusion-framework-module-bookmark": "^3.0.0"
+    "@equinor/fusion-framework-module-bookmark": "^3.0.2"
   },
   "peerDependencies": {
-    "@equinor/fusion-framework-module-bookmark": "^3.0.0"
+    "@equinor/fusion-framework-module-bookmark": "^3.0.2"
   },
   "peerDependenciesMeta": {
     "@equinor/fusion-framework-module-bookmark": {

package/src/AppConfigurator.ts

@@ -3,7 +3,6 @@ import type { FusionModulesInstance } from '@equinor/fusion-framework';
 import {
   type AnyModule,
   type IModulesConfigurator,
-  ModuleConsoleLogger,
   ModulesConfigurator,
 } from '@equinor/fusion-framework-module';
 
@@ -76,7 +75,6 @@ export class AppConfigurator<
 {
   constructor(public readonly env: TEnv) {
     super([event, http, auth]);
-    this.logger = new ModuleConsoleLogger('AppConfigurator');
   }
 
   public configureHttp(...args: Parameters<typeof configureHttp>) {

package/src/__tests__/AppConfigurator.test.ts

@@ -0,0 +1,49 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { firstValueFrom, take } from 'rxjs';
+import { AppConfigurator } from '../AppConfigurator';
+import type { AnyModule } from '@equinor/fusion-framework-module';
+import { SemanticVersion } from '@equinor/fusion-framework-module';
+
+describe('AppConfigurator', () => {
+  let configurator: AppConfigurator;
+
+  // Create a mock module for testing
+  const createMockModule = (name: string, version = '1.0.0'): AnyModule => ({
+    name,
+    version: new SemanticVersion(version),
+    initialize: () => ({ mockInstance: true }),
+  });
+
+  // Mock environment object
+  const mockEnv = {
+    manifest: {
+      appKey: 'test-app',
+      displayName: 'Test App',
+      description: 'A test application',
+      type: 'standalone' as const,
+      build: {
+        version: '1.0.0',
+        entryPoint: 'index.js',
+      },
+    },
+  };
+
+  beforeEach(() => {
+    configurator = new AppConfigurator(mockEnv);
+  });
+
+  describe('Event Name Prefixing', () => {
+    it('should prefix event names with "AppConfigurator::"', async () => {
+      // Trigger event by adding a config
+      configurator.addConfig({
+        module: createMockModule('test', '1.0.0'),
+        configure: () => {},
+      });
+
+      // Wait for the first event to be emitted
+      const event = await firstValueFrom(configurator.event$.pipe(take(1)));
+
+      expect(event.name).toMatch(/^AppConfigurator::/);
+    });
+  });
+});

package/src/configure-modules.ts

@@ -1,5 +1,9 @@
 import type { Fusion } from '@equinor/fusion-framework';
 import type { AnyModule } from '@equinor/fusion-framework-module';
+import {
+  enableTelemetry,
+  type MetadataExtractor,
+} from '@equinor/fusion-framework-module-telemetry';
 
 import { AppConfigurator } from './AppConfigurator';
 import type { AppModulesInstance, AppModuleInitiator, AppEnv } from './types';
@@ -39,16 +43,46 @@ export const configureModules =
    * @returns initialized app modules
    */
   async (args: { fusion: TRef; env: TEnv }): Promise<AppModulesInstance<TModules>> => {
+    const { fusion } = args;
+
+    // Create app configurator
     const configurator = new AppConfigurator<TModules, TRef['modules'], TEnv>(args.env);
+
+    // Extract telemetry metadata from app manifest for tracking and debugging
+    const metadataExtractor: MetadataExtractor = () => {
+      return {
+        fusion: {
+          type: 'app-telemetry',
+          app: {
+            key: args.env.manifest?.appKey || 'unknown-app',
+            version: args.env.manifest?.build?.version || 'unknown-version',
+          },
+        },
+      };
+    };
+
+    // Enable telemetry collection for module configuration events
+    // attachConfiguratorEvents automatically prefixes events with configurator class name
+    enableTelemetry(configurator, {
+      attachConfiguratorEvents: true,
+      configure: (builder) => {
+        builder.setMetadata(metadataExtractor);
+        builder.setParent(fusion.modules.telemetry);
+        // Scope telemetry to 'app' level for app-specific event filtering
+        builder.setDefaultScope(['app']);
+      },
+    });
+
+    // Allow user configuration callback to run before module initialization
     if (cb) {
       await Promise.resolve(cb(configurator, args));
     }
-    const modules = (await configurator.initialize(
+    const modules: AppModulesInstance<TModules> = (await configurator.initialize(
       args.fusion.modules,
-      // TODO
+      // TODO: type cast to unknown should not be needed in future
     )) as unknown as AppModulesInstance<TModules>;
 
-    // @eikeland
+    // Dispatch app modules loaded event for app lifecycle tracking
     // TODO - remove check after fusion-cli is updated (app module is not enabled in fusion-cli)
     if (args.env.manifest?.appKey) {
       modules.event.dispatchEvent('onAppModulesLoaded', {

package/src/version.ts

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

package/tsconfig.json

@@ -18,6 +18,9 @@
     {
       "path": "../modules/event"
     },
+    {
+      "path": "../modules/telemetry"
+    },
     {
       "path": "../modules/bookmark"
     },

package/vitest.config.ts

@@ -0,0 +1,10 @@
+import { defineProject } from 'vitest/config';
+
+import { name, version } from './package.json';
+
+export default defineProject({
+  test: {
+    include: ['src/__tests__/**'],
+    name: `${name}@${version}`,
+  },
+});