zova-cli-set-front 1.2.43 → 1.2.45

package/cli/templates/create/module/boilerplate/_package.json

@@ -14,7 +14,7 @@
   "description": "<%=argv.description%>",
   "keywords": ["Zova Module"],
   "author": "<%=argv.author%>",
-  "files": ["mock", "dist", "src", "icons", "assets", "rest"],
+  "files": ["mock", "dist", "src", "icons", "assets"],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
     "tsc:publish": "npm run clean && zova :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",

package/cli/templates/rest/component.ts

@@ -2,27 +2,30 @@ import type z from 'zod';
 import type { TypeRenderComponentJsx } from 'zova-jsx';
 import type {
   IResourceFormFieldRecord,
+  IResourceTableCellRecord,
+  IResourceTableActionRowRecord,
+  IResourceFormActionRowRecord,
+  IResourceTableActionBulkRecord,
+  IResourceBlockRecord,
   TypeFormSchemaScene,
-  IResourceTableActionRowRecordBoth,
-  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 } from './inner.ts';
+import { _generalSchemaRest, _toLowerCaseFirstChar } from './inner.ts';
 
 export function schemaRenderField<K extends keyof IResourceFormFieldRecord, T extends z.ZodType>(
-  name: K,
+  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 IResourceTableActionRowRecordBoth, T extends z.ZodType>(
-  name: K,
-  options?: IResourceTableActionRowRecordBoth[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

@@ -2966,20 +2966,9 @@ ${contentResourceIcons}
 }
 /** icons: end */
 `;
-  // restComponent
-  await generateRestIcon(moduleName, modulePath);
   // ok
   return content;
 }
-async function generateRestIcon(moduleName, modulePath, _resourceIcons) {
-  // icons
-  const contentResourceIcons = `export * from 'zova-module-${moduleName}';\n`;
-  const fileIcons = path.join(modulePath, 'rest/icons.ts');
-  await fse.outputFile(fileIcons, contentResourceIcons);
-  // index
-  const exportIndexContent = "export * from './icons.js';";
-  await generateRestIndex(modulePath, exportIndexContent);
-}
 async function _generateFileConfigIcons(groups) {
   const groupsFrontImport = [];
   const groupsFrontExport = [];
@@ -3062,18 +3051,6 @@ function _getRecordId(moduleName, groupName, iconName) {
   if (groupName === 'default') groupName = '';
   return `${moduleName}:${groupName}:${iconName}`;
 }
-async function generateRestIndex(modulePath, append) {
-  // index
-  const fileIndex = path.join(modulePath, 'rest/index.ts');
-  let contentIndex = '';
-  if (fse.existsSync(fileIndex)) {
-    contentIndex = (await fse.readFile(fileIndex)).toString();
-  }
-  if (!contentIndex.includes(append)) {
-    contentIndex = `${contentIndex}${append}\n`;
-    await fse.outputFile(fileIndex, contentIndex);
-  }
-}
 
 // import SVGCompiler from 'svg-baker';
 // const svgSymbol = await new SVGCompiler().addSymbol({

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

@@ -10,4 +10,3 @@ export declare function extractBeanInfo(sceneName: string, fileContent: string,
 };
 export declare function beanFullNameFromOnionName(onionName: string, sceneName: string): string;
 export declare function onionNameFromBeanFullName(beanFullName: string, sceneName: string): string;
-export declare function generateRestIndex(modulePath: string, append: string): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.43",
-  "gitHead": "f5fbd410ec433943070bb60839f1e762f98593c6",
+  "version": "1.2.45",
+  "gitHead": "343c61ad189fe3f0fc997ee9f4c710567657e05c",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -40,7 +40,7 @@
     "@cabloy/extend": "^3.1.0",
     "@cabloy/module-info": "^2.0.0",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@cabloy/utils": "^2.1.15",
+    "@cabloy/utils": "^2.1.16",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/word-utils": "^2.1.9",