typeorm 0.2.42-dev.f3e2b0e → 0.2.42-dev.f7c1f7d

package/commands/CacheClearCommand.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var globals_1 = require("../globals");
 var ConnectionOptionsReader_1 = require("../connection/ConnectionOptionsReader");
 var chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+var PlatformTools_1 = require("../platform/PlatformTools");
 /**
  * Clear cache command.
  */
@@ -54,7 +55,7 @@ var CacheClearCommand = /** @class */ (function () {
                     case 3:
                         connection = _a.sent();
                         if (!connection.queryResultCache) {
-                            console.log(chalk_1.default.black.bgRed("Cache is not enabled. To use cache enable it in connection configuration."));
+                            PlatformTools_1.PlatformTools.logCmdErr("Cache is not enabled. To use cache enable it in connection configuration.");
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, connection.queryResultCache.clear()];
@@ -75,8 +76,7 @@ var CacheClearCommand = /** @class */ (function () {
                         _a.sent();
                         _a.label = 9;
                     case 9:
-                        console.log(chalk_1.default.black.bgRed("Error during cache clear:"));
-                        console.error(err_1);
+                        PlatformTools_1.PlatformTools.logCmdErr("Error during cache clear.", err_1);
                         process.exit(1);
                         return [3 /*break*/, 10];
                     case 10: return [2 /*return*/];

package/commands/CacheClearCommand.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/CacheClearCommand.ts"],"names":[],"mappings":";;;;AAAA,sCAA4C;AAC5C,iFAA8E;AAG9E,6DAA0B;AAE1B;;GAEG;AACH;IAAA;QAEI,YAAO,GAAG,aAAa,CAAC;QACxB,aAAQ,GAAG,+CAA+C,CAAC;IAqD/D,CAAC;IAnDG,mCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,8CAA8C;SAC3D,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE,iDAAiD;SAC9D,CAAC,CAAC;IACX,CAAC;IAEK,mCAAO,GAAb,UAAc,IAAqB;;;;;;wBAE3B,UAAU,GAAyB,SAAS,CAAC;;;;wBAEvC,uBAAuB,GAAG,IAAI,iDAAuB,CAAC;4BACxD,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;4BACnB,UAAU,EAAE,IAAI,CAAC,MAAa;yBACjC,CAAC,CAAC;wBACuB,qBAAM,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAiB,CAAC,EAAA;;wBAA7E,iBAAiB,GAAG,SAAyD;wBACnF,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE;4BAC7B,WAAW,EAAE,EAAE;4BACf,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,CAAC,QAAQ,CAAC;yBACtB,CAAC,CAAC;wBACU,qBAAM,IAAA,0BAAgB,EAAC,iBAAiB,CAAC,EAAA;;wBAAtD,UAAU,GAAG,SAAyC,CAAC;wBAEvD,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE;4BAC9B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC,CAAC;4BAC5G,sBAAO;yBACV;wBAED,qBAAM,UAAU,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAA;;wBAAzC,SAAyC,CAAC;wBAC1C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;6BAEvD,UAAU,EAAV,wBAAU;wBAAE,qBAAM,UAAU,CAAC,KAAK,EAAE,EAAA;;wBAAxB,SAAwB,CAAC;;;;;6BAGrC,UAAU,EAAV,wBAAU;wBAAE,qBAAO,UAAyB,CAAC,KAAK,EAAE,EAAA;;wBAAxC,SAAwC,CAAC;;;wBAEzD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;wBAC5D,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAC;wBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;;;;KAEvB;IAEL,wBAAC;AAAD,CAxDA,AAwDC,IAAA;AAxDY,8CAAiB","file":"CacheClearCommand.js","sourcesContent":["import {createConnection} from \"../globals\";\nimport {ConnectionOptionsReader} from \"../connection/ConnectionOptionsReader\";\nimport {Connection} from \"../connection/Connection\";\nimport * as yargs from \"yargs\";\nimport chalk from \"chalk\";\n\n/**\n * Clear cache command.\n */\nexport class CacheClearCommand implements yargs.CommandModule {\n\n    command = \"cache:clear\";\n    describe = \"Clears all data stored in query runner cache.\";\n\n    builder(args: yargs.Argv) {\n        return args\n            .option(\"connection\", {\n                alias: \"c\",\n                default: \"default\",\n                describe: \"Name of the connection on which run a query.\"\n            })\n            .option(\"config\", {\n                alias: \"f\",\n                default: \"ormconfig\",\n                describe: \"Name of the file with connection configuration.\"\n            });\n    }\n\n    async handler(args: yargs.Arguments) {\n\n        let connection: Connection|undefined = undefined;\n        try {\n            const connectionOptionsReader = new ConnectionOptionsReader({\n                root: process.cwd(),\n                configName: args.config as any\n            });\n            const connectionOptions = await connectionOptionsReader.get(args.connection as any);\n            Object.assign(connectionOptions, {\n                subscribers: [],\n                synchronize: false,\n                migrationsRun: false,\n                dropSchema: false,\n                logging: [\"schema\"]\n            });\n            connection = await createConnection(connectionOptions);\n\n            if (!connection.queryResultCache) {\n                console.log(chalk.black.bgRed(\"Cache is not enabled. To use cache enable it in connection configuration.\"));\n                return;\n            }\n\n            await connection.queryResultCache.clear();\n            console.log(chalk.green(\"Cache was successfully cleared\"));\n\n            if (connection) await connection.close();\n\n        } catch (err) {\n            if (connection) await (connection as Connection).close();\n\n            console.log(chalk.black.bgRed(\"Error during cache clear:\"));\n            console.error(err);\n            process.exit(1);\n        }\n    }\n\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/commands/CacheClearCommand.ts"],"names":[],"mappings":";;;;AAAA,sCAA4C;AAC5C,iFAA8E;AAG9E,6DAA0B;AAC1B,2DAA0D;AAE1D;;GAEG;AACH;IAAA;QAEI,YAAO,GAAG,aAAa,CAAC;QACxB,aAAQ,GAAG,+CAA+C,CAAC;IAqD/D,CAAC;IAnDG,mCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,8CAA8C;SAC3D,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE,iDAAiD;SAC9D,CAAC,CAAC;IACX,CAAC;IAEK,mCAAO,GAAb,UAAc,IAAqB;;;;;;wBAE3B,UAAU,GAAyB,SAAS,CAAC;;;;wBAEvC,uBAAuB,GAAG,IAAI,iDAAuB,CAAC;4BACxD,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;4BACnB,UAAU,EAAE,IAAI,CAAC,MAAa;yBACjC,CAAC,CAAC;wBACuB,qBAAM,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAiB,CAAC,EAAA;;wBAA7E,iBAAiB,GAAG,SAAyD;wBACnF,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE;4BAC7B,WAAW,EAAE,EAAE;4BACf,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,CAAC,QAAQ,CAAC;yBACtB,CAAC,CAAC;wBACU,qBAAM,IAAA,0BAAgB,EAAC,iBAAiB,CAAC,EAAA;;wBAAtD,UAAU,GAAG,SAAyC,CAAC;wBAEvD,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE;4BAC9B,6BAAa,CAAC,SAAS,CAAC,2EAA2E,CAAC,CAAC;4BACrG,sBAAO;yBACV;wBAED,qBAAM,UAAU,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAA;;wBAAzC,SAAyC,CAAC;wBAC1C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;6BAEvD,UAAU,EAAV,wBAAU;wBAAE,qBAAM,UAAU,CAAC,KAAK,EAAE,EAAA;;wBAAxB,SAAwB,CAAC;;;;;6BAGrC,UAAU,EAAV,wBAAU;wBAAE,qBAAO,UAAyB,CAAC,KAAK,EAAE,EAAA;;wBAAxC,SAAwC,CAAC;;;wBAEzD,6BAAa,CAAC,SAAS,CAAC,2BAA2B,EAAE,KAAG,CAAC,CAAC;wBAE1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;;;;KAEvB;IAEL,wBAAC;AAAD,CAxDA,AAwDC,IAAA;AAxDY,8CAAiB","file":"CacheClearCommand.js","sourcesContent":["import {createConnection} from \"../globals\";\nimport {ConnectionOptionsReader} from \"../connection/ConnectionOptionsReader\";\nimport {Connection} from \"../connection/Connection\";\nimport * as yargs from \"yargs\";\nimport chalk from \"chalk\";\nimport { PlatformTools } from \"../platform/PlatformTools\";\n\n/**\n * Clear cache command.\n */\nexport class CacheClearCommand implements yargs.CommandModule {\n\n    command = \"cache:clear\";\n    describe = \"Clears all data stored in query runner cache.\";\n\n    builder(args: yargs.Argv) {\n        return args\n            .option(\"connection\", {\n                alias: \"c\",\n                default: \"default\",\n                describe: \"Name of the connection on which run a query.\"\n            })\n            .option(\"config\", {\n                alias: \"f\",\n                default: \"ormconfig\",\n                describe: \"Name of the file with connection configuration.\"\n            });\n    }\n\n    async handler(args: yargs.Arguments) {\n\n        let connection: Connection|undefined = undefined;\n        try {\n            const connectionOptionsReader = new ConnectionOptionsReader({\n                root: process.cwd(),\n                configName: args.config as any\n            });\n            const connectionOptions = await connectionOptionsReader.get(args.connection as any);\n            Object.assign(connectionOptions, {\n                subscribers: [],\n                synchronize: false,\n                migrationsRun: false,\n                dropSchema: false,\n                logging: [\"schema\"]\n            });\n            connection = await createConnection(connectionOptions);\n\n            if (!connection.queryResultCache) {\n                PlatformTools.logCmdErr(\"Cache is not enabled. To use cache enable it in connection configuration.\");\n                return;\n            }\n\n            await connection.queryResultCache.clear();\n            console.log(chalk.green(\"Cache was successfully cleared\"));\n\n            if (connection) await connection.close();\n\n        } catch (err) {\n            if (connection) await (connection as Connection).close();\n\n            PlatformTools.logCmdErr(\"Error during cache clear.\", err);\n\n            process.exit(1);\n        }\n    }\n\n}\n"],"sourceRoot":".."}

package/commands/CommandUtils.d.ts

@@ -15,4 +15,8 @@ export declare class CommandUtils {
      */
     static readFile(filePath: string): Promise<string>;
     static fileExists(filePath: string): Promise<boolean>;
+    /**
+     * Gets migration timestamp and validates argument (if sent)
+     */
+    static getTimestamp(timestampOptionArgument: any): number;
 }

package/commands/CommandUtils.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var fs = (0, tslib_1.__importStar)(require("fs"));
 var path = (0, tslib_1.__importStar)(require("path"));
 var mkdirp_1 = (0, tslib_1.__importDefault)(require("mkdirp"));
+var error_1 = require("../error");
 /**
  * Command line utils functions.
  */
@@ -56,6 +57,15 @@ var CommandUtils = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Gets migration timestamp and validates argument (if sent)
+     */
+    CommandUtils.getTimestamp = function (timestampOptionArgument) {
+        if (timestampOptionArgument && (isNaN(timestampOptionArgument) || timestampOptionArgument < 0)) {
+            throw new error_1.TypeORMError("timestamp option should be a non-negative number. received: " + timestampOptionArgument);
+        }
+        return timestampOptionArgument ? new Date(Number(timestampOptionArgument)).getTime() : Date.now();
+    };
     return CommandUtils;
 }());
 exports.CommandUtils = CommandUtils;

