@primate/mongodb 0.6.0 → 0.8.0

package/lib/private/MongoDB.d.ts

@@ -1,22 +1,24 @@
 import type { As, DataDict, DB, Schema, Sort, With } from "@primate/core/db";
 import type { Dict } from "@rcompat/type";
+import { MongoClient } from "mongodb";
 declare const schema: import("pema").ObjectType<import("pema").NormalizeSchemaObject<{
     readonly host: import("pema").DefaultType<import("pema").StringType, "localhost">;
-    readonly port: import("pema").DefaultType<import("pema").UintType<"u32">, 27017>;
+    readonly port: import("pema").DefaultType<import("pema").UintType<"u32", undefined>, 27017>;
     readonly database: import("pema").StringType;
     readonly username: import("pema").OptionalType<import("pema").StringType>;
     readonly password: import("pema").OptionalType<import("pema").StringType>;
-}>, {
+}>, undefined, {
     host: string;
     port: number;
     database: string;
     username: string | undefined;
     password: string | undefined;
 }>;
-export default class MongoDB implements DB {
+export default class MongoDB implements DB<MongoClient> {
     #private;
     static config: typeof schema.input;
     constructor(config?: typeof schema.input);
+    get client(): MongoClient;
     close(): Promise<void>;
     get schema(): Schema;
     create<O extends Dict>(as: As, record: Dict): Promise<O>;

package/lib/private/MongoDB.js

@@ -89,6 +89,12 @@ async function bind(as, object) {
                     case "$before":
                         next = { $lt: await bind_value(datatype, op_value) };
                         break;
+                    case "$in": {
+                        const array = op_value;
+                        const bound = await Promise.all(array.map(v => bind_value(datatype, v)));
+                        next = { $in: bound };
+                        break;
+                    }
                     default:
                         throw E.operator_unknown(field, op);
                 }
@@ -142,9 +148,15 @@ export default class MongoDB {
     #database;
     #client;
     constructor(config) {
-        const { host, port, database } = schema.parse(config);
-        const params = "directConnection=true&replicaSet=rs0";
-        const client = new MongoClient(`mongodb://${host}:${port}?${params}`);
+        const { host, port, database, username, password, } = schema.parse(config);
+        const uri = new URL(`mongodb://${host}:${port}/${database}`);
+        uri.searchParams.set("directConnection", "true");
+        if (username !== undefined) {
+            uri.username = username;
+            uri.password = password ?? "";
+            uri.searchParams.set("authSource", database);
+        }
+        const client = new MongoClient(uri.toString());
         this.#database = database;
         this.#factory = async () => {
             await client.connect();
@@ -155,8 +167,13 @@ export default class MongoDB {
         this.#client ??= await this.#factory();
         return this.#client.db(this.#database).collection(name);
     }
+    get client() {
+        return this.#client;
+    }
     async close() {
-        await this.#client?.close();
+        const client = this.#client;
+        this.#client = undefined;
+        await client?.close();
     }
     get schema() {
         return {
@@ -316,14 +333,14 @@ export default class MongoDB {
         const sort = get_sort(args.sort);
         const limit = get_limit(args.limit);
         const options = { useBigInt64: true };
-        if (projection)
+        if (is.defined(projection))
             options.projection = projection;
-        if (sort)
+        if (is.defined(sort))
             options.sort = sort;
-        const docs = await collection
-            .find(filter, options)
-            .limit(limit)
-            .toArray();
+        const cursor = collection.find(filter, options).limit(limit);
+        if (is.defined(args.offset))
+            cursor.skip(args.offset);
+        const docs = await cursor.toArray();
         return docs.map(doc => this.#unbind(as, doc));
     }
     async #read_phased(as, args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/mongodb",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "MongoDB databases for Primate",
   "homepage": "https://primate.run/docs/database/mongodb",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -17,18 +17,18 @@
     "!/**/*.spec.*"
   ],
   "dependencies": {
-    "@rcompat/assert": "^0.8.1",
-    "@rcompat/dict": "^0.5.1",
-    "@rcompat/is": "^0.6.1",
-    "mongodb": "^6.17.0",
-    "@primate/core": "^0.6.0",
-    "pema": "0.6.0"
+    "@rcompat/assert": "^0.13.0",
+    "@rcompat/dict": "^0.10.0",
+    "@rcompat/is": "^0.11.0",
+    "mongodb": "^7.2.0",
+    "@primate/core": "^0.8.0",
+    "pema": "0.8.0"
   },
   "devDependencies": {
-    "@rcompat/type": "^0.11.1"
+    "@rcompat/type": "^0.17.0"
   },
   "peerDependencies": {
-    "primate": "^0.37.0"
+    "primate": "^0.39.0"
   },
   "imports": {
     "#*": {
@@ -43,10 +43,10 @@
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc",
+    "build": "npm run clean && tsgo",
     "clean": "rm -rf ./lib",
     "lint": "eslint .",
-    "test": "npx proby",
-    "start:db": "sudo mongod --dbpath /var/lib/mongodb"
+    "test": "npm run db && npx proby",
+    "db": "scripts/db.sh"
   }
 }