feat(cli): make default command dynamic

rudxde · Mar 20, 2022 · 886aa19 · 886aa19
1 parent a1ba0a0
commit 886aa19
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -2,8 +2,11 @@ import { getLogger, initLogger, loggerYargsOptions } from '@lerna-dockerize/logg
 import { existsSync, promises } from 'fs';
 import yargs, { CommandModule } from 'yargs';
 
+export type { CommandModule } from 'yargs';
+
 export async function cli(
     commands: CommandModule<{}, any>[],
+    defaultCommand: string,
 ): Promise<void> {
     let config = {};
     const lernaConfigPath = 'lerna.json';
@@ -25,12 +28,19 @@ export async function cli(
         });
 
     for (const command of commands) {
-        builder = builder.command(command);
+        let yargsCommand: CommandModule<{}, any> = command;
+        if (command.command) {
+            if (typeof command.command === 'string' && command.command === defaultCommand) {
+                yargsCommand.command = [command.command, '$0'];
+            }
+            if (Array.isArray(command.command) && command.command[0] === defaultCommand) {
+                yargsCommand.command = [...command.command, '$0'];
+            }
+        }
+        builder = builder.command(yargsCommand);
     }
 
     builder
         .demandCommand()
         .argv;
 }
-
-export { CommandModule } from 'yargs';
diff --git a/packages/generate/src/bin.ts b/packages/generate/src/bin.ts
@@ -3,9 +3,12 @@ import { getLogger } from '@lerna-dockerize/logger';
 import { cli } from '@lerna-dockerize/cli';
 
 
-cli([
-    generateCommand,
-])
+cli(
+    [
+        generateCommand,
+    ],
+    <string>generateCommand.command,
+)
     .catch(err => {
         getLogger().error(err);
         process.exit(1);

diff --git a/packages/generate/src/index.ts b/packages/generate/src/index.ts
@@ -2,7 +2,7 @@ import type { CommandModule } from '@lerna-dockerize/cli';
 import { IGenerateArgs } from './args';
 
 export const generateCommand: CommandModule<any, IGenerateArgs> = {
-    command: ['generate', '$0'],
+    command: 'generate',
     describe: 'Generates the lerna-dockerize dockerfile',
     builder: {
         baseDockerfileName:  {

diff --git a/packages/init/src/bin.ts b/packages/init/src/bin.ts
@@ -3,9 +3,12 @@ import { getLogger } from '@lerna-dockerize/logger';
 import { cli } from '@lerna-dockerize/cli';
 
 
-cli([
-    initCommand,
-])
+cli(
+    [
+        initCommand,
+    ],
+    <string>initCommand.command,
+)
     .catch(err => {
         getLogger().error(err);
         process.exit(1);

diff --git a/packages/lerna-dockerize/src/index.ts b/packages/lerna-dockerize/src/index.ts
@@ -4,10 +4,13 @@ import { getLogger } from '@lerna-dockerize/logger';
 import { cli } from '@lerna-dockerize/cli';
 
 
-cli([
-    generateCommand,
-    initCommand,
-])
+cli(
+    [
+        generateCommand,
+        initCommand,
+    ],
+    <string>generateCommand.command,
+)
     .catch(err => {
         getLogger().error(err);
         process.exit(1);