cabloy 5.1.64 → 5.1.66

package/vona/packages-cli/cabloy-cli/src/lib/local.helper.ts

@@ -149,11 +149,30 @@ export class LocalHelper {
     return moduleInfo;
   }
 
+  parseModuleInfoCanonical(moduleName, moduleRole = 'module') {
+    const moduleInfo = this.parseModuleInfo(moduleName);
+    if (moduleInfo.relativeName !== moduleName) {
+      throw new Error(
+        `${moduleRole} name must use the canonical relative module name: ${moduleInfo.relativeName}. Received: ${moduleName}. Use names like training-student, not package names or extra-suffixed names.`,
+      );
+    }
+    return moduleInfo;
+  }
+
   findModule(moduleName) {
     const moduleInfo = this.parseModuleInfo(moduleName);
     return this.cli.modulesMeta.modules[moduleInfo.relativeName];
   }
 
+  findModuleCanonical(moduleName, moduleRole = 'module') {
+    const moduleInfo = this.parseModuleInfoCanonical(moduleName, moduleRole);
+    const module = this.cli.modulesMeta.modules[moduleInfo.relativeName];
+    if (!module) {
+      throw new Error(`${moduleRole} does not exist: ${moduleName}`);
+    }
+    return module;
+  }
+
   parseSuiteInfo(suiteName) {
     const suiteInfo = ModuleInfo.parseInfoPro(
       suiteName,
@@ -164,11 +183,30 @@ export class LocalHelper {
     return suiteInfo;
   }
 
+  parseSuiteInfoCanonical(suiteName, suiteRole = 'suite') {
+    const suiteInfo = this.parseSuiteInfo(suiteName);
+    if (suiteInfo.relativeName !== suiteName) {
+      throw new Error(
+        `${suiteRole} name must use the canonical relative suite name: ${suiteInfo.relativeName}. Received: ${suiteName}. Use names like a-training, not package names or extra-suffixed names.`,
+      );
+    }
+    return suiteInfo;
+  }
+
   findSuite(suiteName) {
     const suiteInfo = this.parseSuiteInfo(suiteName);
     return this.cli.modulesMeta.suites[suiteInfo.relativeName];
   }
 
+  findSuiteCanonical(suiteName, suiteRole = 'suite') {
+    const suiteInfo = this.parseSuiteInfoCanonical(suiteName, suiteRole);
+    const suite = this.cli.modulesMeta.suites[suiteInfo.relativeName];
+    if (!suite) {
+      throw new Error(`${suiteRole} does not exist: ${suiteName}`);
+    }
+    return suite;
+  }
+
   async ensureDir(dir) {
     await fse.ensureDir(dir);
     return dir;

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.112",
+  "version": "1.1.116",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoBaseName%>.tsx_

@@ -0,0 +1,18 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+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';
+
+export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>>({
+  fields: {
+    id: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
+export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
+  columns: ['id', 'deleted', 'name', 'description'],
+}) {}

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoMutateName%>.tsx_

@@ -0,0 +1,17 @@
+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 { 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')],
+})
+export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%> extends $Dto.mutate(() => Model<%=argv.detailResourceNameCapitalize%>, {
+  dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,
+}) {}

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoResItemName%>.tsx_

@@ -0,0 +1,60 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+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 { $locale } from '../.metadata/locales.ts';
+import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
+
+export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%> extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%>>({
+  blocks: [
+    ZovaRender.block('basic-details:blockDetails', {
+      blocks: [
+        ZovaRender.block('basic-details:blockToolbarBulk', {
+          actions: [
+            ZovaRender.detailsActionBulk('basic-details:actionCreate', {
+              dialogOptions: { title: $locale('Add<%=argv.detailDialogTitleCapitalize%>') },
+              permission: { formScene: ['create', 'edit'] },
+            }),
+          ],
+        }),
+        ZovaRender.block('basic-details:blockTable'),
+      ],
+    }),
+  ],
+  fields: {
+    name: $makeMetadata(
+      ZovaRender.cell('basic-details:actionView', {
+        dialogOptions: { title: $locale('View<%=argv.detailDialogTitleCapitalize%>') },
+      }),
+    ),
+  },
+})
+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'))
+  _lineNumber?: number;
+
+  @Api.field(
+    v.title($locale('Operations')),
+    ZovaRender.order(1, 'max'),
+    ZovaRender.cell('basic-details:actionOperationsRow', {
+      actions: [
+        ZovaRender.detailsActionRow('basic-details:actionUpdate', {
+          dialogOptions: { title: $locale('Edit<%=argv.detailDialogTitleCapitalize%>') },
+          permission: { formScene: ['create', 'edit'] },
+        }),
+        ZovaRender.detailsActionRow('basic-details:actionDelete', {
+          permission: { formScene: ['create', 'edit'] },
+        }),
+      ],
+    }),
+  )
+  _operationsRow?: unknown;
+}

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoViewName%>.tsx_

@@ -0,0 +1,17 @@
+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 { 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')],
+})
+export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
+  dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,
+}) {}

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.110",
+  "version": "1.1.114",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.bean.ts

