zibri 2.4.0 → 2.5.0

package/dist/cjs/data-source/data-sources/where-converter/typeorm-where-filter.converter.js

@@ -0,0 +1,250 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeOrmWhereFilterConverter = void 0;
+const typeorm_1 = require("typeorm");
+const relation_enum_1 = require("../../../entity/models/relation.enum");
+const metadata_utilities_1 = require("../../../utilities/metadata.utilities");
+const object_utilities_1 = require("../../../utilities/object.utilities");
+const where_filter_keys_model_1 = require("../../models/where/where-filter-keys.model");
+// eslint-disable-next-line typescript/typedef
+const lengthWhereFilterKeys = [
+    'length',
+    'lengthGreaterThan',
+    'lengthGreaterThanEquals',
+    'lengthLesserThan',
+    'lengthLesserThanEquals'
+];
+/**
+ * Abstract base converter that transforms a Zibri WhereFilter into a TypeORM FindOptionsWhere.
+ */
+class TypeOrmWhereFilterConverter {
+    typeOrmDataSource;
+    /**
+     * A map that defines how Zibri's where filter properties are mapped to their typeorm counterpart.
+     */
+    handleFilterKeyMap = {
+        not: (value) => (0, typeorm_1.Not)(value),
+        like: (value) => (0, typeorm_1.Like)(value),
+        oneOf: (value) => {
+            if (!Array.isArray(value)) {
+                throw new Error('The "oneOf" property of the where filter needs to be an array.');
+            }
+            return (0, typeorm_1.In)(value);
+        },
+        notOneOf: (value) => {
+            if (!Array.isArray(value)) {
+                throw new Error('The "notOneOf" property of the where filter needs to be an array.');
+            }
+            return (0, typeorm_1.Not)((0, typeorm_1.In)(value));
+        },
+        after: (value) => (0, typeorm_1.MoreThan)(value),
+        before: (value) => (0, typeorm_1.LessThan)(value),
+        afterOrOn: (value) => (0, typeorm_1.MoreThanOrEqual)(value),
+        beforeOrOn: (value) => (0, typeorm_1.LessThanOrEqual)(value),
+        greaterThan: (value) => (0, typeorm_1.MoreThan)(value),
+        greaterThanEquals: (value) => (0, typeorm_1.MoreThanOrEqual)(value),
+        lesserThan: (value) => (0, typeorm_1.LessThan)(value),
+        lesserThanEquals: (value) => (0, typeorm_1.LessThanOrEqual)(value),
+        iLike: (value) => (0, typeorm_1.ILike)(value),
+        fuzzyLike: (value, metadata, nestedProperties, entityClass) => this.fuzzyLikeWhereFilterHandler(value, metadata, nestedProperties, entityClass),
+        is: (value, metadata) => {
+            if (value === null) {
+                return (0, typeorm_1.IsNull)();
+            }
+            // Unwrap a full entity for MANY_TO_ONE / BELONGS_TO_ONE
+            if ((metadata.type === relation_enum_1.Relation.MANY_TO_ONE
+                || metadata.type === relation_enum_1.Relation.BELONGS_TO_ONE)
+                && typeof value === 'object'
+                && !Array.isArray(value)
+                && 'id' in value) {
+                return (0, typeorm_1.Equal)(value.id);
+            }
+            return (0, typeorm_1.Equal)(value);
+        },
+        where: (value, metadata, nestedProperties, entityClass) => this.whereHandler(value, metadata, nestedProperties, entityClass),
+        includes: (value) => {
+            if (!Array.isArray(value)) {
+                throw new Error('The "includes" property of the where filter needs to be an array.');
+            }
+            return (0, typeorm_1.ArrayContains)(value);
+        },
+        isIncludedIn: (value) => {
+            if (!Array.isArray(value)) {
+                throw new Error('The "isIncludedIn" property of the where filter needs to be an array.');
+            }
+            return (0, typeorm_1.ArrayContainedBy)(value);
+        },
+        length: (value) => (0, typeorm_1.Raw)(alias => `array_length(${alias}, 1) = ${value}`),
+        lengthGreaterThan: (value) => (0, typeorm_1.Raw)(alias => `array_length(${alias}, 1) > ${value}`),
+        lengthGreaterThanEquals: (value) => (0, typeorm_1.Raw)(alias => `array_length(${alias}, 1) >= ${value}`),
+        lengthLesserThan: (value) => (0, typeorm_1.Raw)(alias => `array_length(${alias}, 1) < ${value}`),
+        lengthLesserThanEquals: (value) => (0, typeorm_1.Raw)(alias => `array_length(${alias}, 1) <= ${value}`)
+    };
+    constructor(typeOrmDataSource) {
+        this.typeOrmDataSource = typeOrmDataSource;
+    }
+    // ── Public entry point (concrete) ──────────────────────────
+    /**
+     * Converts the given zibri filter to a typeorm filter.
+     * @param filter - The zibri filter to convert.
+     * @param entityClass - The entity class to search for by this filter.
+     * @returns The typeorm filter.
+     */
+    convert(filter, entityClass) {
+        const properties = metadata_utilities_1.MetadataUtilities.getModelProperties(entityClass);
+        if (Array.isArray(filter)) {
+            return filter.map(f => this.singleWhereFilterToFindOptionsWhere(f, properties, entityClass));
+        }
+        return this.singleWhereFilterToFindOptionsWhere(filter, properties, entityClass);
+    }
+    /**
+     * Handles converting a where filter to a typeorm FindOperator.
+     * @param value - The value of the where filter.
+     * @param metadata - The metadata of the property for which the where filter has been specified.
+     * @param nestedProperties - Nested properties on the where filter. Need to exist.
+     * @param entityClass - The entity class that the where filter belongs to.
+     * @returns A typeorm FindOperator.
+     * @throws Wheen now nested properties have been found.
+     */
+    whereHandler(value, metadata, nestedProperties, entityClass) {
+        if (nestedProperties == undefined) {
+            throw new Error('The "where" operator is not supported on this property without nested metadata.');
+        }
+        let targetClass = entityClass;
+        if (metadata.type === 'object') {
+            targetClass = metadata.cls();
+        }
+        else if (metadata.type === relation_enum_1.Relation.HAS_ONE || metadata.type === relation_enum_1.Relation.BELONGS_TO_ONE
+            || metadata.type === relation_enum_1.Relation.MANY_TO_ONE || metadata.type === relation_enum_1.Relation.ONE_TO_MANY
+            || metadata.type === relation_enum_1.Relation.MANY_TO_MANY) {
+            targetClass = metadata.target();
+        }
+        return this.singleWhereFilterToFindOptionsWhere(value, nestedProperties, targetClass);
+    }
+    // ── Pipeline stages (concrete, overridable) ─────────────────
+    /**
+     * Converts a single where filter to a typeorm FindOptionsWhere property.
+     * @param filter - The filter to convert.
+     * @param properties - The property metadata of the model that the filter is for.
+     * @param entityClass - The entity class to search for by this filter.
+     * @returns A typeorm FindOptionsWhere property.
+     */
+    singleWhereFilterToFindOptionsWhere(filter, properties, entityClass) {
+        const res = {};
+        const extraRawConditions = [];
+        for (const key of object_utilities_1.ObjectUtilities.keys(filter)) {
+            const prop = filter[key];
+            if (prop === undefined) {
+                continue;
+            }
+            const propertyMetadata = properties[key];
+            let nestedProperties;
+            if (propertyMetadata.type === relation_enum_1.Relation.ONE_TO_MANY || propertyMetadata.type === relation_enum_1.Relation.MANY_TO_MANY) {
+                this.processRelationFilter(key, prop, propertyMetadata, entityClass, res, extraRawConditions);
+                continue;
+            }
+            if (propertyMetadata.type === 'object') {
+                nestedProperties = metadata_utilities_1.MetadataUtilities.getModelProperties(propertyMetadata.cls());
+            }
+            else if (propertyMetadata.type === relation_enum_1.Relation.HAS_ONE
+                || propertyMetadata.type === relation_enum_1.Relation.BELONGS_TO_ONE
+                || propertyMetadata.type === relation_enum_1.Relation.MANY_TO_ONE) {
+                nestedProperties = metadata_utilities_1.MetadataUtilities.getModelProperties(propertyMetadata.target());
+            }
+            res[key] = this.propertyToFindOperator(prop, propertyMetadata, nestedProperties, entityClass);
+        }
+        if (extraRawConditions.length) {
+            const existingIdFilter = res['id'];
+            const combined = existingIdFilter
+                ? (0, typeorm_1.And)(existingIdFilter, ...extraRawConditions)
+                : (0, typeorm_1.And)(...extraRawConditions);
+            res['id'] = combined;
+        }
+        return res;
+    }
+    processRelationFilter(key, prop, propertyMetadata, entityClass, res, extraRawConditions) {
+        const filterObj = prop;
+        for (const lengthKey of lengthWhereFilterKeys) {
+            if (lengthKey in filterObj && typeof filterObj[lengthKey] === 'number') {
+                extraRawConditions.push(this.buildRelationLengthRawOperator(entityClass, key, propertyMetadata, lengthKey, filterObj[lengthKey]));
+                // eslint-disable-next-line typescript/no-dynamic-delete
+                delete filterObj[lengthKey];
+            }
+        }
+        // 2) includes / isIncludedIn
+        if ('includes' in filterObj && Array.isArray(filterObj.includes)) {
+            extraRawConditions.push(this.buildRelationIncludesOperator(entityClass, key, propertyMetadata, filterObj.includes));
+            delete filterObj.includes;
+        }
+        if ('isIncludedIn' in filterObj && Array.isArray(filterObj.isIncludedIn)) {
+            extraRawConditions.push(this.buildRelationIsIncludedInOperator(entityClass, key, propertyMetadata, filterObj.isIncludedIn));
+            delete filterObj.isIncludedIn;
+        }
+        // 3) Remaining element filters (e.g. where)
+        if (Object.keys(filterObj).length > 0) {
+            const targetEntity = propertyMetadata.target();
+            const nestedProps = metadata_utilities_1.MetadataUtilities.getModelProperties(targetEntity);
+            res[key] = this.propertyToFindOperator(filterObj, propertyMetadata, nestedProps, entityClass);
+        }
+    }
+    /**
+     * Converts a where filter property to a typeorm FindOperator property.
+     * @param property - The property to convert.
+     * @param propertyMetadata - The property metadata of the property.
+     * @param nestedProperties - Nested properties, if any.
+     * @param entityClass - The entity class that the property is on.
+     * @returns A typeorm FindOperator property.
+     */
+    propertyToFindOperator(property, propertyMetadata, nestedProperties, entityClass) {
+        if (Array.isArray(property)) {
+            return propertyMetadata.type === 'array'
+                ? this.singlePropertyToFindOperator(property, propertyMetadata, nestedProperties, entityClass)
+                : (0, typeorm_1.Or)(...property.map(p => this.singlePropertyToFindOperator(p, propertyMetadata, nestedProperties, entityClass)));
+        }
+        return this.singlePropertyToFindOperator(property, propertyMetadata, nestedProperties, entityClass);
+    }
+    /**
+     * Transforms a single where filter property to a typeorm FindOperator.
+     * @param property - The where filter property to transform.
+     * @param propertyMetadata - The metadata of the where filter property.
+     * @param nestedProperties - Any nested properties of the where filter.
+     * @param entityClass - The entity class that the property is on.
+     * @returns A typeorm FindOperator.
+     * @throws When the where filter property is invalid.
+     */
+    singlePropertyToFindOperator(property, propertyMetadata, nestedProperties, entityClass) {
+        if (property === null) {
+            // eslint-disable-next-line typescript/no-unsafe-return
+            return (0, typeorm_1.IsNull)();
+        }
+        if (typeof property === 'string'
+            || typeof property === 'bigint'
+            || typeof property === 'number'
+            || typeof property === 'boolean'
+            || property instanceof Date
+            || (Array.isArray(property) && propertyMetadata.type === 'array')) {
+            return (0, typeorm_1.Equal)(property);
+        }
+        const operators = [];
+        const filterKeys = object_utilities_1.ObjectUtilities.keys(property);
+        if (!filterKeys.length) {
+            throw new Error('Empty where filter');
+        }
+        for (const key of filterKeys) {
+            if (!(0, where_filter_keys_model_1.isWhereFilterKey)(key)) {
+                throw new Error(`Unknown key "${key}" on where filter ${property}`);
+            }
+            const handler = this.handleFilterKeyMap[key];
+            const value = property[key];
+            const op = handler(value, propertyMetadata, nestedProperties, entityClass);
+            if (op !== undefined) {
+                operators.push(op);
+            }
+        }
+        return operators.length === 1
+            ? operators[0]
+            : (0, typeorm_1.And)(...operators);
+    }
+}
+exports.TypeOrmWhereFilterConverter = TypeOrmWhereFilterConverter;
+//# sourceMappingURL=typeorm-where-filter.converter.js.map

