bigal 10.4.0-beta1 → 10.4.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 10.4.1 - 2022-12-06
+
+- Update npms
+
 ## 10.4.0 - 2022-11-03
 
 - Fix string comparison where constraint with union values

package/Entity.d.ts

@@ -1,5 +1,5 @@
 import type { CreateUpdateParams } from './types';
-export declare type EntityFieldValue = boolean[] | Date | number[] | Record<string, unknown> | string[] | boolean | number | string | unknown | null;
+export type EntityFieldValue = boolean[] | Date | number[] | Record<string, unknown> | string[] | boolean | number | string | unknown | null;
 export declare abstract class Entity {
     abstract id: unknown;
     static beforeCreate(values: CreateUpdateParams<Entity>): CreateUpdateParams<Entity> | Promise<CreateUpdateParams<Entity>>;
@@ -8,7 +8,7 @@ export declare abstract class Entity {
 export interface NotEntityBrand {
     _notEntityBrand: void;
 }
-export declare type NotEntity<T> = NotEntityBrand & T;
+export type NotEntity<T> = NotEntityBrand & T;
 export interface EntityStatic<T extends Entity> {
     beforeCreate?: (values: CreateUpdateParams<any>) => CreateUpdateParams<any> | Promise<CreateUpdateParams<any>>;
     beforeUpdate?: (values: CreateUpdateParams<any>) => CreateUpdateParams<any> | Promise<CreateUpdateParams<any>>;

package/decorators/column.d.ts

@@ -1,8 +1,8 @@
 import type { ColumnCollectionOptions } from './ColumnCollectionOptions';
 import type { ColumnModelOptions } from './ColumnModelOptions';
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ColumnOptions = ColumnCollectionOptions | ColumnModelOptions | ColumnTypeOptions;
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ColumnOptions = ColumnCollectionOptions | ColumnModelOptions | ColumnTypeOptions;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function column(options?: ColumnOptions): ReturnFunctionType;
 export declare function column(dbColumnName: string, options?: ColumnOptions): ReturnFunctionType;
 export {};

package/decorators/createDateColumn.d.ts

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function createDateColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function createDateColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/decorators/primaryColumn.d.ts

@@ -1,7 +1,7 @@
 import type { ColumnModelOptions } from './ColumnModelOptions';
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ColumnOptions = ColumnModelOptions | ColumnTypeOptions;
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ColumnOptions = ColumnModelOptions | ColumnTypeOptions;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function primaryColumn(options?: ColumnOptions): ReturnFunctionType;
 export declare function primaryColumn(dbColumnName: string, options?: ColumnOptions): ReturnFunctionType;
 export {};

package/decorators/table.d.ts

@@ -1,5 +1,5 @@
 import type { TableOptions } from './TableOptions';
-declare type ReturnFunctionType = (object: any) => void;
+type ReturnFunctionType = (object: any) => void;
 export declare function table(options?: TableOptions): ReturnFunctionType;
 export declare function table(dbName: string, options: TableOptions): ReturnFunctionType;
 export {};

package/decorators/updateDateColumn.d.ts

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function updateDateColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function updateDateColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/decorators/versionColumn.d.ts

@@ -1,5 +1,5 @@
 import type { ColumnTypeOptions } from './ColumnTypeOptions';
-declare type ReturnFunctionType = (object: object, propertyName: string) => void;
+type ReturnFunctionType = (object: object, propertyName: string) => void;
 export declare function versionColumn(options?: ColumnTypeOptions): ReturnFunctionType;
 export declare function versionColumn(dbColumnName: string, options?: ColumnTypeOptions): ReturnFunctionType;
 export {};

package/metadata/ColumnCollectionMetadata.js

@@ -3,6 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnCollectionMetadata = void 0;
 const ColumnBaseMetadata_1 = require("./ColumnBaseMetadata");
 class ColumnCollectionMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
+    /**
+     * Type of the items in the collection
+     */
+    get collection() {
+        if (this._collectionString) {
+            return this._collectionString;
+        }
+        if (!this._collectionFn) {
+            throw new Error(`Unable to determine collection type for ${this.target}#${this.propertyName}`);
+        }
+        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
+        this._collectionString = this._collectionFn();
+        return this._collectionString;
+    }
+    /**
+     * Name of the junction table for multi-multi associations
+     */
+    get through() {
+        if (this._throughString) {
+            return this._throughString;
+        }
+        if (this._throughFn) {
+            this._throughString = this._throughFn();
+            return this._throughString;
+        }
+        return undefined;
+    }
     constructor({ target, //
     name, propertyName, required, insert, update, primary, createDate, updateDate, version, collection, via, through, }) {
         super({
@@ -31,33 +58,6 @@ class ColumnCollectionMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
             this._throughFn = through;
         }
     }
-    /**
-     * Type of the items in the collection
-     */
-    get collection() {
-        if (this._collectionString) {
-            return this._collectionString;
-        }
-        if (!this._collectionFn) {
-            throw new Error(`Unable to determine collection type for ${this.target}#${this.propertyName}`);
-        }
-        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
-        this._collectionString = this._collectionFn();
-        return this._collectionString;
-    }
-    /**
-     * Name of the junction table for multi-multi associations
-     */
-    get through() {
-        if (this._throughString) {
-            return this._throughString;
-        }
-        if (this._throughFn) {
-            this._throughString = this._throughFn();
-            return this._throughString;
-        }
-        return undefined;
-    }
 }
 exports.ColumnCollectionMetadata = ColumnCollectionMetadata;
 //# sourceMappingURL=ColumnCollectionMetadata.js.map

package/metadata/ColumnCollectionMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnCollectionMetadata.js","sourceRoot":"./","sources":["metadata/ColumnCollectionMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAiB1D,MAAa,wBAAyB,SAAQ,uCAAkB;IA+C9D,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,OAAO,GACyB;QAChC,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;SACrC;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;SACjC;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;SAC/B;aAAM,IAAI,OAAO,EAAE;YAClB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;SAC3B;IACH,CAAC;IA/ED;;OAEG;IACH,IAAW,UAAU;QACnB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAChG;QAED,8EAA8E;QAC9E,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAOD;;OAEG;IACH,IAAW,OAAO;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CA4CF;AAzFD,4DAyFC"}
+{"version":3,"file":"ColumnCollectionMetadata.js","sourceRoot":"./","sources":["metadata/ColumnCollectionMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAiB1D,MAAa,wBAAyB,SAAQ,uCAAkB;IAS9D;;OAEG;IACH,IAAW,UAAU;QACnB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;SAC/B;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAChG;QAED,8EAA8E;QAC9E,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAOD;;OAEG;IACH,IAAW,OAAO;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC;SAC5B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,GAAG,EACH,OAAO,GACyB;QAChC,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;SACrC;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;SACjC;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;SAC/B;aAAM,IAAI,OAAO,EAAE;YAClB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;SAC3B;IACH,CAAC;CACF;AAzFD,4DAyFC"}

package/metadata/ColumnMetadata.d.ts

@@ -1,4 +1,4 @@
 import type { ColumnCollectionMetadata } from './ColumnCollectionMetadata';
 import type { ColumnModelMetadata } from './ColumnModelMetadata';
 import type { ColumnTypeMetadata } from './ColumnTypeMetadata';
-export declare type ColumnMetadata = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
+export type ColumnMetadata = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;

package/metadata/ColumnModelMetadata.js

@@ -3,6 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnModelMetadata = void 0;
 const ColumnBaseMetadata_1 = require("./ColumnBaseMetadata");
 class ColumnModelMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
+    /**
+     * Name of the model represented by this column id
+     */
+    get model() {
+        if (this._modelString) {
+            return this._modelString;
+        }
+        if (!this._modelFn) {
+            throw new Error(`Unable to determine model type for ${this.target}#${this.propertyName}`);
+        }
+        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
+        this._modelString = this._modelFn();
+        return this._modelString;
+    }
     constructor({ target, //
     name, propertyName, required, insert, update, primary, createDate, updateDate, version, model, }) {
         super({
@@ -24,20 +38,6 @@ class ColumnModelMetadata extends ColumnBaseMetadata_1.ColumnBaseMetadata {
             this._modelFn = model;
         }
     }
-    /**
-     * Name of the model represented by this column id
-     */
-    get model() {
-        if (this._modelString) {
-            return this._modelString;
-        }
-        if (!this._modelFn) {
-            throw new Error(`Unable to determine model type for ${this.target}#${this.propertyName}`);
-        }
-        // Need to defer evaluation until runtime to avoid cyclical dependency issues.
-        this._modelString = this._modelFn();
-        return this._modelString;
-    }
 }
 exports.ColumnModelMetadata = ColumnModelMetadata;
 //# sourceMappingURL=ColumnModelMetadata.js.map

package/metadata/ColumnModelMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnModelMetadata.js","sourceRoot":"./","sources":["metadata/ColumnModelMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAS1D,MAAa,mBAAoB,SAAQ,uCAAkB;IAsBzD,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,KAAK,GACsB;QAC3B,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACvB;IACH,CAAC;IAhDD;;OAEG;IACH,IAAW,KAAK;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3F;QAED,8EAA8E;QAC9E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CAkCF;AAtDD,kDAsDC"}
+{"version":3,"file":"ColumnModelMetadata.js","sourceRoot":"./","sources":["metadata/ColumnModelMetadata.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAS1D,MAAa,mBAAoB,SAAQ,uCAAkB;IAKzD;;OAEG;IACH,IAAW,KAAK;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3F;QAED,8EAA8E;QAC9E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,YAAmB,EACjB,MAAM,EAAE,EAAE;IACV,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,KAAK,GACsB;QAC3B,KAAK,CAAC;YACJ,MAAM;YACN,IAAI;YACJ,YAAY;YACZ,QAAQ;YACR,MAAM;YACN,MAAM;YACN,OAAO;YACP,UAAU;YACV,UAAU;YACV,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACvB;IACH,CAAC;CACF;AAtDD,kDAsDC"}

package/metadata/ModelMetadata.d.ts

@@ -2,8 +2,8 @@ import type { Entity, EntityStatic } from '../Entity';
 import type { ColumnCollectionMetadata } from './ColumnCollectionMetadata';
 import type { ColumnModelMetadata } from './ColumnModelMetadata';
 import type { ColumnTypeMetadata } from './ColumnTypeMetadata';
-declare type Column = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
-declare type ColumnByStringId = Record<string, Column>;
+type Column = ColumnCollectionMetadata | ColumnModelMetadata | ColumnTypeMetadata;
+type ColumnByStringId = Record<string, Column>;
 export interface ModelMetadataOptions<T extends Entity> {
     name: string;
     type: EntityStatic<T>;

package/metadata/ModelMetadata.js

@@ -26,20 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelMetadata = void 0;
 const _ = __importStar(require("lodash"));
 class ModelMetadata {
-    constructor({ name, //
-    type, connection, tableName, readonly = false, }) {
-        this._columns = [];
-        this._createDateColumns = [];
-        this._updateDateColumns = [];
-        this._versionDateColumns = [];
-        this.columnsByColumnName = {};
-        this.columnsByPropertyName = {};
-        this.name = name;
-        this.type = type;
-        this.connection = connection;
-        this.tableName = tableName || _.snakeCase(name);
-        this.readonly = readonly;
-    }
     set columns(columns) {
         this._columns = columns;
         this.columnsByColumnName = {};
@@ -76,6 +62,20 @@ class ModelMetadata {
     get versionColumns() {
         return this._versionDateColumns;
     }
+    constructor({ name, //
+    type, connection, tableName, readonly = false, }) {
+        this._columns = [];
+        this._createDateColumns = [];
+        this._updateDateColumns = [];
+        this._versionDateColumns = [];
+        this.columnsByColumnName = {};
+        this.columnsByPropertyName = {};
+        this.name = name;
+        this.type = type;
+        this.connection = connection;
+        this.tableName = tableName || _.snakeCase(name);
+        this.readonly = readonly;
+    }
 }
 exports.ModelMetadata = ModelMetadata;
 //# sourceMappingURL=ModelMetadata.js.map

package/metadata/ModelMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelMetadata.js","sourceRoot":"./","sources":["metadata/ModelMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAmB5B,MAAa,aAAa;IAwExB,YAAmB,EACjB,IAAI,EAAE,EAAE;IACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GAAG,KAAK,GACQ;QA7ElB,aAAQ,GAAsB,EAAE,CAAC;QAIjC,uBAAkB,GAAa,EAAE,CAAC;QAElC,uBAAkB,GAAa,EAAE,CAAC;QAElC,wBAAmB,GAAa,EAAE,CAAC;QA2DpC,wBAAmB,GAAqB,EAAE,CAAC;QAE3C,0BAAqB,GAAqB,EAAE,CAAC;QASlD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAzED,IAAW,OAAO,CAAC,OAA0B;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YAC/C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEzD,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;CA6BF;AArFD,sCAqFC"}
+{"version":3,"file":"ModelMetadata.js","sourceRoot":"./","sources":["metadata/ModelMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAmB5B,MAAa,aAAa;IAWxB,IAAW,OAAO,CAAC,OAA0B;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YAC/C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEzD,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAgBD,YAAmB,EACjB,IAAI,EAAE,EAAE;IACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,GAAG,KAAK,GACQ;QA7ElB,aAAQ,GAAsB,EAAE,CAAC;QAIjC,uBAAkB,GAAa,EAAE,CAAC;QAElC,uBAAkB,GAAa,EAAE,CAAC;QAElC,wBAAmB,GAAa,EAAE,CAAC;QA2DpC,wBAAmB,GAAqB,EAAE,CAAC;QAE3C,0BAAqB,GAAqB,EAAE,CAAC;QASlD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AArFD,sCAqFC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "10.4.0-beta1",
+  "version": "10.4.1",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,42 +19,42 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.187",
+    "@types/lodash": "^4.14.191",
     "@types/node": ">=14",
     "@types/pg": "^8.6.5",
     "lodash": "^4.17.21",
     "pg": "^8.8.0",
-    "postgres-pool": "^6.0.6"
+    "postgres-pool": "^6.0.7"
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "chai": "^4.3.6",
-    "eslint": "^8.26.0",
+    "@types/chai": "^4.3.4",
+    "@types/mocha": "10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.45.1",
+    "@typescript-eslint/parser": "^5.45.1",
+    "chai": "^4.3.7",
+    "eslint": "^8.29.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.6.2",
+    "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-mocha": "10.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-security": "^1.5.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "husky": "^8.0.2",
+    "lint-staged": "^13.1.0",
     "markdownlint-cli": "^0.32.2",
     "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "rimraf": "^3.0.2",
     "strict-event-emitter-types": "^2.0.0",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   },
   "scripts": {
     "check:types": "tsc -p tsconfig.lint.json --noEmit",

package/query/Comparer.d.ts

@@ -1 +1 @@
-export declare type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';
+export type Comparer = '!' | '<' | '<=' | '>' | '>=' | 'contains' | 'endsWith' | 'like' | 'or' | 'startsWith';

package/query/CreateOptions.d.ts

@@ -3,7 +3,7 @@ import type { OmitEntityCollections, OmitFunctions } from '../types';
 import type { DoNotReturnRecords } from './DoNotReturnRecords';
 import type { OnConflictOptions } from './OnConflictOptions';
 import type { ReturnSelect } from './ReturnSelect';
-declare type CreateOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictOptions<T, K> & Partial<DoNotReturnRecords | ReturnSelect<T>>;
-declare type CreateOptionalOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = Partial<OnConflictOptions<T, K>> & (DoNotReturnRecords | ReturnSelect<T>);
-export declare type CreateOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = CreateOnConflictOptions<T, K> | CreateOptionalOnConflictOptions<T, K>;
+type CreateOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictOptions<T, K> & Partial<DoNotReturnRecords | ReturnSelect<T>>;
+type CreateOptionalOnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = Partial<OnConflictOptions<T, K>> & (DoNotReturnRecords | ReturnSelect<T>);
+export type CreateOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = CreateOnConflictOptions<T, K> | CreateOptionalOnConflictOptions<T, K>;
 export {};

package/query/CreateUpdateOptions.d.ts

@@ -1,4 +1,4 @@
 import type { Entity } from '../Entity';
 import type { DoNotReturnRecords } from './DoNotReturnRecords';
 import type { ReturnSelect } from './ReturnSelect';
-export declare type CreateUpdateOptions<T extends Entity> = DoNotReturnRecords | ReturnSelect<T>;
+export type CreateUpdateOptions<T extends Entity> = DoNotReturnRecords | ReturnSelect<T>;

package/query/DeleteOptions.d.ts

@@ -8,5 +8,5 @@ interface ReturnRecords<T extends Entity, K extends keyof T> {
     returnRecords: true;
     returnSelect?: (K & string & keyof OmitFunctions<OmitEntityCollections<T>>)[];
 }
-export declare type DeleteOptions<T extends Entity, K extends keyof T = keyof T> = ReturnRecords<T, K> | ReturnSelect<T, K>;
+export type DeleteOptions<T extends Entity, K extends keyof T = keyof T> = ReturnRecords<T, K> | ReturnSelect<T, K>;
 export {};

package/query/OnConflictOptions.d.ts

@@ -1,7 +1,7 @@
 import type { Entity } from '../Entity';
 import type { OmitEntityCollections, OmitFunctions } from '../types';
 import type { WhereQuery } from './WhereQuery';
-declare type OnConflictTargets<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = K[] | {
+type OnConflictTargets<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = K[] | {
     columns: K[];
     where: WhereQuery<T>;
 };
@@ -21,5 +21,5 @@ export interface OnConflictMergeOptions<T extends Entity, K extends string & key
         };
     };
 }
-export declare type OnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictIgnoreOptions<T, K> | OnConflictMergeOptions<T, K>;
+export type OnConflictOptions<T extends Entity, K extends string & keyof OmitFunctions<OmitEntityCollections<T>> = string & keyof OmitFunctions<OmitEntityCollections<T>>> = OnConflictIgnoreOptions<T, K> | OnConflictMergeOptions<T, K>;
 export {};

package/query/Sort.d.ts

@@ -1,13 +1,13 @@
 import type { Entity } from '../Entity';
 import type { ExcludeFunctions, OmitEntityCollections, OmitFunctions } from '../types';
-export declare type SortString<T extends Entity> = `${string & keyof OmitFunctions<OmitEntityCollections<T>>} ASC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} asc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} DESC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} desc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>}`;
-declare type ValidateMultipleSorts<T extends Entity, TNextSortPart extends string, TPreviouslyValidatedSortString extends string, TSortString extends string> = TNextSortPart extends `, ${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TNextSortPart extends `${infer TValidatedSortPart}${TRestSortPart}` ? `${TPreviouslyValidatedSortString}${TValidatedSortPart}` : never, TSortString> : `${TPreviouslyValidatedSortString}, ${SortString<T>}`;
-export declare type MultipleSortString<T extends Entity, TSortString extends string = string> = TSortString extends `${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TSortString extends `${infer TPreviouslyValidatedSortString}${TRestSortPart}` ? TPreviouslyValidatedSortString : never, TSortString> : SortString<T>;
-export declare type SortObjectValue = -1 | 'asc' | 'desc' | 1;
-export declare type SortObject<T extends Entity> = {
+export type SortString<T extends Entity> = `${string & keyof OmitFunctions<OmitEntityCollections<T>>} ASC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} asc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} DESC` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>} desc` | `${string & keyof OmitFunctions<OmitEntityCollections<T>>}`;
+type ValidateMultipleSorts<T extends Entity, TNextSortPart extends string, TPreviouslyValidatedSortString extends string, TSortString extends string> = TNextSortPart extends `, ${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TNextSortPart extends `${infer TValidatedSortPart}${TRestSortPart}` ? `${TPreviouslyValidatedSortString}${TValidatedSortPart}` : never, TSortString> : `${TPreviouslyValidatedSortString}, ${SortString<T>}`;
+export type MultipleSortString<T extends Entity, TSortString extends string = string> = TSortString extends `${SortString<T>}${infer TRestSortPart}` ? TRestSortPart extends '' ? TSortString : ValidateMultipleSorts<T, TRestSortPart, TSortString extends `${infer TPreviouslyValidatedSortString}${TRestSortPart}` ? TPreviouslyValidatedSortString : never, TSortString> : SortString<T>;
+export type SortObjectValue = -1 | 'asc' | 'desc' | 1;
+export type SortObject<T extends Entity> = {
     [K in keyof T as ExcludeFunctions<OmitEntityCollections<T>, K>]?: SortObjectValue;
 };
-export declare type Sort<T extends Entity> = MultipleSortString<T> | SortObject<T>;
+export type Sort<T extends Entity> = MultipleSortString<T> | SortObject<T>;
 export interface OrderBy<T extends Entity> {
     propertyName: string & keyof OmitFunctions<OmitEntityCollections<T>>;
     descending?: boolean;

package/query/WhereQuery.d.ts

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

package/types/CreateUpdateParams.d.ts

@@ -4,6 +4,6 @@ import type { ExcludeFunctions } from './ExcludeFunctions';
 /**
  * Changes all Entity value properties to Primitive (string|number) | Pick<Entity, 'id'>
  */
-export declare type CreateUpdateParams<T extends Entity> = {
+export 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] : Extract<T[K], Entity> extends undefined ? T[K] : Exclude<T[K], Entity> | Pick<Extract<T[K], Entity>, 'id'>;
 };

package/types/EntityPrimitiveOrId.d.ts

@@ -1,2 +1,2 @@
 import type { Entity } from '../Entity';
-export declare type EntityPrimitiveOrId<T> = T extends [] ? T extends (infer U)[] ? EntityPrimitiveOrId<U>[] : T : Extract<NonNullable<T>, Entity> extends undefined ? T : Exclude<NonNullable<T>, Entity> | Pick<Extract<NonNullable<T>, Entity>, 'id'>;
+export type EntityPrimitiveOrId<T> = T extends [] ? T extends (infer U)[] ? EntityPrimitiveOrId<U>[] : T : Extract<NonNullable<T>, Entity> extends undefined ? T : Exclude<NonNullable<T>, Entity> | Pick<Extract<NonNullable<T>, Entity>, 'id'>;

package/types/ExcludeEntityCollections.d.ts

@@ -2,4 +2,4 @@ import type { Entity, NotEntityBrand } from '../Entity';
 /**
  * Removes all entity collection properties. To be used as a re-map key function
  */
-export declare type ExcludeEntityCollections<T, K extends PropertyKey> = T extends NotEntityBrand[] | undefined ? K : T extends Entity[] | undefined ? never : K;
+export type ExcludeEntityCollections<T, K extends PropertyKey> = T extends NotEntityBrand[] | undefined ? K : T extends Entity[] | undefined ? never : K;

package/types/ExcludeFunctions.d.ts

@@ -1,4 +1,4 @@
 /**
  * Removes all functions and entity collection properties. To be used as a re-map key function
  */
-export declare type ExcludeFunctions<T, K extends PropertyKey> = T extends Function ? never : K;
+export type ExcludeFunctions<T, K extends PropertyKey> = T extends Function ? never : K;

package/types/GetValueType.d.ts

@@ -1 +1 @@
-export declare type GetValueType<T, TValueType> = T extends TValueType[] ? T extends (infer U)[] ? Extract<U, TValueType> : never : T extends TValueType ? T : never;
+export type GetValueType<T, TValueType> = T extends TValueType[] ? T extends (infer U)[] ? Extract<U, TValueType> : never : T extends TValueType ? T : never;

package/types/IncludeFunctions.d.ts

@@ -1,4 +1,4 @@
 /**
  * Returns the key name if the property type is a function
  */
-export declare type IncludeFunctions<T, K extends PropertyKey> = T extends Function ? K : never;
+export type IncludeFunctions<T, K extends PropertyKey> = T extends Function ? K : never;

package/types/IsValueOfType.d.ts

@@ -1 +1 @@
-export declare type IsValueOfType<T, K extends PropertyKey, TValueType> = T extends TValueType | TValueType[] | undefined ? K : never;
+export type IsValueOfType<T, K extends PropertyKey, TValueType> = T extends TValueType | TValueType[] | undefined ? K : never;

package/types/OmitEntityCollections.d.ts

@@ -2,6 +2,6 @@ import type { ExcludeEntityCollections } from './ExcludeEntityCollections';
 /**
  * Removes all entity collection properties
  */
-export declare type OmitEntityCollections<T> = {
+export type OmitEntityCollections<T> = {
     [K in keyof T as ExcludeEntityCollections<T[K], K>]: T[K];
 };

package/types/OmitFunctions.d.ts

@@ -2,6 +2,6 @@ import type { ExcludeFunctions } from './ExcludeFunctions';
 /**
  * Removes all functions
  */
-export declare type OmitFunctions<T> = {
+export type OmitFunctions<T> = {
     [K in keyof T as ExcludeFunctions<T[K], K>]: T[K];
 };

package/types/PickAsType.d.ts

@@ -1,3 +1,3 @@
-export declare type PickAsType<T, K extends keyof T, TValue> = {
+export type PickAsType<T, K extends keyof T, TValue> = {
     [P in K]: Extract<T[P], TValue>;
 };

package/types/PickByValueType.d.ts

@@ -1,5 +1,5 @@
 import type { GetValueType } from './GetValueType';
 import type { IsValueOfType } from './IsValueOfType';
-export declare type PickByValueType<T, TValueType> = {
+export type PickByValueType<T, TValueType> = {
     [K in keyof T as IsValueOfType<T[K], K, TValueType>]: GetValueType<T[K], TValueType>;
 };

package/types/PickFunctions.d.ts

@@ -1,4 +1,4 @@
 import type { IncludeFunctions } from './IncludeFunctions';
-export declare type PickFunctions<T> = {
+export type PickFunctions<T> = {
     [K in keyof T as IncludeFunctions<T[K], K>]: T[K];
 };

package/types/Populated.d.ts

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Removes primitives from specified properties and make non-optional. Allow singular Entity properties to be null.
  */
-export declare type Populated<T extends Entity, K extends keyof T, TPropertyType extends Entity, TPropertyKeys extends keyof TPropertyType> = {
+export type Populated<T extends Entity, K extends keyof T, TPropertyType extends Entity, TPropertyKeys extends keyof TPropertyType> = {
     [P in K]-?: Extract<T[P], Entity | Entity[]> extends Entity ? undefined extends T[P] ? QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>> | null : QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>> : QueryResult<Pick<TPropertyType, TPropertyKeys | keyof PickFunctions<TPropertyType> | 'id'>>[];
 };

package/types/QueryResult.d.ts

@@ -4,6 +4,6 @@ import type { ExcludeEntityCollections } from './ExcludeEntityCollections';
  * Changes all properties with Entity values to Primitive (string|number). Removes any properties that with values
  * of Entity arrays
  */
-export declare type QueryResult<T extends Entity> = Extract<{
+export type QueryResult<T extends Entity> = Extract<{
     [K in keyof T as ExcludeEntityCollections<NonNullable<T[K]>, K>]: T[K] extends NotEntityBrand | undefined ? T[K] : Exclude<T[K], Entity>;
 }, T>;

package/types/QueryResultOptionalPopulated.d.ts

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Allows a QueryResult type with specific properties optionally populated. If the property is populated, only the id property is needed
  */
-export declare type QueryResultOptionalPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
+export type QueryResultOptionalPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
     [P in K]-?: T[P] extends [] ? undefined extends T[P] ? EntityPrimitiveOrId<T[P]> | null : EntityPrimitiveOrId<T[P]> : EntityPrimitiveOrId<T[P]>;
 };

package/types/QueryResultPopulated.d.ts

@@ -4,6 +4,6 @@ import type { QueryResult } from './QueryResult';
 /**
  * Allows a QueryResult type with specific populated properties
  */
-export declare type QueryResultPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
+export type QueryResultPopulated<T extends Entity, K extends keyof T> = Omit<QueryResult<T>, K> & {
     [P in K]-?: Extract<T[P], Entity | Entity[]> extends Entity ? undefined extends T[P] ? QueryResult<GetValueType<T[P], Entity>> | null : QueryResult<GetValueType<T[P], Entity>> : QueryResult<GetValueType<T[P], Entity>>[];
 };