typeorm 0.3.29-dev.cc07c90 → 1.0.0-beta.1

package/browser/find-options/FindOperator.js

@@ -1,9 +1,12 @@
-import { InstanceChecker } from "../util/InstanceChecker";
-import { ApplyValueTransformers } from "../util/ApplyValueTransformers";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindOperator = void 0;
+const InstanceChecker_1 = require("../util/InstanceChecker");
+const ApplyValueTransformers_1 = require("../util/ApplyValueTransformers");
 /**
  * Find Operator used in Find Conditions.
  */
-export class FindOperator {
+class FindOperator {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
@@ -24,7 +27,7 @@ export class FindOperator {
      * Extracts final value if value is another find operator.
      */
     get useParameter() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value.useParameter;
         return this._useParameter;
     }
@@ -33,7 +36,7 @@ export class FindOperator {
      * Extracts final value if value is another find operator.
      */
     get multipleParameters() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value.multipleParameters;
         return this._multipleParameters;
     }
@@ -47,7 +50,7 @@ export class FindOperator {
      * Gets the final value needs to be used as parameter value.
      */
     get value() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value.value;
         return this._value;
     }
@@ -55,7 +58,7 @@ export class FindOperator {
      * Gets ObjectLiteral parameters.
      */
     get objectLiteralParameters() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value.objectLiteralParameters;
         return this._objectLiteralParameters;
     }
@@ -63,7 +66,7 @@ export class FindOperator {
      * Gets the child FindOperator if it exists
      */
     get child() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value;
         return undefined;
     }
@@ -71,7 +74,7 @@ export class FindOperator {
      * Gets the SQL generator
      */
     get getSql() {
-        if (InstanceChecker.isFindOperator(this._value))
+        if (InstanceChecker_1.InstanceChecker.isFindOperator(this._value))
             return this._value.getSql;
         return this._getSql;
     }
@@ -83,10 +86,10 @@ export class FindOperator {
             this._value =
                 Array.isArray(this._value) && this._multipleParameters
                     ? this._value.map((v) => transformer &&
-                        ApplyValueTransformers.transformTo(transformer, v))
-                    : ApplyValueTransformers.transformTo(transformer, this._value);
+                        ApplyValueTransformers_1.ApplyValueTransformers.transformTo(transformer, v))
+                    : ApplyValueTransformers_1.ApplyValueTransformers.transformTo(transformer, this._value);
         }
     }
 }
-
-//# sourceMappingURL=FindOperator.js.map
+exports.FindOperator = FindOperator;
+//# sourceMappingURL=FindOperator.js.map

