Update options (#75)

Add options to update #75

mod.ts

@@ -4,7 +4,7 @@ export * from "./ts/client.ts";
 export * from "./ts/collection.ts";
 export * from "./ts/database.ts";
 export * from "./ts/result.ts";
-export { ObjectId } from "./ts/types.ts";
+export { ObjectId, UpdateOptions } from "./ts/types.ts";
 export * from "./ts/util.ts";
 export const VERSION = "v0.8.0";
 export const RELEASE_URL =

src/command/update.rs

@@ -9,6 +9,18 @@ struct UpdateArgs {
     query: Value,
     update: Value,
     update_one: bool,
+    options: Option<UpdateOptions>,
+}
+
+#[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+struct UpdateOptions {
+    array_filters: Option<Vec<Document>>,
+    bypass_document_validation: Option<bool>,
+    upsert: Option<bool>,
+    // TODO: add collation
+    // TODO: add hint
+    // TODO: add write_concern
 }
 
 #[derive(Serialize, Debug)]
@@ -33,13 +45,26 @@ pub fn update(command: Command) -> util::AsyncJsonOp<UpdateResultArgs> {
         let database = client.database(&db_name);
         let collection = database.collection(&collection_name);
 
+        let options = if let Some(option) = args.options {
+            Some(options::UpdateOptions {
+                array_filters: option.array_filters,
+                bypass_document_validation: option.bypass_document_validation,
+                upsert: option.upsert,
+                collation: None,
+                hint: None,
+                write_concern: None,
+            })
+        } else {
+            None
+        };
+
         let result = if args.update_one {
             collection
-                .update_one(query_doc, update_doc, None)
+                .update_one(query_doc, update_doc, options)
                 .map_err(|e| e.to_string())?
         } else {
             collection
-                .update_many(query_doc, update_doc, None)
+                .update_many(query_doc, update_doc, options)
                 .map_err(|e| e.to_string())?
         };
 

src/lib.rs

@@ -7,14 +7,21 @@ extern crate bson;
 extern crate mongodb;
 extern crate serde;
 
+use bson::Document;
 use deno_core::plugin_api::{Buf, Interface, Op, ZeroCopyBuf};
 use futures::{Future, FutureExt};
-use mongodb::Client;
+use mongodb::{options, Client};
 use serde::{Deserialize, Serialize};
-use std::result::Result;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use std::{clone::Clone, collections::HashMap, pin::Pin, sync::Mutex, sync::MutexGuard};
+use std::{
+    clone::Clone,
+    collections::HashMap,
+    pin::Pin,
+    result::Result,
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Mutex, MutexGuard,
+    },
+};
 
 mod command;
 mod util;

test.ts

@@ -70,6 +70,32 @@ test("testInsertOne", async () => {
   });
 });
 
+test("testUpsertOne", async () => {
+  const db = getClient().database("test");
+  const users = db.collection<IUser>("mongo_test_users");
+  const { upsertedId } = await users.updateOne({
+    _id: ObjectId("aaaaaaaaaaaaaaaaaaaaaaaa"),
+  }, {
+    username: "user1",
+    password: "pass1",
+    date: new Date(dateNow),
+  }, { upsert: true });
+
+  assert(upsertedId);
+  assertEquals(Object.keys(upsertedId), ["$oid"]);
+
+  const user1 = await users.findOne({
+    _id: ObjectId(upsertedId.$oid),
+  });
+
+  assertEquals(user1, {
+    _id: upsertedId,
+    username: "user1",
+    password: "pass1",
+    date: new Date(dateNow),
+  });
+});
+
 test("testInsertOneTwice", async () => {
   const db = getClient().database("test");
   const users = db.collection<IUser>("mongo_test_users_2");

ts/collection.ts

@@ -1,6 +1,6 @@
 import { MongoClient } from "./client.ts";
 import { UpdateResult } from "./result.ts";
-import { CommandType, FindOptions, ObjectId } from "./types.ts";
+import { CommandType, FindOptions, ObjectId, UpdateOptions } from "./types.ts";
 import { convert, parse } from "./type_convert.ts";
 import { dispatchAsync, encode } from "./util.ts";
 
@@ -272,6 +272,7 @@ export class Collection<T extends any> {
     query: FilterType<T>,
     update: FilterType<T>,
     updateOne: boolean = false,
+    options?: UpdateOptions,
   ): Promise<UpdateResult & T & WithID> {
     const result = await dispatchAsync(
       {
@@ -285,6 +286,7 @@ export class Collection<T extends any> {
           query: convert(query),
           update: convert(update),
           updateOne,
+          options: options ?? null,
         }),
       ),
     );
@@ -294,15 +296,17 @@ export class Collection<T extends any> {
   public updateOne(
     query: FilterType<T>,
     update: FilterType<T>,
+    options?: UpdateOptions,
   ): Promise<UpdateResult & T & WithID> {
-    return this._update(query, update, true);
+    return this._update(query, update, true, options);
   }
 
   public updateMany(
     query: FilterType<T>,
     update: FilterType<T>,
+    options?: UpdateOptions,
   ) {
-    return this._update(query, update, false);
+    return this._update(query, update, false, options);
   }
 
   public async aggregate<T extends {}>(

ts/result.ts

@@ -1,5 +1,7 @@
+import { ObjectId } from "./types.ts";
+
 export interface UpdateResult {
   matchedCount: number;
   modifiedCount: number;
-  upsertedId: Object | null;
+  upsertedId: ObjectId | null;
 }

ts/types.ts

@@ -29,3 +29,9 @@ export interface FindOptions {
   skip?: number;
   limit?: number;
 }
+
+export interface UpdateOptions {
+  arrayFilters?: object[];
+  bypassDocumentValidation?: boolean;
+  upsert?: boolean;
+}