@travetto/scaffold 4.1.1 → 5.0.0-rc.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "4.1.1",
+  "version": "5.0.0-rc.1",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -27,8 +27,8 @@
     "trv-scaffold": "./bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/base": "^4.1.1",
-    "@travetto/cli": "^4.1.1",
+    "@travetto/base": "^5.0.0-rc.1",
+    "@travetto/cli": "^5.0.0-rc.1",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },

package/support/bin/context.ts

@@ -1,10 +1,13 @@
 import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import { render } from 'mustache';
+import rl from 'node:readline/promises';
+import path from 'node:path';
 
-import { ExecUtil, StreamUtil } from '@travetto/base';
+import mustache from 'mustache';
+
+import { ExecUtil, Util } from '@travetto/base';
 import { cliTpl } from '@travetto/cli';
-import { path, RuntimeIndex, NodePackageManager, PackageUtil } from '@travetto/manifest';
+import { RuntimeIndex, NodePackageManager, PackageUtil } from '@travetto/manifest';
 import { Terminal } from '@travetto/terminal';
 
 import { Feature } from './features';
@@ -60,8 +63,10 @@ export class Context {
       env: { PATH: process.env.PATH },
     });
 
-    StreamUtil.onLine(proc.stderr,
-      line => term.writer.writeLine(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line}`).commit());
+    if (proc.stderr) {
+      Util.consumeAsyncItr(rl.createInterface(proc.stderr),
+        line => term.writer.writeLine(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line.trimEnd()}`).commit());
+    }
 
     return ExecUtil.getResult(proc).then(() => { });
   }
@@ -129,7 +134,7 @@ export class 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 = render(
+    const rendered = mustache.render(
       contents
         .replaceAll('$_', '{{{')
         .replaceAll('_$', '}}}'),

package/support/cli.scaffold.ts

@@ -1,6 +1,7 @@
+import path from 'node:path';
+
 import { prompt } from 'enquirer';
 
-import { path } from '@travetto/manifest';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
 import { Terminal } from '@travetto/terminal';
 
@@ -15,7 +16,7 @@ export class ScaffoldCommand implements CliCommandShape {
   /** Template */
   template = 'todo';
   /** Current Working Directory override */
-  cwd: string = path.cwd();
+  cwd: string = path.resolve();
   /** Target Directory */
   dir?: string;
   /** Force writing into an existing directory */