vona-cli-set-api 1.0.487 → 1.0.491

package/cli/templates/create/project/basic/boilerplate/_.gitignore

@@ -29,6 +29,7 @@ miniprogram_npm
 # mine .env files
 env/.env*.mine
 /src/backend/config/config/config*.mine.ts
+/src/backend/config/config/config*.mine.tsx
 /src/backend/typing/modules.d.ts
 **/.metadata/modules.d.ts
 src/backend/typing/mine.d.ts

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

@@ -40,16 +40,11 @@
     "lint": "eslint",
     "lint:fix": "eslint --fix"
   },
-  "pnpm": {
-    "overrides": {
-      "@types/mime": "3.0.4"
-    }
-  },
   "dependencies": {
-    "vona": "^5.0.274"
+    "vona": "^5.0.276"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",
-    "eslint": "^9.35.0"
+    "eslint": "^9.39.2"
   }
 }

package/cli/templates/create/project/basic/boilerplate/pnpm-workspace.yaml

@@ -33,3 +33,7 @@ onlyBuiltDependencies:
   - esbuild
   - msgpackr-extract
   - nx
+
+overrides:
+  "@types/mime": "3.0.4"
+  "@types/react": "npm:@cabloy/types-react@^19.2.13"

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

@@ -3,7 +3,7 @@ import type { IQueryParams } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapiutils';
+import { Api, Resource, v } from 'vona-module-a-openapiutils';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.tsx';
@@ -14,6 +14,7 @@ import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resour
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 
 @Controller<IControllerOptions<%=argv.resourceNameCapitalize%>>('<%=argv.resourceName%>')
+@Resource()
 export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
   @Web.post()
   @Api.body(v.tableIdentity())
@@ -23,14 +24,14 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
 
   @Web.get()
   @Api.body(Dto<%=argv.resourceNameCapitalize%>QueryRes)
-  async findMany(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>Query) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
-    return await this.scope.service.<%=argv.resourceName%>.findMany(params);
+  async select(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>Query) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+    return await this.scope.service.<%=argv.resourceName%>.select(params);
   }
 
   @Web.get(':id')
   @Api.body(v.optional(), v.object(Entity<%=argv.resourceNameCapitalize%>))
-  async findOne(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
-    return await this.scope.service.<%=argv.resourceName%>.findOne(id);
+  async view(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
+    return await this.scope.service.<%=argv.resourceName%>.view(id);
   }
 
   @Web.patch(':id')
@@ -39,7 +40,7 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
   }
 
   @Web.delete(':id')
-  async remove(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.<%=argv.resourceName%>.remove(id);
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
+    return await this.scope.service.<%=argv.resourceName%>.delete(id);
   }
 }

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

@@ -7,7 +7,7 @@ export interface IEntityOptions<%=argv.resourceNameCapitalize%> extends IDecorat
 
 @Entity<IEntityOptions<%=argv.resourceNameCapitalize%>>('<%=argv.moduleResourceName%>', { openapi: { title: $locale('<%=argv.resourceNameCapitalize%>') } })
 export class Entity<%=argv.resourceNameCapitalize%> extends EntityBase {
-  @Api.field(v.title($locale('Name')), v.default(''), v.min(3))
+  @Api.field(v.title($locale('Name')), v.required(), v.min(3))
   name: string;
 
   @Api.field(v.title($locale('Description')), v.optional())

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

@@ -14,11 +14,11 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.insert(<%=argv.resourceName%>);
   }
 
