typeorm 0.3.0-rc.9 → 0.3.0

package/browser/platform/PlatformTools.js

@@ -1,153 +1,210 @@
+import * as path from "path";
+import * as fs from "fs";
+import dotenv from "dotenv";
+import chalk from "chalk";
+import { highlight } from "cli-highlight";
+export { ReadStream } from "fs";
+export { EventEmitter } from "events";
+export { Readable, Writable } from "stream";
 /**
- * Browser's implementation of the platform-specific tools.
- *
- * This file gonna replace PlatformTools for browser environment.
- * For node.js environment this class is not getting packaged.
- * Don't use methods of this class in the code, use PlatformTools methods instead.
+ * Platform-specific tools.
  */
-var PlatformTools = /** @class */ (function () {
-    function PlatformTools() {
-    }
+export class PlatformTools {
     /**
      * Gets global variable where global stuff can be stored.
      */
-    PlatformTools.getGlobalVariable = function () {
-        if (typeof window !== "undefined") {
-            return window;
-        }
-        else {
-            // NativeScript uses global, not window
-            return global;
-        }
-    };
+    static getGlobalVariable() {
+        return global;
+    }
     /**
      * Loads ("require"-s) given file or package.
      * This operation only supports on node platform
      */
-    PlatformTools.load = function (name) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: require(\"" + name + "\").");
-        return "";
-    };
+    static load(name) {
+        // if name is not absolute or relative, then try to load package from the node_modules of the directory we are currently in
+        // this is useful when we are using typeorm package globally installed and it accesses drivers
+        // that are not installed globally
+        try {
+            // switch case to explicit require statements for webpack compatibility.
+            switch (name) {
+                /**
+                 * mongodb
+                 */
+                case "mongodb":
+                    return require("mongodb");
+                /**
+                 * hana
+                 */
+                case "@sap/hana-client":
+                    return require("@sap/hana-client");
+                case "hdb-pool":
+                    return require("hdb-pool");
+                /**
+                 * mysql
+                 */
+                case "mysql":
+                    return require("mysql");
+                case "mysql2":
+                    return require("mysql2");
+                /**
+                 * oracle
+                 */
+                case "oracledb":
+                    return require("oracledb");
+                /**
+                 * postgres
+                 */
+                case "pg":
+                    return require("pg");
+                case "pg-native":
+                    return require("pg-native");
+                case "pg-query-stream":
+                    return require("pg-query-stream");
+                case "typeorm-aurora-data-api-driver":
+                    return require("typeorm-aurora-data-api-driver");
+                /**
+                 * redis
+                 */
+                case "redis":
+                    return require("redis");
+                case "ioredis":
+                    return require("ioredis");
+                /**
+                 * better-sqlite3
+                 */
+                case "better-sqlite3":
+                    return require("better-sqlite3");
+                /**
+                 * sqlite
+                 */
+                case "sqlite3":
+                    return require("sqlite3");
+                /**
+                 * sql.js
+                 */
+                case "sql.js":
+                    return require("sql.js");
+                /**
+                 * sqlserver
+                 */
+                case "mssql":
+                    return require("mssql");
+                /**
+                 * react-native-sqlite
+                 */
+                case "react-native-sqlite-storage":
+                    return require("react-native-sqlite-storage");
+            }
+        }
+        catch (err) {
+            return require(path.resolve(process.cwd() + "/node_modules/" + name));
+        }
+        // If nothing above matched and we get here, the package was not listed within PlatformTools
+        // and is an Invalid Package.  To make it explicit that this is NOT the intended use case for
+        // PlatformTools.load - it's not just a way to replace `require` all willy-nilly - let's throw
+        // an error.
+        throw new TypeError(`Invalid Package for PlatformTools.load: ${name}`);
+    }
     /**
      * Normalizes given path. Does "path.normalize".
      */
-    PlatformTools.pathNormalize = function (pathStr) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: path.normalize(\"" + pathStr + "\").");
-        return "";
-    };
+    static pathNormalize(pathStr) {
+        return path.normalize(pathStr);
+    }
     /**
      * Gets file extension. Does "path.extname".
      */
-    PlatformTools.pathExtname = function (pathStr) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: path.extname(\"" + pathStr + "\").");
-        return "";
-    };
+    static pathExtname(pathStr) {
+        return path.extname(pathStr);
+    }
     /**
      * Resolved given path. Does "path.resolve".
      */
