@orion-js/mongodb 3.3.13 → 3.3.15

package/lib/createCollection/getMethods/dataLoader/loadData.js

@@ -21,8 +21,10 @@ function default_1(collection) {
             ids: options.values,
             timeout: options.timeout,
             load: async (values) => {
-                const query = (0, cloneDeep_1.default)(options.match) || {};
-                query[options.key] = { $in: values };
+                const query = {
+                    ...(0, cloneDeep_1.default)(options.match),
+                    [options.key]: { $in: values }
+                };
                 const cursor = collection.find(query);
                 if (options.sort) {
                     cursor.sort(options.sort);

package/lib/types/index.d.ts

@@ -27,11 +27,10 @@ export interface CollectionIndex {
     keys: MongoDB.IndexSpecification;
     options?: MongoDB.CreateIndexesOptions;
 }
-declare type KeyOf<T extends object> = Extract<keyof T, string>;
 export declare namespace DataLoader {
     interface LoadDataOptionsBase<ModelClass extends ModelClassBase> {
-        key: KeyOf<ModelToDocumentTypeWithId<ModelClass>>;
-        match?: MongoDB.Filter<ModelToDocumentTypeWithId<ModelClass>>;
+        key: keyof ModelClass;
+        match?: MongoFilter<ModelClass>;
         sort?: MongoDB.Sort;
         project?: MongoDB.Document;
         timeout?: number;
@@ -50,7 +49,10 @@ export declare namespace DataLoader {
     export type LoadById<ModelClass extends ModelClassBase> = (id: ModelClass['_id']) => Promise<ModelClass>;
     export {};
 }
-export declare type MongoSelector<ModelClass extends ModelClassBase = ModelClassBase> = ModelClass['_id'] | MongoDB.Filter<ModelClass>;
+export declare type MongoFilter<ModelClass extends ModelClassBase = ModelClassBase> = MongoDB.Filter<ModelClass> & {
+    _id?: ModelClass['_id'];
+};
+export declare type MongoSelector<ModelClass extends ModelClassBase = ModelClassBase> = ModelClass['_id'] | MongoFilter<ModelClass>;
 export interface FindCursor<ModelClass> extends MongoDB.FindCursor {
     toArray: () => Promise<Array<ModelClass>>;
 }

package/lib/types/types.test.js

@@ -42,14 +42,14 @@ it('uses correctly typescript for collections', async () => {
         __metadata("design:type", Object)
     ], User.prototype, "fullName", void 0);
     User = __decorate([
-        (0, typed_model_1.TypedModel)()
+        (0, typed_model_1.TypedSchema)()
     ], User);
-    const Users = (0, index_1.default)({ name: (0, helpers_1.generateId)(), model: User });
+    const Users = (0, index_1.default)({ name: (0, helpers_1.generateId)(), model: User, idPrefix: `userId-` });
     const userId = await Users.insertOne({
         firstName: 'Nico',
         lastName: 'López'
     });
-    const user1 = await Users.findOne(userId);
+    const user1 = await Users.findOne({ _id: userId });
     expect(user1.firstName).toBe('Nico');
     expect(await user1.fullName()).toBe('Nico López');
     await Users.updateOne(userId, { $set: { firstName: 'Nicolás' } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.3.13",
+  "version": "3.3.15",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -20,11 +20,11 @@
     "@orion-js/env": "^3.3.6",
     "@orion-js/helpers": "^3.3.6",
     "@orion-js/logger": "^3.3.6",
-    "@orion-js/models": "^3.3.13",
-    "@orion-js/resolvers": "^3.3.13",
-    "@orion-js/schema": "^3.3.13",
+    "@orion-js/models": "^3.3.14",
+    "@orion-js/resolvers": "^3.3.14",
+    "@orion-js/schema": "^3.3.14",
     "@orion-js/services": "^3.3.6",
-    "@orion-js/typed-model": "^3.3.13",
+    "@orion-js/typed-model": "^3.3.14",
     "dataloader": "2.1.0",
     "dot-object": "2.1.4",
     "mongodb": "4.5.0"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8b63161dd4c14fa182571eb46a7fb87a67895a07"
+  "gitHead": "e84cfa72f81b711debccaf6c174c04ce4c6d537a"
 }