vona-cli-set-api 1.0.432 → 1.0.436

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.244"
+    "vona": "^5.0.246"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-index",
   "type": "module",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "title": "home-index",
   "vonaModule": {
     "dependencies": {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/.metadata/locales.ts

@@ -1,4 +1,5 @@
 import type { TypeLocaleBase } from 'vona';
+import { $makeLocaleMagic } from 'vona';
 import locale_en_us from '../config/locale/en-us.ts';
 import locale_zh_cn from '../config/locale/zh-cn.ts';
 
@@ -7,6 +8,6 @@ export const locales = {
   'zh-cn': locale_zh_cn,
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-index::${K}` {
-  return `home-index::${key}`;
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K) {
+  return $makeLocaleMagic(`home-index::${key}`);
 }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-user",
   "type": "module",
-  "version": "5.0.22",
+  "version": "5.0.24",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/index.ts

@@ -43,9 +43,9 @@ export type EntityRoleUserMeta=TypeEntityMeta<EntityRoleUser,EntityRoleUserTable
 export type EntityUserMeta=TypeEntityMeta<EntityUser,EntityUserTableName>;
 declare module 'vona-module-a-orm' {
   export interface ITableRecord {
-    'homeRole': never;
-'homeRoleUser': never;
-'homeUser': never;
+    'homeRole': EntityRoleMeta;
+'homeRoleUser': EntityRoleUserMeta;
+'homeUser': EntityUserMeta;
   }
 }
 declare module 'vona-module-home-user' {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/locales.ts

@@ -1,4 +1,5 @@
 import type { TypeLocaleBase } from 'vona';
+import { $makeLocaleMagic } from 'vona';
 import locale_en_us from '../config/locale/en-us.ts';
 import locale_zh_cn from '../config/locale/zh-cn.ts';
 
@@ -7,6 +8,6 @@ export const locales = {
   'zh-cn': locale_zh_cn,
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-user::${K}` {
-  return `home-user::${key}`;
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K) {
+  return $makeLocaleMagic(`home-user::${key}`);
 }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.index.ts

@@ -1,16 +1,13 @@
 import type { IMetaOptionsIndex } from 'vona-module-a-index';
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
-import { $tableColumns } from 'vona-module-a-orm';
-import { EntityRole } from '../entity/role.ts';
-import { EntityRoleUser } from '../entity/roleUser.ts';
-import { EntityUser } from '../entity/user.ts';
+import { $tableColumns } from 'vona-module-a-ormutils';
 
 @Meta<IMetaOptionsIndex>({
   indexes: {
-    ...$tableColumns(() => EntityUser, 'name'),
-    ...$tableColumns(() => EntityRole, 'name'),
-    ...$tableColumns(() => EntityRoleUser, ['userId', 'roleId']),
+    ...$tableColumns('homeUser', 'name'),
+    ...$tableColumns('homeRole', 'name'),
+    ...$tableColumns('homeRoleUser', ['userId', 'roleId']),
   },
 })
 export class MetaIndex extends BeanBase {}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-suite-a-home",
   "type": "module",
-  "version": "5.0.26",
+  "version": "5.0.28",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/cli/templates/tools/crud/boilerplate/src/dto/{{resourceName}}Query.ts_

@@ -1,13 +1,13 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
-import { $Dto, $tableName } from 'vona-module-a-orm';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Query extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Query>({
-  openapi: { filter: { table: $tableName(Entity<%=argv.resourceNameCapitalize%>) } },
+  openapi: { filter: { table: '<%=argv.moduleResourceName%>' } },
 })
 export class Dto<%=argv.resourceNameCapitalize%>Query extends $Dto.queryPage(Entity<%=argv.resourceNameCapitalize%>, ['name']) {
   @Api.field(v.optional())

package/cli/templates/tools/crud/snippets/2-meta.index.ts

@@ -8,9 +8,8 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';';
-const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';';
-const __snippet_update = '...$tableColumns(() => Entity<%=argv.resourceNameCapitalize%>, \'name\'),';
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-ormutils\';';
+const __snippet_update = '...$tableColumns(\'<%=argv.moduleResourceName%>\', \'name\'),';
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.index.ts',
@@ -35,11 +34,8 @@ export default metadataCustomSnippet({
       const code = await cli.template.renderContent({ content: __snippet_import1 });
       ast = ast.replace('import { Meta } from \'vona-module-a-meta\';', `import { Meta } from 'vona-module-a-meta';\n${code}`);
     }
-    // import2
-    let code = await cli.template.renderContent({ content: __snippet_import2 });
-    ast = ast.replace('import { $tableColumns } from \'vona-module-a-orm\';', `import { $tableColumns } from 'vona-module-a-orm';\n${code}`);
     // update
-    code = await cli.template.renderContent({ content: __snippet_update });
+    const code = await cli.template.renderContent({ content: __snippet_update });
     if (ast.includes('indexes: {}')) {
       ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
     } else {

package/dist/index.js

@@ -2186,14 +2186,15 @@ async function generateLocale1(modulePath, moduleName) {
   }
   // combine
   const content = `import type { TypeLocaleBase } from 'vona';
+import { $makeLocaleMagic } from 'vona';
 ${contentImports.join('\n')}
 
 export const locales = {
 ${contentLocales.join('\n')}
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): \`${moduleName}::\${K}\` {
-  return \`${moduleName}::\${key}\`;
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K) {
+  return $makeLocaleMagic(\`${moduleName}::\${key}\`);
 }
 `;
   return content;

package/dist-cli/templates/tools/crud/snippets/2-meta.index.js

@@ -1,9 +1,8 @@
 import fs from 'node:fs';
 import { metadataCustomSnippet } from '@cabloy/cli';
 import { catchError } from '@cabloy/utils';
-const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';';
-const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';';
-const __snippet_update = '...$tableColumns(() => Entity<%=argv.resourceNameCapitalize%>, \'name\'),';
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-ormutils\';';
+const __snippet_update = '...$tableColumns(\'<%=argv.moduleResourceName%>\', \'name\'),';
 export default metadataCustomSnippet({
     file: 'src/bean/meta.index.ts',
     language: 'plain',
@@ -27,11 +26,8 @@ export default metadataCustomSnippet({
             const code = await cli.template.renderContent({ content: __snippet_import1 });
             ast = ast.replace('import { Meta } from \'vona-module-a-meta\';', `import { Meta } from 'vona-module-a-meta';\n${code}`);
         }
-        // import2
-        let code = await cli.template.renderContent({ content: __snippet_import2 });
-        ast = ast.replace('import { $tableColumns } from \'vona-module-a-orm\';', `import { $tableColumns } from 'vona-module-a-orm';\n${code}`);
         // update
-        code = await cli.template.renderContent({ content: __snippet_update });
+        const code = await cli.template.renderContent({ content: __snippet_update });
         if (ast.includes('indexes: {}')) {
             ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.432",
+  "version": "1.0.436",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -64,7 +64,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.107",
+    "vona-core": "^5.0.109",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   },