refator(cli): improve init command

Author: ije

cli.ts

@@ -172,15 +172,21 @@ async function main() {
   }
 
   const { default: cmd } = await import(`./cli/${command}.ts`)
-  if (command === 'upgrade') {
-    await cmd(flags.v || flags.version || args[0] || 'latest')
-    return
-  }
-  const appDir = path.resolve(args[0] || '.')
-  if (command !== 'init' && !existsDirSync(appDir)) {
-    log.fatal('No such directory:', appDir)
+  switch (command) {
+    case 'init':
+      await cmd(args[0])
+      break
+    case 'upgrade':
+      await cmd(flags.v || flags.version || args[0] || 'latest')
+      break
+    default:
+      const appDir = path.resolve(args[0] || '.')
+      if (!existsDirSync(appDir)) {
+        log.fatal('No such directory:', appDir)
+      }
+      await cmd(appDir, flags)
+      break
   }
-  await cmd(appDir, flags)
 }
 
 if (import.meta.main) {

cli/init.ts

@@ -14,10 +14,17 @@ Options:
     -h, --help  Prints help message
 `
 
-export default async function (appDir: string, options: Record<string, string | boolean>) {
+export default async function (n?: string) {
+  const cwd = Deno.cwd()
   const rev = 'master'
-  const template = 'hello-world'
-  const vscode = await confirm(`Add recommended VS Code workspace settings?`)
+
+  const name = n || (await ask('Name:')).trim()
+  if (name === '') {
+    return
+  }
+
+  const template = 'hello-world' // todo: add template select ui
+  const vscode = await confirm('Add recommended workspace settings of VS Code?')
 
   console.log('Downloading template...')
   const resp = await fetch('https://codeload.github.com/alephjs/alephjs-templates/tar.gz/' + rev)
@@ -27,10 +34,9 @@ export default async function (appDir: string, options: Record<string, string |
   const tarData = gzipDecode(gzData)
   const entryList = new Untar(new Deno.Buffer(tarData))
 
-  // todo: add template select ui
   for await (const entry of entryList) {
     if (entry.fileName.startsWith(`alephjs-templates-${rev}/${template}/`)) {
-      const fp = path.join(appDir, util.trimPrefix(entry.fileName, `alephjs-templates-${rev}/${template}/`))
+      const fp = path.join(cwd, name, util.trimPrefix(entry.fileName, `alephjs-templates-${rev}/${template}/`))
       if (entry.type === 'directory') {
         await ensureDir(fp)
         continue
@@ -49,6 +55,7 @@ export default async function (appDir: string, options: Record<string, string |
   ]
   const importMap = {
     imports: {
+      '~/': './', '@/': './',
       'aleph': `https://deno.land/x/aleph@v${VERSION}/mod.ts`,
       'aleph/': `https://deno.land/x/aleph@v${VERSION}/`,
       'react': 'https://esm.sh/[email protected]',
@@ -57,8 +64,8 @@ export default async function (appDir: string, options: Record<string, string |
     scopes: {}
   }
   await Promise.all([
-    Deno.writeTextFile(path.join(appDir, '.gitignore'), gitignore.join('\n')),
-    Deno.writeTextFile(path.join(appDir, 'import_map.json'), JSON.stringify(importMap, undefined, 4))
+    Deno.writeTextFile(path.join(cwd, name, '.gitignore'), gitignore.join('\n')),
+    Deno.writeTextFile(path.join(cwd, name, 'import_map.json'), JSON.stringify(importMap, undefined, 4))
   ])
 
   if (vscode) {
@@ -72,21 +79,21 @@ export default async function (appDir: string, options: Record<string, string |
       'deno.unstable': true,
       'deno.import_map': './import_map.json'
     }
-    await ensureDir(path.join(appDir, '.vscode'))
+    await ensureDir(path.join(name, '.vscode'))
     await Promise.all([
-      Deno.writeTextFile(path.join(appDir, '.vscode', 'extensions.json'), JSON.stringify(extensions, undefined, 4)),
-      Deno.writeTextFile(path.join(appDir, '.vscode', 'settings.json'), JSON.stringify(settigns, undefined, 4))
+      Deno.writeTextFile(path.join(name, '.vscode', 'extensions.json'), JSON.stringify(extensions, undefined, 4)),
+      Deno.writeTextFile(path.join(name, '.vscode', 'settings.json'), JSON.stringify(settigns, undefined, 4))
     ])
   }
 
   console.log('Done')
-  console.log('---')
-  console.log(colors.green('Aleph.js is ready to Go.'))
-  console.log(`${colors.dim('$')} cd ` + path.basename(appDir))
-  console.log(`${colors.dim('$')} aleph ${colors.bold('dev')}     ${colors.dim('# start the app in `development` mode')}`)
-  console.log(`${colors.dim('$')} aleph ${colors.bold('start')}   ${colors.dim('# start the app in `production` mode')}`)
-  console.log(`${colors.dim('$')} aleph ${colors.bold('build')}   ${colors.dim('# build the app to a static site (SSG)')}`)
-  console.log('---')
+  console.log(colors.dim('---'))
+  console.log(colors.green('Aleph.js is ready to go!'))
+  console.log(`${colors.dim('$')} cd ${name}`)
+  console.log(`${colors.dim('$')} aleph dev     ${colors.dim('# start the app in `development` mode')}`)
+  console.log(`${colors.dim('$')} aleph start   ${colors.dim('# start the app in `production` mode')}`)
+  console.log(`${colors.dim('$')} aleph build   ${colors.dim('# build the app to a static site (SSG)')}`)
+  console.log(colors.dim('---'))
   Deno.exit(0)
 }