@orion-js/mongodb 3.0.20 → 3.0.27

package/lib/createCollection/getMethods/index.d.ts

@@ -4,8 +4,10 @@ import upsert from './upsert';
 import findOneAndUpdate from './findOneAndUpdate';
 import updateOne from './updateOne';
 import updateMany from './updateMany';
+import updateAndFind from './updateAndFind';
 import deleteOne from './deleteOne';
 import deleteMany from './deleteMany';
 import insertOne from './insertOne';
 import insertMany from './insertMany';
-export { findOne, find, findOneAndUpdate, insertOne, insertMany, updateOne, updateMany, deleteOne, deleteMany, upsert };
+import updateItem from './updateItem';
+export { findOne, find, findOneAndUpdate, insertOne, insertMany, updateOne, updateMany, updateAndFind, updateItem, deleteOne, deleteMany, upsert };

package/lib/createCollection/getMethods/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsert = exports.deleteMany = exports.deleteOne = exports.updateMany = exports.updateOne = exports.insertMany = exports.insertOne = exports.findOneAndUpdate = exports.find = exports.findOne = void 0;
+exports.upsert = exports.deleteMany = exports.deleteOne = exports.updateItem = exports.updateAndFind = exports.updateMany = exports.updateOne = exports.insertMany = exports.insertOne = exports.findOneAndUpdate = exports.find = exports.findOne = void 0;
 const find_1 = __importDefault(require("./find"));
 exports.find = find_1.default;
 const findOne_1 = __importDefault(require("./findOne"));
@@ -16,6 +16,8 @@ const updateOne_1 = __importDefault(require("./updateOne"));
 exports.updateOne = updateOne_1.default;
 const updateMany_1 = __importDefault(require("./updateMany"));
 exports.updateMany = updateMany_1.default;
+const updateAndFind_1 = __importDefault(require("./updateAndFind"));
+exports.updateAndFind = updateAndFind_1.default;
 const deleteOne_1 = __importDefault(require("./deleteOne"));
 exports.deleteOne = deleteOne_1.default;
 const deleteMany_1 = __importDefault(require("./deleteMany"));
@@ -24,3 +26,5 @@ const insertOne_1 = __importDefault(require("./insertOne"));
 exports.insertOne = insertOne_1.default;
 const insertMany_1 = __importDefault(require("./insertMany"));
 exports.insertMany = insertMany_1.default;
+const updateItem_1 = __importDefault(require("./updateItem"));
+exports.updateItem = updateItem_1.default;

package/lib/createCollection/getMethods/updateAndFind.d.ts

@@ -0,0 +1,3 @@
+import { Collection, UpdateAndFind } from '../../types';
+declare const _default: <DocumentType>(collection: Partial<Collection>) => UpdateAndFind<DocumentType>;
+export default _default;

package/lib/createCollection/getMethods/updateAndFind.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (collection) => {
+    const updateAndFind = async function (selector, modifier, options = {}) {
+        return collection.findOneAndUpdate(selector, modifier, {
+            ...options,
+            mongoOptions: {
+                ...options.mongoOptions,
+                returnDocument: 'after'
+            }
+        });
+    };
+    return updateAndFind;
+};

package/lib/createCollection/getMethods/updateAndFind.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/createCollection/getMethods/updateAndFind.test.js

@@ -0,0 +1,38 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const helpers_1 = require("@orion-js/helpers");
+const typed_model_1 = require("@orion-js/typed-model");
+const __1 = __importDefault(require(".."));
+it('update and finds the item and doesnt replaces the variable using updateAndFind', async () => {
+    let Item = class Item {
+    };
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Item.prototype, "_id", void 0);
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Item.prototype, "text", void 0);
+    Item = __decorate([
+        (0, typed_model_1.TypedModel)()
+    ], Item);
+    const Tests = (0, __1.default)({ name: (0, helpers_1.generateId)(), model: Item });
+    await Tests.insertOne({ text: 'hello' });
+    const oldItem = await Tests.findOne();
+    const newItem = await Tests.updateAndFind(oldItem._id, { $set: { text: 'world' } });
+    expect(oldItem.text).toBe('hello');
+    expect(newItem.text).toBe('world');
+});

package/lib/createCollection/getMethods/updateItem.d.ts

@@ -0,0 +1,3 @@
+import { Collection, UpdateItem } from '../../types';
+declare const _default: <DocumentType>(collection: Partial<Collection>) => UpdateItem<DocumentType>;
+export default _default;

package/lib/createCollection/getMethods/updateItem.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (collection) => {
+    const updateItem = async function (item, modifier) {
+        const updated = await collection.updateAndFind({ _id: item._id }, modifier);
+        for (const key in item) {
+            delete item[key];
+        }
+        for (const key in updated) {
+            item[key] = updated[key];
+        }
+    };
+    return updateItem;
+};

package/lib/createCollection/getMethods/updateItem.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/createCollection/getMethods/updateItem.test.js

