bigal 10.0.0-beta2 → 10.0.0-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "10.0.0-beta2",
+  "version": "10.0.0-beta3",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -58,6 +58,7 @@
     "typescript": "^4.5.4"
   },
   "scripts": {
+    "check:types": "tsc -p tsconfig.lint.json --noEmit",
     "prebuild": "rimraf dist",
     "build": "tsc",
     "test": "mocha -r ts-node/register tests/**/*.tests.ts",

package/query/WhereQuery.d.ts

@@ -1,24 +1,23 @@
 import type { Entity, NotEntityBrand } from '../Entity';
-import type { EntityPrimitiveOrId, ExcludeEntityCollections, ExcludeFunctions } from '../types';
-export declare type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, undefined> : TValue extends Entity ? {
-    id: unknown;
-}[] | Exclude<EntityPrimitiveOrId<TValue>, undefined> | Exclude<EntityPrimitiveOrId<TValue>, undefined>[] | {
-    id: unknown;
-} | null : Exclude<(TValue | null)[] | TValue, undefined> | null;
+import type { ExcludeEntityCollections, ExcludeFunctions } from '../types';
+declare type ExcludeUndefined<T> = Exclude<T, undefined>;
+export declare type LiteralValues<TValue> = (ExcludeUndefined<TValue> | null)[] | ExcludeUndefined<TValue> | null;
+export declare type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, undefined> : Extract<ExcludeUndefined<TValue>, Entity> extends Entity ? (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null : LiteralValues<TValue>;
 export declare type StringConstraint<TValue extends string> = {
-    [P in 'contains' | 'endsWith' | 'like' | 'startsWith']?: WhereClauseValue<TValue>;
+    [P in 'contains' | 'endsWith' | 'like' | 'startsWith']?: LiteralValues<TValue>;
 };
 export declare type NumberOrDateConstraint<TValue extends Date | number> = {
-    [P in '<' | '<=' | '>' | '>=']?: WhereClauseValue<TValue>;
+    [P in '<' | '<=' | '>' | '>=']?: LiteralValues<TValue>;
 };
 export declare type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
 export declare type WhereQueryStatement<TValue> = TValue extends string ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraint<TValue> | WhereClauseValue<TValue>> : NegatableConstraint<WhereClauseValue<TValue>>;
 export declare type WhereQuery<T extends Entity> = {
-    [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<U> : Exclude<(T[K] | null)[] | T[K], undefined> | WhereQueryStatement<T[K]> | {
-        '!': Exclude<(T[K] | null)[] | T[K], undefined>;
+    [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<U> : (ExcludeUndefined<T[K]> | null)[] | T[K] | WhereQueryStatement<T[K]> | {
+        '!': LiteralValues<T[K]>;
     };
 } & {
     or?: WhereQuery<T>[];
 };
+export {};

package/types/CreateUpdateParams.d.ts

@@ -1,12 +1,9 @@
 import type { Entity, NotEntityBrand } from '../Entity';
-import type { EntityPrimitiveOrId } from './EntityPrimitiveOrId';
 import type { ExcludeEntityCollections } from './ExcludeEntityCollections';
 import type { ExcludeFunctions } from './ExcludeFunctions';
 /**
  * Changes all Entity value properties to Primitive (string|number) | Pick<Entity, 'id'>
  */
 export declare type CreateUpdateParams<T extends Entity> = {
-    [K in keyof T as ExcludeEntityCollections<NonNullable<T[K]>, ExcludeFunctions<T[K], K>>]?: T[K] extends NotEntityBrand | undefined ? T[K] : T[K] extends Entity ? EntityPrimitiveOrId<T[K]> | {
-        id: unknown;
-    } : T[K];
+    [K in keyof T as ExcludeEntityCollections<NonNullable<T[K]>, ExcludeFunctions<T[K], K>>]?: T[K] extends NotEntityBrand | undefined ? T[K] : Extract<T[K], Entity> extends Entity ? Exclude<T[K], Entity> | Pick<Extract<T[K], Entity>, 'id'> : T[K];
 };

package/types/EntityPrimitiveOrId.d.ts

@@ -1,2 +1,2 @@
 import type { Entity } from '../Entity';
-export declare type EntityPrimitiveOrId<T extends Entity, TIdKey extends keyof T = 'id'> = T extends Entity ? Exclude<T, Entity> | Pick<T, TIdKey> : T;
+export declare type EntityPrimitiveOrId<T extends Entity> = Extract<NonNullable<T>, Entity> extends Entity ? Exclude<NonNullable<T>, Entity> | Pick<T, 'id'> : T;