@travetto/model-query 5.0.15 → 5.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "5.0.15",
+  "version": "5.0.17",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -22,16 +22,16 @@
   ],
   "main": "__index__.ts",
   "repository": {
-    "url": "https://github.com/travetto/travetto.git",
+    "url": "git+https://github.com/travetto/travetto.git",
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^5.0.14",
-    "@travetto/model": "^5.0.15",
-    "@travetto/schema": "^5.0.14"
+    "@travetto/di": "^5.0.16",
+    "@travetto/model": "^5.0.17",
+    "@travetto/schema": "^5.0.16"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.16"
+    "@travetto/test": "^5.0.18"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/verifier.ts

@@ -5,7 +5,6 @@ import { ModelQuery, Query, PageableModelQuery } from './model/query';
 
 import { TypeUtil } from './internal/util/types';
 
-
 type SimpleType = keyof typeof TypeUtil.OPERATORS;
 
 interface State {

package/support/test/crud.ts

@@ -37,7 +37,6 @@ export abstract class ModelQueryCrudSuite extends BaseModelSuite<ModelQueryCrudS
       NotFoundError
     );
 
-
     const todo2 = await svc.create(Todo, Todo.from({ text: 'bob2' }));
 
     const result = await svc.updateByQuery(Todo, Todo.from({
@@ -88,7 +87,6 @@ export abstract class ModelQueryCrudSuite extends BaseModelSuite<ModelQueryCrudS
     }
   }
 
-
   @Test()
   async testDeleteByQuery() {
     const svc = await this.service;

package/support/test/query.ts

@@ -15,6 +15,36 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
 
   supportsGeo = true;
 
+  @Test()
+  async testIds() {
+    const svc = await this.service;
+
+    const people = [1, 2, 3, 8].map(x => Person.from({
+      id: svc.idSource.create(),
+      name: 'Bob Omber',
+      age: 20 + x,
+      gender: 'm',
+      address: {
+        street1: 'a',
+        ...(x === 1 ? { street2: 'b' } : {})
+      }
+    }));
+
+    await this.saveAll(Person, people);
+
+    const one = await svc.queryOne(Person, { where: { id: people[0].id } });
+    assert(one.id === people[0].id);
+
+    const one2 = await svc.queryOne(Person, { where: { id: { $eq: people[0].id } } });
+    assert(one2.id === people[0].id);
+
+    const none = await svc.queryCount(Person, { where: { id: { $ne: people[0].id } } });
+    assert(none === 3);
+
+    const noneids = await svc.query(Person, { where: { id: { $ne: people[0].id } } });
+    assert(noneids.every(x => x.id !== people[0].id));
+  }
+
   @Test('verify word boundary')
   async testWordBoundary() {
     const service = await this.service;
@@ -38,7 +68,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     assert(results3.length === 0);
   }
 
-
   @Test('verify query one behavior')
   async testQueryOne() {
     const service = await this.service;
@@ -62,11 +91,11 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
   @Test('Verify array $in queries work properly')
   async testArrayContains() {
     const svc = await this.service;
-    await svc.create(SimpleList, SimpleList.from({
+    const first = await svc.create(SimpleList, SimpleList.from({
       names: ['a', 'b', 'c']
     }));
 
-    await svc.create(SimpleList, SimpleList.from({
+    const second = await svc.create(SimpleList, SimpleList.from({
       names: ['b', 'c', 'd']
     }));
 
@@ -105,6 +134,24 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
       }
     });
     assert(none.length === 0);
+
+    const ids = await svc.query(SimpleList, {
+      where: {
+        id: {
+          $in: [first.id, second.id]
+        }
+      }
+    });
+    assert(ids.length === 2);
+
+    const idNin = await svc.query(SimpleList, {
+      where: {
+        id: {
+          $nin: ['a', 'b']
+        }
+      }
+    });
+    assert(idNin.length === 2);
   }
 
   @Test('verify all operators')
@@ -186,7 +233,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     assert(all[0].age >= all[1].age);
   }
 
-
   @Test('Test within')
   async testWithin() {
     if (!this.supportsGeo) {
@@ -234,7 +280,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     assert(rad.length > 0);
   }
 
-
   @Test()
   async verifyNestedQuery() {
     const service = await this.service;
@@ -288,7 +333,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     });
     assert(simple === 5);
 
-
     const simple2 = await service.queryCount(Aged, {
       where: {
         createdAt: {
@@ -298,7 +342,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     });
     assert(simple2 === 6);
 
-
     const simple3 = await service.queryCount(Aged, {
       where: {
         createdAt: {