@travetto/model-query 8.0.0-alpha.9 → 8.0.0

package/support/test/polymorphism.ts

@@ -1,24 +1,22 @@
 import assert from 'node:assert';
 
-import { Suite, Test } from '@travetto/test';
-import { NotFoundError, type ModelCrudSupport } from '@travetto/model';
+import { type ModelCrudSupport, NotFoundError } from '@travetto/model';
 import { castTo } from '@travetto/runtime';
+import { Suite, Test } from '@travetto/test';
 
 import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
-import { Doctor, Engineer, Worker, Firefighter } from '@travetto/model/support/test/polymorphism.ts';
+import { Doctor, Engineer, Firefighter, Worker } from '@travetto/model/support/test/polymorphism.ts';
 
 import type { ModelQueryCrudSupport } from '../../src/types/crud.ts';
-import type { ModelQuerySupport } from '../../src/types/query.ts';
 import type { ModelQueryFacetSupport } from '../../src/types/facet.ts';
+import type { ModelQuerySupport } from '../../src/types/query.ts';
 import type { ModelQuerySuggestSupport } from '../../src/types/suggest.ts';
-
+import { ModelQueryCrudUtil } from '../../src/util/crud.ts';
 import { ModelQueryFacetUtil } from '../../src/util/facet.ts';
 import { ModelQuerySuggestUtil } from '../../src/util/suggest.ts';
-import { ModelQueryCrudUtil } from '../../src/util/crud.ts';
 
 @Suite()
 export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQuerySupport & ModelCrudSupport> {
-
   @Test()
   async testQuery() {
     const svc = await this.service;
@@ -36,9 +34,9 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
     assert((await svc.query(Doctor, {})).length === 2);
     assert((await svc.query(Engineer, {})).length === 1);
 
-    assert(await svc.queryCount(Worker, { where: { name: 'bob' } }) === 1);
-    assert(await svc.queryCount(Doctor, { where: { name: 'bob' } }) === 1);
-    assert(await svc.queryCount(Engineer, { where: { name: 'bob' } }) === 0);
+    assert((await svc.queryCount(Worker, { where: { name: 'bob' } })) === 1);
+    assert((await svc.queryCount(Doctor, { where: { name: 'bob' } })) === 1);
+    assert((await svc.queryCount(Engineer, { where: { name: 'bob' } })) === 0);
 
     assert((await svc.queryOne(Worker, { where: { name: 'bob' } })) instanceof Doctor);
     await assert.rejects(() => svc.queryOne(Firefighter, { where: { name: 'bob' } }), NotFoundError);
@@ -55,7 +53,7 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
     ];
 
     await this.saveAll(Worker, [doc, doc2, fire, eng]);
-    assert(await this.getSize(Worker) === 4);
+    assert((await this.getSize(Worker)) === 4);
 
     const c = await svc.updatePartialByQuery(Doctor, { where: { specialty: 'feet' } }, { specialty: 'eyes' });
     assert(c === 1);
@@ -66,8 +64,8 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
 
     assert(removed === 1);
 
-    assert(await this.getSize(Worker) === 3);
-    assert(await this.getSize(Firefighter) === 0);
+    assert((await this.getSize(Worker)) === 3);
+    assert((await this.getSize(Firefighter)) === 0);
   }
 
   @Test({ skip: ModelQueryPolymorphismSuite.ifNot(ModelQuerySuggestUtil.isSupported) })
@@ -81,17 +79,17 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
     ];
 
     await this.saveAll(Worker, [doc, doc2, fire, eng]);
-    assert(await this.getSize(Worker) === 4);
+    assert((await this.getSize(Worker)) === 4);
 
-    assert((await svc.suggest(Worker, 'name', '')).length === 4);
-    assert((await svc.suggestValues(Worker, 'name', '')).length === 4);
-    assert((await svc.suggest(Worker, 'name', 'r')).length === 1);
-    assert((await svc.suggest(Worker, 'name', 'r'))[0] instanceof Firefighter);
-    assert((await svc.suggest(Doctor, 'name', 'r')).length === 0);
-    assert((await svc.suggest(Firefighter, 'name', 'r')).length === 1);
+    assert((await svc.suggestByQuery(Worker, 'name', '')).length === 4);
+    assert((await svc.suggestValuesByQuery(Worker, 'name', '')).length === 4);
+    assert((await svc.suggestByQuery(Worker, 'name', 'r')).length === 1);
+    assert((await svc.suggestByQuery(Worker, 'name', 'r'))[0] instanceof Firefighter);
+    assert((await svc.suggestByQuery(Doctor, 'name', 'r')).length === 0);
+    assert((await svc.suggestByQuery(Firefighter, 'name', 'r')).length === 1);
 
-    assert((await svc.suggestValues(Firefighter, 'name', 'r')).length === 1);
-    assert((await svc.suggestValues(Firefighter, 'name', 'r'))[0] === 'rob');
+    assert((await svc.suggestValuesByQuery(Firefighter, 'name', 'r')).length === 1);
+    assert((await svc.suggestValuesByQuery(Firefighter, 'name', 'r'))[0] === 'rob');
   }
 
   @Test({ skip: ModelQueryPolymorphismSuite.ifNot(ModelQueryFacetUtil.isSupported) })
@@ -105,10 +103,10 @@ export abstract class ModelQueryPolymorphismSuite extends BaseModelSuite<ModelQu
     ];
 
     await this.saveAll(Worker, [doc, doc2, fire, eng]);
-    assert(await this.getSize(Worker) === 4);
+    assert((await this.getSize(Worker)) === 4);
 
-    assert((await svc.facet(Worker, 'name')).length === 4);
-    const docFacet = await svc.facet(Doctor, 'specialty');
+    assert((await svc.facetByQuery(Worker, 'name')).length === 4);
+    const docFacet = await svc.facetByQuery(Doctor, 'specialty');
     assert.deepStrictEqual(docFacet, [{ count: 2, key: 'eyes' }]);
   }
-}
+}