@@ -0,0 +1,38 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const helpers_1 = require("@orion-js/helpers");
+const typed_model_1 = require("@orion-js/typed-model");
+const __1 = __importDefault(require(".."));
+it('updates the item variable using updateItem', async () => {
+    let Item = class Item {
+    };
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Item.prototype, "_id", void 0);
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Item.prototype, "text", void 0);
+    Item = __decorate([
+        (0, typed_model_1.TypedModel)()
+    ], Item);
+    const Tests = (0, __1.default)({ name: (0, helpers_1.generateId)(), model: Item });
+    await Tests.insertOne({ text: 'hello' });
+    const item = await Tests.findOne();
+    expect(item.text).toBe('hello');
+    await Tests.updateItem(item, { $set: { text: 'world' } });
+    expect(item.text).toBe('world');
+});

package/lib/createCollection/index.js

@@ -30,7 +30,7 @@ const createCollection = (options) => {
         rawCollection,
         generateId: (0, generateId_1.default)(options),
         getSchema: () => {
-            const schema = (0, lodash_1.cloneDeep)(model.getSchema());
+            const schema = (0, lodash_1.cloneDeep)(model.getCleanSchema());
             if (!schema._id) {
                 schema._id = {
                     type: 'ID'
@@ -52,6 +52,9 @@ const createCollection = (options) => {
     collection.deleteMany = (0, getMethods_1.deleteMany)(collection);
     collection.deleteOne = (0, getMethods_1.deleteOne)(collection);
     collection.upsert = (0, getMethods_1.upsert)(collection);
+    // update and find
+    collection.updateAndFind = (0, getMethods_1.updateAndFind)(collection);
+    collection.updateItem = (0, getMethods_1.updateItem)(collection);
     // plain passed methods
     collection.aggregate = (pipeline, options) => collection.rawCollection.aggregate(pipeline, options);
     collection.watch = (pipeline, options) => collection.rawCollection.watch(pipeline, options);

package/lib/types/index.d.ts

@@ -68,6 +68,10 @@ export declare type InitItem<ModelClass> = (doc: MongoDB.Document) => ModelClass
 export declare type FindOne<ModelClass> = (selector?: ModelToMongoSelector<ModelClass>, options?: MongoDB.FindOptions) => Promise<ModelClass>;
 export declare type Find<ModelClass> = (selector?: ModelToMongoSelector<ModelClass>, options?: MongoDB.FindOptions) => FindCursor<ModelClass>;
 export declare type FindOneAndUpdate<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, modifier: ModelToUpdateFilter<ModelClass>, options?: FindOneAndUpdateUpdateOptions) => Promise<ModelClass>;
+export declare type UpdateAndFind<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, modifier: ModelToUpdateFilter<ModelClass>, options?: FindOneAndUpdateUpdateOptions) => Promise<ModelClass>;
+export declare type UpdateItem<ModelClass> = (item: {
+    _id: string;
+} & ModelClass, modifier: ModelToUpdateFilter<ModelClass>) => Promise<void>;
 export declare type InsertOne<ModelClass> = (doc: ModelToDocumentTypeWithoutId<ModelClass>, options?: InsertOptions) => Promise<string>;
 export declare type InsertMany<ModelClass> = (doc: Array<ModelToDocumentTypeWithoutId<ModelClass>>, options?: InsertOptions) => Promise<Array<string>>;
 export declare type DeleteMany<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, options?: MongoDB.DeleteOptions) => Promise<MongoDB.DeleteResult>;
@@ -104,6 +108,8 @@ export interface Collection<ModelClass = any> {
     updateMany: UpdateMany<ModelClass>;
     upsert: Upsert<ModelClass>;
     findOneAndUpdate: FindOneAndUpdate<ModelClass>;
+    updateAndFind: UpdateAndFind<ModelClass>;
+    updateItem: UpdateItem<ModelClass>;
     aggregate: <T = MongoDB.Document>(pipeline?: MongoDB.Document[], options?: MongoDB.AggregateOptions) => MongoDB.AggregationCursor<T>;
     watch: <T = MongoDB.Document>(pipeline?: MongoDB.Document[], options?: MongoDB.ChangeStreamOptions) => MongoDB.ChangeStream<T>;
     loadData: DataLoader.LoadData<ModelClass>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.0.20",
+  "version": "3.0.27",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.0.17",
-    "@orion-js/models": "^3.0.20",
-    "@orion-js/resolvers": "^3.0.17",
+    "@orion-js/models": "^3.0.27",
+    "@orion-js/resolvers": "^3.0.24",
     "@orion-js/schema": "^3.0.17",
-    "@orion-js/typed-model": "^3.0.20",
+    "@orion-js/typed-model": "^3.0.27",
     "dataloader": "2.0.0",
     "dot-object": "2.1.4",
     "mongodb": "4.1.4"
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ed37da2a1a61a9a4c0b9935d77e29d83a423e199"
+  "gitHead": "084f56bda6733955cdc640b3c8adf1731ec95af4"
 }