@orion-js/mongodb 4.2.3 → 4.2.5

package/dist/index.d.cts

@@ -335,6 +335,14 @@ 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
@@ -380,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

@@ -335,6 +335,14 @@ 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
@@ -380,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

@@ -74,9 +74,6 @@ var OrionMongoDatabaseWrapper = class {
   configTimeout;
   constructor(connectionName) {
     this.connectionName = connectionName;
-    logger.info("New connection requested", {
-      connectionName
-    });
     this.connectionEvent.setMaxListeners(Number.POSITIVE_INFINITY);
     this.connectionPromise = new Promise((resolve, reject) => {
       if (this.state === "connected") {
@@ -122,11 +119,8 @@ var OrionMongoDatabaseWrapper = class {
       return this;
     }
     this.state = "connecting";
-    const censoredURI = this.uri.replace(/\/\/.*:.*@/, "//");
-    logger.info("Connecting to mongo", {
-      uri: censoredURI,
-      connectionName: this.connectionName
-    });
+    const censoredURI = this.uri.replace(/\/\/.*:.*@/, "//").replace(/^mongodb(\+srv)?:\/\//, "");
+    logger.info(`Starting MongoDB connection "${this.connectionName}" [${censoredURI}]`);
     if (this.encrypted.client) {
       await this.connectWithRetry(this.encrypted.client);
       logger.info("Successfully connected to encrypted mongo", {
@@ -137,10 +131,6 @@ var OrionMongoDatabaseWrapper = class {
     await this.connectWithRetry(this.client);
     this.state = "connected";
     this.connectionEvent.emit("connected", this.client);
-    logger.info("Successfully connected to mongo", {
-      uri: censoredURI,
-      connectionName: this.connectionName
-    });
     nextTick(() => {
       this.connectionEvent.removeAllListeners();
       this.connectionEvent = null;
@@ -1146,7 +1136,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 +1158,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 +1182,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,67 +1225,8 @@ async function deleteUnusedIndexes(collection) {
   return result;
 }
 
-// src/createCollection/createIndexes.ts
-async function checkIndexes(collection) {
-  await collection.connectionPromise;
-  let currentIndexes = [];
-  try {
-    currentIndexes = await collection.rawCollection.indexes();
-  } catch (error) {
-    if (error.codeName !== "NamespaceNotFound") throw error;
-    return;
-  }
-  if (!collection.indexes || collection.indexes.length === 0) {
-    return;
-  }
-  const unexpectedIndexes = currentIndexes.filter(
-    (index) => index.name !== "_id_" && !isIndexDefined(collection.indexes, index)
-  );
-  if (unexpectedIndexes.length > 0) {
-    logger3.warn(
-      `${unexpectedIndexes.length} unexpected indexes found in collection "${collection.name}": ${unexpectedIndexes.map((i) => i.name).join(", ")} | Delete the index or fix the collection definition`
-    );
-  }
-}
-async function loadIndexes(collection) {
-  if (!collection.indexes) return;
-  if (!collection.indexes.length) return;
-  await collection.connectionPromise;
-  const results = Promise.all(
-    collection.indexes.map(async (indexDef) => {
-      const { keys } = indexDef;
-      const options = getIndexOptions(indexDef);
-      try {
-        return await collection.rawCollection.createIndex(keys, options);
-      } catch (error) {
-        if (error.code === 85 || error.code === 86) {
-          console.info("Will delete index to create the new version");
-          const indexName = (() => {
-            const message = error.errorResponse.errmsg;
-            const indexName2 = message.split('name: "')[1].split('"')[0];
-            return indexName2;
-          })();
-          await collection.rawCollection.dropIndex(indexName);
-          console.info("Index was deleted, creating new index");
-          const result = await collection.rawCollection.createIndex(keys, options);
-          console.info("Index updated correctly");
-          return result;
-        }
-        if (error instanceof MongoExpiredSessionError || error instanceof MongoNotConnectedError) {
-        } else {
-          console.error(`Error creating index for collection ${collection.name}: ${error.message}`);
-          console.error(error);
-          return error.message;
-        }
-      }
-    })
-  );
-  await checkIndexes(collection);
-  return results;
-}
-
 // src/createCollection/collectionsRegistry.ts
-import { logger as logger4 } from "@orion-js/logger";
+import { logger as logger3 } from "@orion-js/logger";
 var collectionsRegistry = /* @__PURE__ */ new Map();
 function indexesAreEqual(indexA, indexB) {
   const nameA = getIndexName(indexA);
@@ -1323,17 +1268,28 @@ function getRegisteredCollections(connectionName = "main") {
   }
   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) {
-    logger4.warn(`No collections registered for connection "${connectionName}"`);
+    logger3.warn(`No collections registered for connection "${connectionName}"`);
     return [];
   }
   if (createIndexesPromises.length > 0) {
-    logger4.info("Waiting for pending index creation to complete before deleting unused indexes...");
+    logger3.info("Waiting for pending index creation to complete before deleting unused indexes...");
     await Promise.all(createIndexesPromises);
   }
-  logger4.info(
+  logger3.info(
     `Deleting unused indexes from ${collections.length} collections on connection "${connectionName}"`
   );
   const results = [];
@@ -1344,7 +1300,67 @@ async function deleteAllUnusedIndexes(connectionName = "main") {
     }
   }
   const totalDeleted = results.reduce((sum, r) => sum + r.deletedIndexes.length, 0);
-  logger4.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
+  logger3.info(`Deleted ${totalDeleted} unused indexes from ${results.length} collections`);
+  return results;
+}
+
+// src/createCollection/createIndexes.ts
+async function checkIndexes(collection) {
+  await collection.connectionPromise;
+  let currentIndexes = [];
+  try {
+    currentIndexes = await collection.rawCollection.indexes();
+  } catch (error) {
+    if (error.codeName !== "NamespaceNotFound") throw error;
+    return;
+  }
+  const mergedIndexes = getMergedIndexes(collection.connectionName, collection.name);
+  if (mergedIndexes.length === 0) {
+    return;
+  }
+  const unexpectedIndexes = currentIndexes.filter(
+    (index) => index.name !== "_id_" && !isIndexDefined(mergedIndexes, index)
+  );
+  if (unexpectedIndexes.length > 0) {
+    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`
+    );
+  }
+}
+async function loadIndexes(collection) {
+  if (!collection.indexes) return;
+  if (!collection.indexes.length) return;
+  await collection.connectionPromise;
+  const results = Promise.all(
+    collection.indexes.map(async (indexDef) => {
+      const { keys } = indexDef;
+      const options = getIndexOptions(indexDef);
+      try {
+        return await collection.rawCollection.createIndex(keys, options);
+      } catch (error) {
+        if (error.code === 85 || error.code === 86) {
+          console.info("Will delete index to create the new version");
+          const indexName = (() => {
+            const message = error.errorResponse.errmsg;
+            const indexName2 = message.split('name: "')[1].split('"')[0];
+            return indexName2;
+          })();
+          await collection.rawCollection.dropIndex(indexName);
+          console.info("Index was deleted, creating new index");
+          const result = await collection.rawCollection.createIndex(keys, options);
+          console.info("Index updated correctly");
+          return result;
+        }
+        if (error instanceof MongoExpiredSessionError || error instanceof MongoNotConnectedError) {
+        } else {
+          console.error(`Error creating index for collection ${collection.name}: ${error.message}`);
+          console.error(error);
+          return error.message;
+        }
+      }
+    })
+  );
+  await checkIndexes(collection);
   return results;
 }
 
@@ -1628,6 +1644,7 @@ export {
   createIndexesPromises,
   deleteAllUnusedIndexes,
   getDBName,
+  getMergedIndexes,
   getMongoConnection,
   getOrCreateEncryptionKey,
   getRegisteredCollections,