@orion-js/mongodb 3.2.48 → 3.2.55

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

@@ -12,4 +12,5 @@ import insertMany from './insertMany';
 import updateItem from './updateItem';
 import countDocuments from './countDocuments';
 import estimatedDocumentCount from './estimatedDocumentCount';
-export { findOne, find, findOneAndUpdate, insertOne, insertMany, updateOne, updateMany, updateAndFind, updateItem, deleteOne, deleteMany, upsert, estimatedDocumentCount, countDocuments };
+import insertAndFind from './insertAndFind';
+export { findOne, find, findOneAndUpdate, insertOne, insertMany, insertAndFind, updateOne, updateMany, updateAndFind, updateItem, deleteOne, deleteMany, upsert, estimatedDocumentCount, countDocuments };

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.countDocuments = exports.estimatedDocumentCount = 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;
+exports.countDocuments = exports.estimatedDocumentCount = exports.upsert = exports.deleteMany = exports.deleteOne = exports.updateItem = exports.updateAndFind = exports.updateMany = exports.updateOne = exports.insertAndFind = 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"));
@@ -32,3 +32,5 @@ const countDocuments_1 = __importDefault(require("./countDocuments"));
 exports.countDocuments = countDocuments_1.default;
 const estimatedDocumentCount_1 = __importDefault(require("./estimatedDocumentCount"));
 exports.estimatedDocumentCount = estimatedDocumentCount_1.default;
+const insertAndFind_1 = __importDefault(require("./insertAndFind"));
+exports.insertAndFind = insertAndFind_1.default;

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

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

package/lib/createCollection/getMethods/insertAndFind.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const fromDot_1 = __importDefault(require("../../helpers/fromDot"));
+const schema_1 = require("@orion-js/schema");
+const wrapErrors_1 = require("./wrapErrors");
+exports.default = (collection) => {
+    const insertAndFind = async (insertDoc, options) => {
+        await collection.connectionPromise;
+        let doc = insertDoc;
+        if (!doc || !(0, isPlainObject_1.default)(doc)) {
+            throw new Error('Insert must receive a document');
+        }
+        if (!doc._id) {
+            doc._id = collection.generateId();
+        }
+        if (collection.schema) {
+            const schema = collection.getSchema();
+            doc = await (0, schema_1.clean)(schema, (0, fromDot_1.default)(doc));
+            await (0, schema_1.validate)(schema, doc);
+        }
+        await (0, wrapErrors_1.wrapErrors)(async () => {
+            await collection.rawCollection.insertOne(doc);
+        });
+        return doc;
+    };
+    return insertAndFind;
+};

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

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

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

@@ -0,0 +1,50 @@
+"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 insertOne_1 = __importDefault(require("./insertOne"));
+const helpers_1 = require("@orion-js/helpers");
+const __1 = __importDefault(require(".."));
+const typed_model_1 = require("@orion-js/typed-model");
+describe('insertAndFind', () => {
+    it('should return a function', async () => {
+        const Tests = (0, __1.default)({ name: (0, helpers_1.generateId)() });
+        const insertOne = (0, insertOne_1.default)(Tests);
+        expect(typeof insertOne).toBe('function');
+    });
+    it('inserts and finds a cleaned document', async () => {
+        let TestSchema1 = class TestSchema1 {
+        };
+        __decorate([
+            (0, typed_model_1.Prop)(),
+            __metadata("design:type", String)
+        ], TestSchema1.prototype, "_id", void 0);
+        __decorate([
+            (0, typed_model_1.Prop)({
+                clean: string => `cleaned ${string}`
+            }),
+            __metadata("design:type", String)
+        ], TestSchema1.prototype, "hello", void 0);
+        TestSchema1 = __decorate([
+            (0, typed_model_1.TypedSchema)()
+        ], TestSchema1);
+        const Tests = (0, __1.default)({ name: (0, helpers_1.generateId)(), schema: TestSchema1 });
+        const result = await Tests.insertAndFind({ hello: 'world' });
+        const count = await Tests.estimatedDocumentCount();
+        expect(count).toBe(1);
+        expect(result).toEqual({
+            _id: result._id,
+            hello: 'cleaned world'
+        });
+    });
+});

package/lib/createCollection/index.js

@@ -42,6 +42,7 @@ const createCollection = (options) => {
     collection.findOneAndUpdate = (0, getMethods_1.findOneAndUpdate)(collection);
     collection.insertOne = (0, getMethods_1.insertOne)(collection);
     collection.insertMany = (0, getMethods_1.insertMany)(collection);
+    collection.insertAndFind = (0, getMethods_1.insertAndFind)(collection);
     collection.updateOne = (0, getMethods_1.updateOne)(collection);
     collection.updateMany = (0, getMethods_1.updateMany)(collection);
     collection.deleteMany = (0, getMethods_1.deleteMany)(collection);

package/lib/types/index.d.ts

@@ -81,6 +81,7 @@ export declare type UpdateItem<ModelClass> = (item: {
 } & ModelClass, modifier: ModelToUpdateFilter<ModelClass>) => Promise<void>;
 export declare type InsertOne<ModelClass> = (doc: ModelToDocumentTypeWithIdOptional<ModelClass>, options?: InsertOptions) => Promise<string>;
 export declare type InsertMany<ModelClass> = (doc: Array<ModelToDocumentTypeWithIdOptional<ModelClass>>, options?: InsertOptions) => Promise<Array<string>>;
+export declare type InsertAndFind<ModelClass> = (doc: ModelToDocumentTypeWithIdOptional<ModelClass>, options?: InsertOptions) => Promise<ModelClass>;
 export declare type DeleteMany<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, options?: MongoDB.DeleteOptions) => Promise<MongoDB.DeleteResult>;
 export declare type DeleteOne<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, options?: MongoDB.DeleteOptions) => Promise<MongoDB.DeleteResult>;
 export declare type UpdateOne<ModelClass> = (selector: ModelToMongoSelector<ModelClass>, modifier: ModelToUpdateFilter<ModelClass>, options?: UpdateOptions) => Promise<MongoDB.UpdateResult>;
@@ -136,6 +137,7 @@ export interface Collection<ModelClass = any> {
     find: Find<ModelClass>;
     insertOne: InsertOne<ModelClass>;
     insertMany: InsertMany<ModelClass>;
+    insertAndFind: InsertAndFind<ModelClass>;
     deleteMany: DeleteMany<ModelClass>;
     deleteOne: DeleteOne<ModelClass>;
     updateOne: UpdateOne<ModelClass>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.2.48",
+  "version": "3.2.55",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -20,11 +20,11 @@
     "@orion-js/env": "^3.2.40",
     "@orion-js/helpers": "^3.2.48",
     "@orion-js/logger": "^3.2.40",
-    "@orion-js/models": "^3.2.48",
-    "@orion-js/resolvers": "^3.2.48",
-    "@orion-js/schema": "^3.2.40",
+    "@orion-js/models": "^3.2.53",
+    "@orion-js/resolvers": "^3.2.53",
+    "@orion-js/schema": "^3.2.53",
     "@orion-js/services": "^3.2.48",
-    "@orion-js/typed-model": "^3.2.48",
+    "@orion-js/typed-model": "^3.2.53",
     "dataloader": "2.1.0",
     "dot-object": "2.1.4",
     "mongodb": "4.5.0"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff49b7ffd93c1a72e66c2ed93fdb056360e85e96"
+  "gitHead": "ce5164ec1e1f513042436572b0fbf0d4df0fd224"
 }