@travetto/scaffold 6.0.0 → 7.0.0-rc.0

package/README.md

@@ -25,7 +25,7 @@ $ npx @travetto/scaffold@<version-or-tag>
 The generator will ask about enabling the following features:
 
 ## Web Application
-The [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative api for Web Applications with support for the dependency injection.") provides the necessary integration for exposing web apis.  When selecting the `web` feature, you will need to specify which backend you want to include with your application, the default being [express](https://expressjs.com).  Currently you can select from:
+The [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative support for creating Web Applications") provides the necessary integration for exposing web apis.  When selecting the `web` feature, you will need to specify which backend you want to include with your application, the default being [express](https://expressjs.com).  Currently you can select from:
    *  [express](https://expressjs.com)
    *  [koa](https://koajs.com/)
    *  [fastify](https://www.fastify.io/)

package/bin/trv-scaffold.js

@@ -2,7 +2,7 @@
 // @ts-check
 
 async function getScaffoldCwd() {
-  if (process.env.npm_lifecycle_script === 'trv-scaffold') { // Is npx  run
+  if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
     const { delimiter } = await import('node:path');
     const parts = process.env.PATH?.split(delimiter) ?? [];
     const loc = parts.find(p => p.includes('npx') && p.includes('.bin'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "6.0.0",
+  "version": "7.0.0-rc.0",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -27,14 +27,14 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^6.0.0",
-    "@travetto/runtime": "^6.0.0",
+    "@travetto/cli": "^7.0.0-rc.0",
+    "@travetto/runtime": "^7.0.0-rc.0",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@travetto/model": "^6.0.0",
-    "@types/mustache": "^4.2.5"
+    "@travetto/model": "^7.0.0-rc.0",
+    "@types/mustache": "^4.2.6"
   },
   "travetto": {
     "displayName": "App Scaffold"

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

@@ -25,11 +25,11 @@
   ],
   "license": "MIT",
   "scripts": {
-    "watch": "npx trvc watch",
-    "build": "npx trvc build",
-    "start": "npx trv web:http",
-    "test": "npx trv test",
-    "lint": "npx trv lint"
+    "build": "npx trvc build",    
+    {{#module_web}}"start": "npx trv web:http",{{/module_web}}
+    {{#module_test}}"test": "npx trv test",{{/module_test}}
+    {{#module_eslint}}"lint": "npx trv eslint",{{/module_eslint}}
+    "watch": "npx trvc watch"
   },
   "files": [
     "src",

package/resources/templates/todo/resources/application.yml

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

package/support/bin/context.ts

@@ -57,7 +57,6 @@ export class Context {
     const proc = spawn(cmd, args, {
       cwd: this.destination(),
       stdio: [0, 'pipe', 'pipe'],
-      shell: false,
       env: { PATH: process.env.PATH },
     });
 
@@ -117,14 +116,18 @@ export class Context {
       PackageUtil.resolveImport('@travetto/manifest/package.json')
     );
 
-    const context = Object.assign({
-      frameworkVersion: frameworkVersion.replace(/[.]\d+$/, '.0'),
-      name: this.name,
-      modules,
-      moduleNames,
-      dependencies: [...new Set(this.#dependencies)].toSorted((a, b) => a.localeCompare(b)),
-      devDependencies: [...new Set(this.#devDependencies)].toSorted((a, b) => a.localeCompare(b)),
-    }, ...this.#featureContexts);
+    const context = Object.assign(
+      {
+        frameworkVersion: frameworkVersion.replace(/[.]\d+$/, '.0'),
+        name: this.name,
+        modules,
+        moduleNames,
+        dependencies: [...new Set(this.#dependencies)].toSorted((a, b) => a.localeCompare(b)),
+        devDependencies: [...new Set(this.#devDependencies)].toSorted((a, b) => a.localeCompare(b)),
+      },
+      ...this.#featureContexts,
+      ...moduleNames.map(x => ({ [`module_${x}`]: true }))
+    );
 
     return context;
   }
@@ -204,7 +207,7 @@ export class Context {
     await this.#exec('npx', ['trvc', 'build']);
     if (this.#devDependencies.includes('@travetto/eslint')) {
       yield cliTpl`${{ type: 'ESLint Registration' }} `;
-      await this.#exec('npx', ['trv', 'lint:register']);
+      await this.#exec('npx', ['trv', 'eslint:register']);
     }
 
     yield cliTpl`${{ success: 'Successfully created' }} at ${{ path: this.#targetDir }} `;

package/support/bin/features.ts

@@ -22,25 +22,24 @@ export const FEATURES: Feature[] = [
     required: true,
     default: 'npm'
   },
+  { title: 'Logging', package: '@travetto/log', required: true },
   {
     title: 'Web Framework',
     package: '@travetto/web',
     addons: [
-      { title: 'Web Node', package: '@travetto/web-node' },
-      { title: 'Web Http Server', package: '@travetto/web-http-server' },
-      { title: 'OpenAPI', package: '@travetto/openapi' },
-      { title: 'Logging', package: '@travetto/log' }
+      { title: 'Web Http Server', package: '@travetto/web-http', required: true },
+      { title: 'OpenAPI', package: '@travetto/openapi', required: true },
+      {
+        title: 'Web Authentication',
+        package: '@travetto/auth-web',
+        addons: [
+          { title: 'Session Support', package: ['@travetto/auth-session', '@travetto/auth-web-session', '@travetto/model-memory'] },
+        ]
+      },
     ]
   },
   { title: 'Test Framework', package: '@travetto/test' },
   { title: 'ESLint Support', package: '@travetto/eslint' },
-  {
-    title: 'Web Authentication',
-    package: '@travetto/auth-web',
-    addons: [
-      { title: 'Session Support', package: ['@travetto/auth-session', '@travetto/auth-web-session', '@travetto/model-memory'] },
-    ]
-  },
   {
     title: 'Data Modelling',
     package: '@travetto/model',

package/support/cli.scaffold.ts

@@ -49,13 +49,13 @@ export class ScaffoldCommand implements CliCommandShape {
     return feature.choices?.find(x => x.title === response.choice);
   }
 
-  async * #resolveFeatures(features: Feature[], chosen = false): AsyncGenerator<Feature> {
+  async * #resolveFeatures(features: Feature[], chosen = false, depth = 0): AsyncGenerator<Feature> {
     for (const feat of features) {
       if (!chosen && !feat.required) {
         const ans = await prompt<{ choice: boolean | string }>([{
           type: 'confirm',
           name: 'choice',
-          message: `Include ${feat.title} support?`,
+          message: `${'='.repeat(depth * 2)}${depth > 0 ? '| ' : ''}Include ${feat.title} support?`,
           initial: true
         }]);
 
@@ -67,12 +67,14 @@ export class ScaffoldCommand implements CliCommandShape {
       if (feat.choices) {
         const choice = await this.#chooseFeature(feat);
         if (choice) {
-          yield* this.#resolveFeatures([choice], true);
+          yield* this.#resolveFeatures([choice], true, depth);
         } else {
           throw new Error(`Invalid choice: ${feat}`);
         }
       }
 
+      yield* this.#resolveFeatures(feat.addons ?? [], false, depth + 1);
+
       yield feat;
     }
   }