vona-cli-set-api 1.0.113 → 1.0.115

package/cli/templates/init/lib/boilerplate/lib/index.ts

@@ -0,0 +1 @@
+export {};

package/cli/templates/init/types/boilerplate/types/index.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { Api, Arg, v } from 'vona-module-a-openapi';

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

@@ -1,9 +1,9 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { ClassMapped } from 'vona';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Create extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Create>()
-export class Dto<%=argv.resourceNameCapitalize%>Create extends ClassMapped.pick(Entity<%=argv.resourceNameCapitalize%>, ['name', 'description']) {}
+export class Dto<%=argv.resourceNameCapitalize%>Create extends $Dto.create(() => Model<%=argv.resourceNameCapitalize%>) {}

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

@@ -1,9 +1,9 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { ClassMapped } from 'vona';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import { Dto<%=argv.resourceNameCapitalize%>Create } from './<%=argv.resourceName%>Create.ts';
+import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Update extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Update>()
-export class Dto<%=argv.resourceNameCapitalize%>Update extends ClassMapped.partial(Dto<%=argv.resourceNameCapitalize%>Create) {}
+export class Dto<%=argv.resourceNameCapitalize%>Update extends $Dto.update(() => Model<%=argv.resourceNameCapitalize%>) {}

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

@@ -1,13 +1,13 @@
-import type { IDecoratorEntityOptions } from 'vona-module-a-database';
-import { Entity, EntityBase } from 'vona-module-a-database';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+import { Entity, EntityBase } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapi';
 import { $locale } from '../.metadata/index.ts';
 
 export interface IEntityOptions<%=argv.resourceNameCapitalize%> extends IDecoratorEntityOptions {}
 
