@travetto/scaffold 3.4.10 → 4.0.0-rc.1

package/bin/trv-scaffold.js

@@ -13,5 +13,5 @@
     }
   }
   process.argv = args;
-  await import('@travetto/compiler/bin/trv.js');
+  await import('@travetto/cli/bin/trv.js');
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "3.4.10",
+  "version": "4.0.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.4.2",
-    "@travetto/cli": "^3.4.10",
-    "@travetto/compiler": "^3.4.3",
+    "@travetto/base": "^4.0.0-rc.1",
+    "@travetto/cli": "^4.0.0-rc.1",
+    "@travetto/compiler": "^4.0.0-rc.1",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },

package/resources/templates/todo/test/model/todo.ts

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 import { ModelCrudSupport } from '@travetto/model';

package/support/bin/context.ts

@@ -1,10 +1,11 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
+import { spawn } from 'node:child_process';
 import mustache from 'mustache';
 
+import { ExecUtil, StreamUtil } from '@travetto/base';
 import { cliTpl } from '@travetto/cli';
-import { ManifestContext, path, RootIndex } from '@travetto/manifest';
-import { ExecUtil, ExecutionResult } from '@travetto/base';
-import { GlobalTerminal } from '@travetto/terminal';
+import { path, RuntimeIndex, NodePackageManager, PackageUtil } from '@travetto/manifest';
+import { Terminal } from '@travetto/terminal';
 
 import { Feature } from './features';
 
@@ -40,7 +41,7 @@ export class Context {
   #peerDependencies: string[] = [];
   #featureContexts: Record<string, unknown>[] = [];
 
-  packageManager: ManifestContext['packageManager'] = 'npm';
+  packageManager: NodePackageManager = 'npm';
 
   readonly name: string;
 
@@ -50,19 +51,23 @@ export class Context {
     this.#targetDir = path.resolve(targetDir);
   }
 
-  #exec(cmd: string, args: string[]): Promise<ExecutionResult> {
-    const res = ExecUtil.spawn(cmd, args, {
+  #exec(cmd: string, args: string[]): Promise<void> {
+    const term = new Terminal();
+    const proc = spawn(cmd, args, {
       cwd: this.destination(),
       stdio: [0, 'pipe', 'pipe'],
-      isolatedEnv: true,
-      onStdErrorLine: line => GlobalTerminal.writeLines(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line}`)
-    }).result;
+      shell: false,
+      env: { PATH: process.env.PATH },
+    });
 
-    return res;
+    StreamUtil.onLine(proc.stderr,
+      line => term.writer.writeLine(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line}`).commit());
+
+    return ExecUtil.getResult(proc).then(() => { });
   }
 
   get selfPath(): string {
-    return RootIndex.getModule('@travetto/scaffold')!.sourcePath;
+    return RuntimeIndex.getModule('@travetto/scaffold')!.sourcePath;
   }
 
   source(file?: string): string {
@@ -104,8 +109,13 @@ export class Context {
       .map(x => path.basename(x)).reduce((acc, v) => ({ ...acc, [v.replace(/[-]/g, '_')]: true }), {});
     const moduleNames = [...Object.keys(modules)];
 
+    /** Get framework version at runtime */
+    const { version: frameworkVersion } = PackageUtil.readPackage(
+      PackageUtil.resolveImport('@travetto/manifest/package.json')
+    );
+
     const context = Object.assign({
-      frameworkVersion: RootIndex.manifest.frameworkVersion.replace(/[.]\d+$/, '.0'),
+      frameworkVersion: frameworkVersion.replace(/[.]\d+$/, '.0'),
       name: this.name,
       modules,
       moduleNames,

package/support/cli.scaffold.ts

@@ -2,7 +2,7 @@ import enquirer from 'enquirer';
 
 import { path } from '@travetto/manifest';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { GlobalTerminal } from '@travetto/terminal';
+import { Terminal } from '@travetto/terminal';
 
 import { Context } from './bin/context';
 import { Feature, FEATURES } from './bin/features';
@@ -99,11 +99,6 @@ export class ScaffoldCommand implements CliCommandShape {
 
     console.log(cliTpl`\n${{ title: 'Creating Application' }}\n${'-'.repeat(30)}`);
 
-    await GlobalTerminal.streamLinesWithWaiting(ctx.install(), {
-      position: 'inline',
-      end: false,
-      committedPrefix: '>',
-      cycleDelay: 100
-    });
+    await new Terminal().streamLines(ctx.install());
   }
 }