@openmrs/esm-extensions 10.0.1-pre.5642 → 10.0.1-pre.5649

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 10 files with swc (141.67ms)
+[0] Successfully compiled: 10 files with swc (187.86ms)
 [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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAwBlC,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAQ9B,MAAM,SAAS,CAAC;AAyMjB;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,UAGzD;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,sBAAsB,EAC7B,WAAW,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CAGnC;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAG/F;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,CAAC,qBAAqB,EAAE,qBAAqB,KAAK,IAO7E,CAAC;AAEN;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QA4B3D;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAmBpE;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,iBAAiB,EAAE,MAAM,QAmBlD;AA4ID;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,wBAAwB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAOlH;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAEjF;AAqBD;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAsC1E,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,MAAM,IAOzB,CAAC"}
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAwBlC,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAQ9B,MAAM,SAAS,CAAC;AAyMjB;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,UAGzD;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,sBAAsB,EAC7B,WAAW,EAAE,MAAM,GAClB,qBAAqB,GAAG,SAAS,CAGnC;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAG/F;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,CAAC,qBAAqB,EAAE,qBAAqB,KAAK,IAO7E,CAAC;AAEN;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QA4B3D;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAmBpE;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,iBAAiB,EAAE,MAAM,QAmBlD;AAuJD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,wBAAwB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAOlH;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAEjF;AAsBD;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAsC1E,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,MAAM,IAOzB,CAAC"}

package/dist/extensions.js

@@ -292,6 +292,15 @@ export function getExtensionRegistration(extensionId) {
         }
     });
 }
