@openmrs/esm-config 3.2.1-pre.986 → 3.3.1-pre.1173

package/src/module-config/state.ts

@@ -1,3 +1,4 @@
+/** @module @category Config */
 import { createGlobalStore, getGlobalStore } from "@openmrs/esm-state";
 import {
   Config,
@@ -109,7 +110,7 @@ export interface ConfigExtensionStoreElement {
 
 /** @internal */
 export const configExtensionStore = createGlobalStore<ConfigExtensionStore>(
-  "config-extensions",
+  "config-store-of-extension-state",
   { mountedExtensions: [] }
 );
 
@@ -141,42 +142,78 @@ export function getConfigStore(moduleName: string) {
 }
 
 /**
- * Configuration for a specific extension slot
+ * Configuration for all the specific extension slots
  * @internal
  */
-export interface ExtensionSlotConfigStore {
-  config: ExtensionSlotConfigObject;
-  loaded: boolean;
+export interface ExtensionSlotsConfigStore {
+  slots: {
+    [slotName: string]: {
+      config: ExtensionSlotConfigObject;
+      loaded: boolean;
+    };
+  };
 }
 
-function initializeExtensionSlotConfigStore() {
-  return {
-    config: {},
-    loaded: false,
-  };
+/** @internal */
+export function getExtensionSlotsConfigStore() {
+  return getGlobalStore<ExtensionSlotsConfigStore>(`config-extension-slots`, {
+    slots: {},
+  });
 }
 
 /** @internal */
-export function getExtensionSlotConfigStore(slotName: string) {
-  return getGlobalStore<ExtensionSlotConfigStore>(
-    `config-extension-slots-${slotName}`,
-    initializeExtensionSlotConfigStore()
+export function getExtensionSlotConfig(slotName: string) {
+  return getExtensionSlotConfigFromStore(
+    getExtensionSlotsConfigStore().getState(),
+    slotName
   );
 }
 
+/** @internal */
+export function getExtensionSlotConfigFromStore(
+  state: ExtensionSlotsConfigStore,
+  slotName: string
+) {
+  const slotConfig = state.slots[slotName];
+  return slotConfig ?? { loaded: false, config: {} };
+}
+
+/** @internal */
+export interface ExtensionsConfigStore {
+  configs: {
+    [slotName: string]: {
+      [extensionId: string]: ConfigStore;
+    };
+  };
+}
+
 /**
- * A store for each mounted extension's config
+ * One store for all the extensions
  * @internal
  */
-export function getExtensionConfigStore(
-  extensionSlotModuleName: string,
-  attachedExtensionSlotName: string,
+export function getExtensionsConfigStore() {
+  return getGlobalStore<ExtensionsConfigStore>(`config-extensions`, {
+    configs: {},
+  });
+}
+
+/** @internal */
+export function getExtensionConfig(slotName: string, extensionId: string) {
+  return getExtensionConfigFromStore(
+    getExtensionsConfigStore().getState(),
+    slotName,
+    extensionId
+  );
+}
+
+/** @internal */
+export function getExtensionConfigFromStore(
+  state: ExtensionsConfigStore,
+  slotName: string,
   extensionId: string
 ) {
-  return getGlobalStore<ConfigStore>(
-    `config-extension-${extensionSlotModuleName}-${attachedExtensionSlotName}-${extensionId}`,
-    initializeConfigStore()
-  );
+  const extensionConfig = state.configs[slotName]?.[extensionId];
+  return extensionConfig ?? { loaded: false, config: null };
 }
 
 /**

package/src/navigation/interpolate-string.ts

@@ -1,3 +1,5 @@
+/** @module @category Navigation */
+
 function trimTrailingSlash(str: string) {
   return str.replace(/\/$/, "");
 }
@@ -9,7 +11,6 @@ function trimTrailingSlash(str: string) {
  * parameters in configurable URLs.
  *
  * @param template A string to interpolate
- * @category Navigation
  */
 export function interpolateUrl(template: string): string {
   const openmrsSpaBase = trimTrailingSlash(window.getOpenmrsSpaBase());
@@ -36,7 +37,6 @@ export function interpolateUrl(template: string): string {
  *
  * @param template With optional params wrapped in `${ }`
  * @param params Values to interpolate into the string template
- * @category Navigation
  */
 export function interpolateString(template: string, params: object): string {
   const names = Object.keys(params);

package/src/navigation/navigate.ts

@@ -1,3 +1,4 @@
+/** @module @category Navigation */
 import { navigateToUrl } from "single-spa";
 import { interpolateUrl } from "./interpolate-string";
 import type {} from "@openmrs/esm-globals";
@@ -24,7 +25,6 @@ export interface NavigateOptions {
  * @param to The target path or URL. Supports templating with 'openmrsBase' and 'openmrsSpaBase'.
  * For example, `${openmrsSpaBase}/home` will resolve to `/openmrs/spa/home`
  * for implementations using the standard OpenMRS and SPA base paths.
- * @category Navigation
  */
 export function navigate({ to }: NavigateOptions): void {
   const openmrsSpaBase = trimTrailingSlash(window.getOpenmrsSpaBase());

package/src/public.ts

@@ -0,0 +1,12 @@
+export * from "./types";
+export * from "./navigation/interpolate-string";
+export * from "./navigation/navigate";
+export * from "./validators/validator";
+export * from "./validators/validators";
+export {
+  defineConfigSchema,
+  defineExtensionConfigSchema,
+  provide,
+  getConfig,
+} from "./module-config/module-config";
+export { getConfigStore, ConfigStore } from "./module-config/state";

package/src/types.ts

@@ -7,6 +7,7 @@ export enum Type {
   String = "String",
   UUID = "UUID",
   PersonAttributeTypeUuid = "PersonAttributeTypeUuid",
+  PatientIdentifierTypeUuid = "PatientIdentifierTypeUuid",
 }
 
 // Full-powered typing for Config and Schema trees depends on being able to

package/src/validators/type-validators.ts

@@ -27,7 +27,7 @@ export const isObject = validator(
 
 export const isUuid = validator(
   (val) =>
-    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
       val
     ) || /^[0-9a-f]{36}$/i.test(val),
   "must be a valid UUID or a 36-character hexadecimal string"

package/src/validators/validator.ts

@@ -1,3 +1,4 @@
+/** @module @category Config Validation */
 import { Validator, ValidatorFunction } from "../types";
 
 export function validator(

package/src/validators/validators.ts

@@ -1,3 +1,4 @@
+/** @module @category Config Validation */
 import { validator } from "./validator";
 
 /**

package/webpack.config.js

@@ -18,7 +18,7 @@ module.exports = (env) => ({
       {
         test: /\.m?(js|ts|tsx)$/,
         exclude: /(node_modules|bower_components)/,
-        use: "babel-loader",
+        use: "swc-loader",
       },
     ],
   },

package/.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript",
-    "@babel/preset-react"
-  ],
-  "plugins": ["babel-plugin-ramda"]
-}