@openmrs/esm-config 9.0.3-pre.4178 → 9.0.3-pre.4195

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 8 files with swc (168.59ms)
+[0] Successfully compiled: 8 files with swc (246.59ms)
 [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;AAkKxF;;;;;;;;;;;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;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAgBjF;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,CAwCxD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAKvG;AA8eD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,QAUjD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,SAIhC"}
+{"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+KxF;;;;;;;;;;;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;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAgBjF;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,CAwCxD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAKvG;AA6eD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,QAUjD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,SAIhC"}

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

@@ -1,8 +1,19 @@
-/** @module @category Config */ import { clone, equals, reduce, mergeDeepRight, omit } from "ramda";
+/** @module @category Config */ import { cloneDeep, isEqual, mergeWith, omit as lodashOmit } from "lodash-es";
 import { Type } from "../types.js";
 import { isArray, isBoolean, isUuid, isNumber, isObject, isString } from "../validators/type-validators.js";
 import { validator } from "../validators/validator.js";
 import { configExtensionStore, configInternalStore, getConfigStore, getExtensionConfig, getExtensionSlotsConfigStore, getExtensionsConfigStore, implementerToolsConfigStore, temporaryConfigStore } from "./state.js";
+/**
+ * Deep merge two objects, with right-side values taking precedence.
+ * Arrays are replaced entirely (not merged by index), matching the
+ * behavior of ramda's mergeDeepRight.
+ */ function mergeDeepReplace(left, right) {
+    return mergeWith({}, left, right, (_objValue, srcValue)=>{
+        if (Array.isArray(srcValue)) {
+            return srcValue;
+        }
+    });
+}
 /**
  * Store setup
  *
@@ -92,7 +103,7 @@ function computeExtensionSlotConfigs(state, tempState) {
             ...newSlotStoreEntries
         }
     };
-    if (!equals(oldState.slots, newState.slots)) {
+    if (!isEqual(oldState.slots, newState.slots)) {
         slotStore.setState(newState);
     }
 }
@@ -103,7 +114,7 @@ function computeImplementerToolsConfig(state, tempConfigState) {
         config
     };
     // Use deep equality on the actual config content, not the wrapper object
-    if (!equals(oldState.config, newState.config)) {
+    if (!isEqual(oldState.config, newState.config)) {
         implementerToolsConfigStore.setState(newState);
     }
 }
@@ -127,7 +138,7 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState) {
         configs
     };
     // Use deep equality to only update if configs actually changed
-    if (!equals(oldState.configs, newState.configs)) {
+    if (!isEqual(oldState.configs, newState.configs)) {
         extensionsConfigStore.setState(newState);
     }
 }
@@ -147,7 +158,7 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState) {
  * @param schema The config schema for the module
  */ export function defineConfigSchema(moduleName, schema) {
     validateConfigSchema(moduleName, schema);
-    const enhancedSchema = mergeDeepRight(schema, implicitConfigSchema);
+    const enhancedSchema = mergeDeepReplace(schema, implicitConfigSchema);
     configInternalStore.setState((state)=>({
             ...state,
             schemas: {
@@ -229,7 +240,7 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState) {
  * @param schema The config schema for the extension
  */ export function defineExtensionConfigSchema(extensionName, schema) {
     validateConfigSchema(extensionName, schema);
-    const enhancedSchema = mergeDeepRight(schema, implicitConfigSchema);
+    const enhancedSchema = mergeDeepReplace(schema, implicitConfigSchema);
     const state = configInternalStore.getState();
     if (state.schemas[extensionName]) {
         console.error(`Config schema for extension ${extensionName} already exists. If there are multiple extensions with this same name, one will probably crash.`);
@@ -275,10 +286,10 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState) {
         const store = getConfigStore(moduleName);
         function update(state) {
             if (state.loaded && state.config) {
-                const config = omit([
+                const config = lodashOmit(state.config, [
                     'Display conditions',
                     'Translation overrides'
-                ], state.config);
+                ]);
                 resolve(config);
                 if (unsubscribe) {
                     unsubscribe();
@@ -386,7 +397,7 @@ function computeExtensionConfigs(configState, extensionState, tempConfigState) {
     return config;
 }
 function getImplementerToolsConfig(configState, tempConfigState) {
-    let result = getSchemaWithValuesAndSources(clone(configState.schemas));
+    let result = getSchemaWithValuesAndSources(cloneDeep(configState.schemas));
     const configsAndSources = [
         ...configState.providedConfigs.map((c)=>[
                 c.config,
@@ -574,8 +585,7 @@ function mergeConfigsFor(moduleName, allConfigs) {
     return mergeConfigs(allConfigsForModule);
 }
 function mergeConfigs(configs) {
-    const mergeDeepAll = reduce(mergeDeepRight);
-    return mergeDeepAll({}, configs);
+    return configs.reduce((acc, config)=>mergeDeepReplace(acc, config), {});
 }
 /**
  * Recursively check the provided config tree to make sure that all
@@ -711,7 +721,7 @@ function runValidators(keyPath, validators, value) {
 }
 // Recursively fill in the config with values from the schema.
 const setDefaults = (schema, inputConfig)=>{
-    const config = clone(inputConfig);
+    const config = structuredClone(inputConfig);
     if (!schema) {
         return config;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-config",
-  "version": "9.0.3-pre.4178",
+  "version": "9.0.3-pre.4195",
   "license": "MPL-2.0",
   "description": "A configuration library for the OpenMRS Single-Spa framework.",
   "type": "module",
@@ -53,7 +53,7 @@
     "access": "public"
   },
   "dependencies": {
-    "ramda": "^0.30.1"
+    "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
     "@openmrs/esm-globals": "9.x",
@@ -62,12 +62,12 @@
     "single-spa": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "9.0.3-pre.4178",
-    "@openmrs/esm-state": "9.0.3-pre.4178",
-    "@openmrs/esm-utils": "9.0.3-pre.4178",
+    "@openmrs/esm-globals": "9.0.3-pre.4195",
+    "@openmrs/esm-state": "9.0.3-pre.4195",
+    "@openmrs/esm-utils": "9.0.3-pre.4195",
     "@swc/cli": "0.8.0",
     "@swc/core": "1.15.18",
-    "@types/ramda": "^0.26.44",
+    "@types/lodash-es": "^4.17.12",
     "@vitest/coverage-v8": "^4.0.18",
     "concurrently": "^9.1.2",
     "cross-env": "^7.0.3",

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

@@ -1,5 +1,5 @@
 /** @module @category Config */
-import { clone, equals, reduce, mergeDeepRight, omit } from 'ramda';
+import { cloneDeep, isEqual, mergeWith, omit as lodashOmit } from 'lodash-es';
 import type { Config, ConfigObject, ConfigSchema, ExtensionSlotConfig } from '../types';
 import { Type } from '../types';
 import { isArray, isBoolean, isUuid, isNumber, isObject, isString } from '../validators/type-validators';
@@ -17,6 +17,19 @@ import {
 } from './state';
 import { type TemporaryConfigStore } from '..';
 
+/**
+ * Deep merge two objects, with right-side values taking precedence.
+ * Arrays are replaced entirely (not merged by index), matching the
+ * behavior of ramda's mergeDeepRight.
+ */
+function mergeDeepReplace<T extends object>(left: T, right: Partial<T>): T {
+  return mergeWith({}, left, right, (_objValue: unknown, srcValue: unknown) => {
+    if (Array.isArray(srcValue)) {
+      return srcValue;
+    }
+  }) as T;
+}
+
 /**
  * Store setup
  *
@@ -108,7 +121,7 @@ function computeExtensionSlotConfigs(state: ConfigInternalStore, tempState: Temp
   const oldState = slotStore.getState();
   const newState = { slots: { ...oldState.slots, ...newSlotStoreEntries } };
 
-  if (!equals(oldState.slots, newState.slots)) {
+  if (!isEqual(oldState.slots, newState.slots)) {
     slotStore.setState(newState);
   }
 }
@@ -119,7 +132,7 @@ function computeImplementerToolsConfig(state: ConfigInternalStore, tempConfigSta
   const newState = { config };
 
   // Use deep equality on the actual config content, not the wrapper object
-  if (!equals(oldState.config, newState.config)) {
+  if (!isEqual(oldState.config, newState.config)) {
     implementerToolsConfigStore.setState(newState);
   }
 }
@@ -152,7 +165,7 @@ function computeExtensionConfigs(
   const newState = { configs };
 
   // Use deep equality to only update if configs actually changed
-  if (!equals(oldState.configs, newState.configs)) {
+  if (!isEqual(oldState.configs, newState.configs)) {
     extensionsConfigStore.setState(newState);
   }
 }
@@ -176,7 +189,7 @@ function computeExtensionConfigs(
  */
 export function defineConfigSchema(moduleName: string, schema: ConfigSchema) {
   validateConfigSchema(moduleName, schema);
-  const enhancedSchema = mergeDeepRight(schema, implicitConfigSchema) as ConfigSchema;
+  const enhancedSchema = mergeDeepReplace(schema, implicitConfigSchema);
 
   configInternalStore.setState((state) => ({
     ...state,
@@ -252,7 +265,7 @@ export function registerTranslationNamespace(namespace: string) {
  */
 export function defineExtensionConfigSchema(extensionName: string, schema: ConfigSchema) {
   validateConfigSchema(extensionName, schema);
-  const enhancedSchema = mergeDeepRight(schema, implicitConfigSchema) as ConfigSchema;
+  const enhancedSchema = mergeDeepReplace(schema, implicitConfigSchema);
 
   const state = configInternalStore.getState();
   if (state.schemas[extensionName]) {
@@ -297,7 +310,7 @@ export function getConfig<T = Record<string, any>>(moduleName: string): Promise<
     const store = getConfigStore(moduleName);
     function update(state: ConfigStore) {
       if (state.loaded && state.config) {
-        const config = omit(['Display conditions', 'Translation overrides'], state.config);
+        const config = lodashOmit(state.config, ['Display conditions', 'Translation overrides']);
         resolve(config as T);
 
         if (unsubscribe) {
@@ -432,7 +445,7 @@ function getImplementerToolsConfig(
   configState: ConfigInternalStore,
   tempConfigState: TemporaryConfigStore,
 ): Record<string, Config> {
-  let result = getSchemaWithValuesAndSources(clone(configState.schemas));
+  let result = getSchemaWithValuesAndSources(cloneDeep(configState.schemas));
   const configsAndSources = [
     ...configState.providedConfigs.map((c) => [c.config, c.source]),
     [tempConfigState.config, 'temporary config'],
@@ -645,8 +658,7 @@ function mergeConfigsFor(moduleName: string, allConfigs: Array<Config>): ConfigO
 }
 
 function mergeConfigs(configs: Array<Config>) {
-  const mergeDeepAll = reduce(mergeDeepRight);
-  return mergeDeepAll({}, configs) as Config;
+  return configs.reduce<Config>((acc, config) => mergeDeepReplace(acc, config), {});
 }
 
 /**
@@ -802,7 +814,7 @@ function runValidators(keyPath: string, validators: Array<Function> | undefined,
 
 // Recursively fill in the config with values from the schema.
 const setDefaults = (schema: ConfigSchema, inputConfig: Config) => {
-  const config = clone(inputConfig);
+  const config = structuredClone(inputConfig);
 
   if (!schema) {
     return config;