typeorm 0.2.42-dev.90a8deb → 0.2.42-dev.92c3e79

package/browser/util/DirectoryExportedClassesLoader.js

@@ -1,42 +1,66 @@
+import { __awaiter, __generator, __read } from "tslib";
 import glob from "glob";
 import { PlatformTools } from "../platform/PlatformTools";
 import { EntitySchema } from "../entity-schema/EntitySchema";
+import { importOrRequireFile } from "./ImportUtils";
 /**
  * Loads all exported classes from the given directory.
  */
 export function importClassesFromDirectories(logger, directories, formats) {
-    if (formats === void 0) { formats = [".js", ".cjs", ".ts"]; }
-    var logLevel = "info";
-    var classesNotFoundMessage = "No classes were found using the provided glob pattern: ";
-    var classesFoundMessage = "All classes found using provided glob pattern";
-    function loadFileClasses(exported, allLoaded) {
-        if (typeof exported === "function" || exported instanceof EntitySchema) {
-            allLoaded.push(exported);
+    if (formats === void 0) { formats = [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]; }
+    return __awaiter(this, void 0, void 0, function () {
+        function loadFileClasses(exported, allLoaded) {
+            if (typeof exported === "function" || exported instanceof EntitySchema) {
+                allLoaded.push(exported);
+            }
+            else if (Array.isArray(exported)) {
+                exported.forEach(function (i) { return loadFileClasses(i, allLoaded); });
+            }
+            else if (typeof exported === "object" && exported !== null) {
+                Object.keys(exported).forEach(function (key) { return loadFileClasses(exported[key], allLoaded); });
+            }
+            return allLoaded;
         }
-        else if (Array.isArray(exported)) {
-            exported.forEach(function (i) { return loadFileClasses(i, allLoaded); });
-        }
-        else if (typeof exported === "object" && exported !== null) {
-            Object.keys(exported).forEach(function (key) { return loadFileClasses(exported[key], allLoaded); });
-        }
-        return allLoaded;
-    }
-    var allFiles = directories.reduce(function (allDirs, dir) {
-        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));
-    }, []);
-    if (directories.length > 0 && allFiles.length === 0) {
-        logger.log(logLevel, classesNotFoundMessage + " \"" + directories + "\"");
-    }
-    else if (allFiles.length > 0) {
-        logger.log(logLevel, classesFoundMessage + " \"" + directories + "\" : \"" + allFiles + "\"");
-    }
-    var dirs = allFiles
-        .filter(function (file) {
-        var dtsExtension = file.substring(file.length - 5, file.length);
-        return formats.indexOf(PlatformTools.pathExtname(file)) !== -1 && dtsExtension !== ".d.ts";
-    })
-        .map(function (file) { return require(PlatformTools.pathResolve(file)); });
-    return loadFileClasses(dirs, []);
+        var logLevel, classesNotFoundMessage, classesFoundMessage, allFiles, dirPromises, dirs;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    logLevel = "info";
+                    classesNotFoundMessage = "No classes were found using the provided glob pattern: ";
+                    classesFoundMessage = "All classes found using provided glob pattern";
+                    allFiles = directories.reduce(function (allDirs, dir) {
+                        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));
+                    }, []);
+                    if (directories.length > 0 && allFiles.length === 0) {
+                        logger.log(logLevel, classesNotFoundMessage + " \"" + directories + "\"");
+                    }
+                    else if (allFiles.length > 0) {
+                        logger.log(logLevel, classesFoundMessage + " \"" + directories + "\" : \"" + allFiles + "\"");
+                    }
+                    dirPromises = allFiles
+                        .filter(function (file) {
+                        var dtsExtension = file.substring(file.length - 5, file.length);
+                        return formats.indexOf(PlatformTools.pathExtname(file)) !== -1 && dtsExtension !== ".d.ts";
+                    })
+                        .map(function (file) { return __awaiter(_this, void 0, void 0, function () {
+                        var _a, importOrRequireResult;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0: return [4 /*yield*/, importOrRequireFile(PlatformTools.pathResolve(file))];
+                                case 1:
+                                    _a = __read.apply(void 0, [_b.sent(), 1]), importOrRequireResult = _a[0];
+                                    return [2 /*return*/, importOrRequireResult];
+                            }
+                        });
+                    }); });
+                    return [4 /*yield*/, Promise.all(dirPromises)];
+                case 1:
+                    dirs = _a.sent();
+                    return [2 /*return*/, loadFileClasses(dirs, [])];
+            }
+        });
+    });
 }
 /**
  * Loads all json files from the given directory.

package/browser/util/DirectoryExportedClassesLoader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/util/DirectoryExportedClassesLoader.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D;;GAEG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAc,EAAE,WAAqB,EAAE,OAAgC;IAAhC,wBAAA,EAAA,WAAW,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC;IAEhH,IAAM,QAAQ,GAAG,MAAM,CAAC;IACxB,IAAM,sBAAsB,GAAG,yDAAyD,CAAC;IACzF,IAAM,mBAAmB,GAAG,+CAA+C,CAAC;IAC5E,SAAS,eAAe,CAAC,QAAa,EAAE,SAAqB;QACzD,IAAI,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,YAAY,YAAY,EAAE;YACpE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAE5B;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChC,QAAQ,CAAC,OAAO,CAAC,UAAC,CAAM,IAAK,OAAA,eAAe,CAAC,CAAC,EAAE,SAAS,CAAC,EAA7B,CAA6B,CAAC,CAAC;SAE/D;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE;YAC1D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,EAAzC,CAAyC,CAAC,CAAC;SAEnF;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,GAAG;QAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC,EAAE,EAAc,CAAC,CAAC;IAEnB,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAK,sBAAsB,WAAK,WAAW,OAAG,CAAC,CAAC;KACtE;SAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAK,mBAAmB,WAAK,WAAW,eAAQ,QAAQ,OAAG,CAAC,CAAC;KACnF;IACD,IAAM,IAAI,GAAG,QAAQ;SAChB,MAAM,CAAC,UAAA,IAAI;QACR,IAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,YAAY,KAAK,OAAO,CAAC;IAC/F,CAAC,CAAC;SACD,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAxC,CAAwC,CAAC,CAAC;IAE3D,OAAO,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,WAAqB,EAAE,MAAgB;IAAhB,uBAAA,EAAA,gBAAgB;IAE9E,IAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,GAAG;QAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC,EAAE,EAAc,CAAC,CAAC;IAEnB,OAAO,QAAQ;SACV,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,MAAM,EAA1C,CAA0C,CAAC;SAC1D,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAxC,CAAwC,CAAC,CAAC;AAC/D,CAAC","file":"DirectoryExportedClassesLoader.js","sourcesContent":["import glob from \"glob\";\nimport {PlatformTools} from \"../platform/PlatformTools\";\nimport {EntitySchema} from \"../entity-schema/EntitySchema\";\nimport {Logger} from \"../logger/Logger\";\n/**\n * Loads all exported classes from the given directory.\n */\nexport function importClassesFromDirectories(logger: Logger, directories: string[], formats = [\".js\", \".cjs\", \".ts\"]): Function[] {\n\n    const logLevel = \"info\";\n    const classesNotFoundMessage = \"No classes were found using the provided glob pattern: \";\n    const classesFoundMessage = \"All classes found using provided glob pattern\";\n    function loadFileClasses(exported: any, allLoaded: Function[]) {\n        if (typeof exported === \"function\" || exported instanceof EntitySchema) {\n            allLoaded.push(exported);\n\n        } else if (Array.isArray(exported)) {\n            exported.forEach((i: any) => loadFileClasses(i, allLoaded));\n\n        } else if (typeof exported === \"object\" && exported !== null) {\n            Object.keys(exported).forEach(key => loadFileClasses(exported[key], allLoaded));\n\n        }\n        return allLoaded;\n    }\n\n    const allFiles = directories.reduce((allDirs, dir) => {\n        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));\n    }, [] as string[]);\n\n    if (directories.length > 0 && allFiles.length === 0) {\n        logger.log(logLevel, `${classesNotFoundMessage} \"${directories}\"`);\n    } else if (allFiles.length > 0) {\n        logger.log(logLevel, `${classesFoundMessage} \"${directories}\" : \"${allFiles}\"`);\n    }\n    const dirs = allFiles\n        .filter(file => {\n            const dtsExtension = file.substring(file.length - 5, file.length);\n            return formats.indexOf(PlatformTools.pathExtname(file)) !== -1 && dtsExtension !== \".d.ts\";\n        })\n        .map(file => require(PlatformTools.pathResolve(file)));\n\n    return loadFileClasses(dirs, []);\n}\n\n/**\n * Loads all json files from the given directory.\n */\nexport function importJsonsFromDirectories(directories: string[], format = \".json\"): any[] {\n\n    const allFiles = directories.reduce((allDirs, dir) => {\n        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));\n    }, [] as string[]);\n\n    return allFiles\n        .filter(file => PlatformTools.pathExtname(file) === format)\n        .map(file => require(PlatformTools.pathResolve(file)));\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/util/DirectoryExportedClassesLoader.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD;;GAEG;AACH,MAAM,UAAgB,4BAA4B,CAAC,MAAc,EAAE,WAAqB,EAAE,OAAwD;IAAxD,wBAAA,EAAA,WAAW,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;;QAK9I,SAAS,eAAe,CAAC,QAAa,EAAE,SAAqB;YACzD,IAAI,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,YAAY,YAAY,EAAE;gBACpE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAE5B;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAChC,QAAQ,CAAC,OAAO,CAAC,UAAC,CAAM,IAAK,OAAA,eAAe,CAAC,CAAC,EAAE,SAAS,CAAC,EAA7B,CAA6B,CAAC,CAAC;aAE/D;iBAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE;gBAC1D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,EAAzC,CAAyC,CAAC,CAAC;aAEnF;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;;;;;;oBAfK,QAAQ,GAAG,MAAM,CAAC;oBAClB,sBAAsB,GAAG,yDAAyD,CAAC;oBACnF,mBAAmB,GAAG,+CAA+C,CAAC;oBAetE,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,GAAG;wBAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACvE,CAAC,EAAE,EAAc,CAAC,CAAC;oBAEnB,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wBACjD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAK,sBAAsB,WAAK,WAAW,OAAG,CAAC,CAAC;qBACtE;yBAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAK,mBAAmB,WAAK,WAAW,eAAQ,QAAQ,OAAG,CAAC,CAAC;qBACnF;oBACK,WAAW,GAAG,QAAQ;yBACvB,MAAM,CAAC,UAAA,IAAI;wBACR,IAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAClE,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,YAAY,KAAK,OAAO,CAAC;oBAC/F,CAAC,CAAC;yBACD,GAAG,CAAC,UAAM,IAAI;;;;wCACqB,qBAAM,mBAAmB,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAA;;oCAApF,KAAA,sBAA0B,SAA0D,KAAA,EAAnF,qBAAqB,QAAA;oCAC5B,sBAAO,qBAAqB,EAAC;;;yBAChC,CAAC,CAAC;oBAEM,qBAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAA;;oBAArC,IAAI,GAAG,SAA8B;oBAE3C,sBAAO,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,EAAC;;;;CACpC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,WAAqB,EAAE,MAAgB;IAAhB,uBAAA,EAAA,gBAAgB;IAE9E,IAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,GAAG;QAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC,EAAE,EAAc,CAAC,CAAC;IAEnB,OAAO,QAAQ;SACV,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,MAAM,EAA1C,CAA0C,CAAC;SAC1D,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAxC,CAAwC,CAAC,CAAC;AAC/D,CAAC","file":"DirectoryExportedClassesLoader.js","sourcesContent":["import glob from \"glob\";\nimport {PlatformTools} from \"../platform/PlatformTools\";\nimport {EntitySchema} from \"../entity-schema/EntitySchema\";\nimport {Logger} from \"../logger/Logger\";\nimport {importOrRequireFile} from \"./ImportUtils\";\n/**\n * Loads all exported classes from the given directory.\n */\nexport async function importClassesFromDirectories(logger: Logger, directories: string[], formats = [\".js\", \".mjs\", \".cjs\", \".ts\", \".mts\", \".cts\"]): Promise<Function[]> {\n\n    const logLevel = \"info\";\n    const classesNotFoundMessage = \"No classes were found using the provided glob pattern: \";\n    const classesFoundMessage = \"All classes found using provided glob pattern\";\n    function loadFileClasses(exported: any, allLoaded: Function[]) {\n        if (typeof exported === \"function\" || exported instanceof EntitySchema) {\n            allLoaded.push(exported);\n\n        } else if (Array.isArray(exported)) {\n            exported.forEach((i: any) => loadFileClasses(i, allLoaded));\n\n        } else if (typeof exported === \"object\" && exported !== null) {\n            Object.keys(exported).forEach(key => loadFileClasses(exported[key], allLoaded));\n\n        }\n        return allLoaded;\n    }\n\n    const allFiles = directories.reduce((allDirs, dir) => {\n        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));\n    }, [] as string[]);\n\n    if (directories.length > 0 && allFiles.length === 0) {\n        logger.log(logLevel, `${classesNotFoundMessage} \"${directories}\"`);\n    } else if (allFiles.length > 0) {\n        logger.log(logLevel, `${classesFoundMessage} \"${directories}\" : \"${allFiles}\"`);\n    }\n    const dirPromises = allFiles\n        .filter(file => {\n            const dtsExtension = file.substring(file.length - 5, file.length);\n            return formats.indexOf(PlatformTools.pathExtname(file)) !== -1 && dtsExtension !== \".d.ts\";\n        })\n        .map(async file => {\n            const [importOrRequireResult] = await importOrRequireFile(PlatformTools.pathResolve(file));\n            return importOrRequireResult;\n        });\n\n    const dirs = await Promise.all(dirPromises);\n\n    return loadFileClasses(dirs, []);\n}\n\n/**\n * Loads all json files from the given directory.\n */\nexport function importJsonsFromDirectories(directories: string[], format = \".json\"): any[] {\n\n    const allFiles = directories.reduce((allDirs, dir) => {\n        return allDirs.concat(glob.sync(PlatformTools.pathNormalize(dir)));\n    }, [] as string[]);\n\n    return allFiles\n        .filter(file => PlatformTools.pathExtname(file) === format)\n        .map(file => require(PlatformTools.pathResolve(file)));\n}\n"],"sourceRoot":".."}

package/browser/util/ImportUtils.d.ts

@@ -0,0 +1 @@
+export declare function importOrRequireFile(filePath: string): Promise<[result: any, moduleType: "esm" | "commonjs"]>;

package/browser/util/ImportUtils.js

@@ -0,0 +1,90 @@
+import { __awaiter, __generator } from "tslib";
+import fs from "fs";
+import path from "path";
+export function importOrRequireFile(filePath) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+        var tryToImport, tryToRequire, extension, packageJson, isModule;
+        var _this = this;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    tryToImport = function () { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, Function("return filePath => import(filePath)")()(filePath)];
+                                case 1: 
+                                // `Function` is required to make sure the `import` statement wil stay `import` after
+                                // transpilation and won't be converted to `require`
+                                return [2 /*return*/, [_a.sent(), "esm"]];
+                            }
+                        });
+                    }); };
+                    tryToRequire = function () { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            return [2 /*return*/, [require(filePath), "commonjs"]];
+                        });
+                    }); };
+                    extension = filePath.substring(filePath.lastIndexOf(".") + ".".length);
+                    if (!(extension === "mjs" || extension === "mts")) return [3 /*break*/, 1];
+                    return [2 /*return*/, tryToImport()];
+                case 1:
+                    if (!(extension === "cjs" || extension === "cts")) return [3 /*break*/, 2];
+                    return [2 /*return*/, tryToRequire()];
+                case 2:
+                    if (!(extension === "js" || extension === "ts")) return [3 /*break*/, 4];
+                    return [4 /*yield*/, getNearestPackageJson(filePath)];
+                case 3:
+                    packageJson = _b.sent();
+                    if (packageJson != null) {
+                        isModule = ((_a = packageJson) === null || _a === void 0 ? void 0 : _a.type) === "module";
+                        if (isModule)
+                            return [2 /*return*/, tryToImport()];
+                        else
+                            return [2 /*return*/, tryToRequire()];
+                    }
+                    else
+                        return [2 /*return*/, tryToRequire()];
+                    _b.label = 4;
+                case 4: return [2 /*return*/, tryToRequire()];
+            }
+        });
+    });
+}
+function getNearestPackageJson(filePath) {
+    return new Promise(function (accept) {
+        var currentPath = filePath;
+        function searchPackageJson() {
+            var nextPath = path.dirname(currentPath);
+            if (currentPath === nextPath) // the top of the file tree is reached
+                accept(null);
+            else {
+                currentPath = nextPath;
+                var potentialPackageJson_1 = path.join(currentPath, "package.json");
+                fs.stat(potentialPackageJson_1, function (err, stats) {
+                    if (err != null)
+                        searchPackageJson();
+                    else if (stats.isFile()) {
+                        fs.readFile(potentialPackageJson_1, "utf8", function (err, data) {
+                            if (err != null)
+                                accept(null);
+                            else {
+                                try {
+                                    accept(JSON.parse(data));
+                                }
+                                catch (err) {
+                                    accept(null);
+                                }
+                            }
+                        });
+                    }
+                    else
+                        searchPackageJson();
+                });
+            }
+        }
+        searchPackageJson();
+    });
+}
+
+//# sourceMappingURL=ImportUtils.js.map

