vona-cli-set-api 1.0.498 → 1.1.5

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/cabloy-start/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.base",
+  "compilerOptions": {},
+  "references": [
+    {
+      "path": "modules/start-siteadmin/tsconfig.build.json"
+    },
+    {
+      "path": "modules/start-siteweb/tsconfig.build.json"
+    }
+  ],
+  "exclude": ["modules"]
+}

package/cli/templates/create/project/cabloy-start/boilerplate/tsconfig.base.esm.json

@@ -0,0 +1,11 @@
+{
+  "extends": "@cabloy/lint/api/tsconfig.base.esm",
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "nodenext",
+    "allowImportingTsExtensions": true,
+    "rewriteRelativeImportExtensions": true,
+    "verbatimModuleSyntax": true,
+    "jsx": "react"
+  }
+}

package/cli/templates/create/project/cabloy-start/boilerplate/tsconfig.base.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.base.esm.json"
+}

package/cli/templates/create/project/cabloy-start/boilerplate/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "references": [],
+  "include": [
+    ".vona/**/*.ts",
+    "src/backend/package.json",
+    "src/backend/config",
+    "src/backend/play",
+    "src/backend/typing"
+  ],
+  "exclude": [],
+  "ts-node": {
+    "swc": true
+  }
+}

package/cli/templates/create/suite/_package.json

@@ -1,10 +1,10 @@
 {
   "name": "vona-suite-<%=argv.name%>",
-  "type": "module",
   "version": "5.0.0",
-  "title": "<%=argv.suiteInfo.relativeName%>",
-  "files": [],
   "description": "",
   "author": "",
-  "dependencies": {}
+  "files": [],
+  "type": "module",
+  "dependencies": {},
+  "title": "<%=argv.suiteInfo.relativeName%>"
 }

package/cli/templates/init/appMonkey/boilerplate/monkey.ts

@@ -1,5 +1,6 @@
 import type { IModule } from '@cabloy/module-info';
 import type { IMonkeyModule, IMonkeySystem } from 'vona';
