vona-cli-set-api 1.1.166 → 1.1.167

package/dist/index.js

@@ -24,9 +24,9 @@ import chalk from 'chalk';
 import { spawn } from 'node:child_process';
 import nodemon from 'nodemon';
 import { catchError, combineApiPathControllerAndActionRaw, replaceTemplate } from '@cabloy/utils';
+import fs, { readFileSync } from 'node:fs';
 import { getOnionScenesMeta, getOnionMetasMeta, relativeNameToCapitalize } from '@cabloy/module-info';
 import { toUpperCaseFirstChar, stringToCapitalize, replaceTemplate as replaceTemplate$1 } from '@cabloy/word-utils';
-import fs from 'node:fs';
 import gogocode from 'gogocode';
 
 function getEnvMeta(configMeta) {
@@ -944,13 +944,6 @@ class CliBinDev extends BeanCliBase {
         console.log('App restarted due to: ', files);
       });
     });
-    // await this.helper.spawnExe({
-    //   cmd: 'node',
-    //   args: ['--experimental-transform-types', '--loader=ts-node/esm', '.vona/bootstrap.ts'],
-    //   options: {
-    //     cwd: projectPath,
-    //   },
-    // });
   }
 }
 
@@ -1049,6 +1042,27 @@ class CliBinPlay extends BeanCliBase {
   }
 }
 
