@orion-js/mongodb 3.3.20 → 3.3.22

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

@@ -1,9 +1,19 @@
 "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 getSelector_1 = __importDefault(require("./getSelector"));
+const typed_model_1 = require("@orion-js/typed-model");
 const mongoFunctionMock = function (selectorArg) {
     return (0, getSelector_1.default)(arguments);
 };
@@ -21,3 +31,16 @@ it('should return the selector when a valid mongo selector is passed', async ()
     const selector = { _id: 'hello', number: 123 };
     expect(mongoFunctionMock(selector)).toBe(selector);
 });
+it('should allow passing $in to selectors with typed id', async () => {
+    let Example = class Example {
+    };
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Example.prototype, "_id", void 0);
+    Example = __decorate([
+        (0, typed_model_1.TypedSchema)()
+    ], Example);
+    const selector1 = { _id: { $in: ['prefix_'] } };
+    const selector2 = 'prefix_1';
+});

package/lib/types/index.d.ts

@@ -49,9 +49,13 @@ export declare namespace DataLoader {
     export type LoadById<ModelClass extends ModelClassBase> = (id: ModelClass['_id']) => Promise<ModelClass>;
     export {};
 }
-export declare type MongoFilter<ModelClass extends ModelClassBase = ModelClassBase> = MongoDB.Filter<ModelClass> & {
+export declare type MongoFilter<ModelClass extends ModelClassBase = ModelClassBase> = MongoDB.Filter<ModelClass> & ({
     _id?: ModelClass['_id'];
-};
+} | {
+    _id?: {
+        $in: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.3.20",
+  "version": "3.3.22",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -24,7 +24,7 @@
     "@orion-js/resolvers": "^3.3.20",
     "@orion-js/schema": "^3.3.20",
     "@orion-js/services": "^3.3.20",
-    "@orion-js/typed-model": "^3.3.20",
+    "@orion-js/typed-model": "^3.3.21",
     "dataloader": "2.1.0",
     "dot-object": "2.1.4",
     "mongodb": "4.5.0"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc4d8447758abffb74834f58443e7489cee3a454"
+  "gitHead": "a72457b41d770b8241e4088430770d0ac0c5e28f"
 }