@nocobase/plugin-flow-engine 2.1.0-alpha.23 → 2.1.0-alpha.25

package/dist/server/flow-surfaces/catalog.js

@@ -55,7 +55,9 @@ var import_approval = require("./approval");
 var import_action_scope = require("./action-scope");
 var import_errors = require("./errors");
 var import_field_semantics = require("./field-semantics");
+var import_core_field_default_bindings = require("./core-field-default-bindings");
 var import_field_binding_registry = require("./field-binding-registry");
+var import_association_interfaces = require("./association-interfaces");
 var import_service_helpers = require("./service-helpers");
 var import_support_matrix = require("./support-matrix");
 const ANY_VALUE_SCHEMA = {};
@@ -70,6 +72,9 @@ const OPEN_VIEW_SCENE_SCHEMA = {
 const OBJECT_SCHEMA = { type: "object" };
 const NUMBER_SCHEMA = { type: "number" };
 const ARRAY_SCHEMA = { type: "array" };
+const NULLABLE_NUMBER_OR_STRING_SCHEMA = {
+  oneOf: [NUMBER_SCHEMA, NULLABLE_STRING_SCHEMA]
+};
 const FILTER_CONDITION_SCHEMA = {
   type: "object",
   properties: {
@@ -329,6 +334,79 @@ const CALENDAR_SETTINGS_GROUP = {
     "linkageRules.value": ARRAY_SCHEMA
   }
 };
+const TREE_BLOCK_PROP_SCHEMAS = {
+  searchable: BOOLEAN_SCHEMA,
+  defaultExpandAll: BOOLEAN_SCHEMA,
+  includeDescendants: BOOLEAN_SCHEMA,
+  fieldNames: OBJECT_SCHEMA,
+  pageSize: NUMBER_SCHEMA
+};
+const TREE_SETTINGS_GROUP = {
+  allowedPaths: [
+    "searchable.searchable",
+    "defaultExpandAll.defaultExpandAll",
+    "includeDescendants.includeDescendants",
+    "titleField.titleField",
+    "pageSize.pageSize",
+    "dataScope.filter",
+    "defaultSorting.sort"
+  ],
+  clearable: true,
+  mergeStrategy: "deep",
+  eventBindingSteps: ["treeSettings", "dataScope", "defaultSorting"],
+  pathSchemas: {
+    "searchable.searchable": BOOLEAN_SCHEMA,
+    "defaultExpandAll.defaultExpandAll": BOOLEAN_SCHEMA,
+    "includeDescendants.includeDescendants": BOOLEAN_SCHEMA,
+    "titleField.titleField": STRING_SCHEMA,
+    "pageSize.pageSize": NUMBER_SCHEMA,
+    "dataScope.filter": FILTER_GROUP_SCHEMA,
+    "defaultSorting.sort": ARRAY_SCHEMA
+  }
+};
+const KANBAN_SETTINGS_GROUP = {
+  allowedPaths: [
+    "grouping.groupField",
+    "grouping.groupTitleField",
+    "grouping.groupColorField",
+    "grouping.groupOptions",
+    "styleVariant.styleVariant",
+    "defaultSorting.sort",
+    "dragEnabled.dragEnabled",
+    "dragSortBy.dragSortBy",
+    "quickCreate.quickCreateEnabled",
+    "popup.mode",
+    "popup.size",
+    "popup.popupTemplateUid",
+    "popup.pageModelClass",
+    "popup.uid",
+    "pageSize.pageSize",
+    "columnWidth.columnWidth",
+    "dataScope.filter"
+  ],
+  clearable: true,
+  mergeStrategy: "deep",
+  eventBindingSteps: ["defaultSorting", "dataScope"],
+  pathSchemas: {
+    "grouping.groupField": STRING_SCHEMA,
+    "grouping.groupTitleField": NULLABLE_STRING_SCHEMA,
+    "grouping.groupColorField": NULLABLE_STRING_SCHEMA,
+    "grouping.groupOptions": ARRAY_SCHEMA,
+    "styleVariant.styleVariant": STRING_SCHEMA,
+    "defaultSorting.sort": ARRAY_SCHEMA,
+    "dragEnabled.dragEnabled": BOOLEAN_SCHEMA,
+    "dragSortBy.dragSortBy": NULLABLE_STRING_SCHEMA,
+    "quickCreate.quickCreateEnabled": BOOLEAN_SCHEMA,
+    "popup.mode": STRING_SCHEMA,
+    "popup.size": STRING_SCHEMA,
+    "popup.popupTemplateUid": NULLABLE_STRING_SCHEMA,
+    "popup.pageModelClass": NULLABLE_STRING_SCHEMA,
+    "popup.uid": NULLABLE_STRING_SCHEMA,
+    "pageSize.pageSize": NUMBER_SCHEMA,
+    "columnWidth.columnWidth": NUMBER_SCHEMA,
+    "dataScope.filter": FILTER_GROUP_SCHEMA
+  }
+};
 const TABLE_SETTINGS_GROUP = {
   allowedPaths: [
     "quickEdit.editable",
@@ -379,10 +457,13 @@ const REGISTERED_FILTER_FIELD_USE_SET = (0, import_field_binding_registry.getReg
 const EDITABLE_FIELD_USE_SET = /* @__PURE__ */ new Set([
   ...JS_EDITABLE_FIELD_USE_SET,
   "RecordSelectFieldModel",
+  "RecordPickerFieldModel",
   "JsonFieldModel",
   "TextareaFieldModel",
   "IconFieldModel",
+  "RadioGroupFieldModel",
   "SelectFieldModel",
+  "CheckboxGroupFieldModel",
   "ColorFieldModel",
   "CheckboxFieldModel",
   "PasswordFieldModel",
@@ -394,11 +475,15 @@ const EDITABLE_FIELD_USE_SET = /* @__PURE__ */ new Set([
   "TimeFieldModel",
   "CollectionSelectorFieldModel",
   "RichTextFieldModel",
-  "InputFieldModel"
+  "InputFieldModel",
+  "SubFormListFieldModel",
+  "SubTableFieldModel",
+  "PopupSubTableFieldModel"
 ]);
 const DISPLAY_FIELD_USE_SET = /* @__PURE__ */ new Set([
   ...JS_DISPLAY_FIELD_USE_SET,
   "DisplaySubItemFieldModel",
+  "DisplaySubListFieldModel",
   "DisplaySubTableFieldModel",
   "DisplayHtmlFieldModel",
   "DisplayNumberFieldModel",
@@ -430,7 +515,6 @@ const APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET = /* @__PURE__ */ new Set
   "ApplyTaskCardDetailsItemModel",
   "ApprovalTaskCardDetailsItemModel"
 ]);
-const SINGLE_VALUE_ASSOCIATION_INTERFACES = /* @__PURE__ */ new Set(["m2o", "o2o", "oho", "obo", "updatedBy", "createdBy"]);
 const KNOWN_FIELD_NODE_USES = /* @__PURE__ */ new Set([
   ...EDITABLE_FIELD_USE_SET,
   ...DISPLAY_FIELD_USE_SET,
@@ -871,6 +955,61 @@ CALENDAR_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
   calendarSettings: CALENDAR_SETTINGS_GROUP,
   cardSettings: BLOCK_CARD_SETTINGS_GROUP
 });
+const TREE_BLOCK_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
+  decoratorProps: ["height", "heightMode"],
+  stepParams: ["resourceSettings", "treeSettings", "cardSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS,
+    object: ["click"]
+  }
+});
+TREE_BLOCK_CONTRACT.domains.props = keyedDomain(
+  ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
+  "deep",
+  TREE_BLOCK_PROP_SCHEMAS
+);
+TREE_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
+  resourceSettings: RESOURCE_SETTINGS_GROUP,
+  treeSettings: TREE_SETTINGS_GROUP,
+  cardSettings: BLOCK_CARD_SETTINGS_GROUP
+});
+const KANBAN_BLOCK_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: [
+    "groupField",
+    "groupTitleField",
+    "groupColorField",
+    "groupOptions",
+    "styleVariant",
+    "sortField",
+    "globalSort",
+    "dragEnabled",
+    "dragSortBy",
+    "quickCreateEnabled",
+    "popupMode",
+    "popupSize",
+    "popupTemplateUid",
+    "popupPageModelClass",
+    "popupTargetUid",
+    "pageSize",
+    "columnWidth"
+  ],
+  decoratorProps: ["height", "heightMode"],
+  stepParams: ["resourceSettings", "kanbanSettings", "cardSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS,
+    object: ["click"]
+  }
+});
+KANBAN_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
+  resourceSettings: RESOURCE_SETTINGS_GROUP,
+  kanbanSettings: KANBAN_SETTINGS_GROUP,
+  cardSettings: BLOCK_CARD_SETTINGS_GROUP
+});
 const LIST_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [],
