@travetto/model - npm Package Compare versions

Comparing version 0.0.21 to 0.0.22

package.json

@@ -23,3 +23,3 @@ {
   }, 
-  "version": "0.0.21"
+  "version": "0.0.22"
 }

src/model/query/common.ts

@@ -9,6 +9,6 @@ export type Point = [number, number];
   (T[K] extends (Primitive | undefined) ? K :
-    (T[K] extends (...args: any[]) => any ? never :
+    (T[K] extends (Function | undefined) ? never :
       K))
 }[keyof T];
 
-export type RetainFields<T> = Pick<T, ValidFieldNames<T>>;
+export type RetainFields<T> = Pick<T, ValidFieldNames<T>>;

src/model/query/where.ts

@@ -44,3 +44,3 @@ import { RetainFields, Point } from './common';
 
-type _PropWhereClause<T> = {
+export type PropWhereClause<T> = {
   [P in keyof T]?:
@@ -53,3 +53,3 @@ (T[P] extends (number | undefined) ? ComparableFieldQuery<number> | number :
             (T[P] extends ((infer U)[] | undefined) ? ArrayFieldQuery<U> :
-              (T[P] extends (object | undefined) ? _PropWhereClause<RetainFields<T[P]>> : never)))))));
+              (T[P] extends (object | undefined) ? PropWhereClause<RetainFields<T[P]>> : never)))))));
 }
@@ -61,4 +61,4 @@
   ({ $not: _WhereClause<T>; } & { [P in keyof T]?: never }) |
-  (_PropWhereClause<T> & { $and?: never; $or?: never; $not?: never });
+  (PropWhereClause<T> & { $and?: never; $or?: never; $not?: never });
 
 export type WhereClause<T> = _WhereClause<RetainFields<T>>;

test/registry.ts

@@ -40,3 +40,3 @@ import { ModelSource, Query, BulkResponse, BulkState, QueryOptions, ModelService, ModelCore, ModelQuery, PageableModelQuery } from '../index';
   }
-  query<T extends ModelCore, U>(cls: Class<T>, builder: Query<T>): U[] {
+  query<T extends ModelCore, U>(cls: Class<T>, builder: Query<T>): Promise<U[]> {
     throw new Error('Method not implemented.');
@@ -43,0 +43,0 @@ }

test/verify.ts

 import { Suite, Test, BeforeAll } from '@travetto/test';
-import { Model, ModelQuery } from '..';
+import { Model, ModelQuery, ModelCore, WhereClause, BaseModel, PropWhereClause } from '..';
 import { Schema, SchemaRegistry } from '@travetto/schema';
@@ -7,2 +7,3 @@ import { DependencyRegistry } from '@travetto/di';
 import { RetainFields } from '../src/model/query/common';
+import { Class } from '@travetto/registry';
 
@@ -22,2 +23,7 @@ @Schema()
 
+@Model()
+class ModelUser extends BaseModel {
+
+}
+
 @Suite()
@@ -33,2 +39,22 @@ export class VerifyTest {
   @Test()
+  async verifyModelCore() {
+    const verifier = await DependencyRegistry.getInstance(QueryVerifierService);
+
+    const t2: PropWhereClause<RetainFields<ModelCore>> = {
+
+    }
+
+    const test = <T extends ModelCore>(cls: Class<T>) => {
+      const t: WhereClause<ModelCore> = {
+        id: {
+          $eq: '5'
+        },
+
+      };
+      verifier.verify(User, t);
+    }
+    test(ModelUser);
+  }
+
+  @Test()
   async verifyNested() {
@@ -35,0 +61,0 @@ const verifier = await DependencyRegistry.getInstance(QueryVerifierService);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

36761

increased by1.55%

Lines of code

918

increased by2%

No dependency changes