diff --git a/src/build.ts b/src/build.ts index 29cc8ce..9c4b137 100644 --- a/src/build.ts +++ b/src/build.ts @@ -29,13 +29,8 @@ type BuildArgs = { async function build(args: string[]) { let options: BuildArgs; - if (args.length && ["--help", "-h"].includes(args[0])) { - help(); - return; - } - try { - // default . + // dir - default . const dir = args[0].match(/^-/) ? "." : args[0]; // -m --markdown - default TUTORIAL.md const markdown = diff --git a/src/cli.ts b/src/cli.ts index d71a956..f4f1f61 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,7 +1,7 @@ import "./utils/logs"; import build from "./build"; import create from "./create"; -import help from "./help"; +import { help, create as createHelp, build as buildHelp } from "./help"; export async function cli(rawArgs: string[]): Promise { const command: string = rawArgs[2]; @@ -15,10 +15,18 @@ export async function cli(rawArgs: string[]): Promise { return; case "build": + if (args.length && ["--help", "-h"].includes(args[0])) { + buildHelp(); + return; + } build(args); break; case "create": + if (args.length && ["--help", "-h"].includes(args[0])) { + createHelp(); + return; + } create(args); break; diff --git a/src/create.ts b/src/create.ts index ecb91a6..373bdc9 100644 --- a/src/create.ts +++ b/src/create.ts @@ -15,14 +15,11 @@ type CreateArgs = { async function create(args: string[]): Promise { let options: CreateArgs; - if (args.length && ["--help", "-h"].includes(args[0])) { - help(); - return; - } - - // default . + // dir - default . const dir = !args.length || args[0].match(/^-/) ? "." : args[0]; + // lang - default js const lang = getArg(args, { name: "lang", alias: "l" }) || "js"; + // testRunner - default mocha const testRunner = getArg(args, { name: "testRunner", alias: "t" }) || "mocha"; diff --git a/src/help.ts b/src/help.ts index 9b74510..8767247 100644 --- a/src/help.ts +++ b/src/help.ts @@ -1,4 +1,4 @@ -export default function help() { +export function help() { console.log(` Usage: coderoad [options]