package/browser/util/ImportUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../browser/src/util/ImportUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAgB,mBAAmB,CAAC,QAAgB;;;;;;;;oBAChD,WAAW,GAAG;;;wCAGR,qBAAM,QAAQ,CAAC,qCAAqC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAA;;gCAFzE,qFAAqF;gCACrF,oDAAoD;gCACpD,uBAAQ,SAAiE,EAAE,KAAK,GAAE;;;yBACrF,CAAC;oBACI,YAAY,GAAG;;4BACjB,sBAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,EAAC;;yBAC1C,CAAC;oBAEI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;yBAEzE,CAAA,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,KAAK,CAAA,EAA1C,wBAA0C;oBAC1C,sBAAO,WAAW,EAAE,EAAC;;yBAChB,CAAA,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,KAAK,CAAA,EAA1C,wBAA0C;oBAC/C,sBAAO,YAAY,EAAE,EAAC;;yBACjB,CAAA,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAA,EAAxC,wBAAwC;oBACzB,qBAAM,qBAAqB,CAAC,QAAQ,CAAC,EAAA;;oBAAnD,WAAW,GAAG,SAAqC;oBAEzD,IAAI,WAAW,IAAI,IAAI,EAAE;wBACf,QAAQ,GAAG,CAAA,MAAC,WAAmB,0CAAE,IAAI,MAAK,QAAQ,CAAC;wBAEzD,IAAI,QAAQ;4BACR,sBAAO,WAAW,EAAE,EAAC;;4BAErB,sBAAO,YAAY,EAAE,EAAC;qBAC7B;;wBACG,sBAAO,YAAY,EAAE,EAAC;;wBAG9B,sBAAO,YAAY,EAAE,EAAC;;;;CACzB;AAED,SAAS,qBAAqB,CAAC,QAAgB;IAC3C,OAAO,IAAI,OAAO,CAAC,UAAC,MAAM;QACtB,IAAI,WAAW,GAAG,QAAQ,CAAC;QAE3B,SAAS,iBAAiB;YACtB,IAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE3C,IAAI,WAAW,KAAK,QAAQ,EAAE,sCAAsC;gBAChE,MAAM,CAAC,IAAI,CAAC,CAAC;iBACZ;gBACD,WAAW,GAAG,QAAQ,CAAC;gBACvB,IAAM,sBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;gBAEpE,EAAE,CAAC,IAAI,CAAC,sBAAoB,EAAE,UAAC,GAAG,EAAE,KAAK;oBACrC,IAAI,GAAG,IAAI,IAAI;wBACX,iBAAiB,EAAE,CAAC;yBACnB,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;wBACrB,EAAE,CAAC,QAAQ,CAAC,sBAAoB,EAAE,MAAM,EAAE,UAAC,GAAG,EAAE,IAAI;4BAChD,IAAI,GAAG,IAAI,IAAI;gCACX,MAAM,CAAC,IAAI,CAAC,CAAC;iCACZ;gCACD,IAAI;oCACA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;iCAC5B;gCAAC,OAAO,GAAG,EAAE;oCACV,MAAM,CAAC,IAAI,CAAC,CAAC;iCAChB;6BACJ;wBACL,CAAC,CAAC,CAAC;qBACN;;wBACG,iBAAiB,EAAE,CAAC;gBAC5B,CAAC,CAAC,CAAC;aACN;QACL,CAAC;QAED,iBAAiB,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC","file":"ImportUtils.js","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nexport async function importOrRequireFile(filePath: string): Promise<[result: any, moduleType: \"esm\" | \"commonjs\"]> {\n    const tryToImport = async (): Promise<[any, \"esm\"]> => {\n        // `Function` is required to make sure the `import` statement wil stay `import` after\n        // transpilation and won't be converted to `require`\n        return [await Function(\"return filePath => import(filePath)\")()(filePath), \"esm\"];\n    };\n    const tryToRequire = async (): Promise<[any, \"commonjs\"]> => {\n        return [require(filePath), \"commonjs\"];\n    };\n\n    const extension = filePath.substring(filePath.lastIndexOf(\".\") + \".\".length);\n\n    if (extension === \"mjs\" || extension === \"mts\")\n        return tryToImport();\n    else if (extension === \"cjs\" || extension === \"cts\")\n        return tryToRequire();\n    else if (extension === \"js\" || extension === \"ts\") {\n        const packageJson = await getNearestPackageJson(filePath);\n\n        if (packageJson != null) {\n            const isModule = (packageJson as any)?.type === \"module\";\n\n            if (isModule)\n                return tryToImport();\n            else\n                return tryToRequire();\n        } else\n            return tryToRequire();\n    }\n\n    return tryToRequire();\n}\n\nfunction getNearestPackageJson(filePath: string): Promise<object | null> {\n    return new Promise((accept) => {\n        let currentPath = filePath;\n\n        function searchPackageJson() {\n            const nextPath = path.dirname(currentPath);\n\n            if (currentPath === nextPath) // the top of the file tree is reached\n                accept(null);\n            else {\n                currentPath = nextPath;\n                const potentialPackageJson = path.join(currentPath, \"package.json\");\n\n                fs.stat(potentialPackageJson, (err, stats) => {\n                    if (err != null)\n                        searchPackageJson();\n                    else if (stats.isFile()) {\n                        fs.readFile(potentialPackageJson, \"utf8\", (err, data) => {\n                            if (err != null)\n                                accept(null);\n                            else {\n                                try {\n                                    accept(JSON.parse(data));\n                                } catch (err) {\n                                    accept(null);\n                                }\n                            }\n                        });\n                    } else\n                        searchPackageJson();\n                });\n            }\n        }\n\n        searchPackageJson();\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/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

@@ -43,11 +43,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 +64,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 +79,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 +88,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,11 +115,11 @@ 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;
@@ -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;