typeorm 0.3.0-rc.9 → 0.3.0

package/browser/find-options/FindOperator.js

@@ -1,112 +1,79 @@
+import { InstanceChecker } from "../util/InstanceChecker";
 /**
  * Find Operator used in Find Conditions.
  */
-var FindOperator = /** @class */ (function () {
+export class FindOperator {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function FindOperator(type, value, useParameter, multipleParameters) {
-        if (useParameter === void 0) { useParameter = true; }
-        if (multipleParameters === void 0) { multipleParameters = false; }
-        this.type = type;
+    constructor(type, value, useParameter = true, multipleParameters = false, getSql, objectLiteralParameters) {
+        this["@instanceof"] = Symbol.for("FindOperator");
+        this._type = type;
+        this._value = value;
         this._useParameter = useParameter;
         this._multipleParameters = multipleParameters;
-        this._value = value;
-        // if (condition !== undefined) {
-        //     this.condition = condition;
-        //     this._useParameter = condition === true ? true : false;
-        // }
+        this._getSql = getSql;
+        this._objectLiteralParameters = objectLiteralParameters;
     }
-    Object.defineProperty(FindOperator.prototype, "useParameter", {
-        // -------------------------------------------------------------------------
-        // Accessors
-        // -------------------------------------------------------------------------
-        /**
-         * Indicates if parameter is used or not for this operator.
-         * Extracts final value if value is another find operator.
-         */
-        get: function () {
-            if (this._value instanceof FindOperator)
-                return this._value.useParameter;
-            return this._useParameter;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(FindOperator.prototype, "multipleParameters", {
-        /**
-         * Indicates if multiple parameters must be used for this operator.
-         * Extracts final value if value is another find operator.
-         */
-        get: function () {
-            if (this._value instanceof FindOperator)
-                return this._value.multipleParameters;
-            return this._multipleParameters;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(FindOperator.prototype, "value", {
-        /**
-         * Gets the final value needs to be used as parameter value.
-         */
-        get: function () {
-            if (this._value instanceof FindOperator)
-                return this._value.value;
-            return this._value;
-        },
-        enumerable: true,
-        configurable: true
-    });
     // -------------------------------------------------------------------------
-    // Public Methods
+    // Accessors
     // -------------------------------------------------------------------------
     /**
-     * Gets SQL needs to be inserted into final query.
+     * Indicates if parameter is used or not for this operator.
+     * Extracts final value if value is another find operator.
+     */
+    get useParameter() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value.useParameter;
+        return this._useParameter;
+    }
+    /**
+     * Indicates if multiple parameters must be used for this operator.
+     * Extracts final value if value is another find operator.
+     */
+    get multipleParameters() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value.multipleParameters;
+        return this._multipleParameters;
+    }
+    /**
+     * Gets the Type of this FindOperator
+     */
+    get type() {
+        return this._type;
+    }
+    /**
+     * Gets the final value needs to be used as parameter value.
      */
-    FindOperator.prototype.toSql = function (connection, aliasPath, parameters) {
-        switch (this.type) {
-            case "not":
-                if (this._value instanceof FindOperator) {
-                    return "NOT(" + this._value.toSql(connection, aliasPath, parameters) + ")";
-                }
-                else {
-                    return aliasPath + " != " + parameters[0];
-                }
-            case "lessThan":
-                return aliasPath + " < " + parameters[0];
-            case "lessThanOrEqual":
-                return aliasPath + " <= " + parameters[0];
-            case "moreThan":
-                return aliasPath + " > " + parameters[0];
-            case "moreThanOrEqual":
-                return aliasPath + " >= " + parameters[0];
-            case "equal":
-                return aliasPath + " = " + parameters[0];
-            case "like":
-                return aliasPath + " LIKE " + parameters[0];
-            case "ilike":
-                return aliasPath + " ILIKE " + parameters[0];
-            case "between":
-                return aliasPath + " BETWEEN " + parameters[0] + " AND " + parameters[1];
-            case "in":
-                return aliasPath + " IN (" + parameters.join(", ") + ")";
-            case "any":
-                return aliasPath + " = ANY(" + parameters[0] + ")";
-            case "isNull":
-                return aliasPath + " IS NULL";
-            case "raw":
-                if (this.value instanceof Function) {
-                    return this.value(aliasPath);
-                }
-                else {
-                    return aliasPath + " = " + this.value;
-                }
-        }
-        return "";
-    };
-    return FindOperator;
-}());
-export { FindOperator };
+    get value() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value.value;
+        return this._value;
+    }
+    /**
+     * Gets ObjectLiteral parameters.
+     */
+    get objectLiteralParameters() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value.objectLiteralParameters;
+        return this._objectLiteralParameters;
+    }
+    /**
+     * Gets the child FindOperator if it exists
+     */
+    get child() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value;
+        return undefined;
+    }
+    /**
+     * Gets the SQL generator
+     */
+    get getSql() {
+        if (InstanceChecker.isFindOperator(this._value))
+            return this._value.getSql;
+        return this._getSql;
+    }
+}
 
 //# 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 {FindOperatorType} from \"./FindOperatorType\";\nimport {Connection} from \"../\";\n\n/**\n * Find Operator used in Find Conditions.\n */\nexport class FindOperator<T> {\n\n    // -------------------------------------------------------------------------\n    // Public Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Operator type.\n     */\n    type: FindOperatorType;\n\n    // -------------------------------------------------------------------------\n    // Private Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Parameter value.\n     */\n    private _value: T|FindOperator<T>;\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    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(type: FindOperatorType,\n                value: T|FindOperator<T>,\n                useParameter: boolean = true,\n                multipleParameters: boolean = false) {\n        this.type = type;\n        this._useParameter = useParameter;\n        this._multipleParameters = multipleParameters;\n        this._value = value;\n        // if (condition !== undefined) {\n        //     this.condition = condition;\n        //     this._useParameter = condition === true ? true : false;\n        // }\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 (this._value instanceof FindOperator)\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 (this._value instanceof FindOperator)\n            return this._value.multipleParameters;\n\n        return this._multipleParameters;\n    }\n\n    /**\n     * Gets the final value needs to be used as parameter value.\n     */\n    get value(): T|any {\n        if (this._value instanceof FindOperator)\n            return this._value.value;\n\n        return this._value;\n    }\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Gets SQL needs to be inserted into final query.\n     */\n    toSql(connection: Connection, aliasPath: string, parameters: string[]): string {\n        switch (this.type) {\n            case \"not\":\n                if (this._value instanceof FindOperator) {\n                    return `NOT(${this._value.toSql(connection, aliasPath, parameters)})`;\n                } else {\n                    return `${aliasPath} != ${parameters[0]}`;\n                }\n            case \"lessThan\":\n                return `${aliasPath} < ${parameters[0]}`;\n            case \"lessThanOrEqual\":\n                return `${aliasPath} <= ${parameters[0]}`;\n            case \"moreThan\":\n                return `${aliasPath} > ${parameters[0]}`;\n            case \"moreThanOrEqual\":\n                return `${aliasPath} >= ${parameters[0]}`;\n            case \"equal\":\n                return `${aliasPath} = ${parameters[0]}`;\n            case \"like\":\n                return `${aliasPath} LIKE ${parameters[0]}`;\n            case \"ilike\":\n                return `${aliasPath} ILIKE ${parameters[0]}`;\n            case \"between\":\n                return `${aliasPath} BETWEEN ${parameters[0]} AND ${parameters[1]}`;\n            case \"in\":\n                return `${aliasPath} IN (${parameters.join(\", \")})`;\n            case \"any\":\n                return `${aliasPath} = ANY(${parameters[0]})`;\n            case \"isNull\":\n                return `${aliasPath} IS NULL`;\n            case \"raw\":\n                if (this.value instanceof Function) {\n                    return this.value(aliasPath);\n                } else {\n                    return `${aliasPath} = ${this.value}`;\n                }\n        }\n\n        return \"\";\n    }\n\n}"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/find-options/FindOperator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAIzD;;GAEG;AACH,MAAM,OAAO,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,eAAe,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,eAAe,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,eAAe,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,eAAe,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,eAAe,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,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ","file":"FindOperator.js","sourcesContent":["import { ObjectLiteral } from \"../common/ObjectLiteral\"\nimport { FindOperatorType } from \"./FindOperatorType\"\nimport { InstanceChecker } from \"../util/InstanceChecker\"\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"],"sourceRoot":".."}

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

@@ -1,4 +1,4 @@
 /**
  * List of types that FindOperator can be.
  */
-export declare type FindOperatorType = "not" | "lessThan" | "lessThanOrEqual" | "moreThan" | "moreThanOrEqual" | "equal" | "between" | "in" | "any" | "isNull" | "like" | "ilike" | "raw" | "if" | "switch";
+export declare type FindOperatorType = "not" | "lessThan" | "lessThanOrEqual" | "moreThan" | "moreThanOrEqual" | "equal" | "between" | "in" | "any" | "isNull" | "ilike" | "like" | "raw";

package/browser/find-options/FindOperatorType.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# 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    | \"like\"\n    | \"ilike\"\n    | \"raw\"\n    | \"if\"\n    | \"switch\";\n"],"sourceRoot":".."}
+{"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"],"sourceRoot":".."}

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

@@ -0,0 +1,19 @@
+
+import { ObjectID } from "../driver/mongodb/typings";
+/**
+ * A single property handler for FindOptionsOrder.
+ */
+export declare 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 Buffer ? FindOptionsOrderValue : Property extends Date ? FindOptionsOrderValue : Property extends ObjectID ? FindOptionsOrderValue : Property extends object ? FindOptionsOrder<Property> : FindOptionsOrderValue;
+/**
+ * Order by find options.
+ */
+export declare type FindOptionsOrder<Entity> = {
+    [P in keyof Entity]?: FindOptionsOrderProperty<NonNullable<Entity[P]>>;
+};
+/**
+ * Value of order by in find options.
+ */
+export declare type FindOptionsOrderValue = "ASC" | "DESC" | "asc" | "desc" | 1 | -1 | {
+    direction?: "asc" | "desc" | "ASC" | "DESC";
+    nulls?: "first" | "last" | "FIRST" | "LAST";
+};

package/browser/find-options/FindOptionsOrder.js

@@ -0,0 +1,3 @@
+export {};
+
+//# sourceMappingURL=FindOptionsOrder.js.map

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

@@ -0,0 +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 Buffer\n    ? FindOptionsOrderValue\n    : Property extends Date\n    ? FindOptionsOrderValue\n    : Property extends ObjectID\n    ? FindOptionsOrderValue\n    : Property extends object\n    ? FindOptionsOrder<Property>\n    : FindOptionsOrderValue\n\n/**\n * Order by find options.\n */\nexport type FindOptionsOrder<Entity> = {\n    [P in keyof Entity]?: 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":".."}

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

@@ -0,0 +1,19 @@
+
+import { ObjectID } from "../driver/mongodb/typings";
+/**
+ * A single property handler for FindOptionsRelations.
+ */
+export declare type FindOptionsRelationsProperty<Property> = Property extends Promise<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends Array<infer I> ? FindOptionsRelationsProperty<NonNullable<I>> | boolean : Property extends Function ? never : Property extends Buffer ? never : Property extends Date ? never : Property extends ObjectID ? never : Property extends object ? FindOptionsRelations<Property> | boolean : boolean;
+/**
+ * Relations find options.
+ */
+export declare type FindOptionsRelations<Entity> = {
+    [P in keyof Entity]?: 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 declare type FindOptionsRelationByString = string[];

package/browser/find-options/FindOptionsRelations.js

@@ -0,0 +1,3 @@
+export {};
+
+//# sourceMappingURL=FindOptionsRelations.js.map

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

@@ -0,0 +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 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]?: 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":".."}

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

@@ -0,0 +1,19 @@
+
+import { ObjectID } from "../driver/mongodb/typings";
+/**
+ * A single property handler for FindOptionsSelect.
+ */
+export declare type FindOptionsSelectProperty<Property> = Property extends Promise<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends Array<infer I> ? FindOptionsSelectProperty<I> | boolean : Property extends Function ? never : Property extends Buffer ? boolean : Property extends Date ? boolean : Property extends ObjectID ? boolean : Property extends object ? FindOptionsSelect<Property> : boolean;
+/**
+ * Select find options.
+ */
+export declare type FindOptionsSelect<Entity> = {
+    [P in keyof Entity]?: 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 declare type FindOptionsSelectByString<Entity> = (keyof Entity)[];

package/browser/find-options/FindOptionsSelect.js

@@ -0,0 +1,3 @@
+export {};
+
+//# sourceMappingURL=FindOptionsSelect.js.map

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

@@ -0,0 +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 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>\n    : boolean\n\n/**\n * Select find options.\n */\nexport type FindOptionsSelect<Entity> = {\n    [P in keyof Entity]?: 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":".."}

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

@@ -1,4 +1,8 @@
-import { FindOptions } from "./FindOptions";
+import { FindManyOptions } from "./FindManyOptions";
+import { FindOneOptions } from "./FindOneOptions";
+import { SelectQueryBuilder } from "../query-builder/SelectQueryBuilder";
+import { EntityMetadata } from "../metadata/EntityMetadata";
+import { FindTreeOptions } from "./FindTreeOptions";
 /**
  * Utilities to work with FindOptions.
  */
@@ -6,9 +10,179 @@ export declare class FindOptionsUtils {
     /**
      * Checks if given object is really instance of FindOneOptions interface.
      */
-    static isFindOptions(obj: any): obj is FindOptions<any>;
+    static isFindOneOptions<Entity = any>(obj: any): obj is FindOneOptions<Entity>;
+    /**
+     * Checks if given object is really instance of FindManyOptions interface.
+     */
+    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;
+    /**
+     * Applies give find many options to the given query builder.
+
+    static applyFindManyOptionsOrConditionsToQueryBuilder<T>(qb: SelectQueryBuilder<T>, options: FindManyOptions<T>|Partial<T>|undefined): SelectQueryBuilder<T> {
+        if (this.isFindManyOptions(options))
+            return this.applyOptionsToQueryBuilder(qb, options);
+
+        if (options)
+            return qb.where(options);
+
+        return qb;
+    }*/
+    /**
+     * Applies give find options to the given query builder.
+
+    static applyOptionsToQueryBuilder<T>(qb: SelectQueryBuilder<T>, options: FindOneOptions<T>|FindManyOptions<T>|undefined): SelectQueryBuilder<T> {
+
+        // if options are not set then simply return query builder. This is made for simplicity of usage.
+        if (!options || (!this.isFindOneOptions(options) && !this.isFindManyOptions(options)))
+            return qb;
+
+        if (options.transaction === true) {
+            qb.expressionMap.useTransaction = true;
+        }
+
+        if (!qb.expressionMap.mainAlias || !qb.expressionMap.mainAlias.hasMetadata)
+            return qb;
+
+        const metadata = qb.expressionMap.mainAlias!.metadata;
+
+        // apply all options from FindOptions
+        if (options.comment) {
+            qb.comment(options.comment);
+        }
+
+        if (options.withDeleted) {
+            qb.withDeleted();
+        }
+
+        if (options.select) {
+            qb.select([]);
+            options.select.forEach(select => {
+                if (!metadata.hasColumnWithPropertyPath(`${select}`))
+                    throw new TypeORMError(`${select} column was not found in the ${metadata.name} entity.`);
+
+                const columns = metadata.findColumnsWithPropertyPath(`${select}`);
+
+                for (const column of columns) {
+                    qb.addSelect(qb.alias + "." + column.propertyPath);
+                }
+            });
+        }
+
+        if (options.relations) {
+            // Copy because `applyRelationsRecursively` modifies it
+            const allRelations = [...options.relations];
+            this.applyRelationsRecursively(qb, allRelations, qb.expressionMap.mainAlias!.name, qb.expressionMap.mainAlias!.metadata, "");
+            // recursive removes found relations from allRelations array
+            // 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);
+        }
+
+        if (options.join) {
+            if (options.join.leftJoin)
+                Object.keys(options.join.leftJoin).forEach(key => {
+                    qb.leftJoin(options.join!.leftJoin![key], key);
+                });
+
+            if (options.join.innerJoin)
+                Object.keys(options.join.innerJoin).forEach(key => {
+                    qb.innerJoin(options.join!.innerJoin![key], key);
+                });
+
+            if (options.join.leftJoinAndSelect)
+                Object.keys(options.join.leftJoinAndSelect).forEach(key => {
+                    qb.leftJoinAndSelect(options.join!.leftJoinAndSelect![key], key);
+                });
+
+            if (options.join.innerJoinAndSelect)
+                Object.keys(options.join.innerJoinAndSelect).forEach(key => {
+                    qb.innerJoinAndSelect(options.join!.innerJoinAndSelect![key], key);
+                });
+        }
+
+        if (options.cache) {
+            if (options.cache instanceof Object) {
+                const cache = options.cache as { id: any, milliseconds: number };
+                qb.cache(cache.id, cache.milliseconds);
+            } else {
+                qb.cache(options.cache);
+            }
+        }
+
+        if (options.lock) {
+            if (options.lock.mode === "optimistic") {
+                qb.setLock(options.lock.mode, options.lock.version);
+            } else if (
+                options.lock.mode === "pessimistic_read" ||
+                options.lock.mode === "pessimistic_write" ||
+                options.lock.mode === "dirty_read" ||
+                options.lock.mode === "pessimistic_partial_write" ||
+                options.lock.mode === "pessimistic_write_or_fail" ||
+                options.lock.mode === "for_no_key_update"
+            ) {
+                const tableNames = options.lock.tables ? options.lock.tables.map((table) => {
+                    const tableAlias = qb.expressionMap.aliases.find((alias) => {
+                        return alias.metadata.tableNameWithoutPrefix === table;
+                    });
+                    if (!tableAlias) {
+                        throw new TypeORMError(`"${table}" is not part of this query`);
+                    }
+                    return qb.escape(tableAlias.name);
+                }) : undefined;
+                qb.setLock(options.lock.mode, undefined, tableNames);
+            }
+        }
+
+        if (options.loadRelationIds === true) {
+            qb.loadAllRelationIds();
+
+        } else if (options.loadRelationIds instanceof Object) {
+            qb.loadAllRelationIds(options.loadRelationIds as any);
+        }
+
+        if (options.where)
+            qb.where(options.where);
+
+        if ((options as FindManyOptions<T>).skip)
+            qb.skip((options as FindManyOptions<T>).skip!);
+
+        if ((options as FindManyOptions<T>).take)
+            qb.take((options as FindManyOptions<T>).take!);
+
+        if (options.order)
+            Object.keys(options.order).forEach(key => {
+                const order = ((options as FindOneOptions<T>).order as any)[key as any];
+
+                if (!metadata.findColumnWithPropertyPath(key))
+                    throw new Error(`${key} column was not found in the ${metadata.name} entity.`);
+
+                switch (order) {
+                    case 1:
+                        qb.addOrderBy(qb.alias + "." + key, "ASC");
+                        break;
+                    case -1:
+                        qb.addOrderBy(qb.alias + "." + key, "DESC");
+                        break;
+                    case "ASC":
+                        qb.addOrderBy(qb.alias + "." + key, "ASC");
+                        break;
+                    case "DESC":
+                        qb.addOrderBy(qb.alias + "." + key, "DESC");
+                        break;
+                }
+            });
+
+        return qb;
+    }*/
+    static applyOptionsToTreeQueryBuilder<T>(qb: SelectQueryBuilder<T>, options?: FindTreeOptions): SelectQueryBuilder<T>;
+    /**
+     * Adds joins for all relations and sub-relations of the given relations provided in the find options.
+     */
+    static applyRelationsRecursively(qb: SelectQueryBuilder<any>, allRelations: string[], alias: string, metadata: EntityMetadata, prefix: string): void;
+    static joinEagerRelations(qb: SelectQueryBuilder<any>, alias: string, metadata: EntityMetadata): void;
 }
-/**
- * Normalizes find options.
- */
-export declare function normalizeFindOptions<T>(options: FindOptions<T>): FindOptions<T>;