package/browser/find-options/FindOperator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindOperator.ts"],"names":[],"mappings":"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","file":"FindOperator.js","sourcesContent":["import { ObjectLiteral } from \"../common/ObjectLiteral\"\nimport { FindOperatorType } from \"./FindOperatorType\"\nimport { InstanceChecker } from \"../util/InstanceChecker\"\nimport { ValueTransformer } from \"../decorator/options/ValueTransformer\"\nimport { ApplyValueTransformers } from \"../util/ApplyValueTransformers\"\n\ntype SqlGeneratorType = (aliasPath: string) => string\n\n/**\n * Find Operator used in Find Conditions.\n */\nexport class FindOperator<T> {\n    readonly \"@instanceof\" = Symbol.for(\"FindOperator\")\n\n    // -------------------------------------------------------------------------\n    // Private Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Operator type.\n     */\n    private _type: FindOperatorType\n\n    /**\n     * Parameter value.\n     */\n    private _value: T | FindOperator<T>\n\n    /**\n     * ObjectLiteral parameters.\n     */\n    private _objectLiteralParameters: ObjectLiteral | undefined\n\n    /**\n     * Indicates if parameter is used or not for this operator.\n     */\n    private _useParameter: boolean\n\n    /**\n     * Indicates if multiple parameters must be used for this operator.\n     */\n    private _multipleParameters: boolean\n\n    /**\n     * SQL generator\n     */\n    private _getSql: SqlGeneratorType | undefined\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(\n        type: FindOperatorType,\n        value: T | FindOperator<T>,\n        useParameter: boolean = true,\n        multipleParameters: boolean = false,\n        getSql?: SqlGeneratorType,\n        objectLiteralParameters?: ObjectLiteral,\n    ) {\n        this._type = type\n        this._value = value\n        this._useParameter = useParameter\n        this._multipleParameters = multipleParameters\n        this._getSql = getSql\n        this._objectLiteralParameters = objectLiteralParameters\n    }\n\n    // -------------------------------------------------------------------------\n    // Accessors\n    // -------------------------------------------------------------------------\n\n    /**\n     * Indicates if parameter is used or not for this operator.\n     * Extracts final value if value is another find operator.\n     */\n    get useParameter(): boolean {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.useParameter\n\n        return this._useParameter\n    }\n\n    /**\n     * Indicates if multiple parameters must be used for this operator.\n     * Extracts final value if value is another find operator.\n     */\n    get multipleParameters(): boolean {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.multipleParameters\n\n        return this._multipleParameters\n    }\n\n    /**\n     * Gets the Type of this FindOperator\n     */\n    get type(): FindOperatorType {\n        return this._type\n    }\n\n    /**\n     * Gets the final value needs to be used as parameter value.\n     */\n    get value(): T {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.value\n\n        return this._value\n    }\n\n    /**\n     * Gets ObjectLiteral parameters.\n     */\n    get objectLiteralParameters(): ObjectLiteral | undefined {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.objectLiteralParameters\n\n        return this._objectLiteralParameters\n    }\n\n    /**\n     * Gets the child FindOperator if it exists\n     */\n    get child(): FindOperator<T> | undefined {\n        if (InstanceChecker.isFindOperator(this._value)) return this._value\n\n        return undefined\n    }\n\n    /**\n     * Gets the SQL generator\n     */\n    get getSql(): SqlGeneratorType | undefined {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.getSql\n\n        return this._getSql\n    }\n\n    transformValue(transformer: ValueTransformer | ValueTransformer[]) {\n        if (this._value instanceof FindOperator) {\n            this._value.transformValue(transformer)\n        } else {\n            this._value =\n                Array.isArray(this._value) && this._multipleParameters\n                    ? this._value.map(\n                          (v: any) =>\n                              transformer &&\n                              ApplyValueTransformers.transformTo(\n                                  transformer,\n                                  v,\n                              ),\n                      )\n                    : ApplyValueTransformers.transformTo(\n                          transformer,\n                          this._value,\n                      )\n        }\n    }\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"FindOperator.js","sourceRoot":"../build/browser/src/","sources":["find-options/FindOperator.ts"],"names":[],"mappings":";;;AAEA,6DAAyD;AAEzD,2EAAuE;AAIvE;;GAEG;AACH,MAAa,YAAY;IAqCrB,4EAA4E;IAC5E,cAAc;IACd,4EAA4E;IAE5E,YACI,IAAsB,EACtB,KAA0B,EAC1B,eAAwB,IAAI,EAC5B,qBAA8B,KAAK,EACnC,MAAyB,EACzB,uBAAuC;QA9ClC,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAgD/C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAA;QACjC,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAA;QAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,wBAAwB,GAAG,uBAAuB,CAAA;IAC3D,CAAC;IAED,4EAA4E;IAC5E,YAAY;IACZ,4EAA4E;IAE5E;;;OAGG;IACH,IAAI,YAAY;QACZ,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAA;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAA;IAC7B,CAAC;IAED;;;OAGG;IACH,IAAI,kBAAkB;QAClB,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAA;QAEzC,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACL,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;QAE5B,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED;;OAEG;IACH,IAAI,uBAAuB;QACvB,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAA;QAE9C,OAAO,IAAI,CAAC,wBAAwB,CAAA;IACxC,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACL,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,MAAM,CAAA;QAEnE,OAAO,SAAS,CAAA;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,IAAI,iCAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,cAAc,CAAC,WAAkD;QAC7D,IAAI,IAAI,CAAC,MAAM,YAAY,YAAY,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAC3C,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM;gBACP,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,mBAAmB;oBAClD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,CAAC,CAAM,EAAE,EAAE,CACP,WAAW;wBACX,+CAAsB,CAAC,WAAW,CAC9B,WAAW,EACX,CAAC,CACJ,CACR;oBACH,CAAC,CAAC,+CAAsB,CAAC,WAAW,CAC9B,WAAW,EACX,IAAI,CAAC,MAAM,CACd,CAAA;QACf,CAAC;IACL,CAAC;CACJ;AArJD,oCAqJC","sourcesContent":["import type { ObjectLiteral } from \"../common/ObjectLiteral\"\nimport type { FindOperatorType } from \"./FindOperatorType\"\nimport { InstanceChecker } from \"../util/InstanceChecker\"\nimport type { ValueTransformer } from \"../decorator/options/ValueTransformer\"\nimport { ApplyValueTransformers } from \"../util/ApplyValueTransformers\"\n\ntype SqlGeneratorType = (aliasPath: string) => string\n\n/**\n * Find Operator used in Find Conditions.\n */\nexport class FindOperator<T> {\n    readonly \"@instanceof\" = Symbol.for(\"FindOperator\")\n\n    // -------------------------------------------------------------------------\n    // Private Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Operator type.\n     */\n    private _type: FindOperatorType\n\n    /**\n     * Parameter value.\n     */\n    private _value: T | FindOperator<T>\n\n    /**\n     * ObjectLiteral parameters.\n     */\n    private _objectLiteralParameters: ObjectLiteral | undefined\n\n    /**\n     * Indicates if parameter is used or not for this operator.\n     */\n    private _useParameter: boolean\n\n    /**\n     * Indicates if multiple parameters must be used for this operator.\n     */\n    private _multipleParameters: boolean\n\n    /**\n     * SQL generator\n     */\n    private _getSql: SqlGeneratorType | undefined\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(\n        type: FindOperatorType,\n        value: T | FindOperator<T>,\n        useParameter: boolean = true,\n        multipleParameters: boolean = false,\n        getSql?: SqlGeneratorType,\n        objectLiteralParameters?: ObjectLiteral,\n    ) {\n        this._type = type\n        this._value = value\n        this._useParameter = useParameter\n        this._multipleParameters = multipleParameters\n        this._getSql = getSql\n        this._objectLiteralParameters = objectLiteralParameters\n    }\n\n    // -------------------------------------------------------------------------\n    // Accessors\n    // -------------------------------------------------------------------------\n\n    /**\n     * Indicates if parameter is used or not for this operator.\n     * Extracts final value if value is another find operator.\n     */\n    get useParameter(): boolean {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.useParameter\n\n        return this._useParameter\n    }\n\n    /**\n     * Indicates if multiple parameters must be used for this operator.\n     * Extracts final value if value is another find operator.\n     */\n    get multipleParameters(): boolean {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.multipleParameters\n\n        return this._multipleParameters\n    }\n\n    /**\n     * Gets the Type of this FindOperator\n     */\n    get type(): FindOperatorType {\n        return this._type\n    }\n\n    /**\n     * Gets the final value needs to be used as parameter value.\n     */\n    get value(): T {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.value\n\n        return this._value\n    }\n\n    /**\n     * Gets ObjectLiteral parameters.\n     */\n    get objectLiteralParameters(): ObjectLiteral | undefined {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.objectLiteralParameters\n\n        return this._objectLiteralParameters\n    }\n\n    /**\n     * Gets the child FindOperator if it exists\n     */\n    get child(): FindOperator<T> | undefined {\n        if (InstanceChecker.isFindOperator(this._value)) return this._value\n\n        return undefined\n    }\n\n    /**\n     * Gets the SQL generator\n     */\n    get getSql(): SqlGeneratorType | undefined {\n        if (InstanceChecker.isFindOperator(this._value))\n            return this._value.getSql\n\n        return this._getSql\n    }\n\n    transformValue(transformer: ValueTransformer | ValueTransformer[]) {\n        if (this._value instanceof FindOperator) {\n            this._value.transformValue(transformer)\n        } else {\n            this._value =\n                Array.isArray(this._value) && this._multipleParameters\n                    ? this._value.map(\n                          (v: any) =>\n                              transformer &&\n                              ApplyValueTransformers.transformTo(\n                                  transformer,\n                                  v,\n                              ),\n                      )\n                    : ApplyValueTransformers.transformTo(\n                          transformer,\n                          this._value,\n                      )\n        }\n    }\n}\n"]}