@@ -968,6 +1107,61 @@ GRID_CARD_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
   },
   cardSettings: BLOCK_CARD_SETTINGS_GROUP
 });
+const KANBAN_CARD_ITEM_CONTRACT = createContract({
+  editableDomains: ["props", "stepParams", "flowRegistry"],
+  props: [
+    "enableCardClick",
+    "openMode",
+    "popupSize",
+    "popupTemplateUid",
+    "pageModelClass",
+    "popupTargetUid",
+    "layout",
+    "labelAlign",
+    "labelWidth",
+    "labelWrap",
+    "colon"
+  ],
+  stepParams: ["cardSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS,
+    object: ["click"]
+  }
+});
+KANBAN_CARD_ITEM_CONTRACT.domains.stepParams = groupedDomain({
+  cardSettings: {
+    allowedPaths: [
+      "click.enableCardClick",
+      "popup.mode",
+      "popup.size",
+      "popup.popupTemplateUid",
+      "popup.pageModelClass",
+      "popup.uid",
+      "layout.layout",
+      "layout.labelAlign",
+      "layout.labelWidth",
+      "layout.labelWrap",
+      "layout.colon"
+    ],
+    clearable: true,
+    mergeStrategy: "deep",
+    eventBindingSteps: ["click", "popup", "layout"],
+    pathSchemas: {
+      "click.enableCardClick": BOOLEAN_SCHEMA,
+      "popup.mode": STRING_SCHEMA,
+      "popup.size": STRING_SCHEMA,
+      "popup.popupTemplateUid": NULLABLE_STRING_SCHEMA,
+      "popup.pageModelClass": NULLABLE_STRING_SCHEMA,
+      "popup.uid": NULLABLE_STRING_SCHEMA,
+      "layout.layout": STRING_SCHEMA,
+      "layout.labelAlign": STRING_SCHEMA,
+      "layout.labelWidth": NULLABLE_NUMBER_OR_STRING_SCHEMA,
+      "layout.labelWrap": BOOLEAN_SCHEMA,
+      "layout.colon": BOOLEAN_SCHEMA
+    }
+  }
+});
 const MARKDOWN_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "stepParams", "flowRegistry"],
   props: ["content", "value"],
