@travetto/scaffold 5.0.0-rc.1 → 5.0.0-rc.10

package/README.md

@@ -62,6 +62,7 @@ export class Todo implements ModelType {
   id: string;
   text: string;
   completed?: boolean;
+  userId?: string;
 }
 ```
 

package/package.json

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

package/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
-  userId?: string;  // @doc-exclude
-  // {{/modules.auth_rest}}  // @doc-exclude
+  // {{#modules.auth_rest}}
+  userId?: string;
+  // {{/modules.auth_rest}} 
 }

package/resources/templates/todo/src/rest/auth.config.ts

@@ -1,7 +1,7 @@
 import { Authorizer, Authenticator } from '@travetto/auth';
 import { SessionModelⲐ } from '@travetto/rest-session';
 import { InjectableFactory } from '@travetto/di';
-import { AppError } from '@travetto/base';
+import { AppError } from '@travetto/runtime';
 import { ModelExpirySupport, MemoryModelService } from '@travetto/model';
 
 export const BasicAuthⲐ = Symbol.for('AUTH_BASIC');

package/support/bin/context.ts

@@ -1,13 +1,12 @@
 import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import rl from 'node:readline/promises';
 import path from 'node:path';
 
 import mustache from 'mustache';
 
-import { ExecUtil, Util } from '@travetto/base';
+import { castKey, castTo, ExecUtil, RuntimeIndex } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
-import { RuntimeIndex, NodePackageManager, PackageUtil } from '@travetto/manifest';
+import { NodePackageManager, PackageUtil } from '@travetto/manifest';
 import { Terminal } from '@travetto/terminal';
 
 import { Feature } from './features';
@@ -64,7 +63,7 @@ export class Context {
     });
 
     if (proc.stderr) {
-      Util.consumeAsyncItr(rl.createInterface(proc.stderr),
+      ExecUtil.readLines(proc.stderr,
         line => term.writer.writeLine(cliTpl`    ${{ identifier: [cmd, ...args].join(' ') }}: ${line.trimEnd()}`).commit());
     }
 
@@ -140,10 +139,9 @@ export class Context {
         .replaceAll('_$', '}}}'),
       this.templateContext(),
     )
-      .replace(/\/\/\s*@ts-expect-error.*$/gm, '')
-      .replace(/(\/\/.*@doc-exclude.*)$/gm, '')
-      .replace(/\s*(\/\/.*@doc-exclude.*)/gm, '')
-      .replace(/^\s*(\/\/\s*)\n/gsm, '');
+      .replace(/[ ]*[/][/][ ]*@ts-expect-error[^\n]*\n/gsm, '') // Excluding errors
+      .replace(/^[ ]*[/][/][ ]*[{][{][^\n]*\n/gsm, '') // Excluding conditional comments, full-line
+      .replace(/[ ]*[/][/][ ]*[{][{][^\n]*/gsm, ''); // Excluding conditional comments
     await fs.mkdir(path.dirname(out), { recursive: true });
     await fs.writeFile(out, rendered, 'utf8');
   }
@@ -167,8 +165,7 @@ export class Context {
       }
     }
     if (feat.field) {
-      // @ts-expect-error
-      this[feat.field] = feat.value!;
+      this[castKey(feat.field)] = castTo(feat.value);
     }
     if (feat.context) {
       this.#featureContexts.push(feat.context);