package/browser/find-options/FindOperatorType.js

@@ -1,3 +1,3 @@
-export {};
-
-//# sourceMappingURL=FindOperatorType.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FindOperatorType.js.map

package/browser/find-options/FindOperatorType.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindOperatorType.ts"],"names":[],"mappings":"","file":"FindOperatorType.js","sourcesContent":["/**\n * List of types that FindOperator can be.\n */\nexport type FindOperatorType =\n    | \"not\"\n    | \"lessThan\"\n    | \"lessThanOrEqual\"\n    | \"moreThan\"\n    | \"moreThanOrEqual\"\n    | \"equal\"\n    | \"between\"\n    | \"in\"\n    | \"any\"\n    | \"isNull\"\n    | \"ilike\"\n    | \"like\"\n    | \"raw\"\n    | \"arrayContains\"\n    | \"arrayContainedBy\"\n    | \"arrayOverlap\"\n    | \"and\"\n    | \"jsonContains\"\n    | \"or\"\n"],"sourceRoot":".."}
+{"version":3,"file":"FindOperatorType.js","sourceRoot":"../build/browser/src/","sources":["find-options/FindOperatorType.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * List of types that FindOperator can be.\n */\nexport type FindOperatorType =\n    | \"not\"\n    | \"lessThan\"\n    | \"lessThanOrEqual\"\n    | \"moreThan\"\n    | \"moreThanOrEqual\"\n    | \"equal\"\n    | \"between\"\n    | \"in\"\n    | \"any\"\n    | \"isNull\"\n    | \"ilike\"\n    | \"like\"\n    | \"raw\"\n    | \"arrayContains\"\n    | \"arrayContainedBy\"\n    | \"arrayOverlap\"\n    | \"and\"\n    | \"jsonContains\"\n    | \"or\"\n"]}

package/browser/find-options/FindOptionsOrder.d.ts

@@ -1,8 +1,8 @@
-import { ObjectId } from "../driver/mongodb/typings";
+import type { ObjectId } from "../driver/mongodb/typings";
 /**
  * A single property handler for FindOptionsOrder.
  */
-export type FindOptionsOrderProperty<Property> = Property extends Promise<infer I> ? FindOptionsOrderProperty<NonNullable<I>> : Property extends Array<infer I> ? FindOptionsOrderProperty<NonNullable<I>> : Property extends Function ? never : Property extends string ? FindOptionsOrderValue : Property extends number ? FindOptionsOrderValue : Property extends boolean ? FindOptionsOrderValue : Property extends Buffer ? FindOptionsOrderValue : Property extends Date ? FindOptionsOrderValue : Property extends ObjectId ? FindOptionsOrderValue : Property extends object ? FindOptionsOrder<Property> | FindOptionsOrderValue : FindOptionsOrderValue;
+export type FindOptionsOrderProperty<Property> = Property extends Promise<infer I> ? FindOptionsOrderProperty<NonNullable<I>> : Property extends Array<infer I> ? FindOptionsOrderProperty<NonNullable<I>> : Property extends Function ? never : Property extends string ? FindOptionsOrderValue : Property extends number ? FindOptionsOrderValue : Property extends boolean ? FindOptionsOrderValue : Property extends Uint8Array ? FindOptionsOrderValue : Property extends Date ? FindOptionsOrderValue : Property extends ObjectId ? FindOptionsOrderValue : Property extends object ? FindOptionsOrder<Property> | FindOptionsOrderValue : FindOptionsOrderValue;
 /**
  * Order by find options.
  */