package/commands/CommandUtils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/CommandUtils.ts"],"names":[],"mappings":";;;;AAAA,kDAAyB;AACzB,sDAA6B;AAC7B,+DAA4B;AAE5B;;GAEG;AACH;IAAA;IAmCA,CAAC;IAjCG;;OAEG;IACI,8BAAiB,GAAxB,UAAyB,SAAiB;QACtC,OAAO,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACU,uBAAU,GAAvB,UAAwB,QAAgB,EAAE,OAAe,EAAE,QAAwB;QAAxB,yBAAA,EAAA,eAAwB;;;;4BAC/E,qBAAM,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAA;;wBAA5D,SAA4D,CAAC;wBAC7D,sBAAO,IAAI,OAAO,CAAO,UAAC,EAAE,EAAE,IAAI;gCAC9B,IAAI,QAAQ,KAAK,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;oCAC7C,OAAO,EAAE,EAAE,CAAC;gCAEhB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAtB,CAAsB,CAAC,CAAC;4BACnE,CAAC,CAAC,EAAC;;;;KACN;IAED;;OAEG;IACU,qBAAQ,GAArB,UAAsB,QAAgB;;;gBAClC,sBAAO,IAAI,OAAO,CAAS,UAAC,EAAE,EAAE,IAAI;wBAChC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI,IAAK,OAAA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAArC,CAAqC,CAAC,CAAC;oBAChF,CAAC,CAAC,EAAC;;;KACN;IAGY,uBAAU,GAAvB,UAAwB,QAAgB;;;gBACpC,sBAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;;;KAClC;IACL,mBAAC;AAAD,CAnCA,AAmCC,IAAA;AAnCY,oCAAY","file":"CommandUtils.js","sourcesContent":["import * as fs from \"fs\";\nimport * as path from \"path\";\nimport mkdirp from \"mkdirp\";\n\n/**\n * Command line utils functions.\n */\nexport class CommandUtils {\n\n    /**\n     * Creates directories recursively.\n     */\n    static createDirectories(directory: string) {\n        return mkdirp(directory);\n    }\n\n    /**\n     * Creates a file with the given content in the given path.\n     */\n    static async createFile(filePath: string, content: string, override: boolean = true): Promise<void> {\n        await CommandUtils.createDirectories(path.dirname(filePath));\n        return new Promise<void>((ok, fail) => {\n            if (override === false && fs.existsSync(filePath))\n                return ok();\n\n            fs.writeFile(filePath, content, err => err ? fail(err) : ok());\n        });\n    }\n\n    /**\n     * Reads everything from a given file and returns its content as a string.\n     */\n    static async readFile(filePath: string): Promise<string> {\n        return new Promise<string>((ok, fail) => {\n            fs.readFile(filePath, (err, data) => err ? fail(err) : ok(data.toString()));\n        });\n    }\n\n\n    static async fileExists(filePath: string) {\n        return fs.existsSync(filePath);\n    }\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/commands/CommandUtils.ts"],"names":[],"mappings":";;;;AAAA,kDAAyB;AACzB,sDAA6B;AAC7B,+DAA4B;AAC5B,kCAAsC;AAEtC;;GAEG;AACH;IAAA;IA6CA,CAAC;IA3CG;;OAEG;IACI,8BAAiB,GAAxB,UAAyB,SAAiB;QACtC,OAAO,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACU,uBAAU,GAAvB,UAAwB,QAAgB,EAAE,OAAe,EAAE,QAAwB;QAAxB,yBAAA,EAAA,eAAwB;;;;4BAC/E,qBAAM,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAA;;wBAA5D,SAA4D,CAAC;wBAC7D,sBAAO,IAAI,OAAO,CAAO,UAAC,EAAE,EAAE,IAAI;gCAC9B,IAAI,QAAQ,KAAK,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;oCAC7C,OAAO,EAAE,EAAE,CAAC;gCAEhB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAtB,CAAsB,CAAC,CAAC;4BACnE,CAAC,CAAC,EAAC;;;;KACN;IAED;;OAEG;IACU,qBAAQ,GAArB,UAAsB,QAAgB;;;gBAClC,sBAAO,IAAI,OAAO,CAAS,UAAC,EAAE,EAAE,IAAI;wBAChC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI,IAAK,OAAA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAArC,CAAqC,CAAC,CAAC;oBAChF,CAAC,CAAC,EAAC;;;KACN;IAGY,uBAAU,GAAvB,UAAwB,QAAgB;;;gBACpC,sBAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;;;KAClC;IAED;;OAEG;IACI,yBAAY,GAAnB,UAAoB,uBAA4B;QAC5C,IAAI,uBAAuB,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,uBAAuB,GAAG,CAAC,CAAC,EAAE;YAC5F,MAAM,IAAI,oBAAY,CAAC,iEAA+D,uBAAyB,CAAC,CAAC;SACpH;QACD,OAAO,uBAAuB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACtG,CAAC;IACL,mBAAC;AAAD,CA7CA,AA6CC,IAAA;AA7CY,oCAAY","file":"CommandUtils.js","sourcesContent":["import * as fs from \"fs\";\nimport * as path from \"path\";\nimport mkdirp from \"mkdirp\";\nimport {TypeORMError} from \"../error\";\n\n/**\n * Command line utils functions.\n */\nexport class CommandUtils {\n\n    /**\n     * Creates directories recursively.\n     */\n    static createDirectories(directory: string) {\n        return mkdirp(directory);\n    }\n\n    /**\n     * Creates a file with the given content in the given path.\n     */\n    static async createFile(filePath: string, content: string, override: boolean = true): Promise<void> {\n        await CommandUtils.createDirectories(path.dirname(filePath));\n        return new Promise<void>((ok, fail) => {\n            if (override === false && fs.existsSync(filePath))\n                return ok();\n\n            fs.writeFile(filePath, content, err => err ? fail(err) : ok());\n        });\n    }\n\n    /**\n     * Reads everything from a given file and returns its content as a string.\n     */\n    static async readFile(filePath: string): Promise<string> {\n        return new Promise<string>((ok, fail) => {\n            fs.readFile(filePath, (err, data) => err ? fail(err) : ok(data.toString()));\n        });\n    }\n\n\n    static async fileExists(filePath: string) {\n        return fs.existsSync(filePath);\n    }\n\n    /**\n     * Gets migration timestamp and validates argument (if sent)\n     */\n    static getTimestamp(timestampOptionArgument: any): number {\n        if (timestampOptionArgument && (isNaN(timestampOptionArgument) || timestampOptionArgument < 0)) {\n            throw new TypeORMError(`timestamp option should be a non-negative number. received: ${timestampOptionArgument}`);\n        }\n        return timestampOptionArgument ? new Date(Number(timestampOptionArgument)).getTime() : Date.now();\n    }\n}\n"],"sourceRoot":".."}

