@nocobase/plugin-flow-engine 2.1.0-alpha.37 → 2.1.0-alpha.39

package/dist/server/flow-surfaces/blueprint/compile-blocks.js

@@ -44,11 +44,14 @@ var import_lodash = __toESM(require("lodash"));
 var import_errors = require("../errors");
 var import_service_utils = require("../service-utils");
 var import_default_block_actions = require("../default-block-actions");
+var import_data_block_rules = require("../data-block-rules");
 var import_public_data_surface_default_filter = require("../public-data-surface-default-filter");
 var import_public_compatibility = require("../public-compatibility");
 var import_defaults = require("./defaults");
 var import_hidden_popup_contract = require("../hidden-popup-contract");
 var import_service_helpers = require("../service-helpers");
+var import_template_reference = require("../template-reference");
+var import_field_grid_layout = require("../field-grid-layout");
 var import_private_utils = require("./private-utils");
 var import_field_type_resolver = require("../field-type-resolver");
 const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
@@ -72,6 +75,9 @@ const APPLY_BLUEPRINT_BLOCK_ALLOWED_KEYS = [
   "key",
   "type",
   "title",
+  "description",
+  "height",
+  "heightMode",
   "collection",
   "dataSourceKey",
   "associationPathName",
@@ -87,7 +93,14 @@ const APPLY_BLUEPRINT_BLOCK_ALLOWED_KEYS = [
   "actions",
   "recordActions",
   "script",
-  "chart"
+  "chart",
+  "pageSize",
+  "sort",
+  "sorting",
+  "titleField",
+  "colorField",
+  "startField",
+  "endField"
 ];
 const APPLY_BLUEPRINT_FIELD_ALLOWED_KEYS = [
   "key",
@@ -121,6 +134,15 @@ const APPLY_BLUEPRINT_POPUP_ALLOWED_KEYS = [
   "blocks",
   "layout"
 ];
+const APPLY_BLUEPRINT_POPUP_COMPOSE_MODES = /* @__PURE__ */ new Set(["replace", "append"]);
+const APPLY_BLUEPRINT_POPUP_DISPLAY_MODE_ALIASES = {
+  modal: "dialog",
+  page: "embed"
+};
+const APPLY_BLUEPRINT_POPUP_DISPLAY_MODES = /* @__PURE__ */ new Set(["drawer", "dialog", "embed", "page", "modal"]);
+const APPLY_BLUEPRINT_CALENDAR_FIELD_BINDING_KEYS = ["titleField", "colorField", "startField", "endField"];
+const APPLY_BLUEPRINT_POPUP_PAGE_MODE_BLOCK_THRESHOLD = 3;
+const APPLY_BLUEPRINT_POPUP_PAGE_MODE_FIELD_THRESHOLD = 20;
 const APPLY_BLUEPRINT_POPUP_SAVE_AS_TEMPLATE_ALLOWED_KEYS = ["name", "description", "local"];
 const APPLY_BLUEPRINT_LAYOUT_ALLOWED_KEYS = ["rows"];
 const APPLY_BLUEPRINT_LAYOUT_CELL_ALLOWED_KEYS = ["key", "span"];
@@ -211,7 +233,7 @@ function assertApplyBlueprintCalendarMainContent(block, context) {
   }
   if (Object.prototype.hasOwnProperty.call(block, "recordActions")) {
     (0, import_errors.throwBadRequest)(
-      `${context}.recordActions is not supported on calendar main blocks; configure event actions inside the event-view popup host instead`
+      `${context}.recordActions is not supported on calendar main blocks; use actions[] for calendar block actions or configure event actions inside the event-view popup host instead`
     );
   }
 }
@@ -223,7 +245,9 @@ function assertApplyBlueprintKanbanMainContent(block, context) {
     (0, import_errors.throwBadRequest)(`${context}.fieldGroups is not supported on kanban main blocks; use fields instead`);
   }
   if (Object.prototype.hasOwnProperty.call(block, "recordActions")) {
-    (0, import_errors.throwBadRequest)(`${context}.recordActions is not supported on kanban main blocks in v1`);
+    (0, import_errors.throwBadRequest)(
+      `${context}.recordActions is not supported on kanban main blocks in v1; use actions[] for kanban block actions`
+    );
   }
 }
 function assertApplyBlueprintTreeMainContent(block, context) {
@@ -397,8 +421,20 @@ function splitApplyBlueprintBlockActionsByScope(block, context) {
 function resolveAssetSettings(settings, spec, assets, context) {
   const nextSettings = (0, import_private_utils.cloneOptionalPlainObject)(settings, `${context}.settings`) || {};
   const mergeAsset = (bucket, assetKey) => {
+    if (import_lodash.default.isUndefined(assetKey)) {
+      return;
+    }
+    if (typeof assetKey !== "string") {
+      if (bucket === "scripts") {
+        (0, import_errors.throwBadRequest)(`${context}.script must be a string asset key; use settings.code for inline JS code`);
+      }
+      return;
+    }
     const normalizedKey = (0, import_private_utils.readOptionalString)(assetKey);
     if (!normalizedKey) {
+      if (bucket === "scripts") {
+        (0, import_errors.throwBadRequest)(`${context}.script must be a non-empty string asset key; use settings.code for inline JS code`);
+      }
       return;
     }
     const registry = assets[bucket] || {};
@@ -406,6 +442,11 @@ function resolveAssetSettings(settings, spec, assets, context) {
     if (!import_lodash.default.isPlainObject(asset)) {
       (0, import_errors.throwBadRequest)(`${context} ${bucket.slice(0, -1)} asset '${normalizedKey}' is not defined in assets.${bucket}`);
     }
+    if (bucket === "scripts" && !(0, import_private_utils.readOptionalString)(asset.code)) {
+      (0, import_errors.throwBadRequest)(
+        `${context}.script references script asset '${normalizedKey}' without non-empty code; use settings.code for inline JS code`
+      );
+    }
     import_lodash.default.merge(nextSettings, import_lodash.default.cloneDeep(asset));
   };
   mergeAsset("charts", spec.chart);
@@ -428,6 +469,337 @@ function resolvePopupTitleSettings(settings, title) {
   }
   return nextSettings;
 }
+function normalizeApplyBlueprintPopupMode(value, context) {
+  const rawMode = (0, import_private_utils.readOptionalString)(value);
+  if (!rawMode) {
+    return {};
+  }
+  if (APPLY_BLUEPRINT_POPUP_COMPOSE_MODES.has(rawMode)) {
+    return {
+      composeMode: rawMode
+    };
+  }
+  if (APPLY_BLUEPRINT_POPUP_DISPLAY_MODES.has(rawMode)) {
+    return {
+      displayMode: APPLY_BLUEPRINT_POPUP_DISPLAY_MODE_ALIASES[rawMode] || rawMode
+    };
+  }
+  (0, import_errors.throwBadRequest)(`${context}.mode must be 'replace', 'append', 'drawer', 'dialog' or 'page'`);
+}
+function countApplyBlueprintPopupDirectEffectiveFields(blocks) {
+  return blocks.reduce((count, block) => {
+    if (!import_lodash.default.isPlainObject(block) || (0, import_private_utils.readOptionalString)(block.type) === "filterForm") {
+      return count;
+    }
+    const fields = Object.prototype.hasOwnProperty.call(block, "fieldGroups") ? import_lodash.default.castArray(block.fieldGroups || []).flatMap((group) => import_lodash.default.castArray((group == null ? void 0 : group.fields) || [])) : import_lodash.default.castArray(block.fields || []);
+    return count + fields.filter((field) => {
+      if (import_lodash.default.isPlainObject(field)) {
+        const type = String(field.type || "").trim();
+        return type !== "divider" && type !== "jsitem" && type !== "jscolumn";
+      }
+      return !!String(field || "").trim();
+    }).length;
+  }, 0);
+}
+function countApplyBlueprintPopupNonFilterBlocks(blocks) {
+  return blocks.filter((block) => import_lodash.default.isPlainObject(block) && (0, import_private_utils.readOptionalString)(block.type) !== "filterForm").length;
+}
+function shouldDefaultApplyBlueprintPopupDisplayPage(popup, popupBlocks, options) {
+  if ((0, import_template_reference.hasFlowSurfaceTemplateReference)(popup.template)) {
+    return false;
+  }
+  if (Object.prototype.hasOwnProperty.call(popup, "mode")) {
+    return false;
+  }
+  if ((options.popupDepth || 1) !== 1) {
+    return false;
+  }
+  if (!popupBlocks.length) {
+    return false;
+  }
+  return countApplyBlueprintPopupNonFilterBlocks(popupBlocks) > APPLY_BLUEPRINT_POPUP_PAGE_MODE_BLOCK_THRESHOLD || countApplyBlueprintPopupDirectEffectiveFields(popupBlocks) > APPLY_BLUEPRINT_POPUP_PAGE_MODE_FIELD_THRESHOLD;
+}
+const MAX_AUTO_TEMPLATE_NAME_LENGTH = 80;
+const MAX_AUTO_TEMPLATE_DESCRIPTION_LENGTH = 240;
+const MAX_HEADER_TEXT = 60;
+const CJK_TEXT_PATTERN = /[\u3400-\u9fff\uf900-\ufaff]/;
+function normalizeMetadataText(value) {
+  return typeof value === "string" ? value.trim() : String(value || "").trim();
+}
+function trimAutoTemplateLabel(value, maxLength = MAX_AUTO_TEMPLATE_NAME_LENGTH) {
+  const source = normalizeMetadataText(value);
+  if (!source) {
+    return "";
+  }
+  if (source.length <= maxLength) {
+    return source;
+  }
+  if (maxLength <= 3) {
+    return source.slice(0, maxLength);
+  }
+  return `${source.slice(0, maxLength - 3)}...`;
+}
+function getApplyBlueprintCollectionLabel(block) {
+  var _a, _b, _c, _d;
+  return normalizeMetadataText(block == null ? void 0 : block.collection) || normalizeMetadataText((_a = block == null ? void 0 : block.resourceInit) == null ? void 0 : _a.collectionName) || normalizeMetadataText((_b = block == null ? void 0 : block.resourceInit) == null ? void 0 : _b.collection) || normalizeMetadataText((_c = block == null ? void 0 : block.resource) == null ? void 0 : _c.collectionName) || normalizeMetadataText((_d = block == null ? void 0 : block.resource) == null ? void 0 : _d.collection) || "";
+}
+function getApplyBlueprintAssociationLabel(block) {
+  var _a, _b, _c;
+  return normalizeMetadataText(block == null ? void 0 : block.associationName) || normalizeMetadataText((_a = block == null ? void 0 : block.resourceInit) == null ? void 0 : _a.associationName) || normalizeMetadataText((_b = block == null ? void 0 : block.resource) == null ? void 0 : _b.associationName) || normalizeMetadataText(block == null ? void 0 : block.associationField) || normalizeMetadataText((_c = block == null ? void 0 : block.resource) == null ? void 0 : _c.associationField) || "";
+}
+function buildApplyBlueprintBlockHeader(block) {
+  return normalizeMetadataText(block == null ? void 0 : block.title) || getApplyBlueprintCollectionLabel(block) || normalizeMetadataText(block == null ? void 0 : block.key) || normalizeMetadataText(block == null ? void 0 : block.type);
+}
+function inferPopupTemplateMetadataLocale(popup, options) {
+  var _a, _b;
+  const candidates = [
+    popup.title,
+    options.triggerLabel,
+    (_a = options.hostBlock) == null ? void 0 : _a.title,
+    (_b = options.hostBlock) == null ? void 0 : _b.key,
+    getApplyBlueprintCollectionLabel(options.hostBlock),
+    ...import_lodash.default.castArray(popup.blocks || []).flatMap((block) => [
+      block == null ? void 0 : block.title,
+      block == null ? void 0 : block.key,
+      block == null ? void 0 : block.type,
+      getApplyBlueprintCollectionLabel(block)
+    ])
+  ];
+  return candidates.some((value) => CJK_TEXT_PATTERN.test(normalizeMetadataText(value))) ? "zh" : "en";
+}
+function getPopupTemplateTriggerLabel(kind, locale) {
+  const normalizedKind = String(kind || "").trim();
+  if (locale === "zh") {
+    if (normalizedKind === "field") {
+      return "\u5B57\u6BB5";
+    }
+    if (normalizedKind === "recordAction") {
+      return "\u8BB0\u5F55\u64CD\u4F5C";
+    }
+    if (normalizedKind === "action") {
+      return "\u64CD\u4F5C";
+    }
+    return "\u5F39\u7A97";
+  }
+  if (normalizedKind === "field") {
+    return "field";
+  }
+  if (normalizedKind === "recordAction") {
+    return "record action";
+  }
+  if (normalizedKind === "action") {
+    return "action";
+  }
+  return "popup";
+}
+function describePopupTemplateTrigger(kind, label, locale) {
+  const kindLabel = getPopupTemplateTriggerLabel(kind, locale);
+  const normalizedLabel = normalizeMetadataText(label);
+  if (!normalizedLabel) {
+    return kindLabel;
+  }
+  return locale === "zh" ? `${kindLabel}\u201C${normalizedLabel}\u201D` : `${kindLabel} "${normalizedLabel}"`;
+}
+function describePopupTemplateHost(block, locale) {
+  return normalizeMetadataText(block == null ? void 0 : block.title) || getApplyBlueprintCollectionLabel(block) || normalizeMetadataText(block == null ? void 0 : block.key) || normalizeMetadataText(block == null ? void 0 : block.type) || (locale === "zh" ? "\u5F53\u524D\u533A\u5757" : "current block");
+}
+function summarizePopupTemplateBlocks(blocks, locale) {
+  const labels = import_lodash.default.uniq(
+    import_lodash.default.castArray(blocks || []).map((block) => trimAutoTemplateLabel(buildApplyBlueprintBlockHeader(block), MAX_HEADER_TEXT)).filter(Boolean)
+  ).slice(0, 3);
+  if (!labels.length) {
+    return locale === "zh" ? "\u672C\u5730 popup \u5185\u5BB9" : "local popup content";
+  }
+  return labels.join(locale === "zh" ? "\u3001" : ", ");
+}
+function inferPopupTemplateMetadataScene(popup, options) {
+  var _a;
+  const requestedDefaultType = normalizeMetadataText(popup.defaultType);
+  if (requestedDefaultType === "view" || requestedDefaultType === "edit") {
+    return requestedDefaultType;
+  }
+  const ownerActionType = normalizeMetadataText(options.ownerActionType);
+  if (ownerActionType === "edit") {
+    return "edit";
+  }
+  if (ownerActionType === "addNew" || ownerActionType === "addChild") {
+    return "addNew";
+  }
+  if (ownerActionType === "view") {
+    return "view";
+  }
+  const firstBlockType = normalizeMetadataText((_a = import_lodash.default.castArray(popup.blocks || [])[0]) == null ? void 0 : _a.type);
+  if (firstBlockType === "details") {
+    return "view";
+  }
+  if (firstBlockType === "editForm") {
+    return "edit";
+  }
+  if (firstBlockType === "createForm") {
+    return "addNew";
+  }
+  return "generic";
+}
+function describePopupTemplateMatchContext(popup, options, locale) {
+  const popupBlocks = import_lodash.default.castArray(popup.blocks || []);
+  const firstResourceBlock = popupBlocks.find(
+    (block) => getApplyBlueprintCollectionLabel(block) || getApplyBlueprintAssociationLabel(block)
+  );
+  const collectionLabel = getApplyBlueprintCollectionLabel(firstResourceBlock) || getApplyBlueprintCollectionLabel(options.hostBlock);
+  const associationLabel = normalizeMetadataText(options.associationName) || getApplyBlueprintAssociationLabel(firstResourceBlock) || getApplyBlueprintAssociationLabel(options.hostBlock);
+  const scene = inferPopupTemplateMetadataScene(popup, options);
+  const parts = locale === "zh" ? [`\u573A\u666F\uFF1A${scene}`] : [`Scene: ${scene}`];
+  if (collectionLabel) {
+    parts.push(locale === "zh" ? `\u6570\u636E\u8868\uFF1A${collectionLabel}` : `collection: ${collectionLabel}`);
+  }
+  if (associationLabel) {
+    parts.push(locale === "zh" ? `\u5173\u7CFB\uFF1A${associationLabel}` : `association: ${associationLabel}`);
+  }
+  return parts.join(locale === "zh" ? "\uFF1B" : "; ");
+}
+function buildApplyBlueprintAutoSaveTemplateMetadata(popup, options) {
+  const locale = inferPopupTemplateMetadataLocale(popup, options);
+  const popupTitle = normalizeMetadataText(popup.title);
+  const hostLabel = describePopupTemplateHost(options.hostBlock, locale);
+  const triggerLabel = describePopupTemplateTrigger(options.triggerKind, options.triggerLabel, locale);
+  const contentLabel = summarizePopupTemplateBlocks(popup.blocks, locale);
+  const matchContextLabel = describePopupTemplateMatchContext(popup, options, locale);
+  const associationName = normalizeMetadataText(options.associationName);
+  const directName = popupTitle ? locale === "zh" ? `${popupTitle}\u5F39\u7A97\u6A21\u677F` : `${popupTitle} popup template` : locale === "zh" ? `${hostLabel} ${triggerLabel} \u5F39\u7A97\u6A21\u677F` : `${hostLabel} ${triggerLabel} popup template`;
+  const relationBaseName = popupTitle || `${hostLabel} ${triggerLabel}`;
+  const name = associationName ? `${relationBaseName}(${associationName})` : directName;
+  const contextLabel = associationName ? locale === "zh" ? `\u4E0A\u4E0B\u6587\uFF1A\u5173\u8054 ${associationName}` : `context: relation ${associationName}` : locale === "zh" ? "\u4E0A\u4E0B\u6587\uFF1A\u76F4\u63A5/\u5F53\u524D\u8BB0\u5F55" : "context: direct/current record";
+  const description = locale === "zh" ? `\u590D\u7528\u5F39\u7A97\u6A21\u677F\u3002${matchContextLabel}\uFF1B\u5BBF\u4E3B\uFF1A${hostLabel}\uFF1B\u89E6\u53D1\u5668\uFF1A${triggerLabel}\uFF1B${contextLabel}\uFF1B\u5185\u5BB9\uFF1A${contentLabel}\u3002` : `Reusable popup template. ${matchContextLabel}; host: ${hostLabel}; trigger: ${triggerLabel}; ${contextLabel}; content: ${contentLabel}.`;
+  return {
+    name: trimAutoTemplateLabel(name, MAX_AUTO_TEMPLATE_NAME_LENGTH),
+    description: trimAutoTemplateLabel(description, MAX_AUTO_TEMPLATE_DESCRIPTION_LENGTH)
+  };
+}
+function buildPopupOpenViewContext(options) {
+  const associationName = normalizeMetadataText(options.associationName);
+  if (!associationName) {
+    return {};
+  }
+  return (0, import_service_utils.buildDefinedPayload)({
+    dataSourceKey: normalizeMetadataText(options.dataSourceKey) || void 0,
+    collectionName: normalizeMetadataText(options.surfaceCollectionName) || void 0,
+    associationName
+  });
+}
+function normalizeApplyBlueprintCalendarCompatSettings(block, settings) {
+  if ((0, import_private_utils.readOptionalString)(block.type) !== "calendar") {
+    return settings;
+  }
+  let nextSettings = settings;
+  const ensureNextSettings = () => {
+    if (nextSettings === settings) {
+      nextSettings = import_lodash.default.cloneDeep(settings || {});
+    }
+    return nextSettings;
+  };
+  for (const key of APPLY_BLUEPRINT_CALENDAR_FIELD_BINDING_KEYS) {
+    if (Object.prototype.hasOwnProperty.call(block, key) && !Object.prototype.hasOwnProperty.call(nextSettings, key)) {
+      ensureNextSettings()[key] = block[key];
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(nextSettings, "quickCreateEnabled") && !Object.prototype.hasOwnProperty.call(nextSettings, "quickCreateEvent")) {
+    ensureNextSettings().quickCreateEvent = nextSettings.quickCreateEnabled;
+  }
+  if (nextSettings !== settings) {
+    delete nextSettings.quickCreateEnabled;
+  }
+  return nextSettings;
+}
+function isApplyBlueprintCompatibleTreeTableDragSortFieldMeta(field) {
+  var _a;
+  if (String((0, import_service_helpers.getFieldInterface)(field) || (0, import_service_helpers.getFieldType)(field) || "").trim() !== "sort") {
+    return false;
+  }
+  return !String((0, import_service_helpers.getFieldTarget)(field) || "").trim() && !String((field == null ? void 0 : field.scopeKey) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.scopeKey) || "").trim();
+}
+function getApplyBlueprintCompatibleTreeTableDragSortFieldName(collection) {
+  return (0, import_service_helpers.getFieldName)((0, import_service_helpers.getCollectionFields)(collection).find(isApplyBlueprintCompatibleTreeTableDragSortFieldMeta));
+}
+function isApplyBlueprintCompatibleTreeTableDragSortField(collection, fieldName) {
+  const field = (0, import_service_helpers.getCollectionFields)(collection).find((candidate) => (0, import_service_helpers.getFieldName)(candidate) === fieldName);
+  return !!field && isApplyBlueprintCompatibleTreeTableDragSortFieldMeta(field);
+}
+function normalizeApplyBlueprintTreeTableDragSortBy(block, settings, getCollection) {
+  if ((0, import_private_utils.readOptionalString)(block.type) !== "table" || (settings == null ? void 0 : settings.treeTable) !== true || !Object.prototype.hasOwnProperty.call(settings || {}, "dragSortBy")) {
+    return settings;
+  }
+  const collection = resolveBlueprintBlockCollection(block, getCollection);
+  if (!collection) {
+    return settings;
+  }
+  const currentFieldName = (0, import_private_utils.readOptionalString)(settings.dragSortBy);
+  if (currentFieldName && isApplyBlueprintCompatibleTreeTableDragSortField(collection, currentFieldName)) {
+    return settings;
+  }
+  const nextSettings = import_lodash.default.cloneDeep(settings || {});
+  const replacementFieldName = getApplyBlueprintCompatibleTreeTableDragSortFieldName(collection);
+  if (replacementFieldName) {
+    nextSettings.dragSortBy = replacementFieldName;
+  } else {
+    delete nextSettings.dragSortBy;
+  }
+  return nextSettings;
+}
+function isApplyBlueprintTreeTableBlock(blockType, settings, template, block, getCollection) {
+  return blockType === "table" && (settings == null ? void 0 : settings.treeTable) === true && !(0, import_template_reference.hasFlowSurfaceTemplateDocument)(template) && canInjectTreeTableAddChildDefault(block, getCollection);
+}
+function getTreeTableFirstFieldPath(fields) {
+  const firstField = fields.find((field) => {
+    if (typeof field === "string") {
+      return !!field.trim();
+    }
+    return import_lodash.default.isPlainObject(field) && !!(0, import_private_utils.readOptionalString)(field.field);
+  });
+  if (typeof firstField === "string") {
+    return firstField.trim();
+  }
+  return (0, import_private_utils.readOptionalString)(firstField == null ? void 0 : firstField.field);
+}
+function isUnreadableTreeTableFirstColumnName(fieldPath) {
+  const normalizedFieldPath = String(fieldPath || "").trim();
+  if (!normalizedFieldPath || normalizedFieldPath.includes(".")) {
+    return false;
+  }
+  const normalizedLowerFieldPath = normalizedFieldPath.toLowerCase();
+  return ["id", "uid", "uuid", "parentid"].includes(normalizedLowerFieldPath) || /(?:Id|ID|Uid|UID)$/.test(normalizedFieldPath) || normalizedLowerFieldPath.endsWith("_id") || normalizedLowerFieldPath.endsWith("_uid");
+}
+function isUnreadableTreeTableFirstColumnField(field) {
+  var _a, _b;
+  return !!(field == null ? void 0 : field.primaryKey) || !!((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.primaryKey) || !!(field == null ? void 0 : field.foreignKey) || !!((_b = field == null ? void 0 : field.options) == null ? void 0 : _b.foreignKey) || isApplyBlueprintAssociationField(field) || isUnreadableTreeTableFirstColumnName((0, import_service_helpers.getFieldName)(field));
+}
+function isReadableTreeTableFirstColumnField(fieldPath, collection) {
+  if (!fieldPath || fieldPath.includes(".")) {
+    return false;
+  }
+  const field = collection ? (0, import_service_helpers.resolveFieldFromCollection)(collection, fieldPath) : void 0;
+  return !!field && !!(0, import_service_helpers.getFieldInterface)(field) && !isUnreadableTreeTableFirstColumnName(fieldPath) && !isUnreadableTreeTableFirstColumnField(field);
+}
+function reorderApplyBlueprintTreeTableExplicitFields(input) {
+  if (!Object.prototype.hasOwnProperty.call(input.block, "fields") || !isApplyBlueprintTreeTableBlock(input.blockType, input.settings, input.template, input.block, input.getCollection)) {
+    return input.fields;
+  }
+  const firstFieldPath = getTreeTableFirstFieldPath(input.fields);
+  if (firstFieldPath && isReadableTreeTableFirstColumnField(firstFieldPath, input.collection)) {
+    return input.fields;
+  }
+  const readableIndex = input.fields.findIndex(
+    (field) => isReadableTreeTableFirstColumnField(getTreeTableFirstFieldPath([field]), input.collection)
+  );
+  if (readableIndex >= 0) {
+    const nextFields = input.fields.slice();
+    const [readableField] = nextFields.splice(readableIndex, 1);
+    nextFields.unshift(readableField);
+    return nextFields;
+  }
+  (0, import_errors.throwBadRequest)(
+    `${input.context}.fields[0] tree table explicit fields must include at least one direct readable non-association field; do not rely on applyBlueprint to inject a title/name fallback`
+  );
+}
 function normalizeBlockResourceObject(input, context) {
   (0, import_private_utils.assertOnlyAllowedKeys)(input, context, APPLY_BLUEPRINT_BLOCK_RESOURCE_ALLOWED_KEYS);
   const hasBinding = Object.prototype.hasOwnProperty.call(input, "binding");
@@ -465,7 +837,7 @@ function normalizeBlockResourceObject(input, context) {
   }
   return normalized;
 }
-function buildBlockResource(block, context) {
+function buildBlockResource(block, context, resourceContext, blockType) {
   if (!import_lodash.default.isUndefined(block.resource)) {
     if (!import_lodash.default.isPlainObject(block.resource)) {
       (0, import_errors.throwBadRequest)(`${context}.resource must be an object`);
@@ -500,15 +872,178 @@ function buildBlockResource(block, context) {
     (0, import_errors.throwBadRequest)(`${context}.associationField only works when ${context}.binding is provided`);
   }
   const collectionName = (0, import_private_utils.readOptionalString)(block.collection);
-  if (!collectionName) {
+  if (!collectionName && !(0, import_public_data_surface_default_filter.isFlowSurfacePublicDataSurfaceBlockType)(blockType || "")) {
+    return void 0;
+  }
+  const inheritedCollectionName = (0, import_private_utils.readOptionalString)(resourceContext == null ? void 0 : resourceContext.surfaceCollectionName);
+  if (!collectionName && !inheritedCollectionName) {
     return void 0;
   }
   return (0, import_service_utils.buildDefinedPayload)({
-    dataSourceKey: (0, import_private_utils.readOptionalString)(block.dataSourceKey) || "main",
-    collectionName,
+    binding: !collectionName && inheritedCollectionName ? "otherRecords" : void 0,
+    dataSourceKey: (0, import_private_utils.readOptionalString)(block.dataSourceKey) || (0, import_private_utils.readOptionalString)(resourceContext == null ? void 0 : resourceContext.dataSourceKey) || "main",
+    collectionName: collectionName || inheritedCollectionName,
     associationPathName: (0, import_private_utils.readOptionalString)(block.associationPathName)
   });
 }
+const APPLY_BLUEPRINT_ASSOCIATION_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "belongsto",
+  "hasone",
+  "hasmany",
+  "belongstomany",
+  "belongstoarray",
+  "onetoone"
+]);
+const APPLY_BLUEPRINT_ASSOCIATION_FIELD_INTERFACES = /* @__PURE__ */ new Set([
+  "m2o",
+  "o2m",
+  "m2m",
+  "o2o",
+  "mbm",
+  "obo",
+  "oho",
+  "manytoone",
+  "onetomany",
+  "manytomany"
+]);
+function getApplyBlueprintAssociationFieldRoot(value) {
+  return String(value || "").split(".").map((segment) => segment.trim()).filter(Boolean)[0];
+}
+function isApplyBlueprintAssociationField(field) {
+  if (!field) {
+    return false;
+  }
+  if ((0, import_service_helpers.getFieldTarget)(field)) {
+    return true;
+  }
+  const fieldType = String((0, import_service_helpers.getFieldType)(field) || "").toLowerCase();
+  if (APPLY_BLUEPRINT_ASSOCIATION_FIELD_TYPES.has(fieldType)) {
+    return true;
+  }
+  const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").toLowerCase();
+  return APPLY_BLUEPRINT_ASSOCIATION_FIELD_INTERFACES.has(fieldInterface);
+}
+function resolveApplyBlueprintAssociationFieldFromPath(collection, fieldPath) {
+  const normalizedFieldPath = normalizeMetadataText(fieldPath);
+  if (!collection || !normalizedFieldPath) {
+    return { field: void 0, associationPath: "" };
+  }
+  const field = (0, import_service_helpers.resolveFieldFromCollection)(collection, normalizedFieldPath);
+  if (isApplyBlueprintAssociationField(field)) {
+    return { field, associationPath: normalizedFieldPath };
+  }
+  const parentPath = normalizedFieldPath.includes(".") ? normalizedFieldPath.split(".").filter(Boolean).slice(0, -1).join(".") : "";
+  if (!parentPath) {
+    return { field, associationPath: normalizedFieldPath };
+  }
+  const parentField = (0, import_service_helpers.resolveFieldFromCollection)(collection, parentPath);
+  return { field: parentField, associationPath: parentPath };
+}
+function resolveApplyBlueprintAssociationContext(input) {
+  var _a;
+  const sourceCollectionName = normalizeMetadataText(input.sourceCollectionName);
+  const associationFieldPath = normalizeMetadataText(input.associationField);
+  if (!sourceCollectionName || !associationFieldPath) {
+    return void 0;
+  }
+  const dataSourceKey = normalizeMetadataText(input.dataSourceKey) || "main";
+  const sourceCollection = (_a = input.getCollection) == null ? void 0 : _a.call(input, dataSourceKey, sourceCollectionName);
+  const { field, associationPath } = resolveApplyBlueprintAssociationFieldFromPath(
+    sourceCollection,
+    associationFieldPath
+  );
+  if (input.requireAssociationField && !isApplyBlueprintAssociationField(field)) {
+    return void 0;
+  }
+  const targetCollection = (0, import_service_helpers.resolveFieldTargetCollection)(field, dataSourceKey, input.getCollection);
+  const targetCollectionName = normalizeMetadataText(input.targetCollectionName) || normalizeMetadataText((0, import_service_helpers.getCollectionName)(targetCollection)) || normalizeMetadataText((0, import_service_helpers.getFieldTarget)(field));
+  return {
+    dataSourceKey,
+    surfaceCollectionName: targetCollectionName || void 0,
+    associationName: (associationPath.includes(".") ? `${sourceCollectionName}.${associationPath}` : void 0) || (0, import_service_helpers.resolveAssociationNameFromField)(field, sourceCollection) || `${sourceCollectionName}.${associationPath || associationFieldPath}`
+  };
+}
+function getApplyBlueprintBlockResourceObject(block) {
+  return import_lodash.default.isPlainObject(block == null ? void 0 : block.resource) ? block.resource : void 0;
+}
+function getApplyBlueprintBlockBinding(block) {
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  return normalizeMetadataText(block == null ? void 0 : block.binding) || normalizeMetadataText(resource == null ? void 0 : resource.binding);
+}
+function getApplyBlueprintBlockDataSourceKey(block, parentContext) {
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  return normalizeMetadataText(block == null ? void 0 : block.dataSourceKey) || normalizeMetadataText(resource == null ? void 0 : resource.dataSourceKey) || (parentContext == null ? void 0 : parentContext.dataSourceKey) || "main";
+}
+function getApplyBlueprintBlockDirectCollection(block) {
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  return normalizeMetadataText(block == null ? void 0 : block.collection) || normalizeMetadataText(resource == null ? void 0 : resource.collectionName);
+}
+function getApplyBlueprintBlockExplicitAssociationName(block) {
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  return normalizeMetadataText(block == null ? void 0 : block.associationName) || normalizeMetadataText(resource == null ? void 0 : resource.associationName);
+}
+function getApplyBlueprintBlockAssociationField(block, context) {
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  return normalizeMetadataText(resource == null ? void 0 : resource.associationField) || normalizeMetadataText(block.associationField) || readAssociationFieldFromSingleSegmentPath(resource == null ? void 0 : resource.associationPathName, `${context}.resource`) || readAssociationFieldFromSingleSegmentPath(block.associationPathName, context);
+}
+function resolveApplyBlueprintBlockResourceContext(block, parentContext, getCollection, context) {
+  const dataSourceKey = getApplyBlueprintBlockDataSourceKey(block, parentContext);
+  const directCollectionName = getApplyBlueprintBlockDirectCollection(block);
+  const explicitAssociationName = getApplyBlueprintBlockExplicitAssociationName(block);
+  if (explicitAssociationName) {
+    return {
+      dataSourceKey,
+      surfaceCollectionName: directCollectionName || (parentContext == null ? void 0 : parentContext.surfaceCollectionName),
+      associationName: explicitAssociationName
+    };
+  }
+  const resource = getApplyBlueprintBlockResourceObject(block);
+  const normalizedAssociatedRecords = getApplyBlueprintBlockBinding(block) ? normalizeAssociatedRecordsBindingFromAssociationPath(
+    resource || block,
+    resource ? `${context}.resource` : context
+  ) : null;
+  const binding = ((normalizedAssociatedRecords == null ? void 0 : normalizedAssociatedRecords.binding) || getApplyBlueprintBlockBinding(block)).toLowerCase();
+  if (binding === "associatedrecords") {
+    const associationField = (normalizedAssociatedRecords == null ? void 0 : normalizedAssociatedRecords.associationField) || getApplyBlueprintBlockAssociationField(block, context);
+    const associatedContext = resolveApplyBlueprintAssociationContext({
+      dataSourceKey,
+      sourceCollectionName: parentContext == null ? void 0 : parentContext.surfaceCollectionName,
+      associationField,
+      targetCollectionName: directCollectionName,
+      getCollection
+    });
+    return {
+      dataSourceKey,
+      surfaceCollectionName: directCollectionName || (associatedContext == null ? void 0 : associatedContext.surfaceCollectionName) || (parentContext == null ? void 0 : parentContext.surfaceCollectionName),
+      associationName: (parentContext == null ? void 0 : parentContext.associationName) || (associatedContext == null ? void 0 : associatedContext.associationName)
+    };
+  }
+  return {
+    dataSourceKey,
+    surfaceCollectionName: directCollectionName || (parentContext == null ? void 0 : parentContext.surfaceCollectionName),
+    associationName: parentContext == null ? void 0 : parentContext.associationName
+  };
+}
+function resolveApplyBlueprintFieldAssociationContext(input) {
+  return resolveApplyBlueprintAssociationContext({
+    dataSourceKey: input.parentContext.dataSourceKey,
+    sourceCollectionName: input.parentContext.surfaceCollectionName,
+    associationField: input.fieldPath,
+    getCollection: input.getCollection,
+    requireAssociationField: true
+  });
+}
+function getApplyBlueprintFieldAssociationPath(input) {
+  const associationPathName = (0, import_private_utils.readOptionalString)(input.associationPathName);
+  const fieldPath = (0, import_private_utils.readOptionalString)(input.field);
+  if (!associationPathName) {
+    return fieldPath;
+  }
+  if (!fieldPath || fieldPath === associationPathName || fieldPath.startsWith(`${associationPathName}.`)) {
+    return associationPathName;
+  }
+  return `${associationPathName}.${fieldPath}`;
+}
 function ensureLayoutRows(layout, context) {
   if (import_lodash.default.isUndefined(layout)) {
     return void 0;
@@ -598,51 +1133,21 @@ function compileScopedLayout(layout, keysByLocalKey, context, kind) {
     })
   };
 }
-function buildCompactFieldLayoutRow(keys, blockType) {
-  const normalizedKeys = keys.filter(Boolean);
-  if (!normalizedKeys.length) {
-    return [];
-  }
-  if (blockType === "filterForm") {
-    const span = normalizedKeys.length === 1 ? 24 : normalizedKeys.length === 2 ? 12 : 8;
-    return normalizedKeys.map((key) => ({ key, span }));
-  }
-  if (normalizedKeys.length === 1) {
-    return [{ key: normalizedKeys[0], span: 24 }];
-  }
-  return normalizedKeys.map((key) => ({ key, span: 12 }));
-}
-function buildAutoCompiledFieldsLayout(fields, blockType) {
-  if (!APPLY_BLUEPRINT_FIELD_GRID_BLOCK_TYPES.has(blockType || "") || !fields.length) {
-    return void 0;
-  }
-  const rows = [];
-  const chunkSize = blockType === "filterForm" ? 3 : 2;
-  let pendingKeys = [];
-  const flushPending = () => {
-    if (!pendingKeys.length) {
-      return;
-    }
-    rows.push(buildCompactFieldLayoutRow(pendingKeys, blockType));
-    pendingKeys = [];
-  };
-  fields.forEach((field) => {
-    const key = (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.key);
-    if (!key) {
-      return;
-    }
-    if ((0, import_private_utils.readOptionalString)(field == null ? void 0 : field.type) === "divider") {
-      flushPending();
-      rows.push([{ key, span: 24 }]);
-      return;
-    }
-    pendingKeys.push(key);
-    if (pendingKeys.length >= chunkSize) {
-      flushPending();
-    }
-  });
-  flushPending();
-  return rows.length ? { rows } : void 0;
+function buildAutoCompiledFieldsLayout(fields, blockType, collection) {
+  return (0, import_field_grid_layout.buildFlowSurfaceAutoFieldGridLayout)(
+    fields.map((field) => ({
+      key: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.key),
+      type: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.type),
+      fieldPath: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.fieldPath),
+      associationPathName: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.associationPathName),
+      fieldInterface: (0, import_field_grid_layout.resolveFlowSurfaceFieldGridFieldInterface)({
+        collection,
+        fieldPath: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.fieldPath),
+        associationPathName: (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.associationPathName)
+      })
+    })),
+    blockType
+  );
 }
 function compileFieldGroups(fieldGroups, context) {
   const expanded = [];
@@ -674,13 +1179,64 @@ function compileFieldGroups(fieldGroups, context) {
   });
   return expanded;
 }
