@travetto/model-query 2.2.3 → 3.0.0-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/model-query",
   "displayName": "Data Model Querying",
-  "version": "2.2.3",
+  "version": "3.0.0-rc.1",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -28,9 +28,9 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^2.2.3",
-    "@travetto/model": "^2.2.3",
-    "@travetto/schema": "^2.2.3"
+    "@travetto/di": "^3.0.0-rc.1",
+    "@travetto/model": "^3.0.0-rc.1",
+    "@travetto/schema": "^3.0.0-rc.1"
   },
   "docDependencies": {
     "@travetto/model-mongo": true,

package/test-support/facet.ts

@@ -3,11 +3,17 @@ import * as assert from 'assert';
 import { ModelCrudSupport } from '@travetto/model';
 import { BaseModelSuite } from '@travetto/model/test-support/base';
 import { Suite, Test } from '@travetto/test';
-import { SchemaFakerUtil } from '@travetto/schema';
 
 import { Person } from './types';
 import { ModelQueryFacetSupport } from '../src/service/facet';
 
+const pick = <T>(arr: T[]): T => arr[Math.trunc(Math.random() * arr.length)]!;
+
+const GENDERS = ['m', 'f'] as ['m', 'f'];
+const FNAME = ['Bob', 'Tom', 'Sarah', 'Leo', 'Alice', 'Jennifer', 'Tommy', 'George', 'Paula', 'Sam'];
+const LNAME = ['Smith', 'Sampson', 'Thompson', 'Oscar', 'Washington', 'Jefferson', 'Samuels'];
+const AGES = new Array(100).fill(0).map((x, i) => i + 10);
+
 @Suite()
 export abstract class ModelQueryFacetSuite extends BaseModelSuite<ModelQueryFacetSupport & ModelCrudSupport> {
 
@@ -15,7 +21,14 @@ export abstract class ModelQueryFacetSuite extends BaseModelSuite<ModelQueryFace
   async testFacet() {
     const people = ' '.repeat(50)
       .split('')
-      .map(() => SchemaFakerUtil.generate(Person));
+      .map(() => Person.from({
+        age: pick(AGES),
+        gender: pick(GENDERS),
+        name: `${pick(FNAME)} ${pick(LNAME)}`,
+        address: {
+          street1: `${pick(AGES)} ${pick(LNAME)} Road`
+        }
+      }));
 
     const svc = await this.service;
     const saved = await this.saveAll(Person, people);

package/test-support/polymorphism.ts

@@ -106,6 +106,6 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
 
     assert((await svc.facet(Worker, 'name')).length === 4);
     const docFacet = await svc.facet(Doctor, 'specialty');
-    assert(docFacet === [{ count: 2, key: 'eyes' }]);
+    assert.deepStrictEqual(docFacet, [{ count: 2, key: 'eyes' }]);
   }
 }

package/test-support/query.ts

@@ -216,12 +216,14 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
   async verifyNestedQuery() {
     const service = await this.service;
 
+    const id = service.uuid();
+
     await service.create(Note, Note.from({
-      id: '10',
+      id,
       entities: [
         {
           label: 'hi',
-          id: '10'
+          id
         }
       ]
     }));
@@ -229,7 +231,7 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     const out = await service.queryCount(Note, {
       where: {
         entities: {
-          id: '10'
+          id
         }
       }
     });
@@ -239,7 +241,7 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
     const out2 = await service.query(Note, {
       where: {
         entities: {
-          id: '10'
+          id
         }
       }
     });