+async function runTestChild(args, projectPath) {
+  const child = spawn(process.execPath, args, {
+    cwd: projectPath,
+    stdio: 'inherit'
+  });
+  const onInterrupt = () => child.kill('SIGINT');
+  const onTerminate = () => child.kill('SIGTERM');
+  process.on('SIGINT', onInterrupt);
+  process.on('SIGTERM', onTerminate);
+  try {
+    await new Promise((resolve, reject) => {
+      child.once('error', reject);
+      child.once('close', (code, signal) => {
+        if (code === 0) resolve();else reject(new Error(`Test child exited: ${signal ?? code}`));
+      });
+    });
+  } finally {
+    process.off('SIGINT', onInterrupt);
+    process.off('SIGTERM', onTerminate);
+  }
+}
 class CliBinTest extends BeanCliBase {
   async execute() {
     const {
@@ -1114,13 +1128,7 @@ class CliBinTest extends BeanCliBase {
     }
     args = args.concat([getImportEsm(resolveVonaLocalPaths(projectPath, 'test').generatedDir), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
     // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
-    await this.helper.spawnExe({
-      cmd: 'node',
-      args,
-      options: {
-        cwd: projectPath
-      }
-    });
+    await runTestChild(args, projectPath);
   }
   async _outputCoverageReportViewer(projectPath) {
     // lcovCliFile
@@ -1165,6 +1173,48 @@ class CliBinTest extends BeanCliBase {
   }
 }
 
+function resolveTypeScriptCompiler(compiler, projectPath) {
+  const packageName = compiler === 'native' ? '@typescript/native' : 'typescript';
+  const require = createRequire(path.resolve(projectPath, 'package.json'));
+  let manifestPath;
+  try {
+    manifestPath = require.resolve(`${packageName}/package.json`);
+  } catch (cause) {
+    throw new Error(`Cannot resolve ${packageName}. Install the ${compiler === 'native' ? 'native TypeScript alias (npm:typescript@7.0.2)' : 'TypeScript package'} in the project or its repository root.`, {
+      cause
+    });
+  }
+  const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
+  if (typeof manifest.bin?.tsc !== 'string') {
+    throw new TypeError(`${packageName} does not declare a tsc executable.`);
+  }
+  return path.resolve(path.dirname(manifestPath), manifest.bin.tsc);
+}
+async function runTypeScript(compiler, args, {
+  projectPath,
+  cwd = projectPath
+}) {
+  const executable = resolveTypeScriptCompiler(compiler, projectPath);
+  await new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [executable, ...args], {
+      cwd,
+      stdio: 'inherit',
+      shell: false
+    });
+    child.once('error', reject);
+    child.once('close', (code, signal) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(Object.assign(new Error(`TypeScript (${compiler}) failed: ${signal ? `signal ${signal}` : `exit code ${code}`}`), {
+          exitCode: code ?? 1,
+          signal
+        }));
+      }
+    });
+  });
+}
+
 class CliBinTsc extends BeanCliBase {
   async execute() {
     const {
@@ -1174,9 +1224,17 @@ class CliBinTsc extends BeanCliBase {
     await super.execute();
     const projectPath = argv.projectPath;
     const force = argv.force;
-    await this._tsc(projectPath, force);
+    await this._tsc(projectPath, force, argv.compiler ?? 'typescript', argv.builders);
   }
-  async _tsc(projectPath, force) {
+  async _tsc(projectPath, force, compiler = 'typescript', builders) {
+    if (builders !== undefined) {
+      if (!Number.isSafeInteger(builders) || builders < 1) {
+        throw new Error('--builders must be a positive safe integer');
+      }
+      if (compiler !== 'native') {
+        throw new Error('--builders requires --compiler=native');
+      }
+    }
     const suiteNames = Object.keys(this.modulesMeta.suites).filter(suiteName => !this.modulesMeta.suites[suiteName].info.node_modules);
     const modulesArray = this.modulesMeta.modulesArray.filter(item => !item.suite && !item.info.node_modules);
     // count
@@ -1191,28 +1249,37 @@ class CliBinTsc extends BeanCliBase {
     if (force) {
       tscArgs.push('--force');
     }
+    if (builders !== undefined) {
+      tscArgs.push('--builders', String(builders));
+    }
+    const check = async cwd => {
+      if (compiler === 'native') {
+        await runTypeScript(compiler, tscArgs, {
+          projectPath,
+          cwd
+        });
+      } else {
+        await this.helper.processHelper.tsc(tscArgs, {
+          cwd
+        });
+      }
+    };
     // tsc: project
     // eslint-disable-next-line
     console.log(`===>  ${++counter}/${count} project`);
-    await this.helper.processHelper.tsc(tscArgs, {
-      cwd: projectPath
-    });
+    await check(projectPath);
     // suites
     for (const key of suiteNames) {
       const suite = this.modulesMeta.suites[key];
       // eslint-disable-next-line
       console.log(`===>  ${++counter}/${count} suite: ${suite.info.originalName}`);
-      await this.helper.processHelper.tsc(tscArgs, {
-        cwd: suite.root
-      });
+      await check(suite.root);
     }
     // modules
     for (const module of modulesArray) {
       // eslint-disable-next-line
       console.log(`===>  ${++counter}/${count} module: ${module.info.originalName}`);
-      await this.helper.processHelper.tsc(tscArgs, {
-        cwd: module.root
-      });
+      await check(module.root);
     }
     // end
     const timeEnd = Date.now();
@@ -3664,9 +3731,18 @@ var binTsc = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Tsc',
-    usage: 'npm run vona :bin:tsc -- [--force]'
+    usage: 'npm run vona :bin:tsc -- [--force] [--compiler=typescript|native] [--builders=]'
   },
   options: {
+    compiler: {
+      description: 'TypeScript compiler (native requires @typescript/native in the project or repository root)',
+      type: 'string',
+      choices: ['typescript', 'native']
+    },
+    builders: {
+      description: 'Maximum number of projects to build concurrently (native only)',
+      type: 'number'
+    },
     force: {
       description: 'force',
       type: 'boolean'

package/dist/lib/bean/cli.bin.test.d.ts

@@ -7,6 +7,7 @@ declare module '@cabloy/cli' {
         flavor?: VonaMetaFlavor;
     }
 }
+export declare function runTestChild(args: string[], projectPath: string): Promise<void>;
 export declare class CliBinTest extends BeanCliBase {
     execute(): Promise<void>;
     _test(projectPath: string): Promise<void>;

package/dist/lib/bean/cli.bin.tsc.d.ts

@@ -1,10 +1,13 @@
 import { BeanCliBase } from '@cabloy/cli';
+import type { TypeScriptCompiler } from '../typescriptRunner.ts';
 declare module '@cabloy/cli' {
     interface ICommandArgv {
         force: boolean;
+        compiler: TypeScriptCompiler;
+        builders: number;
     }
 }
 export declare class CliBinTsc extends BeanCliBase {
     execute(): Promise<void>;
-    _tsc(projectPath: string, force: boolean): Promise<void>;
+    _tsc(projectPath: string, force: boolean, compiler?: TypeScriptCompiler, builders?: number): Promise<void>;
 }

package/dist/lib/command/bin.tsc.d.ts

@@ -6,6 +6,15 @@ declare const _default: {
         usage: string;
     };
     options: {
+        compiler: {
+            description: string;
+            type: string;
+            choices: string[];
+        };
+        builders: {
+            description: string;
+            type: string;
+        };
         force: {
             description: string;
             type: string;

package/dist/lib/commands.d.ts

@@ -164,6 +164,15 @@ export declare const commands: {
                 usage: string;
             };
             options: {
+                compiler: {
+                    description: string;
+                    type: string;
+                    choices: string[];
+                };
+                builders: {
+                    description: string;
+                    type: string;
+                };
                 force: {
                     description: string;
                     type: string;

package/dist/lib/typescriptRunner.d.ts

@@ -0,0 +1,6 @@
+export type TypeScriptCompiler = 'native' | 'typescript';
+export declare function resolveTypeScriptCompiler(compiler: TypeScriptCompiler, projectPath: string): string;
+export declare function runTypeScript(compiler: TypeScriptCompiler, args: string[], { projectPath, cwd }: {
+    projectPath: string;
+    cwd?: string;
+}): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.166",
-  "gitHead": "c703cb481fdf9d50a4f3eb3971e7b7c20a79619d",
+  "version": "1.1.167",
+  "gitHead": "b63e6a7b56aa7d6aaa935e98149e43cf7e68d706",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -61,6 +61,7 @@
     "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@swc-node/register": "^1.12.1",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "babel-plugin-vona-bean-module": "^1.1.9",
     "chalk": "^3.0.0",
@@ -74,7 +75,6 @@
     "randomatic": "^3.1.1",
     "rimraf": "^6.1.3",
     "rollup": "^4.60.1",
-    "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
     "vona-core": "^5.1.50",

package/templates/app/register.js

@@ -1,4 +1,4 @@
 import { register } from 'node:module';
 import { pathToFileURL } from 'node:url';
 
-register('ts-node-maintained/esm', pathToFileURL('./'));
+register('@swc-node/register/esm', pathToFileURL('./'));

package/templates/config/_tsconfig_project.json

@@ -12,8 +12,5 @@
     "src/backend/typing"
   ],
   "exclude": [],
-  "ts-node": {
-    "swc": true
-  },
   "references": []
 }

package/templates/config/_tsconfig_source.json

@@ -12,9 +12,6 @@
     "src/backend/typing"
   ],
   "exclude": [],
-  "ts-node": {
-    "swc": true
-  },
   "references": [
     {
       "path": "packages-utils/compose"