cabloy 5.1.108 → 5.1.109

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

@@ -33,13 +33,34 @@ export class RenderForm extends BeanRenderBase {
     return children;
   }
 
+  private _renderFromBlocks() {
+    const blocks = this.$props.blocks;
+    if (!blocks || blocks.length === 0) {
+      return this._renderSchema();
+    }
+    const celScope = this.getFormScope();
+    const jsxRenderContext = this.getFormJsxRenderContext(celScope);
+    const domBlocks: VNode[] = [];
+    blocks.forEach((block, index) => {
+      const options = Object.assign({ key: index }, block.options);
+      const domBlock = this.zovaJsx.render(block.render!, options, celScope, jsxRenderContext);
+      if (!domBlock) return;
+      if (Array.isArray(domBlock)) {
+        domBlocks.push(...domBlock);
+      } else {
+        domBlocks.push(domBlock);
+      }
+    });
+    return domBlocks;
+  }
+
   private _renderBodyInner() {
     const FormTag = this.$props.formTag;
     return this.$slotDefault ? (
       this.$slotDefault(this)
     ) : (
       <>
-        {this._renderSchema()}
+        {this.$props.blocks ? this._renderFromBlocks() : this._renderSchema()}
         {FormTag === 'form' && <button type="submit" style={{ display: 'none' }}></button>}
       </>
     );
@@ -48,9 +69,6 @@ export class RenderForm extends BeanRenderBase {
   private _renderProps() {
     const FormTag = this.$props.formTag;
     const props: any = {};
-    if (this.$props.inline) {
-      props.class = 'inline';
-    }
     if (FormTag === 'form') {
       props.onSubmit = (e: SubmitEvent) => {
         if (this.$props.onFormSubmit) {

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

@@ -1,5 +1,6 @@
 import { isNil } from '@cabloy/utils';
-import { useField, useStore } from '@tanstack/vue-form';
+import { useField } from '@tanstack/vue-form';
+import { useSelector } from '@tanstack/vue-store';
 import { markRaw } from 'vue';
 import z from 'zod';
 import { BeanControllerBase, deepEqual, IComponentOptions, Use } from 'zova';
@@ -139,7 +140,7 @@ export class ControllerFormField<TParentData extends {} = {}> extends BeanContro
   private _createField() {
     const options = this._getFormFieldOptions();
     const field = markRaw(useField(options as any)) as any;
-    const fieldState = useStore(field.api.store, state => state) as any;
+    const fieldState = useSelector(field.api.store, state => state) as any;
     return { api: field.api, state: fieldState };
   }
 

package/zova/src/suite-vendor/a-zova/modules/a-form/src/lib/formLayout.ts

@@ -0,0 +1,203 @@
+import type {
+  IFormLayout,
+  IFormLayoutField,
+  IFormLayoutNode,
+  IFormLayoutTab,
+  IFormLayoutTabs,
+  ISchemaObjectExtensionField,
+} from 'zova-module-a-openapi';
+
+import type {
+  IFormLayoutDiagnostic,
+  IResolvedFormLayout,
+  IResolvedFormLayoutField,
+  IResolvedFormLayoutGroup,
+  IResolvedFormLayoutNode,
+  IResolvedFormLayoutSection,
+  IResolvedFormLayoutTab,
+  IResolvedFormLayoutTabs,
+} from '../types/formLayout.js';
+
+export function resolveFormLayout(
+  layout: IFormLayout,
+  properties: ISchemaObjectExtensionField[] | undefined,
+): IResolvedFormLayout {
+  const propertyNames = new Set(
+    properties
+      ?.filter(item => item.rest?.visible !== false)
+      .map(item => item.key)
+      .filter(Boolean) as string[],
+  );
+  const fieldNames = new Set<string>();
+  const nodeIds = new Set<string>();
+  const diagnostics: IFormLayoutDiagnostic[] = [];
+  const fieldTabPaths: IResolvedFormLayout['fieldTabPaths'] = {};
+  const children = layout.children
+    .map((node, index) =>
+      resolveNode(
+        node,
+        [index],
+        [],
+        propertyNames,
+        fieldNames,
+        nodeIds,
+        diagnostics,
+        fieldTabPaths,
+      ),
+    )
+    .filter(Boolean) as IResolvedFormLayoutNode[];
+  for (const property of properties ?? []) {
+    const name = property.key;
+    if (!name || !propertyNames.has(name) || fieldNames.has(name)) continue;
+    fieldNames.add(name);
+    children.push({ type: 'field', name });
+  }
+  return { children, fieldTabPaths, diagnostics };
+}
+
+function resolveNode(
+  node: IFormLayoutNode,
+  indexPath: number[],
+  tabPath: IResolvedFormLayout['fieldTabPaths'][string],
+  propertyNames: Set<string>,
+  fieldNames: Set<string>,
+  nodeIds: Set<string>,
+  diagnostics: IFormLayoutDiagnostic[],
+  fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
+): IResolvedFormLayoutNode | undefined {
+  if (node.type === 'field') {
+    return resolveField(node, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths);
+  }
+  if (node.type === 'tabs') {
+    return resolveTabs(
+      node,
+      indexPath,
+      propertyNames,
+      fieldNames,
+      nodeIds,
+      diagnostics,
+      fieldTabPaths,
+    );
+  }
+  const id = resolveId(node, indexPath);
+  if (!registerId(id, nodeIds, diagnostics)) return;
+  if (node.type === 'section') {
+    const children = node.children
+      .map(item =>
+        resolveField(item, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths),
+      )
+      .filter(Boolean) as IResolvedFormLayoutField[];
+    return children.length ? { ...node, id, children } : undefined;
+  }
+  const children = node.children
+    .map((item, index) =>
+      resolveNode(
+        item,
+        [...indexPath, index],
+        tabPath,
+        propertyNames,
+        fieldNames,
+        nodeIds,
+        diagnostics,
+        fieldTabPaths,
+      ),
+    )
+    .filter(Boolean) as Array<
+    IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
+  >;
+  return children.length ? { ...node, id, children } : undefined;
+}
+
+function resolveTabs(
+  node: IFormLayoutTabs,
+  indexPath: number[],
+  propertyNames: Set<string>,
+  fieldNames: Set<string>,
+  nodeIds: Set<string>,
+  diagnostics: IFormLayoutDiagnostic[],
+  fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
+): IResolvedFormLayoutTabs | undefined {
+  const id = resolveId(node, indexPath);
+  if (!registerId(id, nodeIds, diagnostics)) return;
+  const children = node.children
+    .map((tab, index) =>
+      resolveTab(
+        tab,
+        [...indexPath, index],
+        id,
+        propertyNames,
+        fieldNames,
+        nodeIds,
+        diagnostics,
+        fieldTabPaths,
+      ),
+    )
+    .filter(Boolean) as IResolvedFormLayoutTab[];
+  return children.length ? { ...node, id, children } : undefined;
+}
+
+function resolveTab(
+  node: IFormLayoutTab,
+  indexPath: number[],
+  tabsId: string,
+  propertyNames: Set<string>,
+  fieldNames: Set<string>,
+  nodeIds: Set<string>,
+  diagnostics: IFormLayoutDiagnostic[],
+  fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
+): IResolvedFormLayoutTab | undefined {
+  const id = resolveId(node, indexPath);
+  if (!registerId(id, nodeIds, diagnostics)) return;
+  const tabPath = [{ tabsId, tabId: id }];
+  const children = node.children
+    .map((item, index) =>
+      resolveNode(
+        item,
+        [...indexPath, index],
+        tabPath,
+        propertyNames,
+        fieldNames,
+        nodeIds,
+        diagnostics,
+        fieldTabPaths,
+      ),
+    )
+    .filter(Boolean) as Array<
+    IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection
+  >;
+  return children.length ? { ...node, id, children } : undefined;
+}
+
+function resolveField(
+  node: IFormLayoutField,
+  tabPath: IResolvedFormLayout['fieldTabPaths'][string],
+  propertyNames: Set<string>,
+  fieldNames: Set<string>,
+  diagnostics: IFormLayoutDiagnostic[],
+  fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
+): IResolvedFormLayoutField | undefined {
+  if (!propertyNames.has(node.name)) {
+    diagnostics.push({ type: 'unknownField', value: node.name });
+    return;
+  }
+  if (fieldNames.has(node.name)) {
+    diagnostics.push({ type: 'duplicateField', value: node.name });
+    return;
+  }
+  fieldNames.add(node.name);
+  fieldTabPaths[node.name] = tabPath;
+  return node;
+}
+
+function resolveId(node: { type: string; id?: string }, indexPath: number[]) {
+  return node.id || `${node.type}-${indexPath.join('-')}`;
+}
+
+function registerId(id: string, ids: Set<string>, diagnostics: IFormLayoutDiagnostic[]) {
+  if (!ids.has(id)) {
+    ids.add(id);
+    return true;
+  }
+  diagnostics.push({ type: 'duplicateId', value: id });
+  return false;
+}

package/zova/src/suite-vendor/a-zova/modules/a-form/src/lib/index.ts

@@ -1,3 +1,4 @@
 export * from './beanControllerFormBase.js';
 export * from './beanControllerPageFormBase.js';
 export * from './utils.js';
+export * from './formLayout.js';

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

@@ -17,7 +17,7 @@ import { types } from 'typestyle';
 
 import type { ControllerForm } from '../component/form/controller.jsx';
 import type { ControllerFormField } from '../component/formField/controller.jsx';
-import type { TypeBehaviorFormFieldOptions } from './form.js';
+import type { IFormScope, TypeBehaviorFormFieldOptions } from './form.js';
 
 export type HTMLInputElementType =
   | 'text'
@@ -139,7 +139,10 @@ export interface IJsxRenderContextFormField<
   $$form: ControllerForm<TParentData, TSubmitMeta>;
 }
 
-export interface IJsxRenderContextForm<TParentData extends {} = {}> extends IJsxRenderContextBase {
-  $celScope: IFormFieldScope<TParentData>;
-  $$form: ControllerForm<TParentData>;
+export interface IJsxRenderContextForm<
+  TParentData extends {} = {},
+  TSubmitMeta = never,
+> extends IJsxRenderContextBase {
+  $celScope: IFormScope;
+  $$form: ControllerForm<TParentData, TSubmitMeta>;
 }

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

@@ -0,0 +1,59 @@
+import type { IFormLayoutResponsiveColumns } from 'zova-module-a-openapi';
+
+export interface IResolvedFormLayout {
+  children: IResolvedFormLayoutNode[];
+  fieldTabPaths: Record<string, IResolvedFormLayoutTabRef[]>;
+  diagnostics: IFormLayoutDiagnostic[];
+}
+
+export interface IResolvedFormLayoutField {
+  type: 'field';
+  name: string;
+  span?: IFormLayoutResponsiveColumns;
+}
+
+export interface IResolvedFormLayoutGroup {
+  type: 'group';
+  id: string;
+  title?: string;
+  description?: string;
+  children: Array<IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
+}
+
+export interface IResolvedFormLayoutSection {
+  type: 'section';
+  id: string;
+  title?: string;
+  description?: string;
+  columns?: IFormLayoutResponsiveColumns;
+  children: IResolvedFormLayoutField[];
+}
+
+export interface IResolvedFormLayoutTabs {
+  type: 'tabs';
+  id: string;
+  children: IResolvedFormLayoutTab[];
+}
+
+export interface IResolvedFormLayoutTab {
+  type: 'tab';
+  id: string;
+  title: string;
+  children: Array<IResolvedFormLayoutField | IResolvedFormLayoutGroup | IResolvedFormLayoutSection>;
+}
+
+export interface IResolvedFormLayoutTabRef {
+  tabsId: string;
+  tabId: string;
+}
+
+export type IResolvedFormLayoutNode =
+  | IResolvedFormLayoutField
+  | IResolvedFormLayoutGroup
+  | IResolvedFormLayoutSection
+  | IResolvedFormLayoutTabs;
+
+export interface IFormLayoutDiagnostic {
+  type: 'duplicateField' | 'unknownField' | 'duplicateId';
+  value: string;
+}

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

@@ -1,2 +1,3 @@
 export * from './form.js';
 export * from './formField.js';
+export * from './formLayout.js';

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.43",
+  "version": "5.1.44",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -31,7 +31,7 @@ export interface IJsxRenderSceneRecord {
   // table: never;
   tableColumn: never;
   tableCell: never;
-  // form: never;
+  form: never;
   formField: never;
   //
   details: never;

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

@@ -0,0 +1,53 @@
+export interface IFormLayout {
+  children: IFormLayoutNode[];
+}
+
+export type TypeFormLayoutColumns = 1 | 2 | 3 | 4;
+
+export interface IFormLayoutResponsiveColumns {
+  default?: TypeFormLayoutColumns;
+  md?: TypeFormLayoutColumns;
+  lg?: TypeFormLayoutColumns;
+}
+
+export interface IFormLayoutField {
+  type: 'field';
+  name: string;
+  span?: IFormLayoutResponsiveColumns;
+}
+
+export interface IFormLayoutGroup {
+  type: 'group';
+  id?: string;
+  title?: string;
+  description?: string;
+  children: Array<IFormLayoutField | IFormLayoutGroup | IFormLayoutSection>;
+}
+
+export interface IFormLayoutSection {
+  type: 'section';
+  id?: string;
+  title?: string;
+  description?: string;
+  columns?: IFormLayoutResponsiveColumns;
+  children: IFormLayoutField[];
+}
+
+export interface IFormLayoutTabs {
+  type: 'tabs';
+  id?: string;
+  children: IFormLayoutTab[];
+}
+
+export interface IFormLayoutTab {
+  type: 'tab';
+  id?: string;
+  title: string;
+  children: Array<IFormLayoutField | IFormLayoutGroup | IFormLayoutSection>;
+}
+
+export type IFormLayoutNode =
+  | IFormLayoutField
+  | IFormLayoutGroup
+  | IFormLayoutSection
+  | IFormLayoutTabs;

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

@@ -2,6 +2,7 @@ export * from './block.js';
 export * from './formActionRow.js';
 export * from './formField.js';
 export * from './formFieldLayout.js';
+export * from './formLayout.js';
 export * from './tableAction.js';
 export * from './tableActionBulk.js';
 export * from './tableActionRow.js';

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.29",
+  "version": "5.1.30",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

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

@@ -193,7 +193,7 @@ export class CtxSSR extends BeanSimple {
           : stringifyStyle(normalizeStyle(clientValue));
         el.setAttribute(key, expected as string);
       }
-    } else if (['id', 'name', 'for', 'd'].includes(key)) {
+    } else if (['id', 'name', 'for', 'd', 'aria-labelledby', 'aria-controls'].includes(key)) {
       ignore = true;
       if (clientValue !== undefined) {
         expected = String(clientValue);

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.135",
+  "version": "5.1.136",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -16,17 +16,17 @@
     "zova-module-a-boundary": "^5.1.21",
     "zova-module-a-command": "^5.1.33",
     "zova-module-a-fetch": "^5.1.23",
-    "zova-module-a-form": "^5.1.43",
+    "zova-module-a-form": "^5.1.44",
     "zova-module-a-icon": "^5.1.26",
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.33",
-    "zova-module-a-openapi": "^5.1.43",
+    "zova-module-a-openapi": "^5.1.44",
     "zova-module-a-router": "^5.1.30",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.33",
-    "zova-module-a-ssr": "^5.1.29",
+    "zova-module-a-ssr": "^5.1.30",
     "zova-module-a-ssrhmr": "^5.1.22",
     "zova-module-a-ssrserver": "^5.1.23",
     "zova-module-a-style": "^5.1.32",