-    PlatformTools.pathResolve = function (pathStr) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: path.resolve(\"" + pathStr + "\").");
-        return "";
-    };
+    static pathResolve(pathStr) {
+        return path.resolve(pathStr);
+    }
     /**
      * Synchronously checks if file exist. Does "fs.existsSync".
      */
-    PlatformTools.fileExist = function (pathStr) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: fs.existsSync(\"" + pathStr + "\").");
-        return false;
-    };
+    static fileExist(pathStr) {
+        return fs.existsSync(pathStr);
+    }
+    static readFileSync(filename) {
+        return fs.readFileSync(filename);
+    }
+    static appendFileSync(filename, data) {
+        fs.appendFileSync(filename, data);
+    }
+    static async writeFile(path, data) {
+        return new Promise((ok, fail) => {
+            fs.writeFile(path, data, (err) => {
+                if (err)
+                    fail(err);
+                ok();
+            });
+        });
+    }
+    /**
+     * Loads a dotenv file into the environment variables.
+     *
+     * @param path The file to load as a dotenv configuration
+     */
+    static dotenv(pathStr) {
+        dotenv.config({ path: pathStr });
+    }
     /**
      * Gets environment variable.
      */
-    PlatformTools.getEnvVariable = function (name) {
-        // if (this.type === "browser")
-        //     throw new Error(`This option/function is not supported in the browser environment. Failed operation: process.env["${name}"].`);
-        return undefined;
-    };
-    PlatformTools.readFileSync = function (filename) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: fs.readFileSync(\"" + filename + "\").");
-        return null;
-    };
-    PlatformTools.appendFileSync = function (filename, data) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: fs.appendFileSync(\"" + filename + "\").");
-    };
-    PlatformTools.writeFile = function (path, data) {
-        if (this.type === "browser")
-            throw new Error("This option/function is not supported in the browser environment. Failed operation: fs.writeFile(\"" + path + "\").");
-        return Promise.reject(null);
-    };
+    static getEnvVariable(name) {
+        return process.env[name];
+    }
     /**
      * Highlights sql string to be print in the console.
      */
-    PlatformTools.highlightSql = function (sql) {
-        return sql;
-    };
+    static highlightSql(sql) {
+        const theme = {
+            keyword: chalk.blueBright,
+            literal: chalk.blueBright,
+            string: chalk.white,
+            type: chalk.magentaBright,
+            built_in: chalk.magentaBright,
+            comment: chalk.gray,
+        };
+        return highlight(sql, { theme: theme, language: "sql" });
+    }
     /**
      * Highlights json string to be print in the console.
      */
-    PlatformTools.highlightJson = function (json) {
-        return json;
-    };
-    /**
-     * Logging functions needed by AdvancedConsoleLogger (but here without chalk)
-     */
-    PlatformTools.logInfo = function (prefix, info) {
-        console.info(prefix + " ", info);
-    };
-    PlatformTools.logError = function (prefix, error) {
-        console.error(prefix + " ", error);
-    };
-    PlatformTools.logWarn = function (prefix, warning) {
-        console.warn(prefix + " ", warning);
-    };
-    PlatformTools.log = function (message) {
-        console.log(message);
-    };
-    PlatformTools.warn = function (message) {
-        return message;
-    };
+    static highlightJson(json) {
+        return highlight(json, { language: "json" });
+    }
     /**
-     * Type of the currently running platform.
+     * Logging functions needed by AdvancedConsoleLogger
      */
-    PlatformTools.type = "browser";
-    return PlatformTools;
-}());
-export { PlatformTools };
+    static logInfo(prefix, info) {
+        console.log(chalk.gray.underline(prefix), info);
+    }
+    static logError(prefix, error) {
+        console.log(chalk.underline.red(prefix), error);
+    }
+    static logWarn(prefix, warning) {
+        console.log(chalk.underline.yellow(prefix), warning);
+    }
+    static log(message) {
+        console.log(chalk.underline(message));
+    }
+    static warn(message) {
+        return chalk.yellow(message);
+    }
+    static logCmdErr(prefix, err) {
+        console.log(chalk.black.bgRed(prefix));
+        if (err)
+            console.error(err);
+    }
+}
 /**
- * These classes are needed for stream operations or
- * in the mongodb driver. Both aren't supported in the browser.
+ * Type of the currently running platform.
  */
