vona-cli-set-api 1.1.129 → 1.1.131

package/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoBaseName%>.tsx_

@@ -4,7 +4,7 @@ import { $makeMetadata } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> extends IDecoratorDtoOptions {}
 

package/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoMutateName%>.tsx_

@@ -3,14 +3,14 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%> extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%>>({
-  blocks: [ZovaRender.block('basic-details:blockForm')],
+  blocks: [ZovaRender.block('<%=argv.detailsModuleName%>:blockForm')],
 })
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%> extends $Dto.mutate(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,

package/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoResItemName%>.tsx_

@@ -4,7 +4,7 @@ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { $locale } from '../.metadata/locales.ts';
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
@@ -13,23 +13,23 @@ export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoRes
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%>>({
   blocks: [
-    ZovaRender.block('basic-details:blockDetails', {
+    ZovaRender.block('<%=argv.detailsModuleName%>:blockDetails', {
       blocks: [
-        ZovaRender.block('basic-details:blockToolbarBulk', {
+        ZovaRender.block('<%=argv.detailsModuleName%>:blockToolbarBulk', {
           actions: [
-            ZovaRender.detailsActionBulk('basic-details:actionCreate', {
+            ZovaRender.detailsActionBulk('<%=argv.detailsModuleName%>:actionCreate', {
               dialogOptions: { title: $locale('Add<%=argv.detailDialogTitleCapitalize%>') },
               permission: { formScene: ['create', 'edit'] },
             }),
           ],
         }),
-        ZovaRender.block('basic-details:blockTable'),
+        ZovaRender.block('<%=argv.detailsModuleName%>:blockTable'),
       ],
     }),
   ],
   fields: {
     name: $makeMetadata(
-      ZovaRender.cell('basic-details:actionView', {
+      ZovaRender.cell('<%=argv.detailsModuleName%>:actionView', {
         dialogOptions: { title: $locale('View<%=argv.detailDialogTitleCapitalize%>') },
       }),
     ),
@@ -38,19 +38,19 @@ export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoRes
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,
 }) {
-  @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('basic-details:lineNumber'))
+  @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('<%=argv.detailsModuleName%>:lineNumber'))
   _lineNumber?: number;
 
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
-    ZovaRender.cell('basic-details:actionOperationsRow', {
+    ZovaRender.cell('<%=argv.detailsModuleName%>:actionOperationsRow', {
       actions: [
-        ZovaRender.detailsActionRow('basic-details:actionUpdate', {
+        ZovaRender.detailsActionRow('<%=argv.detailsModuleName%>:actionUpdate', {
           dialogOptions: { title: $locale('Edit<%=argv.detailDialogTitleCapitalize%>') },
           permission: { formScene: ['create', 'edit'] },
         }),
-        ZovaRender.detailsActionRow('basic-details:actionDelete', {
+        ZovaRender.detailsActionRow('<%=argv.detailsModuleName%>:actionDelete', {
           permission: { formScene: ['create', 'edit'] },
         }),
       ],

package/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoViewName%>.tsx_

@@ -3,14 +3,14 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%> extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%>>({
-  blocks: [ZovaRender.block('basic-details:blockForm')],
+  blocks: [ZovaRender.block('<%=argv.detailsModuleName%>:blockForm')],
 })
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,

package/dist/index.js

@@ -2055,6 +2055,10 @@ class CliToolsMasterDetail extends BeanCliBase {
     argv.detailDtoResItemName = `detail${argv.detailResourceNameCapitalize}ResItem`;
     argv.detailFieldPrivateName = `_${argv.relationName}`;
     argv.detailDialogTitleCapitalize = argv.detailModuleCapitalize;
+    const editionName = fs.existsSync(path.join(argv.projectPath, '__CABLOY_START__')) ? 'start' : 'basic';
+    argv.restAdminNpm = `zova-rest-cabloy-${editionName}-admin`;
+    argv.detailsModuleName = `${editionName}-details`;
+    argv.detailCrudCommand = `:tools:crud${this._capitalize(editionName)}`;
   }
   async _ensureDetailModule() {
     const {
@@ -2339,7 +2343,7 @@ class CliToolsMasterDetail extends BeanCliBase {
       content = this._replaceStrict(content, "import { $Dto } from 'vona-module-a-orm';", "import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';\nimport { $Dto } from 'vona-module-a-orm';", fileName);
     }
     if (!content.includes("import { $locale } from '../.metadata/locales.ts';")) {
-      content = this._replaceStrict(content, "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n", "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n\nimport { $locale } from '../.metadata/locales.ts';\n", fileName);
+      content = this._replaceStrict(content, `import { ZovaRender } from '${argv.restAdminNpm}';\n`, `import { ZovaRender } from '${argv.restAdminNpm}';\n\nimport { $locale } from '../.metadata/locales.ts';\n`, fileName);
     }
     const importMarker = `import { Model${argv.resourceNameCapitalize} } from '../model/${argv.resourceName}.ts';\n`;
     if (!content.includes(`import { Dto${detailDtoClassCapitalize} } from './`)) {
@@ -2375,7 +2379,7 @@ class CliToolsMasterDetail extends BeanCliBase {
     const {
       argv
     } = this.context;
-    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('basic-details:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
+    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('${argv.detailsModuleName}:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
   }
   _masterDtoClassReplaceSource(scene) {
     const {
@@ -2410,7 +2414,7 @@ class CliToolsMasterDetail extends BeanCliBase {
     const {
       argv
     } = this.context;
-    await this.helper.invokeCli([':tools:crudBasic', argv.detailResourceName, `--module=${argv.detailModule}`, '--nometadata'], {
+    await this.helper.invokeCli([argv.detailCrudCommand, argv.detailResourceName, `--module=${argv.detailModule}`, '--nometadata'], {
       cwd: argv.projectPath
     });
   }

package/dist/lib/bean/cli.tools.masterDetail.d.ts

@@ -27,6 +27,9 @@ declare module '@cabloy/cli' {
         detailDialogTitleCapitalize: string;
         createdDetailModule?: boolean;
         createdDetailResource?: boolean;
+        restAdminNpm: string;
+        detailsModuleName: string;
+        detailCrudCommand: string;
     }
 }
 export declare class CliToolsMasterDetail extends BeanCliBase {

package/dist-toolsIsolate/test.js

@@ -5,6 +5,7 @@ import { globby } from 'globby';
 import { createWriteStream } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { pipeline } from 'node:stream/promises';
 import { run } from 'node:test';
 import { lcov, spec } from 'node:test/reporters';
 import { fileURLToPath } from 'node:url';
@@ -100,19 +101,24 @@ async function testRun(projectPath, coverage, patterns) {
             }
         });
         const summaryPromise = waitForTestSummary(testStream);
-        if (coverage) {
-            const reporterDir = path.join(projectPath, 'coverage');
-            fse.ensureDirSync(reporterDir);
-            const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
-            testStream.compose(lcov).pipe(reporterLcov);
-        }
-        else {
-            testStream.compose(spec).pipe(process.stdout);
-        }
-        const summarySuccess = await summaryPromise;
+        const reporterPromise = coverage
+            ? (() => {
+                const reporterDir = path.join(projectPath, 'coverage');
+                fse.ensureDirSync(reporterDir);
+                const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
+                return pipeline(testStream.compose(lcov), reporterLcov);
+            })()
+            : pipeline(testStream.compose(spec), process.stdout, { end: false });
+        const [summarySuccess, [, reporterError]] = await Promise.all([
+            summaryPromise,
+            catchError(() => reporterPromise),
+        ]);
         if (!summarySuccess) {
             throw new Error('node:test reported failed tests');
         }
+        if (reporterError) {
+            throw reporterError;
+        }
     }
     catch (error) {
         testError = error;
@@ -139,15 +145,19 @@ function waitForTestSummary(testStream) {
 }
 async function prepareConcurrency(app) {
     // check
+    const configured = process.env.TEST_CONCURRENCY;
     let concurrency = 1;
-    if (process.env.TEST_CONCURRENCY === 'true') {
-        concurrency = os.cpus().length;
-    }
-    else if (process.env.TEST_CONCURRENCY === 'false') {
+    if (configured === 'false') {
         concurrency = 1;
     }
+    else if (configured === undefined || configured === 'true') {
+        concurrency = Math.max(1, os.cpus().length);
+    }
     else {
-        concurrency = Number.parseInt(process.env.TEST_CONCURRENCY);
+        concurrency = Number.parseInt(configured, 10);
+        if (!Number.isSafeInteger(concurrency) || concurrency < 1) {
+            throw new Error(`TEST_CONCURRENCY must be true, false, or a positive integer; received ${configured}`);
+        }
     }
     if (concurrency === 1)
         return concurrency;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.129",
-  "gitHead": "cd41414765dfc186953f59e31d654ecb8ab2ed41",
+  "version": "1.1.131",
+  "gitHead": "fac7768bb7db22ff0180dc59d711efba5b853ae7",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -73,7 +73,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
-    "vona-core": "^5.1.32",
+    "vona-core": "^5.1.34",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   }