package/browser/find-options/FindOptionsOrder.js

@@ -1,3 +1,3 @@
-export {};
-
-//# sourceMappingURL=FindOptionsOrder.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FindOptionsOrder.js.map

package/browser/find-options/FindOptionsOrder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindOptionsOrder.ts"],"names":[],"mappings":"","file":"FindOptionsOrder.js","sourcesContent":["import { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsOrder.\n */\nexport type FindOptionsOrderProperty<Property> = Property extends Promise<\n    infer I\n>\n    ? FindOptionsOrderProperty<NonNullable<I>>\n    : Property extends Array<infer I>\n    ? FindOptionsOrderProperty<NonNullable<I>>\n    : Property extends Function\n    ? never\n    : Property extends string\n    ? FindOptionsOrderValue\n    : Property extends number\n    ? FindOptionsOrderValue\n    : Property extends boolean\n    ? FindOptionsOrderValue\n    : Property extends Buffer\n    ? FindOptionsOrderValue\n    : Property extends Date\n    ? FindOptionsOrderValue\n    : Property extends ObjectId\n    ? FindOptionsOrderValue\n    : Property extends object\n    ? FindOptionsOrder<Property> | FindOptionsOrderValue\n    : FindOptionsOrderValue\n\n/**\n * Order by find options.\n */\nexport type FindOptionsOrder<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsOrderProperty<NonNullable<Entity[P]>>\n}\n\n/**\n * Value of order by in find options.\n */\nexport type FindOptionsOrderValue =\n    | \"ASC\"\n    | \"DESC\"\n    | \"asc\"\n    | \"desc\"\n    | 1\n    | -1\n    | {\n          direction?: \"asc\" | \"desc\" | \"ASC\" | \"DESC\"\n          nulls?: \"first\" | \"last\" | \"FIRST\" | \"LAST\"\n      }\n"],"sourceRoot":".."}
+{"version":3,"file":"FindOptionsOrder.js","sourceRoot":"../build/browser/src/","sources":["find-options/FindOptionsOrder.ts"],"names":[],"mappings":"","sourcesContent":["import type { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsOrder.\n */\nexport type FindOptionsOrderProperty<Property> =\n    Property extends Promise<infer I>\n        ? FindOptionsOrderProperty<NonNullable<I>>\n        : Property extends Array<infer I>\n          ? FindOptionsOrderProperty<NonNullable<I>>\n          : Property extends Function\n            ? never\n            : Property extends string\n              ? FindOptionsOrderValue\n              : Property extends number\n                ? FindOptionsOrderValue\n                : Property extends boolean\n                  ? FindOptionsOrderValue\n                  : Property extends Uint8Array\n                    ? FindOptionsOrderValue\n                    : Property extends Date\n                      ? FindOptionsOrderValue\n                      : Property extends ObjectId\n                        ? FindOptionsOrderValue\n                        : Property extends object\n                          ? FindOptionsOrder<Property> | FindOptionsOrderValue\n                          : FindOptionsOrderValue\n\n/**\n * Order by find options.\n */\nexport type FindOptionsOrder<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsOrderProperty<NonNullable<Entity[P]>>\n}\n\n/**\n * Value of order by in find options.\n */\nexport type FindOptionsOrderValue =\n    | \"ASC\"\n    | \"DESC\"\n    | \"asc\"\n    | \"desc\"\n    | 1\n    | -1\n    | {\n          direction?: \"asc\" | \"desc\" | \"ASC\" | \"DESC\"\n          nulls?: \"first\" | \"last\" | \"FIRST\" | \"LAST\"\n      }\n"]}

package/browser/find-options/FindOptionsRelations.d.ts

@@ -1,18 +1,11 @@
-import { ObjectId } from "../driver/mongodb/typings";
+import type { ObjectId } from "../driver/mongodb/typings";
 /**
  * A single property handler for FindOptionsRelations.
  */
-export type FindOptionsRelationsProperty<Property> = Property extends Promise<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends Array<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends string ? never : Property extends number ? never : Property extends boolean ? never : Property extends Function ? never : Property extends Buffer ? never : Property extends Date ? never : Property extends ObjectId ? never : Property extends object ? FindOptionsRelations<Property> | boolean : boolean;
+export type FindOptionsRelationsProperty<Property> = Property extends Promise<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends Array<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends string ? never : Property extends number ? never : Property extends boolean ? never : Property extends Function ? never : Property extends Uint8Array ? never : Property extends Date ? never : Property extends ObjectId ? never : Property extends object ? FindOptionsRelations<Property> | boolean : boolean;
 /**
  * Relations find options.
  */
 export type FindOptionsRelations<Entity> = {
     [P in keyof Entity]?: P extends "toString" ? unknown : FindOptionsRelationsProperty<NonNullable<Entity[P]>>;
 };
-/**
- * Relation names to be selected by "relation" defined as string.
- * Old relation mechanism in TypeORM.
- *
- * @deprecated will be removed in the next version, use FindOptionsRelation type notation instead
- */
-export type FindOptionsRelationByString = string[];

