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

package/dist/ai/ai-employees/nathan/index.js

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(nathan_exports);
 var import_ai = require("@nocobase/ai");
 var nathan_default = (0, import_ai.defineAIEmployee)({
   username: "nathan",
+  category: "developer",
   description: "AI employee for coding",
   avatar: "nocobase-002-male",
   nickname: "Nathan",

package/dist/externalVersion.js

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

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-28T15:59:20.625Z"}
+{"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-05-06T11:08:08.197Z"}

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-28T15:59:21.674Z"}
+{"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-05-06T11:08:09.236Z"}

package/dist/server/flow-surfaces/blueprint/compile-blocks.d.ts

@@ -7,8 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import _ from 'lodash';
-import type { FlowSurfaceApplyBlueprintDocument, FlowSurfaceApplyBlueprintLayout, FlowSurfaceApplyBlueprintTabDocument } from './public-types';
+import type { FlowSurfaceApplyBlueprintCollectionResolver, FlowSurfaceApplyBlueprintDocument, FlowSurfaceApplyBlueprintLayout, FlowSurfaceApplyBlueprintTabDocument } from './public-types';
 export declare function collectReferencedBlockKeys(layout: FlowSurfaceApplyBlueprintLayout | undefined, context: string): Set<string>;
 export declare function compileTabComposeValues(tab: FlowSurfaceApplyBlueprintTabDocument, document: FlowSurfaceApplyBlueprintDocument, tabIndex: number, options: {
     mode: 'append' | 'replace';
+    getCollection?: FlowSurfaceApplyBlueprintCollectionResolver;
 }): _.Dictionary<any>;

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

@@ -45,7 +45,10 @@ 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_hidden_popup_contract = require("../hidden-popup-contract");
+var import_service_helpers = require("../service-helpers");
 var import_private_utils = require("./private-utils");
 var import_field_type_resolver = require("../field-type-resolver");
 const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
@@ -94,7 +97,6 @@ const APPLY_BLUEPRINT_FIELD_ALLOWED_KEYS = [
   "type",
   "fieldType",
   "fields",
-  "selectorFields",
   "titleField",
   "openMode",
   "popupSize",
@@ -155,7 +157,7 @@ const APPLY_BLUEPRINT_AUTO_PROMOTED_RECORD_ACTION_TYPES = /* @__PURE__ */ new Se
   "updateRecord",
   "duplicate"
 ]);
-const APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES = /* @__PURE__ */ new Set(["addNew", "view", "edit"]);
+const APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES = /* @__PURE__ */ new Set(["addNew", "addChild", "view", "edit"]);
 const APPLY_BLUEPRINT_BLOCK_TYPES = new Set(APPLY_BLUEPRINT_BLOCK_TYPE_ENUM);
 const APPLY_BLUEPRINT_ADD_CHILD_RECORD_ACTION_ERROR = "type 'addChild' must be authored under recordActions and is only valid when the live target catalog.recordActions exposes it for a tree collection table with treeTable enabled";
 function assertNoBlockLevelLayout(input, context) {
@@ -163,6 +165,24 @@ function assertNoBlockLevelLayout(input, context) {
     (0, import_errors.throwBadRequest)(`${context}.layout is not supported; layout is only allowed on tabs[] and popup`);
   }
 }
+function normalizeApplyBlueprintCalendarPopupSettings(settings, blockContext, defaultsMetadata) {
+  return (0, import_hidden_popup_contract.normalizeBlockHiddenPopupSettings)(
+    settings,
+    blockContext,
+    ["quickCreatePopup", "eventPopup"],
+    defaultsMetadata,
+    import_errors.throwBadRequest
+  );
+}
+function normalizeApplyBlueprintKanbanPopupSettings(settings, blockContext, defaultsMetadata) {
+  return (0, import_hidden_popup_contract.normalizeBlockHiddenPopupSettings)(
+    settings,
+    blockContext,
+    ["quickCreatePopup", "cardPopup"],
+    defaultsMetadata,
+    import_errors.throwBadRequest
+  );
+}
 function assertApplyBlueprintFieldsLayoutHost(block, context) {
   if (!Object.prototype.hasOwnProperty.call(block, "fieldsLayout")) {
     return;
@@ -722,6 +742,10 @@ function shouldAttachDefaultPopupMetadata(popup, itemType, options = {}) {
 function attachCompiledPopupDefaults(popup, metadata) {
   return (0, import_defaults.attachFlowSurfaceApplyBlueprintPopupDefaults)(popup, metadata);
 }
+function attachDefaultActionPopupMetadata(popup, actionType, metadata) {
+  const defaultPopup = actionType === "addChild" && import_lodash.default.isUndefined(popup) ? {} : popup;
+  return attachCompiledPopupDefaults(defaultPopup, metadata);
+}
 function compilePopup(popup, scopePrefix, assets, context, defaults, options = {}) {
   if (import_lodash.default.isUndefined(popup)) {
     return {};
@@ -765,7 +789,8 @@ function compilePopup(popup, scopePrefix, assets, context, defaults, options = {
     assets,
     `${context}.blocks`,
     defaults,
-    collectReferencedBlockKeys(popup.layout, `${context}.layout`)
+    collectReferencedBlockKeys(popup.layout, `${context}.layout`),
+    options.getCollection
   ) : { blocks: [], blockKeysByLocalKey: /* @__PURE__ */ new Map() };
   const layout = popupBlocks.length || popup.layout ? compileLayout(
     popup.layout || autoLayoutFromBlockKeys(compiledBlocks.blocks.map((block) => block.key)),
@@ -854,7 +879,7 @@ function compileTreeConnectSettingsTargets(settings, localBlockKeys, context) {
   });
   return nextSettings;
 }
-function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults) {
+function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults, getCollection) {
   if (typeof input === "string") {
     const fieldPath2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
     return {
@@ -874,10 +899,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`);
   }
@@ -894,7 +915,9 @@ 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 popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
+    getCollection
+  });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
   const popup = shouldAttachDefaultPopupMetadata(input.popup, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
@@ -905,7 +928,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),
@@ -916,13 +938,13 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     popup
   });
 }
-function compileAction(input, index, scopePrefix, assets, context, popupDefaultsMetadata, defaults) {
+function compileAction(input, index, scopePrefix, assets, context, popupDefaultsMetadata, defaults, getCollection) {
   if (typeof input === "string") {
     const type2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
     return {
       key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, `${type2}_${index + 1}`), `${context}[${index}]`),
       type: type2,
-      ...APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(type2) ? { popup: attachCompiledPopupDefaults(void 0, popupDefaultsMetadata) } : {}
+      ...APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(type2) ? { popup: attachDefaultActionPopupMetadata(void 0, type2, popupDefaultsMetadata) } : {}
     };
   }
   if (!import_lodash.default.isPlainObject(input)) {
@@ -937,10 +959,11 @@ function compileAction(input, index, scopePrefix, assets, context, popupDefaults
     settings.title = (0, import_private_utils.readOptionalString)(input.title);
   }
   const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
-    ownerActionType: type
+    ownerActionType: type,
+    getCollection
   });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
-  const popup = shouldAttachDefaultPopupMetadata(input.popup, type) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
+  const popup = shouldAttachDefaultPopupMetadata(input.popup, type) ? attachDefaultActionPopupMetadata(popupResult.popup, type, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
     key,
     type,
@@ -960,7 +983,64 @@ function compileInjectedDefaultAction(descriptor, scopePrefix, context, index, p
     popup
   });
 }
-function compileBlocks(input, scopePrefix, assets, context, defaults, requiredExplicitBlockKeys = /* @__PURE__ */ new Set()) {
+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;
+}
+function resolveTreeChildrenFieldName(collection) {
+  const field = (0, import_service_helpers.getCollectionFields)(collection).find(
+    (candidate) => {
+      var _a;
+      return (candidate == null ? void 0 : candidate.treeChildren) === true || ((_a = candidate == null ? void 0 : candidate.options) == null ? void 0 : _a.treeChildren) === true;
+    }
+  );
+  return (0, import_service_helpers.getFieldName)(field);
+}
+function canInjectTreeTableAddChildDefault(block, getCollection) {
+  if (!getCollection) {
+    return false;
+  }
+  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 false;
+  }
+  const collection = getCollection(dataSourceKey, collectionName);
+  if (!collection) {
+    return false;
+  }
+  if (!isTreeCollection(collection)) {
+    return false;
+  }
+  return !!resolveTreeChildrenFieldName(collection);
+}
+function hasExplicitAddChildRecordAction(recordActions) {
+  return recordActions.some((action) => {
+    if (typeof action === "string") {
+      return action.trim() === "addChild";
+    }
+    return (0, import_private_utils.readOptionalString)(action == null ? void 0 : action.type) === "addChild";
+  });
+}
+function buildTreeTableAddChildDefaultAction(scopePrefix, context, index, popupDefaultsMetadata) {
+  const descriptorPopup = {
+    tryTemplate: true,
+    [import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
+  };
+  return compileInjectedDefaultAction(
+    {
+      type: "addChild",
+      scope: "recordActions",
+      popup: descriptorPopup
+    },
+    scopePrefix,
+    context,
+    index,
+    popupDefaultsMetadata
+  );
+}
+function compileBlocks(input, scopePrefix, assets, context, defaults, requiredExplicitBlockKeys = /* @__PURE__ */ new Set(), getCollection) {
   const blockKeysByLocalKey = /* @__PURE__ */ new Map();
   const referencedBlockKeys = new Set(requiredExplicitBlockKeys);
   const rawBlocks = import_lodash.default.castArray(input || []);
@@ -1021,11 +1101,21 @@ 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
+    });
+    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,
@@ -1047,7 +1137,8 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         blockKeysByLocalKey,
         `${blockContext}.fields`,
         popupDefaultsMetadata,
-        defaults
+        defaults,
+        getCollection
       )
     );
     const fieldsLayout = Object.prototype.hasOwnProperty.call(block, "fieldsLayout") ? compileScopedLayout(
@@ -1058,11 +1149,30 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
     ) : buildAutoCompiledFieldsLayout(fields, (0, import_private_utils.readOptionalString)(block.type));
     const { actions, recordActions } = splitApplyBlueprintBlockActionsByScope(block, blockContext);
     const explicitActions = actions.map(
-      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.actions`, popupDefaultsMetadata, defaults)
+      (action, actionIndex) => compileAction(
+        action,
+        actionIndex,
+        key,
+        assets,
+        `${blockContext}.actions`,
+        popupDefaultsMetadata,
+        defaults,
+        getCollection
+      )
     );
     const explicitRecordActions = recordActions.map(
-      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.recordActions`, popupDefaultsMetadata, defaults)
+      (action, actionIndex) => compileAction(
+        action,
+        actionIndex,
+        key,
+        assets,
+        `${blockContext}.recordActions`,
+        popupDefaultsMetadata,
+        defaults,
+        getCollection
+      )
     );
+    const shouldInjectAddChild = blockType === "table" && import_lodash.default.isUndefined(template) && (settings == null ? void 0 : settings.treeTable) === true && canInjectTreeTableAddChildDefault(block, getCollection);
     const injectedActionIndexes = {
       actions: explicitActions.length,
       recordActions: explicitRecordActions.length
@@ -1080,6 +1190,15 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
         popupDefaultsMetadata
       )
     });
+    const finalRecordActions = blockType === "table" && shouldInjectAddChild && !hasExplicitAddChildRecordAction(mergedActions.recordActions) ? [
+      ...mergedActions.recordActions,
+      buildTreeTableAddChildDefaultAction(
+        key,
+        `${blockContext}.recordActions`,
+        injectedActionIndexes.recordActions++,
+        popupDefaultsMetadata
+      )
+    ] : mergedActions.recordActions;
     const actionsWithDefaultFilter = (0, import_public_data_surface_default_filter.backfillFlowSurfaceFilterActionDefaultFilter)(
       mergedActions.actions,
       blockDefaultFilter
@@ -1093,7 +1212,7 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       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 : mergedActions.recordActions
+      recordActions: blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : finalRecordActions
     });
   });
   return {
@@ -1111,7 +1230,8 @@ function compileTabComposeValues(tab, document, tabIndex, options) {
     document.assets,
     blocksPath,
     document.defaults,
-    collectReferencedBlockKeys(tab.layout, layoutPath)
+    collectReferencedBlockKeys(tab.layout, layoutPath),
+    options.getCollection
   );
   const layout = compileLayout(
     tab.layout || autoLayoutFromBlockKeys(compiledBlocks.blocks.map((block) => block.key)),

package/dist/server/flow-surfaces/blueprint/compile-plan.d.ts

@@ -6,8 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import type { FlowSurfaceApplyBlueprintDocument, FlowSurfaceApplyBlueprintProgram, FlowSurfaceApplyBlueprintReplaceTargetInfo } from './public-types';
+import type { FlowSurfaceApplyBlueprintCollectionResolver, FlowSurfaceApplyBlueprintDocument, FlowSurfaceApplyBlueprintProgram, FlowSurfaceApplyBlueprintReplaceTargetInfo } from './public-types';
 export declare function compileFlowSurfaceApplyBlueprintRequest(document: FlowSurfaceApplyBlueprintDocument, options?: {
     replaceTarget?: FlowSurfaceApplyBlueprintReplaceTargetInfo;
+    getCollection?: FlowSurfaceApplyBlueprintCollectionResolver;
 }): FlowSurfaceApplyBlueprintProgram;
 export declare function resolveApplyBlueprintPageLocator(program: FlowSurfaceApplyBlueprintProgram, executeResult: Record<string, any> | undefined): import("../types").FlowSurfaceReadLocator;

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

@@ -82,7 +82,7 @@ function buildTabSelectorFromUid(uid) {
     locator: { uid }
   };
 }
-function compileCreatePlan(document) {
+function compileCreatePlan(document, getCollection) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
   const steps = [];
   const chrome = buildPageChrome(document);
@@ -134,7 +134,7 @@ function compileCreatePlan(document) {
     selectors: {
       target: buildTabSelectorFromStep(CREATE_PAGE_STEP_ID)
     },
-    values: (0, import_compile_blocks.compileTabComposeValues)(document.tabs[0], document, 0, { mode: "append" })
+    values: (0, import_compile_blocks.compileTabComposeValues)(document.tabs[0], document, 0, { mode: "append", getCollection })
   });
   document.tabs.slice(1).forEach((tab, offset) => {
     const tabIndex = offset + 1;
@@ -161,7 +161,7 @@ function compileCreatePlan(document) {
       selectors: {
         target: buildTabSelectorFromStep(addTabStepId)
       },
-      values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, tabIndex, { mode: "append" })
+      values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, tabIndex, { mode: "append", getCollection })
     });
   });
   steps.push(...(0, import_compile_reaction.compileReactionPlanSteps)(document.reaction));
@@ -182,7 +182,7 @@ function buildPageConfigureChanges(document) {
     displayTitle: (_f = document.page) == null ? void 0 : _f.displayTitle
   });
 }
-function compileReplacePlan(document, targetInfo) {
+function compileReplacePlan(document, targetInfo, getCollection) {
   const steps = [];
   const pageChanges = buildPageConfigureChanges(document);
   if (Object.keys(pageChanges).length) {
@@ -225,7 +225,7 @@ function compileReplacePlan(document, targetInfo) {
         selectors: {
           target: buildTabSelectorFromUid(existingTab.uid)
         },
-        values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, index, { mode: "replace" })
+        values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, index, { mode: "replace", getCollection })
       });
       return;
     }
@@ -253,7 +253,7 @@ function compileReplacePlan(document, targetInfo) {
       selectors: {
         target: buildTabSelectorFromStep(addTabStepId)
       },
-      values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, index, { mode: "append" })
+      values: (0, import_compile_blocks.compileTabComposeValues)(tab, document, index, { mode: "append", getCollection })
     });
   });
   targetInfo.tabs.slice(document.tabs.length).reverse().forEach((tab, index) => {
@@ -278,12 +278,12 @@ function compileReplacePlan(document, targetInfo) {
 }
 function compileFlowSurfaceApplyBlueprintRequest(document, options = {}) {
   if (document.mode === "create") {
-    return compileCreatePlan(document);
+    return compileCreatePlan(document, options.getCollection);
   }
   if (!options.replaceTarget) {
     (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint replace target resolution is missing`);
   }
-  return compileReplacePlan(document, options.replaceTarget);
+  return compileReplacePlan(document, options.replaceTarget, options.getCollection);
 }
 function resolveApplyBlueprintPageLocator(program, executeResult) {
   var _a, _b, _c;

package/dist/server/flow-surfaces/blueprint/normalize-document.js

@@ -123,27 +123,18 @@ function normalizeNavigation(input) {
       if (!import_lodash.default.isUndefined(routeId) && !import_lodash.default.isString(routeId) && !import_lodash.default.isNumber(routeId)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group.routeId must be a string or integer`);
       }
-      if (!import_lodash.default.isUndefined(routeId) && (0, import_private_utils.readString)(input.group.title)) {
-        (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group cannot mix routeId with title`);
-      }
-      const routeMetadataKeys = import_private_utils.APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS.filter(
-        (key) => !import_lodash.default.isUndefined(input.group[key])
-      );
-      if (!import_lodash.default.isUndefined(routeId) && routeMetadataKeys.length) {
-        (0, import_errors.throwBadRequest)(
-          `flowSurfaces applyBlueprint navigation.group.routeId cannot mix with ${routeMetadataKeys.map((key) => `navigation.group.${key}`).join(
-            ", "
-          )}; applyBlueprint create mode does not update existing menu-group metadata. Use flowSurfaces:updateMenu separately if needed`
-        );
+      if (!import_lodash.default.isUndefined(routeId)) {
+        return {
+          routeId
+        };
       }
       const normalized2 = (0, import_service_utils.buildDefinedPayload)({
-        routeId: import_lodash.default.isUndefined(routeId) ? void 0 : routeId,
         title: (0, import_private_utils.readOptionalString)(input.group.title),
         icon: (0, import_private_utils.readOptionalString)(input.group.icon),
         tooltip: (0, import_private_utils.readOptionalString)(input.group.tooltip),
         hideInMenu: (0, import_private_utils.readBoolean)(input.group.hideInMenu, "flowSurfaces applyBlueprint navigation.group.hideInMenu")
       });
-      if (import_lodash.default.isUndefined(normalized2.routeId) && !normalized2.title) {
+      if (!normalized2.title) {
         (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group requires routeId or title`);
       }
       return normalized2;

package/dist/server/flow-surfaces/blueprint/private-utils.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type { FlowSurfaceApplyBlueprintAssetMap } from './public-types';
-export declare const APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS: readonly ["icon", "tooltip", "hideInMenu"];
 export declare function assertPlainObject(value: any, context: string): void;
 export declare function assertOnlyAllowedKeys(input: Record<string, any>, context: string, allowedKeys: string[]): void;
 export declare function normalizeApplyBlueprintToken(value: any, fallback?: string): string;

package/dist/server/flow-surfaces/blueprint/private-utils.js

@@ -36,7 +36,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var private_utils_exports = {};
 __export(private_utils_exports, {
-  APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS: () => APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS,
   assertNonEmptyString: () => assertNonEmptyString,
   assertOnlyAllowedKeys: () => assertOnlyAllowedKeys,
   assertPlainObject: () => assertPlainObject,
@@ -56,7 +55,6 @@ module.exports = __toCommonJS(private_utils_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_errors = require("../errors");
 var import_service_utils = require("../service-utils");
-const APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS = ["icon", "tooltip", "hideInMenu"];
 function assertPlainObject(value, context) {
   if (!import_lodash.default.isPlainObject(value)) {
     (0, import_errors.throwBadRequest)(`${context} must be an object`);
@@ -164,7 +162,6 @@ function normalizeAssetRegistry(input, context) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS,
   assertNonEmptyString,
   assertOnlyAllowedKeys,
   assertPlainObject,

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;
@@ -184,6 +183,7 @@ export type FlowSurfaceApplyBlueprintDocument = {
     assets: FlowSurfaceApplyBlueprintAssets;
     reaction?: FlowSurfaceApplyBlueprintReaction;
 };
+export type FlowSurfaceApplyBlueprintCollectionResolver = (dataSourceKey: string | undefined, collectionName: string | undefined) => any;
 export type FlowSurfaceApplyBlueprintReplaceTargetInfo = {
     locator: FlowSurfaceReadLocator;
     pageUid: string;

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

@@ -82,6 +82,7 @@ export declare function buildBlockTree(options: {
     use?: string;
     containerUse?: string;
     resourceInit?: Record<string, any>;
+    enableDefaultSorting?: boolean;
     props?: Record<string, any>;
     decoratorProps?: Record<string, any>;
     stepParams?: Record<string, any>;