zova-cli-set-front 1.2.37 → 1.2.41

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

@@ -1,10 +1,12 @@
 import type { IComponentOptions } from 'zova';
-import type { IFormFieldComponentOptions } from 'zova-module-a-form';
+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';
 
-export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldComponentOptions {}
+export interface Controller<%=argv.nameMeta.fullCapitalize%>Props extends IFormFieldPresetOptionsBase<IResourceFormFieldOptionsBase> {}
 
 @Controller()
 export class Controller<%=argv.nameMeta.fullCapitalize%> extends BeanControllerBase {

package/cli/templates/refactor/componentModel/snippets/1-controller.ts

@@ -3,15 +3,16 @@ import { metadataCustomSnippet } from '@cabloy/cli';
 declare module '@cabloy/cli' {
   interface ICommandArgv {
     modelName: string;
+    controllerFileName: string;
+    controllerClassName: string;
   }
 }
 
 const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 const __regModelsReplace = /interface [^<]*Models([^{]*) \{/;
-const __regModelValue = /import \{[^}]*ModelValue[^}]*\} from 'zova';/;
-const __regModelValueReplace = /import \{ ([^}]*) \} from 'zova';/;
 const __regPropsDefaultReplace = /static \$propsDefault([^{]*) = \{/;
 const __regLocalNameReplace = /protected async __init__/;
+const __regLocalNameInitReplace = /protected async __init__([^{]*){/;
 
 export default metadataCustomSnippet({
   file: ({ argv }) => {
@@ -38,19 +39,17 @@ export default metadataCustomSnippet({
     ast = ast.replace(__regModelsReplace, $0 => {
       return `${$0}\n  '${typeName}'?: number;`;
     });
-    // @Model
-    if (!__regModelValue.test(ast)) {
-      ast = ast.replace(__regModelValueReplace, (_, $1) => {
-        return `import { ${$1}, ModelValue } from 'zova';`;
-      });
-    }
     // propsDefault
     ast = ast.replace(__regPropsDefaultReplace, $0 => {
       return `${$0}\n  ${modelName}: 0,`;
     });
     // localName
     ast = ast.replace(__regLocalNameReplace, $0 => {
-      return `@ModelValue()\n${localName}: number;\n\n    ${$0}`;
+      return `${localName}: number;\n\n    ${$0}`;
+    });
+    // init
+    ast = ast.replace(__regLocalNameInitReplace, $0 => {
+      return `${$0}\n    this.${localName} = this.$useModel('${modelName}');`;
     });
     // ok
     return ast;

package/cli/templates/rest/_package.json

@@ -0,0 +1,12 @@
+{
+  "name": "<%=argv.Name%>",
+  "version": "<%=argv.Version%>",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": ["./index.d.mts"],
+      "import": "./index.mjs"
+    },
+    "./package.json": "./package.json"
+  }
+}

package/cli/templates/rest/component.ts

@@ -0,0 +1,87 @@
+import type z from 'zod';
+import type { TypeRenderComponentJsx } from 'zova-jsx';
+import type {
+  IResourceComponentFormFieldRecord,
+  TypeFormSchemaScene,
+  IResourceComponentTableCellActionRowRecord,
+  IResourceActionRowRecord,
+  IResourceComponentActionRowOptionsAction,
+  IResourceActionBulkRecord,
+  IResourceComponentActionBulkOptionsAction,
+  IResourceComponentBlockRecord,
+  IResourceComponentBlockOptionsBlock,
+} from 'zova-module-a-openapi';
+
+import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+
+import { _generalSchemaRest } from './inner.ts';
+
+export function schemaRenderField<K extends keyof IResourceComponentFormFieldRecord, T extends z.ZodType>(
+  name: K,
+  options?: IResourceComponentFormFieldRecord[K],
+  scene?: TypeFormSchemaScene,
+) {
+  return function (schema: T): T {
+    const options2 = options !== undefined ? { render: name as never, options } : { render: name as never };
+    return _generalSchemaRest(schema, options2, scene ?? 'form'); // diff from table
+  };
+}
+
+export function schemaRenderFieldJsx<T extends z.ZodType>(renderComponentJsx: TypeRenderComponentJsx, scene?: TypeFormSchemaScene) {
+  return function (schema: T): T {
+    const options = { render: renderComponentJsx };
+    return _generalSchemaRest(schema, options, scene ?? 'form'); //diff from table
+  };
+}
+
+export function schemaRenderCell<K extends keyof IResourceComponentTableCellActionRowRecord, T extends z.ZodType>(
+  name: K,
+  options?: IResourceComponentTableCellActionRowRecord[K],
+) {
+  return function (schema: T): T {
+    const options2 = options !== undefined ? { render: name as never, columnProps: options } : { render: name as never };
+    return _generalSchemaRest(schema, options2, 'table');
+  };
+}
+
+export function schemaRenderCellJsx<T extends z.ZodType>(renderComponentJsx: TypeRenderComponentJsx) {
+  return function (schema: T): T {
+    const options = { render: renderComponentJsx };
+    return _generalSchemaRest(schema, options, '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 schemaRenderActionRowJsx<K extends keyof IResourceActionRowRecord>(name: K, renderComponentJsx: TypeRenderComponentJsx) {
+  return { name, render: renderComponentJsx };
+}
+
+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 schemaRenderActionBulkJsx<K extends IResourceActionBulkRecord>(name: K, renderComponentJsx: TypeRenderComponentJsx) {
+  return { name, render: renderComponentJsx };
+}
+
+export function schemaRenderBlock<K extends keyof IResourceComponentBlockRecord>(
+  name: K,
+  options?: IResourceComponentBlockRecord[K],
+): IResourceComponentBlockOptionsBlock {
+  return { $$typeof: 'zova-jsx:block', render: name, options };
+}
+
+export function schemaRenderBlockJsx(renderComponentJsx: TypeRenderComponentJsx) {
+  return { render: renderComponentJsx };
+}

package/cli/templates/rest/index.ts

@@ -0,0 +1,3 @@
+export * from './modules.ts';
+export * from './utils.ts';
+export * from './render.ts';

package/cli/templates/rest/inner.ts

@@ -0,0 +1,22 @@
+import type z from 'zod';
+import type { TypeSchemaOrderLevel, TypeSchemaScene } from 'zova-module-a-openapi';
+
+export const OrderCoreBase = 100;
+export const OrderBusinessBase = 1000;
+export const OrderUnknownBase = 10000;
+export const OrderMaxBase = 100000;
+
+export const OrderLevelBaseMap = {
+  core: OrderCoreBase,
+  business: OrderBusinessBase,
+  max: OrderMaxBase,
+};
+
+export function _generalSchemaRest<T extends z.ZodType>(schema: T, options: any, scene?: TypeSchemaScene) {
+  return schema.openapi(scene ? { rest: { [scene]: options } } : { rest: options });
+}
+
+export function _order(order: number, level?: TypeSchemaOrderLevel) {
+  const levelBase = OrderLevelBaseMap[level ?? 'business'];
+  return levelBase + order;
+}

package/cli/templates/rest/modules.ts

@@ -0,0 +1 @@
+<%-argv.Modules%>

package/cli/templates/rest/render.ts

@@ -0,0 +1,41 @@
+import {
+  schemaRenderActionBulk,
+  schemaRenderActionBulkJsx,
+  schemaRenderActionRow,
+  schemaRenderActionRowJsx,
+  schemaRenderBlock,
+  schemaRenderBlockJsx,
+  schemaRenderCell,
+  schemaRenderCellJsx,
+  schemaRenderField,
+  schemaRenderFieldJsx,
+} from './component.ts';
+import {
+  schemaRenderDisableNotifyChanged,
+  schemaRenderFieldSource,
+  schemaRenderLayout,
+  schemaRenderOrder,
+  schemaRenderReadonly,
+  schemaRenderVisible,
+} from './rest.ts';
+
+export const render = {
+  // render
+  layout: schemaRenderLayout,
+  visible: schemaRenderVisible,
+  readonly: schemaRenderReadonly,
+  order: schemaRenderOrder,
+  disableNotifyChanged: schemaRenderDisableNotifyChanged,
+  fieldSource: schemaRenderFieldSource,
+  // component
+  field: schemaRenderField,
+  fieldJsx: schemaRenderFieldJsx,
+  cell: schemaRenderCell,
+  cellJsx: schemaRenderCellJsx,
+  actionRow: schemaRenderActionRow,
+  actionRowJsx: schemaRenderActionRowJsx,
+  actionBulk: schemaRenderActionBulk,
+  actionBulkJsx: schemaRenderActionBulkJsx,
+  block: schemaRenderBlock,
+  blockJsx: schemaRenderBlockJsx,
+};

package/cli/templates/rest/rest.ts

@@ -0,0 +1,51 @@
+import type z from 'zod';
+
+import { TypeFormSchemaScene } from 'zova-module-a-openapi';
+import { ISchemaRenderComponentLayoutOptions } from 'zova-module-a-openapi';
+import { TypeSchemaScene } from 'zova-module-a-openapi';
+import { TypeSchemaOrderLevel } from 'zova-module-a-openapi';
+
+import { _generalSchemaRest, _order } from './inner.ts';
+
+export function schemaRenderLayout<T extends z.ZodType>(layoutOptions: ISchemaRenderComponentLayoutOptions, scene?: TypeFormSchemaScene) {
+  return function (schema: T): T {
+    const options = { layout: layoutOptions };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}
+
+export function schemaRenderVisible<T extends z.ZodType>(visible?: boolean, scene?: TypeSchemaScene) {
+  return function (schema: T): T {
+    const options = { visible };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}
+
+export function schemaRenderReadonly<T extends z.ZodType>(readonly?: boolean, scene?: TypeSchemaScene) {
+  return function (schema: T): T {
+    const options = { readonly };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}
+
+export function schemaRenderDisableNotifyChanged<T extends z.ZodType>(disableNotifyChanged?: boolean, scene?: TypeSchemaScene) {
+  return function (schema: T): T {
+    const options = { disableNotifyChanged };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}
+
+export function schemaRenderFieldSource<T extends z.ZodType>(fieldSource: string, scene?: TypeSchemaScene) {
+  return function (schema: T): T {
+    const options = { fieldSource };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}
+
+export function schemaRenderOrder<T extends z.ZodType>(order: number, level?: TypeSchemaOrderLevel, scene?: TypeSchemaScene) {
+  const orderReal = _order(order, level);
+  return function (schema: T): T {
+    const options = { order: orderReal };
+    return _generalSchemaRest(schema, options, scene);
+  };
+}

package/cli/templates/rest/utils.ts

@@ -0,0 +1,27 @@
+import type { IActionRecord, TypeActionOptions } from 'zova-module-a-action';
+import type { IVonaComponentRecord, TypeComponentOptions } from 'zova-module-a-bean';
+import type { IIconRecord } from 'zova-module-a-icon';
+import type { TypePagePathSchema } from 'zova-module-a-router';
+
+declare module 'zova-module-a-router' {
+  export interface IPagePathRecord {
+    '/': TypePagePathSchema<undefined, undefined>;
+    'presetLogin': TypePagePathSchema<undefined, undefined>;
+    'presetErrorExpired': TypePagePathSchema<undefined, undefined>;
+    'presetResource': TypePagePathSchema<undefined, undefined>;
+  }
+}
+
+export function $iconName<K extends keyof IIconRecord>(name: K): any {
+  return name;
+}
+
+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.');
+}
+
+export function Component<K extends keyof IVonaComponentRecord>(options: TypeComponentOptions<K>) {
+  if (!options.name) throw new Error('should specify the component name');
+  return options.name;
+}

package/dist/index.js

@@ -11,7 +11,7 @@ import { camelToKebab, replaceTemplate, toUpperCaseFirstChar, toLowerCaseFirstCh
 import fse from 'fs-extra';
 import { build as build$1 } from 'tsdown';
 import yaml from 'yaml';
-import { saveJSONFile as saveJSONFile$1, createConfigUtils } from 'zova-vite';
+import { createConfigUtils, saveJSONFile as saveJSONFile$1 } from 'zova-vite';
 import fs from 'node:fs';
 import 'node:url';
 import { getOnionScenesMeta, getOnionMetasMeta } from '@cabloy/module-info';
@@ -169,6 +169,8 @@ async function saveJSONFile(fileName, json) {
   await fse.writeFile(fileName, `${JSON.stringify(json, null, 2)}\n`);
 }
 
+const __ThisSetName__ = 'front';
+
 function svgResolverPlugin() {
   return {
     name: 'svg-resolver',
@@ -239,6 +241,53 @@ class CliBinBuildRest extends BeanCliBase {
     await rimraf(srcDir);
   }
   async _prepareResources(context) {
+    const {
+      projectPath,
+      flavor,
+      bundleName,
+      srcDir
+    } = context;
+    const {
+      argv
+    } = this.context;
+    //
+    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();
+    // modulesMeta
+    const modulesMeta = await configUtils.loadModulesMeta();
+    // Modules
+    const modules = [];
+    const bundleModules = [];
+    for (const module of modulesMeta.modulesArray) {
+      modules.push(`export * from '${module.info.fullName}';`);
+      const moduleRoot = module.root.replaceAll('\\', '/');
+      if (moduleRoot.includes('/src/module/') || moduleRoot.includes('/src/suite/')) {
+        bundleModules.push(module.info.fullName);
+      }
+    }
+    context.bundleModules = bundleModules;
+    argv.Modules = modules.join('\n');
+    // Name/Version
+    argv.Name = bundleName;
+    argv.Version = env.APP_VERSION;
+    // templateDir
+    const templateDir = this.template.resolveTemplatePath(__ThisSetName__, 'rest');
+    // render
+    await this.template.renderDir(srcDir, templateDir);
+  }
+  async _prepareResources_(context) {
     // package.json
     await this._prepareResourcesPackage(context);
     // index.ts
@@ -271,8 +320,8 @@ class CliBinBuildRest extends BeanCliBase {
         alwaysBundle: _id => {
           return false;
         }
-      },
-      minify: true
+      }
+      // minify: true,
     });
     const fileIndex = path.join(outDir, 'index.mjs');
     let fileContent = (await fse.readFile(fileIndex)).toString();
@@ -281,9 +330,9 @@ class CliBinBuildRest extends BeanCliBase {
   }
   async _buildDts({
     srcDir,
-    outDir
+    outDir,
+    bundleModules
   }) {
-    const bundleModules = this._prepareBundleModules();
     // entry
     const entry = path.join(srcDir, 'index.ts');
     // build
@@ -307,8 +356,8 @@ class CliBinBuildRest extends BeanCliBase {
           if (bundleModules.includes(id)) return true;
           return false;
         }
-      },
-      minify: true
+      }
+      // minify: true,
     });
   }
   async _build(buildContext) {
@@ -373,6 +422,8 @@ 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,
@@ -426,9 +477,17 @@ export type {
     } 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;
   }
@@ -515,8 +574,6 @@ async function getPackageVersionFromNodeModules(projectPath, packageName) {
   return pkgContent.version;
 }
 
-const __ThisSetName__ = 'front';
-
 let __snippetsPathPrefix;
 class CliCreateBean extends BeanCliBase {
   async execute() {

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

@@ -3,6 +3,9 @@ import { BeanCliBase } from '@cabloy/cli';
 declare module '@cabloy/cli' {
     interface ICommandArgv {
         flavor?: ZovaMetaFlavor;
+        Modules: string;
+        Name: string;
+        Version: string;
     }
 }
 interface IBinBuildRestContext {
@@ -12,13 +15,15 @@ interface IBinBuildRestContext {
     bundleNameCopy: string;
     srcDir: string;
     outDir: string;
+    bundleModules?: string[];
 }
 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 }: 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>;

package/dist-cli/templates/refactor/componentModel/snippets/1-controller.js

@@ -1,10 +1,9 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 const __regProps = /interface Controller[^<]*Props<(.*?)>/;
 const __regModelsReplace = /interface [^<]*Models([^{]*) \{/;
-const __regModelValue = /import \{[^}]*ModelValue[^}]*\} from 'zova';/;
-const __regModelValueReplace = /import \{ ([^}]*) \} from 'zova';/;
 const __regPropsDefaultReplace = /static \$propsDefault([^{]*) = \{/;
 const __regLocalNameReplace = /protected async __init__/;
+const __regLocalNameInitReplace = /protected async __init__([^{]*){/;
 export default metadataCustomSnippet({
     file: ({ argv }) => {
         return argv.controllerFileName;
@@ -30,19 +29,17 @@ export default metadataCustomSnippet({
         ast = ast.replace(__regModelsReplace, $0 => {
             return `${$0}\n  '${typeName}'?: number;`;
         });
-        // @Model
-        if (!__regModelValue.test(ast)) {
-            ast = ast.replace(__regModelValueReplace, (_, $1) => {
-                return `import { ${$1}, ModelValue } from 'zova';`;
-            });
-        }
         // propsDefault
         ast = ast.replace(__regPropsDefaultReplace, $0 => {
             return `${$0}\n  ${modelName}: 0,`;
         });
         // localName
         ast = ast.replace(__regLocalNameReplace, $0 => {
-            return `@ModelValue()\n${localName}: number;\n\n    ${$0}`;
+            return `${localName}: number;\n\n    ${$0}`;
+        });
+        // init
+        ast = ast.replace(__regLocalNameInitReplace, $0 => {
+            return `${$0}\n    this.${localName} = this.$useModel('${modelName}');`;
         });
         // ok
         return ast;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.37",
-  "gitHead": "da650d644d8851a92a8da4babaebfef74c9e8a5d",
+  "version": "1.2.41",
+  "gitHead": "6c7a09c8f0a8a0f41c5090b544a1667dbc689f0e",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -65,6 +65,6 @@
     "vite": "^8.0.2",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.9",
-    "zova-vite": "^1.1.20"
+    "zova-vite": "^1.1.23"
   }
 }