package/browser/find-options/FindOptionsRelations.js

@@ -1,3 +1,3 @@
-export {};
-
-//# sourceMappingURL=FindOptionsRelations.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FindOptionsRelations.js.map

package/browser/find-options/FindOptionsRelations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindOptionsRelations.ts"],"names":[],"mappings":"","file":"FindOptionsRelations.js","sourcesContent":["import { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsRelations.\n */\nexport type FindOptionsRelationsProperty<Property> = Property extends Promise<\n    infer I\n>\n    ? FindOptionsRelationsProperty<NonNullable<I>> | boolean\n    : Property extends Array<infer I>\n    ? FindOptionsRelationsProperty<NonNullable<I>> | boolean\n    : Property extends string\n    ? never\n    : Property extends number\n    ? never\n    : Property extends boolean\n    ? never\n    : Property extends Function\n    ? never\n    : Property extends Buffer\n    ? never\n    : Property extends Date\n    ? never\n    : Property extends ObjectId\n    ? never\n    : Property extends object\n    ? FindOptionsRelations<Property> | boolean\n    : boolean\n\n/**\n * Relations find options.\n */\nexport type FindOptionsRelations<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsRelationsProperty<NonNullable<Entity[P]>>\n}\n\n/**\n * Relation names to be selected by \"relation\" defined as string.\n * Old relation mechanism in TypeORM.\n *\n * @deprecated will be removed in the next version, use FindOptionsRelation type notation instead\n */\nexport type FindOptionsRelationByString = string[]\n"],"sourceRoot":".."}
+{"version":3,"file":"FindOptionsRelations.js","sourceRoot":"../build/browser/src/","sources":["find-options/FindOptionsRelations.ts"],"names":[],"mappings":"","sourcesContent":["import type { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsRelations.\n */\nexport type FindOptionsRelationsProperty<Property> =\n    Property extends Promise<infer I>\n        ? FindOptionsRelationsProperty<NonNullable<I>> | boolean\n        : Property extends Array<infer I>\n          ? FindOptionsRelationsProperty<NonNullable<I>> | boolean\n          : Property extends string\n            ? never\n            : Property extends number\n              ? never\n              : Property extends boolean\n                ? never\n                : Property extends Function\n                  ? never\n                  : Property extends Uint8Array\n                    ? never\n                    : Property extends Date\n                      ? never\n                      : Property extends ObjectId\n                        ? never\n                        : Property extends object\n                          ? FindOptionsRelations<Property> | boolean\n                          : boolean\n\n/**\n * Relations find options.\n */\nexport type FindOptionsRelations<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsRelationsProperty<NonNullable<Entity[P]>>\n}\n"]}

package/browser/find-options/FindOptionsSelect.d.ts

@@ -1,18 +1,11 @@
-import { ObjectId } from "../driver/mongodb/typings";
+import type { ObjectId } from "../driver/mongodb/typings";
 /**
  * A single property handler for FindOptionsSelect.
  */
-export type FindOptionsSelectProperty<Property> = Property extends Promise<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends Array<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends string ? boolean : Property extends number ? boolean : Property extends boolean ? boolean : Property extends Function ? never : Property extends Buffer ? boolean : Property extends Date ? boolean : Property extends ObjectId ? boolean : Property extends object ? FindOptionsSelect<Property> | boolean : boolean;
+export type FindOptionsSelectProperty<Property> = Property extends Promise<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends Array<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends string ? boolean : Property extends number ? boolean : Property extends boolean ? boolean : Property extends Function ? never : Property extends Uint8Array ? boolean : Property extends Date ? boolean : Property extends ObjectId ? boolean : Property extends object ? FindOptionsSelect<Property> | boolean : boolean;
 /**
  * Select find options.
  */
 export type FindOptionsSelect<Entity> = {
     [P in keyof Entity]?: P extends "toString" ? unknown : FindOptionsSelectProperty<NonNullable<Entity[P]>>;
 };
-/**
- * Property paths (column names) to be selected by "find" defined as string.
- * Old selection mechanism in TypeORM.
- *
- * @deprecated will be removed in the next version, use FindOptionsSelect type notation instead
- */
-export type FindOptionsSelectByString<Entity> = (keyof Entity)[];

package/browser/find-options/FindOptionsSelect.js

@@ -1,3 +1,3 @@
-export {};
-
-//# sourceMappingURL=FindOptionsSelect.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FindOptionsSelect.js.map

