opticedge-cloud-utils 1.1.12 → 1.1.13

package/dist/db/mongo.d.ts

@@ -1,4 +1,5 @@
-import { Collection, Document } from 'mongodb';
+import { Db, Collection, Document } from 'mongodb';
 export declare function connectToMongo(projectId: string, uriSecret: string, dbName: string): Promise<void>;
 export declare function connectToMongoWithUri(uri: string, dbName: string): Promise<void>;
+export declare function getDb(): Db;
 export declare function getCollection<T extends Document = Document>(name: string): Collection<T>;

package/dist/db/mongo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectToMongo = connectToMongo;
 exports.connectToMongoWithUri = connectToMongoWithUri;
+exports.getDb = getDb;
 exports.getCollection = getCollection;
 const mongodb_1 = require("mongodb");
 const secrets_1 = require("../secrets");
@@ -33,6 +34,11 @@ async function connectToMongoWithUri(uri, dbName) {
     }
     await connectPromise;
 }
+function getDb() {
+    if (!db)
+        throw new Error('Mongo not initialized. Call connectToMongo(...) first.');
+    return db;
+}
 function getCollection(name) {
     if (!db)
         throw new Error('Mongo not initialized');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opticedge-cloud-utils",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "Common utilities for cloud functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/db/mongo.ts

@@ -34,6 +34,11 @@ export async function connectToMongoWithUri(uri: string, dbName: string) {
   await connectPromise
 }
 
+export function getDb(): Db {
+  if (!db) throw new Error('Mongo not initialized. Call connectToMongo(...) first.')
+  return db
+}
+
 export function getCollection<T extends Document = Document>(name: string): Collection<T> {
   if (!db) throw new Error('Mongo not initialized')
   return db.collection<T>(name)

package/tests/db/mongo.test.ts

@@ -1,4 +1,4 @@
-import { connectToMongo, connectToMongoWithUri, getCollection } from '../../src/db/mongo'
+import { connectToMongo, connectToMongoWithUri, getCollection, getDb } from '../../src/db/mongo'
 import { MongoClient, Db } from 'mongodb'
 import * as secretsModule from '../../src/secrets'
 
@@ -37,18 +37,27 @@ describe('Mongo Utils', () => {
     expect(mockDb.collection).toHaveBeenCalledWith('users')
   })
 
-  it('should throw error if db is not initialized', () => {
+  it('getDb should return the initialized Db instance', async () => {
+    await connectToMongo('test-project', 'mongo-uri-secret', 'test-db')
+    const got = getDb()
+    expect(got).toBe(mockDb)
+  })
+
+  it('should throw error if db is not initialized (getCollection/getDb)', () => {
     jest.isolateModules(() => {
+      // require a fresh copy of the module so module-level state is uninitialized
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getCollection } = require('../../src/db/mongo')
-      expect(() => getCollection('users')).toThrow('Mongo not initialized')
+      const mod = require('../../src/db/mongo')
+      expect(() => mod.getCollection('users')).toThrow(/Mongo not initialized/)
+      expect(() => mod.getDb()).toThrow(/Mongo not initialized/)
     })
   })
 })
 
 describe('Mongo Utils 2', () => {
-  it('should connect to MongoDB and store client/db', async () => {
-    jest.isolateModules(async () => {
+  it('should connect to MongoDB and store client/db with URI helper', async () => {
+    // isolate modules so connect state is fresh for this test
+    await jest.isolateModulesAsync(async () => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
       const { connectToMongoWithUri } = require('../../src/db/mongo')
       await connectToMongoWithUri('mongo-uri', 'test-db')
@@ -58,10 +67,16 @@ describe('Mongo Utils 2', () => {
     })
   })
 
-  it('should return a collection when db is initialized', async () => {
+  it('should return a collection when db is initialized (connectToMongoWithUri)', async () => {
     await connectToMongoWithUri('mongo-uri', 'test-db')
     getCollection('users')
 
     expect(mockDb.collection).toHaveBeenCalledWith('users')
   })
+
+  it('getDb should return the initialized Db instance after connectToMongoWithUri', async () => {
+    await connectToMongoWithUri('mongo-uri', 'test-db')
+    const got = getDb()
+    expect(got).toBe(mockDb)
+  })
 })