@@ -1578,6 +1772,28 @@ CALENDAR_POPUP_ACTION_CONTRACT.domains.stepParams = groupedDomain({
     pathSchemas: OPEN_VIEW_PATH_SCHEMAS
   }
 });
+const KANBAN_POPUP_ACTION_CONTRACT = createContract({
+  editableDomains: ["stepParams"],
+  stepParams: ["popupSettings"],
+  eventCapabilities: {
+    direct: ACTION_DIRECT_EVENTS,
+    object: ACTION_OBJECT_EVENTS
+  },
+  eventBindings: {
+    popupSettings: {
+      stepKeys: ["openView"]
+    }
+  }
+});
+KANBAN_POPUP_ACTION_CONTRACT.domains.stepParams = groupedDomain({
+  popupSettings: {
+    allowedPaths: OPEN_VIEW_ALLOWED_PATHS,
+    clearable: true,
+    mergeStrategy: "deep",
+    eventBindingSteps: ["openView"],
+    pathSchemas: OPEN_VIEW_PATH_SCHEMAS
+  }
+});
 const DELETE_ACTION_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: ACTION_PROP_KEYS,
@@ -2225,6 +2441,8 @@ const NODE_CONTRACT_ENTRIES = [
   ["ApprovalBlockGridModel", GRID_NODE_CONTRACT],
   ["TableBlockModel", TABLE_BLOCK_CONTRACT],
   ["CalendarBlockModel", CALENDAR_BLOCK_CONTRACT],
+  ["TreeBlockModel", TREE_BLOCK_CONTRACT],
+  ["KanbanBlockModel", KANBAN_BLOCK_CONTRACT],
   ["CreateFormModel", CREATE_FORM_BLOCK_CONTRACT],
   ["EditFormModel", EDIT_FORM_BLOCK_CONTRACT],
   ["FormBlockModel", FORM_BLOCK_CONTRACT],
@@ -2246,6 +2464,7 @@ const NODE_CONTRACT_ENTRIES = [
   ["FormItemModel", FORM_ITEM_CONTRACT],
   ["FormAssociationItemModel", DETAILS_ITEM_CONTRACT],
   ["DetailsItemModel", DETAILS_ITEM_CONTRACT],
+  ["KanbanCardItemModel", KANBAN_CARD_ITEM_CONTRACT],
   ["FilterFormItemModel", FILTER_FORM_ITEM_CONTRACT],
   ["PatternFormItemModel", FORM_ITEM_CONTRACT],
   ["ApprovalDetailsItemModel", DETAILS_ITEM_CONTRACT],
@@ -2265,6 +2484,8 @@ const NODE_CONTRACT_ENTRIES = [
   ["PopupCollectionActionModel", POPUP_ACTION_CONTRACT],
   ["CalendarQuickCreateActionModel", CALENDAR_POPUP_ACTION_CONTRACT],
   ["CalendarEventViewActionModel", CALENDAR_POPUP_ACTION_CONTRACT],
+  ["KanbanQuickCreateActionModel", KANBAN_POPUP_ACTION_CONTRACT],
+  ["KanbanCardViewActionModel", KANBAN_POPUP_ACTION_CONTRACT],
   ["AddChildActionModel", POPUP_ACTION_CONTRACT],
   ["DeleteActionModel", DELETE_ACTION_CONTRACT],
   ["BulkDeleteActionModel", DELETE_ACTION_CONTRACT],
@@ -2353,112 +2574,19 @@ function inferEditableFieldUse(fieldInterface) {
   if (["m2m", "m2o", "o2o", "o2m", "oho", "obo", "updatedBy", "createdBy", "mbm"].includes(fieldInterface)) {
     return "RecordSelectFieldModel";
   }
-  const map = {
-    json: "JsonFieldModel",
-    textarea: "TextareaFieldModel",
-    icon: "IconFieldModel",
-    radioGroup: "SelectFieldModel",
-    color: "ColorFieldModel",
-    select: "SelectFieldModel",
-    multipleSelect: "SelectFieldModel",
-    checkboxGroup: "SelectFieldModel",
-    checkbox: "CheckboxFieldModel",
-    password: "PasswordFieldModel",
-    number: "NumberFieldModel",
-    integer: "NumberFieldModel",
-    id: "NumberFieldModel",
-    snowflakeId: "NumberFieldModel",
-    percent: "PercentFieldModel",
-    datetimeNoTz: "DateTimeNoTzFieldModel",
-    date: "DateOnlyFieldModel",
-    datetime: "DateTimeTzFieldModel",
-    createdAt: "DateTimeTzFieldModel",
-    updatedAt: "DateTimeTzFieldModel",
-    unixTimestamp: "DateTimeTzFieldModel",
-    time: "TimeFieldModel",
-    collection: "CollectionSelectorFieldModel",
-    tableoid: "CollectionSelectorFieldModel",
-    richText: "RichTextFieldModel",
-    input: "InputFieldModel",
-    email: "InputFieldModel",
-    phone: "InputFieldModel",
-    uuid: "InputFieldModel",
-    url: "InputFieldModel",
-    nanoid: "InputFieldModel"
-  };
-  return map[fieldInterface] || "InputFieldModel";
+  return (0, import_core_field_default_bindings.inferSharedFieldDefaultBindingUse)("editable", fieldInterface);
 }
 function inferDisplayFieldUse(fieldInterface) {
   if (["m2m", "o2m", "mbm"].includes(fieldInterface)) {
     return "DisplaySubTableFieldModel";
   }
-  const map = {
-    richText: "DisplayHtmlFieldModel",
-    number: "DisplayNumberFieldModel",
-    integer: "DisplayNumberFieldModel",
-    id: "DisplayNumberFieldModel",
-    snowflakeId: "DisplayNumberFieldModel",
-    json: "DisplayJSONFieldModel",
-    // Real frontend saved fixtures still read back these enum-like displays as text fields.
-    select: "DisplayTextFieldModel",
-    multipleSelect: "DisplayTextFieldModel",
-    radioGroup: "DisplayTextFieldModel",
-    checkboxGroup: "DisplayTextFieldModel",
-    collection: "DisplayTextFieldModel",
-    tableoid: "DisplayTextFieldModel",
-    icon: "DisplayIconFieldModel",
-    checkbox: "DisplayCheckboxFieldModel",
-    password: "DisplayPasswordFieldModel",
-    percent: "DisplayPercentFieldModel",
-    date: "DisplayDateTimeFieldModel",
-    datetimeNoTz: "DisplayDateTimeFieldModel",
-    createdAt: "DisplayDateTimeFieldModel",
-    datetime: "DisplayDateTimeFieldModel",
-    updatedAt: "DisplayDateTimeFieldModel",
-    unixTimestamp: "DisplayDateTimeFieldModel",
-    formula: "DisplayDateTimeFieldModel",
-    input: "DisplayTextFieldModel",
-    email: "DisplayTextFieldModel",
-    phone: "DisplayTextFieldModel",
-    uuid: "DisplayTextFieldModel",
-    textarea: "DisplayTextFieldModel",
-    nanoid: "DisplayTextFieldModel",
-    url: "DisplayURLFieldModel",
-    color: "DisplayColorFieldModel",
-    time: "DisplayTimeFieldModel"
-  };
-  return map[fieldInterface] || "DisplayTextFieldModel";
+  return (0, import_core_field_default_bindings.inferSharedFieldDefaultBindingUse)("display", fieldInterface);
 }
 function inferFilterFieldUse(fieldInterface) {
   if (["m2m", "m2o", "o2o", "o2m", "oho", "obo", "updatedBy", "createdBy", "mbm"].includes(fieldInterface)) {
     return "FilterFormRecordSelectFieldModel";
   }
-  const map = {
-    date: "DateOnlyFilterFieldModel",
-    datetimeNoTz: "DateTimeNoTzFilterFieldModel",
-    createdAt: "DateTimeTzFilterFieldModel",
-    datetime: "DateTimeTzFilterFieldModel",
-    updatedAt: "DateTimeTzFilterFieldModel",
-    unixTimestamp: "DateTimeTzFilterFieldModel",
-    select: "SelectFieldModel",
-    multipleSelect: "SelectFieldModel",
-    radioGroup: "SelectFieldModel",
-    checkboxGroup: "SelectFieldModel",
-    checkbox: "SelectFieldModel",
-    number: "NumberFieldModel",
-    integer: "NumberFieldModel",
-    id: "NumberFieldModel",
-    snowflakeId: "NumberFieldModel",
-    time: "TimeFieldModel",
-    percent: "PercentFieldModel",
-    input: "InputFieldModel",
-    email: "InputFieldModel",
-    phone: "InputFieldModel",
-    uuid: "InputFieldModel",
-    url: "InputFieldModel",
-    nanoid: "InputFieldModel"
-  };
-  return map[fieldInterface] || "InputFieldModel";
+  return (0, import_core_field_default_bindings.inferSharedFieldDefaultBindingUse)("filter", fieldInterface);
 }
 function getAllowedFieldUseSet(containerUse, enabledPackages) {
   switch (normalizeFieldContainerUse(containerUse)) {
@@ -2473,7 +2601,7 @@ function getAllowedFieldUseSet(containerUse, enabledPackages) {
       return null;
   }
 }
-function canUseNestedApprovalAssociationFieldComponent(input) {
+function canUseNestedAssociationFieldComponent(input) {
   var _a;
   const getCollection = input.getCollection || (() => null);
   const targetCollection = (0, import_service_helpers.resolveFieldTargetCollection)(input.field, input.dataSourceKey || "main", getCollection);
@@ -2488,40 +2616,89 @@ function getSupportedFieldComponentUseSet(input) {
   if (!baseAllowedFieldUses || !fieldInterface) {
     return baseAllowedFieldUses;
   }
-  const wrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(input.containerUse) || String(input.containerUse || "").trim();
+  const wrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(input.containerUse) || getFieldWrapperUseForContainer(input.containerUse) || String(input.containerUse || "").trim();
   const inferredFieldUse = inferFieldUseByContainer(input.containerUse, input.field, {
     enabledPackages: input.enabledPackages,
     dataSourceKey: input.dataSourceKey,
     getCollection: input.getCollection
   });
   if (wrapperUse === "PatternFormItemModel") {
-    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "PopupSubTableFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+  }
+  if (wrapperUse === "FormItemModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         [
           "RecordSelectFieldModel",
           "RecordPickerFieldModel",
-          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
           inferredFieldUse
         ].filter(Boolean)
       );
     }
-    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         [
           "RecordSelectFieldModel",
           "RecordPickerFieldModel",
-          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
-          canUseNestedApprovalAssociationFieldComponent(input) ? "PatternSubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "PopupSubTableFieldModel" : void 0,
           inferredFieldUse
         ].filter(Boolean)
       );
     }
   }
   if (APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET.has(wrapperUse)) {
-    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(["DisplayTextFieldModel", "DisplaySubItemFieldModel", inferredFieldUse].filter(Boolean));
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
+          Boolean
+        )
+      );
+    }
+  }
+  if (wrapperUse === "DetailsItemModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(["DisplayTextFieldModel", "DisplaySubItemFieldModel", inferredFieldUse].filter(Boolean));
     }