-var EventEmitter = /** @class */ (function () {
-    function EventEmitter() {
-    }
-    return EventEmitter;
-}());
-export { EventEmitter };
-var Readable = /** @class */ (function () {
-    function Readable() {
-    }
-    return Readable;
-}());
-export { Readable };
-var Writable = /** @class */ (function () {
-    function Writable() {
-    }
-    return Writable;
-}());
-export { Writable };
-if (typeof window !== "undefined") {
-    window.Buffer = require("buffer/").Buffer;
-}
-// NativeScript uses global, not window
-if (typeof global !== "undefined") {
-    global.Buffer = require("buffer/").Buffer;
-}
+PlatformTools.type = "node";
 
 //# sourceMappingURL=PlatformTools.js.map

package/browser/platform/PlatformTools.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/platform/PlatformTools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH;IAAA;IAoIA,CAAC;IA7HG;;OAEG;IACI,+BAAiB,GAAxB;QACI,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YAC/B,OAAO,MAAM,CAAA;SAChB;aAAM;YACH,uCAAuC;YACvC,OAAO,MAAM,CAAA;SAChB;IACL,CAAC;IAED;;;OAGG;IACI,kBAAI,GAAX,UAAY,IAAY;QACpB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,mGAAgG,IAAI,SAAK,CAAC,CAAC;QAE/H,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACI,2BAAa,GAApB,UAAqB,OAAe;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,0GAAuG,OAAO,SAAK,CAAC,CAAC;QAEzI,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACI,yBAAW,GAAlB,UAAmB,OAAe;QAC9B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,wGAAqG,OAAO,SAAK,CAAC,CAAC;QAEvI,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACI,yBAAW,GAAlB,UAAmB,OAAe;QAC9B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,wGAAqG,OAAO,SAAK,CAAC,CAAC;QAEvI,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACI,uBAAS,GAAhB,UAAiB,OAAe;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,yGAAsG,OAAO,SAAK,CAAC,CAAC;QAExI,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACI,4BAAc,GAArB,UAAsB,IAAY;QAC9B,+BAA+B;QAC/B,sIAAsI;QACtI,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,0BAAY,GAAnB,UAAoB,QAAgB;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,2GAAwG,QAAQ,SAAK,CAAC,CAAC;QAC3I,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,4BAAc,GAArB,UAAsB,QAAgB,EAAE,IAAS;QAC7C,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,6GAA0G,QAAQ,SAAK,CAAC,CAAC;IACjJ,CAAC;IAEM,uBAAS,GAAhB,UAAiB,IAAY,EAAE,IAAS;QACpC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YACvB,MAAM,IAAI,KAAK,CAAC,wGAAqG,IAAI,SAAK,CAAC,CAAC;QACpI,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACI,0BAAY,GAAnB,UAAoB,GAAW;QAC3B,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACI,2BAAa,GAApB,UAAqB,IAAY;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,qBAAO,GAAd,UAAe,MAAc,EAAE,IAAS;QACpC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAEM,sBAAQ,GAAf,UAAgB,MAAc,EAAE,KAAU;QACtC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAEM,qBAAO,GAAd,UAAe,MAAc,EAAE,OAAY;QACvC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAEM,iBAAG,GAAV,UAAW,OAAe;QACtB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAEM,kBAAI,GAAX,UAAY,OAAe;QACvB,OAAO,OAAO,CAAC;IACnB,CAAC;IAjID;;OAEG;IACI,kBAAI,GAAqB,SAAS,CAAC;IA+H9C,oBAAC;CApID,AAoIC,IAAA;SApIY,aAAa;AAsI1B;;;GAGG;AACH;IAAA;IAA2B,CAAC;IAAD,mBAAC;AAAD,CAA3B,AAA4B,IAAA;;AAE5B;IAAA;IAAuB,CAAC;IAAD,eAAC;AAAD,CAAvB,AAAwB,IAAA;;AAExB;IAAA;IAAuB,CAAC;IAAD,eAAC;AAAD,CAAvB,AAAwB,IAAA;;AAYxB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;CAC7C;AACD,uCAAuC;AACvC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IAC/B,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;CAC7C","file":"PlatformTools.js","sourcesContent":["/**\n * Browser's implementation of the platform-specific tools.\n *\n * This file gonna replace PlatformTools for browser environment.\n * For node.js environment this class is not getting packaged.\n * Don't use methods of this class in the code, use PlatformTools methods instead.\n */\nexport class PlatformTools {\n\n    /**\n     * Type of the currently running platform.\n     */\n    static type: \"browser\"|\"node\" = \"browser\";\n\n    /**\n     * Gets global variable where global stuff can be stored.\n     */\n    static getGlobalVariable(): any {\n        if (typeof window !== \"undefined\") {\n            return window\n        } else {\n            // NativeScript uses global, not window\n            return global\n        }\n    }\n\n    /**\n     * Loads (\"require\"-s) given file or package.\n     * This operation only supports on node platform\n     */\n    static load(name: string): any {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: require(\"${name}\").`);\n\n        return \"\";\n    }\n\n    /**\n     * Normalizes given path. Does \"path.normalize\".\n     */\n    static pathNormalize(pathStr: string): string {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: path.normalize(\"${pathStr}\").`);\n\n        return \"\";\n    }\n\n    /**\n     * Gets file extension. Does \"path.extname\".\n     */\n    static pathExtname(pathStr: string): string {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: path.extname(\"${pathStr}\").`);\n\n        return \"\";\n    }\n\n    /**\n     * Resolved given path. Does \"path.resolve\".\n     */\n    static pathResolve(pathStr: string): string {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: path.resolve(\"${pathStr}\").`);\n\n        return \"\";\n    }\n\n    /**\n     * Synchronously checks if file exist. Does \"fs.existsSync\".\n     */\n    static fileExist(pathStr: string): boolean {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.existsSync(\"${pathStr}\").`);\n\n        return false;\n    }\n\n    /**\n     * Gets environment variable.\n     */\n    static getEnvVariable(name: string): any {\n        // if (this.type === \"browser\")\n        //     throw new Error(`This option/function is not supported in the browser environment. Failed operation: process.env[\"${name}\"].`);\n        return undefined;\n    }\n\n    static readFileSync(filename: string): any {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.readFileSync(\"${filename}\").`);\n        return null;\n    }\n    \n    static appendFileSync(filename: string, data: any) {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.appendFileSync(\"${filename}\").`);\n    }\n\n    static writeFile(path: string, data: any): Promise<void> {\n        if (this.type === \"browser\")\n            throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.writeFile(\"${path}\").`);\n        return Promise.reject(null);\n    }\n\n    /**\n     * Highlights sql string to be print in the console.\n     */\n    static highlightSql(sql: string) {\n        return sql;\n    }\n\n    /**\n     * Highlights json string to be print in the console.\n     */\n    static highlightJson(json: string) {\n        return json;\n    }\n\n    /**\n     * Logging functions needed by AdvancedConsoleLogger (but here without chalk)\n     */\n    static logInfo(prefix: string, info: any) {\n        console.info(prefix + \" \", info);\n    }\n\n    static logError(prefix: string, error: any) {\n        console.error(prefix + \" \", error);\n    }\n    \n    static logWarn(prefix: string, warning: any) {\n        console.warn(prefix + \" \", warning);\n    }\n    \n    static log(message: string) {\n        console.log(message);\n    }\n\n    static warn(message: string) {\n        return message;\n    }\n}\n\n/**\n * These classes are needed for stream operations or\n * in the mongodb driver. Both aren't supported in the browser.\n */\nexport class EventEmitter {}\n\nexport class Readable {}\n\nexport class Writable {}\n\nexport interface ReadStream {}\n\n/**\n * This loads a polyfill to enable Buffers in the browser.\n */\ninterface Window {\n    Buffer: any;\n}\n\ndeclare var window: Window;\nif (typeof window !== \"undefined\") {\n    window.Buffer = require(\"buffer/\").Buffer;\n}\n// NativeScript uses global, not window\nif (typeof global !== \"undefined\") {\n    global.Buffer = require(\"buffer/\").Buffer;\n}"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/platform/PlatformTools.ts"],"names":[],"mappings":"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","file":"PlatformTools.js","sourcesContent":["import * as path from \"path\"\nimport * as fs from \"fs\"\nimport dotenv from \"dotenv\"\nimport chalk from \"chalk\"\nimport { highlight, Theme } from \"cli-highlight\"\n\nexport { ReadStream } from \"fs\"\nexport { EventEmitter } from \"events\"\nexport { Readable, Writable } from \"stream\"\n\n/**\n * Platform-specific tools.\n */\nexport class PlatformTools {\n    /**\n     * Type of the currently running platform.\n     */\n    static type: \"browser\" | \"node\" = \"node\"\n\n    /**\n     * Gets global variable where global stuff can be stored.\n     */\n    static getGlobalVariable(): any {\n        return global\n    }\n\n    /**\n     * Loads (\"require\"-s) given file or package.\n     * This operation only supports on node platform\n     */\n    static load(name: string): any {\n        // if name is not absolute or relative, then try to load package from the node_modules of the directory we are currently in\n        // this is useful when we are using typeorm package globally installed and it accesses drivers\n        // that are not installed globally\n\n        try {\n            // switch case to explicit require statements for webpack compatibility.\n\n            switch (name) {\n                /**\n                 * mongodb\n                 */\n                case \"mongodb\":\n                    return require(\"mongodb\")\n\n                /**\n                 * hana\n                 */\n                case \"@sap/hana-client\":\n                    return require(\"@sap/hana-client\")\n\n                case \"hdb-pool\":\n                    return require(\"hdb-pool\")\n\n                /**\n                 * mysql\n                 */\n                case \"mysql\":\n                    return require(\"mysql\")\n\n                case \"mysql2\":\n                    return require(\"mysql2\")\n\n                /**\n                 * oracle\n                 */\n                case \"oracledb\":\n                    return require(\"oracledb\")\n\n                /**\n                 * postgres\n                 */\n                case \"pg\":\n                    return require(\"pg\")\n\n                case \"pg-native\":\n                    return require(\"pg-native\")\n\n                case \"pg-query-stream\":\n                    return require(\"pg-query-stream\")\n\n                case \"typeorm-aurora-data-api-driver\":\n                    return require(\"typeorm-aurora-data-api-driver\")\n\n                /**\n                 * redis\n                 */\n                case \"redis\":\n                    return require(\"redis\")\n\n                case \"ioredis\":\n                    return require(\"ioredis\")\n\n                /**\n                 * better-sqlite3\n                 */\n                case \"better-sqlite3\":\n                    return require(\"better-sqlite3\")\n\n                /**\n                 * sqlite\n                 */\n                case \"sqlite3\":\n                    return require(\"sqlite3\")\n\n                /**\n                 * sql.js\n                 */\n                case \"sql.js\":\n                    return require(\"sql.js\")\n\n                /**\n                 * sqlserver\n                 */\n                case \"mssql\":\n                    return require(\"mssql\")\n\n                /**\n                 * react-native-sqlite\n                 */\n                case \"react-native-sqlite-storage\":\n                    return require(\"react-native-sqlite-storage\")\n            }\n        } catch (err) {\n            return require(path.resolve(\n                process.cwd() + \"/node_modules/\" + name,\n            ))\n        }\n\n        // If nothing above matched and we get here, the package was not listed within PlatformTools\n        // and is an Invalid Package.  To make it explicit that this is NOT the intended use case for\n        // PlatformTools.load - it's not just a way to replace `require` all willy-nilly - let's throw\n        // an error.\n        throw new TypeError(`Invalid Package for PlatformTools.load: ${name}`)\n    }\n\n    /**\n     * Normalizes given path. Does \"path.normalize\".\n     */\n    static pathNormalize(pathStr: string): string {\n        return path.normalize(pathStr)\n    }\n\n    /**\n     * Gets file extension. Does \"path.extname\".\n     */\n    static pathExtname(pathStr: string): string {\n        return path.extname(pathStr)\n    }\n\n    /**\n     * Resolved given path. Does \"path.resolve\".\n     */\n    static pathResolve(pathStr: string): string {\n        return path.resolve(pathStr)\n    }\n\n    /**\n     * Synchronously checks if file exist. Does \"fs.existsSync\".\n     */\n    static fileExist(pathStr: string): boolean {\n        return fs.existsSync(pathStr)\n    }\n\n    static readFileSync(filename: string): Buffer {\n        return fs.readFileSync(filename)\n    }\n\n    static appendFileSync(filename: string, data: any): void {\n        fs.appendFileSync(filename, data)\n    }\n\n    static async writeFile(path: string, data: any): Promise<void> {\n        return new Promise<void>((ok, fail) => {\n            fs.writeFile(path, data, (err) => {\n                if (err) fail(err)\n                ok()\n            })\n        })\n    }\n\n    /**\n     * Loads a dotenv file into the environment variables.\n     *\n     * @param path The file to load as a dotenv configuration\n     */\n    static dotenv(pathStr: string): void {\n        dotenv.config({ path: pathStr })\n    }\n\n    /**\n     * Gets environment variable.\n     */\n    static getEnvVariable(name: string): any {\n        return process.env[name]\n    }\n\n    /**\n     * Highlights sql string to be print in the console.\n     */\n    static highlightSql(sql: string) {\n        const theme: Theme = {\n            keyword: chalk.blueBright,\n            literal: chalk.blueBright,\n            string: chalk.white,\n            type: chalk.magentaBright,\n            built_in: chalk.magentaBright,\n            comment: chalk.gray,\n        }\n        return highlight(sql, { theme: theme, language: \"sql\" })\n    }\n\n    /**\n     * Highlights json string to be print in the console.\n     */\n    static highlightJson(json: string) {\n        return highlight(json, { language: \"json\" })\n    }\n\n    /**\n     * Logging functions needed by AdvancedConsoleLogger\n     */\n    static logInfo(prefix: string, info: any) {\n        console.log(chalk.gray.underline(prefix), info)\n    }\n\n    static logError(prefix: string, error: any) {\n        console.log(chalk.underline.red(prefix), error)\n    }\n\n    static logWarn(prefix: string, warning: any) {\n        console.log(chalk.underline.yellow(prefix), warning)\n    }\n\n    static log(message: string) {\n        console.log(chalk.underline(message))\n    }\n\n    static warn(message: string) {\n        return chalk.yellow(message)\n    }\n\n    static logCmdErr(prefix: string, err?: any) {\n        console.log(chalk.black.bgRed(prefix))\n        if (err) console.error(err)\n    }\n}\n"],"sourceRoot":".."}

