zova-cli-set-front 1.2.42 → 1.2.44

package/cli/templates/create/component/boilerplateActionBulk/controller.tsx_

@@ -1,9 +1,15 @@
-import type { IJsxRenderContextPage, IResourceActionBulkOptionsBase } from 'zova-module-a-openapi';
+import type { IJsxRenderContextPage, IResourceTableActionBulkOptionsBase } from 'zova-module-a-openapi';
 
-import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceActionBulkOptionsBase {}
+declare module 'zova-module-a-openapi' {
+  export interface IResourceTableActionBulkRecord {
+    '<%=argv.module%>:<%=argv.nameMeta.full%>'?: Controller<%=argv.nameMeta.fullCapitalize%>Props;
+  }
+}
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceTableActionBulkOptionsBase {}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {

package/cli/templates/create/component/boilerplateActionRow/controller.tsx_

@@ -1,9 +1,15 @@
-import type { IJsxRenderContextPageEntry, IResourceActionRowOptionsBase } from 'zova-module-a-openapi';
+import type { IJsxRenderContextPageEntry, IResourceFormActionRowOptionsBase } from 'zova-module-a-openapi';
 
-import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceActionRowOptionsBase {}
+declare module 'zova-module-a-openapi' {
+  export interface IResourceFormActionRowRecord {
+    '<%=argv.module%>:<%=argv.nameMeta.full%>'?: Controller<%=argv.nameMeta.fullCapitalize%>Props;
+  }
+}
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceFormActionRowOptionsBase {}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {

package/cli/templates/create/component/boilerplateBlockPage/controller.tsx_

@@ -1,8 +1,14 @@
 import type { IResourceBlockOptionsBase, IJsxRenderContextPage } from 'zova-module-a-openapi';
 
-import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+declare module 'zova-module-a-openapi' {
+  export interface IResourceBlockRecord {
+    '<%=argv.module%>:<%=argv.nameMeta.full%>'?: Controller<%=argv.nameMeta.fullCapitalize%>Props;
+  }
+}
+
 export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceBlockOptionsBase {}
 
 @Controller()

package/cli/templates/create/component/boilerplateBlockPageEntry/controller.tsx_

@@ -1,8 +1,14 @@
 import type { IResourceBlockOptionsBase, IJsxRenderContextPageEntry } from 'zova-module-a-openapi';
 
-import { BeanControllerBase, IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+declare module 'zova-module-a-openapi' {
+  export interface IResourceBlockRecord {
+    '<%=argv.module%>:<%=argv.nameMeta.full%>'?: Controller<%=argv.nameMeta.fullCapitalize%>Props;
+  }
+}
+
 export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IResourceBlockOptionsBase {}
 
 @Controller()

package/cli/templates/create/component/boilerplateFormField/controller.tsx_

@@ -6,7 +6,7 @@ import { Controller } from 'zova-module-a-bean';
 import { ZFormField, type IFormFieldComponentOptions } from 'zova-module-a-form';
 
 declare module 'zova-module-a-openapi' {
-  export interface IResourceComponentFormFieldRecord {
+  export interface IResourceFormFieldRecord {
     '<%=argv.module%>:<%=argv.nameMeta.full%>'?: IResource<%=argv.nameMeta.fullCapitalize%>Options;
   }
 }

package/cli/templates/rest/component.ts

@@ -1,28 +1,31 @@
 import type z from 'zod';
 import type { TypeRenderComponentJsx } from 'zova-jsx';
 import type {
-  IResourceComponentFormFieldRecord,
+  IResourceFormFieldRecord,
+  IResourceTableCellRecord,
+  IResourceTableActionRowRecord,
+  IResourceFormActionRowRecord,
+  IResourceTableActionBulkRecord,
+  IResourceBlockRecord,
   TypeFormSchemaScene,
-  IResourceComponentTableCellActionRowRecord,
-  IResourceActionRowRecord,
-  IResourceComponentActionRowOptionsAction,
-  IResourceActionBulkRecord,
-  IResourceComponentActionBulkOptionsAction,
-  IResourceComponentBlockRecord,
-  IResourceComponentBlockOptionsBlock,
+  IResourceRenderTableActionRowOptionsAction,
+  IResourceRenderFormActionRowOptionsAction,
+  IResourceRenderTableActionBulkOptionsAction,
+  IResourceRenderBlockOptionsBlock,
+  IResourceTableActionRowOptionsBase,
+  IResourceFormActionRowOptionsBase,
+  IResourceTableActionBulkOptionsBase,
 } from 'zova-module-a-openapi';
 
-import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+import { _generalSchemaRest, _toLowerCaseFirstChar } from './inner.ts';
 
-import { _generalSchemaRest } from './inner.ts';
-
-export function schemaRenderField<K extends keyof IResourceComponentFormFieldRecord, T extends z.ZodType>(
-  name: K,
-  options?: IResourceComponentFormFieldRecord[K],
+export function schemaRenderField<K extends keyof IResourceFormFieldRecord, T extends z.ZodType>(
+  render: K,
+  options?: IResourceFormFieldRecord[K],
   scene?: TypeFormSchemaScene,
 ) {
   return function (schema: T): T {
-    const options2 = options !== undefined ? { render: name as never, options } : { render: name as never };
+    const options2 = options !== undefined ? { render, options } : { render };
     return _generalSchemaRest(schema, options2, scene ?? 'form'); // diff from table
   };
 }
@@ -34,52 +37,79 @@ export function schemaRenderFieldJsx<T extends z.ZodType>(renderComponentJsx: Ty
   };
 }
 
-export function schemaRenderCell<K extends keyof IResourceComponentTableCellActionRowRecord, T extends z.ZodType>(
-  name: K,
-  options?: IResourceComponentTableCellActionRowRecord[K],
+export function schemaRenderCell<K extends keyof (IResourceTableCellRecord & IResourceTableActionRowRecord), T extends z.ZodType>(
+  render: K,
+  options?: (IResourceTableCellRecord & IResourceTableActionRowRecord)[K],
 ) {
   return function (schema: T): T {
-    const options2 = options !== undefined ? { render: name as never, columnProps: options } : { render: name as never };
+    const options2 = options !== undefined ? { render, columnProps: options } : { render };
     return _generalSchemaRest(schema, options2, 'table');
   };
 }
 
-export function schemaRenderCellJsx<T extends z.ZodType>(renderComponentJsx: TypeRenderComponentJsx) {
+export function schemaRenderCellJsx<T extends z.ZodType>(
+  renderComponentJsx: TypeRenderComponentJsx,
+  options?: Pick<IResourceTableActionRowOptionsBase, 'permission'>,
+) {
   return function (schema: T): T {
-    const options = { render: renderComponentJsx };
-    return _generalSchemaRest(schema, options, 'table');
+    const options2 = options !== undefined ? { render: renderComponentJsx, columnProps: options } : { render: renderComponentJsx };
+    return _generalSchemaRest(schema, options2, 'table');
   };
 }
 
-export function schemaRenderActionRow<K extends keyof IResourceActionRowRecord>(
-  name: K,
-  options?: IResourceActionRowRecord[K],
-): IResourceComponentActionRowOptionsAction {
-  const render = 'Action' + toUpperCaseFirstChar(name);
-  return { $$typeof: 'zova-jsx:actionRow', name, render: render as any, options };
+export function schemaRenderTableActionRow<K extends keyof IResourceTableActionRowRecord>(
+  render: K,
+  options?: IResourceTableActionRowRecord[K],
+): IResourceRenderTableActionRowOptionsAction {
+  const pos = render.toString().indexOf(':action');
+  const name = pos > -1 ? _toLowerCaseFirstChar(render.toString().substring(pos + ':action'.length)) : undefined;
+  return { $$typeof: 'zova-jsx:actionRow', name, render, options };
 }
 
-export function schemaRenderActionRowJsx<K extends keyof IResourceActionRowRecord>(name: K, renderComponentJsx: TypeRenderComponentJsx) {
-  return { name, render: renderComponentJsx };
+export function schemaRenderTableActionRowJsx(
+  renderComponentJsx: TypeRenderComponentJsx,
+  options?: Pick<IResourceTableActionRowOptionsBase, 'permission'>,
+) {
+  return { render: renderComponentJsx, options };
 }
 
-export function schemaRenderActionBulk<K extends keyof IResourceActionBulkRecord>(
-  name: K,
-  options?: IResourceActionBulkRecord[K],
-): IResourceComponentActionBulkOptionsAction {
-  const render = 'Action' + toUpperCaseFirstChar(name);
-  return { $$typeof: 'zova-jsx:actionBulk', name, render: render as any, options };
+export function schemaRenderFormActionRow<K extends keyof IResourceFormActionRowRecord>(
+  render: K,
+  options?: IResourceFormActionRowRecord[K],
+): IResourceRenderFormActionRowOptionsAction {
+  const pos = render.toString().indexOf(':action');
+  const name = pos > -1 ? _toLowerCaseFirstChar(render.toString().substring(pos + ':action'.length)) : undefined;
+  return { $$typeof: 'zova-jsx:actionRow', name, render, options };
 }
 
-export function schemaRenderActionBulkJsx<K extends IResourceActionBulkRecord>(name: K, renderComponentJsx: TypeRenderComponentJsx) {
-  return { name, render: renderComponentJsx };
+export function schemaRenderFormActionRowJsx(
+  renderComponentJsx: TypeRenderComponentJsx,
+  options?: Pick<IResourceFormActionRowOptionsBase, 'permission'>,
+) {
+  return { render: renderComponentJsx, options };
+}
+
+export function schemaRenderTableActionBulk<K extends keyof IResourceTableActionBulkRecord>(
+  render: K,
+  options?: IResourceTableActionBulkRecord[K],
+): IResourceRenderTableActionBulkOptionsAction {
+  const pos = render.toString().indexOf(':action');
+  const name = pos > -1 ? _toLowerCaseFirstChar(render.toString().substring(pos + ':action'.length)) : undefined;
+  return { $$typeof: 'zova-jsx:actionBulk', name, render, options };
+}
+
+export function schemaRenderTableActionBulkJsx(
+  renderComponentJsx: TypeRenderComponentJsx,
+  options?: Pick<IResourceTableActionBulkOptionsBase, 'permission'>,
+) {
+  return { render: renderComponentJsx, options };
 }
 
-export function schemaRenderBlock<K extends keyof IResourceComponentBlockRecord>(
-  name: K,
-  options?: IResourceComponentBlockRecord[K],
-): IResourceComponentBlockOptionsBlock {
-  return { $$typeof: 'zova-jsx:block', render: name, options };
+export function schemaRenderBlock<K extends keyof IResourceBlockRecord>(
+  render: K,
+  options?: IResourceBlockRecord[K],
+): IResourceRenderBlockOptionsBlock {
+  return { $$typeof: 'zova-jsx:block', render, options };
 }
 
 export function schemaRenderBlockJsx(renderComponentJsx: TypeRenderComponentJsx) {

package/cli/templates/rest/inner.ts

@@ -20,3 +20,7 @@ export function _order(order: number, level?: TypeSchemaOrderLevel) {
   const levelBase = OrderLevelBaseMap[level ?? 'business'];
   return levelBase + order;
 }
+
+export function _toLowerCaseFirstChar(str: string) {
+  return str.charAt(0).toLowerCase() + str.substring(1);
+}

package/cli/templates/rest/render.ts

@@ -1,14 +1,16 @@
 import {
-  schemaRenderActionBulk,
-  schemaRenderActionBulkJsx,
-  schemaRenderActionRow,
-  schemaRenderActionRowJsx,
   schemaRenderBlock,
   schemaRenderBlockJsx,
   schemaRenderCell,
   schemaRenderCellJsx,
   schemaRenderField,
   schemaRenderFieldJsx,
+  schemaRenderFormActionRow,
+  schemaRenderFormActionRowJsx,
+  schemaRenderTableActionBulk,
+  schemaRenderTableActionBulkJsx,
+  schemaRenderTableActionRow,
+  schemaRenderTableActionRowJsx,
 } from './component.ts';
 import {
   schemaRenderDisableNotifyChanged,
@@ -32,10 +34,12 @@ export const render = {
   fieldJsx: schemaRenderFieldJsx,
   cell: schemaRenderCell,
   cellJsx: schemaRenderCellJsx,
-  actionRow: schemaRenderActionRow,
-  actionRowJsx: schemaRenderActionRowJsx,
-  actionBulk: schemaRenderActionBulk,
-  actionBulkJsx: schemaRenderActionBulkJsx,
+  tableActionRow: schemaRenderTableActionRow,
+  tableActionRowJsx: schemaRenderTableActionRowJsx,
+  formActionRow: schemaRenderFormActionRow,
+  formActionRowJsx: schemaRenderFormActionRowJsx,
+  tableActionBulk: schemaRenderTableActionBulk,
+  tableActionBulkJsx: schemaRenderTableActionBulkJsx,
   block: schemaRenderBlock,
   blockJsx: schemaRenderBlockJsx,
 };

package/dist/index.js

@@ -7,7 +7,7 @@ import { rolldown } from 'rolldown';
 import { dts } from 'rolldown-plugin-dts';
 import { build } from 'vite';
 import { createRequire } from 'node:module';
-import { camelToKebab, replaceTemplate, toUpperCaseFirstChar, toLowerCaseFirstChar, skipPrefix, stringToCapitalize } from '@cabloy/word-utils';
+import { camelToKebab, toUpperCaseFirstChar, toLowerCaseFirstChar, skipPrefix, stringToCapitalize, replaceTemplate } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import { build as build$1 } from 'tsdown';
 import yaml from 'yaml';
@@ -192,21 +192,6 @@ function svgResolverPlugin() {
     }
   };
 }
-const __template_package = `{
-  "name": "{{Name}}",
-  "version": "{{Version}}",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": [
-        "./index.d.mts"
-      ],
-      "import": "./index.mjs"
-    },
-    "./package.json": "./package.json"
-  }
-}
-`;
 class CliBinBuildRest extends BeanCliBase {
   async execute() {
     const {
@@ -287,22 +272,6 @@ class CliBinBuildRest extends BeanCliBase {
     // render
     await this.template.renderDir(srcDir, templateDir);
   }
-  async _prepareResources_(context) {
-    // package.json
-    await this._prepareResourcesPackage(context);
-    // index.ts
-    await this._prepareResourcesIndex(context);
-  }
-  _prepareBundleModules() {
-    const modules = [];
-    for (const module of this.modulesMeta.modulesArray) {
-      const moduleRoot = module.root.replaceAll('\\', '/');
-      if (moduleRoot.includes('/src/module/') || moduleRoot.includes('/src/suite/')) {
-        modules.push(module.info.fullName);
-      }
-    }
-    return modules;
-  }
   async _buildTs({
     srcDir,
     outDir
@@ -385,124 +354,6 @@ class CliBinBuildRest extends BeanCliBase {
     // copy
     _copyToTarget(outDir, process.env.BUILD_REST_COPY_DIST, bundleNameCopy);
   }
-  async _prepareResourcesPackage({
-    projectPath,
-    flavor,
-    bundleName,
-    srcDir
-  }) {
-    const mode = 'production';
-    const appMode = 'ssr';
-    const configMeta = {
-      flavor,
-      mode,
-      appMode
-    };
-    const configOptions = {
-      appDir: projectPath,
-      runtimeDir: '.zova'
-    };
-    const configUtils = createConfigUtils(configMeta, configOptions);
-    // env
-    const env = configUtils.loadEnvs();
-    // package.json
-    const pkgContent = replaceTemplate(__template_package, {
-      Name: bundleName,
-      Version: env.APP_VERSION
-    });
-    await fse.writeFile(path.join(srcDir, 'package.json'), pkgContent);
-  }
-  async _prepareResourcesIndex({
-    srcDir,
-    projectPath
-  }) {
-    let indexContent = `import type { IIconRecord } from 'zova-module-a-icon';
-export type { IIconRecord } from 'zova-module-a-icon';
-import type { TypePagePathSchema } from 'zova-module-a-router';
-export type { IPagePathRecord } from 'zova-module-a-router';
-import type { IActionRecord, TypeActionOptions } from 'zova-module-a-action';
-export type { IActionRecord } from 'zova-module-a-action';
-import type { IVonaComponentRecord, TypeComponentOptions } from 'zova-module-a-bean';
-export type { IVonaComponentRecord } from 'zova-module-a-bean';
-export type {
-  IResourceComponentActionBulkRecord,
-  IResourceComponentActionRowRecord,
-  IResourceComponentBlockRecord,
-  IResourceComponentFormFieldRecord,
-  IResourceComponentTableCellRecord,
-  ISchemaRenderComponentLayoutOptions,
-} from 'zova-module-a-openapi';
-`;
-    indexContent += await this._prepareResourcesIndex_rest(srcDir);
-    indexContent += await this._prepareResourcesIndex_icons(srcDir);
-    indexContent += await this._prepareResourcesIndex_pages(srcDir);
-    indexContent += await this._prepareResourcesIndex_providers(srcDir, projectPath);
-    await fse.writeFile(path.join(srcDir, 'index.ts'), indexContent);
-  }
-  async _prepareResourcesIndex_rest(srcDir) {
-    let content = '';
-    for (const module of this.modulesMeta.modulesArray) {
-      const restDir = path.join(module.root, 'rest');
-      if (!fse.existsSync(restDir)) continue;
-      let tempDir;
-      if (module.info.node_modules) {
-        tempDir = path.join(srcDir, 'modules', module.info.relativeName, 'rest');
-        await fse.copy(restDir, tempDir);
-      } else {
-        tempDir = path.join(module.root, 'rest');
-      }
-      const restIndexFile = path.join(tempDir, 'index.ts');
-      let restIndexFileRelative = path.relative(srcDir, restIndexFile);
-      if (!restIndexFileRelative.startsWith('.')) {
-        restIndexFileRelative = `./${restIndexFileRelative}`;
-      }
-      content += `export * from '${restIndexFileRelative.replaceAll('\\', '/')}';\n`;
-    }
-    return content;
-  }
-  async _prepareResourcesIndex_icons(_srcDir) {
-    const content = `export function $iconName<K extends keyof IIconRecord>(name: K): any {
-  return name;
-}
-`;
-    return content;
-  }
-  async _prepareResourcesIndex_providers(_srcDir, projectPath) {
-    // openapi
-    const dirBasicOpenapi = path.join(projectPath, './src/suite/cabloy-basic/modules/basic-openapi');
-    const dirStartOpenapi = path.join(projectPath, './src/suite/cabloy-start/modules/start-openapi');
-    let content = '';
-    if (fse.existsSync(dirBasicOpenapi)) {
-      content += `import 'zova-module-basic-openapi';\n`;
-    } else if (fse.existsSync(dirStartOpenapi)) {
-      content += `import 'zova-module-start-openapi';\n`;
-    }
-    // actions
-    content += `export function Action<K extends keyof IActionRecord>(options: TypeActionOptions<K>) {
-  if(!options.name) throw new Error('should specify the action name');
-  return options.name.replace(':','.action.');
-}
-`;
-    // components
-    content += `export function Component<K extends keyof IVonaComponentRecord>(options: TypeComponentOptions<K>) {
-  if (!options.name) throw new Error('should specify the component name');
-  return options.name;
-}
-`;
-    return content;
-  }
-  async _prepareResourcesIndex_pages(_srcDir) {
-    const content = `declare module 'zova-module-a-router' {
-  export interface IPagePathRecord {
-    '/': TypePagePathSchema<undefined, undefined>;
-    'presetLogin': TypePagePathSchema<undefined, undefined>;
-    'presetErrorExpired': TypePagePathSchema<undefined, undefined>;
-    'presetResource': TypePagePathSchema<undefined, undefined>;
-  }
-}
-`;
-    return content;
-  }
 }
 function _copyToTarget(outDir, target, bundleNameCopy) {
   if (!target) return;

package/dist/lib/bean/cli.bin.buildRest.d.ts

@@ -20,16 +20,8 @@ interface IBinBuildRestContext {
 export declare class CliBinBuildRest extends BeanCliBase {
     execute(): Promise<void>;
     _prepareResources(context: IBinBuildRestContext): Promise<void>;
-    _prepareResources_(context: IBinBuildRestContext): Promise<void>;
-    _prepareBundleModules(): string[];
     _buildTs({ srcDir, outDir }: IBinBuildRestContext): Promise<void>;
     _buildDts({ srcDir, outDir, bundleModules }: IBinBuildRestContext): Promise<void>;
     _build(buildContext: IBinBuildRestContext): Promise<void>;
-    _prepareResourcesPackage({ projectPath, flavor, bundleName, srcDir }: IBinBuildRestContext): Promise<void>;
-    _prepareResourcesIndex({ srcDir, projectPath }: IBinBuildRestContext): Promise<void>;
-    _prepareResourcesIndex_rest(srcDir: string): Promise<string>;
-    _prepareResourcesIndex_icons(_srcDir: string): Promise<string>;
-    _prepareResourcesIndex_providers(_srcDir: string, projectPath: string): Promise<string>;
-    _prepareResourcesIndex_pages(_srcDir: string): Promise<string>;
 }
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.42",
-  "gitHead": "59a9d8a527385e1677aa1664328637de4054ed86",
+  "version": "1.2.44",
+  "gitHead": "b6da8c02893f8002151fdd2eeec44c597570d5d6",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",