-@Entity<IEntityOptions<%=argv.resourceNameCapitalize%>>('<%=argv.moduleResourceName%>')
+@Entity<IEntityOptions<%=argv.resourceNameCapitalize%>>('<%=argv.moduleResourceName%>', { openapi: { title: $locale('<%=argv.resourceNameCapitalize%>') } })
 export class Entity<%=argv.resourceNameCapitalize%> extends EntityBase {
-  @Api.field(v.openapi({ title: $locale('Name') }), v.min(3))
+  @Api.field(v.openapi({ title: $locale('Name') }), v.default(''), v.min(3))
   name: string;
 
   @Api.field(v.openapi({ title: $locale('Description') }), v.optional())

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

@@ -1,5 +1,8 @@
-import { BeanModelBase, Model } from 'vona-module-a-database';
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+import { BeanModelBase, Model } from 'vona-module-a-orm';
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
 
-@Model({ entity: Entity<%=argv.resourceNameCapitalize%> })
+export interface IModelOptions<%=argv.resourceNameCapitalize%> extends IDecoratorModelOptions<Entity<%=argv.resourceNameCapitalize%>> {}
+
+@Model<IModelOptions<%=argv.resourceNameCapitalize%>>({ entity: Entity<%=argv.resourceNameCapitalize%> })
 export class Model<%=argv.resourceNameCapitalize%> extends BeanModelBase<Entity<%=argv.resourceNameCapitalize%>> {}

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

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
 import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';

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

@@ -8,12 +8,9 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-database\';\n';
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';\n';
 const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';\n';
-const __snippet_update = `...$tableColumns(
-      () => Entity<%=argv.resourceNameCapitalize%>,
-      entity => entity.name,
-    ),`;
+const __snippet_update = '...$tableColumns(() => Entity<%=argv.resourceNameCapitalize%>, \'name\'),';
 
 export default metadataCustomSnippet({
   file: 'src/bean/meta.index.ts',

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

@@ -11,9 +11,10 @@ declare module '@cabloy/cli' {
 const __snippet_update = `if (options.version === <%=argv.fileVersion%>) {
   const entity<%=argv.resourceNameCapitalize%> = this.scope.entity.<%=argv.resourceName%>;
   await this.bean.model.createTable(entity<%=argv.resourceNameCapitalize%>.$table, table => {
+    table.comment(entity<%=argv.resourceNameCapitalize%>.$comment.$table);
     table.basicFields();
-    table.string(entity<%=argv.resourceNameCapitalize%>.name, 50);
-    table.string(entity<%=argv.resourceNameCapitalize%>.description, 255);
+    table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
+    table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
   });
 }`;
 

package/dist/lib/bean/cli.init.lib.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitLib extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.lib.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitLib extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // 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}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const mainFile = path.join(targetDir, 'src/lib/index.ts');
+        if (fse.existsSync(mainFile)) {
+            throw new Error(`lib exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/lib/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

package/dist/lib/bean/cli.init.types.d.ts

@@ -0,0 +1,8 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+    }
+}
+export declare class CliInitTypes extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.types.js

@@ -0,0 +1,36 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+import { __ThisSetName__ } from "../this.js";
+export class CliInitTypes extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // 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}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        const mainFile = path.join(targetDir, 'src/types/index.ts');
+        if (fse.existsSync(mainFile)) {
+            throw new Error(`types exists: ${moduleName}`);
+        }
+        // render boilerplate
+        await this.template.renderBoilerplateAndSnippets({
+            targetDir: path.join(targetDir, 'src'),
+            setName: __ThisSetName__,
+            snippetsPath: null,
+            boilerplatePath: 'init/types/boilerplate',
+        });
+        // tools.metadata
+        await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });
+    }
+}

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

@@ -8,6 +8,7 @@ export declare class CliToolsMetadata extends BeanCliBase {
     execute(): Promise<void>;
     _generateMetadata(moduleName: string, force: boolean): Promise<void>;
     _generatePatch(content: string): string;
+    _generatePatch_resources(content: string, packageName: string, resources: string[], type: boolean): string;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
     _generateIndex(modulePath: string): Promise<void>;
 }

package/dist/lib/bean/cli.tools.metadata.js

@@ -4,7 +4,6 @@ import { getOnionMetasMeta, getOnionScenesMeta } from '@cabloy/module-info';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import { generateBeanGenerals } from "./toolsMetadata/generateBeanGenerals.js";
-import { generateBeans } from "./toolsMetadata/generateBeans.js";
 import { generateConfig, generateConstant, generateError, generateLocale } from "./toolsMetadata/generateConfig.js";
 import { generateMetadataCustom } from "./toolsMetadata/generateMetadataCustom.js";
 import { generateMain, generateMonkey } from "./toolsMetadata/generateMonkey.js";
@@ -55,8 +54,6 @@ export class CliToolsMetadata extends BeanCliBase {
         const onionScenesMeta = getOnionScenesMeta(this.modulesMeta.modules);
         // content
         let content = '';
-        // beans
-        content += await generateBeans(onionScenesMeta, moduleName, modulePath);
         // onions
         const scopeResources = {};
         for (const sceneName in onionScenesMeta) {
@@ -137,17 +134,29 @@ export class CliToolsMetadata extends BeanCliBase {
     _generatePatch(content) {
         if (!content)
             return content;
-        if (content.includes('TypeEntityOptionsFields')) {
-            content = `import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';\n${content}`;
-        }
-        if (content.includes('TypeControllerOptionsActions')) {
-            content = `import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';\n${content}`;
-        }
-        if (content.includes('TypeEntityMeta')) {
-            content = `import type { TypeEntityMeta } from 'vona-module-a-database';\n${content}`;
-        }
+        content = this._generatePatch_resources(content, 'vona-module-a-openapi', ['TypeEntityOptionsFields', 'TypeControllerOptionsActions'], true);
+        content = this._generatePatch_resources(content, 'vona-module-a-orm', [
+            'TypeEntityMeta',
+            'TypeModelsClassLikeGeneral',
+            'TypeSymbolKeyFieldsMore',
+            'IModelRelationHasOne',
+            'IModelRelationBelongsTo',
+            'IModelRelationHasMany',
+            'IModelRelationBelongsToMany',
+        ], true);
+        content = this._generatePatch_resources(content, 'vona', ['PowerPartial'], true);
         return content;
     }
+    _generatePatch_resources(content, packageName, resources, type) {
+        const items = resources.filter(item => {
+            const regexp = new RegExp(`${item}[\\[\\]<,;?:\\s]`);
+            return !!regexp.exec(content);
+        });
+        if (items.length === 0)
+            return content;
+        const importContent = `import ${type ? 'type ' : ''}{ ${items.join(',')} } from '${packageName}';`;
+        return `${importContent}\n${content}`;
+    }
     async _generateThis(moduleName, relativeNameCapitalize, modulePath) {
         const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
         if (fse.existsSync(thisDest))
@@ -159,19 +168,33 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
         await fse.writeFile(thisDest, content);
     }
     async _generateIndex(modulePath) {
-        const jsExport = "export * from './.metadata/index.ts';";
+        let jsContent = '';
         const jsFile = path.join(modulePath, 'src/index.ts');
-        let jsContent;
         if (fse.existsSync(jsFile)) {
             jsContent = (await fse.readFile(jsFile)).toString();
-            if (jsContent.includes(jsExport))
-                return;
-            jsContent = `${jsExport}\n${jsContent}`;
-            jsContent = jsContent.replace('export {};\n', '');
         }
-        else {
-            jsContent = `${jsExport}\n`;
+        // jsTypes
+        const jsTypes = "export * from './types/index.ts';";
+        const jsTypesFile = path.join(modulePath, 'src/types/index.ts');
+        if (fse.existsSync(jsTypesFile) && !jsContent.includes(jsTypes)) {
+            jsContent = `${jsTypes}\n${jsContent}`;
+        }
+        // jsLib
+        const jsLib = "export * from './lib/index.ts';";
+        const jsLibFile = path.join(modulePath, 'src/lib/index.ts');
+        if (fse.existsSync(jsLibFile) && !jsContent.includes(jsLib)) {
+            jsContent = `${jsLib}\n${jsContent}`;
+        }
+        // jsMetadata
+        const jsMetadata = "export * from './.metadata/index.ts';";
+        const jsMetadataFile = path.join(modulePath, 'src/.metadata/index.ts');
+        if (fse.existsSync(jsMetadataFile) && !jsContent.includes(jsMetadata)) {
+            jsContent = `${jsMetadata}\n${jsContent}`;
         }
+        // trim empty
+        jsContent = jsContent.replace('export {};\n', '');
+        // write
         await fse.writeFile(jsFile, jsContent);
+        await this.helper.formatFile({ fileName: jsFile, logPrefix: 'format: ' });
     }
 }

package/dist/lib/bean/toolsMetadata/generateOnions.js

@@ -1,5 +1,6 @@
 import { replaceTemplate } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+import { beanFullNameFromOnionName } from 'vona-core';
 import { extractBeanInfo, getScopeModuleName, globBeanFiles } from "./utils.js";
 export async function generateOnions(sceneName, sceneMeta, moduleName, modulePath) {
     const scopeModuleName = getScopeModuleName(moduleName);
@@ -15,7 +16,8 @@ export async function generateOnions(sceneName, sceneMeta, moduleName, modulePat
     const contentRecordsLocal = [];
     let needImportOptionsGlobalInterface;
     for (const globFile of globFiles) {
-        const { fileContent, fileNameJSRelative, className, beanNameFull, isIgnore, isVirtual } = globFile;
+        const { fileContent, fileNameJSRelative, sceneName, className, beanNameFull, isIgnore, isVirtual } = globFile;
+        const isBeanGlobal = fileNameJSRelative.includes('../bean/bean.');
         contentExports.push(`export * from '${fileNameJSRelative}';`);
         if (isIgnore)
             continue; // get scope() also can be ignored
@@ -26,6 +28,13 @@ export async function generateOnions(sceneName, sceneMeta, moduleName, modulePat
           /** @internal */
           get scope(): ${scopeModuleName};
         }`);
+            if (!isBeanGlobal) {
+                contentScopes.push(`
+          export interface ${className} {
+            get $beanFullName(): '${beanFullNameFromOnionName(beanNameFull, sceneName)}';
+            get $onionName(): '${beanNameFull}';
+          }`);
+            }
         }
         if (sceneMeta.optionsNone)
             continue;

package/dist/lib/bean/toolsMetadata/utils.js

@@ -39,6 +39,7 @@ export async function globBeanFiles(sceneName, sceneMeta, moduleName, modulePath
         const className = (sceneMeta.sceneIsolate ? sceneNameCapitalize : '') + parts.map(item => toUpperCaseFirstChar(item)).join('');
         const beanName = parts[parts.length - 1];
         const beanNameFull = `${moduleName}:${beanName}`;
+        const beanNameCapitalize = toUpperCaseFirstChar(beanName);
         const fileContent = isIgnore ? '' : fse.readFileSync(filePath).toString();
         const isVirtual = fileContent.includes('@Virtual()');
         result.push({
@@ -52,6 +53,7 @@ export async function globBeanFiles(sceneName, sceneMeta, moduleName, modulePath
             className,
             beanName,
             beanNameFull,
+            beanNameCapitalize,
             isIgnore,
             isVirtual,
         });

package/dist/lib/beans.d.ts

@@ -14,10 +14,12 @@ import { CliDefaultList } from './bean/cli.default.list.ts';
 import { CliInitConfig } from './bean/cli.init.config.ts';
 import { CliInitConstant } from './bean/cli.init.constant.ts';
 import { CliInitError } from './bean/cli.init.error.ts';
+import { CliInitLib } from './bean/cli.init.lib.ts';
 import { CliInitLocale } from './bean/cli.init.locale.ts';
 import { CliInitMain } from './bean/cli.init.main.ts';
 import { CliInitMonkey } from './bean/cli.init.monkey.ts';
 import { CliInitStatic } from './bean/cli.init.static.ts';
+import { CliInitTypes } from './bean/cli.init.types.ts';
 import { CliToolsCrud } from './bean/cli.tools.crud.ts';
 import { CliToolsDeps } from './bean/cli.tools.deps.ts';
 import { CliToolsMetadata } from './bean/cli.tools.metadata.ts';
@@ -42,6 +44,8 @@ export declare const beans: {
     'init.monkey': typeof CliInitMonkey;
     'init.main': typeof CliInitMain;
     'init.static': typeof CliInitStatic;
+    'init.lib': typeof CliInitLib;
+    'init.types': typeof CliInitTypes;
     'tools.deps': typeof CliToolsDeps;
     'tools.metadata': typeof CliToolsMetadata;
     'tools.crud': typeof CliToolsCrud;

package/dist/lib/beans.js

@@ -14,10 +14,12 @@ import { CliDefaultList } from "./bean/cli.default.list.js";
 import { CliInitConfig } from "./bean/cli.init.config.js";
 import { CliInitConstant } from "./bean/cli.init.constant.js";
 import { CliInitError } from "./bean/cli.init.error.js";
+import { CliInitLib } from "./bean/cli.init.lib.js";
 import { CliInitLocale } from "./bean/cli.init.locale.js";
 import { CliInitMain } from "./bean/cli.init.main.js";
 import { CliInitMonkey } from "./bean/cli.init.monkey.js";
 import { CliInitStatic } from "./bean/cli.init.static.js";
+import { CliInitTypes } from "./bean/cli.init.types.js";
 import { CliToolsCrud } from "./bean/cli.tools.crud.js";
 import { CliToolsDeps } from "./bean/cli.tools.deps.js";
 import { CliToolsMetadata } from "./bean/cli.tools.metadata.js";
@@ -42,6 +44,8 @@ export const beans = {
     'init.monkey': CliInitMonkey,
     'init.main': CliInitMain,
     'init.static': CliInitStatic,
+    'init.lib': CliInitLib,
+    'init.types': CliInitTypes,
     'tools.deps': CliToolsDeps,
     'tools.metadata': CliToolsMetadata,
     'tools.crud': CliToolsCrud,

package/dist/lib/command/init.lib.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    bean: string;
+    info: {
+        version: string;
+        title: string;
+        usage: string;
+    };
+};
+export default _default;

package/dist/lib/command/init.lib.js

@@ -0,0 +1,10 @@
+export default {
+    bean: 'init.lib',
+    info: {
+        version: '5.0.0',
+        title: 'Cli: Init: Lib',
+        usage: 'vona :init:lib module',
+    },
+    // options: null,
+    // groups: null,
+};

package/dist/lib/command/init.types.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    bean: string;
+    info: {
+        version: string;
+        title: string;
+        usage: string;
+    };
+};
+export default _default;

package/dist/lib/command/init.types.js

@@ -0,0 +1,10 @@
+export default {
+    bean: 'init.types',
+    info: {
+        version: '5.0.0',
+        title: 'Cli: Init: Types',
+        usage: 'vona :init:types module',
+    },
+    // options: null,
+    // groups: null,
+};

package/dist/lib/commands.d.ts

@@ -391,6 +391,22 @@ export declare const commands: {
                 usage: string;
             };
         };
+        lib: {
+            bean: string;
+            info: {
+                version: string;
+                title: string;
+                usage: string;
+            };
+        };
+        types: {
+            bean: string;
+            info: {
+                version: string;
+                title: string;
+                usage: string;
+            };
+        };
     };
     refactor: {};
     tools: {

package/dist/lib/commands.js

@@ -14,10 +14,12 @@ import defaultList from "./command/default.list.js";
 import initConfig from "./command/init.config.js";
 import initConstant from "./command/init.constant.js";
 import initError from "./command/init.error.js";
+import initLib from "./command/init.lib.js";
 import initLocale from "./command/init.locale.js";
 import initMain from "./command/init.main.js";
 import initMonkey from "./command/init.monkey.js";
 import initStatic from "./command/init.static.js";
+import initTypes from "./command/init.types.js";
 import toolsCrud from "./command/tools.crud.js";
 import toolsDeps from "./command/tools.deps.js";
 import toolsMetadata from "./command/tools.metadata.js";
@@ -49,6 +51,8 @@ export const commands = {
         monkey: initMonkey,
         main: initMain,
         static: initStatic,
+        lib: initLib,
+        types: initTypes,
     },
     refactor: {},
     tools: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.113",
+  "version": "1.0.115",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,11 +31,11 @@
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-class-properties": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@cabloy/cli": "^3.0.40",
+    "@cabloy/cli": "^3.0.41",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
-    "@cabloy/module-glob": "^5.2.22",
-    "@cabloy/module-info": "^1.3.24",
+    "@cabloy/module-glob": "^5.2.23",
+    "@cabloy/module-info": "^1.3.25",
     "@cabloy/word-utils": "^2.0.1",
     "@lcov-viewer/cli": "^1.3.0",
     "@rollup/plugin-alias": "^5.1.1",
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.37",
+    "vona-core": "^5.0.38",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },

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

@@ -1,14 +0,0 @@
-import type { IDecoratorEntityOptions, TableIdentity } from 'vona-module-a-database';
-import { Entity, EntityBase } from 'vona-module-a-database';
-import { Api, v } from 'vona-module-a-openapi';
-
-export interface IEntityOptionsUserRole extends IDecoratorEntityOptions {}
-
-@Entity<IEntityOptionsUserRole>('homeUserRole')
-export class EntityUserRole extends EntityBase {
-  @Api.field(v.tableIdentity())
-  userId: TableIdentity;
-
-  @Api.field(v.tableIdentity())
-  roleId: TableIdentity;
-}

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

@@ -1,5 +0,0 @@
-import { BeanModelBase, Model } from 'vona-module-a-database';
-import { EntityUserRole } from '../entity/userRole.ts';
-
-@Model({ entity: EntityUserRole })
-export class ModelUserRole extends BeanModelBase<EntityUserRole> {}

package/dist/lib/bean/toolsMetadata/generateBeans.d.ts

@@ -1,2 +0,0 @@
-import type { OnionScenesMeta } from '@cabloy/module-info';
-export declare function generateBeans(onionScenesMeta: OnionScenesMeta, moduleName: string, modulePath: string): Promise<string>;

package/dist/lib/bean/toolsMetadata/generateBeans.js

@@ -1,72 +0,0 @@
-import path from 'node:path';
-import { toUpperCaseFirstChar } from '@cabloy/word-utils';
-import { globby } from 'globby';
-import { checkIgnoreOfParts, getScopeModuleName } from "./utils.js";
-// todo: remove
-export async function generateBeans(onionScenesMeta, moduleName, modulePath) {
-    const scopeModuleName = getScopeModuleName(moduleName);
-    // ignore
-    const ignore = Object.keys(onionScenesMeta).map(item => `**/${item}.*.ts`);
-    // files
-    const files = await globby('src/bean/*.ts', { ignore, cwd: modulePath });
-    if (files.length === 0)
-        return '';
-    files.sort();
-    const contentExports = [];
-    const contentScopes = [];
-    const contentImports = [];
-    const contentRecordsGlobal = [];
-    const contentRecordsGeneral = [];
-    for (const file of files) {
-        const fileName = path.basename(file);
-        if (fileName.startsWith('_'))
-            continue;
-        const parts = fileName.split('.').slice(0, -1);
-        if (parts.length < 2)
-            continue;
-        const isIgnore = checkIgnoreOfParts(parts);
-        const isBeanGlobal = parts[0] === 'bean';
-        // const sceneName = parts.slice(0, -1).join('.');
-        // const beanName = parts[parts.length - 1];
-        // const beanNameCapitalize = toUpperCaseFirstChar(beanName);
-        const fileNameJS = fileName; // fileName.replace('.ts', '.js');
-        const className = parts.map(item => toUpperCaseFirstChar(item)).join('');
-        const beanFullName = isBeanGlobal ? parts[1] : `${moduleName}.${parts.join('.')}`;
-        contentExports.push(`export * from '../bean/${fileNameJS}';`);
-        // ignore virtual
-        contentScopes.push(`
-        export interface ${className} {
-          /** @internal */
-          get scope(): ${scopeModuleName};
-        }`);
-        if (isBeanGlobal || !isIgnore) {
-            contentImports.push(`import type { ${className} } from '../bean/${fileNameJS}';`);
-        }
-        if (isBeanGlobal && !isIgnore) {
-            contentRecordsGlobal.push(`'${beanFullName}': ${className};`);
-        }
-        if ((isBeanGlobal && isIgnore) || (!isBeanGlobal && !isIgnore)) {
-            contentRecordsGeneral.push(`'${beanFullName}': ${className};`);
-        }
-    }
-    // combine
-    const content = `/** beans: begin */
-${contentExports.join('\n')}
-${contentImports.join('\n')}
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    ${contentRecordsGlobal.join('\n')}
-  }
-
-  export interface IBeanRecordGeneral {
-    ${contentRecordsGeneral.join('\n')}
-  }
-}
-declare module 'vona-module-${moduleName}' {
-  ${contentScopes.join('\n')} 
-}
-/** beans: end */
-`;
-    return content;
-}