@medyll/idae-db 0.106.0 → 0.108.0

package/README.md

@@ -10,6 +10,14 @@ To install the library, run:
 npm install idae-db
 ```
 
+## Scripts
+
+```bash
+npm run test            # Run all tests
+npm run test:coverage   # Run tests with coverage (v8)
+npm run test:mongodb    # Run only the MongoDB adapter suite (in-memory mongo)
+```
+
 ## Usage
 
 ### Initialization

package/dist/IdaeDBModel.js

@@ -45,8 +45,10 @@ export class IdaeDBModel {
         await idaeAuto.db(increment_name);
         const incrementCollection = idaeAuto.collection(this._autoIncrementDbCollection);
         // await incrementCollection.createIndex({ _id: 1 }, { unique: true });
-        await incrementCollection.updateWhere({ query: { _id: new ObjectId(this.fieldId) } }, { $inc: { value: 1 } }, { upsert: true });
-        const next = await incrementCollection.findOne({ query: { _id: new ObjectId(this.fieldId) } });
+        // Use a stable string key per collection+field to track increments
+        const key = `${this._collectionName}:${this._fieldId}`;
+        await incrementCollection.updateWhere({ query: { _id: key } }, { $inc: { value: 1 } }, { upsert: true });
+        const next = await incrementCollection.findOne({ query: { _id: key } });
         return next?.value;
     }
 }

package/dist/IdaeDbConnection.d.ts

@@ -45,6 +45,7 @@ export declare class IdaeDbConnection {
     get dbName(): string;
     get connected(): boolean;
     get idaeDb(): IdaeDb;
+    get uri(): string;
     /**
      * Gets the full database name with scope.
      * @returns The full database name.

package/dist/IdaeDbConnection.js

@@ -101,6 +101,9 @@ export class IdaeDbConnection {
     get idaeDb() {
         return this._idaeDb;
     }
+    get uri() {
+        return this.#uri;
+    }
     /**
      * Gets the full database name with scope.
      * @returns The full database name.

package/dist/IdaeEventEmitter.js

@@ -28,19 +28,33 @@ export function withEmitter() {
         descriptor.value = function (...args) {
             // Emit the pre-execution event
             this.emit(`pre:${String(propertyKey)}`, ...args);
-            let result;
             try {
                 // Execute the original method
-                result = originalMethod.apply(this, args);
+                const executionResult = originalMethod.apply(this, args);
+                // If the method returns a Promise, handle async resolution/rejection
+                if (executionResult &&
+                    (typeof executionResult.then === 'function' ||
+                        executionResult instanceof Promise)) {
+                    const promise = executionResult
+                        .then((resolved) => {
+                        this.emit(`post:${String(propertyKey)}`, resolved, ...args);
+                        return resolved;
+                    })
+                        .catch((error) => {
+                        this.emit(`error:${String(propertyKey)}`, error);
+                        throw error;
+                    });
+                    return promise;
+                }
+                // Synchronous result
+                this.emit(`post:${String(propertyKey)}`, executionResult, ...args);
+                return executionResult;
             }
             catch (error) {
                 // Emit the error event if an exception occurs
                 this.emit(`error:${String(propertyKey)}`, error);
                 throw error;
             }
-            // Emit the post-execution event
-            this.emit(`post:${String(propertyKey)}`, result, ...args);
-            return result;
         };
     };
 }

package/dist/adapters/MongoDBAdapter.js

@@ -53,8 +53,9 @@ export class MongoDBAdapter {
     }
     async create(data) {
         const id = await this.model.getNextIncrement();
-        const result = await this.model.collection.findOneAndUpdate({ [this.fieldId]: id }, { $set: { ...data, [this.fieldId]: id } }, { upsert: true, returnDocument: 'after' });
-        return result?.value;
+        await this.model.collection.updateOne({ [this.fieldId]: id }, { $set: { ...data, [this.fieldId]: id } }, { upsert: true });
+        const result = await this.model.collection.findOne({ [this.fieldId]: id });
+        return result;
     }
     async update(id, updateData, options) {
         return this.model.collection.updateMany({ [this.fieldId]: id }, { $set: { ...updateData } }, options);

package/dist/idaeDb.js

@@ -47,6 +47,23 @@ export class IdaeDb {
         if (!IdaeDb.#instances.has(instanceKey)) {
             IdaeDb.#instances.set(instanceKey, new IdaeDb(uri, options));
         }
+        else if (options) {
+            // Merge only missing options into existing instance (do not override already set values)
+            const existing = IdaeDb.#instances.get(instanceKey);
+            const merged = { ...options };
+            // Apply keys where current value is undefined
+            for (const key of Object.keys(merged)) {
+                // @ts-expect-error index access on private field within class scope
+                if (existing.#options[key] === undefined && merged[key] !== undefined) {
+                    // @ts-expect-error index access on private field within class scope
+                    existing.#options[key] = merged[key];
+                }
+            }
+            // If dbEvents were provided, register them
+            if (merged.dbEvents) {
+                existing.registerEvents(merged.dbEvents);
+            }
+        }
         return IdaeDb.#instances.get(instanceKey);
     }
     /**
@@ -113,6 +130,7 @@ export class IdaeDb {
         if (this.#connection) {
             await this.#connection.close();
             this.#connections.delete(this.connectionKey);
+            this.#connection = undefined;
         }
     }
     /**
@@ -124,6 +142,7 @@ export class IdaeDb {
             await connection.close();
         }
         this.#connections.clear();
+        this.#connection = undefined;
     }
     /**
      * Gets the adapter class for the current database type.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medyll/idae-db",
-  "version": "0.106.0",
+  "version": "0.108.0",
   "description": "@medyll/idae-db is a flexible and powerful library for interacting with various databases, with a particular focus on MongoDB support. It offers robust connection management, an intuitive API, and simplified CRUD operations.",
   "scripts": {
     "dev": "vite dev",
@@ -11,6 +11,9 @@
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "test": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "test:mongodb": "vitest run tests/mongodb.test.ts",
+    "test:watch": "vitest --watch",
     "lint": "prettier --check . && eslint .",
     "format": "prettier --write .",
     "package:pre": "node scripts/package-pre.js"
@@ -36,10 +39,12 @@
     "@sveltejs/package": "^2.3.11",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "@types/eslint": "^9.6.1",
+    "@vitest/coverage-v8": "^3.1.1",
     "eslint": "^9.25.0",
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-svelte": "^3.5.1",
     "globals": "^16.0.0",
+    "mongodb-memory-server": "^10.1.4",
     "prettier": "^3.5.3",
     "prettier-plugin-svelte": "^3.3.3",
     "publint": "^0.3.12",
@@ -57,4 +62,4 @@
   "dependencies": {
     "chromadb": "^2.2.1"
   }
-}
+}