cli/src/commands/create.ts

@@ -1,62 +1,33 @@
-import type { CommandModule, Argv, ArgumentsCamelCase } from 'yargs'
+import type { CommandModule } from 'yargs'
 import c from 'chalk'
 import { input, select } from '@inquirer/prompts'
 import clone from 'git-clone'
 import path from 'node:path'
 
-import { checkForUpdate } from '../utils/update'
-
-function builder(yargs: Argv) {
-    return yargs
-        .option('projectName', {
-            alias: 'p',
-            description: 'Name of the folder to scaffold a project to',
-            type: 'string',
-            demandOption: false,
-        })
-        .option('template', {
-            alias: 't',
-            description: 'Frontend framework to use for CEF',
-            type: 'string',
-            demandOption: false,
-        })
-        .middleware(async () => await checkForUpdate())
-}
-
-async function handler(args: ArgumentsCamelCase) {
-    let folder = (args.projectName as string) ?? args.p
-    let framework = (args.template as string) ?? args.t
-
-    if (!folder) {
-        folder = await input({
-            message: c.gray('Enter project name:'),
-            default: 'rage-fw',
-        })
-    } else {
-        console.log(c.gray('Project name:'), folder)
-    }
-
-    if (!framework) {
-        framework = await select({
-            message: c.gray('Select frontend:'),
-            default: 'react',
-            loop: true,
-            choices: [
-                {
-                    name: 'React + TypeScript (Vite)',
-                    value: 'react',
-                    description: 'React + TypeScript (Vite) as a frontend',
-                },
-                // {
-                //     name: 'vue',
-                //     value: 'vue',
-                //     description: 'npm is the most popular package manager',
-                // },
-            ],
-        })
-    } else {
-        console.log(c.gray('Frontend:'), framework)
-    }
+// the handler function will be called when our command is executed
+// it will receive the command line arguments parsed by yargs
+async function handler() {
+    const folder = await input({
+        message: c.gray('Enter project name:'),
+        default: 'rage-fw',
+    })
+    const framework = await select({
+        message: c.gray('Select frontend:'),
+        default: 'react',
+        loop: true,
+        choices: [
+            {
+                name: 'React + TypeScript (Vite)',
+                value: 'react',
+                description: 'React + TypeScript (Vite) as a frontend',
+            },
+            // {
+            //     name: 'vue',
+            //     value: 'vue',
+            //     description: 'npm is the most popular package manager',
+            // },
+        ],
+    })
 
     console.log(
         c.gray('\nScaffolding template project into'),
@@ -85,11 +56,11 @@ async function handler(args: ArgumentsCamelCase) {
     )
 }
 
+// name and description for our command module
 const init: CommandModule = {
-    command: 'create [folderName] [template]',
+    command: 'create [template]',
     aliases: 'c',
     describe: 'Scaffold a template project using RageFW',
-    builder,
     handler,
 }
 

cli/src/index.ts

@@ -1,11 +1,13 @@
 import yargs from 'yargs'
 
 import create from './commands/create'
+import { checkForUpdate } from './utils/update'
+
+yargs.middleware(checkForUpdate)
 
 yargs
     .usage('<cmd> [args]')
     // .scriptName('rage-fw')
     //     .usage('$0 <cmd> [args]')
-    // @ts-ignore
     .command(create)
     .help().argv

cli/src/utils/update.ts

@@ -10,20 +10,17 @@ type Version = {
     message: string
 }
 
-export async function checkForUpdate(): Promise<void> {
-    return new Promise(res => {
-        yargs.showVersion(version =>
-            axios
-                .get<Version[]>(latestVersionURL)
-                .then(({ data }) => {
-                    const latestVersion = data[0].name
+export async function checkForUpdate() {
+    yargs.showVersion(version =>
+        axios.get<Version[]>(latestVersionURL).then(({ data }) => {
+            const latestVersion = data[0].name
 
-                    if (!(latestVersion === version))
-                        notifyUserAboutUpdate(latestVersion)
-                })
-                .then(() => res()),
-        )
-    })
+            if (!(latestVersion === version))
+                notifyUserAboutUpdate(latestVersion)
+
+            return
+        }),
+    )
 }
 
 function notifyUserAboutUpdate(version: string) {