@travetto/scaffold 3.0.0-rc.9 → 3.0.1

package/README.md

@@ -3,11 +3,6 @@
 # App Scaffold
 ## App Scaffold for the Travetto framework
 
-**Install: @travetto/scaffold**
-```bash
-npm install @travetto/scaffold
-```
-
 A simple tool for scaffolding a reference project.  To get started, you need to make sure:
 
 **Install: Setting up the necessary config**
@@ -15,11 +10,15 @@ A simple tool for scaffolding a reference project.  To get started, you need to
 $ git config --global.username <Username> #Set your git username
 ```
 
-Once installed you can invoke the scaffolding by running
+Once the necessary configuration is setup, you can invoke the scaffolding by running
 
 **Terminal: Running Generator**
 ```bash
 $ npx @travetto/scaffold
+
+# or
+
+$ npx @travetto/scaffold@<version-or-tag>
 ```
 
 The generator will ask about enabling the following features:
@@ -37,12 +36,12 @@ The code will establish some basic routes, specifically, `GET /` as the root end
 ### Additional Rest Features
 In addition to the core functionality, the `rest` feature has some useful sub-features.  Specifically:
 
-[OpenAPI Specification](https://github.com/travetto/travetto/tree/main/module/openapi#readme "OpenAPI integration support for the travetto framework") support for the restful api.  This will automatically expose a `openapi.yml` endpoint, and provide the necessary plumbing to support client generation.
+[OpenAPI Specification](https://github.com/travetto/travetto/tree/main/module/openapi#readme "OpenAPI integration support for the Travetto framework") support for the restful api.  This will automatically expose a `openapi.yml` endpoint, and provide the necessary plumbing to support client generation.
 
 [Logging](https://github.com/travetto/travetto/tree/main/module/log#readme "Logging framework that integrates at the console.log level.") support for better formatting, [debug](https://www.npmjs.com/package/debug) like support, and colorized output.  This is generally useful for server logs, especially during development.
 
 ## Authentication
-Authentication is also supported on the Restful endpoints by selecting [Rest Auth](https://github.com/travetto/travetto/tree/main/module/auth-rest#readme "Rest authentication integration support for the travetto framework") during setup.  This will support basic authentication running out of local memory, with user [REST Session](https://github.com/travetto/travetto/tree/main/module/rest-session#readme "Session provider for the travetto rest module.")s.
+Authentication is also supported on the Restful endpoints by selecting [Rest Auth](https://github.com/travetto/travetto/tree/main/module/auth-rest#readme "Rest authentication integration support for the Travetto framework") during setup.  This will support basic authentication running out of local memory, with user [REST Session](https://github.com/travetto/travetto/tree/main/module/rest-session#readme "Session provider for the travetto rest module.")s.
 
 ## Testing
 [Testing](https://github.com/travetto/travetto/tree/main/module/test#readme "Declarative test framework") can also be configured out of the box to provide simple test cases for the data model.

package/bin/trv-scaffold.js

@@ -1,3 +1,17 @@
 #!/usr/bin/env node
-process.argv = [...process.argv.slice(0, 2), 'scaffold', ...process.argv.slice(2)];
-require('@travetto/compiler/bin/trv');
+
+(async function () {
+  const args = [...process.argv.slice(0, 2), 'scaffold', ...process.argv.slice(2)];
+  if (process.env.npm_lifecycle_script === 'trv-scaffold') { // Is npx  run
+    const path = await import('path');
+    const parts = process.env.PATH.split(path.delimiter);
+    const loc = parts.find(p => p.includes('npx') && p.includes('.bin'));
+    if (loc) {
+      const final = loc.split('/node_modules')[0];
+      args.push('-c', process.cwd());
+      process.chdir(final);
+    }
+  }
+  process.argv = args;
+  await import('@travetto/compiler/bin/trv.js');
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "3.0.0-rc.9",
+  "version": "3.0.1",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -16,7 +16,8 @@
   },
   "files": [
     "bin",
-    "support"
+    "support",
+    "resources"
   ],
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
@@ -26,8 +27,9 @@
     "trv-scaffold": "./bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/base": "^3.0.0-rc.8",
-    "@travetto/cli": "^3.0.0-rc.9",
+    "@travetto/base": "^3.0.0",
+    "@travetto/compiler": "^3.0.0",
+    "@travetto/cli": "^3.0.0",
     "enquirer": "^2.3.6",
     "mustache": "^4.2.0"
   },

package/{support/resources → resources}/templates/todo/listing.json

@@ -9,12 +9,6 @@
   "gitignore.txt": {
     "rename": ".gitignore"
   },
-  "eslintrc.js.txt": {
-    "rename": ".eslintrc.js",
-    "requires": [
-      "@travetto/eslint-plugin"
-    ]
-  },
   "resources/application.yml": {},
   "src/model/todo.ts": {
     "requires": [

package/{support/resources → resources}/templates/todo/package.json.txt

@@ -4,11 +4,17 @@
     "name": "{{{author.name}}}"
   },
   "dependencies": {
-    // {{#frameworkDependencies}}
+    // {{#dependencies}}
     "{{{.}}}": "^{{{frameworkVersion}}}",
-    // {{/frameworkDependencies}}
+    // {{/dependencies}}
     "@travetto/app": "^{{{frameworkVersion}}}",
-    "@travetto/cli": "^{{{frameworkVersion}}}",
+    "@travetto/cli": "^{{{frameworkVersion}}}"
+  },
+  "devDependencies": {
+    // {{#devDependencies}}
+    "{{{.}}}": "^{{{frameworkVersion}}}",
+    // {{/devDependencies}}
+    "@travetto/compiler": "^{{{frameworkVersion}}}",
     "@travetto/pack": "^{{{frameworkVersion}}}"
   },
   "description": "A Travetto-based project",
@@ -20,10 +26,11 @@
   ],
   "license": "MIT",
   "scripts": {
+    "watch": "npx trv watch",
     "build": "npx trv build",
     "start": "npx trv run rest",
     "test": "npx trv test",
-    "lint": "npx eslint --ext .ts --ext .js ."
+    "lint": "npx trv lint"
   },
   "files": [
     "src",

package/{support/resources → resources}/templates/todo/resources/application.yml

@@ -1,7 +1,7 @@
 # {{#modules.rest}}
 rest:
   ssl:
-    active: true
+    active: false
   context:
     active: true
   cors:

package/{support/resources → resources}/templates/todo/src/model/todo.ts

@@ -5,7 +5,7 @@ export class Todo implements ModelType {
   id: string;
   text: string;
   completed?: boolean;
-  // {{#modules.auth-rest}} // @doc-exclude
+  // {{#modules.auth_rest}} // @doc-exclude
   userId?: string;  // @doc-exclude
-  // {{/modules.auth-rest}}  // @doc-exclude
+  // {{/modules.auth_rest}}  // @doc-exclude
 }

package/{support/resources → resources}/templates/todo/src/rest/auth.config.ts

@@ -1,6 +1,8 @@
 import { Authorizer, Authenticator } from '@travetto/auth';
+import { SessionModelⲐ } from '@travetto/rest-session';
 import { InjectableFactory } from '@travetto/di';
 import { AppError } from '@travetto/base';
+import { ModelExpirySupport, MemoryModelService } from '@travetto/model';
 
 export const BasicAuthⲐ = Symbol.for('AUTH_BASIC');
 
@@ -12,6 +14,11 @@ class AuthConfig {
     return { authorize: p => p };
   }
 
+  @InjectableFactory(SessionModelⲐ)
+  static getStore(svc: MemoryModelService): ModelExpirySupport {
+    return svc;
+  }
+
   @InjectableFactory(BasicAuthⲐ)
   static getAuthenticator(): Authenticator<User> {
     return {

package/{support/resources → resources}/templates/todo/src/rest/todo.ts

@@ -1,23 +1,24 @@
 import { Controller, Get, Put, Post, Delete } from '@travetto/rest';
 import { NotFoundError } from '@travetto/model';
 import { Inject } from '@travetto/di';
-import { ModelQuery, ModelQueryCrudSupport } from '@travetto/model-query';
+import { ModelQuery } from '@travetto/model-query';
 import { Schema } from '@travetto/schema';
-// {{#modules.auth-rest}}
+// {{#modules.auth_rest}}
 import { Authenticated } from '@travetto/auth-rest';
-// {{/modules.auth-rest}}
-// {{#modules.auth-rest-context}}
+// {{/modules.auth_rest}}
+// {{#modules.auth_rest_context}}
 import { AuthContextService } from '@travetto/auth-rest-context';
-// {{/modules.auth-rest-context}}
+// {{/modules.auth_rest_context}}
+import { $_modelService_$ } from '$_modelImport_$';
 
 import { Todo } from '../model/todo';
 
 @Schema()
 class Query {
   q: {
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     userId?: string;
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
   } = {};
 }
 
@@ -25,18 +26,18 @@ class Query {
  * Controller for managing all aspects of the Todo lifecycle
  */
 @Controller('/todo')
-// {{#modules.auth-rest}}
+// {{#modules.auth_rest}}
 @Authenticated()
-// {{/modules.auth-rest}}
+// {{/modules.auth_rest}}
 export class TodoController {
 
   @Inject()
-  source: ModelQueryCrudSupport;
+  source: $_modelService_$;
 
-  // {{#modules.auth-rest-context}}
+  // {{#modules.auth_rest_context}}
   @Inject()
   auth: AuthContextService;
-  // {{/modules.auth-rest-context}}
+  // {{/modules.auth_rest_context}}
 
   /**
    * Get all Todos
@@ -44,9 +45,9 @@ export class TodoController {
   @Get('/')
   async getAll(query: Query): Promise<Todo[]> {
     query.q ??= {};
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     query.q.userId = this.auth.get()?.id;
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
     return this.source.query(Todo, { where: query.q });
   }
 
@@ -56,11 +57,11 @@ export class TodoController {
   @Get('/:id')
   async getOne(id: string): Promise<Todo> {
     const q: ModelQuery<Todo> = { where: { id } };
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     if (typeof q.where !== 'string') {
       q.where!.userId = this.auth.get()?.id;
     }
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
     return this.source.queryOne(Todo, q);
   }
 
@@ -69,9 +70,9 @@ export class TodoController {
    */
   @Post('/')
   async save(todo: Todo): Promise<Todo> {
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     todo.userId = this.auth.get()?.id;
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
     return this.source.create(Todo, todo);
   }
 
@@ -80,9 +81,9 @@ export class TodoController {
    */
   @Put('/:id')
   async update(todo: Todo): Promise<Todo> {
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     todo.userId = this.auth.get()?.id;
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
     return this.source.update(Todo, todo);
   }
 
@@ -92,11 +93,11 @@ export class TodoController {
   @Delete('/:id')
   async remove(id: string): Promise<void> {
     const q: ModelQuery<Todo> = { where: { id } };
-    // {{#modules.auth-rest-context}}
+    // {{#modules.auth_rest_context}}
     if (typeof q.where !== 'string') {
       q.where!.userId = this.auth.get()?.id;
     }
-    // {{/modules.auth-rest-context}}
+    // {{/modules.auth_rest_context}}
     if (await this.source.deleteByQuery(Todo, q) !== 1) {
       throw new NotFoundError(Todo, id);
     }

package/{support/resources → resources}/templates/todo/test/model/todo.ts

@@ -3,12 +3,16 @@ import assert from 'assert';
 import { Suite, Test } from '@travetto/test';
 import { ModelCrudSupport } from '@travetto/model';
 import { BaseModelSuite } from '@travetto/model/support/test/base';
+import { $_modelConfig_$, $_modelService_$ } from '$_modelImport_$';
 
 import { Todo } from '../../src/model/todo';
 
 @Suite('Simple CRUD')
 class TestCRUD extends BaseModelSuite<ModelCrudSupport>  {
 
+  serviceClass = $_modelService_$;
+  configClass = $_modelConfig_$;
+
   @Test('save it')
   async save(): Promise<void> {
     const svc = await this.service;

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

@@ -0,0 +1,3 @@
+{
+  "extends": "@travetto/compiler/tsconfig.trv.json"
+}

package/support/bin/context.ts

@@ -1,24 +1,31 @@
 import fs from 'fs/promises';
 import mustache from 'mustache';
 
-import { path, RootIndex } from '@travetto/manifest';
+import { cliTpl } from '@travetto/cli';
+import { ManifestContext, path, RootIndex } from '@travetto/manifest';
 import { ExecUtil, ExecutionResult } from '@travetto/base';
+import { GlobalTerminal } from '@travetto/terminal';
 
 import { Feature } from './features';
 
 type ListingEntry = { requires?: string[], rename?: string };
 type Listing = Record<string, ListingEntry>;
 
+const DEV_DEPS = new Set([
+  '@travetto/test',
+  '@travetto/pack',
+  '@travetto/compiler',
+  '@travetto/command',
+  '@travetto/transformer',
+  '@travetto/eslint',
+]);
+
 export class Context {
 
   static #meetsRequirement(modules: string[], desired: string[]): boolean {
     let valid = true;
     for (const mod of desired) {
-      if (mod.endsWith('-')) {
-        valid = valid && !!modules.find(m => m.startsWith(mod));
-      } else {
-        valid = valid && modules.includes(mod);
-      }
+      valid = valid && modules.includes(mod);
       if (!valid) {
         break;
       }
@@ -28,40 +35,38 @@ export class Context {
 
   #template: string;
   #targetDir: string;
-  #frameworkDependencies: string[] = [];
+  #dependencies: string[] = [];
+  #devDependencies: string[] = [];
   #peerDependencies: string[] = [];
-  #modules: Record<string, boolean>;
+  #featureContexts: Record<string, unknown>[] = [];
+
+  packageManager: ManifestContext['packageManager'] = 'npm';
 
   readonly name: string;
-  readonly frameworkVersion = RootIndex.mainDigest().framework.replace(/[.]\d+$/, '.0');
 
   constructor(name: string, template: string, targetDir: string) {
-    this.name = name;
+    this.name = name.replace(/[^a-zA-Z0-9]+/, '-').replace(/-+$/, '');
     this.#template = template;
     this.#targetDir = path.resolve(targetDir);
   }
 
-  get modules(): Record<string, boolean> {
-    if (!this.#modules) {
-      this.#modules = this.#frameworkDependencies.map(x => x.split('/')).reduce((acc, [, v]) => ({ ...acc, [v]: true }), {});
-    }
-    return this.#modules;
-  }
-
-  get frameworkDependencies(): string[] {
-    return this.#frameworkDependencies;
-  }
+  #exec(cmd: string, args: string[]): Promise<ExecutionResult> {
+    const res = ExecUtil.spawn(cmd, args, {
+      cwd: this.destination(),
+      stdio: [0, 'pipe', 'pipe'],
+      isolatedEnv: true,
+      onStdErrorLine: line => GlobalTerminal.writeLines(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line}`)
+    }).result;
 