-function resolveBlockFieldInputs(block, context) {
+function buildAutoFieldGroupFieldPathsFromCollection(collection) {
+  const fields = (0, import_service_helpers.getCollectionFields)(collection);
+  const associationForeignKeys = new Set(
+    fields.filter((field) => (0, import_service_helpers.getFieldType)(field) === "belongsTo").map((field) => {
+      var _a;
+      return String((field == null ? void 0 : field.foreignKey) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.foreignKey) || "").trim();
+    }).filter(Boolean)
+  );
+  return fields.filter((field) => {
+    var _a, _b;
+    const name = (0, import_service_helpers.getFieldName)(field);
+    if (!name || name === "id") {
+      return false;
+    }
+    if (associationForeignKeys.has(name)) {
+      return false;
+    }
+    if ((field == null ? void 0 : field.hidden) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.hidden)) {
+      return false;
+    }
+    if (typeof (field == null ? void 0 : field.isAssociationField) === "function" && field.isAssociationField()) {
+      return false;
+    }
+    const type = String((field == null ? void 0 : field.type) || ((_b = field == null ? void 0 : field.options) == null ? void 0 : _b.type) || "").trim();
+    return !["belongsTo", "hasOne", "hasMany", "belongsToMany", "json", "password"].includes(type);
+  }).map((field) => (0, import_service_helpers.getFieldName)(field)).filter((name) => !!name);
+}
+function buildAutoFieldGroupsFromCollection(block, getCollection) {
+  const blockType = (0, import_private_utils.readOptionalString)(block.type);
+  if (!APPLY_BLUEPRINT_FIELD_GROUP_BLOCK_TYPES.has(blockType || "")) {
+    return void 0;
+  }
+  const collection = resolveBlueprintBlockCollection(block, getCollection);
+  const fields = buildAutoFieldGroupFieldPathsFromCollection(collection);
+  if (!fields.length) {
+    return void 0;
+  }
+  return [
+    {
+      key: "main",
+      title: "Main",
+      fields
+    }
+  ];
+}
+function resolveBlockFieldInputs(block, context, getCollection) {
   const hasFields = Object.prototype.hasOwnProperty.call(block, "fields");
   const hasFieldGroups = Object.prototype.hasOwnProperty.call(block, "fieldGroups");
   if (hasFields && hasFieldGroups) {
     (0, import_errors.throwBadRequest)(`${context} cannot mix fields with fieldGroups`);
   }
   if (!hasFieldGroups) {
+    if (!hasFields) {
+      const autoFieldGroups = buildAutoFieldGroupsFromCollection(block, getCollection);
+      if (autoFieldGroups == null ? void 0 : autoFieldGroups.length) {
+        return compileFieldGroups(autoFieldGroups, `${context}.fieldGroups`);
+      }
+    }
     return readOptionalItems(block.fields, `${context}.fields`);
   }
   const blockType = (0, import_private_utils.readOptionalString)(block.type);
@@ -746,6 +1302,19 @@ function attachDefaultActionPopupMetadata(popup, actionType, metadata) {
   const defaultPopup = actionType === "addChild" && import_lodash.default.isUndefined(popup) ? {} : popup;
   return attachCompiledPopupDefaults(defaultPopup, metadata);
 }
+function hasNestedDefaultPopupMetadata(value) {
+  if (Array.isArray(value)) {
+    return value.some((item) => hasNestedDefaultPopupMetadata(item));
+  }
+  if (!import_lodash.default.isPlainObject(value)) {
+    return false;
+  }
+  const popup = value.popup;
+  if (import_lodash.default.isPlainObject(popup) && Object.prototype.hasOwnProperty.call(popup, import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY)) {
+    return true;
+  }
+  return Object.entries(value).some(([key, item]) => key !== "popup" && hasNestedDefaultPopupMetadata(item));
+}
 function compilePopup(popup, scopePrefix, assets, context, defaults, options = {}) {
   if (import_lodash.default.isUndefined(popup)) {
     return {};
@@ -755,7 +1324,10 @@ function compilePopup(popup, scopePrefix, assets, context, defaults, options = {
   }
   (0, import_private_utils.assertOnlyAllowedKeys)(popup, context, APPLY_BLUEPRINT_POPUP_ALLOWED_KEYS);
   const popupTitle = (0, import_private_utils.readOptionalString)(popup.title);
+  const popupMode = normalizeApplyBlueprintPopupMode(popup.mode, context);
   const template = ensureOptionalTemplate(popup.template, `${context}.template`);
+  const hasTemplateReference = (0, import_template_reference.hasFlowSurfaceTemplateReference)(template);
+  const hasTemplateDocument = (0, import_template_reference.hasFlowSurfaceTemplateDocument)(template);
   const tryTemplate = import_lodash.default.isUndefined(popup.tryTemplate) ? void 0 : import_lodash.default.isBoolean(popup.tryTemplate) ? popup.tryTemplate : (0, import_errors.throwBadRequest)(`${context}.tryTemplate must be a boolean`);
   const defaultType = import_lodash.default.isUndefined(popup.defaultType) ? void 0 : popup.defaultType === "view" || popup.defaultType === "edit" ? popup.defaultType : (0, import_errors.throwBadRequest)(`${context}.defaultType must be 'view' or 'edit'`);
   const saveAsTemplate = import_lodash.default.isUndefined(popup.saveAsTemplate) ? void 0 : import_lodash.default.isPlainObject(popup.saveAsTemplate) ? ((0, import_private_utils.assertOnlyAllowedKeys)(
@@ -767,22 +1339,26 @@ function compilePopup(popup, scopePrefix, assets, context, defaults, options = {
     description: (0, import_private_utils.assertNonEmptyString)(popup.saveAsTemplate.description, `${context}.saveAsTemplate.description`),
     local: (0, import_private_utils.readOptionalString)(popup.saveAsTemplate.local)
   }) : (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate must be an object`);
-  if (saveAsTemplate && template) {
+  if (saveAsTemplate && hasTemplateReference) {
     (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate cannot be combined with ${context}.template`);
   }
-  if (template) {
+  if (hasTemplateReference) {
+    const openViewContext2 = buildPopupOpenViewContext(options);
+    const openView2 = (0, import_service_utils.buildDefinedPayload)({
+      ...openViewContext2,
+      ...popupMode.displayMode ? { mode: popupMode.displayMode } : {}
+    });
     return {
-      popup: {
-        template
-      },
+      popup: (0, import_service_utils.buildDefinedPayload)({
+        template,
+        ...Object.keys(openView2).length ? { openView: openView2 } : {}
+      }),
       popupTitle
     };
   }
   const rawPopupBlocks = readOptionalItems(popup.blocks, `${context}.blocks`);
   const popupBlocks = options.ownerActionType === "edit" && rawPopupBlocks.length ? normalizeEditPopupBlocks(rawPopupBlocks, context) : rawPopupBlocks;
-  if (saveAsTemplate && !popupBlocks.length && tryTemplate !== true) {
-    (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate requires explicit popup.blocks`);
-  }
+  const isMultiBlockEditPopup = options.ownerActionType === "edit" && popupBlocks.length > 1;
   const compiledBlocks = popupBlocks.length ? compileBlocks(
     popupBlocks,
     scopePrefix,
@@ -790,23 +1366,40 @@ function compilePopup(popup, scopePrefix, assets, context, defaults, options = {
     `${context}.blocks`,
     defaults,
     collectReferencedBlockKeys(popup.layout, `${context}.layout`),
-    options.getCollection
+    options.getCollection,
+    {
+      mode: options.mode,
+      popupDepth: (options.popupDepth || 1) + 1,
+      dataSourceKey: options.dataSourceKey,
+      surfaceCollectionName: options.surfaceCollectionName,
+      associationName: options.associationName
+    }
   ) : { blocks: [], blockKeysByLocalKey: /* @__PURE__ */ new Map() };
+  const hasNestedDefaultPopup = hasNestedDefaultPopupMetadata(compiledBlocks.blocks);
+  const willAutoTryTemplate = import_lodash.default.isUndefined(popup.tryTemplate) && options.mode === "create" && !hasTemplateDocument && popupBlocks.length > 0 && !isMultiBlockEditPopup && !hasNestedDefaultPopup;
+  if (saveAsTemplate && !popupBlocks.length && tryTemplate !== true && !willAutoTryTemplate) {
+    (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate requires explicit popup.blocks`);
+  }
   const layout = popupBlocks.length || popup.layout ? compileLayout(
     popup.layout || autoLayoutFromBlockKeys(compiledBlocks.blocks.map((block) => block.key)),
     compiledBlocks.blockKeysByLocalKey,
     `${context}.layout`
   ) : void 0;
-  const popupMode = (0, import_private_utils.readOptionalString)(popup.mode);
-  if (popupMode && popupMode !== "replace" && popupMode !== "append") {
-    (0, import_errors.throwBadRequest)(`${context}.mode must be 'replace' or 'append'`);
-  }
+  const autoSaveAsTemplate = import_lodash.default.isUndefined(saveAsTemplate) && options.mode === "create" && !hasTemplateDocument && popupBlocks.length > 0 && !isMultiBlockEditPopup && !hasNestedDefaultPopup ? buildApplyBlueprintAutoSaveTemplateMetadata(popup, options) : void 0;
+  const effectiveTryTemplate = willAutoTryTemplate ? true : tryTemplate;
+  const displayMode = popupMode.displayMode || (shouldDefaultApplyBlueprintPopupDisplayPage(popup, popupBlocks, options) ? "embed" : popupBlocks.length && (options.popupDepth || 1) > 1 ? "drawer" : void 0);
+  const openViewContext = buildPopupOpenViewContext(options);
+  const openView = (0, import_service_utils.buildDefinedPayload)({
+    ...openViewContext,
+    ...displayMode ? { mode: displayMode } : {}
+  });
   const compiledPopup = (0, import_service_utils.buildDefinedPayload)({
-    mode: popupMode || (popupBlocks.length || template || layout ? "replace" : void 0),
-    template,
-    ...tryTemplate ? { tryTemplate: true } : {},
+    mode: popupMode.composeMode || (popupBlocks.length || layout ? "replace" : void 0),
+    template: hasTemplateDocument ? template : void 0,
+    ...Object.keys(openView).length ? { openView } : {},
+    ...!import_lodash.default.isUndefined(effectiveTryTemplate) ? { tryTemplate: effectiveTryTemplate } : {},
     ...defaultType ? { defaultType } : {},
-    ...saveAsTemplate ? { saveAsTemplate } : {},
+    ...saveAsTemplate || autoSaveAsTemplate ? { saveAsTemplate: saveAsTemplate || autoSaveAsTemplate } : {},
     blocks: compiledBlocks.blocks.length ? compiledBlocks.blocks : void 0,
     layout
   });
@@ -879,7 +1472,7 @@ function compileTreeConnectSettingsTargets(settings, localBlockKeys, context) {
   });
   return nextSettings;
 }
-function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults, getCollection) {
+function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults, getCollection, popupOptions = {}) {
   if (typeof input === "string") {
     const fieldPath2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
     return {
@@ -915,9 +1508,27 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
   if ((0, import_private_utils.readOptionalString)(input.label) && import_lodash.default.isUndefined(settings.label)) {
     settings.label = (0, import_private_utils.readOptionalString)(input.label);
   }
-  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
+  const parentResourceContext = {
+    dataSourceKey: popupOptions.dataSourceKey,
+    surfaceCollectionName: popupOptions.surfaceCollectionName,
+    associationName: popupOptions.associationName
+  };
+  const fieldAssociationContext = resolveApplyBlueprintFieldAssociationContext({
+    fieldPath: getApplyBlueprintFieldAssociationPath(input),
+    parentContext: parentResourceContext,
     getCollection
   });
+  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
+    getCollection,
+    mode: popupOptions.mode,
+    popupDepth: popupOptions.popupDepth,
+    triggerKind: "field",
+    triggerLabel: input.label || input.field || input.key,
+    hostBlock: popupOptions.hostBlock,
+    dataSourceKey: (fieldAssociationContext == null ? void 0 : fieldAssociationContext.dataSourceKey) || popupOptions.dataSourceKey,
+    surfaceCollectionName: (fieldAssociationContext == null ? void 0 : fieldAssociationContext.surfaceCollectionName) || popupOptions.surfaceCollectionName,
+    associationName: popupOptions.associationName || (fieldAssociationContext == null ? void 0 : fieldAssociationContext.associationName)
+  });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
   const popup = shouldAttachDefaultPopupMetadata(input.popup, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
@@ -938,13 +1549,35 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     popup
   });
 }
-function compileAction(input, index, scopePrefix, assets, context, popupDefaultsMetadata, defaults, getCollection) {
+function compileAction(input, index, scopePrefix, assets, context, popupDefaultsMetadata, defaults, getCollection, options = {}) {
+  var _a, _b, _c, _d, _e, _f;
+  const buildActionKey = (localKey2, isExplicit, keyContext) => {
+    const key2 = (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, localKey2), keyContext);
+    const avoidKeys = options.avoidKeys;
+    if (!(avoidKeys == null ? void 0 : avoidKeys.has(key2))) {
+      return key2;
+    }
+    if (isExplicit) {
+      (0, import_errors.throwBadRequest)(`${keyContext} '${key2}' duplicates an action key in the same block`);
+    }
+    const prefix = options.generatedConflictPrefix ? (0, import_service_utils.normalizeFlowSurfaceComposeKey)(options.generatedConflictPrefix, keyContext) : void 0;
+    const baseLocalKey = prefix ? `${prefix}_${localKey2}` : localKey2;
+    let candidate = (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, baseLocalKey), keyContext);
+    let suffix = 2;
+    while (avoidKeys.has(candidate)) {
+      candidate = (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, `${baseLocalKey}_${suffix}`), keyContext);
+      suffix += 1;
+    }
+    return candidate;
+  };
   if (typeof input === "string") {
     const type2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
+    const localKey2 = (0, import_private_utils.normalizeBlueprintLocalKey)(void 0, `${type2}_${index + 1}`, `${context}[${index}]`);
+    const defaultPopup = APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(type2) ? attachDefaultActionPopupMetadata(void 0, type2, popupDefaultsMetadata) : void 0;
     return {
-      key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, `${type2}_${index + 1}`), `${context}[${index}]`),
+      key: buildActionKey(localKey2, false, `${context}[${index}]`),
       type: type2,
-      ...APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(type2) ? { popup: attachDefaultActionPopupMetadata(void 0, type2, popupDefaultsMetadata) } : {}
+      ...defaultPopup ? { popup: defaultPopup } : {}
     };
   }
   if (!import_lodash.default.isPlainObject(input)) {
@@ -952,15 +1585,24 @@ function compileAction(input, index, scopePrefix, assets, context, popupDefaults
   }
   (0, import_private_utils.assertOnlyAllowedKeys)(input, `${context}[${index}]`, APPLY_BLUEPRINT_ACTION_ALLOWED_KEYS);
   const type = (0, import_private_utils.assertNonEmptyString)(input.type, `${context}[${index}].type`);
+  const hasExplicitKey = (0, import_private_utils.readOptionalString)(input.key);
   const localKey = (0, import_private_utils.normalizeBlueprintLocalKey)(input.key, `${type}_${index + 1}`, `${context}[${index}].key`);
-  const key = (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, localKey), `${context}[${index}]`);
+  const key = buildActionKey(localKey, !!hasExplicitKey, `${context}[${index}].key`);
   let settings = resolveAssetSettings(input.settings, input, assets, `${context}[${index}]`);
   if ((0, import_private_utils.readOptionalString)(input.title) && import_lodash.default.isUndefined(settings.title)) {
     settings.title = (0, import_private_utils.readOptionalString)(input.title);
   }
   const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
     ownerActionType: type,