package/dist/cjs/data-source/data-sources/where-converter/typeorm-where-filter.converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeorm-where-filter.converter.js","sourceRoot":"","sources":["../../../../../src/data-source/data-sources/where-converter/typeorm-where-filter.converter.ts"],"names":[],"mappings":"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"}

package/dist/cjs/data-source/migration/migration-entity.model.d.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from '../../entity/base-entity.model';
-import { type Version } from '../../types/version.type';
+import { type SemVerVersion } from '../../utilities/sem-ver.utilities';
 /**
  * The migration entity that is stored in the db.
  */
@@ -11,7 +11,7 @@ export declare class MigrationEntity extends BaseEntity {
     /**
      * The version at which this migration should run.
      */
-    version: Version;
+    version: SemVerVersion;
     /**
      * The timestamp at which the migration ran.
      */

package/dist/cjs/data-source/migration/migration-entity.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-entity.model.d.ts","sourceRoot":"","sources":["../../../../src/data-source/migration/migration-entity.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD;;GAEG;AACH,qBACa,eAAgB,SAAQ,UAAU;IAC3C;;OAEG;IAEH,IAAI,EAAG,MAAM,CAAC;IAEd;;OAEG;IAEH,OAAO,EAAG,OAAO,CAAC;IAElB;;OAEG;IAEH,KAAK,EAAG,IAAI,CAAC;CAChB"}
+{"version":3,"file":"migration-entity.model.d.ts","sourceRoot":"","sources":["../../../../src/data-source/migration/migration-entity.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEvE;;GAEG;AACH,qBACa,eAAgB,SAAQ,UAAU;IAC3C;;OAEG;IAEH,IAAI,EAAG,MAAM,CAAC;IAEd;;OAEG;IAEH,OAAO,EAAG,aAAa,CAAC;IAExB;;OAEG;IAEH,KAAK,EAAG,IAAI,CAAC;CAChB"}

package/dist/cjs/data-source/migration/migration-entity.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"migration-entity.model.js","sourceRoot":"","sources":["../../../../src/data-source/migration/migration-entity.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAA4D;AAC5D,+EAAkE;AAClE,mFAAsE;AAGtE;;GAEG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,8BAAU;IAC3C;;OAEG;IAEH,IAAI,CAAU;IAEd;;OAEG;IAEH,OAAO,CAAW;IAElB;;OAEG;IAEH,KAAK,CAAQ;CAChB,CAAA;AAlBY,0CAAe;AAKxB;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;6CACpB;AAMd;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;gDAChB;AAMlB;IADC,6BAAQ,CAAC,IAAI,EAAE;8BACR,IAAI;8CAAC;0BAjBJ,eAAe;IAD3B,IAAA,yBAAM,GAAE;GACI,eAAe,CAkB3B"}
+{"version":3,"file":"migration-entity.model.js","sourceRoot":"","sources":["../../../../src/data-source/migration/migration-entity.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAA4D;AAC5D,+EAAkE;AAClE,mFAAsE;AAGtE;;GAEG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,8BAAU;IAC3C;;OAEG;IAEH,IAAI,CAAU;IAEd;;OAEG;IAEH,OAAO,CAAiB;IAExB;;OAEG;IAEH,KAAK,CAAQ;CAChB,CAAA;AAlBY,0CAAe;AAKxB;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;6CACpB;AAMd;IADC,6BAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;gDACV;AAMxB;IADC,6BAAQ,CAAC,IAAI,EAAE;8BACR,IAAI;8CAAC;0BAjBJ,eAAe;IAD3B,IAAA,yBAAM,GAAE;GACI,eAAe,CAkB3B"}

package/dist/cjs/data-source/migration/migration.model.d.ts

@@ -1,6 +1,6 @@
 import { MigrationEntity } from './migration-entity.model';
 import { Newable } from '../../types/newable.type';
-import { Version } from '../../types/version.type';
+import { SemVerVersion } from '../../utilities/sem-ver.utilities';
 import { DataSourceInterface } from '../data-sources/data-source.interface';
 import { Repository } from '../repository';
 import { Transaction } from '../transaction/transaction.model';
@@ -8,7 +8,7 @@ import { Transaction } from '../transaction/transaction.model';
  * Base class for a data source migration.
  */
 export declare abstract class Migration {
-    abstract readonly version: Version;
+    abstract readonly version: SemVerVersion;
     /**
      * The data source that the migration is for.
      */

package/dist/cjs/data-source/migration/migration.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration.model.d.ts","sourceRoot":"","sources":["../../../../src/data-source/migration/migration.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE/D;;GAEG;AACH,8BAAsB,SAAS;IAC3B,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACnC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACnD;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;gBAExD,eAAe,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAKzD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CACnE"}
+{"version":3,"file":"migration.model.d.ts","sourceRoot":"","sources":["../../../../src/data-source/migration/migration.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE/D;;GAEG;AACH,8BAAsB,SAAS;IAC3B,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IACzC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACnD;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;gBAExD,eAAe,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAKzD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CACnE"}

package/dist/cjs/data-source/models/options/count-options.model.d.ts

@@ -1,13 +1,8 @@
 import { BaseRepositoryOptions } from './base-repository-options.model';
+import { FindAllOptions } from './find-all-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { Where } from '../where/where-filter.model';
 /**
  * Options for counting entities.
  */
-export type CountOptions<T extends BaseEntity> = BaseRepositoryOptions & {
-    /**
-     * The where filter to count the options by.
-     */
-    where?: Where<T>;
-};
+export type CountOptions<T extends BaseEntity> = BaseRepositoryOptions & Pick<FindAllOptions<T>, 'where'>;
 //# sourceMappingURL=count-options.model.d.ts.map

package/dist/cjs/data-source/models/options/count-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/count-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAChE;IACE;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;CACnB,CAAC"}
+{"version":3,"file":"count-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/count-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAChE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC"}

package/dist/cjs/data-source/models/options/delete-all-options.model.d.ts

@@ -1,8 +1,6 @@
-import { FindAllOptions } from './find-all-options.model';
-import { BaseEntity } from '../../../entity/base-entity.model';
-import { OmitStrict } from '../../../types/omit-strict.type';
+import { BaseRepositoryOptions } from './base-repository-options.model';
 /**
  * Options for deleting multiple entities.
  */
-export type DeleteAllOptions<T extends BaseEntity> = OmitStrict<FindAllOptions<T>, 'where'>;
+export type DeleteAllOptions = BaseRepositoryOptions;
 //# sourceMappingURL=delete-all-options.model.d.ts.map

package/dist/cjs/data-source/models/options/delete-all-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/delete-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"delete-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/delete-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,CAAC"}

package/dist/cjs/data-source/models/options/find-all-options.model.d.ts

@@ -1,4 +1,4 @@
-import { FindManyOptions } from 'typeorm';
+import { FindManyOptions, FindOptionsRelations } from 'typeorm';
 import { BaseRepositoryOptions } from './base-repository-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
 import { Where } from '../where/where-filter.model';
@@ -13,6 +13,6 @@ export type FindAllOptions<T extends BaseEntity> = BaseRepositoryOptions & Pick<
     /**
      * The relations to include in the found entities.
      */
-    relations?: (keyof T)[];
+    relations?: FindOptionsRelations<T> | (keyof T)[];
 };
 //# sourceMappingURL=find-all-options.model.d.ts.map

package/dist/cjs/data-source/models/options/find-all-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAClE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,GACnD;IACE;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CAC1B,CAAC"}
+{"version":3,"file":"find-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAClE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,GACnD;IACE;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CACpD,CAAC"}

package/dist/cjs/data-source/models/options/find-by-id-options.model.d.ts

@@ -4,10 +4,5 @@ import { OmitStrict } from '../../../types/omit-strict.type';
 /**
  * Options for finding a single entity by its id.
  */
-export type FindByIdOptions<T extends BaseEntity> = OmitStrict<FindOneOptions<T>, 'where' | 'relations'> & {
-    /**
-     * The relations to include in the found entity.
-     */
-    relations?: (keyof T)[];
-};
+export type FindByIdOptions<T extends BaseEntity> = OmitStrict<FindOneOptions<T>, 'where'>;
 //# sourceMappingURL=find-by-id-options.model.d.ts.map

package/dist/cjs/data-source/models/options/find-by-id-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-by-id-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-by-id-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG;IACvG;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CAC1B,CAAC"}
+{"version":3,"file":"find-by-id-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-by-id-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC"}

package/dist/cjs/data-source/models/options/find-one-options.model.d.ts

@@ -1,17 +1,8 @@
 import { BaseRepositoryOptions } from './base-repository-options.model';
+import { FindAllOptions } from './find-all-options.model';
 import { BaseEntity } from '../../../entity/base-entity.model';
-import { Where } from '../where/where-filter.model';
 /**
  * Options for finding a single entity.
  */
-export type FindOneOptions<T extends BaseEntity> = BaseRepositoryOptions & {
-    /**
-     * The where filter to find the entity by.
-     */
-    where?: Where<T>;
-    /**
-     * The relations to include in the found entity.
-     */
-    relations?: (keyof T)[];
-};
+export type FindOneOptions<T extends BaseEntity> = BaseRepositoryOptions & Pick<FindAllOptions<T>, 'where' | 'relations'>;
 //# sourceMappingURL=find-one-options.model.d.ts.map

package/dist/cjs/data-source/models/options/find-one-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-one-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-one-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAClE;IACE;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CAC1B,CAAC"}
+{"version":3,"file":"find-one-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/find-one-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,qBAAqB,GAClE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,CAAC"}

package/dist/cjs/data-source/models/options/update-all-options.model.d.ts

@@ -2,11 +2,5 @@ import { BaseRepositoryOptions } from './base-repository-options.model';
 /**
  * Options for updating multiple entities at once.
  */
-export type UpdateAllOptions = BaseRepositoryOptions & {
-    /**
-     * Whether or not setting the id property manually is allowed.
-     * @default false.
-     */
-    allowId?: boolean;
-};
+export type UpdateAllOptions = BaseRepositoryOptions & {};
 //# sourceMappingURL=update-all-options.model.d.ts.map

package/dist/cjs/data-source/models/options/update-all-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/update-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG;IACnD;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAC"}
+{"version":3,"file":"update-all-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/update-all-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG,EAGtD,CAAC"}

package/dist/cjs/data-source/models/options/update-by-id-options.model.d.ts

@@ -2,11 +2,5 @@ import { BaseRepositoryOptions } from './base-repository-options.model';
 /**
  * Options for updating an entity by its id.
  */
-export type UpdateByIdOptions = BaseRepositoryOptions & {
-    /**
-     * Whether or not setting the id property manually is allowed.
-     * @default false.
-     */
-    allowId?: boolean;
-};
+export type UpdateByIdOptions = BaseRepositoryOptions & {};
 //# sourceMappingURL=update-by-id-options.model.d.ts.map

package/dist/cjs/data-source/models/options/update-by-id-options.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-by-id-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/update-by-id-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG;IACpD;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAC"}
+{"version":3,"file":"update-by-id-options.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/options/update-by-id-options.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GAAG,EAGvD,CAAC"}

package/dist/cjs/data-source/models/where/array-where-filter.model.d.ts

@@ -1,12 +1,90 @@
+import { Where, WhereFilterProperty } from './where-filter.model';
 /**
  * A filter for an array where property.
  */
-export type ArrayWhereFilter<ItemType> = null | {
+export type ArrayWhereFilter<ItemType> = null | ItemType[] | {
     /**
-     * The property needs to equal the value.
+     * The property needs to be not this value.
      */
-    equals: ItemType[];
+    not?: null | ItemType[];
+    /**
+     * The property needs to include the value.
+     */
+    includes?: ItemType[];
+    /**
+     * The properties items needs to be included in the value.
+     */
+    isIncludedIn?: ItemType[];
+    /**
+     * The length that this array needs to have.
+     */
+    length?: number;
+    /**
+     * The length of this array needs to be greater than the provided value.
+     */
+    lengthGreaterThan?: number;
+    /**
+     * The length of this array needs to be greater than or equal to the provided value.
+     */
+    lengthGreaterThanEquals?: number;
+    /**
+     * The length of this array needs to be lesser than the provided value.
+     */
+    lengthLesserThan?: number;
+    /**
+     * The length of this array needs to be lesser than or equal to the provided value.
+     */
+    lengthLesserThanEquals?: number;
+    /**
+     * A where condition that at least one of the items inside this array needs to match.
+     */
+    where?: never;
 } | {
+    /**
+     * The property needs to be not this value.
+     */
+    not?: never;
+    /**
+     * The property needs to include the value.
+     */
+    includes?: never;
+    /**
+     * The properties items needs to be included in the value.
+     */
+    isIncludedIn?: never;
+    /**
+     * The length that this array needs to have.
+     */
+    length?: number;
+    /**
+     * The length of this array needs to be greater than the provided value.
+     */
+    lengthGreaterThan?: number;
+    /**
+     * The length of this array needs to be greater than or equal to the provided value.
+     */
+    lengthGreaterThanEquals?: number;
+    /**
+     * The length of this array needs to be lesser than the provided value.
+     */
+    lengthLesserThan?: number;
+    /**
+     * The length of this array needs to be lesser than or equal to the provided value.
+     */
+    lengthLesserThanEquals?: number;
+    /**
+     * A where condition that at least one of the items inside this array needs to match.
+     */
+    where: WhereFilterProperty<ItemType> | WhereFilterProperty<ItemType>[];
+};
+/**
+ * A filter for an array of object items where property.
+ */
+export type ObjectArrayWhereFilter<ItemType extends object> = null | ItemType[] | {
+    /**
+     * The property needs to be not this value.
+     */
+    not?: null | ItemType[];
     /**
      * The property needs to include the value.
      */
@@ -15,5 +93,66 @@ export type ArrayWhereFilter<ItemType> = null | {
      * The properties items needs to be included in the value.
      */
     isIncludedIn?: ItemType[];
+    /**
+     * The length that this array needs to have.
+     */
+    length?: number;
+    /**
+     * The length of this array needs to be greater than the provided value.
+     */
+    lengthGreaterThan?: number;
+    /**
+     * The length of this array needs to be greater than or equal to the provided value.
+     */
+    lengthGreaterThanEquals?: number;
+    /**
+     * The length of this array needs to be lesser than the provided value.
+     */
+    lengthLesserThan?: number;
+    /**
+     * The length of this array needs to be lesser than or equal to the provided value.
+     */
+    lengthLesserThanEquals?: number;
+    /**
+     * A where condition that at least one of the items inside this array needs to match.
+     */
+    where?: never;
+} | {
+    /**
+     * The property needs to be not this value.
+     */
+    not?: never;
+    /**
+     * The property needs to include the value.
+     */
+    includes?: never;
+    /**
+     * The properties items needs to be included in the value.
+     */
+    isIncludedIn?: never;
+    /**
+     * The length that this array needs to have.
+     */
+    length?: number;
+    /**
+     * The length of this array needs to be greater than the provided value.
+     */
+    lengthGreaterThan?: number;
+    /**
+     * The length of this array needs to be greater than or equal to the provided value.
+     */
+    lengthGreaterThanEquals?: number;
+    /**
+     * The length of this array needs to be lesser than the provided value.
+     */
+    lengthLesserThan?: number;
+    /**
+     * The length of this array needs to be lesser than or equal to the provided value.
+     */
+    lengthLesserThanEquals?: number;
+    /**
+     * A where condition that at least one of the items inside this array needs to match.
+     */
+    where: Where<ItemType>;
 };
 //# sourceMappingURL=array-where-filter.model.d.ts.map

package/dist/cjs/data-source/models/where/array-where-filter.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-where-filter.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/where/array-where-filter.model.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,IAAI,GAAG;IAC5C;;OAEG;IACH,MAAM,EAAE,QAAQ,EAAE,CAAA;CACrB,GAAG;IACA;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAA;CAC5B,CAAC"}
+{"version":3,"file":"array-where-filter.model.d.ts","sourceRoot":"","sources":["../../../../../src/data-source/models/where/array-where-filter.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,IAAI,GAAG,QAAQ,EAAE,GAAG;IACzD;;OAEG;IACH,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC1B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;CAChB,GACC;IACE;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAA;CACzE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,QAAQ,SAAS,MAAM,IAAI,IAAI,GAAG,QAAQ,EAAE,GAAG;IAC9E;;OAEG;IACH,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC1B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;CAChB,GACC;IACE;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;CACzB,CAAC"}