+
 import { BeanSimple } from 'vona';
 
 export class AppMonkey extends BeanSimple implements IMonkeyModule, IMonkeySystem {

package/cli/templates/init/main/boilerplate/main.ts

@@ -1,4 +1,5 @@
 import type { IModuleMain } from 'vona';
+
 import { BeanSimple } from 'vona';
 
 export class Main extends BeanSimple implements IModuleMain {

package/cli/templates/init/monkey/boilerplate/monkey.ts

@@ -1,5 +1,6 @@
 import type { IModule } from '@cabloy/module-info';
 import type { IMonkeyModule } from 'vona';
+
 import { BeanSimple } from 'vona';
 
 export class Monkey extends BeanSimple implements IMonkeyModule {

package/cli/templates/tools/{crudCabloy → crud}/boilerplate/src/bean/ssrMenu.{{resourceName}}.ts_

@@ -1,24 +1,27 @@
 import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
-import type { ISsrSiteOptionsHome } from 'vona-module-a-ssrhome';
+import type { ISsrSiteOptionsAdmin } from '<%=argv.ssrSiteModuleName%>';
 import { BeanBase } from 'vona';
+import { $order } from 'vona-module-a-openapiutils';
 import { SsrMenu } from 'vona-module-a-ssr';
 import { $locale } from '../.metadata/locales.ts';
 
-export interface ISsrMenuOptions<%=argv.resourceNameCapitalize%> extends IDecoratorSsrMenuOptions<ISsrSiteOptionsHome> {}
+export interface ISsrMenuOptions<%=argv.resourceNameCapitalize%> extends IDecoratorSsrMenuOptions<ISsrSiteOptionsAdmin> {}
 
 @SsrMenu<ISsrMenuOptions<%=argv.resourceNameCapitalize%>>({
   items: {
     <%=argv.resourceName%>: {
       title: $locale('<%=argv.resourceNameCapitalize%>'),
-      group: 'a-ssrhome:admin',
+      order: $order(1),
+      icon: undefined,
       link: 'presetResource',
       meta: {
         params: {
           resource: '<%=argv.module%>:<%=argv.resourceName%>',
         },
       },
+      group: '<%=argv.ssrSiteGroupName%>',
     },
   },
-  site: 'a-ssrhome:home',
+  site: ['<%=argv.ssrSiteOnionName%>'],
 })
 export class SsrMenu<%=argv.resourceNameCapitalize%> extends BeanBase {}

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

@@ -9,7 +9,7 @@ import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resour
 import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
-import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 
@@ -29,8 +29,8 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
   }
 
   @Web.get(':id')
-  @Api.body(v.optional(), v.object(Entity<%=argv.resourceNameCapitalize%>))
-  async view(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
+  @Api.body(v.optional(), v.object(Dto<%=argv.resourceNameCapitalize%>View))
+  async view(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<Dto<%=argv.resourceNameCapitalize%>View | undefined> {
     return await this.scope.service.<%=argv.resourceName%>.view(id);
   }
 

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}View.tsx_

@@ -0,0 +1,9 @@
+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.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>View extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>View>()
+export class Dto<%=argv.resourceNameCapitalize%>View extends $Dto.get(() => Model<%=argv.resourceNameCapitalize%>) {}

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

@@ -3,6 +3,7 @@ import type { IQueryParams } from 'vona-module-a-orm';
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';
@@ -18,7 +19,7 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.selectAndCount(params);
   }
 
-  async view(id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {
+  async view(id: TableIdentity): Promise<Dto<%=argv.resourceNameCapitalize%>View | undefined> {
     return await this.scope.model.<%=argv.resourceName%>.getById(id);
   }
 

package/cli/templates/tools/{crud → crudBasic}/snippets/2-meta.index.ts

@@ -1,6 +1,6 @@
-import fs from 'node:fs';
 import { metadataCustomSnippet } from '@cabloy/cli';
 import { catchError } from '@cabloy/utils';
+import fs from 'node:fs';
 
 declare module '@cabloy/cli' {
   interface ICommandArgv {
@@ -8,8 +8,8 @@ declare module '@cabloy/cli' {
   }
 }
 
-const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-ormutils\';';
-const __snippet_update = '...$tableColumns(\'<%=argv.moduleResourceName%>\', \'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',
@@ -17,14 +17,9 @@ export default metadataCustomSnippet({
   format: true,
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
-      return cli.helper.invokeCli([
-        ':create:bean',
-        'meta',
-        'index',
-        `--module=${argv.module}`,
-        '--nometadata',
-        '--noformat',
-      ], { cwd: argv.projectPath });
+      return cli.helper.invokeCli([':create:bean', 'meta', 'index', `--module=${argv.module}`, '--nometadata', '--noformat'], {
+        cwd: argv.projectPath,
+      });
     });
     return fs.readFileSync(targetFile).toString('utf8');
   },
@@ -32,7 +27,7 @@ export default metadataCustomSnippet({
     // import1
     if (!ast.includes(__snippet_import1)) {
       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}`);
+      ast = ast.replace("import { Meta } from 'vona-module-a-meta';", `import { Meta } from 'vona-module-a-meta';\n${code}`);
     }
     // update
     const code = await cli.template.renderContent({ content: __snippet_update });

package/cli/templates/tools/{crud → crudBasic}/snippets/2-meta.version.ts

@@ -1,6 +1,6 @@
-import fs from 'node:fs';
 import { metadataCustomSnippet } from '@cabloy/cli';
 import { catchError } from '@cabloy/utils';
+import fs from 'node:fs';
 
 declare module '@cabloy/cli' {
   interface ICommandArgv {
@@ -25,14 +25,9 @@ export default metadataCustomSnippet({
   format: true,
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
-      return cli.helper.invokeCli([
-        ':create:bean',
-        'meta',
-        'version',
-        `--module=${argv.module}`,
-        '--nometadata',
-        '--noformat',
-      ], { cwd: argv.projectPath });
+      return cli.helper.invokeCli([':create:bean', 'meta', 'version', `--module=${argv.module}`, '--nometadata', '--noformat'], {
+        cwd: argv.projectPath,
+      });
     });
     return fs.readFileSync(targetFile).toString('utf8');
   },

package/cli/templates/tools/{crud → crudBasic}/snippets/3-en-us.ts

@@ -1,6 +1,7 @@
-import fs from 'node:fs';
 import { metadataCustomSnippet } from '@cabloy/cli';
 import { catchError } from '@cabloy/utils';
+import fs from 'node:fs';
+
 import { locale_transform } from '../utils.ts';
 
 const __resources = { Name: 'Name', Description: 'Description' };
@@ -17,12 +18,7 @@ export default metadataCustomSnippet({
   language: 'plain',
   init: async ({ cli, argv, targetFile }) => {
     await catchError(() => {
-      return cli.helper.invokeCli([
-        ':init:locale',
-        argv.module,
-        '--nometadata',
-        '--noformat',
-      ], {
+      return cli.helper.invokeCli([':init:locale', argv.module, '--nometadata', '--noformat'], {
         cwd: argv.projectPath,
       });
     });

package/cli/templates/tools/{crud → crudBasic}/snippets/4-zh-cn.ts

@@ -1,4 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
+
 import { locale_transform } from '../utils.ts';
 
 const __resources = { Name: '名称', Description: '描述' };

package/cli/templates/tools/{crud → crudBasic}/utils.ts

@@ -2,16 +2,11 @@ import { evaluateSimple } from '@cabloy/utils';
 
 export async function locale_transform({ ast, argv, resources }: { ast: string; argv: any; resources: any }) {
   const values = evaluateSimple(ast.replace('export default', '').replace(';', ''));
-  resources = Object.assign(
-    {},
-    resources,
-    { [argv.resourceNameCapitalize]: argv.resourceNameCapitalize },
-    values,
-  );
+  resources = Object.assign({}, resources, { [argv.resourceNameCapitalize]: argv.resourceNameCapitalize }, values);
   const keys = Object.keys(resources).sort();
   let content = '';
   for (const key of keys) {
-    content += `  ${key}: '${resources[key].replaceAll('\'', '\\\'')}',\n`;
+    content += `  ${key}: '${resources[key].replaceAll("'", "\\'")}',\n`;
   }
   ast = `export default {\n${content}};\n`;
   // ok