@equinor/fusion-framework-module-context 8.0.2 → 8.0.3

package/dist/types/utils/resolve-initial-context.d.ts

@@ -1,4 +1,5 @@
 import type { ContextModuleConfig } from '../configurator';
+import { type ContextPathResolveArgs } from './resolve-context-from-path';
 /**
  * Resolves the initial context from the parent module.
  *
@@ -9,10 +10,12 @@ export declare const resolveContextFromParent: ContextModuleConfig['resolveIniti
 /**
  * Resolves the initial context for a Fusion Framework context module.
  *
- * Attempts to resolve the initial context from the parent context provider.
- * URL-based resolution is handled by the context-navigation plugin.
+ * will try to resolve the initial context from the path, and if that fails, it will try to resolve the context from the parent.
  *
+ * @param options - Optional configuration for resolving the context path.
  * @returns A function that accepts the module's reference and modules, and returns an Observable of the resolved initial context.
  */
-export declare const resolveInitialContext: () => Required<ContextModuleConfig>['resolveInitialContext'];
+export declare const resolveInitialContext: (options?: {
+    path?: ContextPathResolveArgs;
+}) => Required<ContextModuleConfig>['resolveInitialContext'];
 export default resolveInitialContext;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.0.2";
+export declare const version = "8.0.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-context",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "",
   "main": "./dist/esm/index.js",
   "exports": {
@@ -55,7 +55,7 @@
     "@equinor/fusion-framework-module-event": "^6.0.1",
     "@equinor/fusion-framework-module-navigation": "^7.0.7",
     "@equinor/fusion-framework-module": "^6.1.2",
-    "@equinor/fusion-framework-module-services": "^8.0.3"
+    "@equinor/fusion-framework-module-services": "^8.1.0"
   },
   "peerDependencies": {
     "@types/semver": "^7.0.0",

package/src/configurator.ts

@@ -249,7 +249,12 @@ export class ContextModuleConfigurator implements IContextModuleConfigurator {
       Promise.resolve({} as Partial<ContextModuleConfig>),
     );
 
-    config.resolveInitialContext ??= resolveInitialContext();
+    config.resolveInitialContext ??= resolveInitialContext({
+      path: {
+        extract: config.extractContextIdFromPath,
+        validate: config.extractContextIdFromPath ? () => true : undefined,
+      },
+    });
 
     // TODO(#5119) - make less lazy
     config.client ??= await (async (): Promise<ContextModuleConfig['client']> => {

package/src/utils/resolve-initial-context.ts

@@ -1,7 +1,9 @@
 import type { ModulesInstance } from '@equinor/fusion-framework-module';
 import type { ContextModule } from '../module';
 import type { ContextModuleConfig } from '../configurator';
-import { concat, EMPTY, of, take } from 'rxjs';
+import { concat, EMPTY, first, of } from 'rxjs';
+import resolveContextFromPath, { type ContextPathResolveArgs } from './resolve-context-from-path';
+import type { NavigationModule } from '@equinor/fusion-framework-module-navigation';
 
 /**
  * Resolves the initial context from the parent module.
@@ -11,6 +13,7 @@ import { concat, EMPTY, of, take } from 'rxjs';
  */
 export const resolveContextFromParent: ContextModuleConfig['resolveInitialContext'] = ({ ref }) => {
   const parentContext = (ref as ModulesInstance<[ContextModule]>)?.context;
+  // check if the parent has context module
   if (!parentContext) {
     // No parent context available — either portal level or parent lacks context module.
     return EMPTY;
@@ -22,19 +25,31 @@ export const resolveContextFromParent: ContextModuleConfig['resolveInitialContex
 /**
  * Resolves the initial context for a Fusion Framework context module.
  *
- * Attempts to resolve the initial context from the parent context provider.
- * URL-based resolution is handled by the context-navigation plugin.
+ * will try to resolve the initial context from the path, and if that fails, it will try to resolve the context from the parent.
  *
+ * @param options - Optional configuration for resolving the context path.
  * @returns A function that accepts the module's reference and modules, and returns an Observable of the resolved initial context.
  */
+
 // Deliberately co-located with resolveContextFromParent, which it composes with
 // fusion-lint-disable-next-line single-export-per-file
 export const resolveInitialContext =
-  (): Required<ContextModuleConfig>['resolveInitialContext'] =>
+  (options?: {
+    path?: ContextPathResolveArgs;
+  }): Required<ContextModuleConfig>['resolveInitialContext'] =>
   ({ ref, modules }) => {
-    // Resolve from parent context if available.
-    // URL-based resolution is handled by the context-navigation plugin.
-    return concat(resolveContextFromParent({ ref, modules })).pipe(take(1));
+    const { context, navigation } = modules;
+    // create a path resolver from the context module
+    const pathResolver = resolveContextFromPath(context, options?.path);
+    // use the path from the navigation module, or the path from the parent navigation module
+    const pathname =
+      navigation?.path.pathname ??
+      (ref as Partial<ModulesInstance<[NavigationModule]>>).navigation?.path.pathname;
+    // try to resolve the context from the path, and if that fails, try to resolve the context from the parent
+    return concat(
+      pathname ? pathResolver(pathname) : EMPTY,
+      resolveContextFromParent({ ref, modules }),
+    ).pipe(first());
   };
 
 export default resolveInitialContext;

package/src/version.ts

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