package/browser/find-options/FindOptionsSelect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/find-options/FindOptionsSelect.ts"],"names":[],"mappings":"","file":"FindOptionsSelect.js","sourcesContent":["import { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsSelect.\n */\nexport type FindOptionsSelectProperty<Property> = Property extends Promise<\n    infer I\n>\n    ? FindOptionsSelectProperty<I> | boolean\n    : Property extends Array<infer I>\n    ? FindOptionsSelectProperty<I> | boolean\n    : Property extends string\n    ? boolean\n    : Property extends number\n    ? boolean\n    : Property extends boolean\n    ? boolean\n    : Property extends Function\n    ? never\n    : Property extends Buffer\n    ? boolean\n    : Property extends Date\n    ? boolean\n    : Property extends ObjectId\n    ? boolean\n    : Property extends object\n    ? FindOptionsSelect<Property> | boolean\n    : boolean\n\n/**\n * Select find options.\n */\nexport type FindOptionsSelect<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsSelectProperty<NonNullable<Entity[P]>>\n}\n\n/**\n * Property paths (column names) to be selected by \"find\" defined as string.\n * Old selection mechanism in TypeORM.\n *\n * @deprecated will be removed in the next version, use FindOptionsSelect type notation instead\n */\nexport type FindOptionsSelectByString<Entity> = (keyof Entity)[]\n"],"sourceRoot":".."}
+{"version":3,"file":"FindOptionsSelect.js","sourceRoot":"../build/browser/src/","sources":["find-options/FindOptionsSelect.ts"],"names":[],"mappings":"","sourcesContent":["import type { ObjectId } from \"../driver/mongodb/typings\"\n\n/**\n * A single property handler for FindOptionsSelect.\n */\nexport type FindOptionsSelectProperty<Property> =\n    Property extends Promise<infer I>\n        ? FindOptionsSelectProperty<I> | boolean\n        : Property extends Array<infer I>\n          ? FindOptionsSelectProperty<I> | boolean\n          : Property extends string\n            ? boolean\n            : Property extends number\n              ? boolean\n              : Property extends boolean\n                ? boolean\n                : Property extends Function\n                  ? never\n                  : Property extends Uint8Array\n                    ? boolean\n                    : Property extends Date\n                      ? boolean\n                      : Property extends ObjectId\n                        ? boolean\n                        : Property extends object\n                          ? FindOptionsSelect<Property> | boolean\n                          : boolean\n\n/**\n * Select find options.\n */\nexport type FindOptionsSelect<Entity> = {\n    [P in keyof Entity]?: P extends \"toString\"\n        ? unknown\n        : FindOptionsSelectProperty<NonNullable<Entity[P]>>\n}\n"]}

package/browser/find-options/FindOptionsUtils.d.ts

@@ -1,29 +1,64 @@
-import { FindManyOptions } from "./FindManyOptions";
-import { FindOneOptions } from "./FindOneOptions";
-import { SelectQueryBuilder } from "../query-builder/SelectQueryBuilder";
-import { EntityMetadata } from "../metadata/EntityMetadata";
-import { FindTreeOptions } from "./FindTreeOptions";
-import { ObjectLiteral } from "../common/ObjectLiteral";
+import type { FindManyOptions } from "./FindManyOptions";
+import type { FindOneOptions } from "./FindOneOptions";
+import type { SelectQueryBuilder } from "../query-builder/SelectQueryBuilder";
+import type { EntityMetadata } from "../metadata/EntityMetadata";
+import type { FindTreeOptions } from "./FindTreeOptions";
+import type { ObjectLiteral } from "../common/ObjectLiteral";
+import type { RelationMetadata } from "../metadata/RelationMetadata";
 /**
  * Utilities to work with FindOptions.
  */
 export declare class FindOptionsUtils {
+    /**
+     * Throws if the removed `join` option is present on a find-options object.
+     * This catches untyped/JS callers still passing `join` after its removal in v1.0.
+     * @param options
+     */
+    static rejectJoinOption(options: unknown): void;
+    /**
+     * Throws if the removed string-array `select` syntax is used.
+     * This catches untyped/JS callers still passing `select: ["col"]` after its removal in v1.0.
+     * @param options
+     */
+    static rejectStringArraySelect(options: unknown): void;
+    /**
+     * Throws if the removed string-array `relations` syntax is used.
+     * This catches untyped/JS callers still passing `relations: ["rel"]` after its removal in v1.0.
+     * @param options
+     */
+    static rejectStringArrayRelations(options: unknown): void;
+    /**
+     * Determines the join type for a relation based on nullability,
+     * join column ownership, and soft-delete configuration.
+     *
+     * Uses INNER JOIN only when:
+     * - The relation is non-nullable (nullable=false)
+     * - The relation owns the join column (ManyToOne or OneToOne owner)
+     * - The target entity has no soft-delete column, or withDeleted is enabled
+     * @param relation
+     * @param withDeleted
+     * @param parentJoinType
+     */
+    static getRelationJoinType(relation: RelationMetadata, withDeleted: boolean, parentJoinType?: "inner" | "left"): "inner" | "left";
     /**
      * Checks if given object is really instance of FindOneOptions interface.
+     * @param obj
      */
     static isFindOneOptions<Entity = any>(obj: any): obj is FindOneOptions<Entity>;
     /**
      * Checks if given object is really instance of FindManyOptions interface.
+     * @param obj
      */
     static isFindManyOptions<Entity = any>(obj: any): obj is FindManyOptions<Entity>;
-    /**
-     * Checks if given object is really instance of FindOptions interface.
-     */
-    static extractFindManyOptionsAlias(object: any): string | undefined;
     static applyOptionsToTreeQueryBuilder<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, options?: FindTreeOptions): SelectQueryBuilder<T>;
     /**
      * Adds joins for all relations and sub-relations of the given relations provided in the find options.
+     * @param qb
+     * @param allRelations
+     * @param alias
+     * @param metadata
+     * @param prefix
      */
     static applyRelationsRecursively(qb: SelectQueryBuilder<any>, allRelations: string[], alias: string, metadata: EntityMetadata, prefix: string): void;