package/commands/EntityCreateCommand.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var ConnectionOptionsReader_1 = require("../connection/ConnectionOptionsReader");
 var CommandUtils_1 = require("./CommandUtils");
 var chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+var PlatformTools_1 = require("../platform/PlatformTools");
 /**
  * Generates a new entity.
  */
@@ -79,8 +80,7 @@ var EntityCreateCommand = /** @class */ (function () {
                         return [3 /*break*/, 8];
                     case 7:
                         err_2 = _a.sent();
-                        console.log(chalk_1.default.black.bgRed("Error during entity creation:"));
-                        console.error(err_2);
+                        PlatformTools_1.PlatformTools.logCmdErr("Error during entity creation:", err_2);
                         process.exit(1);
                         return [3 /*break*/, 8];
                     case 8: return [2 /*return*/];

package/commands/EntityCreateCommand.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/EntityCreateCommand.ts"],"names":[],"mappings":";;;;AAAA,iFAA8E;AAC9E,+CAA4C;AAE5C,6DAA0B;AAE1B;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,eAAe,CAAC;QAC1B,aAAQ,GAAG,yBAAyB,CAAC;IA8EzC,CAAC;IA5EG,qCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,gDAAgD;SAC7D,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,2BAA2B;YACrC,MAAM,EAAE,IAAI;SACf,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,2CAA2C;SACxD,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE,iDAAiD;SAC9D,CAAC,CAAC;IACX,CAAC;IAEK,qCAAO,GAAb,UAAc,IAAqB;;;;;;;wBAErB,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;wBAChE,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;wBAC/B,SAAS,GAAG,IAAI,CAAC,GAAyB,CAAC;6BAG3C,CAAC,SAAS,EAAV,wBAAU;;;;wBAEA,uBAAuB,GAAG,IAAI,iDAAuB,CAAC;4BACxD,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;4BACnB,UAAU,EAAE,IAAI,CAAC,MAAa;yBACjC,CAAC,CAAC;wBACuB,qBAAM,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAiB,CAAC,EAAA;;wBAA7E,iBAAiB,GAAG,SAAyD;wBACnF,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;;;;;;wBAI3F,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;4BACzC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,SAAS,CAAC;yBAC/C;wBACK,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;wBAC1C,qBAAM,2BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAA;;wBAAhD,UAAU,GAAG,SAAmC;wBACtD,IAAI,UAAU,EAAE;4BACZ,MAAM,UAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAiB,CAAC;yBACnD;wBACD,qBAAM,2BAAY,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;wBAAhD,SAAgD,CAAC;wBACjD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,YAAU,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAiC,CAAC,CAAC,CAAC;;;;wBAGtF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC;wBAChE,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAC;wBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;;;;KAEvB;IAED,4EAA4E;IAC5E,2BAA2B;IAC3B,4EAA4E;IAE5E;;OAEG;IACc,+BAAW,GAA5B,UAA6B,IAAY;QACrC,OAAO,kEAGA,IAAI,cAGlB,CAAC;IACE,CAAC;IAEL,0BAAC;AAAD,CAhFA,AAgFC,IAAA;AAhFY,kDAAmB","file":"EntityCreateCommand.js","sourcesContent":["import {ConnectionOptionsReader} from \"../connection/ConnectionOptionsReader\";\nimport {CommandUtils} from \"./CommandUtils\";\nimport * as yargs from \"yargs\";\nimport chalk from \"chalk\";\n\n/**\n * Generates a new entity.\n */\nexport class EntityCreateCommand implements yargs.CommandModule {\n    command = \"entity:create\";\n    describe = \"Generates a new entity.\";\n\n    builder(args: yargs.Argv) {\n        return args\n            .option(\"c\", {\n                alias: \"connection\",\n                default: \"default\",\n                describe: \"Name of the connection on which to run a query\"\n            })\n            .option(\"n\", {\n                alias: \"name\",\n                describe: \"Name of the entity class.\",\n                demand: true\n            })\n            .option(\"d\", {\n                alias: \"dir\",\n                describe: \"Directory where entity should be created.\"\n            })\n            .option(\"f\", {\n                alias: \"config\",\n                default: \"ormconfig\",\n                describe: \"Name of the file with connection configuration.\"\n            });\n    }\n\n    async handler(args: yargs.Arguments) {\n        try {\n            const fileContent = EntityCreateCommand.getTemplate(args.name as any);\n            const filename = args.name + \".ts\";\n            let directory = args.dir as string | undefined;\n\n            // if directory is not set then try to open tsconfig and find default path there\n            if (!directory) {\n                try {\n                    const connectionOptionsReader = new ConnectionOptionsReader({\n                        root: process.cwd(),\n                        configName: args.config as any\n                    });\n                    const connectionOptions = await connectionOptionsReader.get(args.connection as any);\n                    directory = connectionOptions.cli ? (connectionOptions.cli.entitiesDir || \"\") : \"\";\n                } catch (err) { }\n            }\n\n            if (directory && !directory.startsWith(\"/\")) {\n                directory = process.cwd() + \"/\" + directory;\n            }\n            const path = (directory ? (directory + \"/\") : \"\") + filename;\n            const fileExists = await CommandUtils.fileExists(path);\n            if (fileExists) {\n                throw `File ${chalk.blue(path)} already exists`;\n            }\n            await CommandUtils.createFile(path, fileContent);\n            console.log(chalk.green(`Entity ${chalk.blue(path)} has been created successfully.`));\n\n        } catch (err) {\n            console.log(chalk.black.bgRed(\"Error during entity creation:\"));\n            console.error(err);\n            process.exit(1);\n        }\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Static Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Gets contents of the entity file.\n     */\n    protected static getTemplate(name: string): string {\n        return `import {Entity} from \"typeorm\";\n\n@Entity()\nexport class ${name} {\n\n}\n`;\n    }\n\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/commands/EntityCreateCommand.ts"],"names":[],"mappings":";;;;AAAA,iFAA8E;AAC9E,+CAA4C;AAE5C,6DAA0B;AAC1B,2DAA0D;AAE1D;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,eAAe,CAAC;QAC1B,aAAQ,GAAG,yBAAyB,CAAC;IA6EzC,CAAC;IA3EG,qCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,gDAAgD;SAC7D,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,2BAA2B;YACrC,MAAM,EAAE,IAAI;SACf,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,2CAA2C;SACxD,CAAC;aACD,MAAM,CAAC,GAAG,EAAE;YACT,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE,iDAAiD;SAC9D,CAAC,CAAC;IACX,CAAC;IAEK,qCAAO,GAAb,UAAc,IAAqB;;;;;;;wBAErB,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;wBAChE,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;wBAC/B,SAAS,GAAG,IAAI,CAAC,GAAyB,CAAC;6BAG3C,CAAC,SAAS,EAAV,wBAAU;;;;wBAEA,uBAAuB,GAAG,IAAI,iDAAuB,CAAC;4BACxD,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;4BACnB,UAAU,EAAE,IAAI,CAAC,MAAa;yBACjC,CAAC,CAAC;wBACuB,qBAAM,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAiB,CAAC,EAAA;;wBAA7E,iBAAiB,GAAG,SAAyD;wBACnF,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;;;;;;wBAI3F,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;4BACzC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,SAAS,CAAC;yBAC/C;wBACK,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;wBAC1C,qBAAM,2BAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAA;;wBAAhD,UAAU,GAAG,SAAmC;wBACtD,IAAI,UAAU,EAAE;4BACZ,MAAM,UAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAiB,CAAC;yBACnD;wBACD,qBAAM,2BAAY,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;wBAAhD,SAAgD,CAAC;wBACjD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,YAAU,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAiC,CAAC,CAAC,CAAC;;;;wBAGtF,6BAAa,CAAC,SAAS,CAAC,+BAA+B,EAAE,KAAG,CAAC,CAAC;wBAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;;;;KAEvB;IAED,4EAA4E;IAC5E,2BAA2B;IAC3B,4EAA4E;IAE5E;;OAEG;IACc,+BAAW,GAA5B,UAA6B,IAAY;QACrC,OAAO,kEAGA,IAAI,cAGlB,CAAC;IACE,CAAC;IAEL,0BAAC;AAAD,CA/EA,AA+EC,IAAA;AA/EY,kDAAmB","file":"EntityCreateCommand.js","sourcesContent":["import {ConnectionOptionsReader} from \"../connection/ConnectionOptionsReader\";\nimport {CommandUtils} from \"./CommandUtils\";\nimport * as yargs from \"yargs\";\nimport chalk from \"chalk\";\nimport { PlatformTools } from \"../platform/PlatformTools\";\n\n/**\n * Generates a new entity.\n */\nexport class EntityCreateCommand implements yargs.CommandModule {\n    command = \"entity:create\";\n    describe = \"Generates a new entity.\";\n\n    builder(args: yargs.Argv) {\n        return args\n            .option(\"c\", {\n                alias: \"connection\",\n                default: \"default\",\n                describe: \"Name of the connection on which to run a query\"\n            })\n            .option(\"n\", {\n                alias: \"name\",\n                describe: \"Name of the entity class.\",\n                demand: true\n            })\n            .option(\"d\", {\n                alias: \"dir\",\n                describe: \"Directory where entity should be created.\"\n            })\n            .option(\"f\", {\n                alias: \"config\",\n                default: \"ormconfig\",\n                describe: \"Name of the file with connection configuration.\"\n            });\n    }\n\n    async handler(args: yargs.Arguments) {\n        try {\n            const fileContent = EntityCreateCommand.getTemplate(args.name as any);\n            const filename = args.name + \".ts\";\n            let directory = args.dir as string | undefined;\n\n            // if directory is not set then try to open tsconfig and find default path there\n            if (!directory) {\n                try {\n                    const connectionOptionsReader = new ConnectionOptionsReader({\n                        root: process.cwd(),\n                        configName: args.config as any\n                    });\n                    const connectionOptions = await connectionOptionsReader.get(args.connection as any);\n                    directory = connectionOptions.cli ? (connectionOptions.cli.entitiesDir || \"\") : \"\";\n                } catch (err) { }\n            }\n\n            if (directory && !directory.startsWith(\"/\")) {\n                directory = process.cwd() + \"/\" + directory;\n            }\n            const path = (directory ? (directory + \"/\") : \"\") + filename;\n            const fileExists = await CommandUtils.fileExists(path);\n            if (fileExists) {\n                throw `File ${chalk.blue(path)} already exists`;\n            }\n            await CommandUtils.createFile(path, fileContent);\n            console.log(chalk.green(`Entity ${chalk.blue(path)} has been created successfully.`));\n\n        } catch (err) {\n            PlatformTools.logCmdErr(\"Error during entity creation:\", err);\n            process.exit(1);\n        }\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Static Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Gets contents of the entity file.\n     */\n    protected static getTemplate(name: string): string {\n        return `import {Entity} from \"typeorm\";\n\n@Entity()\nexport class ${name} {\n\n}\n`;\n    }\n\n}\n"],"sourceRoot":".."}