-    getCollection
+    getCollection,
+    mode: (_a = options.popupOptions) == null ? void 0 : _a.mode,
+    popupDepth: (_b = options.popupOptions) == null ? void 0 : _b.popupDepth,
+    triggerKind: options.triggerKind,
+    triggerLabel: input.title || input.key || input.type,
+    hostBlock: (_c = options.popupOptions) == null ? void 0 : _c.hostBlock,
+    dataSourceKey: (_d = options.popupOptions) == null ? void 0 : _d.dataSourceKey,
+    surfaceCollectionName: (_e = options.popupOptions) == null ? void 0 : _e.surfaceCollectionName,
+    associationName: (_f = options.popupOptions) == null ? void 0 : _f.associationName
   });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
   const popup = shouldAttachDefaultPopupMetadata(input.popup, type) ? attachDefaultActionPopupMetadata(popupResult.popup, type, popupDefaultsMetadata) : popupResult.popup;
@@ -971,18 +1613,33 @@ function compileAction(input, index, scopePrefix, assets, context, popupDefaults
     popup
   });
 }
-function compileInjectedDefaultAction(descriptor, scopePrefix, context, index, popupDefaultsMetadata) {
+function compileInjectedDefaultAction(descriptor, scopePrefix, context, index, popupDefaultsMetadata, popupOptions = {}) {
   const descriptorPopup = descriptor.popup ? import_lodash.default.cloneDeep(descriptor.popup) : void 0;
-  const popup = shouldAttachDefaultPopupMetadata(descriptorPopup, descriptor.type) ? attachCompiledPopupDefaults(descriptorPopup, popupDefaultsMetadata) : void 0;
+  let popup = descriptorPopup;
+  const openViewContext = buildPopupOpenViewContext(popupOptions);
+  if (popup && Object.keys(openViewContext).length) {
+    popup = {
+      ...popup,
+      openView: (0, import_service_utils.buildDefinedPayload)({
+        ...openViewContext,
+        ...import_lodash.default.isPlainObject(popup.openView) ? popup.openView : {}
+      })
+    };
+  }
+  popup = shouldAttachDefaultPopupMetadata(popup, descriptor.type) ? attachCompiledPopupDefaults(popup, popupDefaultsMetadata) : void 0;
+  const localKey = descriptor.type === "submit" ? "submitAction" : `${descriptor.type}_default_${index + 1}`;
   return (0, import_service_utils.buildDefinedPayload)({
-    key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
-      (0, import_private_utils.buildScopedKey)(scopePrefix, `${descriptor.type}_default_${index + 1}`),
-      `${context}[${index}]`
-    ),
+    key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, localKey), `${context}[${index}]`),
     type: descriptor.type,
     popup
   });
 }
