@openmrs/esm-config 10.0.1-pre.5635 → 10.0.1-pre.5649

package/.turbo/turbo-build.log

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

package/dist/module-config/module-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-config.d.ts","sourceRoot":"","sources":["../../src/module-config/module-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AA+SxF;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,QAS1E;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,QAKhE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,QAKpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,QAK7D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,QAetF;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,SAAa,QAK9D;AAiCD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAMjF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAoBxD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAKvG;AA6nBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,QAUjD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,SAUhC"}
+{"version":3,"file":"module-config.d.ts","sourceRoot":"","sources":["../../src/module-config/module-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AA4VxF;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,QAS1E;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,QAKhE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,QAKpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,QAK7D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,QAetF;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,SAAa,QAK9D;AAiCD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAMjF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAoBxD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAKvG;AA6nBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,QAUjD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,SAYhC"}

package/dist/module-config/module-config.js

@@ -43,14 +43,33 @@ const configSubscriptions = [];
     const configState = configInternalStore.getState();
     const tempConfigState = temporaryConfigStore.getState();
     const extensionState = configExtensionStore.getState();
+    // Mounting an extension changes only `configExtensionStore`, which only the extension configs
+    // depend on, so the rest of the last derivation is reused.
+    const configInputsUnchanged = lastDerivation?.configState === configState && lastDerivation.tempConfigState === tempConfigState;
+    if (configInputsUnchanged) {
+        computeExtensionConfigs(configState, extensionState, tempConfigState, lastDerivation.slotConfigs, true);
+        return;
+    }
     computeModuleConfig(configState, tempConfigState);
     const slotConfigs = getExtensionSlotConfigs(configState, tempConfigState);
     computeExtensionSlotConfigs(slotConfigs);
-    computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs);
+    computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs, false);
+    // Recorded only after the outputs above are written, so a failure forces a full derivation next time.
+    lastDerivation = {
+        configState,
+        tempConfigState,
+        slotConfigs
+    };
     // Last, because a failure here must not skip the outputs above. Only kept current while the
     // implementer tools are watching it; otherwise derived on read.
     invalidateImplementerToolsConfig();
 }
+/** The inputs the outputs were last fully derived from, compared by identity. */ let lastDerivation = null;
+/**
+ * The mounted extension each extension config entry was derived for. An extension ID can be
+ * mounted under a different module while its slot and ID stay the same, so an entry is only
+ * current if its modules match too.
+ */ let entryOrigins = new WeakMap();
 function setupConfigSubscriptions() {
     // Registered here rather than at module load so that `resetConfigSystem` restores it.
     setImplementerToolsConfigRecomputer(()=>computeImplementerToolsConfig(configInternalStore.getState(), temporaryConfigStore.getState()));
@@ -149,7 +168,7 @@ function computeImplementerToolsConfig(state, tempConfigState) {
         implementerToolsConfigStore.setState(newState);
     }
 }
-function computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs) {
+function computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs, configInputsUnchanged) {
     const extensionsConfigStore = getExtensionsConfigStore();
     const oldConfigs = extensionsConfigStore.getState().configs;
     const configs = {};
@@ -158,14 +177,22 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState, s
     // We assume that the module schema has already been defined, since the extension
     // it contains is mounted.
     for (let extension of extensionState.mountedExtensions){
-        const config = computeExtensionConfig(extension.slotModuleName, extension.extensionModuleName, extension.slotName, extension.extensionId, configState, tempConfigState, slotConfigs[extension.slotName]);
         const previous = oldConfigs[extension.slotName]?.[extension.extensionId];
-        // Entries keep their identity when the configuration behind them hasn't changed, so that
-        // mounting one extension doesn't hand every other mounted extension a new config object.
-        const entry = previous?.loaded && isEqual(previous.config, config) ? previous : {
-            config,
-            loaded: true
-        };
+        let entry;
+        const origin = previous && entryOrigins.get(previous);
+        if (configInputsUnchanged && previous?.loaded && origin?.slotModuleName === extension.slotModuleName && origin.extensionModuleName === extension.extensionModuleName) {
+            // Derived from these same inputs by the previous run, so it is still current.
+            entry = previous;
+        } else {
+            const config = computeExtensionConfig(extension.slotModuleName, extension.extensionModuleName, extension.slotName, extension.extensionId, configState, tempConfigState, slotConfigs[extension.slotName]);
+            // Entries keep their identity when the configuration behind them hasn't changed, so that
+            // mounting one extension doesn't hand every other mounted extension a new config object.
+            entry = previous?.loaded && isEqual(previous.config, config) ? previous : {
+                config,
+                loaded: true
+            };
+        }
+        entryOrigins.set(entry, extension);
         if (entry !== previous) {
             changed = true;
         }
@@ -937,6 +964,8 @@ function logError(keyPath, message) {
     extensionConfigCache.clear();
     schemaValuesAndSourcesCache.clear();
     implementerToolsModuleCache.clear();
+    lastDerivation = null;
+    entryOrigins = new WeakMap();
     setupConfigSubscriptions();
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-config",
-  "version": "10.0.1-pre.5635",
+  "version": "10.0.1-pre.5649",
   "license": "MPL-2.0",
   "description": "A configuration library for the OpenMRS Single-Spa framework.",
   "type": "module",
@@ -57,15 +57,15 @@
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
-    "@openmrs/esm-globals": "^10.0.1-pre.5635",
-    "@openmrs/esm-state": "^10.0.1-pre.5635",
-    "@openmrs/esm-utils": "^10.0.1-pre.5635",
+    "@openmrs/esm-globals": "^10.0.1-pre.5649",
+    "@openmrs/esm-state": "^10.0.1-pre.5649",
+    "@openmrs/esm-utils": "^10.0.1-pre.5649",
     "single-spa": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "10.0.1-pre.5635",
-    "@openmrs/esm-state": "10.0.1-pre.5635",
-    "@openmrs/esm-utils": "10.0.1-pre.5635",
+    "@openmrs/esm-globals": "10.0.1-pre.5649",
+    "@openmrs/esm-state": "10.0.1-pre.5649",
+    "@openmrs/esm-utils": "10.0.1-pre.5649",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@types/lodash-es": "^4.17.12",

package/src/module-config/module-config.test.ts

@@ -1304,6 +1304,54 @@ describe('extension config', () => {
     expect(derivations).toBe(3);
   });
 
+  it('keeps every mounted extension current across config changes interleaved with mounts', () => {
+    const mount = (extensionIds: Array<string>) =>
+      configExtensionStore.setState({
+        mountedExtensions: extensionIds.map((extensionId) => ({
+          slotModuleName: 'slot-mod',
+          extensionModuleName: 'ext-mod',
+          slotName: 'barSlot',
+          extensionId,
+        })),
+      });
+    const bar = (extensionId: string) => getExtensionConfig('barSlot', extensionId).getState().config.bar;
+
+    mount(['fooExt#a']);
+    expect(bar('fooExt#a')).toBe('barry');
+
+    temporaryConfigStore.setState({ config: { 'ext-mod': { bar: 'temporary' } } });
+    expect(bar('fooExt#a')).toBe('temporary');
+
+    // Mounting with the config unchanged must neither revert the extension already mounted nor
+    // hand the new one a config derived from anything but the current inputs.
+    mount(['fooExt#a', 'fooExt#b']);
+    expect(bar('fooExt#a')).toBe('temporary');
+    expect(bar('fooExt#b')).toBe('temporary');
+
+    temporaryConfigStore.setState({ config: {} });
+    expect(bar('fooExt#a')).toBe('barry');
+    expect(bar('fooExt#b')).toBe('barry');
+  });
+
+  it('re-derives the config of an extension mounted again under a different module', () => {
+    Config.defineConfigSchema('other-mod', { bar: { _default: 'other' } });
+    Config.registerModuleLoad('other-mod');
+
+    const mount = (extensionModuleName: string) =>
+      configExtensionStore.setState({
+        mountedExtensions: [
+          { slotModuleName: 'slot-mod', extensionModuleName, slotName: 'barSlot', extensionId: 'fooExt' },
+        ],
+      });
+    const bar = () => getExtensionConfig('barSlot', 'fooExt').getState().config.bar;
+
+    mount('ext-mod');
+    expect(bar()).toBe('barry');
+
+    mount('other-mod');
+    expect(bar()).toBe('other');
+  });
+
   it('returns the module config', async () => {
     const moduleLevelConfig = { 'ext-mod': { bar: 'qux' } };
     updateConfigExtensionStore();

package/src/module-config/module-config.ts

@@ -6,6 +6,7 @@ import { isArray, isBoolean, isUuid, isNumber, isObject, isString } from '../val
 import { validator } from '../validators/validator';
 import {
   type ConfigExtensionStore,
+  type ConfigExtensionStoreElement,
   type ConfigInternalStore,
   type ConfigStore,
   type ExtensionSlotsConfigStore,
@@ -74,17 +75,44 @@ function recomputeAllConfigs() {
   const tempConfigState = temporaryConfigStore.getState();
   const extensionState = configExtensionStore.getState();
 
+  // Mounting an extension changes only `configExtensionStore`, which only the extension configs
+  // depend on, so the rest of the last derivation is reused.
+  const configInputsUnchanged =
+    lastDerivation?.configState === configState && lastDerivation.tempConfigState === tempConfigState;
+
+  if (configInputsUnchanged) {
+    computeExtensionConfigs(configState, extensionState, tempConfigState, lastDerivation!.slotConfigs, true);
+    return;
+  }
+
   computeModuleConfig(configState, tempConfigState);
 
   const slotConfigs = getExtensionSlotConfigs(configState, tempConfigState);
   computeExtensionSlotConfigs(slotConfigs);
-  computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs);
+  computeExtensionConfigs(configState, extensionState, tempConfigState, slotConfigs, false);
+
+  // Recorded only after the outputs above are written, so a failure forces a full derivation next time.
+  lastDerivation = { configState, tempConfigState, slotConfigs };
 
   // Last, because a failure here must not skip the outputs above. Only kept current while the
   // implementer tools are watching it; otherwise derived on read.
   invalidateImplementerToolsConfig();
 }
 
+/** The inputs the outputs were last fully derived from, compared by identity. */
+let lastDerivation: {
+  configState: ConfigInternalStore;
+  tempConfigState: TemporaryConfigStore;
+  slotConfigs: Record<string, ExtensionSlotConfig>;
+} | null = null;
+
+/**
+ * The mounted extension each extension config entry was derived for. An extension ID can be
+ * mounted under a different module while its slot and ID stay the same, so an entry is only
+ * current if its modules match too.
+ */
+let entryOrigins = new WeakMap<object, ConfigExtensionStoreElement>();
+
 function setupConfigSubscriptions() {
   // Registered here rather than at module load so that `resetConfigSystem` restores it.
   setImplementerToolsConfigRecomputer(() =>
@@ -233,6 +261,7 @@ function computeExtensionConfigs(
   extensionState: ConfigExtensionStore,
   tempConfigState: TemporaryConfigStore,
   slotConfigs: Record<string, ExtensionSlotConfig>,
+  configInputsUnchanged: boolean,
 ) {
   const extensionsConfigStore = getExtensionsConfigStore();
   const oldConfigs = extensionsConfigStore.getState().configs;
@@ -243,20 +272,36 @@ function computeExtensionConfigs(
   // We assume that the module schema has already been defined, since the extension
   // it contains is mounted.
   for (let extension of extensionState.mountedExtensions) {
-    const config = computeExtensionConfig(
-      extension.slotModuleName,
-      extension.extensionModuleName,
-      extension.slotName,
-      extension.extensionId,
-      configState,
-      tempConfigState,
-      slotConfigs[extension.slotName],
-    );
-
     const previous = oldConfigs[extension.slotName]?.[extension.extensionId];
-    // Entries keep their identity when the configuration behind them hasn't changed, so that
-    // mounting one extension doesn't hand every other mounted extension a new config object.
-    const entry = previous?.loaded && isEqual(previous.config, config) ? previous : { config, loaded: true };
+    let entry: ConfigStore | { config: ConfigObject; loaded: true };
+
+    const origin = previous && entryOrigins.get(previous);
+
+    if (
+      configInputsUnchanged &&
+      previous?.loaded &&
+      origin?.slotModuleName === extension.slotModuleName &&
+      origin.extensionModuleName === extension.extensionModuleName
+    ) {
+      // Derived from these same inputs by the previous run, so it is still current.
+      entry = previous;
+    } else {
+      const config = computeExtensionConfig(
+        extension.slotModuleName,
+        extension.extensionModuleName,
+        extension.slotName,
+        extension.extensionId,
+        configState,
+        tempConfigState,
+        slotConfigs[extension.slotName],
+      );
+
+      // Entries keep their identity when the configuration behind them hasn't changed, so that
+      // mounting one extension doesn't hand every other mounted extension a new config object.
+      entry = previous?.loaded && isEqual(previous.config, config) ? previous : { config, loaded: true };
+    }
+
+    entryOrigins.set(entry, extension);
 
     if (entry !== previous) {
       changed = true;
@@ -1198,6 +1243,8 @@ export function resetConfigSystem() {
   extensionConfigCache.clear();
   schemaValuesAndSourcesCache.clear();
   implementerToolsModuleCache.clear();
+  lastDerivation = null;
+  entryOrigins = new WeakMap();
   setupConfigSubscriptions();
 }