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

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 8 files with swc (233.45ms)
+[0] Successfully compiled: 8 files with swc (210.06ms)
 [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.js

@@ -254,7 +254,9 @@ export function provide(config, sourceName = 'provided') {
                     'Translation overrides'
                 ], state.config);
                 resolve(config);
-                unsubscribe && unsubscribe();
+                if (unsubscribe) {
+                    unsubscribe();
+                }
             }
         }
         update(store.getState());
@@ -269,7 +271,9 @@ export function provide(config, sourceName = 'provided') {
                 if (state.translationOverridesLoaded && state.config) {
                     const translationOverrides = state.config['Translation overrides'] ?? {};
                     resolve(translationOverrides);
-                    unsubscribe && unsubscribe();
+                    if (unsubscribe) {
+                        unsubscribe();
+                    }
                 }
             }
             update(configStore.getState());
@@ -283,7 +287,9 @@ export function provide(config, sourceName = 'provided') {
                 if (state.loaded && state.config) {
                     const translationOverrides = state.config['Translation overrides'] ?? {};
                     resolve(translationOverrides);
-                    unsubscribe && unsubscribe();
+                    if (unsubscribe) {
+                        unsubscribe();
+                    }
                 }
             }
             update(configStore.getState());
@@ -624,6 +630,7 @@ function validateArrayStructure(arraySchema, value, keyPath) {
  * @returns true if validation passes, false otherwise
  */ function checkType(keyPath, _type, value) {
     if (_type) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
         const validator = {
             Array: isArray,
             Boolean: isBoolean,
@@ -644,7 +651,8 @@ function validateArrayStructure(arraySchema, value, keyPath) {
 /**
  * Runs validators, logging errors.
  * @returns true if all pass, false otherwise.
- */ function runValidators(keyPath, validators, value) {
+ */ // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+function runValidators(keyPath, validators, value) {
     let returnValue = true;
     if (validators) {
         try {

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

@@ -1,5 +1,5 @@
 import { type StoreApi } from 'zustand';
-import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfigObject, ProvidedConfig } from '../types';
+import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfig, ProvidedConfig } from '../types';
 /**
  * Internal store
  *   A store of the inputs and internal state
@@ -70,7 +70,7 @@ export declare function getConfigStore(moduleName: string): StoreApi<ConfigStore
 export interface ExtensionSlotsConfigStore {
     slots: {
         [slotName: string]: {
-            config: ExtensionSlotConfigObject;
+            config: ExtensionSlotConfig;
             loaded: boolean;
         };
     };
@@ -79,12 +79,12 @@ export interface ExtensionSlotsConfigStore {
 export declare function getExtensionSlotsConfigStore(): StoreApi<ExtensionSlotsConfigStore>;
 /** @internal */
 export declare function getExtensionSlotConfig(slotName: string): {
-    config: ExtensionSlotConfigObject;
+    config: ExtensionSlotConfig;
     loaded: boolean;
 };
 /** @internal */
 export declare function getExtensionSlotConfigFromStore(state: ExtensionSlotsConfigStore, slotName: string): {
-    config: ExtensionSlotConfigObject;
+    config: ExtensionSlotConfig;
     loaded: boolean;
 };
 /** @internal */
@@ -104,6 +104,8 @@ export declare function getExtensionsConfigStore(): StoreApi<ExtensionsConfigSto
 export declare function getExtensionConfig(slotName: string, extensionId: string): StoreApi<Omit<ConfigStore, 'translationOverridesLoaded'>>;
 /** @internal */
 export declare function getExtensionConfigFromStore(state: ExtensionsConfigStore, slotName: string, extensionId: string): ConfigStore;
+/** @internal */
+export declare function getExtensionConfigFromExtensionSlotStore(state: ExtensionSlotConfig, slotName: string, extensionId: string): object | null;
 /**
  * A store of the implementer tools output config
  * @internal

package/dist/module-config/state.js

@@ -111,6 +111,10 @@ function initializeConfigStore() {
         config: null
     };
 }
+/** @internal */ export function getExtensionConfigFromExtensionSlotStore(state, slotName, extensionId) {
+    const extensionConfig = state.configure?.[extensionId];
+    return extensionConfig ?? null;
+}
 /** @internal */ export const implementerToolsConfigStore = createGlobalStore('config-implementer-tools', {
     config: {}
 });

package/dist/types.d.ts

@@ -38,22 +38,17 @@ export interface DisplayConditionsConfigObject {
 }
 export type ConfigValue = string | number | boolean | void | Array<any> | object;
 export interface ExtensionSlotConfig {
+    /** Additional extension IDs to assign to this slot, in addition to those `attach`ed in code. */
     add?: Array<string>;
+    /** Extension IDs which were `attach`ed to the slot but which should not be assigned. */
     remove?: Array<string>;
+    /** Overrides the default ordering of extensions. */
     order?: Array<string>;
     configure?: ExtensionSlotConfigureValueObject;
 }
 export interface ExtensionSlotConfigureValueObject {
     [key: string]: object;
 }
-export interface ExtensionSlotConfigObject {
-    /** Additional extension IDs to assign to this slot, in addition to those `attach`ed in code. */
-    add?: Array<string>;
-    /** Extension IDs which were `attach`ed to the slot but which should not be assigned. */
-    remove?: Array<string>;
-    /** Overrides the default ordering of extensions. */
-    order?: Array<string>;
-}
 export type ProvidedConfig = {
     source: string;
     config: Config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-config",
-  "version": "6.3.1-pre.3106",
+  "version": "6.3.1-pre.3124",
   "license": "MPL-2.0",
   "description": "A configuration library for the OpenMRS Single-Spa framework.",
   "type": "module",
@@ -61,9 +61,9 @@
     "single-spa": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "6.3.1-pre.3106",
-    "@openmrs/esm-state": "6.3.1-pre.3106",
-    "@openmrs/esm-utils": "6.3.1-pre.3106",
+    "@openmrs/esm-globals": "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",
     "@types/ramda": "^0.26.44",

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

@@ -1,6 +1,6 @@
 /** @module @category Config */
 import { clone, reduce, mergeDeepRight, equals, omit } from 'ramda';
-import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfig, ExtensionSlotConfigObject } from '../types';
+import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfig } from '../types';
 import { Type } from '../types';
 import { isArray, isBoolean, isUuid, isNumber, isObject, isString } from '../validators/type-validators';
 import { validator } from '../validators/validator';
@@ -281,7 +281,10 @@ export function getConfig<T = Record<string, any>>(moduleName: string): Promise<
       if (state.loaded && state.config) {
         const config = omit(['Display conditions', 'Translation overrides'], state.config);
         resolve(config as T);
-        unsubscribe && unsubscribe();
+
+        if (unsubscribe) {
+          unsubscribe();
+        }
       }
     }
     update(store.getState());
@@ -302,7 +305,10 @@ export function getTranslationOverrides(
         if (state.translationOverridesLoaded && state.config) {
           const translationOverrides = state.config['Translation overrides'] ?? {};
           resolve(translationOverrides);
-          unsubscribe && unsubscribe();
+
+          if (unsubscribe) {
+            unsubscribe();
+          }
         }
       }
       update(configStore.getState());
@@ -318,7 +324,10 @@ export function getTranslationOverrides(
           if (state.loaded && state.config) {
             const translationOverrides = state.config['Translation overrides'] ?? {};
             resolve(translationOverrides);
-            unsubscribe && unsubscribe();
+
+            if (unsubscribe) {
+              unsubscribe();
+            }
           }
         }
         update(configStore.getState());
@@ -431,7 +440,7 @@ function createValuesAndSourcesTree(config: ConfigObject, source: string) {
 function getExtensionSlotConfigs(
   configState: ConfigInternalStore,
   tempConfigState: TemporaryConfigStore,
-): Record<string, ExtensionSlotConfigObject> {
+): Record<string, ExtensionSlotConfig> {
   const allConfigs = mergeConfigs(getProvidedConfigs(configState, tempConfigState));
   const slotConfigPerModule: Record<string, Record<string, ExtensionSlotConfig>> = Object.keys(allConfigs).reduce(
     (obj, key) => {
@@ -715,6 +724,7 @@ function runAllValidatorsInConfigTree(schema: ConfigSchema, config: ConfigObject
  */
 function checkType(keyPath: string, _type: Type | undefined, value: any) {
   if (_type) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     const validator: Record<string, Function> = {
       Array: isArray,
       Boolean: isBoolean,
@@ -735,6 +745,7 @@ function checkType(keyPath: string, _type: Type | undefined, value: any) {
  * Runs validators, logging errors.
  * @returns true if all pass, false otherwise.
  */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 function runValidators(keyPath: string, validators: Array<Function> | undefined, value: any) {
   let returnValue = true;
   if (validators) {
@@ -811,7 +822,7 @@ const setDefaults = (schema: ConfigSchema, inputConfig: Config) => {
   return config;
 };
 
-function hasObjectSchema(elementsSchema: Object | undefined): elementsSchema is ConfigSchema {
+function hasObjectSchema(elementsSchema: unknown): elementsSchema is ConfigSchema {
   return (
     !!elementsSchema && Object.keys(elementsSchema).filter((e) => !['_default', '_validators'].includes(e)).length > 0
   );

package/src/module-config/state.ts

@@ -2,7 +2,7 @@
 import { createGlobalStore, getGlobalStore } from '@openmrs/esm-state';
 import { shallowEqual } from '@openmrs/esm-utils';
 import { type StoreApi } from 'zustand';
-import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfigObject, ProvidedConfig } from '../types';
+import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfig, ProvidedConfig } from '../types';
 
 /**
  * Internal store
@@ -123,7 +123,7 @@ export function getConfigStore(moduleName: string) {
 export interface ExtensionSlotsConfigStore {
   slots: {
     [slotName: string]: {
-      config: ExtensionSlotConfigObject;
+      config: ExtensionSlotConfig;
       loaded: boolean;
     };
   };
@@ -235,6 +235,16 @@ export function getExtensionConfigFromStore(state: ExtensionsConfigStore, slotNa
   return extensionConfig ?? { loaded: false, config: null };
 }
 
+/** @internal */
+export function getExtensionConfigFromExtensionSlotStore(
+  state: ExtensionSlotConfig,
+  slotName: string,
+  extensionId: string,
+) {
+  const extensionConfig = state.configure?.[extensionId];
+  return extensionConfig ?? null;
+}
+
 /**
  * A store of the implementer tools output config
  * @internal

package/src/types.ts

@@ -46,8 +46,11 @@ export interface DisplayConditionsConfigObject {
 export type ConfigValue = string | number | boolean | void | Array<any> | object;
 
 export interface ExtensionSlotConfig {
+  /** Additional extension IDs to assign to this slot, in addition to those `attach`ed in code. */
   add?: Array<string>;
+  /** Extension IDs which were `attach`ed to the slot but which should not be assigned. */
   remove?: Array<string>;
+  /** Overrides the default ordering of extensions. */
   order?: Array<string>;
   configure?: ExtensionSlotConfigureValueObject;
 }
@@ -56,15 +59,6 @@ export interface ExtensionSlotConfigureValueObject {
   [key: string]: object;
 }
 
-export interface ExtensionSlotConfigObject {
-  /** Additional extension IDs to assign to this slot, in addition to those `attach`ed in code. */
-  add?: Array<string>;
-  /** Extension IDs which were `attach`ed to the slot but which should not be assigned. */
-  remove?: Array<string>;
-  /** Overrides the default ordering of extensions. */
-  order?: Array<string>;
-}
-
 export type ProvidedConfig = {
   source: string;
   config: Config;