-  async findMany(params?: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+  async select(params?: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
     return await this.scope.model.<%=argv.resourceName%>.selectAndCount(params);
   }
 
-  async findOne(id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
+  async view(id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
     return await this.scope.model.<%=argv.resourceName%>.getById(id);
   }
 
@@ -26,7 +26,7 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.updateById(id, <%=argv.resourceName%>);
   }
 
-  async remove(id: TableIdentity) {
+  async delete(id: TableIdentity) {
     return await this.scope.model.<%=argv.resourceName%>.deleteById(id);
   }
 }

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

@@ -13,7 +13,7 @@ const __snippet_update = `if (options.version === <%=argv.fileVersion%>) {
     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).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
+      table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
       table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
     });
   }

package/dist/index.js

@@ -230,7 +230,7 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
     // meta
     const meta = getEnvMeta(configMeta);
     configDir = path.join(configOptions.appDir, 'src/backend/config/config');
-    const files = getEnvFiles(meta, configDir, 'config', '.ts');
+    const files = getEnvFiles(meta, configDir, 'config', ['.ts', '.tsx']);
     const filenames = files.map(item => path.basename(item));
     const imports = [];
     const constNames = [];
@@ -784,7 +784,7 @@ class CliBinDev extends BeanCliBase {
         // execArgs: ['--experimental-transform-types', getImportEsm(), '--trace-deprecation'],
         // signal: 'SIGHUP',
         watch: ['packages-utils', 'packages-vona', './src'],
-        ignore: ['**/node_modules/**', '**/dist/**', '**/test/**/*.test.ts', 'src/backend/play/**', 'src/backend/typing/**', '**/src/config/errors.ts', '**/src/config/locale/*.ts', '**/src/config/config.ts', '**/src/config/constants.ts', '**/src/types/**', '**/src/controller/*.ts', '**/src/model/*.ts', '**/src/service/*.ts', '**/src/bean/*.*.ts', '**/src/dto/*.ts(x)?', '**/src/entity/*.ts(x)?']
+        ignore: ['**/node_modules/**', '**/dist/**', '**/test/**/*.test.ts', 'src/backend/play/**', 'src/backend/typing/**', '**/src/config/errors.ts', '**/src/config/locale/*.ts', '**/src/config/config.ts', '**/src/config/constants.ts', '**/src/types/**', '**/src/controller/*.ts(x)?', '**/src/model/*.ts', '**/src/service/*.ts', '**/src/bean/*.*.ts', '**/src/dto/*.ts(x)?', '**/src/entity/*.ts(x)?']
       });
       nodemon.on('quit', () => {
         closed = true;
@@ -2136,6 +2136,7 @@ async function globBeanFiles(sceneName, sceneMeta, moduleName, modulePath) {
     const beanName = parts[parts.length - 1];
     const beanNameFull = `${moduleName}:${beanName}`;
     const beanNameCapitalize = toUpperCaseFirstChar(beanName);
+    const beanFullName = sceneName === 'bean' ? beanName : `${moduleName}.${sceneName}.${beanName}`;
     const fileContent = isIgnore ? '' : fse.readFileSync(filePath).toString();
     const isVirtual = fileContent.includes('@Virtual()');
     result.push({
@@ -2150,6 +2151,7 @@ async function globBeanFiles(sceneName, sceneMeta, moduleName, modulePath) {
       beanName,
       beanNameFull,
       beanNameCapitalize,
+      beanFullName,
       isIgnore,
       isVirtual
     });
@@ -2173,7 +2175,7 @@ function extractBeanInfo(sceneName, fileContent, sceneMeta) {
     }
   }
   // isGlobal
-  const isGlobal = sceneMeta.hasLocal ? fileContent.match(/@.*?\(\{([\s\S]*?)global: true([\s\S]*?)\}([\s\S]*?)\)\s*export class/) : true;
+  const isGlobal = sceneMeta.hasLocal ? fileContent.includes('@Global()') : true;
   return {
     optionsCustomInterface,
     optionsCustomInterfaceFrom,
@@ -2181,6 +2183,8 @@ function extractBeanInfo(sceneName, fileContent, sceneMeta) {
   };
 }
 
+// fileContent.match(/@.*?\(\{([\s\S]*?)global: true([\s\S]*?)\}([\s\S]*?)\)\s*export class/)
+
 async function generateBeanGenerals(sceneName, sceneMeta, moduleName, modulePath) {
   const globFiles = await globBeanFiles(sceneName, sceneMeta, moduleName, modulePath);
   if (globFiles.length === 0) return '';

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

@@ -5,5 +5,5 @@ export declare function globBeanFiles(sceneName: string, sceneMeta: OnionSceneMe
 export declare function extractBeanInfo(sceneName: string, fileContent: string, sceneMeta: OnionSceneMeta): {
     optionsCustomInterface: string | undefined;
     optionsCustomInterfaceFrom: string | undefined;
-    isGlobal: boolean | RegExpMatchArray | null;
+    isGlobal: boolean;
 };

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

@@ -6,7 +6,7 @@ const __snippet_update = `if (options.version === <%=argv.fileVersion%>) {
     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).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
+      table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
       table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.487",
+  "version": "1.0.491",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -33,12 +33,12 @@
     "@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.94",
-    "@cabloy/dotenv": "^1.1.12",
-    "@cabloy/extend": "^3.1.11",
-    "@cabloy/module-glob": "^5.2.51",
-    "@cabloy/module-info": "^1.3.37",
-    "@cabloy/utils": "^2.0.16",
+    "@cabloy/cli": "^3.0.95",
+    "@cabloy/dotenv": "^1.1.13",
+    "@cabloy/extend": "^3.1.13",
+    "@cabloy/module-glob": "^5.2.53",
+    "@cabloy/module-info": "^1.3.41",
+    "@cabloy/utils": "^2.0.17",
     "@cabloy/word-utils": "^2.0.2",
     "@lcov-viewer/cli": "^1.3.0",
     "@rollup/plugin-alias": "^5.1.1",
@@ -50,7 +50,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "babel-plugin-vona-bean-module": "^1.0.7",
+    "babel-plugin-vona-bean-module": "^1.0.8",
     "chalk": "^3.0.0",
     "cli-table3": "^0.6.5",
     "compressing": "^1.10.0",
@@ -65,7 +65,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.129",
+    "vona-core": "^5.0.131",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   },