+function shouldStripSingleScopeApplyBlueprintDataBlockTitle(block, rawBlocks) {
+  if (!(0, import_data_block_rules.isFlowSurfaceNonTemplateTitleCleanupDataBlock)(block)) {
+    return false;
+  }
+  return (0, import_data_block_rules.countFlowSurfaceNonTemplateTitleCleanupDataBlocks)(rawBlocks) === 1;
+}
 function isTreeCollection(collection) {
   var _a;
   return (collection == null ? void 0 : collection.template) === "tree" || ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) === "tree" || (collection == null ? void 0 : collection.tree) === true;
@@ -1015,6 +1672,18 @@ function canInjectTreeTableAddChildDefault(block, getCollection) {
   }
   return !!resolveTreeChildrenFieldName(collection);
 }
+function resolveBlueprintBlockCollection(block, getCollection) {
+  if (!getCollection) {
+    return null;
+  }
+  const resource = import_lodash.default.isPlainObject(block.resource) ? block.resource : void 0;
+  const dataSourceKey = (0, import_private_utils.readOptionalString)(block.dataSourceKey) || (0, import_private_utils.readOptionalString)(resource == null ? void 0 : resource.dataSourceKey) || "main";
+  const collectionName = (0, import_private_utils.readOptionalString)(block.collection) || (0, import_private_utils.readOptionalString)(resource == null ? void 0 : resource.collectionName);
+  if (!collectionName) {
+    return null;
+  }
+  return getCollection(dataSourceKey, collectionName);
+}
 function hasExplicitAddChildRecordAction(recordActions) {
   return recordActions.some((action) => {
     if (typeof action === "string") {
@@ -1023,7 +1692,7 @@ function hasExplicitAddChildRecordAction(recordActions) {
     return (0, import_private_utils.readOptionalString)(action == null ? void 0 : action.type) === "addChild";
   });
 }
-function buildTreeTableAddChildDefaultAction(scopePrefix, context, index, popupDefaultsMetadata) {
+function buildTreeTableAddChildDefaultAction(scopePrefix, context, index, popupDefaultsMetadata, popupOptions = {}) {
   const descriptorPopup = {
     tryTemplate: true,
     [import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
@@ -1037,10 +1706,11 @@ function buildTreeTableAddChildDefaultAction(scopePrefix, context, index, popupD
     scopePrefix,
     context,
     index,
-    popupDefaultsMetadata
+    popupDefaultsMetadata,
+    popupOptions
   );
 }
-function compileBlocks(input, scopePrefix, assets, context, defaults, requiredExplicitBlockKeys = /* @__PURE__ */ new Set(), getCollection) {
+function compileBlocks(input, scopePrefix, assets, context, defaults, requiredExplicitBlockKeys = /* @__PURE__ */ new Set(), getCollection, options = {}) {
   const blockKeysByLocalKey = /* @__PURE__ */ new Map();
   const referencedBlockKeys = new Set(requiredExplicitBlockKeys);
   const rawBlocks = import_lodash.default.castArray(input || []);
@@ -1052,7 +1722,7 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
     assertApplyBlueprintCalendarMainContent(block, `${context}[${index}]`);
     assertApplyBlueprintKanbanMainContent(block, `${context}[${index}]`);
     assertApplyBlueprintTreeMainContent(block, `${context}[${index}]`);
-    const fields = resolveBlockFieldInputs(block, `${context}[${index}]`);
+    const fields = resolveBlockFieldInputs(block, `${context}[${index}]`, getCollection);
     collectTreeConnectTargetKeys(block.settings, `${context}[${index}]`).forEach((targetKey) => {
       referencedBlockKeys.add(targetKey);
     });
@@ -1102,32 +1772,76 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       (0, import_errors.throwBadRequest)(`${blockContext} key '${localKey}' is missing after block key compilation`);
     }
     const blockType = (0, import_private_utils.readOptionalString)(block.type);
+    const parentResourceContext = {
+      dataSourceKey: options.dataSourceKey,
+      surfaceCollectionName: options.surfaceCollectionName,
+      associationName: options.associationName
+    };
+    const blockResourceContext = resolveApplyBlueprintBlockResourceContext(
+      block,
+      parentResourceContext,
+      getCollection,
+      blockContext
+    );
+    const stripSingleScopeTitle = shouldStripSingleScopeApplyBlueprintDataBlockTitle(block, rawBlocks);
     let settings = resolveAssetSettings(block.settings, block, assets, blockContext);
-    if ((0, import_private_utils.readOptionalString)(block.title) && import_lodash.default.isUndefined(settings.title)) {
+    settings = normalizeApplyBlueprintCalendarCompatSettings(block, settings);
+    if (!stripSingleScopeTitle && (0, import_private_utils.readOptionalString)(block.title) && import_lodash.default.isUndefined(settings.title)) {
       settings.title = (0, import_private_utils.readOptionalString)(block.title);
     }
+    if (stripSingleScopeTitle && Object.prototype.hasOwnProperty.call(settings, "title")) {
+      delete settings.title;
+    }
+    if ((0, import_private_utils.readOptionalString)(block.description) && import_lodash.default.isUndefined(settings.description)) {
+      settings.description = (0, import_private_utils.readOptionalString)(block.description);
+    }
+    if (!import_lodash.default.isUndefined(block.height) && import_lodash.default.isUndefined(settings.height)) {
+      settings.height = block.height;
+    }
+    if (!import_lodash.default.isUndefined(block.heightMode) && import_lodash.default.isUndefined(settings.heightMode)) {
+      settings.heightMode = block.heightMode;
+    }
     settings = (0, import_public_compatibility.normalizeFlowSurfacePublicSortingAlias)({
       context: `${blockContext}.settings`,
       type: blockType,
       settings
     });
+    settings = normalizeApplyBlueprintTreeTableDragSortBy(block, settings, getCollection);
     if (blockType === "calendar") {
       settings = normalizeApplyBlueprintCalendarPopupSettings(settings, blockContext, popupDefaultsMetadata);
     } else if (blockType === "kanban") {
       settings = normalizeApplyBlueprintKanbanPopupSettings(settings, blockContext, popupDefaultsMetadata);
     }
     const template = ensureOptionalTemplate(block.template, `${blockContext}.template`);
-    const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("applyBlueprint", block.defaultFilter, {
-      blockType,
-      template,
-      path: blockContext
-    });
-    if (!import_lodash.default.isUndefined(blockDefaultFilter)) {
-      (0, import_public_data_surface_default_filter.assertFlowSurfaceConcreteDefaultFilterItem)("applyBlueprint", blockDefaultFilter, {
+    const isTemplateBackedBlock = (0, import_template_reference.hasFlowSurfaceTemplateReference)(template);
+    const explicitBlockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)(
+      "applyBlueprint",
+      block.defaultFilter,
+      {
+        blockType,
+        template,
+        path: blockContext
+      }
+    );
+    const blockDefaultFilter = !import_lodash.default.isUndefined(explicitBlockDefaultFilter) ? explicitBlockDefaultFilter : buildApplyBlueprintDefaultFilter(block, blockType, template, getCollection);
+    const effectiveBlockDefaultFilter = !import_lodash.default.isUndefined(blockDefaultFilter) ? (0, import_public_data_surface_default_filter.clampFlowSurfaceDefaultFilterToCandidateLimit)(blockDefaultFilter) : void 0;
+    if (!import_lodash.default.isUndefined(effectiveBlockDefaultFilter)) {
+      (0, import_public_data_surface_default_filter.assertFlowSurfaceConcreteDefaultFilterItem)("applyBlueprint", effectiveBlockDefaultFilter, {
         path: blockContext
       });
     }
-    const fieldInputs = resolveBlockFieldInputs(block, blockContext);
+    const rawFieldInputs = resolveBlockFieldInputs(block, blockContext, getCollection);
+    const fieldGridCollection = getCollection && blockResourceContext.surfaceCollectionName ? getCollection(blockResourceContext.dataSourceKey || "main", blockResourceContext.surfaceCollectionName) : null;
+    const fieldInputs = reorderApplyBlueprintTreeTableExplicitFields({
+      blockType,
+      settings,
+      template,
+      block,
+      fields: rawFieldInputs,
+      collection: fieldGridCollection,
+      getCollection,
+      context: blockContext
+    });
     const fields = fieldInputs.map(
       (field, fieldIndex) => compileField(
         field,
@@ -1138,7 +1852,15 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         `${blockContext}.fields`,
         popupDefaultsMetadata,
         defaults,
-        getCollection
+        getCollection,
+        {
+          mode: options.mode,
+          popupDepth: options.popupDepth || 1,
+          hostBlock: block,
+          dataSourceKey: blockResourceContext.dataSourceKey,
+          surfaceCollectionName: blockResourceContext.surfaceCollectionName,
+          associationName: blockResourceContext.associationName
+        }
       )
     );
     const fieldsLayout = Object.prototype.hasOwnProperty.call(block, "fieldsLayout") ? compileScopedLayout(
@@ -1146,7 +1868,7 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       buildCompiledFieldKeyMap(fieldInputs, fields, `${blockContext}.fields`),
       `${blockContext}.fieldsLayout`,
       "field"
-    ) : buildAutoCompiledFieldsLayout(fields, (0, import_private_utils.readOptionalString)(block.type));
+    ) : buildAutoCompiledFieldsLayout(fields, (0, import_private_utils.readOptionalString)(block.type), fieldGridCollection);
     const { actions, recordActions } = splitApplyBlueprintBlockActionsByScope(block, blockContext);
     const explicitActions = actions.map(
       (action, actionIndex) => compileAction(
@@ -1157,9 +1879,21 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         `${blockContext}.actions`,
         popupDefaultsMetadata,
         defaults,
-        getCollection
+        getCollection,
+        {
+          popupOptions: {
+            mode: options.mode,
+            popupDepth: options.popupDepth || 1,
+            hostBlock: block,
+            dataSourceKey: blockResourceContext.dataSourceKey,
+            surfaceCollectionName: blockResourceContext.surfaceCollectionName,
+            associationName: blockResourceContext.associationName
+          },
+          triggerKind: "action"
+        }
       )
     );
+    const explicitActionKeys = new Set(explicitActions.map((action) => action.key).filter(Boolean));
     const explicitRecordActions = recordActions.map(
       (action, actionIndex) => compileAction(
         action,
@@ -1169,10 +1903,23 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         `${blockContext}.recordActions`,
         popupDefaultsMetadata,
         defaults,
-        getCollection
+        getCollection,
+        {
+          avoidKeys: explicitActionKeys,
+          generatedConflictPrefix: "record",
+          popupOptions: {
+            mode: options.mode,
+            popupDepth: options.popupDepth || 1,
+            hostBlock: block,
+            dataSourceKey: blockResourceContext.dataSourceKey,
+            surfaceCollectionName: blockResourceContext.surfaceCollectionName,
+            associationName: blockResourceContext.associationName
+          },
+          triggerKind: "recordAction"
+        }
       )
     );
-    const shouldInjectAddChild = blockType === "table" && import_lodash.default.isUndefined(template) && (settings == null ? void 0 : settings.treeTable) === true && canInjectTreeTableAddChildDefault(block, getCollection);
+    const shouldInjectAddChild = isApplyBlueprintTreeTableBlock(blockType, settings, template, block, getCollection);
     const injectedActionIndexes = {
       actions: explicitActions.length,
       recordActions: explicitRecordActions.length
@@ -1182,12 +1929,21 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       template,
       actions: explicitActions,
       recordActions: explicitRecordActions,
+      mergeRecordActionDefaults: !shouldInjectAddChild,
       createAction: (descriptor) => compileInjectedDefaultAction(
         descriptor,
         key,
         `${blockContext}.${descriptor.scope}`,
         injectedActionIndexes[descriptor.scope]++,
-        popupDefaultsMetadata
+        popupDefaultsMetadata,
+        {
+          mode: options.mode,
+          popupDepth: options.popupDepth || 1,
+          hostBlock: block,
+          dataSourceKey: blockResourceContext.dataSourceKey,
+          surfaceCollectionName: blockResourceContext.surfaceCollectionName,
+          associationName: blockResourceContext.associationName
+        }
       )
     });
     const finalRecordActions = blockType === "table" && shouldInjectAddChild && !hasExplicitAddChildRecordAction(mergedActions.recordActions) ? [
@@ -1196,23 +1952,32 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         key,
         `${blockContext}.recordActions`,
         injectedActionIndexes.recordActions++,
-        popupDefaultsMetadata
+        popupDefaultsMetadata,
+        {
+          mode: options.mode,
+          popupDepth: options.popupDepth || 1,
+          hostBlock: block,
+          dataSourceKey: blockResourceContext.dataSourceKey,
+          surfaceCollectionName: blockResourceContext.surfaceCollectionName,
+          associationName: blockResourceContext.associationName
+        }
       )
     ] : mergedActions.recordActions;
     const actionsWithDefaultFilter = (0, import_public_data_surface_default_filter.backfillFlowSurfaceFilterActionDefaultFilter)(
       mergedActions.actions,
-      blockDefaultFilter
+      effectiveBlockDefaultFilter
     );
     return (0, import_service_utils.buildDefinedPayload)({
       key,
-      type: blockType,
-      resource: buildBlockResource(block, blockContext),
+      type: isTemplateBackedBlock ? void 0 : blockType,
+      resource: isTemplateBackedBlock ? void 0 : buildBlockResource(block, blockContext, blockResourceContext, blockType),
       template,
+      defaultFilter: !isTemplateBackedBlock ? effectiveBlockDefaultFilter : void 0,
       settings: Object.keys(settings).length ? compileTreeConnectSettingsTargets(settings, blockKeysByLocalKey, blockContext) : void 0,
-      fields: blockType === "calendar" || blockType === "tree" ? void 0 : fields,
-      fieldsLayout: blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : fieldsLayout,
-      actions: blockType === "tree" ? void 0 : actionsWithDefaultFilter,
-      recordActions: blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : finalRecordActions
+      fields: isTemplateBackedBlock || blockType === "calendar" || blockType === "tree" ? void 0 : fields,
+      fieldsLayout: isTemplateBackedBlock || blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : fieldsLayout,
+      actions: isTemplateBackedBlock || blockType === "tree" ? void 0 : actionsWithDefaultFilter,
+      recordActions: isTemplateBackedBlock || blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : finalRecordActions
     });
   });
   return {
@@ -1220,6 +1985,13 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
     blockKeysByLocalKey
   };
 }
+function buildApplyBlueprintDefaultFilter(block, blockType, template, getCollection) {
+  if (!blockType || !(0, import_public_data_surface_default_filter.isFlowSurfacePublicDataSurfaceBlockType)(blockType) || (0, import_template_reference.hasFlowSurfaceTemplateDocument)(template) || !getCollection) {
+    return void 0;
+  }
+  const collection = resolveBlueprintBlockCollection(block, getCollection);
+  return (0, import_public_data_surface_default_filter.buildFlowSurfaceDefaultFilterFromCollection)(collection);
+}
 function compileTabComposeValues(tab, document, tabIndex, options) {
   const tabPublicPath = (0, import_private_utils.buildApplyBlueprintTabPublicPath)(tabIndex);
   const blocksPath = `${tabPublicPath}.blocks`;
@@ -1231,7 +2003,10 @@ function compileTabComposeValues(tab, document, tabIndex, options) {
     blocksPath,
     document.defaults,
     collectReferencedBlockKeys(tab.layout, layoutPath),
-    options.getCollection
+    options.getCollection,
+    {
+      mode: document.mode
+    }
   );
   const layout = compileLayout(
     tab.layout || autoLayoutFromBlockKeys(compiledBlocks.blocks.map((block) => block.key)),
@@ -1241,7 +2016,8 @@ function compileTabComposeValues(tab, document, tabIndex, options) {
   return (0, import_service_utils.buildDefinedPayload)({
     mode: options.mode,
     blocks: compiledBlocks.blocks,
-    layout
+    layout,
+    defaults: document.defaults
   });
 }
 // Annotate the CommonJS export names for ESM import in node: