@nocobase/plugin-flow-engine 2.1.0-beta.22 → 2.1.0-beta.24

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.22",
+  "@nocobase/client": "2.1.0-beta.24",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-beta.22",
-  "@nocobase/data-source-manager": "2.1.0-beta.22",
-  "@nocobase/resourcer": "2.1.0-beta.22",
-  "@nocobase/utils": "2.1.0-beta.22",
-  "@nocobase/cache": "2.1.0-beta.22",
-  "@nocobase/plugin-localization": "2.1.0-beta.22",
-  "@nocobase/server": "2.1.0-beta.22",
-  "@nocobase/actions": "2.1.0-beta.22",
+  "@nocobase/database": "2.1.0-beta.24",
+  "@nocobase/data-source-manager": "2.1.0-beta.24",
+  "@nocobase/resourcer": "2.1.0-beta.24",
+  "@nocobase/utils": "2.1.0-beta.24",
+  "@nocobase/cache": "2.1.0-beta.24",
+  "@nocobase/plugin-localization": "2.1.0-beta.24",
+  "@nocobase/server": "2.1.0-beta.24",
+  "@nocobase/actions": "2.1.0-beta.24",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/ai": "2.1.0-beta.22"
+  "@nocobase/ai": "2.1.0-beta.24"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-04-28T10:18:21.506Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-04-29T08:16:19.164Z"}

package/dist/node_modules/zod/package.json

@@ -1 +1 @@
-{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-04-28T10:18:22.575Z"}
+{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-04-29T08:16:20.198Z"}

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

@@ -45,6 +45,7 @@ var import_errors = require("../errors");
 var import_service_utils = require("../service-utils");
 var import_default_block_actions = require("../default-block-actions");
 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_private_utils = require("./private-utils");
 var import_field_type_resolver = require("../field-type-resolver");
@@ -94,7 +95,6 @@ const APPLY_BLUEPRINT_FIELD_ALLOWED_KEYS = [
   "type",
   "fieldType",
   "fields",
-  "selectorFields",
   "titleField",
   "openMode",
   "popupSize",
@@ -874,10 +874,6 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
   const syntheticType = (0, import_private_utils.readOptionalString)(input.type);
   const fieldType = (0, import_field_type_resolver.normalizePublicFieldType)(input.fieldType, `${context}[${index}]`);
   const fields = (0, import_field_type_resolver.normalizePublicFieldNameList)(input.fields, `${context}[${index}].fields`);
-  const selectorFields = (0, import_field_type_resolver.normalizePublicFieldNameList)(
-    input.selectorFields,
-    `${context}[${index}].selectorFields`
-  );
   if (!fieldPath && !syntheticType) {
     (0, import_errors.throwBadRequest)(`${context}[${index}] requires field or type`);
   }
@@ -905,7 +901,6 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     type: syntheticType,
     fieldType,
     fields,
-    selectorFields,
     titleField: (0, import_private_utils.readOptionalString)(input.titleField),
     openMode: (0, import_private_utils.readOptionalString)(input.openMode),
     popupSize: (0, import_private_utils.readOptionalString)(input.popupSize),
@@ -1021,11 +1016,16 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
     if (!key) {
       (0, import_errors.throwBadRequest)(`${blockContext} key '${localKey}' is missing after block key compilation`);
     }
-    const settings = resolveAssetSettings(block.settings, block, assets, blockContext);
+    const blockType = (0, import_private_utils.readOptionalString)(block.type);
+    let settings = resolveAssetSettings(block.settings, block, assets, blockContext);
     if ((0, import_private_utils.readOptionalString)(block.title) && import_lodash.default.isUndefined(settings.title)) {
       settings.title = (0, import_private_utils.readOptionalString)(block.title);
     }
-    const blockType = (0, import_private_utils.readOptionalString)(block.type);
+    settings = (0, import_public_compatibility.normalizeFlowSurfacePublicSortingAlias)({
+      context: `${blockContext}.settings`,
+      type: blockType,
+      settings
+    });
     const template = ensureOptionalTemplate(block.template, `${blockContext}.template`);
     const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("applyBlueprint", block.defaultFilter, {
       blockType,

package/dist/server/flow-surfaces/blueprint/public-types.d.ts

@@ -87,7 +87,6 @@ export type FlowSurfaceApplyBlueprintFieldObjectSpec = {
     type?: string;
     fieldType?: string;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;

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

@@ -2434,6 +2434,7 @@ const NODE_CONTRACT_ENTRIES = [
   ["TriggerBlockGridModel", GRID_NODE_CONTRACT],
   ["ApprovalBlockGridModel", GRID_NODE_CONTRACT],
   ["TableBlockModel", TABLE_BLOCK_CONTRACT],
+  ["TableSelectModel", TABLE_BLOCK_CONTRACT],
   ["CalendarBlockModel", CALENDAR_BLOCK_CONTRACT],
   ["TreeBlockModel", TREE_BLOCK_CONTRACT],
   ["KanbanBlockModel", KANBAN_BLOCK_CONTRACT],

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

@@ -25,7 +25,6 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     type?: string;
     fieldType?: string;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;

package/dist/server/flow-surfaces/compose-compiler.js

@@ -125,7 +125,6 @@ function buildComposeFieldCreatePayload(fieldSpec) {
     ...fieldSpec.type ? { type: fieldSpec.type } : {},
     ...fieldSpec.fieldType ? { fieldType: fieldSpec.fieldType } : {},
     ...typeof fieldSpec.fields !== "undefined" ? { fields: fieldSpec.fields } : {},
-    ...typeof fieldSpec.selectorFields !== "undefined" ? { selectorFields: fieldSpec.selectorFields } : {},
     ...fieldSpec.titleField ? { titleField: fieldSpec.titleField } : {},
     ...fieldSpec.openMode ? { openMode: fieldSpec.openMode } : {},
     ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},

package/dist/server/flow-surfaces/configure-options.js

@@ -108,13 +108,9 @@ const FIELD_TYPE = stringOption("Public relation field presentation type", {
 const RELATION_FIELDS = arrayOption("Relation target fields", {
   example: ["title", "name"]
 });
-const SELECTOR_FIELDS = arrayOption("Record picker selector fields", {
-  example: ["title", "code"]
-});
 const RELATION_FIELD_TYPE_OPTIONS = {
   fieldType: FIELD_TYPE,
   fields: RELATION_FIELDS,
-  selectorFields: SELECTOR_FIELDS,
   openMode: stringOption("Popup open mode", { example: "drawer" }),
   popupSize: stringOption("Popup size", { example: "medium" }),
   pageSize: numberOption("Page size", { example: 10 }),

package/dist/server/flow-surfaces/contract-guard.js

@@ -53,7 +53,7 @@ class FlowSurfaceContractGuard {
       if (!Object.keys(nextValue).length) {
         return {};
       }
-      return contract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(nextValue) : import_lodash.default.merge({}, currentValue || {}, nextValue);
+      return contract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(nextValue) : mergeFlowSurfaceSettingsValue(currentValue || {}, nextValue);
     }
     if (contract.groups) {
       const unknownGroups = Object.keys(nextValue).filter((key) => !contract.allowedKeys.includes(key));
@@ -108,7 +108,7 @@ class FlowSurfaceContractGuard {
             )}`
           );
         }
-        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue2) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue2);
+        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue2) : mergeFlowSurfaceSettingsValue((currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue2);
       });
       return next2;
     }
@@ -135,7 +135,7 @@ class FlowSurfaceContractGuard {
     }
     const next = import_lodash.default.cloneDeep(currentValue || {});
     Object.entries(normalizedValue).forEach(([key, value]) => {
-      next[key] = contract.mergeStrategy === "replace" || !import_lodash.default.isPlainObject(value) || !Object.keys(value).length ? import_lodash.default.cloneDeep(value) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[key]) || {}, value);
+      next[key] = contract.mergeStrategy === "replace" || !import_lodash.default.isPlainObject(value) || !Object.keys(value).length ? import_lodash.default.cloneDeep(value) : mergeFlowSurfaceSettingsValue((currentValue == null ? void 0 : currentValue[key]) || {}, value);
     });
     return next;
   }
@@ -275,6 +275,14 @@ class FlowSurfaceContractGuard {
     });
   }
 }
+function mergeFlowSurfaceSettingsValue(currentValue, nextValue) {
+  return import_lodash.default.mergeWith({}, currentValue || {}, nextValue, (_current, next) => {
+    if (Array.isArray(next)) {
+      return import_lodash.default.cloneDeep(next);
+    }
+    return void 0;
+  });
+}
 function matchesContractPath(pattern, path) {
   if (pattern === "*") {
     return true;

package/dist/server/flow-surfaces/field-type-resolver.d.ts

@@ -22,7 +22,6 @@ export declare function resolveRelationFieldType(input: {
     dataSourceKey: string;
     getCollection: (dataSourceKey: string, collectionName: string) => any;
     fields?: any;
-    selectorFields?: any;
     titleField?: any;
     openMode?: any;
     popupSize?: any;

package/dist/server/flow-surfaces/field-type-resolver.js

@@ -93,6 +93,7 @@ const FIELD_USE_TO_PUBLIC_FIELD_TYPE = {
   PopupSubTableFieldModel: "popupSubTable"
 };
 const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
+  "picker",
   "subForm",
   "subFormList",
   "subDetails",
@@ -100,7 +101,6 @@ const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
   "subTable",
   "popupSubTable"
 ]);
-const FIELD_TYPES_WITH_SELECTOR_FIELDS = /* @__PURE__ */ new Set(["picker"]);
 const FIELD_TYPES_WITH_TABLE_PROPS = /* @__PURE__ */ new Set(["subTable", "popupSubTable"]);
 function assertNoInternalFieldKeys(input, context) {
   if (!import_lodash.default.isPlainObject(input)) {
@@ -250,16 +250,9 @@ function resolveRelationFieldType(input) {
       break;
   }
   const explicitFields = normalizePublicFieldNameList(input.fields, `${input.context}.fields`);
-  const explicitSelectorFields = normalizePublicFieldNameList(input.selectorFields, `${input.context}.selectorFields`);
-  if (explicitFields && explicitSelectorFields) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} cannot mix fields and selectorFields on the same field`);
-  }
   if (explicitFields && !FIELD_TYPES_WITH_FIELDS.has(fieldType)) {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support fields`);
   }
-  if (explicitSelectorFields && !FIELD_TYPES_WITH_SELECTOR_FIELDS.has(fieldType)) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support selectorFields`);
-  }
   if ((!import_lodash.default.isUndefined(input.openMode) || !import_lodash.default.isUndefined(input.popupSize)) && fieldType !== "picker") {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support openMode or popupSize`);
   }
@@ -268,15 +261,12 @@ function resolveRelationFieldType(input) {
   }
   const shouldApplyDefaults = input.applyDefaults !== false;
   const defaultTargetField = shouldApplyDefaults ? pickCollectionFallbackFieldName(targetCollection) : void 0;
-  const fields = explicitFields ?? (shouldApplyDefaults && usesNestedRelationFields(fieldUse) ? [defaultTargetField] : void 0);
-  const selectorFields = explicitSelectorFields ?? (shouldApplyDefaults && fieldType === "picker" && import_lodash.default.isUndefined(input.selectorFields) ? [defaultTargetField] : void 0);
+  const fields = explicitFields ?? (shouldApplyDefaults && (usesNestedRelationFields(fieldUse) || fieldType === "picker") ? [defaultTargetField] : void 0);
+  const selectorFields = ["picker", "popupSubTable"].includes(fieldType) ? fields : void 0;
   const titleField = import_lodash.default.isUndefined(input.titleField) ? defaultTargetField : String(input.titleField || "").trim() || void 0;
   if (fields == null ? void 0 : fields.length) {
     assertTargetFieldNamesExist(targetCollection, fields, `${input.context}.fields`);
   }
-  if (selectorFields == null ? void 0 : selectorFields.length) {
-    assertTargetFieldNamesExist(targetCollection, selectorFields, `${input.context}.selectorFields`);
-  }
   if (titleField && !(0, import_service_helpers.resolveFieldFromCollection)(targetCollection, titleField)) {
     (0, import_errors.throwBadRequest)(
       `flowSurfaces ${input.context}.titleField '${titleField}' does not exist on relation target collection`

package/dist/server/flow-surfaces/public-compatibility.d.ts

@@ -0,0 +1,16 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+type NormalizeSortingAliasInput = {
+    context: string;
+    type?: string;
+    use?: string;
+    settings?: any;
+};
+export declare function normalizeFlowSurfacePublicSortingAlias(input: NormalizeSortingAliasInput): any;
+export {};

package/dist/server/flow-surfaces/public-compatibility.js

@@ -0,0 +1,139 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var public_compatibility_exports = {};
+__export(public_compatibility_exports, {
+  normalizeFlowSurfacePublicSortingAlias: () => normalizeFlowSurfacePublicSortingAlias
+});
+module.exports = __toCommonJS(public_compatibility_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_configure_options = require("./configure-options");
+var import_errors = require("./errors");
+var import_support_matrix = require("./support-matrix");
+function resolveBlockUse(input) {
+  var _a;
+  const explicitUse = String(input.use || "").trim();
+  if (explicitUse) {
+    return explicitUse;
+  }
+  const typeOrUse = String(input.type || "").trim();
+  if (!typeOrUse) {
+    return void 0;
+  }
+  if (import_support_matrix.FLOW_SURFACE_BLOCK_SUPPORT_BY_USE.has(typeOrUse)) {
+    return typeOrUse;
+  }
+  return ((_a = import_support_matrix.FLOW_SURFACE_BLOCK_SUPPORT_BY_KEY.get(typeOrUse)) == null ? void 0 : _a.modelUse) || typeOrUse;
+}
+function blockSupportsSorting(use) {
+  return !!use && (0, import_configure_options.getConfigureOptionKeysForUse)(use).includes("sorting");
+}
+function normalizeSortingDirection(input, context) {
+  const normalized = String(input || "").trim().toLowerCase();
+  if (!normalized || normalized === "asc" || normalized === "ascend" || normalized === "ascending") {
+    return "asc";
+  }
+  if (normalized === "desc" || normalized === "descend" || normalized === "descending") {
+    return "desc";
+  }
+  (0, import_errors.throwBadRequest)(`${context} must be 'asc' or 'desc'`);
+}
+function normalizeSortingField(input, context) {
+  const field = String(input || "").trim();
+  if (!field) {
+    (0, import_errors.throwBadRequest)(`${context} must be a non-empty field name`);
+  }
+  return field;
+}
+function normalizeSortingEntry(input, context) {
+  if (import_lodash.default.isString(input)) {
+    const value = input.trim();
+    if (!value) {
+      (0, import_errors.throwBadRequest)(`${context} must be a non-empty sort field`);
+    }
+    const descending = value.startsWith("-");
+    const field = descending ? value.slice(1).trim() : value;
+    return {
+      field: normalizeSortingField(field, context),
+      direction: descending ? "desc" : "asc"
+    };
+  }
+  if (!import_lodash.default.isPlainObject(input)) {
+    (0, import_errors.throwBadRequest)(`${context} must be a string or an object with field and direction`);
+  }
+  return {
+    field: normalizeSortingField(input.field, `${context}.field`),
+    direction: normalizeSortingDirection(input.direction, `${context}.direction`)
+  };
+}
+function normalizeSortingArray(input, context) {
+  if (!Array.isArray(input)) {
+    (0, import_errors.throwBadRequest)(`${context} must be an array`);
+  }
+  return input.map((item, index) => normalizeSortingEntry(item, `${context}[${index}]`));
+}
+function normalizeFlowSurfacePublicSortingAlias(input) {
+  if (import_lodash.default.isUndefined(input.settings)) {
+    return input.settings;
+  }
+  if (!import_lodash.default.isPlainObject(input.settings)) {
+    (0, import_errors.throwBadRequest)(`${input.context} must be an object`);
+  }
+  if (!Object.prototype.hasOwnProperty.call(input.settings, "sort")) {
+    return input.settings;
+  }
+  const use = resolveBlockUse(input);
+  if (!blockSupportsSorting(use)) {
+    return input.settings;
+  }
+  const nextSettings = import_lodash.default.cloneDeep(input.settings);
+  const sortingFromSort = normalizeSortingArray(nextSettings.sort, `${input.context}.sort`);
+  if (Object.prototype.hasOwnProperty.call(nextSettings, "sorting")) {
+    const canonicalSorting = normalizeSortingArray(nextSettings.sorting, `${input.context}.sorting`);
+    if (!import_lodash.default.isEqual(sortingFromSort, canonicalSorting)) {
+      (0, import_errors.throwBadRequest)(`${input.context}.sort conflicts with ${input.context}.sorting; use canonical sorting`);
+    }
+    nextSettings.sorting = canonicalSorting;
+  } else {
+    nextSettings.sorting = sortingFromSort;
+  }
+  delete nextSettings.sort;
+  return nextSettings;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  normalizeFlowSurfacePublicSortingAlias
+});

package/dist/server/flow-surfaces/service-utils.d.ts

@@ -69,7 +69,6 @@ export type NormalizedComposeFieldSpec = {
     type?: string;
     fieldType?: FlowSurfacePublicRelationFieldType;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;

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

@@ -388,10 +388,6 @@ function normalizeComposeFieldSpec(input, index) {
   const renderer = typeof input.renderer === "undefined" ? void 0 : String(input.renderer || "").trim();
   const fieldType = (0, import_field_type_resolver.normalizePublicFieldType)(input.fieldType, `compose field #${index + 1}`);
   const fields = (0, import_field_type_resolver.normalizePublicFieldNameList)(input.fields, `compose field #${index + 1}.fields`);
-  const selectorFields = (0, import_field_type_resolver.normalizePublicFieldNameList)(
-    input.selectorFields,
-    `compose field #${index + 1}.selectorFields`
-  );
   const titleField = typeof input.titleField === "undefined" ? void 0 : String(input.titleField || "").trim();
   const openMode = typeof input.openMode === "undefined" ? void 0 : String(input.openMode || "").trim();
   const popupSize = typeof input.popupSize === "undefined" ? void 0 : String(input.popupSize || "").trim();
@@ -423,7 +419,6 @@ function normalizeComposeFieldSpec(input, index) {
     ...semanticType ? { type: semanticType } : {},
     ...fieldType ? { fieldType } : {},
     ...!import_lodash.default.isUndefined(fields) ? { fields } : {},
-    ...!import_lodash.default.isUndefined(selectorFields) ? { selectorFields } : {},
     ...titleField ? { titleField } : {},
     ...openMode ? { openMode } : {},
     ...popupSize ? { popupSize } : {},
@@ -665,7 +660,6 @@ function splitComposeFieldChanges(changes, wrapperUse) {
     "name",
     "fieldType",
     "fields",
-    "selectorFields",
     "titleField",
     "openMode",
     "popupSize",

package/dist/server/flow-surfaces/service.d.ts

@@ -77,6 +77,7 @@ export declare class FlowSurfacesService {
     private patchResolvedNodeConfigureOptions;
     private buildRelationFieldTypeCandidates;
     private collectRelationNestedFieldPaths;
+    private collectRelationFieldPaths;
     private collectRelationSelectorFieldPaths;
     private projectCatalogItem;
     private buildCatalogBlockItem;
@@ -86,6 +87,7 @@ export declare class FlowSurfacesService {
     private isCatalogBlockVisibleForPopupProfile;
     private getPopupCollectionBlockScenes;
     private isPopupCollectionBlockSceneUnsupported;
+    private supportsPopupAssociatedRecordsBinding;
     private isPopupCollectionBlockVisibleForScene;
     private resolveFieldAssociationContextFromBinding;
     private resolvePopupHostFieldAssociationContext;
@@ -104,6 +106,8 @@ export declare class FlowSurfacesService {
     private assertRequiredBlockResourceInit;
     private describeComposeBlock;
     private resolvePopupCollectionBlockResourceInit;
+    private shouldUseLegacyAssociationPopupCurrentRecordBinding;
+    private shouldNormalizeLegacyAssociationPopupRecordBlockResource;
     private compilePopupSemanticResourceInit;
     private assertPopupRawResourceInit;
     private validatePopupRawResourceInit;
@@ -541,6 +545,12 @@ export declare class FlowSurfacesService {
     }>;
     private syncFilterActionSettingsForUpdateSettings;
     private syncMirroredStepParamsForUpdateSettings;
+    private syncUpdateActionAssignedValuesForUpdateSettings;
+    private syncUpdateActionAssignFormItems;
+    private ensureUpdateActionAssignForm;
+    private ensureUpdateActionAssignFormGrid;
+    private buildUpdateActionAssignFormItemTree;
+    private resolveUpdateActionAssignFormFieldUse;
     private normalizeCanonicalBlockHeaderWriteForUpdateSettings;
     private syncCanonicalBlockHeaderForUpdateSettings;
     private stripLegacyBlockHeaderChromeForUpdateSettings;
@@ -690,6 +700,7 @@ export declare class FlowSurfacesService {
     private configureFieldWrapper;
     private configureFieldNode;
     private normalizeFilterActionDefaultFilterValue;
+    private normalizeActionAssignValues;
     private configureActionNode;
     private normalizeActionPanelActionChanges;
     private buildFieldCatalog;
@@ -824,6 +835,7 @@ export declare class FlowSurfacesService {
     private ensureFieldGridSubModel;
     private applyResolvedRelationFieldType;
     private applyRecordPickerFieldTypeSettings;
+    private ensureRelationSelectorGridTable;
     private buildExactFieldSettingsInitPayload;
     private patchFieldSettingsInitExact;
     private inferFieldComponentFlowDomain;