+/** Maps each ID to the index of its first occurrence, matching `Array.prototype.indexOf`. */ function indexById(ids) {
+    const index = new Map();
+    ids.forEach((id, i)=>{
+        if (!index.has(id)) {
+            index.set(id, i);
+        }
+    });
+    return index;
+}
 /**
  * Get an order index for the extension. This will
  * come from either its configured order, its registered order
@@ -301,15 +310,15 @@ export function getExtensionRegistration(extensionId) {
  * those with no ordering information share the last band rather than taking a sentinel that can't be
  * compared against itself.
  */ function getOrder(extensionId, configuredOrder, registeredOrderIndex, attachedOrder) {
-    const configuredIndex = configuredOrder.indexOf(extensionId);
-    if (configuredIndex !== -1) {
+    const configuredIndex = configuredOrder.get(extensionId);
+    if (configuredIndex !== undefined) {
         return configuredIndex;
     } else if (registeredOrderIndex !== undefined) {
         // extensions that don't have a configured order should appear after those that do
         return 1000 + registeredOrderIndex;
     } else {
-        const assignedIndex = attachedOrder.indexOf(extensionId);
-        if (assignedIndex !== -1) {
+        const assignedIndex = attachedOrder.get(extensionId);
+        if (assignedIndex !== undefined) {
             // extensions that have neither a configured nor registered order should appear
             // after all others
             return 2000 + assignedIndex;
@@ -426,17 +435,22 @@ function calculateAssignedIds(config, attachedIds) {
     const removedIds = config.remove || [];
     const idOrder = config.order || [];
     const { extensions } = extensionInternalStore.getState();
-    return [
+    const removed = new Set(removedIds);
+    const ids = [
         ...attachedIds,
         ...addedIds
-    ].filter((id)=>!removedIds.includes(id)).sort((idA, idB)=>{
-        const ai = getOrder(idA, idOrder, extensions[getExtensionNameFromId(idA)]?.order, attachedIds);
-        const bi = getOrder(idB, idOrder, extensions[getExtensionNameFromId(idB)]?.order, attachedIds);
-        // Ties keep their input order — `Array.prototype.sort` is stable, and the input is
-        // `[...attachedIds, ...addedIds]`, so two extensions the ordering rules can't separate
-        // come out in the order the code and the configuration declared them.
-        return ai - bi;
-    });
+    ].filter((id)=>!removed.has(id));
+    const configuredIndex = indexById(idOrder);
+    const attachedIndex = indexById(attachedIds);
+    // Computed once per ID: calling `getOrder` from the comparator makes the sort quadratic.
+    const order = new Map(ids.map((id)=>[
+            id,
+            getOrder(id, configuredIndex, extensions[getExtensionNameFromId(id)]?.order, attachedIndex)
+        ]));
+    // Ties keep their input order — `Array.prototype.sort` is stable, and the input is
+    // `[...attachedIds, ...addedIds]`, so two extensions the ordering rules can't separate
+    // come out in the order the code and the configuration declared them.
+    return ids.sort((idA, idB)=>order.get(idA) - order.get(idB));
 }
 /**
  * Used by by extension slots at mount time.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-extensions",
-  "version": "10.0.1-pre.5642",
+  "version": "10.0.1-pre.5649",
   "license": "MPL-2.0",
   "description": "Coordinates extensions and extension points in the OpenMRS Frontend",
   "type": "module",
@@ -57,21 +57,21 @@
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
-    "@openmrs/esm-api": "^10.0.1-pre.5642",
-    "@openmrs/esm-config": "^10.0.1-pre.5642",
-    "@openmrs/esm-expression-evaluator": "^10.0.1-pre.5642",
-    "@openmrs/esm-feature-flags": "^10.0.1-pre.5642",
-    "@openmrs/esm-state": "^10.0.1-pre.5642",
-    "@openmrs/esm-utils": "^10.0.1-pre.5642",
+    "@openmrs/esm-api": "^10.0.1-pre.5649",
+    "@openmrs/esm-config": "^10.0.1-pre.5649",
+    "@openmrs/esm-expression-evaluator": "^10.0.1-pre.5649",
+    "@openmrs/esm-feature-flags": "^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-api": "10.0.1-pre.5642",
-    "@openmrs/esm-config": "10.0.1-pre.5642",
-    "@openmrs/esm-expression-evaluator": "10.0.1-pre.5642",
-    "@openmrs/esm-feature-flags": "10.0.1-pre.5642",
-    "@openmrs/esm-state": "10.0.1-pre.5642",
-    "@openmrs/esm-utils": "10.0.1-pre.5642",
+    "@openmrs/esm-api": "10.0.1-pre.5649",
+    "@openmrs/esm-config": "10.0.1-pre.5649",
+    "@openmrs/esm-expression-evaluator": "10.0.1-pre.5649",
+    "@openmrs/esm-feature-flags": "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",
     "@vitest/coverage-v8": "^4.1.2",

package/src/extensions.ts

@@ -387,6 +387,17 @@ export function detachAll(extensionSlotName: string) {
   });
 }
 
+/** Maps each ID to the index of its first occurrence, matching `Array.prototype.indexOf`. */
+function indexById(ids: Array<string>) {
+  const index = new Map<string, number>();
+  ids.forEach((id, i) => {
+    if (!index.has(id)) {
+      index.set(id, i);
+    }
+  });
+  return index;
+}
+
 /**
  * Get an order index for the extension. This will
  * come from either its configured order, its registered order
@@ -398,19 +409,19 @@ export function detachAll(extensionSlotName: string) {
  */
 function getOrder(
   extensionId: string,
-  configuredOrder: Array<string>,
+  configuredOrder: Map<string, number>,
   registeredOrderIndex: number | undefined,
-  attachedOrder: Array<string>,
+  attachedOrder: Map<string, number>,
 ) {
-  const configuredIndex = configuredOrder.indexOf(extensionId);
-  if (configuredIndex !== -1) {
+  const configuredIndex = configuredOrder.get(extensionId);
+  if (configuredIndex !== undefined) {
     return configuredIndex;
   } else if (registeredOrderIndex !== undefined) {
     // extensions that don't have a configured order should appear after those that do
     return 1000 + registeredOrderIndex;
   } else {
-    const assignedIndex = attachedOrder.indexOf(extensionId);
-    if (assignedIndex !== -1) {
+    const assignedIndex = attachedOrder.get(extensionId);
+    if (assignedIndex !== undefined) {
       // extensions that have neither a configured nor registered order should appear
       // after all others
       return 2000 + assignedIndex;
@@ -566,18 +577,19 @@ function calculateAssignedIds(config: ExtensionSlotConfig, attachedIds: Array<st
   const removedIds = config.remove || [];
   const idOrder = config.order || [];
   const { extensions } = extensionInternalStore.getState();
+  const removed = new Set(removedIds);
+  const ids = [...attachedIds, ...addedIds].filter((id) => !removed.has(id));
+  const configuredIndex = indexById(idOrder);
+  const attachedIndex = indexById(attachedIds);
+  // Computed once per ID: calling `getOrder` from the comparator makes the sort quadratic.
+  const order = new Map(
+    ids.map((id) => [id, getOrder(id, configuredIndex, extensions[getExtensionNameFromId(id)]?.order, attachedIndex)]),
+  );
 
-  return [...attachedIds, ...addedIds]
-    .filter((id) => !removedIds.includes(id))
-    .sort((idA, idB) => {
-      const ai = getOrder(idA, idOrder, extensions[getExtensionNameFromId(idA)]?.order, attachedIds);
-      const bi = getOrder(idB, idOrder, extensions[getExtensionNameFromId(idB)]?.order, attachedIds);
-
-      // Ties keep their input order — `Array.prototype.sort` is stable, and the input is
-      // `[...attachedIds, ...addedIds]`, so two extensions the ordering rules can't separate
-      // come out in the order the code and the configuration declared them.
-      return ai - bi;
-    });
+  // Ties keep their input order — `Array.prototype.sort` is stable, and the input is
+  // `[...attachedIds, ...addedIds]`, so two extensions the ordering rules can't separate
+  // come out in the order the code and the configuration declared them.
+  return ids.sort((idA, idB) => order.get(idA)! - order.get(idB)!);
 }
 
 /**