@@ -60,12 +60,8 @@ export class CliCreateBean extends BeanCliBase {
       : 'zova-rest-cabloy-basic-web';
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // scene name

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.module.ts

@@ -25,12 +25,9 @@ export class CliCreateModule extends BeanCliBase {
     // suite name/info
     const suiteName = argv.suite;
     if (suiteName) {
-      argv.suiteInfo = this.helper.parseSuiteInfo(suiteName);
+      argv.suiteInfo = this.helper.parseSuiteInfoCanonical(suiteName);
       // check if exists
-      argv._suite = this.helper.findSuite(suiteName);
-      if (!argv._suite) {
-        throw new Error(`suite does not exist: ${suiteName}`);
-      }
+      argv._suite = this.helper.findSuiteCanonical(suiteName);
     }
     // nameMeta
     const nameMeta = this.helper.parseNameMeta(argv.name);
@@ -38,7 +35,7 @@ export class CliCreateModule extends BeanCliBase {
     argv.name = nameMeta.short;
     // module name/info
     const moduleName = argv.name;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
     argv.relativeNameCapitalize = this.helper.stringToCapitalize(argv.moduleInfo.relativeName, '-');
     // check if exists
     const _module = this.helper.findModule(moduleName);

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.suite.ts

@@ -24,7 +24,7 @@ export class CliCreateSuite extends BeanCliBase {
     argv.name = nameMeta.short;
     // suite name/info
     const suiteName = argv.name;
-    argv.suiteInfo = this.helper.parseSuiteInfo(suiteName);
+    argv.suiteInfo = this.helper.parseSuiteInfoCanonical(suiteName);
     // check if exists
     const _suite = this.helper.findSuite(suiteName);
     if (_suite) {

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.test.ts

@@ -24,12 +24,8 @@ export class CliCreateTest extends BeanCliBase {
     await super.execute();
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // name

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.asset.ts

@@ -19,12 +19,8 @@ export class CliInitAsset extends BeanCliBase {
     await super.execute();
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // scene

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.config.ts

@@ -16,12 +16,8 @@ export class CliInitConfig extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const configFile = path.join(targetDir, 'src/config/config.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.constant.ts

@@ -16,12 +16,8 @@ export class CliInitConstant extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const constantFile = path.join(targetDir, 'src/config/constants.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.error.ts

@@ -16,12 +16,8 @@ export class CliInitError extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const errorFile = path.join(targetDir, 'src/config/errors.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.lib.ts

@@ -16,12 +16,8 @@ export class CliInitLib extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const mainFile = path.join(targetDir, 'src/lib/index.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.locale.ts

@@ -16,12 +16,8 @@ export class CliInitLocale extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const localeFile = path.join(targetDir, 'src/config/locale');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.main.ts

@@ -16,12 +16,8 @@ export class CliInitMain extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const mainFile = path.join(targetDir, 'src/main.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.monkey.ts

@@ -16,12 +16,8 @@ export class CliInitMonkey extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const monkeyFile = path.join(targetDir, 'src/monkey.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.static.ts

@@ -16,12 +16,8 @@ export class CliInitStatic extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const staticDir = path.join(targetDir, 'assets/static');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.types.ts

@@ -16,12 +16,8 @@ export class CliInitTypes extends BeanCliBase {
     // module name/info
     const moduleName = argv._[0];
     if (!moduleName) return;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     const mainFile = path.join(targetDir, 'src/types/index.ts');

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crud.ts

@@ -34,12 +34,8 @@ export class CliToolsCrud extends BeanCliBase {
       : 'basic-siteadmin:management';
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // resourceName

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudBasic.ts

@@ -25,12 +25,8 @@ export class CliToolsCrudBasic extends BeanCliBase {
     await super.execute();
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // resourceName

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudStart.ts

@@ -25,12 +25,8 @@ export class CliToolsCrudStart extends BeanCliBase {
     await super.execute();
     // module name/info
     const moduleName = argv.module;
-    argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
-    // check if exists
-    const _module = this.helper.findModule(moduleName);
-    if (!_module) {
-      throw new Error(`module does not exist: ${moduleName}`);
-    }
+    argv.moduleInfo = this.helper.parseModuleInfoCanonical(moduleName);
+    const _module = this.helper.findModuleCanonical(moduleName);
     // target dir
     const targetDir = await this.helper.ensureDir(_module.root);
     // resourceName