-    static joinEagerRelations(qb: SelectQueryBuilder<any>, alias: string, metadata: EntityMetadata): void;
+    static joinEagerRelations(qb: SelectQueryBuilder<any>, alias: string, metadata: EntityMetadata, parentJoinType?: "inner" | "left"): void;
 }

package/browser/find-options/FindOptionsUtils.js

@@ -1,15 +1,89 @@
-import { FindRelationsNotFoundError } from "../error";
-import { DriverUtils } from "../driver/DriverUtils";
-import { EntityPropertyNotFoundError } from "../error";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindOptionsUtils = void 0;
+const error_1 = require("../error");
+const DriverUtils_1 = require("../driver/DriverUtils");
+const error_2 = require("../error");
 /**
  * Utilities to work with FindOptions.
  */
-export class FindOptionsUtils {
+class FindOptionsUtils {
     // -------------------------------------------------------------------------
     // Public Static Methods
     // -------------------------------------------------------------------------
+    /**
+     * Throws if the removed `join` option is present on a find-options object.
+     * This catches untyped/JS callers still passing `join` after its removal in v1.0.
+     * @param options
+     */
+    static rejectJoinOption(options) {
+        if (options &&
+            typeof options === "object" &&
+            "join" in options &&
+            options.join != null) {
+            throw new error_2.TypeORMError(`"join" option has been removed. Use "relations" for left joins ` +
+                `or QueryBuilder for other join types. See the v1 migration guide for details.`);
+        }
+    }
+    /**
+     * Throws if the removed string-array `select` syntax is used.
+     * This catches untyped/JS callers still passing `select: ["col"]` after its removal in v1.0.
+     * @param options
+     */
+    static rejectStringArraySelect(options) {
+        if (options &&
+            typeof options === "object" &&
+            "select" in options &&
+            Array.isArray(options.select)) {
+            throw new error_2.TypeORMError(`String-array "select" syntax has been removed. ` +
+                `Use object syntax instead, e.g. select: { id: true, name: true }. ` +
+                `See the v1 migration guide for details.`);
+        }
+    }
+    /**
+     * Throws if the removed string-array `relations` syntax is used.
+     * This catches untyped/JS callers still passing `relations: ["rel"]` after its removal in v1.0.
+     * @param options
+     */
+    static rejectStringArrayRelations(options) {
+        if (options &&
+            typeof options === "object" &&
+            "relations" in options &&
+            Array.isArray(options.relations)) {
+            throw new error_2.TypeORMError(`String-array "relations" syntax has been removed. ` +
+                `Use object syntax instead, e.g. relations: { profile: true, posts: true }. ` +
+                `See the v1 migration guide for details.`);
+        }
+    }
+    /**
+     * Determines the join type for a relation based on nullability,
+     * join column ownership, and soft-delete configuration.
+     *
+     * Uses INNER JOIN only when:
+     * - The relation is non-nullable (nullable=false)
+     * - The relation owns the join column (ManyToOne or OneToOne owner)
+     * - The target entity has no soft-delete column, or withDeleted is enabled
+     * @param relation
+     * @param withDeleted
+     * @param parentJoinType
+     */
+    static getRelationJoinType(relation, withDeleted, parentJoinType = "inner") {
+        // If the parent was LEFT-joined, all descendants must also be LEFT
+        // to avoid filtering out rows where the parent alias is NULL
+        if (parentJoinType === "left") {
+            return "left";
+        }
+        if (!relation.isNullable && relation.isWithJoinColumn) {
+            const hasSoftDelete = relation.inverseEntityMetadata.deleteDateColumn;
+            if (!hasSoftDelete || withDeleted) {
+                return "inner";
+            }
+        }
+        return "left";
+    }
     /**
      * Checks if given object is really instance of FindOneOptions interface.
+     * @param obj
      */
     static isFindOneOptions(obj) {
         const possibleOptions = obj;
@@ -19,8 +93,6 @@ export class FindOptionsUtils {
                 typeof possibleOptions.select === "object" ||
                 typeof possibleOptions.relations === "object" ||
                 typeof possibleOptions.where === "object" ||
-                // typeof possibleOptions.where === "string" ||
-                typeof possibleOptions.join === "object" ||
                 typeof possibleOptions.order === "object" ||
                 typeof possibleOptions.cache === "object" ||
                 typeof possibleOptions.cache === "boolean" ||
@@ -36,6 +108,7 @@ export class FindOptionsUtils {
     }
     /**
      * Checks if given object is really instance of FindManyOptions interface.
+     * @param obj
      */
     static isFindManyOptions(obj) {
         const possibleOptions = obj;
@@ -50,14 +123,6 @@ export class FindOptionsUtils {
                 typeof possibleOptions.take ===
                     "string"));
     }
-    /**
-     * Checks if given object is really instance of FindOptions interface.
-     */
-    static extractFindManyOptionsAlias(object) {
-        if (this.isFindManyOptions(object) && object.join)
-            return object.join.alias;
-        return undefined;
-    }
     static applyOptionsToTreeQueryBuilder(qb, options) {
         if (options?.relations) {
             // Copy because `applyRelationsRecursively` modifies it
@@ -67,7 +132,7 @@ export class FindOptionsUtils {
             // if there are relations left in this array it means those relations were not found in the entity structure
             // so, we give an exception about not found relations
             if (allRelations.length > 0)
-                throw new FindRelationsNotFoundError(allRelations);
+                throw new error_1.FindRelationsNotFoundError(allRelations);
         }
         return qb;
     }
@@ -76,10 +141,15 @@ export class FindOptionsUtils {
     // -------------------------------------------------------------------------
     /**
      * Adds joins for all relations and sub-relations of the given relations provided in the find options.
+     * @param qb
+     * @param allRelations
+     * @param alias
+     * @param metadata
+     * @param prefix
      */
     static applyRelationsRecursively(qb, allRelations, alias, metadata, prefix) {
         // find all relations that match given prefix
-        let matchedBaseRelations = [];
+        let matchedBaseRelations;
         if (prefix) {
             const regexp = new RegExp("^" + prefix.replace(".", "\\.") + "\\.");
             matchedBaseRelations = allRelations
@@ -95,12 +165,15 @@ export class FindOptionsUtils {
         // go through all matched relations and add join for them
         matchedBaseRelations.forEach((relation) => {
             // generate a relation alias
-            const relationAlias = DriverUtils.buildAlias(qb.connection.driver, { joiner: "__" }, alias, relation.propertyPath);
+            const relationAlias = DriverUtils_1.DriverUtils.buildAlias(qb.dataSource.driver, { joiner: "__" }, alias, relation.propertyPath);
             // add a join for the found relation
             const selection = alias + "." + relation.propertyPath;
             if (qb.expressionMap.relationLoadStrategy === "query") {
                 qb.concatRelationMetadata(relation);
             }
+            else if (this.getRelationJoinType(relation, qb.expressionMap.withDeleted) === "inner") {
+                qb.innerJoinAndSelect(selection, relationAlias);
+            }
             else {
                 qb.leftJoinAndSelect(selection, relationAlias);
             }
@@ -121,7 +194,7 @@ export class FindOptionsUtils {
                 relationName = join.alias.name;
             }
             if (!relationName || !relationMetadata) {
-                throw new EntityPropertyNotFoundError(relation.propertyPath, metadata);
+                throw new error_2.EntityPropertyNotFoundError(relation.propertyPath, metadata);
             }
             this.applyRelationsRecursively(qb, allRelations, relationName, relationMetadata, prefix
                 ? prefix + "." + relation.propertyPath
@@ -136,19 +209,17 @@ export class FindOptionsUtils {
             }
         });
     }
-    static joinEagerRelations(qb, alias, metadata) {
+    static joinEagerRelations(qb, alias, metadata, parentJoinType = "inner") {
         metadata.eagerRelations.forEach((relation) => {
             // generate a relation alias
-            let relationAlias = DriverUtils.buildAlias(qb.connection.driver, { joiner: "__" }, alias, relation.propertyName);
+            let relationAlias = DriverUtils_1.DriverUtils.buildAlias(qb.dataSource.driver, { joiner: "__" }, alias, relation.propertyName);
             // add a join for the relation
             // Checking whether the relation wasn't joined yet.
             let addJoin = true;
-            // TODO: Review this validation
             for (const join of qb.expressionMap.joinAttributes) {
-                if (join.condition !== undefined ||
-                    join.mapToProperty !== undefined ||
+                if (join.mapToProperty !== undefined ||
                     join.isMappingMany !== undefined ||
-                    join.direction !== "LEFT" ||
+                    (join.direction !== "LEFT" && join.direction !== "INNER") ||
                     join.entityOrProperty !==
                         `${alias}.${relation.propertyPath}`) {
                     continue;
@@ -158,8 +229,23 @@ export class FindOptionsUtils {
                 break;
             }
             const joinAlreadyAdded = Boolean(qb.expressionMap.joinAttributes.find((joinAttribute) => joinAttribute.alias.name === relationAlias));
+            let joinType = "left";
             if (addJoin && !joinAlreadyAdded) {
-                qb.leftJoin(alias + "." + relation.propertyPath, relationAlias);
+                joinType = this.getRelationJoinType(relation, qb.expressionMap.withDeleted, parentJoinType);
+                if (joinType === "inner") {
+                    qb.innerJoin(alias + "." + relation.propertyPath, relationAlias);
+                }
+                else {
+                    qb.leftJoin(alias + "." + relation.propertyPath, relationAlias);
+                }
+            }
+            else {
+                // Derive join type from existing join for propagation
+                const existingJoin = qb.expressionMap.joinAttributes.find((j) => j.alias.name === relationAlias);
+                if (existingJoin) {
+                    joinType =
+                        existingJoin.direction === "INNER" ? "inner" : "left";
+                }
             }
             // Checking whether the relation wasn't selected yet.
             // This check shall be after the join check to detect relationAlias.
@@ -177,9 +263,9 @@ export class FindOptionsUtils {
                 qb.addSelect(relationAlias);
             }
             // (recursive) join the eager relations
-            this.joinEagerRelations(qb, relationAlias, relation.inverseEntityMetadata);
+            this.joinEagerRelations(qb, relationAlias, relation.inverseEntityMetadata, joinType);
         });
     }
 }
-
-//# sourceMappingURL=FindOptionsUtils.js.map
+exports.FindOptionsUtils = FindOptionsUtils;
+//# sourceMappingURL=FindOptionsUtils.js.map