@orion-js/mongodb 4.2.1 → 4.2.4

package/dist/index.d.cts

@@ -317,11 +317,14 @@ interface DeleteUnusedIndexesResult {
 /**
  * Registry that tracks all collections created via createCollection().
  * Maps connection name to a map of collection name to collection instance.
+ * When the same collection is registered multiple times, indexes are merged.
  */
 declare const collectionsRegistry: Map<string, Map<string, Collection<ModelClassBase>>>;
 /**
  * Registers a collection in the registry.
  * Called automatically when a collection is created via createCollection().
+ * If the same collection name is registered multiple times, indexes are merged
+ * to support multiple createCollection() calls for the same collection.
  * @param connectionName - The name of the MongoDB connection
  * @param collection - The collection instance to register
  */
@@ -332,11 +335,23 @@ declare function registerCollection(connectionName: string, collection: Collecti
  * @returns Array of registered collections for the connection
  */
 declare function getRegisteredCollections(connectionName?: string): Array<Collection<ModelClassBase>>;
+/**
+ * Gets the merged indexes for a specific collection from the registry.
+ * This includes all indexes from all createCollection() calls for the same collection name.
+ * @param connectionName - The name of the MongoDB connection
+ * @param collectionName - The name of the collection
+ * @returns Array of merged index definitions, or empty array if collection not registered
+ */
+declare function getMergedIndexes(connectionName: string, collectionName: string): CollectionIndex[];
 /**
  * Deletes unused indexes from all registered collections for a connection.
  * Iterates over all collections registered via createCollection() and
  * removes indexes that exist in MongoDB but are not defined in the collection configuration.
  *
+ * **Important**: This function waits for all pending index creation to complete before
+ * deleting any indexes, to avoid race conditions where an index being created might
+ * be incorrectly identified as unused.
+ *
  * @param connectionName - The name of the MongoDB connection (defaults to 'main')
  * @returns Array of results for each collection that had indexes deleted
  *
@@ -373,4 +388,4 @@ declare const ENCRYPTION_ALGORITHMS: {
     RANDOM: string;
 };
 
-export { BaseCollection, Collection, type CollectionIndex, type CountDocuments, type CreateCollectionOptions, type CreateCollectionOptionsWithSchemaType, type CreateCollectionOptionsWithTypedSchema, DataLoader, type DeleteMany, type DeleteOne, type DistinctDocumentId, type DocumentWithId, ENCRYPTION_ALGORITHMS, type EstimatedDocumentCount, type Find, type FindCursor, type FindOne, type FindOneAndUpdate, type FindOneAndUpdateUpdateOptions, type InferIdType, type InferSchemaTypeWithId, type InitItem, type InsertAndFind, type InsertMany, type InsertManyOptions, type InsertOne, type InsertOptions, type ModelClassBase, type ModelToMongoSelector, MongoCollection, type MongoFilter, type MongoSelector, type OptionalId, Repository, type SchemaWithRequiredId, type TypedId, type UpdateAndFind, type UpdateItem, type UpdateMany, type UpdateOne, type UpdateOptions, type Upsert, allConnectionPromises, collectionsRegistry, configureConnection, connections, createCollection, createIndexesPromises, deleteAllUnusedIndexes, getDBName, getMongoConnection, getOrCreateEncryptionKey, getRegisteredCollections, registerCollection, typedId };
+export { BaseCollection, Collection, type CollectionIndex, type CountDocuments, type CreateCollectionOptions, type CreateCollectionOptionsWithSchemaType, type CreateCollectionOptionsWithTypedSchema, DataLoader, type DeleteMany, type DeleteOne, type DistinctDocumentId, type DocumentWithId, ENCRYPTION_ALGORITHMS, type EstimatedDocumentCount, type Find, type FindCursor, type FindOne, type FindOneAndUpdate, type FindOneAndUpdateUpdateOptions, type InferIdType, type InferSchemaTypeWithId, type InitItem, type InsertAndFind, type InsertMany, type InsertManyOptions, type InsertOne, type InsertOptions, type ModelClassBase, type ModelToMongoSelector, MongoCollection, type MongoFilter, type MongoSelector, type OptionalId, Repository, type SchemaWithRequiredId, type TypedId, type UpdateAndFind, type UpdateItem, type UpdateMany, type UpdateOne, type UpdateOptions, type Upsert, allConnectionPromises, collectionsRegistry, configureConnection, connections, createCollection, createIndexesPromises, deleteAllUnusedIndexes, getDBName, getMergedIndexes, getMongoConnection, getOrCreateEncryptionKey, getRegisteredCollections, registerCollection, typedId };

package/dist/index.d.ts

@@ -317,11 +317,14 @@ interface DeleteUnusedIndexesResult {
 /**
  * Registry that tracks all collections created via createCollection().
  * Maps connection name to a map of collection name to collection instance.
+ * When the same collection is registered multiple times, indexes are merged.
  */
 declare const collectionsRegistry: Map<string, Map<string, Collection<ModelClassBase>>>;
 /**
  * Registers a collection in the registry.
  * Called automatically when a collection is created via createCollection().
+ * If the same collection name is registered multiple times, indexes are merged
+ * to support multiple createCollection() calls for the same collection.
  * @param connectionName - The name of the MongoDB connection
  * @param collection - The collection instance to register
  */
@@ -332,11 +335,23 @@ declare function registerCollection(connectionName: string, collection: Collecti
  * @returns Array of registered collections for the connection
  */
 declare function getRegisteredCollections(connectionName?: string): Array<Collection<ModelClassBase>>;
+/**
+ * Gets the merged indexes for a specific collection from the registry.
+ * This includes all indexes from all createCollection() calls for the same collection name.
+ * @param connectionName - The name of the MongoDB connection
+ * @param collectionName - The name of the collection
+ * @returns Array of merged index definitions, or empty array if collection not registered
+ */
+declare function getMergedIndexes(connectionName: string, collectionName: string): CollectionIndex[];
 /**
  * Deletes unused indexes from all registered collections for a connection.
  * Iterates over all collections registered via createCollection() and
  * removes indexes that exist in MongoDB but are not defined in the collection configuration.
  *
+ * **Important**: This function waits for all pending index creation to complete before
+ * deleting any indexes, to avoid race conditions where an index being created might
+ * be incorrectly identified as unused.
+ *
  * @param connectionName - The name of the MongoDB connection (defaults to 'main')
  * @returns Array of results for each collection that had indexes deleted
  *
@@ -373,4 +388,4 @@ declare const ENCRYPTION_ALGORITHMS: {
     RANDOM: string;
 };
 
-export { BaseCollection, Collection, type CollectionIndex, type CountDocuments, type CreateCollectionOptions, type CreateCollectionOptionsWithSchemaType, type CreateCollectionOptionsWithTypedSchema, DataLoader, type DeleteMany, type DeleteOne, type DistinctDocumentId, type DocumentWithId, ENCRYPTION_ALGORITHMS, type EstimatedDocumentCount, type Find, type FindCursor, type FindOne, type FindOneAndUpdate, type FindOneAndUpdateUpdateOptions, type InferIdType, type InferSchemaTypeWithId, type InitItem, type InsertAndFind, type InsertMany, type InsertManyOptions, type InsertOne, type InsertOptions, type ModelClassBase, type ModelToMongoSelector, MongoCollection, type MongoFilter, type MongoSelector, type OptionalId, Repository, type SchemaWithRequiredId, type TypedId, type UpdateAndFind, type UpdateItem, type UpdateMany, type UpdateOne, type UpdateOptions, type Upsert, allConnectionPromises, collectionsRegistry, configureConnection, connections, createCollection, createIndexesPromises, deleteAllUnusedIndexes, getDBName, getMongoConnection, getOrCreateEncryptionKey, getRegisteredCollections, registerCollection, typedId };
+export { BaseCollection, Collection, type CollectionIndex, type CountDocuments, type CreateCollectionOptions, type CreateCollectionOptionsWithSchemaType, type CreateCollectionOptionsWithTypedSchema, DataLoader, type DeleteMany, type DeleteOne, type DistinctDocumentId, type DocumentWithId, ENCRYPTION_ALGORITHMS, type EstimatedDocumentCount, type Find, type FindCursor, type FindOne, type FindOneAndUpdate, type FindOneAndUpdateUpdateOptions, type InferIdType, type InferSchemaTypeWithId, type InitItem, type InsertAndFind, type InsertMany, type InsertManyOptions, type InsertOne, type InsertOptions, type ModelClassBase, type ModelToMongoSelector, MongoCollection, type MongoFilter, type MongoSelector, type OptionalId, Repository, type SchemaWithRequiredId, type TypedId, type UpdateAndFind, type UpdateItem, type UpdateMany, type UpdateOne, type UpdateOptions, type Upsert, allConnectionPromises, collectionsRegistry, configureConnection, connections, createCollection, createIndexesPromises, deleteAllUnusedIndexes, getDBName, getMergedIndexes, getMongoConnection, getOrCreateEncryptionKey, getRegisteredCollections, registerCollection, typedId };

package/dist/index.js

@@ -1146,7 +1146,7 @@ var generateId_default = getIdGenerator;
 
 // src/createCollection/createIndexes.ts
 import { MongoExpiredSessionError, MongoNotConnectedError } from "mongodb";
-import { logger as logger3 } from "@orion-js/logger";
+import { logger as logger4 } from "@orion-js/logger";
 
 // src/createCollection/deleteUnusedIndexes.ts
 import { logger as logger2 } from "@orion-js/logger";
@@ -1168,6 +1168,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);
@@ -1183,7 +1192,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) {
@@ -1221,6 +1235,85 @@ async function deleteUnusedIndexes(collection) {
   return result;
 }
 
+// src/createCollection/collectionsRegistry.ts
+import { logger as logger3 } from "@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) {
+    logger3.warn(`No collections registered for connection "${connectionName}"`);
+    return [];
+  }
+  if (createIndexesPromises.length > 0) {
+    logger3.info("Waiting for pending index creation to complete before deleting unused indexes...");
+    await Promise.all(createIndexesPromises);
+  }
+  logger3.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);
+  logger3.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
+  return results;
+}
+
 // src/createCollection/createIndexes.ts
 async function checkIndexes(collection) {
   await collection.connectionPromise;
@@ -1231,14 +1324,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) {
-    logger3.warn(
+    logger4.warn(
       `${unexpectedIndexes.length} unexpected indexes found in collection "${collection.name}": ${unexpectedIndexes.map((i) => i.name).join(", ")} | Delete the index or fix the collection definition`
     );
   }
@@ -1280,43 +1374,6 @@ async function loadIndexes(collection) {
   return results;
 }
 
-// src/createCollection/collectionsRegistry.ts
-import { logger as logger4 } from "@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) {
-    logger4.warn(`No collections registered for connection "${connectionName}"`);
-    return [];
-  }
-  logger4.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);
-  logger4.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
-  return results;
-}
-
 // src/createCollection/getSchemaAndModel.ts
 import { clone as clone3 } from "@orion-js/helpers";
 Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
@@ -1597,6 +1654,7 @@ export {
   createIndexesPromises,
   deleteAllUnusedIndexes,
   getDBName,
+  getMergedIndexes,
   getMongoConnection,
   getOrCreateEncryptionKey,
   getRegisteredCollections,