@openmrs/esm-extensions 6.3.1-pre.3106 → 6.3.1-pre.3124

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 10 files with swc (114.51ms)
+[0] Successfully compiled: 10 files with swc (156.95ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/extensions.js

@@ -6,12 +6,12 @@
  * - assigned (computed from attached and configured)
  * - connected (computed from assigned using connectivity and online / offline)
  */ import { sessionStore, userHasAccess } from "@openmrs/esm-api";
-import { getExtensionConfigFromStore, getExtensionsConfigStore, getExtensionSlotConfig, getExtensionSlotConfigFromStore, getExtensionSlotsConfigStore } from "@openmrs/esm-config";
+import { getExtensionConfigFromStore, getExtensionsConfigStore, getExtensionSlotConfig, getExtensionConfigFromExtensionSlotStore, getExtensionSlotConfigFromStore, getExtensionSlotsConfigStore } from "@openmrs/esm-config";
 import { evaluateAsBoolean } from "@openmrs/esm-expression-evaluator";
 import { featureFlagsStore } from "@openmrs/esm-feature-flags";
 import { subscribeConnectivityChanged } from "@openmrs/esm-globals";
 import { isOnline as isOnlineFn } from "@openmrs/esm-utils";
-import { isEqual } from "lodash-es";
+import { isEqual, merge } from "lodash-es";
 import { checkStatusFor } from "./helpers.js";
 import { getExtensionStore, getExtensionInternalStore, updateInternalExtensionStore } from "./store.js";
 const extensionInternalStore = getExtensionInternalStore();
@@ -221,7 +221,9 @@ function getAssignedExtensionsFromSlotData(slotName, internalState, config, exte
     const assignedIds = calculateAssignedIds(config, attachedIds);
     const extensions = [];
     for (let id of assignedIds){
-        const { config: extensionConfig } = getExtensionConfigFromStore(extensionConfigStoreState, slotName, id);
+        const { config: rawExtensionConfig } = getExtensionConfigFromStore(extensionConfigStoreState, slotName, id);
+        const rawExtensionSlotExtensionConfig = getExtensionConfigFromExtensionSlotStore(config, slotName, id);
+        const extensionConfig = merge(rawExtensionConfig, rawExtensionSlotExtensionConfig);
         const name = getExtensionNameFromId(id);
         const extension = internalState.extensions[name];
         // if the extension has not been registered yet, do not include it

package/dist/store.d.ts

@@ -1,4 +1,4 @@
-import type { ConfigObject, ExtensionSlotConfigObject } from '@openmrs/esm-config';
+import type { ConfigObject, ExtensionSlotConfig } from '@openmrs/esm-config';
 import { type LifeCycles } from 'single-spa';
 export interface ExtensionMeta {
     [_: string]: any;
@@ -49,7 +49,7 @@ export interface ExtensionSlotInfo {
      */
     attachedIds: Array<string>;
     /** The configuration provided for this slot. `null` if not yet loaded. */
-    config: ExtensionSlotConfigObject | null;
+    config: Omit<ExtensionSlotConfig, 'configuration'> | null;
 }
 export interface ExtensionStore {
     slots: Record<string, ExtensionSlotState>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-extensions",
-  "version": "6.3.1-pre.3106",
+  "version": "6.3.1-pre.3124",
   "license": "MPL-2.0",
   "description": "Coordinates extensions and extension points in the OpenMRS Frontend",
   "type": "module",
@@ -64,12 +64,12 @@
     "single-spa": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "6.3.1-pre.3106",
-    "@openmrs/esm-config": "6.3.1-pre.3106",
-    "@openmrs/esm-expression-evaluator": "6.3.1-pre.3106",
-    "@openmrs/esm-feature-flags": "6.3.1-pre.3106",
-    "@openmrs/esm-state": "6.3.1-pre.3106",
-    "@openmrs/esm-utils": "6.3.1-pre.3106",
+    "@openmrs/esm-api": "6.3.1-pre.3124",
+    "@openmrs/esm-config": "6.3.1-pre.3124",
+    "@openmrs/esm-expression-evaluator": "6.3.1-pre.3124",
+    "@openmrs/esm-feature-flags": "6.3.1-pre.3124",
+    "@openmrs/esm-state": "6.3.1-pre.3124",
+    "@openmrs/esm-utils": "6.3.1-pre.3124",
     "@swc/cli": "^0.7.7",
     "@swc/core": "^1.11.29",
     "concurrently": "^9.1.2",

package/src/extensions.ts

@@ -11,11 +11,12 @@
 import { type Session, type SessionStore, sessionStore, userHasAccess } from '@openmrs/esm-api';
 import {
   type ExtensionsConfigStore,
-  type ExtensionSlotConfigObject,
+  type ExtensionSlotConfig,
   type ExtensionSlotsConfigStore,
   getExtensionConfigFromStore,
   getExtensionsConfigStore,
   getExtensionSlotConfig,
+  getExtensionConfigFromExtensionSlotStore,
   getExtensionSlotConfigFromStore,
   getExtensionSlotsConfigStore,
 } from '@openmrs/esm-config';
@@ -23,7 +24,7 @@ import { evaluateAsBoolean } from '@openmrs/esm-expression-evaluator';
 import { type FeatureFlagsStore, featureFlagsStore } from '@openmrs/esm-feature-flags';
 import { subscribeConnectivityChanged } from '@openmrs/esm-globals';
 import { isOnline as isOnlineFn } from '@openmrs/esm-utils';
-import { isEqual } from 'lodash-es';
+import { isEqual, merge } from 'lodash-es';
 import { checkStatusFor } from './helpers';
 import {
   type AssignedExtension,
@@ -322,7 +323,7 @@ function getOrder(
 function getAssignedExtensionsFromSlotData(
   slotName: string,
   internalState: ExtensionInternalStore,
-  config: ExtensionSlotConfigObject,
+  config: ExtensionSlotConfig,
   extensionConfigStoreState: ExtensionsConfigStore,
   enabledFeatureFlags: Array<string>,
   isOnline: boolean,
@@ -333,7 +334,10 @@ function getAssignedExtensionsFromSlotData(
   const extensions: Array<AssignedExtension> = [];
 
   for (let id of assignedIds) {
-    const { config: extensionConfig } = getExtensionConfigFromStore(extensionConfigStoreState, slotName, id);
+    const { config: rawExtensionConfig } = getExtensionConfigFromStore(extensionConfigStoreState, slotName, id);
+    const rawExtensionSlotExtensionConfig = getExtensionConfigFromExtensionSlotStore(config, slotName, id);
+    const extensionConfig = merge(rawExtensionConfig, rawExtensionSlotExtensionConfig);
+
     const name = getExtensionNameFromId(id);
     const extension = internalState.extensions[name];
 
@@ -418,7 +422,7 @@ export function getAssignedExtensions(slotName: string): Array<AssignedExtension
   );
 }
 
-function calculateAssignedIds(config: ExtensionSlotConfigObject, attachedIds: Array<string>) {
+function calculateAssignedIds(config: ExtensionSlotConfig, attachedIds: Array<string>) {
   const addedIds = config.add || [];
   const removedIds = config.remove || [];
   const idOrder = config.order || [];

package/src/store.ts

@@ -1,6 +1,6 @@
 /** @module @category Extension */
 import { isEqual } from 'lodash-es';
-import type { ConfigExtensionStoreElement, ConfigObject, ExtensionSlotConfigObject } from '@openmrs/esm-config';
+import type { ConfigExtensionStoreElement, ConfigObject, ExtensionSlotConfig } from '@openmrs/esm-config';
 import { configExtensionStore } from '@openmrs/esm-config';
 import { createGlobalStore, getGlobalStore } from '@openmrs/esm-state';
 import { type LifeCycles } from 'single-spa';
@@ -57,7 +57,7 @@ export interface ExtensionSlotInfo {
    */
   attachedIds: Array<string>;
   /** The configuration provided for this slot. `null` if not yet loaded. */
-  config: ExtensionSlotConfigObject | null;
+  config: Omit<ExtensionSlotConfig, 'configuration'> | null;
 }
 
 export interface ExtensionStore {