@travetto/scaffold 7.0.4 → 7.0.6

package/README.md

@@ -57,7 +57,7 @@ A default model is constructed, a [Todo](https://github.com/travetto/travetto/tr
 
 **Code: Todo Model**
 ```typescript
-import { Model, ModelType } from '@travetto/model';
+import { Model, type ModelType } from '@travetto/model';
 
 @Model()
 export class Todo implements ModelType {
@@ -78,7 +78,7 @@ In the case both `web` and `model` features are enabled, the code will produce a
 import { Controller, Get, Put, Post, Delete } from '@travetto/web';
 import { NotFoundError } from '@travetto/model';
 import { Inject } from '@travetto/di';
-import { ModelQuery, ModelQueryCrudSupport } from '@travetto/model-query';
+import type { ModelQuery, ModelQueryCrudSupport } from '@travetto/model-query';
 import { Schema } from '@travetto/schema';
 
 import { Todo } from './model.ts';

package/bin/trv-scaffold.js

@@ -1,48 +1,29 @@
 #!/usr/bin/env node
 // @ts-check
+import { delimiter } from 'node:path';
+import fs from 'node:fs';
+import { spawn, execSync } from 'node:child_process';
 
-async function getModuleDirectory() {
-  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(part => part.includes('npx') && part.includes('.bin'));
-    if (loc) {
-      return loc.split('/node_modules')[0];
-    }
-  }
-  return process.cwd();
-}
+let workingDirectory = process.cwd();
 
-/**
- * @param {string} workingDirectory
- */
-async function getVersion(workingDirectory) {
-  const fs = await import('node:fs/promises');
-  const pkg = JSON.parse(await fs.readFile(`${workingDirectory}/package.json`, 'utf8'));
-  const version = `${pkg.dependencies['@travetto/scaffold']}`.replace(/\d+$/, '0');
-  return version;
+if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
+  const parts = process.env.PATH?.split(delimiter) ?? [];
+  const item = parts.find(part => part.includes('npx') && part.includes('.bin'));
+  if (item) {
+    workingDirectory = item.split('/node_modules')[0];
+  }
 }
 
-(async function () {
-  const workingDirectory = await getModuleDirectory();
-  const version = await getVersion(workingDirectory);
-
-  const { spawn, execSync } = await import('node:child_process');
-  // Ensure we install the compiler first
-  execSync(`npm i @travetto/compiler@${version}`, { stdio: 'pipe', cwd: workingDirectory });
+const pkg = JSON.parse(fs.readFileSync(`${workingDirectory}/package.json`, 'utf8'));
+const pkgVersion = `${pkg.dependencies?.['@travetto/scaffold']}`.replace(/\d+$/, '0');
 
-  spawn('npx', [
-    'trvc', 'exec',
-    '@travetto/cli/support/entry.trv.js',
-    'scaffold',
-    '-c', process.cwd(),
-    ...process.argv.slice(2)
-  ], {
-    stdio: 'inherit',
-    cwd: workingDirectory,
-    env: {
-      ...process.env,
-      TRV_QUIET: '1',
-    }
-  });
-})();
+// Ensure we install the compiler first
+execSync(`npm i @travetto/compiler@${pkgVersion}`, { stdio: 'pipe', cwd: workingDirectory });
+spawn('npx', [
+  'trvc', 'exec', '@travetto/cli/support/entry.trv.js',
+  'scaffold', '-c', process.cwd(), ...process.argv.slice(2)
+], {
+  stdio: 'inherit',
+  cwd: workingDirectory,
+  env: { ...process.env, TRV_QUIET: '1', }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "type": "module",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
@@ -28,13 +28,13 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^7.0.4",
-    "@travetto/runtime": "^7.0.3",
+    "@travetto/cli": "^7.0.6",
+    "@travetto/runtime": "^7.0.4",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@travetto/model": "^7.0.4",
+    "@travetto/model": "^7.0.5",
     "@types/mustache": "^4.2.6"
   },
   "travetto": {

package/support/bin/context.ts

@@ -6,10 +6,10 @@ import mustache from 'mustache';
 
 import { castKey, castTo, ExecUtil, JSONUtil, RuntimeIndex } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
-import { NodePackageManager, PackageUtil } from '@travetto/manifest';
+import { type NodePackageManager, PackageUtil } from '@travetto/manifest';
 import { Terminal } from '@travetto/terminal';
 
-import { Feature } from './features.ts';
+import type { Feature } from './features.ts';
 
 type ListingEntry = { requires?: string[], rename?: string };
 type Listing = Record<string, ListingEntry>;
@@ -26,8 +26,8 @@ export class Context {
 
   static #meetsRequirement(modules: string[], desired: string[]): boolean {
     let valid = true;
-    for (const mod of desired) {
-      valid = valid && modules.includes(mod);
+    for (const module of desired) {
+      valid = valid && modules.includes(module);
       if (!valid) {
         break;
       }
@@ -108,7 +108,7 @@ export class Context {
 
   templateContext(): Record<string, unknown> {
     const modules = [...this.#dependencies, ...this.#devDependencies]
-      .map(mod => path.basename(mod))
+      .map(module => path.basename(module))
       .reduce((ctx, value) => ({ ...ctx, [value.replace(/[-]/g, '_')]: true }), {});
     const moduleNames = [...Object.keys(modules)];
 
@@ -127,7 +127,7 @@ export class Context {
         devDependencies: [...new Set(this.#devDependencies)].toSorted((a, b) => a.localeCompare(b)),
       },
       ...this.#featureContexts,
-      ...moduleNames.map(mod => ({ [`module_${mod}`]: true }))
+      ...moduleNames.map(module => ({ [`module_${module}`]: true }))
     );
 
     return context;

package/support/cli.scaffold.ts

@@ -4,11 +4,11 @@ import * as enquirer from 'enquirer';
 
 const { prompt } = enquirer.default;
 
-import { CliCommandShape, CliCommand, cliTpl, CliFlag } from '@travetto/cli';
+import { type CliCommandShape, CliCommand, cliTpl, CliFlag } from '@travetto/cli';
 import { Terminal } from '@travetto/terminal';
 
 import { Context } from './bin/context.ts';
-import { Feature, FEATURES } from './bin/features.ts';
+import { type Feature, FEATURES } from './bin/features.ts';
 
 /**
  * Command to run scaffolding