package/browser/query-builder/Alias.d.ts

@@ -15,7 +15,8 @@ export declare class Alias {
     subQuery?: string;
     constructor(alias?: Alias);
     private _metadata?;
-    readonly target: Function | string;
-    readonly hasMetadata: boolean;
-    metadata: EntityMetadata;
+    get target(): Function | string;
+    get hasMetadata(): boolean;
+    set metadata(metadata: EntityMetadata);
+    get metadata(): EntityMetadata;
 }

package/browser/query-builder/Alias.js

@@ -1,38 +1,25 @@
 import { ObjectUtils } from "../util/ObjectUtils";
+import { TypeORMError } from "../error";
 /**
  */
-var Alias = /** @class */ (function () {
-    function Alias(alias) {
+export class Alias {
+    constructor(alias) {
         ObjectUtils.assign(this, alias || {});
     }
-    Object.defineProperty(Alias.prototype, "target", {
-        get: function () {
-            return this.metadata.target;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Alias.prototype, "hasMetadata", {
-        get: function () {
-            return !!this._metadata;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Alias.prototype, "metadata", {
-        get: function () {
-            if (!this._metadata)
-                throw new Error("Cannot get entity metadata for the given alias \"" + this.name + "\"");
-            return this._metadata;
-        },
-        set: function (metadata) {
-            this._metadata = metadata;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return Alias;
-}());
-export { Alias };
+    get target() {
+        return this.metadata.target;
+    }
+    get hasMetadata() {
+        return !!this._metadata;
+    }
+    set metadata(metadata) {
+        this._metadata = metadata;
+    }
+    get metadata() {
+        if (!this._metadata)
+            throw new TypeORMError(`Cannot get entity metadata for the given alias "${this.name}"`);
+        return this._metadata;
+    }
+}
 
 //# sourceMappingURL=Alias.js.map

package/browser/query-builder/Alias.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/query-builder/Alias.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;GACG;AACH;IAiBI,eAAY,KAAa;QACrB,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAID,sBAAI,yBAAM;aAAV;YACI,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAChC,CAAC;;;OAAA;IAED,sBAAI,8BAAW;aAAf;YACI,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC5B,CAAC;;;OAAA;IAED,sBAAI,2BAAQ;aAIZ;YACI,IAAI,CAAC,IAAI,CAAC,SAAS;gBACf,MAAM,IAAI,KAAK,CAAC,sDAAmD,IAAI,CAAC,IAAI,OAAG,CAAC,CAAC;YAErF,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;aATD,UAAa,QAAwB;YACjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC9B,CAAC;;;OAAA;IASL,YAAC;AAAD,CA1CA,AA0CC,IAAA","file":"Alias.js","sourcesContent":["import {EntityMetadata} from \"../metadata/EntityMetadata\";\nimport { ObjectUtils } from \"../util/ObjectUtils\";\n\n/**\n */\nexport class Alias {\n\n    type: \"from\"|\"select\"|\"join\"|\"other\"; // todo: make something with \"other\"\n\n    name: string;\n\n    /**\n     * Table on which this alias is applied.\n     * Used only for aliases which select custom tables.\n     */\n    tablePath?: string;\n\n    /**\n     * If this alias is for sub query.\n     */\n    subQuery?: string;\n\n    constructor(alias?: Alias) {\n        ObjectUtils.assign(this, alias || {});\n    }\n\n    private _metadata?: EntityMetadata;\n\n    get target(): Function|string {\n        return this.metadata.target;\n    }\n\n    get hasMetadata(): boolean {\n        return !!this._metadata;\n    }\n\n    set metadata(metadata: EntityMetadata) {\n        this._metadata = metadata;\n    }\n\n    get metadata(): EntityMetadata {\n        if (!this._metadata)\n            throw new Error(`Cannot get entity metadata for the given alias \"${this.name}\"`);\n\n        return this._metadata;\n    }\n\n}"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/query-builder/Alias.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC;GACG;AACH,MAAM,OAAO,KAAK;IAgBd,YAAY,KAAa;QACrB,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAA;IACzC,CAAC;IAID,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAA;IAC/B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAA;IAC3B,CAAC;IAED,IAAI,QAAQ,CAAC,QAAwB;QACjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;IAC7B,CAAC;IAED,IAAI,QAAQ;QACR,IAAI,CAAC,IAAI,CAAC,SAAS;YACf,MAAM,IAAI,YAAY,CAClB,mDAAmD,IAAI,CAAC,IAAI,GAAG,CAClE,CAAA;QAEL,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;CACJ","file":"Alias.js","sourcesContent":["import { EntityMetadata } from \"../metadata/EntityMetadata\"\nimport { ObjectUtils } from \"../util/ObjectUtils\"\nimport { TypeORMError } from \"../error\"\n\n/**\n */\nexport class Alias {\n    type: \"from\" | \"select\" | \"join\" | \"other\" // todo: make something with \"other\"\n\n    name: string\n\n    /**\n     * Table on which this alias is applied.\n     * Used only for aliases which select custom tables.\n     */\n    tablePath?: string\n\n    /**\n     * If this alias is for sub query.\n     */\n    subQuery?: string\n\n    constructor(alias?: Alias) {\n        ObjectUtils.assign(this, alias || {})\n    }\n\n    private _metadata?: EntityMetadata\n\n    get target(): Function | string {\n        return this.metadata.target\n    }\n\n    get hasMetadata(): boolean {\n        return !!this._metadata\n    }\n\n    set metadata(metadata: EntityMetadata) {\n        this._metadata = metadata\n    }\n\n    get metadata(): EntityMetadata {\n        if (!this._metadata)\n            throw new TypeORMError(\n                `Cannot get entity metadata for the given alias \"${this.name}\"`,\n            )\n\n        return this._metadata\n    }\n}\n"],"sourceRoot":".."}

package/browser/query-builder/Brackets.d.ts

@@ -1,15 +1,16 @@
-import { WhereExpression } from "./WhereExpression";
+import { WhereExpressionBuilder } from "./WhereExpressionBuilder";
 /**
  * Syntax sugar.
  * Allows to use brackets in WHERE expressions for better syntax.
  */
 export declare class Brackets {
+    readonly "@instanceof": symbol;
     /**
      * WHERE expression that will be taken into brackets.
      */
-    whereFactory: (qb: WhereExpression) => any;
+    whereFactory: (qb: WhereExpressionBuilder) => any;
     /**
      * Given WHERE query builder that will build a WHERE expression that will be taken into brackets.
      */
-    constructor(whereFactory: (qb: WhereExpression) => any);
+    constructor(whereFactory: (qb: WhereExpressionBuilder) => any);
 }

package/browser/query-builder/Brackets.js

@@ -2,15 +2,14 @@
  * Syntax sugar.
  * Allows to use brackets in WHERE expressions for better syntax.
  */
-var Brackets = /** @class */ (function () {
+export class Brackets {
     /**
      * Given WHERE query builder that will build a WHERE expression that will be taken into brackets.
      */
-    function Brackets(whereFactory) {
+    constructor(whereFactory) {
+        this["@instanceof"] = Symbol.for("Brackets");
         this.whereFactory = whereFactory;
     }
-    return Brackets;
-}());
-export { Brackets };
+}
 
 //# sourceMappingURL=Brackets.js.map

package/browser/query-builder/Brackets.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/query-builder/Brackets.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH;IAOI;;OAEG;IACH,kBAAY,YAA0C;QAClD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAEL,eAAC;AAAD,CAdA,AAcC,IAAA","file":"Brackets.js","sourcesContent":["import {WhereExpression} from \"./WhereExpression\";\n\n/**\n * Syntax sugar.\n * Allows to use brackets in WHERE expressions for better syntax.\n */\nexport class Brackets {\n\n    /**\n     * WHERE expression that will be taken into brackets.\n     */\n    whereFactory: (qb: WhereExpression) => any;\n\n    /**\n     * Given WHERE query builder that will build a WHERE expression that will be taken into brackets.\n     */\n    constructor(whereFactory: (qb: WhereExpression) => any) {\n        this.whereFactory = whereFactory;\n    }\n\n}"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/query-builder/Brackets.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,OAAO,QAAQ;IAQjB;;OAEG;IACH,YAAY,YAAiD;QAVpD,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAW3C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;CACJ","file":"Brackets.js","sourcesContent":["import { WhereExpressionBuilder } from \"./WhereExpressionBuilder\"\n\n/**\n * Syntax sugar.\n * Allows to use brackets in WHERE expressions for better syntax.\n */\nexport class Brackets {\n    readonly \"@instanceof\" = Symbol.for(\"Brackets\")\n\n    /**\n     * WHERE expression that will be taken into brackets.\n     */\n    whereFactory: (qb: WhereExpressionBuilder) => any\n\n    /**\n     * Given WHERE query builder that will build a WHERE expression that will be taken into brackets.\n     */\n    constructor(whereFactory: (qb: WhereExpressionBuilder) => any) {\n        this.whereFactory = whereFactory\n    }\n}\n"],"sourceRoot":".."}

package/browser/query-builder/DeleteQueryBuilder.d.ts

@@ -1,19 +1,19 @@
 import { QueryBuilder } from "./QueryBuilder";
 import { ObjectLiteral } from "../common/ObjectLiteral";
-import { ObjectType } from "../common/ObjectType";
-import { Connection } from "../connection/Connection";
+import { EntityTarget } from "../common/EntityTarget";
+import { DataSource } from "../data-source/DataSource";
 import { QueryRunner } from "../query-runner/QueryRunner";
-import { WhereExpression } from "./WhereExpression";
+import { WhereExpressionBuilder } from "./WhereExpressionBuilder";
 import { Brackets } from "./Brackets";
 import { DeleteResult } from "./result/DeleteResult";
-import { EntitySchema } from "../index";
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
-export declare class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements WhereExpression {
-    constructor(connectionOrQueryBuilder: Connection | QueryBuilder<any>, queryRunner?: QueryRunner);
+export declare class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements WhereExpressionBuilder {
+    readonly "@instanceof": symbol;
+    constructor(connectionOrQueryBuilder: DataSource | QueryBuilder<any>, queryRunner?: QueryRunner);
     /**
-     * Gets generated sql query without parameters being replaced.
+     * Gets generated SQL query without parameters being replaced.
      */
     getQuery(): string;
     /**
@@ -24,7 +24,7 @@ export declare class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> imp
      * Specifies FROM which entity's table select/update/delete will be executed.
      * Also sets a main string alias of the selection data.
      */
-    from<T>(entityTarget: ObjectType<T> | EntitySchema<T> | string, aliasName?: string): DeleteQueryBuilder<T>;
+    from<T>(entityTarget: EntityTarget<T>, aliasName?: string): DeleteQueryBuilder<T>;
     /**
      * Sets WHERE condition in the query builder.
      * If you had previously WHERE expression defined,
@@ -36,14 +36,16 @@ export declare class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> imp
      * Adds new AND WHERE condition in the query builder.
      * Additionally you can add parameters used in where expression.
      */
-    andWhere(where: Brackets | string | ((qb: this) => string), parameters?: ObjectLiteral): this;
+    andWhere(where: Brackets | string | ((qb: this) => string) | ObjectLiteral | ObjectLiteral[], parameters?: ObjectLiteral): this;
     /**
      * Adds new OR WHERE condition in the query builder.
      * Additionally you can add parameters used in where expression.
      */
-    orWhere(where: Brackets | string | ((qb: this) => string), parameters?: ObjectLiteral): this;
+    orWhere(where: Brackets | string | ((qb: this) => string) | ObjectLiteral | ObjectLiteral[], parameters?: ObjectLiteral): this;
     /**
-     * Adds new AND WHERE with conditions for the given ids.
+     * Sets WHERE condition in the query builder with a condition for the given ids.
+     * If you had previously WHERE expression defined,
+     * calling this function will override previously set WHERE conditions.
      */
     whereInIds(ids: any | any[]): this;
     /**