feat: add absolute path support to other CLI commands (typeorm#6807)

imnotjames · Oct 1, 2020 · d9a76e9 · d9a76e9
1 parent f3de0f6
commit d9a76e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/commands/EntityCreateCommand.ts b/src/commands/EntityCreateCommand.ts
@@ -37,7 +37,7 @@ export class EntityCreateCommand implements yargs.CommandModule {
         try {
             const fileContent = EntityCreateCommand.getTemplate(args.name as any);
             const filename = args.name + ".ts";
-            let directory = args.dir;
+            let directory = args.dir as string;
 
             // if directory is not set then try to open tsconfig and find default path there
             if (!directory) {
@@ -51,7 +51,7 @@ export class EntityCreateCommand implements yargs.CommandModule {
                 } catch (err) { }
             }
 
-            const path = process.cwd() + "/" + (directory ? (directory + "/") : "") + filename;
+            const path = (directory.startsWith("/") ? "" : process.cwd() + "/") + (directory ? (directory + "/") : "") + filename;
             const fileExists = await CommandUtils.fileExists(path);
             if (fileExists) {
                 throw `File ${chalk.blue(path)} already exists`;

diff --git a/src/commands/SubscriberCreateCommand.ts b/src/commands/SubscriberCreateCommand.ts
@@ -38,7 +38,7 @@ export class SubscriberCreateCommand implements yargs.CommandModule {
         try {
             const fileContent = SubscriberCreateCommand.getTemplate(args.name as any);
             const filename = args.name + ".ts";
-            let directory = args.dir;
+            let directory = args.dir as string;
 
             // if directory is not set then try to open tsconfig and find default path there
             if (!directory) {
@@ -52,7 +52,7 @@ export class SubscriberCreateCommand implements yargs.CommandModule {
                 } catch (err) { }
             }
 
-            const path = process.cwd() + "/" + (directory ? (directory + "/") : "") + filename;
+            const path = (directory.startsWith("/") ? "" : process.cwd() + "/") + (directory ? (directory + "/") : "") + filename;
             await CommandUtils.createFile(path, fileContent);
             console.log(chalk.green(`Subscriber ${chalk.blue(path)} has been created successfully.`));