fix: broken CLI in ESM projects since version 0.3 (#8773)

* fix: broken CLI in ESM projects * style: formatting
typeorm · Mar 22, 2022 · 97699e8 · 97699e8
1 parent c8fb1bb
commit 97699e8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/src/commands/CacheClearCommand.ts b/src/commands/CacheClearCommand.ts
@@ -25,7 +25,7 @@ export class CacheClearCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/CommandUtils.ts b/src/commands/CommandUtils.ts
@@ -4,15 +4,20 @@ import mkdirp from "mkdirp"
 import { TypeORMError } from "../error"
 import { DataSource } from "../data-source"
 import { InstanceChecker } from "../util/InstanceChecker"
+import { importOrRequireFile } from "../util/ImportUtils"
 
 /**
  * Command line utils functions.
  */
 export class CommandUtils {
-    static loadDataSource(dataSourceFilePath: string): DataSource {
+    static async loadDataSource(
+        dataSourceFilePath: string,
+    ): Promise<DataSource> {
         let dataSourceFileExports
         try {
-            dataSourceFileExports = require(dataSourceFilePath)
+            ;[dataSourceFileExports] = await importOrRequireFile(
+                dataSourceFilePath,
+            )
         } catch (err) {
             throw new Error(
                 `Invalid file path given: "${dataSourceFilePath}". File must contain a TypeScript / JavaScript code and export a DataSource instance.`,

diff --git a/src/commands/MigrationGenerateCommand.ts b/src/commands/MigrationGenerateCommand.ts
@@ -70,7 +70,7 @@ export class MigrationGenerateCommand implements yargs.CommandModule {
 
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/MigrationRevertCommand.ts b/src/commands/MigrationRevertCommand.ts
@@ -31,7 +31,7 @@ export class MigrationRevertCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/MigrationRunCommand.ts b/src/commands/MigrationRunCommand.ts
@@ -31,7 +31,7 @@ export class MigrationRunCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/MigrationShowCommand.ts b/src/commands/MigrationShowCommand.ts
@@ -24,7 +24,7 @@ export class MigrationShowCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/QueryCommand.ts b/src/commands/QueryCommand.ts
@@ -33,7 +33,7 @@ export class QueryCommand implements yargs.CommandModule {
         let queryRunner: QueryRunner | undefined = undefined
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/SchemaDropCommand.ts b/src/commands/SchemaDropCommand.ts
@@ -27,7 +27,7 @@ export class SchemaDropCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/SchemaLogCommand.ts b/src/commands/SchemaLogCommand.ts
@@ -28,7 +28,7 @@ export class SchemaLogCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({

diff --git a/src/commands/SchemaSyncCommand.ts b/src/commands/SchemaSyncCommand.ts
@@ -27,7 +27,7 @@ export class SchemaSyncCommand implements yargs.CommandModule {
     async handler(args: yargs.Arguments) {
         let dataSource: DataSource | undefined = undefined
         try {
-            dataSource = CommandUtils.loadDataSource(
+            dataSource = await CommandUtils.loadDataSource(
                 path.resolve(process.cwd(), args.dataSource as string),
             )
             dataSource.setOptions({