@travetto/scaffold 7.1.2 → 7.1.4

package/README.md

@@ -25,12 +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 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/)
-
-The code will establish some basic endpoints, specifically, `GET / ` as the root endpoint.  This will return the contents of your `package.json` as an identification operation.
+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, leveraging [Web HTTP Server Support](https://github.com/travetto/travetto/tree/main/module/web-http#readme "Web HTTP Server Support").   The code will establish some basic endpoints, specifically, `GET / ` as the root endpoint.  This will return the contents of your `package.json` as an identification operation.
 
 ### Additional Web Features
 In addition to the core functionality, the `web` feature has some useful sub-features.  Specifically:
@@ -49,7 +44,9 @@ Authentication is also supported on the Web endpoints by selecting [Web Auth](ht
 The [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") allows for modeling of application data, and provides mechanisms for storage and retrieval.  When setting up your application, you will need to select which database backend you want to use:
    *  [elasticsearch](https://elastic.co)
    *  [mongodb](https://mongodb.com)
-   *  [SQL](https://en.wikipedia.org/wiki/SQL)
+   *  [Postgres](https://postgresql.org)
+   *  [MySQL](https://www.mysql.com/)
+   *  [SQLite](https://www.sqlite.org/)
    *  [DynamoDB](https://aws.amazon.com/dynamodb/)
    *  [Firestore](https://firebase.google.com/docs/firestore)
 

package/bin/trv-scaffold.js

@@ -6,7 +6,7 @@ import '@travetto/compiler/bin/hook.js';
 
 const current = process.cwd();
 
-if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
+if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is global run (not installed)
   const folder = import.meta.dirname.split('node_modules')[0];
   const pkg = resolve(folder, 'package.json');
   writeFileSync(pkg, JSON.stringify({ ...JSON.parse(readFileSync(pkg, 'utf-8')), type: 'module' }));
@@ -14,4 +14,4 @@ if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
 }
 
 const { invoke } = await import('@travetto/compiler/support/invoke.ts');
-await invoke('exec', ['@travetto/cli/support/entry.trv.js', 'scaffold', '-c', current, ...process.argv.slice(2)]);
+await invoke('exec', ['@travetto/cli/support/entry.trv.ts', 'scaffold', '-c', current, ...process.argv.slice(2)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "7.1.2",
+  "version": "7.1.4",
   "type": "module",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
@@ -28,14 +28,14 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^7.1.2",
-    "@travetto/compiler": "^7.1.1",
-    "@travetto/runtime": "^7.1.2",
+    "@travetto/cli": "^7.1.4",
+    "@travetto/compiler": "^7.1.3",
+    "@travetto/runtime": "^7.1.4",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@travetto/model": "^7.1.2",
+    "@travetto/model": "^7.1.4",
     "@types/mustache": "^4.2.6"
   },
   "travetto": {

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

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

package/support/bin/context.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs/promises';
-import { spawn } from 'node:child_process';
+import { spawn, type ChildProcess, type SpawnOptions } from 'node:child_process';
 import path from 'node:path';
 
 import mustache from 'mustache';
@@ -52,9 +52,11 @@ export class Context {
     this.#targetDirectory = path.resolve(targetDirectory);
   }
 
-  #exec(cmd: string, args: string[]): Promise<void> {
+  #exec(cmd: string, args: string[], options?: { spawn?: (cmd: string, args: string[], options?: SpawnOptions) => ChildProcess }): Promise<void> {
     const terminal = new Terminal();
-    const subProcess = spawn(cmd, args, {
+    const spawnCmd = options?.spawn ?? spawn;
+    const subProcess = spawnCmd(cmd, args, {
+      ...options,
       cwd: this.destination(),
       stdio: [0, 'pipe', 'pipe'],
       env: { PATH: process.env.PATH },
@@ -194,21 +196,21 @@ export class Context {
     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} `);
+      case 'pnpm': await this.#exec('pnpm', ['install']); break;
     }
 
     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} `);
+      case 'pnpm': await this.#exec('pnpm', ['update', '--latest']); break;
     }
 
     yield cliTpl`${{ type: 'Initial Build' }} `;
-    await this.#exec('npx', ['trvc', 'build']);
+    await this.#exec('trvc', ['build'], { spawn: ExecUtil.spawnPackageCommand });
     if (this.#devDependencies.includes('@travetto/eslint')) {
       yield cliTpl`${{ type: 'ESLint Registration' }} `;
-      await this.#exec('npx', ['trv', 'eslint:register']);
+      await this.#exec('trv', ['eslint:register'], { spawn: ExecUtil.spawnPackageCommand });
     }
 
     yield cliTpl`${{ success: 'Successfully created' }} at ${{ path: this.#targetDirectory }} `;

package/support/bin/features.ts

@@ -1,3 +1,5 @@
+import { PACKAGE_MANAGERS } from '@travetto/manifest';
+
 export type Feature = {
   title?: string;
   package?: string | string[];
@@ -15,10 +17,7 @@ export type Feature = {
 export const FEATURES: Feature[] = [
   {
     title: 'Package Manager',
-    choices: [
-      { title: 'NPM', field: 'packageManager', value: 'npm' },
-      { title: 'Yarn', field: 'packageManager', value: 'yarn' }
-    ],
+    choices: PACKAGE_MANAGERS.map(manager => ({ title: manager.title, field: 'packageManager', value: manager.type })),
     required: true,
     default: 'npm'
   },