cabloy 5.1.64 → 5.1.66

package/zova/src/suite-vendor/a-zova/modules/a-command/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-command",
-  "version": "5.1.29",
+  "version": "5.1.30",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [
@@ -58,7 +58,8 @@
         "optionsGlobalInterfaceFrom": "zova-module-a-command",
         "boilerplate": "command/boilerplate",
         "boilerplateCommandBulk": "commandBulk/boilerplate",
-        "boilerplateCommandRow": "commandRow/boilerplate"
+        "boilerplateCommandRow": "commandRow/boilerplate",
+        "boilerplateCommandDetailsRow": "commandDetailsRow/boilerplate"
       }
     },
     "capabilities": {

package/zova/src/suite-vendor/a-zova/modules/a-command/src/types/command.ts

@@ -40,6 +40,8 @@ export interface ICommandRowOptionsBase<Result = any> extends ICommandOptionsBas
   id?: TableIdentity;
 }
 
+export interface ICommandDetailsRowOptionsBase<Result = any> extends ICommandOptionsBase<Result> {}
+
 declare module 'zova-module-a-bean' {
   export interface SysOnion {
     command: ServiceOnion<IDecoratorCommandOptions, keyof ICommandRecord>;

package/zova/src/suite-vendor/a-zova/modules/a-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-form",
-  "version": "5.1.35",
+  "version": "5.1.36",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-form/src/component/form/controller.tsx

@@ -127,6 +127,7 @@ export class ControllerForm<
   }
 
   public async submit(submitMeta?: TSubmitMeta): Promise<boolean> {
+    if (this.formMeta?.formScene === 'view') return false;
     const [_, error] = await catchError(() => {
       return this.form.handleSubmit(submitMeta as any);
     });

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.35",
+  "version": "5.1.37",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [
@@ -34,7 +34,7 @@
     "postpack": "clean-package restore && npm run clean"
   },
   "dependencies": {
-    "@cabloy/json-schema-to-zod": "^2.6.4",
+    "@cabloy/json-schema-to-zod": "^2.6.5",
     "openapi3-ts": "^4.5.0",
     "typestyle": "^2.4.0"
   },

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/lib/schema.ts

@@ -76,15 +76,31 @@ function _normalizeSchema(
   const schemaNew = Object.assign({}, schema, { properties: {} });
   for (const key in schema.properties) {
     let property = schema.properties[key] as SchemaObject | undefined;
-    if (property?.$ref) {
-      property = onGetSchema(property.$ref);
-    }
+    property = _normalizePropertySchema(property, onGetSchema);
     if (!property) continue;
-    schemaNew.properties[key] = _normalizeSchema(property, onGetSchema);
+    // items.$ref
+    if (property.items?.$ref) {
+      const propertyItems = _normalizePropertySchema(property.items as any, onGetSchema);
+      if (!propertyItems) continue;
+      property = { ...property, items: propertyItems };
+    }
+    // _normalizeSchema
+    schemaNew.properties[key] = property;
   }
   return schemaNew;
 }
 
+function _normalizePropertySchema(
+  property: SchemaObject | undefined,
+  onGetSchema: (schemaName: string) => SchemaObject | undefined,
+) {
+  if (property?.$ref) {
+    property = onGetSchema(property.$ref);
+  }
+  if (!property) return;
+  return _normalizeSchema(property, onGetSchema);
+}
+
 export function getSchemaOfRequestBody(
   operationObject?: OperationObject,
 ): SchemaObject | undefined {

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/action.ts

@@ -21,7 +21,7 @@ export interface IJsxRenderContextPageEntry extends IJsxRenderContextBase {
 
 export interface IPageEntryScope {
   resource?: string;
-  id: TableIdentity | null;
+  id?: TableIdentity | null;
   permissions?: TypeOpenapiPermissions;
 }
 
@@ -35,6 +35,7 @@ export interface IJsxRenderSceneRecord {
   formField: never;
   //
   details: never;
+  detail: never;
 }
 
 export interface IPageScope {

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/detail.ts

@@ -0,0 +1,10 @@
+import { IJsxRenderContextBase } from '../action.js';
+import { IFormMeta } from '../formMeta.js';
+
+export interface IDetailScope {
+  formMeta?: IFormMeta;
+}
+
+export interface IJsxRenderContextDetail extends IJsxRenderContextBase {
+  $celScope: IDetailScope;
+}

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/details.ts

@@ -1,6 +1,9 @@
 import { IJsxRenderContextBase } from '../action.js';
+import { IFormMeta } from '../formMeta.js';
 
-export interface IDetailsScope {}
+export interface IDetailsScope {
+  formMeta?: IFormMeta;
+}
 
 export interface IJsxRenderContextDetails extends IJsxRenderContextBase {
   $celScope: IDetailsScope;

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/detailsActionRow.ts

@@ -0,0 +1,24 @@
+import { types } from 'typestyle';
+import { TypeRenderComponentJsx } from 'zova-jsx';
+
+import type { IPermissionHintDetailsActionRow } from '../permissions.js';
+
+export type IResourceDetailsActionRowNameRecord = {
+  [KEY in keyof IResourceDetailsActionRowRecord as KEY extends `${string}:action${infer Name}`
+    ? Uncapitalize<Name>
+    : KEY]: IResourceDetailsActionRowRecord[KEY];
+};
+
+export interface IResourceDetailsActionRowRecord {}
+
+export interface IResourceDetailsActionRowOptionsBase {
+  class?: any;
+  style?: types.NestedCSSProperties;
+  permission?: IPermissionHintDetailsActionRow;
+}
+
+export interface IResourceRenderDetailsActionRowOptionsAction {
+  name?: keyof IResourceDetailsActionRowNameRecord; // not omit operationsRow
+  render?: keyof IResourceDetailsActionRowRecord | TypeRenderComponentJsx;
+  options?: IResourceDetailsActionRowOptionsBase;
+}

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/index.ts

@@ -1,2 +1,4 @@
 export * from './details.js';
 export * from './detailsActionBulk.js';
+export * from './detailsActionRow.js';
+export * from './detail.js';

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/permissions.ts

@@ -35,6 +35,10 @@ export interface IPermissionHintTableActionBulk {
   public?: boolean;
 }
 
+export interface IPermissionHintDetailsActionRow {
+  formScene?: TypeFormScene | TypeFormScene[];
+}
+
 export interface IPermissionHintDetailsActionBulk {
   // actionInherit?: keyof IResourceDetailsActionBulkNameRecord;
   // public?: boolean;

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/rest.ts

@@ -6,6 +6,7 @@ import 'openapi3-ts/oas30';
 import 'openapi3-ts/oas31';
 import { SchemaObject } from 'openapi3-ts/oas31';
 
+import { IResourceDetailsActionRowRecord } from './detail/detailsActionRow.js';
 import { IResourceRenderBlockOptionsBlock } from './resource/block.js';
 import { IResourceFormFieldRecord } from './resource/formField.js';
 import { IResourceTableActionRowRecord } from './resource/tableActionRow.js';
@@ -112,6 +113,7 @@ export type TypeTableCellRenderComponentNormal =
   | TypeRenderComponentPreset;
 export type TypeTableCellRenderComponent =
   | keyof IResourceTableActionRowRecord
+  | keyof IResourceDetailsActionRowRecord
   | TypeRenderComponentJsx;
 export type TypeTableCellRenderComponentProvider = TypeRenderComponentJsx | 'text' | string;
 export type TypeTableBulkRenderComponentProvider =

package/zova/src/suite-vendor/a-zova/modules/a-table/cli/detailsActionRow/boilerplate/{{sceneName}}.{{beanName}}.tsx_

@@ -0,0 +1,24 @@
+import type { IResourceDetailsActionRowOptionsBase } from 'zova-module-a-openapi';
+import type {
+  IJsxRenderContextTableCell,
+  ITableCellRender,
+  NextTableCellRender,
+} from 'zova-module-a-table';
+
+import { BeanBase } from 'zova';
+import { TableCell } from 'zova-module-a-table';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceDetailsActionRowRecord {
+    '<%=argv.module%>:<%=argv.beanName%>'?: ITableCellOptions<%=argv.beanNameCapitalize%>;
+  }
+}
+
+export interface ITableCellOptions<%=argv.beanNameCapitalize%> extends IResourceDetailsActionRowOptionsBase {}
+
+@TableCell<ITableCellOptions<%=argv.beanNameCapitalize%>>()
+export class TableCell<%=argv.beanNameCapitalize%> extends BeanBase implements ITableCellRender {
+  render(_options: ITableCellOptions<%=argv.beanNameCapitalize%>, _renderContext: IJsxRenderContextTableCell, next: NextTableCellRender) {
+    return next();
+  }
+}

package/zova/src/suite-vendor/a-zova/modules/a-table/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-table",
-  "version": "5.1.32",
+  "version": "5.1.33",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [
@@ -76,7 +76,8 @@
         "optionsGlobalInterfaceName": "IDecoratorTableCellOptions",
         "optionsGlobalInterfaceFrom": "zova-module-a-table",
         "boilerplate": "tableCell/boilerplate",
-        "boilerplateTableActionRow": "tableActionRow/boilerplate"
+        "boilerplateTableActionRow": "tableActionRow/boilerplate",
+        "boilerplateDetailsActionRow": "detailsActionRow/boilerplate"
       }
     }
   }

package/zova/src/suite-vendor/a-zova/modules/a-table/src/component/table/controller.tsx

@@ -11,6 +11,7 @@ import {
   CellContext,
   createColumnHelper,
   getCoreRowModel,
+  Row,
   TableOptionsWithReactiveData,
 } from '@tanstack/vue-table';
 import { SchemaObject } from 'openapi3-ts/oas31';
@@ -50,6 +51,7 @@ export interface ControllerTableProps<TData extends {} = {}> {
   tableScope?: ITableScope;
   getColumns?: TypeTableGetColumns<TData>;
   slotDefault?: (table: ControllerTable<TData>) => VNode;
+  getRowId?: (originalRow: TData, index: number, parent?: Row<TData>) => string;
 }
 
 @Controller()
@@ -85,11 +87,11 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     this._createTable();
   }
 
-  get schema() {
+  public get schema() {
     return this.$props.schema;
   }
 
-  get data() {
+  public get data() {
     return this.$props.data;
   }
 
@@ -102,7 +104,7 @@ export class ControllerTable<TData extends {} = {}> extends BeanControllerTableB
     // eslint-disable-next-line
     const self = this;
     const tableOptions: TableOptionsWithReactiveData<TData> = {
-      getRowId: (row: TData) => cast(row).id,
+      getRowId: this.$props.getRowId ?? ((originalRow: TData) => cast(originalRow).id),
       getCoreRowModel: getCoreRowModel(),
       renderFallbackValue: this.scope.config.renderFallbackValue,
       manualPagination: true,

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.70",
+  "version": "5.1.74",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -46,7 +46,7 @@
     "zova-jsx": "^1.1.63"
   },
   "devDependencies": {
-    "@cabloy/cli": "^3.1.18",
+    "@cabloy/cli": "^3.1.23",
     "@types/luxon": "^3.7.1",
     "clean-package": "^2.2.0",
     "fs-extra": "^11.3.5",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.104",
+  "version": "5.1.109",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -14,15 +14,15 @@
     "zova-module-a-behavior": "^5.1.22",
     "zova-module-a-behaviors": "^5.1.18",
     "zova-module-a-boundary": "^5.1.18",
-    "zova-module-a-command": "^5.1.29",
+    "zova-module-a-command": "^5.1.30",
     "zova-module-a-fetch": "^5.1.20",
-    "zova-module-a-form": "^5.1.35",
+    "zova-module-a-form": "^5.1.36",
     "zova-module-a-icon": "^5.1.23",
     "zova-module-a-interceptor": "^5.1.26",
     "zova-module-a-logger": "^5.1.23",
     "zova-module-a-meta": "^5.1.18",
     "zova-module-a-model": "^5.1.27",
-    "zova-module-a-openapi": "^5.1.35",
+    "zova-module-a-openapi": "^5.1.37",
     "zova-module-a-router": "^5.1.26",
     "zova-module-a-routerstack": "^5.1.23",
     "zova-module-a-routertabs": "^5.1.29",
@@ -30,9 +30,9 @@
     "zova-module-a-ssrhmr": "^5.1.19",
     "zova-module-a-ssrserver": "^5.1.19",
     "zova-module-a-style": "^5.1.29",
-    "zova-module-a-table": "^5.1.32",
+    "zova-module-a-table": "^5.1.33",
     "zova-module-a-zod": "^5.1.30",
-    "zova-module-a-zova": "^5.1.70"
+    "zova-module-a-zova": "^5.1.74"
   },
   "title": "a-zova"
 }

package/zova/src/suite/cabloy-basic/modules/basic-details/src/.metadata/component/blockDetailsToolbarBulk.ts

@@ -1,31 +0,0 @@
-import type { TypeControllerInnerProps } from 'zova';
-
-import { defineComponent } from 'vue';
-import { prepareComponentOptions, useController } from 'zova';
-
-import type { ControllerBlockDetailsToolbarBulkProps } from '../../component/blockDetailsToolbarBulk/controller.jsx';
-
-import { ControllerBlockDetailsToolbarBulk } from '../../component/blockDetailsToolbarBulk/controller.jsx';
-export type ZBlockDetailsToolbarBulkProps = {
-  controllerRef?: (ref: ControllerBlockDetailsToolbarBulk) => void;
-} & ControllerBlockDetailsToolbarBulkProps;
-
-type ControllerInnerProps = TypeControllerInnerProps<
-  ControllerBlockDetailsToolbarBulkProps,
-  keyof typeof ControllerBlockDetailsToolbarBulk.$propsDefault
->;
-declare module 'zova-module-basic-details' {
-  export interface ControllerBlockDetailsToolbarBulk {
-    $props: ControllerInnerProps;
-  }
-}
-
-export const ZBlockDetailsToolbarBulk = defineComponent((_props: ZBlockDetailsToolbarBulkProps) => {
-  useController(ControllerBlockDetailsToolbarBulk, undefined, undefined);
-  return () => {};
-}, prepareComponentOptions(ControllerBlockDetailsToolbarBulk.$componentOptions));
-declare module 'zova-module-a-bean' {
-  export interface IVonaComponentRecord {
-    'basic-details:blockDetailsToolbarBulk': ControllerBlockDetailsToolbarBulkProps;
-  }
-}