zova-cli-set-front 1.2.41 → 1.2.43

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_

@@ -1,12 +1,21 @@
 import type { IComponentOptions } from 'zova';
-import type { IFormFieldPresetOptionsBase } from 'zova-module-a-form';
 import type { IResourceFormFieldOptionsBase } from 'zova-module-a-openapi';
 
 import { BeanControllerBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { ZFormField } from 'zova-module-a-form';
+import { ZFormField, type IFormFieldComponentOptions } from 'zova-module-a-form';
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldPresetOptionsBase<IResourceFormFieldOptionsBase> {}
+declare module 'zova-module-a-openapi' {
+  export interface IResourceFormFieldRecord {
+    '<%=argv.module%>:<%=argv.nameMeta.full%>'?: IResource<%=argv.nameMeta.fullCapitalize%>Options;
+  }
+}
+
+export interface IResource<%=argv.nameMeta.fullCapitalize%>Options extends IResourceFormFieldOptionsBase {}
+
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldComponentOptions {
+  options?: IResource<%=argv.nameMeta.fullCapitalize%>Options;
+}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {

package/cli/templates/rest/component.ts

@@ -1,9 +1,9 @@
 import type z from 'zod';
 import type { TypeRenderComponentJsx } from 'zova-jsx';
 import type {
-  IResourceComponentFormFieldRecord,
+  IResourceFormFieldRecord,
   TypeFormSchemaScene,
-  IResourceComponentTableCellActionRowRecord,
+  IResourceTableActionRowRecordBoth,
   IResourceActionRowRecord,
   IResourceComponentActionRowOptionsAction,
   IResourceActionBulkRecord,
@@ -16,9 +16,9 @@ import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 
 import { _generalSchemaRest } from './inner.ts';
 
-export function schemaRenderField<K extends keyof IResourceComponentFormFieldRecord, T extends z.ZodType>(
+export function schemaRenderField<K extends keyof IResourceFormFieldRecord, T extends z.ZodType>(
   name: K,
-  options?: IResourceComponentFormFieldRecord[K],
+  options?: IResourceFormFieldRecord[K],
   scene?: TypeFormSchemaScene,
 ) {
   return function (schema: T): T {
@@ -34,9 +34,9 @@ export function schemaRenderFieldJsx<T extends z.ZodType>(renderComponentJsx: Ty
   };
 }
 
-export function schemaRenderCell<K extends keyof IResourceComponentTableCellActionRowRecord, T extends z.ZodType>(
+export function schemaRenderCell<K extends keyof IResourceTableActionRowRecordBoth, T extends z.ZodType>(
   name: K,
-  options?: IResourceComponentTableCellActionRowRecord[K],
+  options?: IResourceTableActionRowRecordBoth[K],
 ) {
   return function (schema: T): T {
     const options2 = options !== undefined ? { render: name as never, columnProps: options } : { render: name as never };

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.41",
-  "gitHead": "6c7a09c8f0a8a0f41c5090b544a1667dbc689f0e",
+  "version": "1.2.43",
+  "gitHead": "f5fbd410ec433943070bb60839f1e762f98593c6",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",