typeorm-extensions 2.2.0-rc.1 → 2.2.0-rc.10

package/dist/extensions/where-array.extension.d.ts

@@ -68,3 +68,7 @@ declare module 'typeorm/query-builder/DeleteQueryBuilder' {
     interface DeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereArrayMethods {
     }
 }
+declare module 'typeorm/query-builder/SoftDeleteQueryBuilder' {
+    interface SoftDeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereArrayMethods {
+    }
+}

package/dist/extensions/where-array.extension.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const query_builder_utils_1 = require("../utils/query-builder.utils");
 const sql_utils_1 = require("../utils/sql.utils");
@@ -20,14 +19,7 @@ const extension = {
         orWhereArrayOverlaps: createWhereArrayMethod('orWhere', '&&'),
     },
 };
-const queryBuilders = [
-    typeorm_1.SelectQueryBuilder,
-    typeorm_1.UpdateQueryBuilder,
-    typeorm_1.DeleteQueryBuilder,
-];
-queryBuilders.forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, extension);
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, extension);
 // implementation
 function attachWhereArray(builder, method, field, operator, values, arrayType) {
     if (!method || typeof field !== 'string') {

package/dist/extensions/where-exists.extension.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachExists = void 0;
-const typeorm_1 = require("typeorm");
-const SoftDeleteQueryBuilder_1 = require("typeorm/query-builder/SoftDeleteQueryBuilder");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const parameter_utils_1 = require("../utils/parameter.utils");
+const query_builder_utils_1 = require("../utils/query-builder.utils");
 const existsMethods = {
     prototype: {
         whereExists(subQuery) {
@@ -33,10 +32,8 @@ const notExistsMethods = {
 };
 // only where the builder lacks them: SelectQueryBuilder keeps TypeORM's own whereExists /
 // andWhereExists / orWhereExists, and a later TypeORM that adds any of these keeps its own
-[typeorm_1.SelectQueryBuilder, typeorm_1.UpdateQueryBuilder, typeorm_1.DeleteQueryBuilder, SoftDeleteQueryBuilder_1.SoftDeleteQueryBuilder].forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, existsMethods, { onlyMissing: true });
-    (0, prototype_utils_1.patchPrototype)(builder, notExistsMethods, { onlyMissing: true });
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, existsMethods, { onlyMissing: true });
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, notExistsMethods, { onlyMissing: true });
 // implementation
 function attachExists(builder, method, subQuery, negate) {
     const [condition, parameters] = (0, parameter_utils_1.withUniqueParameterNames)(...getExistsCondition(subQuery));
@@ -48,15 +45,7 @@ exports.attachExists = attachExists;
  * drops GROUP BY, which leaves a HAVING to aggregate the whole subquery: the GROUP BY stays with one.
  */
 function getExistsCondition(subQuery) {
-    const query = subQuery
-        .clone()
-        .orderBy()
-        .offset(undefined)
-        .limit(undefined)
-        .skip(undefined)
-        .take(undefined)
-        .select('1')
-        .setOption('disable-global-order');
+    const query = (0, query_builder_utils_1.withoutPaging)(subQuery.clone()).select('1');
     if (query.expressionMap.havings.length === 0) {
         query.groupBy();
     }

package/dist/extensions/where-is-any.extension.d.ts

@@ -1,142 +1,55 @@
 import { ObjectLiteral } from 'typeorm';
 import { ArgsType } from '../types/util-types';
+export interface WhereIsAnyMethods {
+    /**
+     * Sets WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
+     * The array is bound as a single parameter instead of one parameter per value.
+     * `arrayType` (e.g. `'uuid[]'`) casts the parameter: `= ANY(CAST(:array AS uuid[]))`.
+     * If you had previously WHERE expression defined,
+     * calling this function will override previously set WHERE conditions.
+     */
+    whereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
+    /**
+     * Adds new AND WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
+     */
+    andWhereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
+    /**
+     * Adds new OR WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
+     */
+    orWhereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
+    /**
+     * Sets WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL):
+     * the field differs from every value of the array.
+     * If you had previously WHERE expression defined,
+     * calling this function will override previously set WHERE conditions.
+     */
+    whereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
+    /**
+     * Adds new AND WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
+     */
+    andWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
+    /**
+     * Adds new OR WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
+     */
+    orWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
+}
 declare module 'typeorm/query-builder/WhereExpressionBuilder' {
-    interface WhereExpressionBuilder {
-        /**
-         * Sets WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         * The array is bound as a single parameter instead of one parameter per value.
-         * `arrayType` (e.g. `'uuid[]'`) casts the parameter: `= ANY(CAST(:array AS uuid[]))`.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
-        /**
-         * Adds new AND WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
-        /**
-         * Adds new OR WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsAny(field: string, array?: ArgsType, arrayType?: string): this;
-        /**
-         * Sets WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL):
-         * the field differs from every value of the array.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
-        /**
-         * Adds new AND WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
-        /**
-         * Adds new OR WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): this;
+    interface WhereExpressionBuilder extends WhereIsAnyMethods {
     }
 }
 declare module 'typeorm/query-builder/SelectQueryBuilder' {
-    interface SelectQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         * The array is bound as a single parameter instead of one parameter per value.
-         * `arrayType` (e.g. `'uuid[]'`) casts the parameter: `= ANY(CAST(:array AS uuid[]))`.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
-        /**
-         * Sets WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL):
-         * the field differs from every value of the array.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): SelectQueryBuilder<Entity>;
+    interface SelectQueryBuilder<Entity extends ObjectLiteral> extends WhereIsAnyMethods {
     }
 }
 declare module 'typeorm/query-builder/UpdateQueryBuilder' {
-    interface UpdateQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         * The array is bound as a single parameter instead of one parameter per value.
-         * `arrayType` (e.g. `'uuid[]'`) casts the parameter: `= ANY(CAST(:array AS uuid[]))`.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
-        /**
-         * Sets WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL):
-         * the field differs from every value of the array.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): UpdateQueryBuilder<Entity>;
+    interface UpdateQueryBuilder<Entity extends ObjectLiteral> extends WhereIsAnyMethods {
     }
 }
 declare module 'typeorm/query-builder/DeleteQueryBuilder' {
-    interface DeleteQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         * The array is bound as a single parameter instead of one parameter per value.
-         * `arrayType` (e.g. `'uuid[]'`) casts the parameter: `= ANY(CAST(:array AS uuid[]))`.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field = ANY(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
-        /**
-         * Sets WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL):
-         * the field differs from every value of the array.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        andWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE `field <> ALL(:array)` condition in the query builder (PostgreSQL).
-         */
-        orWhereIsNotAny(field: string, array?: ArgsType, arrayType?: string): DeleteQueryBuilder<Entity>;
+    interface DeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereIsAnyMethods {
+    }
+}
+declare module 'typeorm/query-builder/SoftDeleteQueryBuilder' {
+    interface SoftDeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereIsAnyMethods {
     }
 }

package/dist/extensions/where-is-any.extension.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const query_builder_utils_1 = require("../utils/query-builder.utils");
 const sql_utils_1 = require("../utils/sql.utils");
@@ -17,14 +16,7 @@ const extension = {
         orWhereIsNotAny: createWhereIsAnyMethod('orWhere', '<> ALL'),
     },
 };
-const queryBuilders = [
-    typeorm_1.SelectQueryBuilder,
-    typeorm_1.UpdateQueryBuilder,
-    typeorm_1.DeleteQueryBuilder,
-];
-queryBuilders.forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, extension);
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, extension);
 // implementation
 function attachWhereIsAny(builder, method, field, comparison, array, arrayType) {
     if (!method || typeof field !== 'string') {

package/dist/extensions/where-is-distinct-from.extension.d.ts

@@ -54,3 +54,7 @@ declare module 'typeorm/query-builder/DeleteQueryBuilder' {
     interface DeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereDistinctMethods {
     }
 }
+declare module 'typeorm/query-builder/SoftDeleteQueryBuilder' {
+    interface SoftDeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereDistinctMethods {
+    }
+}

package/dist/extensions/where-is-distinct-from.extension.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const query_builder_utils_1 = require("../utils/query-builder.utils");
 const sql_utils_1 = require("../utils/sql.utils");
@@ -19,14 +18,7 @@ const extension = {
         orWhereIsNotDistinctFrom: createWhereDistinctMethod('orWhere', false),
     },
 };
-const queryBuilders = [
-    typeorm_1.SelectQueryBuilder,
-    typeorm_1.UpdateQueryBuilder,
-    typeorm_1.DeleteQueryBuilder,
-];
-queryBuilders.forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, extension);
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, extension);
 // implementation
 /** `field IS [NOT] DISTINCT FROM value` in the database's own null-safe syntax. */
 function buildDistinctCondition(driver, field, distinct, value) {

package/dist/extensions/where-is-in.extension.d.ts

@@ -1,130 +1,52 @@
 import { ObjectLiteral } from 'typeorm';
 import { ArgsType } from '../types/util-types';
+export interface WhereIsInMethods {
+    /**
+     * Sets WHERE IN condition in the query builder.
+     * If you had previously WHERE expression defined,
+     * calling this function will override previously set WHERE conditions.
+     */
+    whereIsIn(field: string, array?: ArgsType): this;
+    /**
+     * Adds new AND WHERE IN condition in the query builder.
+     */
+    andWhereIsIn(field: string, array?: ArgsType): this;
+    /**
+     * Adds new OR WHERE IN condition in the query builder.
+     */
+    orWhereIsIn(field: string, array?: ArgsType): this;
+    /**
+     * Sets WHERE NOT IN condition in the query builder.
+     * If you had previously WHERE expression defined,
+     * calling this function will override previously set WHERE conditions.
+     */
+    whereIsNotIn(field: string, array?: ArgsType): this;
+    /**
+     * Adds new AND WHERE NOT IN condition in the query builder.
+     */
+    andWhereIsNotIn(field: string, array?: ArgsType): this;
+    /**
+     * Adds new OR WHERE NOT IN condition in the query builder.
+     */
+    orWhereIsNotIn(field: string, array?: ArgsType): this;
+}
 declare module 'typeorm/query-builder/WhereExpressionBuilder' {
-    interface WhereExpressionBuilder {
-        /**
-         * Sets WHERE IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsIn(field: string, array?: ArgsType): this;
-        /**
-         * Adds new AND WHERE IN condition in the query builder.
-         */
-        andWhereIsIn(field: string, array?: ArgsType): this;
-        /**
-         * Adds new OR WHERE IN condition in the query builder.
-         */
-        orWhereIsIn(field: string, array?: ArgsType): this;
-        /**
-         * Sets WHERE NOT IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotIn(field: string, array?: ArgsType): this;
-        /**
-         * Adds new AND WHERE NOT IN condition in the query builder.
-         */
-        andWhereIsNotIn(field: string, array?: ArgsType): this;
-        /**
-         * Adds new OR WHERE NOT IN condition in the query builder.
-         */
-        orWhereIsNotIn(field: string, array?: ArgsType): this;
+    interface WhereExpressionBuilder extends WhereIsInMethods {
     }
 }
 declare module 'typeorm/query-builder/SelectQueryBuilder' {
-    interface SelectQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE IN condition in the query builder.
-         */
-        andWhereIsIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE IN condition in the query builder.
-         */
-        orWhereIsIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
-        /**
-         * Sets WHERE NOT IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE NOT IN condition in the query builder.
-         */
-        andWhereIsNotIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE NOT IN condition in the query builder.
-         */
-        orWhereIsNotIn(field: string, array?: ArgsType): SelectQueryBuilder<Entity>;
+    interface SelectQueryBuilder<Entity extends ObjectLiteral> extends WhereIsInMethods {
     }
 }
 declare module 'typeorm/query-builder/UpdateQueryBuilder' {
-    interface UpdateQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE IN condition in the query builder.
-         */
-        andWhereIsIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE IN condition in the query builder.
-         */
-        orWhereIsIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
-        /**
-         * Sets WHERE NOT IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE NOT IN condition in the query builder.
-         */
-        andWhereIsNotIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE NOT IN condition in the query builder.
-         */
-        orWhereIsNotIn(field: string, array?: ArgsType): UpdateQueryBuilder<Entity>;
+    interface UpdateQueryBuilder<Entity extends ObjectLiteral> extends WhereIsInMethods {
     }
 }
 declare module 'typeorm/query-builder/DeleteQueryBuilder' {
-    interface DeleteQueryBuilder<Entity extends ObjectLiteral> {
-        /**
-         * Sets WHERE IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE IN condition in the query builder.
-         */
-        andWhereIsIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE IN condition in the query builder.
-         */
-        orWhereIsIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
-        /**
-         * Sets WHERE NOT IN condition in the query builder.
-         * If you had previously WHERE expression defined,
-         * calling this function will override previously set WHERE conditions.
-         */
-        whereIsNotIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new AND WHERE NOT IN condition in the query builder.
-         */
-        andWhereIsNotIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
-        /**
-         * Adds new OR WHERE NOT IN condition in the query builder.
-         */
-        orWhereIsNotIn(field: string, array?: ArgsType): DeleteQueryBuilder<Entity>;
+    interface DeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereIsInMethods {
+    }
+}
+declare module 'typeorm/query-builder/SoftDeleteQueryBuilder' {
+    interface SoftDeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereIsInMethods {
     }
 }

package/dist/extensions/where-is-in.extension.js

@@ -1,39 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const where_utils_1 = require("../utils/where.utils");
+/* eslint-enable @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars */
 // patching
+const createWhereIsInMethod = (method, operator) => function (field, array) {
+    return attachWhereIsIn(this, method, field, operator, array);
+};
 const extension = {
     prototype: {
-        whereIsIn: function (field, array) {
-            return attachWhereIsIn(this, 'where', field, 'IN', array);
-        },
-        andWhereIsIn: function (field, array) {
-            return attachWhereIsIn(this, 'andWhere', field, 'IN', array);
-        },
-        orWhereIsIn: function (field, array) {
-            return attachWhereIsIn(this, 'orWhere', field, 'IN', array);
-        },
-        whereIsNotIn: function (field, array) {
-            return attachWhereIsIn(this, 'where', field, 'NOT IN', array);
-        },
-        andWhereIsNotIn: function (field, array) {
-            return attachWhereIsIn(this, 'andWhere', field, 'NOT IN', array);
-        },
-        orWhereIsNotIn: function (field, array) {
-            return attachWhereIsIn(this, 'orWhere', field, 'NOT IN', array);
-        },
+        whereIsIn: createWhereIsInMethod('where', 'IN'),
+        andWhereIsIn: createWhereIsInMethod('andWhere', 'IN'),
+        orWhereIsIn: createWhereIsInMethod('orWhere', 'IN'),
+        whereIsNotIn: createWhereIsInMethod('where', 'NOT IN'),
+        andWhereIsNotIn: createWhereIsInMethod('andWhere', 'NOT IN'),
+        orWhereIsNotIn: createWhereIsInMethod('orWhere', 'NOT IN'),
     },
 };
-const queryBuilders = [
-    typeorm_1.SelectQueryBuilder,
-    typeorm_1.UpdateQueryBuilder,
-    typeorm_1.DeleteQueryBuilder,
-];
-queryBuilders.forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, extension);
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, extension);
 // implementation
 function attachWhereIsIn(builder, method, field, operator, array) {
     if (method && typeof field === 'string' && typeof operator === 'string') {

package/dist/extensions/where-json.extension.d.ts

@@ -53,3 +53,7 @@ declare module 'typeorm/query-builder/DeleteQueryBuilder' {
     interface DeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereJsonMethods {
     }
 }
+declare module 'typeorm/query-builder/SoftDeleteQueryBuilder' {
+    interface SoftDeleteQueryBuilder<Entity extends ObjectLiteral> extends WhereJsonMethods {
+    }
+}

package/dist/extensions/where-json.extension.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
 const prototype_utils_1 = require("../utils/prototype.utils");
 const query_builder_utils_1 = require("../utils/query-builder.utils");
 const sql_utils_1 = require("../utils/sql.utils");
@@ -22,14 +21,7 @@ const extension = {
         orWhereJsonHasKey: createWhereJsonHasKeyMethod('orWhere'),
     },
 };
-const queryBuilders = [
-    typeorm_1.SelectQueryBuilder,
-    typeorm_1.UpdateQueryBuilder,
-    typeorm_1.DeleteQueryBuilder,
-];
-queryBuilders.forEach((builder) => {
-    (0, prototype_utils_1.patchPrototype)(builder, extension);
-});
+(0, prototype_utils_1.patchPrototypes)(prototype_utils_1.WHERE_QUERY_BUILDERS, extension);
 // implementation
 /**
  * `CAST("table"."column" AS jsonb)`: makes `json` and `simple-json` (text) columns work, and is dropped by PostgreSQL

package/dist/extensions/where-relation-exists.extension.d.ts

@@ -19,17 +19,17 @@ type RelatedCondition<Related extends ObjectLiteral> = (subQuery: SelectQueryBui
  */
 export interface WhereRelationExistsMethods<Entity extends ObjectLiteral> {
     /** Sets `WHERE EXISTS (…)` over the relation, replacing the WHERE conditions set before. */
-    whereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    whereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `AND EXISTS (…)` over the relation. */
-    andWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    andWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `OR EXISTS (…)` over the relation. */
-    orWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    orWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Sets `WHERE NOT EXISTS (…)` over the relation, replacing the WHERE conditions set before. */
-    whereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    whereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `AND NOT EXISTS (…)` over the relation. */
-    andWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    andWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `OR NOT EXISTS (…)` over the relation. */
-    orWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    orWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
 }
 declare module 'typeorm/query-builder/SelectQueryBuilder' {
     interface SelectQueryBuilder<Entity extends ObjectLiteral> extends WhereRelationExistsMethods<Entity> {

package/dist/extensions/where-relation-exists.extension.js

@@ -22,18 +22,12 @@ const extension = {
 // implementation
 function attachRelationExists(builder, method, negate, relationSelection, alias, where) {
     const methodName = `${method}Relation${negate ? 'Not' : ''}Exists`;
-    const key = (0, query_builder_utils_1.getTypedSelectionKey)(builder, relationSelection);
-    if (Array.isArray(key)) {
-        throw new TypeError(`${methodName} expects the callback to select one relation, got ${key.length}: ${key.join(', ')}`);
-    }
-    const dot = key.indexOf('.');
-    const ownerAlias = key.slice(0, dot);
-    const propertyPath = key.slice(dot + 1);
-    const aliases = queryAliases(builder);
+    const { aliasName: ownerAlias, propertyPath } = (0, query_builder_utils_1.resolveTypedProperty)(builder, relationSelection, methodName);
+    const aliases = (0, query_builder_utils_1.listQueryAliases)(builder);
     const owner = aliases.find((candidate) => candidate.name === ownerAlias);
     const relation = (owner === null || owner === void 0 ? void 0 : owner.hasMetadata) ? owner.metadata.findRelationWithPropertyPath(propertyPath) : undefined;
-    if (!relation) {
-        throw new TypeError(`${methodName}: ${key} is not a relation of an entity of the query`);
+    if (!owner || !relation) {
+        throw new TypeError(`${methodName}: ${ownerAlias}.${propertyPath} is not a relation of an entity of the query`);
     }
     // in the subquery the alias would hide the outer one the join condition refers to; SQLite matches
     // names without case, so 'USER' would hide 'user' there
@@ -45,26 +39,12 @@ function attachRelationExists(builder, method, negate, relationSelection, alias,
         .createQueryBuilder()
         .select('1')
         .from(relation.inverseEntityMetadata.target, alias);
-    const correlation = joinCondition(relation, ownerAlias, alias, column, subQuery);
+    const correlation = joinCondition(relation, owner.name, alias, column, subQuery);
     where === null || where === void 0 ? void 0 : where(subQuery);
     // after the caller's conditions, so a `where` or an `orWhere` of theirs can't drop or bypass it
     (0, where_utils_1.andWhereNarrowing)(subQuery, correlation);
     return (0, where_exists_extension_1.attachExists)(builder, method, subQuery, negate);
 }
-/**
- * The aliases of the query and of the queries it is part of. Inside `Brackets` the builder has the outer
- * query's main alias but none of its joins: those are on its parent.
- */
-function queryAliases(builder) {
-    const aliases = [];
-    // parentQueryBuilder is protected in TypeORM's types
-    let query = builder;
-    for (; query; query = query.parentQueryBuilder) {
-        const { aliases: own, mainAlias } = query.expressionMap;
-        aliases.push(...own, ...(mainAlias ? [mainAlias] : []));
-    }
-    return aliases;
-}
 const equal = (left, right) => `${left} = ${right}`;
 /** The condition between the related rows (`alias`) and the outer row (`ownerAlias`); joins the junction table of a many-to-many. */
 function joinCondition(relation, ownerAlias, alias, column, subQuery) {