package/commands/InitCommand.d.ts

@@ -17,9 +17,11 @@ export declare class InitCommand implements yargs.CommandModule {
         docker: unknown;
     } & {
         pm: string;
+    } & {
+        ms: string;
     }>;
     handler(args: yargs.Arguments): Promise<void>;
-    protected static executeCommand(command: string): Promise<string>;
+    protected static executeCommand(command: string, cwd: string): Promise<string>;
     /**
      * Gets contents of the ormconfig file.
      */
@@ -27,7 +29,7 @@ export declare class InitCommand implements yargs.CommandModule {
     /**
      * Gets contents of the ormconfig file.
      */
-    protected static getTsConfigTemplate(): string;
+    protected static getTsConfigTemplate(esmModule: boolean): string;
     /**
      * Gets contents of the .gitignore file.
      */
@@ -39,19 +41,19 @@ export declare class InitCommand implements yargs.CommandModule {
     /**
      * Gets contents of the route file (used when express is enabled).
      */
-    protected static getRoutesTemplate(): string;
+    protected static getRoutesTemplate(isEsm: boolean): string;
     /**
      * Gets contents of the user controller file (used when express is enabled).
      */
-    protected static getControllerTemplate(): string;
+    protected static getControllerTemplate(isEsm: boolean): string;
     /**
      * Gets contents of the main (index) application file.
      */
-    protected static getAppIndexTemplate(express: boolean): string;
+    protected static getAppIndexTemplate(express: boolean, isEsm: boolean): string;
     /**
      * Gets contents of the new package.json file.
      */
-    protected static getPackageJsonTemplate(projectName?: string): string;
+    protected static getPackageJsonTemplate(projectName?: string, projectIsEsm?: boolean): string;
     /**
      * Gets contents of the new docker-compose.yml file.
      */
@@ -65,5 +67,5 @@ export declare class InitCommand implements yargs.CommandModule {
     /**
      * Appends to a given package.json template everything needed.
      */
-    protected static appendPackageJson(packageJsonContents: string, database: string, express: boolean): string;
+    protected static appendPackageJson(packageJsonContents: string, database: string, express: boolean, projectIsEsm: boolean): string;
 }

package/commands/InitCommand.js

@@ -7,6 +7,7 @@ var path = (0, tslib_1.__importStar)(require("path"));
 var chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 var child_process_1 = require("child_process");
 var TypeORMError_1 = require("../error/TypeORMError");
+var PlatformTools_1 = require("../platform/PlatformTools");
 /**
  * Generates a new project with TypeORM.
  */
@@ -43,11 +44,17 @@ var InitCommand = /** @class */ (function () {
             choices: ["npm", "yarn"],
             default: "npm",
             describe: "Install packages, expected values are npm or yarn."
+        })
+            .option("ms", {
+            alias: "module",
+            choices: ["commonjs", "esm"],
+            default: "commonjs",
+            describe: "Module system to use for project, expected values are commonjs or esm."
         });
     };
     InitCommand.prototype.handler = function (args) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var database, isExpress, isDocker, basePath, projectName, installNpm, packageJsonContents, err_1;
+            var database, isExpress, isDocker, basePath, projectName, installNpm, projectIsEsm, packageJsonContents, err_1;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -58,7 +65,8 @@ var InitCommand = /** @class */ (function () {
                         basePath = process.cwd() + (args.name ? ("/" + args.name) : "");
                         projectName = args.name ? path.basename(args.name) : undefined;
                         installNpm = args.pm === "yarn" ? false : true;
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/package.json", InitCommand.getPackageJsonTemplate(projectName), false)];
+                        projectIsEsm = args.ms === "esm";
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/package.json", InitCommand.getPackageJsonTemplate(projectName, projectIsEsm), false)];
                     case 1:
                         _a.sent();
                         if (!isDocker) return [3 /*break*/, 3];
@@ -72,7 +80,7 @@ var InitCommand = /** @class */ (function () {
                         return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/README.md", InitCommand.getReadmeTemplate({ docker: isDocker }), false)];
                     case 5:
                         _a.sent();
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/tsconfig.json", InitCommand.getTsConfigTemplate())];
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/tsconfig.json", InitCommand.getTsConfigTemplate(projectIsEsm))];
                     case 6:
                         _a.sent();
                         return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/ormconfig.json", InitCommand.getOrmConfigTemplate(database))];
@@ -81,24 +89,24 @@ var InitCommand = /** @class */ (function () {
                         return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/entity/User.ts", InitCommand.getUserEntityTemplate(database))];
                     case 8:
                         _a.sent();
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/index.ts", InitCommand.getAppIndexTemplate(isExpress))];
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/index.ts", InitCommand.getAppIndexTemplate(isExpress, projectIsEsm))];
                     case 9:
                         _a.sent();
                         return [4 /*yield*/, CommandUtils_1.CommandUtils.createDirectories(basePath + "/src/migration")];
                     case 10:
                         _a.sent();
                         if (!isExpress) return [3 /*break*/, 13];
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/routes.ts", InitCommand.getRoutesTemplate())];
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/routes.ts", InitCommand.getRoutesTemplate(projectIsEsm))];
                     case 11:
                         _a.sent();
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/controller/UserController.ts", InitCommand.getControllerTemplate())];
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/src/controller/UserController.ts", InitCommand.getControllerTemplate(projectIsEsm))];
                     case 12:
                         _a.sent();
                         _a.label = 13;
                     case 13: return [4 /*yield*/, CommandUtils_1.CommandUtils.readFile(basePath + "/package.json")];
                     case 14:
                         packageJsonContents = _a.sent();
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/package.json", InitCommand.appendPackageJson(packageJsonContents, database, isExpress))];
+                        return [4 /*yield*/, CommandUtils_1.CommandUtils.createFile(basePath + "/package.json", InitCommand.appendPackageJson(packageJsonContents, database, isExpress, projectIsEsm))];
                     case 15:
                         _a.sent();
                         if (args.name) {
@@ -108,19 +116,18 @@ var InitCommand = /** @class */ (function () {
                             console.log(chalk_1.default.green("Project created inside current directory."));
                         }
                         if (!(args.pm && installNpm)) return [3 /*break*/, 17];
-                        return [4 /*yield*/, InitCommand.executeCommand("npm install")];
+                        return [4 /*yield*/, InitCommand.executeCommand("npm install", basePath)];
                     case 16:
                         _a.sent();
                         return [3 /*break*/, 19];
-                    case 17: return [4 /*yield*/, InitCommand.executeCommand("yarn install")];
+                    case 17: return [4 /*yield*/, InitCommand.executeCommand("yarn install", basePath)];
                     case 18:
                         _a.sent();
                         _a.label = 19;
                     case 19: return [3 /*break*/, 21];
                     case 20:
                         err_1 = _a.sent();
-                        console.log(chalk_1.default.black.bgRed("Error during project initialization:"));
-                        console.error(err_1);
+                        PlatformTools_1.PlatformTools.logCmdErr("Error during project initialization:", err_1);
                         process.exit(1);
                         return [3 /*break*/, 21];
                     case 21: return [2 /*return*/];
@@ -131,9 +138,9 @@ var InitCommand = /** @class */ (function () {
     // -------------------------------------------------------------------------
     // Protected Static Methods
     // -------------------------------------------------------------------------
-    InitCommand.executeCommand = function (command) {
+    InitCommand.executeCommand = function (command, cwd) {
         return new Promise(function (ok, fail) {
-            (0, child_process_1.exec)(command, function (error, stdout, stderr) {
+            (0, child_process_1.exec)(command, { cwd: cwd }, function (error, stdout, stderr) {
                 if (stdout)
                     return ok(stdout);
                 if (stderr)
@@ -251,19 +258,34 @@ var InitCommand = /** @class */ (function () {
     /**
      * Gets contents of the ormconfig file.
      */
-    InitCommand.getTsConfigTemplate = function () {
-        return JSON.stringify({
-            compilerOptions: {
-                lib: ["es5", "es6"],
-                target: "es5",
-                module: "commonjs",
-                moduleResolution: "node",
-                outDir: "./build",
-                emitDecoratorMetadata: true,
-                experimentalDecorators: true,
-                sourceMap: true
-            }
-        }, undefined, 3);
+    InitCommand.getTsConfigTemplate = function (esmModule) {
+        if (esmModule)
+            return JSON.stringify({
+                compilerOptions: {
+                    lib: ["es2021"],
+                    target: "es2021",
+                    module: "es2022",
+                    moduleResolution: "node",
+                    allowSyntheticDefaultImports: true,
+                    outDir: "./build",
+                    emitDecoratorMetadata: true,
+                    experimentalDecorators: true,
+                    sourceMap: true
+                }
+            }, undefined, 3);
+        else
+            return JSON.stringify({
+                compilerOptions: {
+                    lib: ["es5", "es6"],
+                    target: "es5",
+                    module: "commonjs",
+                    moduleResolution: "node",
+                    outDir: "./build",
+                    emitDecoratorMetadata: true,
+                    experimentalDecorators: true,
+                    sourceMap: true
+                }
+            }, undefined, 3);
     };
     /**
      * Gets contents of the .gitignore file.
@@ -280,34 +302,35 @@ var InitCommand = /** @class */ (function () {
     /**
      * Gets contents of the route file (used when express is enabled).
      */
-    InitCommand.getRoutesTemplate = function () {
-        return "import {UserController} from \"./controller/UserController\";\n\nexport const Routes = [{\n    method: \"get\",\n    route: \"/users\",\n    controller: UserController,\n    action: \"all\"\n}, {\n    method: \"get\",\n    route: \"/users/:id\",\n    controller: UserController,\n    action: \"one\"\n}, {\n    method: \"post\",\n    route: \"/users\",\n    controller: UserController,\n    action: \"save\"\n}, {\n    method: \"delete\",\n    route: \"/users/:id\",\n    controller: UserController,\n    action: \"remove\"\n}];";
+    InitCommand.getRoutesTemplate = function (isEsm) {
+        return "import {UserController} from \"./controller/UserController" + (isEsm ? ".js" : "") + "\";\n\nexport const Routes = [{\n    method: \"get\",\n    route: \"/users\",\n    controller: UserController,\n    action: \"all\"\n}, {\n    method: \"get\",\n    route: \"/users/:id\",\n    controller: UserController,\n    action: \"one\"\n}, {\n    method: \"post\",\n    route: \"/users\",\n    controller: UserController,\n    action: \"save\"\n}, {\n    method: \"delete\",\n    route: \"/users/:id\",\n    controller: UserController,\n    action: \"remove\"\n}];";
     };
     /**
      * Gets contents of the user controller file (used when express is enabled).
      */
-    InitCommand.getControllerTemplate = function () {
-        return "import {getRepository} from \"typeorm\";\nimport {NextFunction, Request, Response} from \"express\";\nimport {User} from \"../entity/User\";\n\nexport class UserController {\n\n    private userRepository = getRepository(User);\n\n    async all(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.find();\n    }\n\n    async one(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.findOne(request.params.id);\n    }\n\n    async save(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.save(request.body);\n    }\n\n    async remove(request: Request, response: Response, next: NextFunction) {\n        let userToRemove = await this.userRepository.findOne(request.params.id);\n        await this.userRepository.remove(userToRemove);\n    }\n\n}";
+    InitCommand.getControllerTemplate = function (isEsm) {
+        return "import {getRepository} from \"typeorm\";\nimport {NextFunction, Request, Response} from \"express\";\nimport {User} from \"../entity/User" + (isEsm ? ".js" : "") + "\";\n\nexport class UserController {\n\n    private userRepository = getRepository(User);\n\n    async all(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.find();\n    }\n\n    async one(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.findOne(request.params.id);\n    }\n\n    async save(request: Request, response: Response, next: NextFunction) {\n        return this.userRepository.save(request.body);\n    }\n\n    async remove(request: Request, response: Response, next: NextFunction) {\n        let userToRemove = await this.userRepository.findOne(request.params.id);\n        await this.userRepository.remove(userToRemove);\n    }\n\n}";
     };
     /**
      * Gets contents of the main (index) application file.
      */
-    InitCommand.getAppIndexTemplate = function (express) {
+    InitCommand.getAppIndexTemplate = function (express, isEsm) {
         if (express) {
-            return "import \"reflect-metadata\";\nimport {createConnection} from \"typeorm\";\nimport * as express from \"express\";\nimport * as bodyParser from \"body-parser\";\nimport {Request, Response} from \"express\";\nimport {Routes} from \"./routes\";\nimport {User} from \"./entity/User\";\n\ncreateConnection().then(async connection => {\n\n    // create express app\n    const app = express();\n    app.use(bodyParser.json());\n\n    // register express routes from defined application routes\n    Routes.forEach(route => {\n        (app as any)[route.method](route.route, (req: Request, res: Response, next: Function) => {\n            const result = (new (route.controller as any))[route.action](req, res, next);\n            if (result instanceof Promise) {\n                result.then(result => result !== null && result !== undefined ? res.send(result) : undefined);\n\n            } else if (result !== null && result !== undefined) {\n                res.json(result);\n            }\n        });\n    });\n\n    // setup express app here\n    // ...\n\n    // start express server\n    app.listen(3000);\n\n    // insert new users for test\n    await connection.manager.save(connection.manager.create(User, {\n        firstName: \"Timber\",\n        lastName: \"Saw\",\n        age: 27\n    }));\n    await connection.manager.save(connection.manager.create(User, {\n        firstName: \"Phantom\",\n        lastName: \"Assassin\",\n        age: 24\n    }));\n\n    console.log(\"Express server has started on port 3000. Open http://localhost:3000/users to see results\");\n\n}).catch(error => console.log(error));\n";
+            return "import \"reflect-metadata\";\nimport {createConnection} from \"typeorm\";\nimport " + (!isEsm ? "* as " : "") + "express from \"express\";\nimport " + (!isEsm ? "* as " : "") + "bodyParser from \"body-parser\";\nimport {Request, Response} from \"express\";\nimport {Routes} from \"./routes" + (isEsm ? ".js" : "") + "\";\nimport {User} from \"./entity/User" + (isEsm ? ".js" : "") + "\";\n\ncreateConnection().then(async connection => {\n\n    // create express app\n    const app = express();\n    app.use(bodyParser.json());\n\n    // register express routes from defined application routes\n    Routes.forEach(route => {\n        (app as any)[route.method](route.route, (req: Request, res: Response, next: Function) => {\n            const result = (new (route.controller as any))[route.action](req, res, next);\n            if (result instanceof Promise) {\n                result.then(result => result !== null && result !== undefined ? res.send(result) : undefined);\n\n            } else if (result !== null && result !== undefined) {\n                res.json(result);\n            }\n        });\n    });\n\n    // setup express app here\n    // ...\n\n    // start express server\n    app.listen(3000);\n\n    // insert new users for test\n    await connection.manager.save(connection.manager.create(User, {\n        firstName: \"Timber\",\n        lastName: \"Saw\",\n        age: 27\n    }));\n    await connection.manager.save(connection.manager.create(User, {\n        firstName: \"Phantom\",\n        lastName: \"Assassin\",\n        age: 24\n    }));\n\n    console.log(\"Express server has started on port 3000. Open http://localhost:3000/users to see results\");\n\n}).catch(error => console.log(error));\n";
         }
         else {
-            return "import \"reflect-metadata\";\nimport {createConnection} from \"typeorm\";\nimport {User} from \"./entity/User\";\n\ncreateConnection().then(async connection => {\n\n    console.log(\"Inserting a new user into the database...\");\n    const user = new User();\n    user.firstName = \"Timber\";\n    user.lastName = \"Saw\";\n    user.age = 25;\n    await connection.manager.save(user);\n    console.log(\"Saved a new user with id: \" + user.id);\n\n    console.log(\"Loading users from the database...\");\n    const users = await connection.manager.find(User);\n    console.log(\"Loaded users: \", users);\n\n    console.log(\"Here you can setup and run express/koa/any other framework.\");\n\n}).catch(error => console.log(error));\n";
+            return "import \"reflect-metadata\";\nimport {createConnection} from \"typeorm\";\nimport {User} from \"./entity/User" + (isEsm ? ".js" : "") + "\";\n\ncreateConnection().then(async connection => {\n\n    console.log(\"Inserting a new user into the database...\");\n    const user = new User();\n    user.firstName = \"Timber\";\n    user.lastName = \"Saw\";\n    user.age = 25;\n    await connection.manager.save(user);\n    console.log(\"Saved a new user with id: \" + user.id);\n\n    console.log(\"Loading users from the database...\");\n    const users = await connection.manager.find(User);\n    console.log(\"Loaded users: \", users);\n\n    console.log(\"Here you can setup and run express/koa/any other framework.\");\n\n}).catch(error => console.log(error));\n";
         }
     };
     /**
      * Gets contents of the new package.json file.
      */
-    InitCommand.getPackageJsonTemplate = function (projectName) {
+    InitCommand.getPackageJsonTemplate = function (projectName, projectIsEsm) {
         return JSON.stringify({
             name: projectName || "new-typeorm-project",
             version: "0.0.1",
             description: "Awesome project developed with TypeORM.",
+            type: projectIsEsm ? "module" : "commonjs",
             devDependencies: {},
             dependencies: {},
             scripts: {}
@@ -355,20 +378,20 @@ var InitCommand = /** @class */ (function () {
     /**
      * Appends to a given package.json template everything needed.
      */
-    InitCommand.appendPackageJson = function (packageJsonContents, database, express /*, docker: boolean*/) {
+    InitCommand.appendPackageJson = function (packageJsonContents, database, express, projectIsEsm /*, docker: boolean*/) {
         var packageJson = JSON.parse(packageJsonContents);
         if (!packageJson.devDependencies)
             packageJson.devDependencies = {};
         Object.assign(packageJson.devDependencies, {
-            "ts-node": "3.3.0",
-            "@types/node": "^8.0.29",
-            "typescript": "3.3.3333"
+            "ts-node": "10.4.0",
+            "@types/node": "^16.11.10",
+            "typescript": "4.5.2"
         });
         if (!packageJson.dependencies)
             packageJson.dependencies = {};
         Object.assign(packageJson.dependencies, {
             "typeorm": require("../package.json").version,
-            "reflect-metadata": "^0.1.10"
+            "reflect-metadata": "^0.1.13"
         });
         switch (database) {
             case "mysql":
@@ -396,15 +419,21 @@ var InitCommand = /** @class */ (function () {
                 break;
         }
         if (express) {
-            packageJson.dependencies["express"] = "^4.15.4";
-            packageJson.dependencies["body-parser"] = "^1.18.1";
+            packageJson.dependencies["express"] = "^4.17.2";
+            packageJson.dependencies["body-parser"] = "^1.19.1";
         }
         if (!packageJson.scripts)
             packageJson.scripts = {};
-        Object.assign(packageJson.scripts, {
-            start: /*(docker ? "docker-compose up && " : "") + */ "ts-node src/index.ts",
-            typeorm: "node --require ts-node/register ./node_modules/typeorm/cli.js"
-        });
+        if (projectIsEsm)
+            Object.assign(packageJson.scripts, {
+                start: /*(docker ? "docker-compose up && " : "") + */ "node --loader ts-node/esm src/index.ts",
+                typeorm: "node --loader ts-node/esm ./node_modules/typeorm/cli.js"
+            });
+        else
+            Object.assign(packageJson.scripts, {
+                start: /*(docker ? "docker-compose up && " : "") + */ "ts-node src/index.ts",
+                typeorm: "node --require ts-node/register ./node_modules/typeorm/cli.js"
+            });
         return JSON.stringify(packageJson, undefined, 3);
     };
     return InitCommand;