@travetto/model-query 5.0.14 → 5.0.16

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "5.0.14",
+  "version": "5.0.16",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -26,12 +26,12 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^5.0.13",
-    "@travetto/model": "^5.0.14",
-    "@travetto/schema": "^5.0.13"
+    "@travetto/di": "^5.0.15",
+    "@travetto/model": "^5.0.16",
+    "@travetto/schema": "^5.0.15"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.15"
+    "@travetto/test": "^5.0.17"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/internal/service/query.ts

@@ -31,8 +31,18 @@ export class ModelQueryUtil {
     if (res.length === 1 || res.length > 1 && !failOnMany) {
       return res[0]!;
     }
-    const requestedId = ((where && 'id' in where && typeof where.id === 'string') ? where.id : undefined) ?? 'unknown';
-    throw res.length === 0 ? new NotFoundError(cls, requestedId, { where }) : new AppError(`Invalid number of results for find by id: ${res.length}`, { category: 'data' });
+    const requestedId = ((where && 'id' in where && typeof where.id === 'string') ? where.id : undefined);
+    if (res.length === 0) {
+      if (requestedId) {
+        throw new NotFoundError(cls, requestedId);
+      } else {
+        const err = new NotFoundError(cls, 'unknown');
+        err.message = 'No results found for query';
+        throw err;
+      }
+    } else {
+      throw new AppError(`Invalid number of results: ${res.length}`, { category: 'data' });
+    }
   }
 
   /**

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;
@@ -54,13 +83,7 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
 
     await assert.rejects(() => service.queryOne(Person, { where: { gender: 'm' } }), /Invalid number of results/);
     await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), NotFoundError);
-    await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), /unknown/);
-    assert.deepStrictEqual(
-      (await service.queryOne(Person, { where: { gender: 'z' } }).catch(e => e)).details.where,
-      {
-        gender: 'z'
-      }
-    );
+    await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), /No results found for query/);
     await assert.rejects(() => service.queryOne(Person, { where: { id: 'orange' } }), NotFoundError);
     await assert.rejects(() => service.queryOne(Person, { where: { id: 'orange' } }), /orange/);
   }
@@ -68,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']
     }));
 
@@ -111,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')
@@ -192,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) {
@@ -240,7 +280,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     assert(rad.length > 0);
   }
 
-
   @Test()
   async verifyNestedQuery() {
     const service = await this.service;
@@ -294,7 +333,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     });
     assert(simple === 5);
 
-
     const simple2 = await service.queryCount(Aged, {
       where: {
         createdAt: {
@@ -304,7 +342,6 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     });
     assert(simple2 === 6);
 
-
     const simple3 = await service.queryCount(Aged, {
       where: {
         createdAt: {