@nocobase/plugin-flow-engine 2.1.0-alpha.45 → 2.1.0-alpha.47

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

@@ -81,6 +81,7 @@ var import_placement = require("./placement");
 var import_route_sync = require("./route-sync");
 var import_surface_context = require("./surface-context");
 var import_context = require("./context");
+var import_event_flow_normalizer = require("./event-flow-normalizer");
 var import_configure_options = require("./configure-options");
 var import_public_compatibility = require("./public-compatibility");
 var import_support_matrix = require("./support-matrix");
@@ -103,14 +104,38 @@ var import_template_service_utils = require("./template-service-utils");
 var import_hidden_popup_contract = require("./hidden-popup-contract");
 var import_hidden_popup_calendar = require("./hidden-popup-calendar");
 var import_hidden_popup_kanban = require("./hidden-popup-kanban");
-const FLOW_SURFACE_CHART_REPAIR_HINT = "This is a chart payload shape problem. Repair the current chart block payload using assets.charts.<key>.query/visual plus block.chart, or localized settings.query/settings.visual. Do not change this block type to table, jsBlock, actionPanel, gridCard, or another block type. Do not drop or defer the chart. KPI / summary numbers should use jsBlock; charts are for trends, distributions, rankings, and visual analysis.";
+const FLOW_SURFACE_CHART_REPAIR_HINT = "This is a chart payload shape problem. Keep using chart and repair the current chart block payload using assets.charts.<key>.query/visual plus block.chart, or localized settings.query/settings.visual. Do not change this block type to table, jsBlock, actionPanel, gridCard, or another block type. Do not drop or defer the chart. KPI / summary numbers should use jsBlock; charts are for trends, distributions, rankings, and visual analysis.";
 const FLOW_SURFACE_CHART_REPAIR_STEPS = [
   "Keep the block type as chart.",
-  "Define assets.charts.<key>.query and assets.charts.<key>.visual, or repair the localized settings.query/settings.visual on the existing chart block.",
+  "Define assets.charts.<key>.query and assets.charts.<key>.visual, or fill localized settings.query and settings.visual on the existing chart block.",
   "Reference the asset from the chart block with block.chart = <key> when using assets.charts.",
   "Retry the chart payload instead of replacing the chart with another block type, omitting it, or deferring it."
 ];
 const FLOW_SURFACE_CHART_EXPECTED_SHAPE = {
+  settings: {
+    query: {
+      mode: "builder",
+      resource: {
+        dataSourceKey: "main",
+        collectionName: "employees"
+      },
+      measures: [
+        {
+          field: "id",
+          aggregation: "count",
+          alias: "employeeCount"
+        }
+      ]
+    },
+    visual: {
+      mode: "basic",
+      type: "bar",
+      mappings: {
+        x: "status",
+        y: "employeeCount"
+      }
+    }
+  },
   assets: {
     charts: {
       chartKey: {
@@ -126,29 +151,80 @@ const FLOW_SURFACE_CHART_EXPECTED_SHAPE = {
 };
 const FLOW_SURFACE_CHART_FORBIDDEN_FALLBACKS = [
   "table",
+  "list",
   "jsBlock",
   "actionPanel",
   "gridCard",
+  "markdown",
   "drop chart",
   "defer chart"
 ];
+const FLOW_SURFACE_CHART_REPAIR_EXAMPLE = {
+  settings: {
+    query: {
+      mode: "builder",
+      resource: {
+        dataSourceKey: "main",
+        collectionName: "<collectionName>"
+      },
+      measures: [
+        {
+          field: "id",
+          aggregation: "count",
+          alias: "recordCount"
+        }
+      ],
+      dimensions: [
+        {
+          field: "<dimensionField>"
+        }
+      ]
+    },
+    visual: {
+      mode: "basic",
+      type: "bar",
+      mappings: {
+        x: "<dimensionField>",
+        y: "recordCount"
+      }
+    }
+  }
+};
 function withChartRepairMessage(message) {
   return `${message}. ${FLOW_SURFACE_CHART_REPAIR_HINT}`;
 }
 function withFlowSurfaceChartRepairDetails(details = {}) {
   return {
     ...details,
+    requiredBlockType: "chart",
+    fixStrategy: "repair_same_block_type",
     repairHint: FLOW_SURFACE_CHART_REPAIR_HINT,
     repairSteps: FLOW_SURFACE_CHART_REPAIR_STEPS,
     expectedShape: FLOW_SURFACE_CHART_EXPECTED_SHAPE,
+    repairExample: FLOW_SURFACE_CHART_REPAIR_EXAMPLE,
     forbiddenFallbacks: FLOW_SURFACE_CHART_FORBIDDEN_FALLBACKS
   };
 }
-function throwChartRepairBadRequest(message, details = {}) {
+function throwChartRepairBadRequest(message, options = {}) {
+  const details = import_lodash.default.isPlainObject(options.details) ? options.details : {};
   (0, import_errors.throwBadRequest)(withChartRepairMessage(message), {
+    ...options,
     details: withFlowSurfaceChartRepairDetails(details)
   });
 }
+function isChartConfigureBadRequestError(error) {
+  return error instanceof import_errors.FlowSurfaceBadRequestError && String(error.message || "").startsWith("chart ");
+}
+function buildChartConfigureFromSemanticChangesWithRepair(currentConfigure, changes) {
+  try {
+    return (0, import_chart_config.buildChartConfigureFromSemanticChanges)(currentConfigure, changes);
+  } catch (error) {
+    if (isChartConfigureBadRequestError(error)) {
+      throwChartRepairBadRequest(error.message, error.options);
+    }
+    throw error;
+  }
+}
 function isFlowSurfaceChartRepairError(error) {
   var _a, _b;
   return error instanceof import_errors.FlowSurfaceBadRequestError && ((_b = (_a = error.options) == null ? void 0 : _a.details) == null ? void 0 : _b.repairHint) === FLOW_SURFACE_CHART_REPAIR_HINT;
@@ -1088,7 +1164,7 @@ class FlowSurfacesService {
             parentId: null,
             options: {
               documentTitle: values.tabDocumentTitle,
-              flowRegistry: values.tabFlowRegistry || {}
+              flowRegistry: this.normalizeEventFlowRegistry("createMenu", values.tabFlowRegistry || {})
             }
           }
         ]
@@ -2819,7 +2895,7 @@ class FlowSurfacesService {
           use: "RootPageTabModel",
           props: import_lodash.default.omit(import_lodash.default.cloneDeep((currentNode == null ? void 0 : currentNode.props) || {}), ["route"]),
           decoratorProps: import_lodash.default.cloneDeep((currentNode == null ? void 0 : currentNode.decoratorProps) || {}),
-          flowRegistry: import_lodash.default.cloneDeep((currentNode == null ? void 0 : currentNode.flowRegistry) || {}),
+          flowRegistry: this.getEventFlowRegistry(currentNode),
           stepParams: import_lodash.default.cloneDeep((values == null ? void 0 : values.stepParams) || (currentNode == null ? void 0 : currentNode.stepParams) || {})
         }),
         { transaction: options == null ? void 0 : options.transaction }
@@ -3040,7 +3116,7 @@ class FlowSurfacesService {
         continue;
       }
       (0, import_service_utils.assertSupportedSimpleChanges)("chart", chartAsset, (0, import_configure_options.getConfigureOptionKeysForUse)("ChartBlockModel"));
-      const nextConfigure = (0, import_chart_config.buildChartConfigureFromSemanticChanges)(void 0, chartAsset);
+      const nextConfigure = buildChartConfigureFromSemanticChangesWithRepair(void 0, chartAsset);
       await this.validateChartConfigureForRuntime(
         `applyBlueprint assets.charts.${chartKey}`,
         nextConfigure,
@@ -3048,6 +3124,209 @@ class FlowSurfacesService {
       );
     }
   }
+  composeChartBlockHasInlineConfig(block) {
+    const settings = import_lodash.default.isPlainObject(block.settings) ? block.settings : {};
+    return ["configure", "query", "visual", "events"].some(
+      (key) => Object.prototype.hasOwnProperty.call(settings, key)
+    );
+  }
+  prepareComposeChartAssetNestedPopupBlocks(input, path, chartAssets) {
+    if (!import_lodash.default.isPlainObject(input)) {
+      return { value: input, didResolveChartAsset: false };
+    }
+    let didResolveChartAsset = false;
+    let nextInput = input;
+    const ensureNextInput = () => {
+      if (nextInput === input) {
+        nextInput = { ...input };
+      }
+      return nextInput;
+    };
+    const preparePopupBlocks = (key) => {
+      const popup = input[key];
+      if (!import_lodash.default.isPlainObject(popup) || !Array.isArray(popup.blocks)) {
+        return;
+      }
+      const prepared = this.prepareComposeChartAssetBlockList(popup.blocks, `${path}.${key}.blocks`, chartAssets);
+      if (!prepared.didResolveChartAsset) {
+        return;
+      }
+      ensureNextInput()[key] = {
+        ...popup,
+        blocks: prepared.blocks
+      };
+      didResolveChartAsset = true;
+    };
+    preparePopupBlocks("popup");
+    preparePopupBlocks("openView");
+    return {
+      value: nextInput,
+      didResolveChartAsset
+    };
+  }
+  prepareComposeChartAssetBlockList(blocks, path, chartAssets) {
+    const rawBlocks = import_lodash.default.castArray(blocks || []);
+    if (!rawBlocks.length) {
+      return { blocks: rawBlocks, didResolveChartAsset: false };
+    }
+    let didResolveChartAsset = false;
+    const hiddenPopupKeys = [
+      "quickCreatePopup",
+      "eventPopup",
+      "cardPopup",
+      "quickCreatePopupSettings",
+      "eventPopupSettings",
+      "cardPopupSettings"
+    ];
+    const nextBlocks = rawBlocks.map((block, index) => {
+      if (!import_lodash.default.isPlainObject(block)) {
+        return block;
+      }
+      const blockPath = `${path}[${index}]`;
+      let nextBlock = block;
+      const ensureNextBlock = () => {
+        if (nextBlock === block) {
+          nextBlock = { ...block };
+        }
+        return nextBlock;
+      };
+      if (Array.isArray(block.blocks)) {
+        const prepared = this.prepareComposeChartAssetBlockList(block.blocks, `${blockPath}.blocks`, chartAssets);
+        if (prepared.didResolveChartAsset) {
+          ensureNextBlock().blocks = prepared.blocks;
+          didResolveChartAsset = true;
+        }
+      }
+      for (const slot of ["actions", "recordActions", "fields"]) {
+        if (!Array.isArray(block[slot])) {
+          continue;
+        }
+        let didPrepareSlot = false;
+        const nextItems = block[slot].map((item, itemIndex) => {
+          const prepared = this.prepareComposeChartAssetNestedPopupBlocks(
+            item,
+            `${blockPath}.${slot}[${itemIndex}]`,
+            chartAssets
+          );
+          didPrepareSlot = didPrepareSlot || prepared.didResolveChartAsset;
+          return prepared.value;
+        });
+        if (didPrepareSlot) {
+          ensureNextBlock()[slot] = nextItems;
+          didResolveChartAsset = true;
+        }
+      }
+      if (Array.isArray(block.fieldGroups)) {
+        let didPrepareFieldGroups = false;
+        const nextFieldGroups = block.fieldGroups.map((group, groupIndex) => {
+          if (!import_lodash.default.isPlainObject(group) || !Array.isArray(group.fields)) {
+            return group;
+          }
+          let didPrepareGroupFields = false;
+          const nextFields = group.fields.map((field, fieldIndex) => {
+            const prepared = this.prepareComposeChartAssetNestedPopupBlocks(
+              field,
+              `${blockPath}.fieldGroups[${groupIndex}].fields[${fieldIndex}]`,
+              chartAssets
+            );
+            didPrepareGroupFields = didPrepareGroupFields || prepared.didResolveChartAsset;
+            return prepared.value;
+          });
+          if (!didPrepareGroupFields) {
+            return group;
+          }
+          didPrepareFieldGroups = true;
+          return {
+            ...group,
+            fields: nextFields
+          };
+        });
+        if (didPrepareFieldGroups) {
+          ensureNextBlock().fieldGroups = nextFieldGroups;
+          didResolveChartAsset = true;
+        }
+      }
+      if (import_lodash.default.isPlainObject(block.popup) && Array.isArray(block.popup.blocks)) {
+        const prepared = this.prepareComposeChartAssetBlockList(
+          block.popup.blocks,
+          `${blockPath}.popup.blocks`,
+          chartAssets
+        );
+        if (prepared.didResolveChartAsset) {
+          ensureNextBlock().popup = {
+            ...block.popup,
+            blocks: prepared.blocks
+          };
+          didResolveChartAsset = true;
+        }
+      }
+      if (import_lodash.default.isPlainObject(block.settings)) {
+        for (const key of hiddenPopupKeys) {
+          const popup = block.settings[key];
+          if (!import_lodash.default.isPlainObject(popup) || !Array.isArray(popup.blocks)) {
+            continue;
+          }
+          const prepared = this.prepareComposeChartAssetBlockList(
+            popup.blocks,
+            `${blockPath}.settings.${key}.blocks`,
+            chartAssets
+          );
+          if (!prepared.didResolveChartAsset) {
+            continue;
+          }
+          ensureNextBlock().settings = {
+            ...nextBlock.settings || {},
+            [key]: {
+              ...popup,
+              blocks: prepared.blocks
+            }
+          };
+          didResolveChartAsset = true;
+        }
+      }
+      if (String(nextBlock.type || "").trim() !== "chart" || !Object.prototype.hasOwnProperty.call(nextBlock, "chart") || this.composeChartBlockHasInlineConfig(nextBlock)) {
+        return nextBlock;
+      }
+      const chartKey = String(nextBlock.chart || "").trim();
+      if (!chartKey) {
+        throwChartRepairBadRequest(`${blockPath}.chart must reference one key from assets.charts`, {
+          path: `${blockPath}.chart`,
+          ruleId: "chart-block-asset-reference-required"
+        });
+      }
+      const chartAsset = chartAssets[chartKey];
+      if (!import_lodash.default.isPlainObject(chartAsset)) {
+        throwChartRepairBadRequest(`${blockPath}.chart references missing chart asset '${chartKey}'`, {
+          path: `${blockPath}.chart`,
+          ruleId: "chart-block-asset-reference-missing",
+          details: {
+            chartKey
+          }
+        });
+      }
+      if (!import_lodash.default.isUndefined(nextBlock.settings) && !import_lodash.default.isPlainObject(nextBlock.settings)) {
+        return nextBlock;
+      }
+      didResolveChartAsset = true;
+      return {
+        ...nextBlock,
+        settings: import_lodash.default.merge({}, import_lodash.default.cloneDeep(nextBlock.settings || {}), import_lodash.default.cloneDeep(chartAsset))
+      };
+    });
+    return {
+      blocks: nextBlocks,
+      didResolveChartAsset
+    };
+  }
+  prepareComposeChartAssetSettings(values) {
+    var _a;
+    const chartAssets = import_lodash.default.isPlainObject((_a = values == null ? void 0 : values.assets) == null ? void 0 : _a.charts) ? values.assets.charts : {};
+    const prepared = this.prepareComposeChartAssetBlockList(values == null ? void 0 : values.blocks, "$.blocks", chartAssets);
+    return prepared.didResolveChartAsset ? {
+      ...values,
+      blocks: prepared.blocks
+    } : values;
+  }
   getApplyBlueprintKanbanBlockResourceObject(block) {
     return import_lodash.default.isPlainObject(block == null ? void 0 : block.resource) ? block.resource : {};
   }
@@ -3450,16 +3729,6 @@ class FlowSurfacesService {
       await this.assertApplyBlueprintAuthoringPayload(values, options);
       const document = (0, import_blueprint.prepareFlowSurfaceApplyBlueprintDocument)(values);
       await this.prevalidateApplyBlueprintChartAssets(document);
-      if (document.mode === "create") {
-        return await this.applyBlueprintWithTransaction(
-          values,
-          { ...options, skipAuthoringValidation: true },
-          createdKanbanSortFields,
-          {
-            readSurface: false
-          }
-        );
-      }
       return await this.transaction(
         (transaction) => this.applyBlueprintWithTransaction(
           values,
@@ -5132,12 +5401,13 @@ class FlowSurfacesService {
   async compose(values, options = {}) {
     var _a, _b, _c;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
-    const target = await this.prepareWriteTarget("compose", values == null ? void 0 : values.target, values, options);
+    const composeValues = this.prepareComposeChartAssetSettings(values);
+    const target = await this.prepareWriteTarget("compose", composeValues == null ? void 0 : composeValues.target, composeValues, options);
     const authoringContext = await this.buildTargetAuthoringContext({
       target,
       transaction: options.transaction
     });
-    await (0, import_authoring_validation.assertFlowSurfaceAuthoringPayload)("compose", values, {
+    await (0, import_authoring_validation.assertFlowSurfaceAuthoringPayload)("compose", composeValues, {
       transaction: options.transaction,
       enabledPackages,
       skipGeneratedLayoutSingleColumnErrors: options.skipGeneratedLayoutSingleColumnErrors === true,
@@ -5150,12 +5420,17 @@ class FlowSurfacesService {
       ...options,
       popupTemplateTreeCache
     };
-    const mode = this.assertComposeMode(values == null ? void 0 : values.mode);
-    const popupDefaultsMetadata = this.buildPopupDefaultsMetadata(values == null ? void 0 : values.defaults);
-    const normalizedBlocks = this.normalizeComposeBlocks(values == null ? void 0 : values.blocks, enabledPackages, popupDefaultsMetadata, {
-      dataSourceKey: authoringContext.currentDataSourceKey,
-      collectionName: authoringContext.currentCollectionName
-    });
+    const mode = this.assertComposeMode(composeValues == null ? void 0 : composeValues.mode);
+    const popupDefaultsMetadata = this.buildPopupDefaultsMetadata(composeValues == null ? void 0 : composeValues.defaults);
+    const normalizedBlocks = this.normalizeComposeBlocks(
+      composeValues == null ? void 0 : composeValues.blocks,
+      enabledPackages,
+      popupDefaultsMetadata,
+      {
+        dataSourceKey: authoringContext.currentDataSourceKey,
+        collectionName: authoringContext.currentCollectionName
+      }
+    );
     this.validateComposePopupTemplateAliases(normalizedBlocks, popupTemplateAliasSession);
     const blockParent = await this.surfaceContext.resolveBlockParent(target, options.transaction);
     const gridUid = blockParent.parentUid;
@@ -5181,7 +5456,7 @@ class FlowSurfacesService {
       mode,
       normalizedBlocks,
       existingItemUids: existingItems.map((item) => item.uid),
-      layout: values.layout
+      layout: composeValues.layout
     });
     const generatedDefaultFilterByComposeBlockUid = /* @__PURE__ */ new Map();
     const result = await (0, import_compose_runtime.executeComposeRuntime)(plan, {
@@ -5216,7 +5491,7 @@ class FlowSurfacesService {
           {
             ...payload,
             ...Object.keys(hiddenPopupSettings).length ? { settings: hiddenPopupSettings } : {},
-            ...values.defaults ? { defaults: values.defaults } : {}
+            ...composeValues.defaults ? { defaults: composeValues.defaults } : {}
           },
           {
             ...runtimeOptions,
@@ -5553,7 +5828,7 @@ class FlowSurfacesService {
           parentId: routeId,
           options: {
             documentTitle: values.tabDocumentTitle,
-            flowRegistry: values.tabFlowRegistry || {}
+            flowRegistry: this.normalizeEventFlowRegistry("createPage", values.tabFlowRegistry || {})
           }
         },
         transaction
@@ -5572,7 +5847,10 @@ class FlowSurfacesService {
           options: {
             ...this.readRouteOptions(tabRoute),
             documentTitle: values.tabDocumentTitle ?? this.readRouteOptions(tabRoute).documentTitle,
-            flowRegistry: values.tabFlowRegistry || this.readRouteOptions(tabRoute).flowRegistry || {}
+            flowRegistry: this.normalizeEventFlowRegistry(
+              "createPage",
+              values.tabFlowRegistry || this.readRouteOptions(tabRoute).flowRegistry || {}
+            )
           }
         },
         transaction
@@ -5714,7 +5992,7 @@ class FlowSurfacesService {
         hidden: !pageRoute.get("enableTabs"),
         options: {
           documentTitle: values.documentTitle,
-          flowRegistry: values.flowRegistry || {}
+          flowRegistry: this.normalizeEventFlowRegistry("addTab", values.flowRegistry || {})
         }
       },
       transaction: options.transaction
@@ -5762,7 +6040,7 @@ class FlowSurfacesService {
           )
         }
       } : void 0,
-      flowRegistry: !import_lodash.default.isUndefined(values.flowRegistry) ? values.flowRegistry : void 0
+      flowRegistry: !import_lodash.default.isUndefined(values.flowRegistry) ? this.normalizeEventFlowRegistry("updateTab", values.flowRegistry) : void 0
     });
     await this.routeSync.persistTabSettings(target, current, nextPayload, options.transaction);
     return {
@@ -5878,7 +6156,7 @@ class FlowSurfacesService {
       title: values.title,
       icon: values.icon,
       documentTitle: values.documentTitle,
-      flowRegistry: values.flowRegistry
+      flowRegistry: this.normalizeEventFlowRegistry("addPopupTab", values.flowRegistry)
     });
     await this.repository.upsertModel(
       {
@@ -5933,7 +6211,7 @@ class FlowSurfacesService {
           }
         }
       } : void 0,
-      flowRegistry: !import_lodash.default.isUndefined(values.flowRegistry) ? values.flowRegistry : void 0
+      flowRegistry: !import_lodash.default.isUndefined(values.flowRegistry) ? this.normalizeEventFlowRegistry("updatePopupTab", values.flowRegistry) : void 0
     });
     if (Object.keys(nextPayload).length === 1) {
       return { uid: popupTab.uid };
@@ -6134,7 +6412,7 @@ class FlowSurfacesService {
           use: "ReferenceFormGridModel",
           props: currentGrid.props,
           decoratorProps: currentGrid.decoratorProps,
-          flowRegistry: currentGrid.flowRegistry,
+          flowRegistry: this.getEventFlowRegistry(currentGrid),
           sortIndex: currentGrid.sortIndex,
           parentId: blockUid,
           subKey: "grid",
@@ -6380,7 +6658,8 @@ class FlowSurfacesService {
     if ((0, import_service_utils.hasOwnDefined)(normalizedSettings, "defaultFilter")) {
       normalizedSettings.defaultFilter = (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
         normalizedSettings.defaultFilter,
-        `flowSurfaces ${actionName} defaultActionSettings.filter.defaultFilter expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`
+        `flowSurfaces ${actionName} defaultActionSettings.filter.defaultFilter expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`,
+        { strictDateValues: true }
       );
       normalizedSettings.defaultFilter = this.normalizeEffectivePublicDataSurfaceDefaultFilter(
         normalizedSettings.defaultFilter,
@@ -7390,7 +7669,7 @@ class FlowSurfacesService {
       props: actionSettingsPayload.props,
       decoratorProps: values.decoratorProps,
       stepParams: actionSettingsPayload.stepParams,
-      flowRegistry: values.flowRegistry
+      flowRegistry: this.normalizeEventFlowRegistry("addAction", values.flowRegistry)
     });
     this.contractGuard.validateNodeTreeAgainstContract(action);
     const created = await this.repository.upsertModel(
@@ -7517,7 +7796,7 @@ class FlowSurfacesService {
       props: actionSettingsPayload.props,
       decoratorProps: values.decoratorProps,
       stepParams: actionSettingsPayload.stepParams,
-      flowRegistry: values.flowRegistry
+      flowRegistry: this.normalizeEventFlowRegistry("addRecordAction", values.flowRegistry)
     });
     this.contractGuard.validateNodeTreeAgainstContract(action);
     const created = await this.repository.upsertModel(
@@ -7569,7 +7848,8 @@ class FlowSurfacesService {
         },
         {
           ...options,
-          preserveSingleScopeDataBlockTitle
+          preserveSingleScopeDataBlockTitle,
+          skipAuthoringValidation: true
         }
       )
     });
@@ -11157,6 +11437,7 @@ class FlowSurfacesService {
       }
       if (domain === "flowRegistry") {
         this.assertNoTreeConnectFieldsFlowRegistry(current, normalizedValues[domain], "updateSettings");
+        normalizedValues[domain] = this.normalizeEventFlowRegistry("updateSettings", normalizedValues[domain]);
       }
       if (!contract.editableDomains.includes(domain)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces updateSettings domain '${domain}' is not editable`);
@@ -11173,6 +11454,9 @@ class FlowSurfacesService {
         current.use
       );
     });
+    if (!import_lodash.default.isUndefined(nextPayload.flowRegistry)) {
+      nextPayload.flowRegistry = this.normalizeEventFlowRegistry("updateSettings", nextPayload.flowRegistry);
+    }
     this.replaceExplicitPopupStepParamSubtreesForUpdateSettings(
       current,
       normalizedValues,
@@ -11239,7 +11523,7 @@ class FlowSurfacesService {
       props: nextPayload.props ?? current.props,
       decoratorProps: nextPayload.decoratorProps ?? current.decoratorProps,
       stepParams: nextPayload.stepParams ?? current.stepParams,
-      flowRegistry: nextPayload.flowRegistry ?? current.flowRegistry
+      flowRegistry: nextPayload.flowRegistry ?? this.getEventFlowRegistry(current)
     };
     const shouldValidateFlowRegistry = !import_lodash.default.isUndefined(nextPayload.flowRegistry) || !import_lodash.default.isUndefined(nextPayload.stepParams);
     assertNoFlowSurfaceIdTitleFieldSettings(import_lodash.default.pick(effectiveNode, ["props", "stepParams"]), {
@@ -11664,12 +11948,12 @@ class FlowSurfacesService {
           "flowSurfaces updateSettings filter action values 'props.defaultFilterValue/filterValue' and 'stepParams.filterSettings.defaultFilter.defaultFilter' must match"
         );
       }
-      const filterValue = this.normalizeEffectivePublicDataSurfaceDefaultFilter(
-        hasStepDefaultFilter ? nextStepFilter : nextPropFilter,
-        {
-          requiredFieldCount: options.requiredFieldCount
-        }
+      const normalizedFilterValue = this.normalizeFilterActionDefaultFilterValue(
+        hasStepDefaultFilter ? nextStepFilter : nextPropFilter
       );
+      const filterValue = this.normalizeEffectivePublicDataSurfaceDefaultFilter(normalizedFilterValue, {
+        requiredFieldCount: options.requiredFieldCount
+      });
       if (!hasPropsFilterableFieldNames && !hasStepFilterableFieldNames) {
         const filterableFieldNames = (0, import_public_data_surface_default_filter.resolveFlowSurfaceDefaultFilterFieldNames)(filterValue);
         if (filterableFieldNames.length) {
@@ -12113,7 +12397,7 @@ class FlowSurfacesService {
     return String(input || "").trim();
   }
   validateBuilderChartFieldsForRuntime(actionName, configure) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g;
     const resourceInit = (0, import_chart_config.getChartBuilderResourceInit)(configure);
     if (!(resourceInit == null ? void 0 : resourceInit.collectionName)) {
       return;
@@ -12131,10 +12415,12 @@ class FlowSurfacesService {
     const selections = [
       ...import_lodash.default.castArray(state.query.measures || []).map((selection, index) => ({
         selection,
+        kind: "measure",
         path: `chart query.measures[${index}].field`
       })),
       ...import_lodash.default.castArray(state.query.dimensions || []).map((selection, index) => ({
         selection,
+        kind: "dimension",
         path: `chart query.dimensions[${index}].field`
       }))
     ];
@@ -12143,37 +12429,151 @@ class FlowSurfacesService {
       if (!fieldPath) {
         continue;
       }
+      const fieldPathParts = fieldPath.split(".").filter(Boolean);
+      const isCountMeasureSelection = item.kind === "measure" && String(((_c = item.selection) == null ? void 0 : _c.aggregation) || "").trim() === "count" && !((_d = item.selection) == null ? void 0 : _d.distinct);
+      if (fieldPathParts.length > 1 && !isCountMeasureSelection) {
+        const directAssociationPath = fieldPathParts[0];
+        const directAssociationField = (0, import_service_helpers.resolveFieldFromCollection)(collection, directAssociationPath);
+        const directAssociationTargetCollection = directAssociationField && (0, import_service_helpers.isAssociationField)(directAssociationField) ? (0, import_service_helpers.resolveFieldTargetCollection)(
+          directAssociationField,
+          dataSourceKey,
+          (resolvedDataSourceKey, targetCollection) => this.getCollection(resolvedDataSourceKey, targetCollection)
+        ) : null;
+        const invalidDirectSubfield = directAssociationTargetCollection ? (0, import_service_helpers.getInvalidChartBuilderRelationDirectSubfieldDetails)({
+          associationPathName: directAssociationPath,
+          selectedSubfieldPath: fieldPathParts.slice(1).join("."),
+          targetCollection: directAssociationTargetCollection
+        }) : null;
+        if (invalidDirectSubfield) {
+          (0, import_errors.throwBadRequest)(
+            withChartRepairMessage(
+              `flowSurfaces ${actionName} ${item.path} '${fieldPath}' must reference a direct scalar child field under relation '${invalidDirectSubfield.associationPath}'. ${(0, import_service_helpers.formatChartBuilderSupportedRelationSubfields)(
+                invalidDirectSubfield.associationPath,
+                invalidDirectSubfield.supportedFields
+              )}`
+            ),
+            {
+              path: item.path,
+              ruleId: "chart-builder-query-relation-direct-subfield-required",
+              details: withFlowSurfaceChartRepairDetails({
+                fieldPath,
+                dataSourceKey,
+                collectionName,
+                ...invalidDirectSubfield
+              })
+            }
+          );
+        }
+      }
       const parsed = this.parseFieldPath(collection, fieldPath, void 0, dataSourceKey, collectionName);
+      if (parsed.associationPathName) {
+        const associationField = parsed.associationField;
+        const associationTargetCollection = associationField && (0, import_service_helpers.isAssociationField)(associationField) ? (0, import_service_helpers.resolveFieldTargetCollection)(
+          associationField,
+          dataSourceKey,
+          (resolvedDataSourceKey, targetCollection) => this.getCollection(resolvedDataSourceKey, targetCollection)
+        ) : null;
+        if (!associationField || !(0, import_service_helpers.isAssociationField)(associationField) || !associationTargetCollection) {
+          (0, import_errors.throwBadRequest)(
+            withChartRepairMessage(
+              `flowSurfaces ${actionName} ${item.path} '${fieldPath}' uses invalid association path '${parsed.associationPathName}' for builder charts`
+            ),
+            {
+              path: item.path,
+              ruleId: "chart-builder-query-association-path-invalid",
+              details: withFlowSurfaceChartRepairDetails({
+                fieldPath,
+                associationPath: parsed.associationPathName,
+                dataSourceKey,
+                collectionName
+              })
+            }
+          );
+        }
+      }
       const field = (0, import_service_helpers.resolveFieldFromCollection)(parsed.leafCollection, parsed.leafFieldPath);
+      const leafModelAttributes = (0, import_service_helpers.getCollectionModelAttributes)(parsed.leafCollection);
+      const hasLeafModelAttribute = Object.prototype.hasOwnProperty.call(leafModelAttributes, parsed.leafFieldPath);
+      const isCountMeasureRelationSubfield = item.kind === "measure" && String(((_e = item.selection) == null ? void 0 : _e.aggregation) || "").trim() === "count" && !((_f = item.selection) == null ? void 0 : _f.distinct) && parsed.associationField && (0, import_service_helpers.isAssociationField)(parsed.associationField);
+      const unsupportedRelationSubfield = parsed.associationField && (0, import_service_helpers.isAssociationField)(parsed.associationField) ? (0, import_service_helpers.getUnsupportedChartBuilderRelationSubfieldDetails)({
+        associationPathName: parsed.associationPathName,
+        leafFieldName: parsed.leafFieldPath,
+        leafField: field,
+        targetCollection: parsed.leafCollection
+      }) : null;
       if (!field) {
-        if (this.collectionHasConcreteField(parsed.leafCollection, parsed.leafFieldPath)) {
-          continue;
+        const hasConcreteField = hasLeafModelAttribute || this.collectionHasConcreteField(parsed.leafCollection, parsed.leafFieldPath);
+        if (!hasConcreteField) {
+          (0, import_errors.throwBadRequest)(
+            withChartRepairMessage(
+              `flowSurfaces ${actionName} ${item.path} '${fieldPath}' does not exist on collection '${dataSourceKey}.${collectionName}'`
+            ),
+            {
+              details: withFlowSurfaceChartRepairDetails({
+                fieldPath,
+                dataSourceKey,
+                collectionName
+              })
+            }
+          );
         }
+      }
+      if (!fieldPath.includes(".") && field && (0, import_service_helpers.isAssociationField)(field)) {
+        const suggestion = this.resolveBuilderChartAssociationSubfieldSuggestion(fieldPath, field, dataSourceKey);
         (0, import_errors.throwBadRequest)(
           withChartRepairMessage(
-            `flowSurfaces ${actionName} ${item.path} '${fieldPath}' does not exist on collection '${dataSourceKey}.${collectionName}'`
+            `flowSurfaces ${actionName} ${item.path} '${fieldPath}' references an association field directly; use scalar subfield '${suggestion.suggestedFieldPath}' for builder charts`
           ),
           {
             details: withFlowSurfaceChartRepairDetails({
               fieldPath,
               dataSourceKey,
-              collectionName
+              collectionName,
+              ...suggestion
             })
           }
         );
       }
-      if (!fieldPath.includes(".") && (0, import_service_helpers.isAssociationField)(field)) {
-        const suggestion = this.resolveBuilderChartAssociationSubfieldSuggestion(fieldPath, field, dataSourceKey);
+      if (isCountMeasureRelationSubfield) {
         (0, import_errors.throwBadRequest)(
           withChartRepairMessage(
-            `flowSurfaces ${actionName} ${item.path} '${fieldPath}' references an association field directly; use scalar subfield '${suggestion.suggestedFieldPath}' for builder charts`
+            `flowSurfaces ${actionName} ${item.path} '${fieldPath}' counts a relation subfield; count a scalar base field such as 'id' and keep '${fieldPath}' as a dimension`
           ),
           {
+            path: item.path,
+            ruleId: "chart-builder-query-count-measure-relation-subfield",
             details: withFlowSurfaceChartRepairDetails({
               fieldPath,
               dataSourceKey,
               collectionName,
-              ...suggestion
+              suggestedMeasure: {
+                field: "id",
+                aggregation: "count",
+                alias: String(((_g = item.selection) == null ? void 0 : _g.alias) || "").trim() || "recordCount"
+              },
+              suggestedDimension: {
+                field: fieldPath
+              }
+            })
+          }
+        );
+      }
+      if (unsupportedRelationSubfield) {
+        (0, import_errors.throwBadRequest)(
+          withChartRepairMessage(
+            `flowSurfaces ${actionName} ${item.path} '${fieldPath}' references relation subfield '${fieldPath}', but current chart builder SQL generation cannot query relation subfield '${unsupportedRelationSubfield.leafFieldName}' because its database column is '${unsupportedRelationSubfield.columnName}'. ${(0, import_service_helpers.formatChartBuilderSupportedRelationSubfields)(
+              unsupportedRelationSubfield.associationPath,
+              unsupportedRelationSubfield.supportedFields
+            )}`
+          ),
+          {
+            path: item.path,
+            ruleId: "chart-builder-query-relation-subfield-column-unsupported",
+            details: withFlowSurfaceChartRepairDetails({
+              fieldPath,
+              dataSourceKey,
+              collectionName,
+              ...unsupportedRelationSubfield
             })
           }
         );
@@ -12448,6 +12848,8 @@ class FlowSurfacesService {
       options
     );
     const flowRegistry = this.getEventFlowRegistry(current);
+    const directEvents = import_lodash.default.cloneDeep(((_a = contract.eventCapabilities) == null ? void 0 : _a.direct) || []);
+    const objectEvents = import_lodash.default.uniq([...import_lodash.default.cloneDeep(((_b = contract.eventCapabilities) == null ? void 0 : _b.object) || []), ...directEvents]);
     return {
       target: {
         uid: target.uid,
@@ -12456,8 +12858,8 @@ class FlowSurfacesService {
       },
       flowRegistry,
       events: {
-        direct: import_lodash.default.cloneDeep(((_a = contract.eventCapabilities) == null ? void 0 : _a.direct) || []),
-        object: import_lodash.default.cloneDeep(((_b = contract.eventCapabilities) == null ? void 0 : _b.object) || [])
+        direct: directEvents,
+        object: objectEvents
       },
       phases: {
         supported: ["beforeAllFlows", "afterAllFlows", "beforeFlow", "afterFlow", "beforeStep", "afterStep"],
@@ -12492,13 +12894,12 @@ class FlowSurfacesService {
     if (phase !== "beforeAllFlows") {
       (0, import_errors.throwBadRequest)(`flowSurfaces addEventFlow only supports phase 'beforeAllFlows'`);
     }
-    const flow = this.normalizeAddEventFlowInput(key, values, phase);
-    const nextFlowRegistry = {
+    const nextFlowRegistry = this.normalizeEventFlowRegistry("addEventFlow", {
       ...flowRegistry,
-      [key]: flow
-    };
+      [key]: this.normalizeAddEventFlowInput(key, values, phase)
+    });
     await this.persistEventFlowRegistry("addEventFlow", target, current, nextFlowRegistry, options);
-    return this.buildEventFlowWriteResult(target, key, flow, nextFlowRegistry);
+    return this.buildEventFlowWriteResult(target, key, nextFlowRegistry[key], nextFlowRegistry);
   }
   async setEventFlow(values, options = {}) {
     var _a;
@@ -12512,13 +12913,12 @@ class FlowSurfacesService {
     const key = this.normalizeEventFlowKey("setEventFlow", (values == null ? void 0 : values.key) ?? ((_a = values == null ? void 0 : values.flow) == null ? void 0 : _a.key));
     this.assertEventFlowFingerprint("setEventFlow", values == null ? void 0 : values.expectedFingerprint, flowRegistry);
     const flowInput = import_lodash.default.isPlainObject(values == null ? void 0 : values.flow) ? values.flow : values;
-    const flow = this.normalizeEventFlowObject("setEventFlow", key, flowInput);
-    const nextFlowRegistry = {
+    const nextFlowRegistry = this.normalizeEventFlowRegistry("setEventFlow", {
       ...flowRegistry,
-      [key]: flow
-    };
+      [key]: this.normalizeEventFlowObject("setEventFlow", key, flowInput)
+    });
     await this.persistEventFlowRegistry("setEventFlow", target, current, nextFlowRegistry, options);
-    return this.buildEventFlowWriteResult(target, key, flow, nextFlowRegistry);
+    return this.buildEventFlowWriteResult(target, key, nextFlowRegistry[key], nextFlowRegistry);
   }
   async removeEventFlow(values, options = {}) {
     (0, import_payload_shape.validateFlowSurfacePayloadShape)("removeEventFlow", values, "values");
@@ -12533,14 +12933,14 @@ class FlowSurfacesService {
       (0, import_errors.throwBadRequest)(`flowSurfaces removeEventFlow flow '${key}' does not exist`);
     }
     this.assertEventFlowFingerprint("removeEventFlow", values == null ? void 0 : values.expectedFingerprint, flowRegistry);
-    const nextFlowRegistry = import_lodash.default.omit(flowRegistry, [key]);
+    const nextFlowRegistry = this.normalizeEventFlowRegistry("removeEventFlow", import_lodash.default.omit(flowRegistry, [key]));
     await this.persistEventFlowRegistry("removeEventFlow", target, current, nextFlowRegistry, options);
     return this.buildEventFlowWriteResult(target, key, void 0, nextFlowRegistry);
   }
   async setEventFlows(values, options = {}) {
     (0, import_payload_shape.validateFlowSurfacePayloadShape)("setEventFlows", values, "values");
     const { target, current } = await this.resolveEventFlowTarget("setEventFlows", values == null ? void 0 : values.target, values, options);
-    const flows = values.flowRegistry || values.flows || {};
+    const flows = this.normalizeEventFlowRegistry("setEventFlows", values.flowRegistry || values.flows || {});
     await this.persistEventFlowRegistry("setEventFlows", target, current, flows, options);
     return {
       uid: target.uid,
@@ -12566,7 +12966,10 @@ class FlowSurfacesService {
     };
   }
   getEventFlowRegistry(node) {
-    return import_lodash.default.isPlainObject(node == null ? void 0 : node.flowRegistry) ? import_lodash.default.cloneDeep(node.flowRegistry) : {};
+    return import_lodash.default.isPlainObject(node == null ? void 0 : node.flowRegistry) ? this.normalizeEventFlowRegistry("getEventFlowRegistry", node.flowRegistry) : {};
+  }
+  normalizeEventFlowRegistry(actionName, flowRegistry) {
+    return (0, import_event_flow_normalizer.normalizeFlowSurfaceEventFlowRegistry)(actionName, flowRegistry);
   }
   buildEventFlowFingerprint(flowRegistry) {
     return this.buildSurfaceFingerprint({
@@ -12604,7 +13007,9 @@ class FlowSurfacesService {
   normalizeAddEventFlowInput(key, values, phase) {
     var _a, _b, _c;
     const flow = import_lodash.default.isPlainObject(values.flow) ? import_lodash.default.cloneDeep(values.flow) : {};
-    const eventName = String(values.eventName ?? ((_a = flow == null ? void 0 : flow.on) == null ? void 0 : _a.eventName) ?? "").trim();
+    const eventName = String(
+      values.eventName ?? (typeof flow.on === "string" ? flow.on : (_a = flow == null ? void 0 : flow.on) == null ? void 0 : _a.eventName) ?? ""
+    ).trim();
     if (!eventName) {
       (0, import_errors.throwBadRequest)(`flowSurfaces addEventFlow requires eventName`);
     }
@@ -12627,25 +13032,7 @@ class FlowSurfacesService {
     });
   }
   normalizeEventFlowObject(actionName, key, flowInput) {
-    if (!import_lodash.default.isPlainObject(flowInput)) {
-      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} flow '${key}' must be an object`);
-    }
-    const flow = import_lodash.default.cloneDeep(flowInput);
-    flow.key = key;
-    if (import_lodash.default.isPlainObject(flow.on)) {
-      const eventName = String(flow.on.eventName || "").trim();
-      if (eventName) {
-        flow.on.eventName = eventName;
-      }
-      const phase = String(flow.on.phase || "").trim();
-      if (phase) {
-        flow.on.phase = phase;
-      }
-    }
-    if (import_lodash.default.isUndefined(flow.steps)) {
-      flow.steps = {};
-    }
-    return flow;
+    return (0, import_event_flow_normalizer.normalizeFlowSurfaceEventFlow)(actionName, key, flowInput);
   }
   async persistEventFlowRegistry(actionName, target, current, flowRegistry, options = {}) {
     this.assertNoTreeConnectFieldsFlowRegistry(current, flowRegistry, actionName);
@@ -16037,7 +16424,10 @@ class FlowSurfacesService {
     const shouldLoadCurrent = shouldUpdateConfigure || shouldUpdateCardSettings;
     const resolved = shouldLoadCurrent ? await this.locator.resolve(target, options) : null;
     const current = resolved ? await this.loadResolvedNode(resolved, options.transaction) : null;
-    let nextConfigure = shouldUpdateConfigure ? (0, import_chart_config.buildChartConfigureFromSemanticChanges)(import_lodash.default.get(current, ["stepParams", "chartSettings", "configure"]), changes) : void 0;
+    let nextConfigure = shouldUpdateConfigure ? buildChartConfigureFromSemanticChangesWithRepair(
+      import_lodash.default.get(current, ["stepParams", "chartSettings", "configure"]),
+      changes
+    ) : void 0;
     if (shouldUpdateConfigure) {
       nextConfigure = await this.stripBasicSqlVisualWhenPreviewUnavailable(nextConfigure, changes, options.transaction);
     }
@@ -16165,18 +16555,18 @@ class FlowSurfacesService {
     return String(raw || "").trim();
   }
   collectionHasConcreteField(collection, fieldName) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
     const normalized = String(fieldName || "").trim();
     if (!normalized) {
       return false;
     }
-    const modelAttributes = (typeof ((_a = collection == null ? void 0 : collection.model) == null ? void 0 : _a.getAttributes) === "function" ? collection.model.getAttributes() : null) || ((_b = collection == null ? void 0 : collection.model) == null ? void 0 : _b.rawAttributes) || ((_c = collection == null ? void 0 : collection.model) == null ? void 0 : _c.attributes) || {};
+    const modelAttributes = (0, import_service_helpers.getCollectionModelAttributes)(collection);
     const primaryKeyAttributes = import_lodash.default.castArray(
-      ((_d = collection == null ? void 0 : collection.model) == null ? void 0 : _d.primaryKeyAttributes) || ((_e = collection == null ? void 0 : collection.model) == null ? void 0 : _e.primaryKeyAttribute) || []
+      ((_a = collection == null ? void 0 : collection.model) == null ? void 0 : _a.primaryKeyAttributes) || ((_b = collection == null ? void 0 : collection.model) == null ? void 0 : _b.primaryKeyAttribute) || []
     );
     const modelAttribute = modelAttributes == null ? void 0 : modelAttributes[normalized];
     const isModelPrimaryKey = primaryKeyAttributes.includes(normalized) || !!(modelAttribute == null ? void 0 : modelAttribute.primaryKey);
-    return !!((0, import_service_helpers.resolveFieldFromCollection)(collection, normalized) || ((_f = collection == null ? void 0 : collection.getField) == null ? void 0 : _f.call(collection, normalized)) || (0, import_service_helpers.getCollectionFields)(collection).some((field) => (0, import_service_helpers.getFieldName)(field) === normalized) || isModelPrimaryKey);
+    return !!((0, import_service_helpers.resolveFieldFromCollection)(collection, normalized) || ((_c = collection == null ? void 0 : collection.getField) == null ? void 0 : _c.call(collection, normalized)) || (0, import_service_helpers.getCollectionFields)(collection).some((field) => (0, import_service_helpers.getFieldName)(field) === normalized) || isModelPrimaryKey);
   }
   assertInitialBlockResourceCompatible(actionName, blockUse, resourceInit, popupProfile) {
     if (blockUse === "CommentsBlockModel") {
@@ -16987,7 +17377,11 @@ class FlowSurfacesService {
         items: []
       };
     }
-    return import_lodash.default.cloneDeep(value);
+    return (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
+      value,
+      `flowSurfaces configure action defaultFilter expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`,
+      { strictDateValues: true }
+    );
   }
   normalizeActionAssignValues(actionName, value) {
     if (!import_lodash.default.isPlainObject(value)) {
@@ -21637,7 +22031,7 @@ ${AI_EMPLOYEE_CURRENT_RECORD_PROMPT_VARIABLE}` : AI_EMPLOYEE_CURRENT_RECORD_PROM
         (value) => !import_lodash.default.isUndefined(value)
       ),
       decoratorProps: import_lodash.default.cloneDeep(innerField.decoratorProps || {}),
-      flowRegistry: import_lodash.default.cloneDeep(innerField.flowRegistry || {}),
+      flowRegistry: this.getEventFlowRegistry(innerField),
       stepParams: import_lodash.default.merge({}, innerField.stepParams || {}, {
         fieldBinding: {
           use: normalizedTargetUse