@orion-js/mongodb 4.2.1 → 4.2.4

package/dist/index.cjs

@@ -43,6 +43,7 @@ __export(index_exports, {
   createIndexesPromises: () => createIndexesPromises,
   deleteAllUnusedIndexes: () => deleteAllUnusedIndexes,
   getDBName: () => getDBName,
+  getMergedIndexes: () => getMergedIndexes,
   getMongoConnection: () => getMongoConnection,
   getOrCreateEncryptionKey: () => getOrCreateEncryptionKey,
   getRegisteredCollections: () => getRegisteredCollections,
@@ -1197,7 +1198,7 @@ var generateId_default = getIdGenerator;
 
 // src/createCollection/createIndexes.ts
 var import_mongodb2 = require("mongodb");
-var import_logger3 = require("@orion-js/logger");
+var import_logger4 = require("@orion-js/logger");
 
 // src/createCollection/deleteUnusedIndexes.ts
 var import_logger2 = require("@orion-js/logger");
@@ -1219,6 +1220,15 @@ function getIndexName(indexDef) {
 }
 
 // src/createCollection/deleteUnusedIndexes.ts
+function isTextIndexDefinition(keys) {
+  return Object.values(keys).some((value) => value === "text");
+}
+function isMongoDBTextIndex(key) {
+  return "_fts" in key && "_ftsx" in key;
+}
+function generateIndexName(keys) {
+  return Object.entries(keys).map(([field, value]) => `${field}_${value}`).join("_");
+}
 function keysMatch(definitionKeys, currentIndexKey) {
   const defEntries = Object.entries(definitionKeys);
   const curEntries = Object.entries(currentIndexKey);
@@ -1234,7 +1244,12 @@ function isIndexDefined(definedIndexes, currentIndex) {
   return definedIndexes.some((defIndex) => {
     const customName = getIndexName(defIndex);
     if (customName && customName === currentIndex.name) return true;
-    return keysMatch(defIndex.keys, currentIndex.key);
+    const defKeys = defIndex.keys;
+    if (isTextIndexDefinition(defKeys) && isMongoDBTextIndex(currentIndex.key)) {
+      const expectedName = generateIndexName(defKeys);
+      return currentIndex.name === expectedName;
+    }
+    return keysMatch(defKeys, currentIndex.key);
   });
 }
 async function deleteUnusedIndexes(collection) {
@@ -1272,6 +1287,85 @@ async function deleteUnusedIndexes(collection) {
   return result;
 }
 
+// src/createCollection/collectionsRegistry.ts
+var import_logger3 = require("@orion-js/logger");
+var collectionsRegistry = /* @__PURE__ */ new Map();
+function indexesAreEqual(indexA, indexB) {
+  const nameA = getIndexName(indexA);
+  const nameB = getIndexName(indexB);
+  if (nameA && nameB) {
+    return nameA === nameB;
+  }
+  return keysMatch(
+    indexA.keys,
+    indexB.keys
+  );
+}
+function mergeIndexes(existingIndexes, newIndexes) {
+  const merged = [...existingIndexes];
+  for (const newIndex of newIndexes) {
+    const isDuplicate = existingIndexes.some((existing) => indexesAreEqual(existing, newIndex));
+    if (!isDuplicate) {
+      merged.push(newIndex);
+    }
+  }
+  return merged;
+}
+function registerCollection(connectionName, collection) {
+  if (!collectionsRegistry.has(connectionName)) {
+    collectionsRegistry.set(connectionName, /* @__PURE__ */ new Map());
+  }
+  const connectionMap = collectionsRegistry.get(connectionName);
+  const existingCollection = connectionMap.get(collection.name);
+  if (existingCollection) {
+    existingCollection.indexes = mergeIndexes(existingCollection.indexes, collection.indexes);
+  } else {
+    connectionMap.set(collection.name, collection);
+  }
+}
+function getRegisteredCollections(connectionName = "main") {
+  const connectionCollections = collectionsRegistry.get(connectionName);
+  if (!connectionCollections) {
+    return [];
+  }
+  return Array.from(connectionCollections.values());
+}
+function getMergedIndexes(connectionName, collectionName) {
+  const connectionCollections = collectionsRegistry.get(connectionName);
+  if (!connectionCollections) {
+    return [];
+  }
+  const collection = connectionCollections.get(collectionName);
+  if (!collection) {
+    return [];
+  }
+  return collection.indexes || [];
+}
+async function deleteAllUnusedIndexes(connectionName = "main") {
+  const collections = getRegisteredCollections(connectionName);
+  if (collections.length === 0) {
+    import_logger3.logger.warn(`No collections registered for connection "${connectionName}"`);
+    return [];
+  }
+  if (createIndexesPromises.length > 0) {
+    import_logger3.logger.info("Waiting for pending index creation to complete before deleting unused indexes...");
+    await Promise.all(createIndexesPromises);
+  }
+  import_logger3.logger.info(
+    `Deleting unused indexes from ${collections.length} collections on connection "${connectionName}"`
+  );
+  const results = [];
+  for (const collection of collections) {
+    const result = await collection.deleteUnusedIndexes();
+    if (result.deletedIndexes.length > 0) {
+      results.push(result);
+    }
+  }
+  const totalDeleted = results.reduce((sum, r) => sum + r.deletedIndexes.length, 0);
+  import_logger3.logger.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
+  return results;
+}
+
 // src/createCollection/createIndexes.ts
 async function checkIndexes(collection) {
   await collection.connectionPromise;
@@ -1282,14 +1376,15 @@ async function checkIndexes(collection) {
     if (error.codeName !== "NamespaceNotFound") throw error;
     return;
   }
-  if (!collection.indexes || collection.indexes.length === 0) {
+  const mergedIndexes = getMergedIndexes(collection.connectionName, collection.name);
+  if (mergedIndexes.length === 0) {
     return;
   }
   const unexpectedIndexes = currentIndexes.filter(
-    (index) => index.name !== "_id_" && !isIndexDefined(collection.indexes, index)
+    (index) => index.name !== "_id_" && !isIndexDefined(mergedIndexes, index)
   );
   if (unexpectedIndexes.length > 0) {
-    import_logger3.logger.warn(
+    import_logger4.logger.warn(
       `${unexpectedIndexes.length} unexpected indexes found in collection "${collection.name}": ${unexpectedIndexes.map((i) => i.name).join(", ")} | Delete the index or fix the collection definition`
     );
   }
@@ -1331,43 +1426,6 @@ async function loadIndexes(collection) {
   return results;
 }
 
-// src/createCollection/collectionsRegistry.ts
-var import_logger4 = require("@orion-js/logger");
-var collectionsRegistry = /* @__PURE__ */ new Map();
-function registerCollection(connectionName, collection) {
-  if (!collectionsRegistry.has(connectionName)) {
-    collectionsRegistry.set(connectionName, /* @__PURE__ */ new Map());
-  }
-  collectionsRegistry.get(connectionName).set(collection.name, collection);
-}
-function getRegisteredCollections(connectionName = "main") {
-  const connectionCollections = collectionsRegistry.get(connectionName);
-  if (!connectionCollections) {
-    return [];
-  }
-  return Array.from(connectionCollections.values());
-}
-async function deleteAllUnusedIndexes(connectionName = "main") {
-  const collections = getRegisteredCollections(connectionName);
-  if (collections.length === 0) {
-    import_logger4.logger.warn(`No collections registered for connection "${connectionName}"`);
-    return [];
-  }
-  import_logger4.logger.info(
-    `Deleting unused indexes from ${collections.length} collections on connection "${connectionName}"`
-  );
-  const results = [];
-  for (const collection of collections) {
-    const result = await collection.deleteUnusedIndexes();
-    if (result.deletedIndexes.length > 0) {
-      results.push(result);
-    }
-  }
-  const totalDeleted = results.reduce((sum, r) => sum + r.deletedIndexes.length, 0);
-  import_logger4.logger.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
-  return results;
-}
-
 // src/createCollection/getSchemaAndModel.ts
 var import_helpers7 = require("@orion-js/helpers");
 Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
@@ -1649,6 +1707,7 @@ var ENCRYPTION_ALGORITHMS = {
   createIndexesPromises,
   deleteAllUnusedIndexes,
   getDBName,
+  getMergedIndexes,
   getMongoConnection,
   getOrCreateEncryptionKey,
   getRegisteredCollections,