-  get peerDependencies(): string[] {
-    return this.#peerDependencies;
+    return res;
   }
 
-  get moduleNames(): string[] {
-    return [...Object.keys(this.modules)].filter(x => !x.includes('-'));
+  get selfPath(): string {
+    return RootIndex.getModule('@travetto/scaffold')!.sourcePath;
   }
 
   source(file?: string): string {
-    return path.resolve('resources', 'templates', this.#template, ...file ? [file] : []);
+    return path.resolve(this.selfPath, 'resources', 'templates', this.#template, ...file ? [file] : []);
   }
 
   destination(file?: string): string {
@@ -73,8 +78,11 @@ export class Context {
   }
 
   async resolvedSourceListing(): Promise<[string, ListingEntry][]> {
-    return Object.entries(await this.sourceListing)
-      .filter(([, conf]) => !conf.requires || Context.#meetsRequirement(this.#frameworkDependencies, conf.requires));
+    const res = Object.entries(await this.sourceListing)
+      .filter(([, conf]) => !conf.requires ||
+        Context.#meetsRequirement([...this.#dependencies, ...this.#devDependencies], conf.requires));
+
+    return res;
   }
 
   async initialize(): Promise<void> {
@@ -91,10 +99,35 @@ export class Context {
     }
   }
 
+  templateContext(): Record<string, unknown> {
+    const modules = [...this.#dependencies, ...this.#devDependencies]
+      .map(x => path.basename(x)).reduce((acc, v) => ({ ...acc, [v.replace(/[-]/g, '_')]: true }), {});
+    const moduleNames = [...Object.keys(modules)];
+
+    const context = Object.assign({
+      frameworkVersion: RootIndex.mainDigest().framework.replace(/[.]\d+$/, '.0'),
+      name: this.name,
+      modules,
+      moduleNames,
+      dependencies: [...new Set(this.#dependencies)].sort((a, b) => a.localeCompare(b)),
+      devDependencies: [...new Set(this.#devDependencies)].sort((a, b) => a.localeCompare(b)),
+    }, ...this.#featureContexts);
+
+    return context;
+  }
+
   async template(file: string, { rename }: ListingEntry): Promise<void> {
     const contents = await fs.readFile(this.source(file), 'utf-8');
     const out = this.destination(rename ?? file);
-    const rendered = mustache.render(contents, this).replace(/^\s*(\/\/|#)\s*\n/gsm, '');
+    const rendered = mustache.render(
+      contents
+        .replaceAll('$_', '{{{')
+        .replaceAll('_$', '}}}'),
+      this.templateContext(),
+    )
+      .replace(/(\/\/.*@doc-exclude.*)$/g, '')
+      .replace(/\s*(\/\/.*@doc-exclude.*)/g, '')
+      .replace(/^\s*(\/\/\s*)\n/gsm, '');
     await fs.mkdir(path.dirname(out), { recursive: true });
     await fs.writeFile(out, rendered, 'utf8');
   }
@@ -105,19 +138,59 @@ export class Context {
     }
   }
 
-  async addDependency(feat: Feature): Promise<void> {
-    if (feat.npm.startsWith('@travetto')) {
-      this.#frameworkDependencies.push(feat.npm);
-    } else {
-      this.#peerDependencies.push(feat.npm);
+  async resolveFeature(feat: Feature): Promise<void> {
+    if (feat.package) {
+      if (feat.package.startsWith('@travetto')) {
+        if (DEV_DEPS.has(feat.package)) {
+          this.#devDependencies.push(feat.package);
+        } else {
+          this.#dependencies.push(feat.package);
+        }
+      } else {
+        this.#peerDependencies.push(feat.package);
+      }
+    }
+    if (feat.field) {
+      // @ts-expect-error
+      this[feat.field] = feat.value!;
+    }
+    if (feat.context) {
+      this.#featureContexts.push(feat.context);
     }
 
     for (const addon of (feat.addons ?? [])) {
-      this.addDependency(addon);
+      this.resolveFeature(addon);
     }
   }
 
-  exec(cmd: string, args: string[]): Promise<ExecutionResult> {
-    return ExecUtil.spawn(cmd, args, { cwd: this.destination(), stdio: [0, 1, 2], isolatedEnv: true }).result;
+  async * install(): AsyncIterable<string | undefined> {
+
+    yield cliTpl`${{
+      type: 'Templating files'
+    }}`;
+    await this.templateResolvedFiles();
+
+    yield cliTpl`${{ type: 'Installing dependencies' }} `;
+    switch (this.packageManager) {
+      case 'npm': await this.#exec('npm', ['i']); break;
+      case 'yarn': await this.#exec('yarn', []); break;
+      default: throw new Error(`Unknown package manager: ${this.packageManager} `);
+    }
+
+    yield cliTpl`${{ type: 'Ensuring latest dependencies' }} `;
+    switch (this.packageManager) {
+      case 'npm': await this.#exec('npm', ['update', '-S']); break;
+      case 'yarn': await this.#exec('yarn', ['upgrade']); break;
+      default: throw new Error(`Unknown package manager: ${this.packageManager} `);
+    }
+
+    yield cliTpl`${{ type: 'Initial Build' }} `;
+    await this.#exec('npx', ['trv', 'build']);
+    if (this.#devDependencies.includes('@travetto/eslint')) {
+      yield cliTpl`${{ type: 'ESLint Registration' }} `;
+      await this.#exec('npx', ['trv', 'lint:register']);
+    }
+
+    yield cliTpl`${{ success: 'Successfully created' }} at ${{ path: this.#targetDir }} `;
   }
 }

package/support/bin/features.ts

@@ -1,6 +1,9 @@
 export type Feature = {
   title?: string;
-  npm: string;
+  package?: string;
+  field?: string;
+  value?: string;
+  required?: boolean;
   version?: string;
   addons?: Feature[];
   choices?: Feature[];
@@ -10,42 +13,70 @@ export type Feature = {
 };
 
 export const FEATURES: Feature[] = [
+  {
+    title: 'Package Manager',
+    choices: [
+      { title: 'NPM', field: 'packageManager', value: 'npm' },
+      { title: 'Yarn', field: 'packageManager', value: 'yarn' }
+    ],
+    required: true,
+    default: 'npm'
+  },
   {
     title: 'Rest Framework',
-    npm: '@travetto/rest',
+    package: '@travetto/rest',
     choices: [
-      { title: 'Express.js', npm: '@travetto/rest-express' },
-      { title: 'Express.js Lambda', npm: '@travetto/rest-express-lambda' },
-      { title: 'KOA', npm: '@travetto/rest-koa' },
-      { title: 'KOA Lambda', npm: '@travetto/rest-koa-lambda' },
-      { title: 'Fastify', npm: '@travetto/rest-fastify' },
-      { title: 'Fastify Lambda', npm: '@travetto/rest-fastify-lambda' },
+      { title: 'Express.js', package: '@travetto/rest-express' },
+      { title: 'Express.js Lambda', package: '@travetto/rest-express-lambda' },
+      { title: 'KOA', package: '@travetto/rest-koa' },
+      { title: 'KOA Lambda', package: '@travetto/rest-koa-lambda' },
+      { title: 'Fastify', package: '@travetto/rest-fastify' },
+      { title: 'Fastify Lambda', package: '@travetto/rest-fastify-lambda' },
     ],
     addons: [
-      { title: 'OpenAPI', npm: '@travetto/openapi' },
-      { title: 'Logging', npm: '@travetto/log' }
+      { title: 'OpenAPI', package: '@travetto/openapi' },
+      { title: 'Logging', package: '@travetto/log' }
     ],
     default: 'Express.js'
   },
-  { title: 'Test Framework', npm: '@travetto/test' },
-  { title: 'ESLint Support', npm: '@travetto/eslint-plugin' },
+  { title: 'Test Framework', package: '@travetto/test' },
+  { title: 'ESLint Support', package: '@travetto/eslint' },
   {
     title: 'Rest Authentication',
-    npm: '@travetto/auth-rest',
+    package: '@travetto/auth-rest',
     addons: [
-      { title: 'Rest Session', npm: '@travetto/rest-session', addons: [{ npm: '@travetto/auth-rest-session' }] },
-      { title: 'Context', npm: '@travetto/auth-rest-session' }
+      { title: 'Rest Session', package: '@travetto/rest-session' },
+      { title: 'Auth Rest Session', package: '@travetto/auth-rest-session' },
+      { title: 'Auth Rest Context', package: '@travetto/auth-rest-context' }
     ]
   },
   {
     title: 'Data Modelling',
-    npm: '@travetto/model',
+    package: '@travetto/model',
     choices: [
-      { title: 'Elasticsearch', npm: '@travetto/model-elasticsearch' },
-      { title: 'MongoDB', npm: '@travetto/model-mongo' },
-      { title: 'MySQL', npm: '@travetto/model-mysql' },
-      { title: 'PostgreSQL', npm: '@travetto/model-postgres' },
-      { title: 'SQLite', npm: '@travetto/model-sqlite' }
+      {
+        title: 'Elasticsearch', package: '@travetto/model-elasticsearch',
+        context: { modelService: 'ElasticsearchModelService', modelConfig: 'ElasticsearchModelConfig', modelImport: '@travetto/model-elasticsearch' }
+      },
+      {
+        title: 'MongoDB', package: '@travetto/model-mongo',
+        context: { modelService: 'MongoModelService', modelConfig: 'MongoModelConfig', modelImport: '@travetto/model-mongo' }
+      },
+      {
+        title: 'MySQL', package: '@travetto/model-mysql',
+        context: { modelService: 'SQLModelService', modelConfig: 'SQLModelConfig', modelImport: '@travetto/model-sql' }
+      },
+      {
+        title: 'PostgreSQL', package: '@travetto/model-postgres',
+        context: { modelService: 'SQLModelService', modelConfig: 'SQLModelConfig', modelImport: '@travetto/model-sql' }
+      },
+      {
+        title: 'SQLite', package: '@travetto/model-sqlite',
+        context: { modelService: 'SQLModelService', modelConfig: 'SQLModelConfig', modelImport: '@travetto/model-sql' }
+      }
+    ],
+    addons: [
+      { title: 'Command Support', package: '@travetto/command' }
     ],
     default: 'MongoDB'
   },

package/support/cli.scaffold.ts

@@ -1,13 +1,15 @@
 import enquirer from 'enquirer';
 
 import { path } from '@travetto/manifest';
-import { CliCommand, OptionConfig } from '@travetto/cli';
+import { CliCommand, cliTpl, OptionConfig } 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>;
 };
@@ -21,6 +23,7 @@ export class ScaffoldCommand extends CliCommand<Options> {
   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 })
     };
@@ -59,7 +62,7 @@ export class ScaffoldCommand extends CliCommand<Options> {
 
   async * #resolveFeatures(features: Feature[], chosen = false): AsyncGenerator<Feature> {
     for (const feat of features) {
-      if (!chosen) {
+      if (!chosen && !feat.required) {
         const ans = await enquirer.prompt<{ choice: boolean | string }>([{
           type: 'confirm',
           name: 'choice',
@@ -95,17 +98,26 @@ export class ScaffoldCommand extends CliCommand<Options> {
       return this.exit(1);
     }
 
-    const ctx = new Context(
-      name, this.cmd.template, path.resolve(this.cmd.dir ?? name)
-    );
+    this.cmd.cwd ??= path.cwd();
+
+    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);
+    }
+
+    const ctx = new Context(name, this.cmd.template, path.resolve(this.cmd.cwd, this.cmd.dir));
 
     if (!this.cmd.force) {
       await ctx.initialize();
     }
 
     try {
-      for await (const dep of this.#resolveFeatures(FEATURES)) {
-        await ctx.addDependency(dep);
+      for await (const feature of this.#resolveFeatures(FEATURES)) {
+        await ctx.resolveFeature(feature);
       }
     } catch (err) {
       if (err instanceof Error) {
@@ -114,9 +126,13 @@ export class ScaffoldCommand extends CliCommand<Options> {
       return this.exit(1);
     }
 
-    await ctx.templateResolvedFiles();
+    console.log(cliTpl`\n${{ title: 'Creating Application' }}\n${'-'.repeat(30)}`);
 
-    await ctx.exec('npm', ['i']);
-    await ctx.exec('npm', ['run', 'build']);
+    await GlobalTerminal.streamLinesWithWaiting(ctx.install(), {
+      position: 'inline',
+      end: false,
+      committedPrefix: '>',
+      cycleDelay: 100
+    });
   }
 }

package/support/.eslintrc.json

@@ -1,14 +0,0 @@
-{
-  "ignorePatterns": [
-    "resources/templates"
-  ],
-  "overrides": [
-    {
-      "files": "resources/**/*.ts",
-      "rules": {
-        "@typescript-eslint/consistent-type-assertions": 0,
-        "@typescript-eslint/explicit-function-return-type": 0
-      }
-    }
-  ]
-}

package/support/resources/templates/todo/eslintrc.js.txt

@@ -1 +0,0 @@
-module.exports = require('@travetto/eslint-plugin/bin/init');

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

@@ -1,3 +0,0 @@
-{
-  "extends": "./node_modules/@travetto/compiler/tsconfig.trv.json"
-}