@travetto/scaffold 3.0.4 → 3.1.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "3.0.4",
+  "version": "3.1.0-rc.1",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -27,9 +27,9 @@
     "trv-scaffold": "./bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/base": "^3.0.3",
-    "@travetto/compiler": "^3.0.3",
-    "@travetto/cli": "^3.0.3",
+    "@travetto/base": "^3.1.0-rc.0",
+    "@travetto/compiler": "^3.1.0-rc.0",
+    "@travetto/cli": "^3.1.0-rc.1",
     "enquirer": "^2.3.6",
     "mustache": "^4.2.0"
   },

package/resources/templates/todo/package.json.txt

@@ -7,7 +7,6 @@
     // {{#dependencies}}
     "{{{.}}}": "^{{{frameworkVersion}}}",
     // {{/dependencies}}
-    "@travetto/app": "^{{{frameworkVersion}}}",
     "@travetto/cli": "^{{{frameworkVersion}}}"
   },
   "devDependencies": {

package/support/cli.scaffold.ts

@@ -1,37 +1,25 @@
 import enquirer from 'enquirer';
 
 import { path } from '@travetto/manifest';
-import { CliCommand, cliTpl, OptionConfig } from '@travetto/cli';
+import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
 import { GlobalTerminal } from '@travetto/terminal';
 
 import { Context } from './bin/context';
 import { Feature, FEATURES } from './bin/features';
 
-type Options = {
-  template: OptionConfig<string>;
-  cwd: OptionConfig<string>;
-  dir: OptionConfig<string>;
-  force: OptionConfig<boolean>;
-};
-
 /**
  * Command to run scaffolding
  */
-export class ScaffoldCommand extends CliCommand<Options> {
-  name = 'scaffold';
-
-  getOptions(): Options {
-    return {
-      template: this.option({ def: 'todo', desc: 'Template' }),
-      cwd: this.option({ desc: 'Current Working Directory override' }),
-      dir: this.option({ desc: 'Target Directory' }),
-      force: this.boolOption({ desc: 'Force writing into an existing directory', def: false })
-    };
-  }
-
-  getArgs(): string {
-    return '[name]';
-  }
+@CliCommand()
+export class ScaffoldCommand implements CliCommandShape {
+  /** Template */
+  template = 'todo';
+  /** Current Working Directory override */
+  cwd: string = path.cwd();
+  /** Target Directory */
+  dir?: string;
+  /** Force writing into an existing directory */
+  force = false;
 
   async #getName(name?: string): Promise<string> {
     if (!name) {
@@ -88,42 +76,25 @@ export class ScaffoldCommand extends CliCommand<Options> {
     }
   }
 
-  async action(name?: string): Promise<void> {
-    try {
-      name = await this.#getName(name);
-    } catch (err) {
-      if (err instanceof Error) {
-        console.error('Failed to provide correct input', err.message);
-      }
-      return this.exit(1);
-    }
-
-    this.cmd.cwd ??= path.cwd();
+  async main(name?: string): Promise<void> {
+    name = await this.#getName(name);
 
-    if (!name && this.cmd.dir) {
-      name = path.basename(this.cmd.dir);
-    } else if (name && !this.cmd.dir) {
-      this.cmd.dir = path.resolve(this.cmd.cwd, name);
-    } else if (!name && !this.cmd.dir) {
-      console.error('Either a name or a target directory are required');
-      return this.exit(1);
+    if (!name && this.dir) {
+      name = path.basename(this.dir);
+    } else if (name && !this.dir) {
+      this.dir = path.resolve(this.cwd, name);
+    } else if (!name && !this.dir) {
+      throw new Error('Either a name or a target directory are required');
     }
 
-    const ctx = new Context(name, this.cmd.template, path.resolve(this.cmd.cwd, this.cmd.dir));
+    const ctx = new Context(name, this.template, path.resolve(this.cwd, this.dir!));
 
-    if (!this.cmd.force) {
+    if (!this.force) {
       await ctx.initialize();
     }
 
-    try {
-      for await (const feature of this.#resolveFeatures(FEATURES)) {
-        await ctx.resolveFeature(feature);
-      }
-    } catch (err) {
-      if (err instanceof Error) {
-        console.error('Failed to provide correct input', err.message);
-      }
-      return this.exit(1);
+    for await (const feature of this.#resolveFeatures(FEATURES)) {
+      await ctx.resolveFeature(feature);
     }
 
     console.log(cliTpl`\n${{ title: 'Creating Application' }}\n${'-'.repeat(30)}`);