-    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
+          Boolean
+        )
+      );
+    }
+  }
+  if (wrapperUse === "FormAssociationItemModel" || wrapperUse === "TableColumnModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(["DisplayTextFieldModel", inferredFieldUse].filter(Boolean));
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
           Boolean
@@ -2529,6 +2706,9 @@ function getSupportedFieldComponentUseSet(input) {
       );
     }
   }
+  if (inferredFieldUse) {
+    return /* @__PURE__ */ new Set([inferredFieldUse]);
+  }
   return baseAllowedFieldUses;
 }
 function inferFieldUseByContainer(containerUse, field, options = {}) {
@@ -2643,11 +2823,16 @@ function resolveSupportedFieldCapability(input) {
       `flowSurfaces field wrapper '${input.requestedWrapperUse}' is not allowed under '${input.containerUse}', expected '${wrapperUse}'`
     );
   }
-  const inferredFieldUse = requestedRenderer === "js" ? inferJsFieldUseByContainer(input.containerUse) : input.field ? inferFieldUseByContainer(input.containerUse, input.field, {
-    enabledPackages: input.enabledPackages,
-    dataSourceKey: input.dataSourceKey,
-    getCollection: input.getCollection
-  }) : void 0;
+  let inferredFieldUse;
+  if (requestedRenderer === "js") {
+    inferredFieldUse = inferJsFieldUseByContainer(input.containerUse);
+  } else if (input.field) {
+    inferredFieldUse = inferFieldUseByContainer(input.containerUse, input.field, {
+      enabledPackages: input.enabledPackages,
+      dataSourceKey: input.dataSourceKey,
+      getCollection: input.getCollection
+    });
+  }
   const fieldUse = input.requestedFieldUse || inferredFieldUse;
   if (!fieldUse) {
     if (input.allowUnresolvedFieldUse) {
@@ -2661,12 +2846,18 @@ function resolveSupportedFieldCapability(input) {
     }
     throw new import_errors.FlowSurfaceBadRequestError(`flowSurfaces field '${input.containerUse}' requires a supported fieldUse`);
   }
-  if (input.requestedFieldUse && inferredFieldUse && input.requestedFieldUse !== inferredFieldUse && KNOWN_FIELD_NODE_USES.has(input.requestedFieldUse)) {
+  if (input.requestedFieldUse && inferredFieldUse && input.requestedFieldUse !== inferredFieldUse && input.requestedFieldUseMode !== "fieldType" && KNOWN_FIELD_NODE_USES.has(input.requestedFieldUse)) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces fieldUse '${input.requestedFieldUse}' does not match inferred fieldUse '${inferredFieldUse}' under '${input.containerUse}'`
     );
   }
-  const allowedFieldUses = getAllowedFieldUseSet(input.containerUse, input.enabledPackages);
+  const allowedFieldUses = input.requestedFieldUseMode === "fieldType" && input.field ? getSupportedFieldComponentUseSet({
+    containerUse: input.containerUse,
+    field: input.field,
+    enabledPackages: input.enabledPackages,
+    dataSourceKey: input.dataSourceKey,
+    getCollection: input.getCollection
+  }) : getAllowedFieldUseSet(input.containerUse, input.enabledPackages);
   if (!(allowedFieldUses == null ? void 0 : allowedFieldUses.has(fieldUse))) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces fieldUse '${fieldUse}' is not allowed under '${input.containerUse}'`
@@ -2734,6 +2925,8 @@ function getAvailableActionCatalogItems(containerUse, scope, enabledPackages) {
 const COLLECTION_RESOURCE_REQUIRED = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "TreeBlockModel",
+  "KanbanBlockModel",
   "CreateFormModel",
   "EditFormModel",
   "FormBlockModel",
@@ -2768,6 +2961,10 @@ const approvalBlockCatalog = import_approval.APPROVAL_BLOCK_CATALOG_SPECS.map(
   })
 );
 const blockCatalog = [...baseBlockCatalog, ...approvalBlockCatalog];
+const COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES = [
+  ...import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+  ...import_action_scope.KANBAN_BLOCK_ACTION_CONTAINER_USES
+];
 const APPROVAL_PAGE_LIKE_BLOCK_CONTAINER_USE_SET = /* @__PURE__ */ new Set([...import_approval.APPROVAL_BLOCK_GRID_USES]);
 const APPROVAL_PAGE_LIKE_GENERIC_BLOCK_KEY_SET = /* @__PURE__ */ new Set(["markdown", "jsBlock"]);
 const APPROVAL_EXCLUSIVE_BLOCK_CONTAINER_USE_SET = /* @__PURE__ */ new Set([...import_approval.APPROVAL_TASK_CARD_GRID_USES]);
@@ -2810,7 +3007,7 @@ const actionRegistry = [
     scene: "collection",
     use: "FilterActionModel",
     ownerPlugin: CORE_FLOW_SURFACE_OWNER_PLUGIN,
-    allowedContainerUses: import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+    allowedContainerUses: COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES,
     createSupported: true
   },
   {
@@ -2820,7 +3017,7 @@ const actionRegistry = [
     scene: "collection",
     use: "AddNewActionModel",
     ownerPlugin: CORE_FLOW_SURFACE_OWNER_PLUGIN,
-    allowedContainerUses: import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+    allowedContainerUses: COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES,
     createSupported: true
   },
   {
@@ -2830,7 +3027,7 @@ const actionRegistry = [
     scene: "collection",
     use: "PopupCollectionActionModel",
     ownerPlugin: CORE_FLOW_SURFACE_OWNER_PLUGIN,
-    allowedContainerUses: import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+    allowedContainerUses: COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES,
     createSupported: true
   },
   {
@@ -2840,7 +3037,7 @@ const actionRegistry = [
     scene: "collection",
     use: "RefreshActionModel",
     ownerPlugin: CORE_FLOW_SURFACE_OWNER_PLUGIN,
-    allowedContainerUses: import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+    allowedContainerUses: COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES,
     createSupported: true
   },
   {
@@ -2980,7 +3177,7 @@ const actionRegistry = [
     scene: "collection",
     use: "JSCollectionActionModel",
     ownerPlugin: CORE_FLOW_SURFACE_OWNER_PLUGIN,
-    allowedContainerUses: import_action_scope.COLLECTION_BLOCK_ACTION_CONTAINER_USES,
+    allowedContainerUses: COLLECTION_BLOCK_AND_KANBAN_ACTION_CONTAINER_USES,
     createSupported: true
   },
   {

package/dist/server/flow-surfaces/compose-compiler.d.ts

@@ -23,6 +23,14 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     associationPathName?: string;
     renderer?: string;
     type?: string;
+    fieldType?: string;
+    fields?: string[];
+    selectorFields?: string[];
+    titleField?: string;
+    openMode?: string;
+    popupSize?: string;
+    pageSize?: number;
+    showIndex?: boolean;
     target?: string | Record<string, unknown>;
     settings?: FlowSurfaceComposeObject;
     popup?: FlowSurfaceComposeObject;