@nocobase/plugin-flow-engine 2.1.0-alpha.15 → 2.1.0-alpha.17

package/dist/externalVersion.js

@@ -8,15 +8,15 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.15",
+  "@nocobase/client": "2.1.0-alpha.17",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.1.0-alpha.15",
-  "@nocobase/data-source-manager": "2.1.0-alpha.15",
-  "@nocobase/resourcer": "2.1.0-alpha.15",
-  "@nocobase/utils": "2.1.0-alpha.15",
-  "@nocobase/cache": "2.1.0-alpha.15",
-  "@nocobase/plugin-localization": "2.1.0-alpha.15",
-  "@nocobase/server": "2.1.0-alpha.15",
-  "@nocobase/actions": "2.1.0-alpha.15",
-  "@nocobase/ai": "2.1.0-alpha.15"
+  "@nocobase/database": "2.1.0-alpha.17",
+  "@nocobase/data-source-manager": "2.1.0-alpha.17",
+  "@nocobase/resourcer": "2.1.0-alpha.17",
+  "@nocobase/utils": "2.1.0-alpha.17",
+  "@nocobase/cache": "2.1.0-alpha.17",
+  "@nocobase/plugin-localization": "2.1.0-alpha.17",
+  "@nocobase/server": "2.1.0-alpha.17",
+  "@nocobase/actions": "2.1.0-alpha.17",
+  "@nocobase/ai": "2.1.0-alpha.17"
 };

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-10T12:40:14.296Z"}
+{"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-17T02:45:43.122Z"}

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-10T12:40:15.319Z"}
+{"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-17T02:45:44.190Z"}

package/dist/server/flow-surfaces/{compiler.d.ts → apply/compiler.d.ts}

@@ -6,17 +6,8 @@
  * 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 { FlowSurfaceApplySpec, FlowSurfaceMutateOp, FlowSurfaceWriteTarget } from './types';
+import type { FlowSurfaceApplySpec, FlowSurfaceMutateOp, FlowSurfaceWriteTarget } from '../types';
 export declare function compileApplySpec(target: FlowSurfaceWriteTarget, currentTree: any, spec: FlowSurfaceApplySpec): {
     ops: FlowSurfaceMutateOp[];
     clientKeyToUid: Record<string, string>;
 };
-export declare function buildAutoLayout(itemRefs: any[]): {
-    rows: {
-        [k: string]: any[][];
-    };
-    sizes: {
-        [k: string]: number[];
-    };
-    rowOrder: string[];
-};

package/dist/server/flow-surfaces/{compiler.js → apply/compiler.js}

@@ -36,22 +36,28 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var compiler_exports = {};
 __export(compiler_exports, {
-  buildAutoLayout: () => buildAutoLayout,
   compileApplySpec: () => compileApplySpec
 });
 module.exports = __toCommonJS(compiler_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_catalog = require("./catalog");
-var import_placement = require("./placement");
-var import_errors = require("./errors");
+var import_catalog = require("../catalog");
+var import_placement = require("../placement");
+var import_errors = require("../errors");
+var import_node_use_sets = require("../node-use-sets");
+var import_layout = require("./layout");
+var import_matching = require("./matching");
 function makeOpRef(path) {
-  return { ref: path };
+  const normalized = String(path || "").trim();
+  const [step, ...rest] = normalized.split(".");
+  return {
+    step,
+    ...rest.length ? { path: rest.join(".") } : {}
+  };
 }
 const FORM_GRID_USES = /* @__PURE__ */ new Set(["FormGridModel", "AssignFormGridModel"]);
 const ACTION_USES = new Set(Array.from(import_catalog.ACTION_KEY_BY_USE.keys()));
 const BLOCK_USES = new Set(Array.from(import_catalog.BLOCK_KEY_BY_USE.keys()));
-const FIELD_WRAPPER_USES = import_placement.FLOW_SURFACE_FIELD_WRAPPER_USES;
-const STANDALONE_FIELD_USES = /* @__PURE__ */ new Set(["JSColumnModel", "JSItemModel"]);
+const STANDALONE_FIELD_USES = import_node_use_sets.CREATABLE_STANDALONE_FIELD_USES;
 const FORM_BLOCK_USES = import_placement.FLOW_SURFACE_FORM_BLOCK_USES;
 const DETAILS_BLOCK_USES = import_placement.FLOW_SURFACE_DETAILS_BLOCK_USES;
 const FILTER_FORM_BLOCK_USES = import_placement.FLOW_SURFACE_FILTER_FORM_BLOCK_USES;
@@ -143,12 +149,12 @@ function compileApplySpec(target, currentTree, spec) {
 function syncExistingNode(ops, state, nodeRef, currentNode, desiredNode, explicitTarget) {
   emitDomainSettingOps(ops, nodeRef, currentNode, desiredNode, explicitTarget);
   const childSync = syncChildren(ops, state, nodeRef, currentNode, desiredNode);
-  emitLayoutOp(ops, explicitTarget || { uid: nodeRef.uidRef }, currentNode, desiredNode, childSync);
+  (0, import_layout.emitLayoutOp)(ops, explicitTarget || { uid: nodeRef.uidRef }, currentNode, desiredNode, childSync);
 }
 function syncCreatedNode(ops, state, nodeRef, desiredNode) {
   emitDomainSettingOps(ops, nodeRef, null, desiredNode);
   const childSync = syncChildren(ops, state, nodeRef, null, desiredNode);
-  emitLayoutOp(ops, { uid: nodeRef.uidRef }, null, desiredNode, childSync);
+  (0, import_layout.emitLayoutOp)(ops, { uid: nodeRef.uidRef }, null, desiredNode, childSync);
 }
 function syncRoutePageNode(ops, state, target, currentNode, desiredNode) {
   const pageTarget = { uid: String(target.uid || currentNode.uid || "").trim() };
@@ -173,16 +179,16 @@ function syncPageNode(ops, state, pageTarget, currentNode, desiredNode) {
     },
     pageTarget
   );
-  if (!hasExplicitSubModelKey(desiredNode, "tabs")) {
+  if (!(0, import_matching.hasExplicitSubModelKey)(desiredNode, "tabs")) {
     return;
   }
   const hasTabsSpec = Object.prototype.hasOwnProperty.call(desiredNode.subModels || {}, "tabs");
   if (!hasTabsSpec) {
     return;
   }
-  const desiredTabs = normalizeChildren((_a = desiredNode.subModels) == null ? void 0 : _a.tabs);
-  const currentTabs = normalizeChildren((_b = currentNode.subModels) == null ? void 0 : _b.tabs);
-  const tabMatchPlan = planArrayChildMatches(currentTabs, desiredTabs, currentNode.use, "tabs");
+  const desiredTabs = (0, import_matching.normalizeChildren)((_a = desiredNode.subModels) == null ? void 0 : _a.tabs);
+  const currentTabs = (0, import_matching.normalizeChildren)((_b = currentNode.subModels) == null ? void 0 : _b.tabs);
+  const tabMatchPlan = (0, import_matching.planArrayChildMatches)(currentTabs, desiredTabs, currentNode.use, "tabs");
   const desiredRefs = [];
   for (const [desiredIndex, desiredTab] of desiredTabs.entries()) {
     const currentMatch = tabMatchPlan.matchesByDesiredIndex.get(desiredIndex);
@@ -226,7 +232,7 @@ function syncPageNode(ops, state, pageTarget, currentNode, desiredNode) {
       });
     }
   }
-  emitMoveTabOps(ops, desiredRefs);
+  (0, import_layout.emitMoveTabOps)(ops, desiredRefs);
 }
 function syncRouteTabNode(ops, state, target, currentNode, desiredNode) {
   const tabTarget = { uid: String(target.uid || currentNode.uid || "").trim() };
@@ -251,15 +257,15 @@ function syncTabNode(ops, state, tabTarget, currentNode, desiredNode) {
     },
     tabTarget
   );
-  if (!hasExplicitSubModelKey(desiredNode, "grid")) {
+  if (!(0, import_matching.hasExplicitSubModelKey)(desiredNode, "grid")) {
     return;
   }
   const hasGridSpec = Object.prototype.hasOwnProperty.call(desiredNode.subModels || {}, "grid");
   if (!hasGridSpec) {
     return;
   }
-  const desiredGrid = normalizeChildren((_a = desiredNode.subModels) == null ? void 0 : _a.grid)[0];
-  const currentGrid = normalizeChildren((_b = currentNode.subModels) == null ? void 0 : _b.grid)[0];
+  const desiredGrid = (0, import_matching.normalizeChildren)((_a = desiredNode.subModels) == null ? void 0 : _a.grid)[0];
+  const currentGrid = (0, import_matching.normalizeChildren)((_b = currentNode.subModels) == null ? void 0 : _b.grid)[0];
   if (!desiredGrid || !currentGrid) {
     return;
   }
@@ -291,8 +297,8 @@ function syncChildren(ops, state, parentRef, currentParent, desiredParent) {
   for (const subKey of subKeys) {
     const desiredRaw = desiredSubModels[subKey];
     const currentRaw = currentSubModels[subKey];
-    const desiredChildren = normalizeChildren(desiredRaw);
-    const currentChildren = normalizeChildren(currentRaw);
+    const desiredChildren = (0, import_matching.normalizeChildren)(desiredRaw);
+    const currentChildren = (0, import_matching.normalizeChildren)(currentRaw);
     const isArraySubModel = Array.isArray(desiredRaw) || Array.isArray(currentRaw);
     if (parentRef.use === "ChildPageModel" && subKey === "tabs") {
       const tabSync = syncPopupTabs(ops, state, parentRef, currentChildren, desiredChildren);
@@ -317,7 +323,7 @@ function syncChildren(ops, state, parentRef, currentParent, desiredParent) {
       if (!desiredChild) {
         continue;
       }
-      if (currentChild && matchesObjectChild(currentChild, desiredChild)) {
+      if (currentChild && (0, import_matching.matchesObjectChild)(currentChild, desiredChild)) {
         bindClientKey(state, desiredChild.clientKey, currentChild.uid);
         if (desiredChild.clientKey) {
           result.childClientKeyRefs[desiredChild.clientKey] = currentChild.uid;
@@ -354,7 +360,7 @@ function syncChildren(ops, state, parentRef, currentParent, desiredParent) {
       }
       continue;
     }
-    const childMatchPlan = planArrayChildMatches(currentChildren, desiredChildren, parentRef.use, subKey);
+    const childMatchPlan = (0, import_matching.planArrayChildMatches)(currentChildren, desiredChildren, parentRef.use, subKey);
     const desiredRefs = [];
     for (const [desiredIndex, desiredChild] of desiredChildren.entries()) {
       const currentMatch = childMatchPlan.matchesByDesiredIndex.get(desiredIndex);
@@ -394,10 +400,10 @@ function syncChildren(ops, state, parentRef, currentParent, desiredParent) {
         });
       }
     }
-    emitMoveOps(ops, desiredRefs);
+    (0, import_layout.emitMoveOps)(ops, desiredRefs);
     if (subKey === "items") {
       result.finalItemRefs = desiredRefs;
-      result.itemsChanged = didItemRefsChange(currentChildren, desiredRefs);
+      result.itemsChanged = (0, import_layout.didItemRefsChange)(currentChildren, desiredRefs);
       result.itemsSpecified = true;
     }
   }
@@ -429,7 +435,7 @@ function createDesiredChild(ops, state, parentRef, subKey, desiredChild, current
     }
     return createBlockNode(ops, state, parentRef, desiredChild);
   }
-  if (isFieldContainer(parentRef.use, subKey) && !FIELD_WRAPPER_USES.has(desiredChild.use) && !STANDALONE_FIELD_USES.has(desiredChild.use)) {
+  if (isFieldContainer(parentRef.use, subKey) && !import_node_use_sets.FIELD_WRAPPER_USES.has(desiredChild.use) && !STANDALONE_FIELD_USES.has(desiredChild.use)) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces apply field wrapper '${desiredChild.use}' is not a public capability`
     );
@@ -525,7 +531,7 @@ function createFieldNode(ops, state, parentRef, desiredNode) {
     syncCreatedNode(ops, state, ref2, desiredNode);
     return ref2;
   }
-  const innerField = normalizeChildren((_a = desiredNode.subModels) == null ? void 0 : _a.field)[0];
+  const innerField = (0, import_matching.normalizeChildren)((_a = desiredNode.subModels) == null ? void 0 : _a.field)[0];
   const requestedRenderer = (innerField == null ? void 0 : innerField.use) === "JSFieldModel" || (innerField == null ? void 0 : innerField.use) === "JSEditableFieldModel" ? "js" : void 0;
   const fieldCapability = (0, import_catalog.resolveSupportedFieldCapability)({
     containerUse: parentRef.use,
@@ -569,9 +575,9 @@ function createFieldNode(ops, state, parentRef, desiredNode) {
 }
 function compilePopupPageSpec(ops, state, hostRef, pageSpec) {
   var _a, _b, _c;
-  const tabSpec = normalizeChildren((_a = pageSpec.subModels) == null ? void 0 : _a.tabs)[0];
-  const gridSpec = normalizeChildren((_b = tabSpec == null ? void 0 : tabSpec.subModels) == null ? void 0 : _b.grid)[0];
-  const popupItems = normalizeChildren((_c = gridSpec == null ? void 0 : gridSpec.subModels) == null ? void 0 : _c.items);
+  const tabSpec = (0, import_matching.normalizeChildren)((_a = pageSpec.subModels) == null ? void 0 : _a.tabs)[0];
+  const gridSpec = (0, import_matching.normalizeChildren)((_b = tabSpec == null ? void 0 : tabSpec.subModels) == null ? void 0 : _b.grid)[0];
+  const popupItems = (0, import_matching.normalizeChildren)((_c = gridSpec == null ? void 0 : gridSpec.subModels) == null ? void 0 : _c.items);
   if (!tabSpec || !gridSpec) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces apply popup page creation under '${hostRef.use}' requires popup page -> tab -> grid`
@@ -604,13 +610,13 @@ function compilePopupPageSpec(ops, state, hostRef, pageSpec) {
         }
       });
     }
-    emitLayoutOp(ops, { uid: popupGridUidRef }, null, gridSpec, {
+    (0, import_layout.emitLayoutOp)(ops, { uid: popupGridUidRef }, null, gridSpec, {
       childClientKeyRefs,
       finalItemRefs: childRefs,
       itemsChanged: true,
       itemsSpecified: true
     });
-    emitMoveOps(ops, childRefs);
+    (0, import_layout.emitMoveOps)(ops, childRefs);
   }
 }
 function bootstrapPopupShellCreation(ops, state, hostRef, pageSpec, tabSpec, popupItems) {
@@ -664,8 +670,8 @@ function bootstrapPopupShellCreation(ops, state, hostRef, pageSpec, tabSpec, pop
   return result;
 }
 function emitDomainSettingOps(ops, nodeRef, currentNode, desiredNode, explicitTarget) {
-  const props = omitLayoutProps(desiredNode.props);
-  const currentProps = omitLayoutProps(currentNode == null ? void 0 : currentNode.props);
+  const props = (0, import_layout.omitLayoutProps)(desiredNode.props);
+  const currentProps = (0, import_layout.omitLayoutProps)(currentNode == null ? void 0 : currentNode.props);
   const values = {};
   if (!import_lodash.default.isNil(props) && !import_lodash.default.isEqual(props, currentProps)) {
     values.props = props;
@@ -693,33 +699,6 @@ function emitDomainSettingOps(ops, nodeRef, currentNode, desiredNode, explicitTa
     });
   }
 }
-function emitLayoutOp(ops, target, currentNode, desiredNode, childSync) {
-  const explicitLayout = resolveLayoutRefs(extractLayout(desiredNode.props), childSync.childClientKeyRefs);
-  const desiredLayout = explicitLayout || (isGridNode((currentNode == null ? void 0 : currentNode.use) || desiredNode.use) && childSync.itemsSpecified ? buildAutoLayout(childSync.finalItemRefs.map((item) => item.uidRef)) : null);
-  if (!desiredLayout) {
-    return;
-  }
-  if (!hasRefValue(desiredLayout) && import_lodash.default.isEqual(desiredLayout, extractLayout(currentNode == null ? void 0 : currentNode.props))) {
-    return;
-  }
-  ops.push({
-    type: "setLayout",
-    target,
-    values: desiredLayout
-  });
-}
-function emitMoveOps(ops, desiredRefs) {
-  for (let index = desiredRefs.length - 2; index >= 0; index -= 1) {
-    ops.push({
-      type: "moveNode",
-      values: {
-        sourceUid: desiredRefs[index].uidRef,
-        targetUid: desiredRefs[index + 1].uidRef,
-        position: "before"
-      }
-    });
-  }
-}
 function getDefaultChildRef(parentRef, subKey, childUse) {
   if (!parentRef.sourceOpId || !childUse) {
     return null;
@@ -784,7 +763,7 @@ function getDefaultChildRef(parentRef, subKey, childUse) {
       use: childUse
     };
   }
-  if (FIELD_WRAPPER_USES.has(parentRef.use) && subKey === "field") {
+  if (import_node_use_sets.FIELD_WRAPPER_USES.has(parentRef.use) && subKey === "field") {
     return {
       uidRef: makeOpRef(`${parentRef.sourceOpId}.fieldUid`),
       use: childUse
@@ -810,140 +789,9 @@ function resolveRecordActionCreateTargetUidRef(parentRef, currentParent) {
     `flowSurfaces apply cannot resolve owning surface for record action container '${parentRef.use}'`
   );
 }
-function normalizeChildren(input) {
-  if (!input) {
-    return [];
-  }
-  return import_lodash.default.castArray(input).filter(Boolean);
-}
-function hasExplicitSubModelKey(node, key) {
-  return !!(node == null ? void 0 : node.subModels) && Object.prototype.hasOwnProperty.call(node.subModels, key);
-}
-function matchesObjectChild(currentChild, desiredChild) {
-  return currentChild.uid === desiredChild.uid || !desiredChild.uid && currentChild.use === desiredChild.use;
-}
-function planArrayChildMatches(currentChildren, desiredChildren, parentUse, subKey) {
-  const matchesByDesiredIndex = /* @__PURE__ */ new Map();
-  const matchedCurrentUids = /* @__PURE__ */ new Set();
-  const remainingDesiredByUse = /* @__PURE__ */ new Map();
-  for (const [desiredIndex, desiredChild] of desiredChildren.entries()) {
-    const matchedCurrent = findExactArrayChildMatch(currentChildren, desiredChild, matchedCurrentUids);
-    if (matchedCurrent) {
-      matchesByDesiredIndex.set(desiredIndex, matchedCurrent);
-      if (matchedCurrent.uid) {
-        matchedCurrentUids.add(matchedCurrent.uid);
-      }
-      continue;
-    }
-    if ((desiredChild == null ? void 0 : desiredChild.use) && !desiredChild.uid) {
-      const desiredIndexes = remainingDesiredByUse.get(desiredChild.use) || [];
-      desiredIndexes.push(desiredIndex);
-      remainingDesiredByUse.set(desiredChild.use, desiredIndexes);
-    }
-  }
-  const remainingCurrentByUse = /* @__PURE__ */ new Map();
-  for (const currentChild of currentChildren) {
-    if (!(currentChild == null ? void 0 : currentChild.use) || matchedCurrentUids.has(currentChild.uid || "")) {
-      continue;
-    }
-    const currentGroup = remainingCurrentByUse.get(currentChild.use) || [];
-    currentGroup.push(currentChild);
-    remainingCurrentByUse.set(currentChild.use, currentGroup);
-  }
-  const uses = /* @__PURE__ */ new Set([...remainingCurrentByUse.keys(), ...remainingDesiredByUse.keys()]);
-  for (const use of uses) {
-    const currentGroup = remainingCurrentByUse.get(use) || [];
-    const desiredIndexes = remainingDesiredByUse.get(use) || [];
-    const shouldReuseByOrder = currentGroup.length > 1 || desiredIndexes.length > 1;
-    if (currentGroup.length > 0 && desiredIndexes.length > 0 && currentGroup.length !== desiredIndexes.length && shouldReuseByOrder) {
-      throw new import_errors.FlowSurfaceBadRequestError(
-        `flowSurfaces apply cannot safely match duplicate '${use}' nodes under '${parentUse}.${subKey}' without explicit uid or signature`
-      );
-    }
-    if (!shouldReuseByOrder) {
-      continue;
-    }
-    const reuseCount = Math.min(currentGroup.length, desiredIndexes.length);
-    for (let index = 0; index < reuseCount; index += 1) {
-      const currentChild = currentGroup[index];
-      const desiredIndex = desiredIndexes[index];
-      matchesByDesiredIndex.set(desiredIndex, currentChild);
-      if (currentChild == null ? void 0 : currentChild.uid) {
-        matchedCurrentUids.add(currentChild.uid);
-      }
-    }
-  }
-  return {
-    matchesByDesiredIndex,
-    matchedCurrentUids
-  };
-}
-function findExactArrayChildMatch(currentChildren, desiredChild, matchedCurrent) {
-  if (desiredChild.uid) {
-    return currentChildren.find((item) => (item == null ? void 0 : item.uid) === desiredChild.uid);
-  }
-  const desiredStrongSignature = getStrongNodeSignature(desiredChild);
-  if (desiredStrongSignature) {
-    return currentChildren.find(
-      (item) => !matchedCurrent.has(item.uid || "") && getStrongNodeSignature(item) === desiredStrongSignature
-    );
-  }
-  const desiredWeakSignature = getWeakNodeSignature(desiredChild);
-  if (desiredWeakSignature) {
-    return currentChildren.find(
-      (item) => !matchedCurrent.has(item.uid || "") && getWeakNodeSignature(item) === desiredWeakSignature
-    );
-  }
-  return void 0;
-}
-function getStrongNodeSignature(node) {
-  if (!(node == null ? void 0 : node.use)) {
-    return null;
-  }
-  const resourceInit = import_lodash.default.get(node, ["stepParams", "resourceSettings", "init"]);
-  if ((resourceInit == null ? void 0 : resourceInit.dataSourceKey) || (resourceInit == null ? void 0 : resourceInit.collectionName) || (resourceInit == null ? void 0 : resourceInit.associationName) || (resourceInit == null ? void 0 : resourceInit.associationPathName) || !import_lodash.default.isUndefined(resourceInit == null ? void 0 : resourceInit.sourceId)) {
-    return [
-      "resource",
-      node.use,
-      resourceInit.dataSourceKey || "",
-      resourceInit.collectionName || "",
-      resourceInit.associationName || "",
-      resourceInit.associationPathName || "",
-      import_lodash.default.isUndefined(resourceInit.sourceId) ? "" : String(resourceInit.sourceId)
-    ].join(":");
-  }
-  const fieldInit = import_lodash.default.get(node, ["stepParams", "fieldSettings", "init"]) || import_lodash.default.get(node, ["subModels", "field", "stepParams", "fieldSettings", "init"]);
-  if (fieldInit == null ? void 0 : fieldInit.fieldPath) {
-    return [
-      "field",
-      node.use,
-      fieldInit.dataSourceKey || "",
-      fieldInit.collectionName || "",
-      fieldInit.associationPathName || "",
-      fieldInit.fieldPath
-    ].join(":");
-  }
-  if (node.use === "TableActionsColumnModel") {
-    return "slot:table-actions-column";
-  }
-  return null;
-}
-function getWeakNodeSignature(node) {
-  if (!(node == null ? void 0 : node.use)) {
-    return null;
-  }
-  const title = import_lodash.default.get(node, ["stepParams", "pageTabSettings", "tab", "title"]) || import_lodash.default.get(node, ["stepParams", "buttonSettings", "general", "title"]) || import_lodash.default.get(node, ["props", "title"]);
-  if (typeof title === "string" && title.trim()) {
-    return ["title", node.use, title.trim()].join(":");
-  }
-  return null;
-}
 function isFieldWrapperNode(use) {
   return (0, import_placement.isFieldWrapperUse)(use);
 }
-function isGridNode(use) {
-  return (0, import_placement.isGridUse)(use);
-}
 function isFieldContainer(parentUse, subKey) {
   return (0, import_placement.isFieldContainerUse)(parentUse, subKey);
 }
@@ -956,96 +804,10 @@ function isActionContainer(parentUse) {
 function extractResourceInit(node) {
   return import_lodash.default.get(node, ["stepParams", "resourceSettings", "init"]);
 }
-function extractLayout(props) {
-  if (!props || !("rows" in props) && !("sizes" in props) && !("rowOrder" in props)) {
-    return null;
-  }
-  return {
-    rows: props.rows || {},
-    sizes: props.sizes || {},
-    rowOrder: props.rowOrder || Object.keys(props.rows || {})
-  };
-}
-function omitLayoutProps(props) {
-  if (!props) {
-    return props;
-  }
-  const next = import_lodash.default.omit(props, ["rows", "sizes", "rowOrder"]);
-  return Object.keys(next).length ? next : void 0;
-}
-function resolveLayoutRefs(layout, childClientKeyRefs) {
-  if (!layout) {
-    return layout;
-  }
-  return {
-    rows: Object.fromEntries(
-      Object.entries(layout.rows || {}).map(([rowId, cells]) => [
-        rowId,
-        import_lodash.default.castArray(cells).map(
-          (cell) => import_lodash.default.castArray(cell).map((itemUid) => childClientKeyRefs[itemUid] ?? itemUid)
-        )
-      ])
-    ),
-    sizes: layout.sizes || {},
-    rowOrder: layout.rowOrder || []
-  };
-}
-function hasRefValue(value) {
-  if (Array.isArray(value)) {
-    return value.some((item) => hasRefValue(item));
-  }
-  if (import_lodash.default.isPlainObject(value)) {
-    if (typeof value.ref === "string") {
-      return true;
-    }
-    return Object.values(value).some((item) => hasRefValue(item));
-  }
-  return false;
-}
-function buildAutoLayout(itemRefs) {
-  if (!itemRefs.length) {
-    return {
-      rows: {},
-      sizes: {},
-      rowOrder: []
-    };
-  }
-  return {
-    rows: Object.fromEntries(itemRefs.map((itemRef, index) => [`autoRow${index + 1}`, [[itemRef]]])),
-    sizes: Object.fromEntries(itemRefs.map((_2, index) => [`autoRow${index + 1}`, [24]])),
-    rowOrder: itemRefs.map((_2, index) => `autoRow${index + 1}`)
-  };
-}
-function didItemRefsChange(currentChildren, desiredRefs) {
-  if (currentChildren.length !== desiredRefs.length) {
-    return true;
-  }
-  return desiredRefs.some(
-    (item, index) => {
-      var _a;
-      return typeof item.uidRef !== "string" || ((_a = currentChildren[index]) == null ? void 0 : _a.uid) !== item.uidRef;
-    }
-  );
-}
 function nextOpId(state, prefix) {
   state.seq += 1;
   return `${prefix}_${state.seq}`;
 }
-function emitMoveTabOps(ops, desiredRefs) {
-  emitOrderedTabMoves(ops, desiredRefs, "moveTab");
-}
-function emitOrderedTabMoves(ops, desiredRefs, type) {
-  for (let index = desiredRefs.length - 2; index >= 0; index -= 1) {
-    ops.push({
-      type,
-      values: {
-        sourceUid: desiredRefs[index].uidRef,
-        targetUid: desiredRefs[index + 1].uidRef,
-        position: "before"
-      }
-    });
-  }
-}
 function bindClientKey(state, clientKey, uid) {
   if (!clientKey || typeof uid !== "string") {
     return;
@@ -1059,7 +821,7 @@ function syncPopupTabs(ops, state, popupPageRef, currentTabs, desiredTabs) {
     itemsChanged: false,
     itemsSpecified: false
   };
-  const tabMatchPlan = planArrayChildMatches(currentTabs, desiredTabs, popupPageRef.use, "tabs");
+  const tabMatchPlan = (0, import_matching.planArrayChildMatches)(currentTabs, desiredTabs, popupPageRef.use, "tabs");
   const desiredRefs = [];
   for (const [desiredIndex, desiredTab] of desiredTabs.entries()) {
     const currentMatch = tabMatchPlan.matchesByDesiredIndex.get(desiredIndex);
@@ -1094,7 +856,7 @@ function syncPopupTabs(ops, state, popupPageRef, currentTabs, desiredTabs) {
       });
     }
   }
-  emitOrderedTabMoves(ops, desiredRefs, "movePopupTab");
+  (0, import_layout.emitMovePopupTabOps)(ops, desiredRefs);
   return result;
 }
 function createPopupTabNode(ops, state, popupPageRef, desiredNode) {
@@ -1124,6 +886,5 @@ function createPopupTabNode(ops, state, popupPageRef, desiredNode) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildAutoLayout,
   compileApplySpec
 });

package/dist/server/flow-surfaces/apply/layout.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+import type { FlowSurfaceMutateOp, FlowSurfaceNodeSpec, FlowSurfaceWriteTarget } from '../types';
+type CompiledNodeRefLike = {
+    uidRef: any;
+};
+type SyncChildrenResultLike = {
+    childClientKeyRefs: Record<string, any>;
+    finalItemRefs: CompiledNodeRefLike[];
+    itemsChanged: boolean;
+    itemsSpecified: boolean;
+};
+export declare function omitLayoutProps(props?: Record<string, any>): Record<string, any>;
+export declare function buildAutoLayout(itemRefs: any[]): {
+    rows: {
+        [k: string]: any[][];
+    };
+    sizes: {
+        [k: string]: number[];
+    };
+    rowOrder: string[];
+};
+declare function didItemRefsChange(currentChildren: FlowSurfaceNodeSpec[], desiredRefs: CompiledNodeRefLike[]): boolean;
+export declare function emitLayoutOp(ops: FlowSurfaceMutateOp[], target: FlowSurfaceWriteTarget, currentNode: any, desiredNode: Pick<FlowSurfaceNodeSpec, 'props' | 'use'>, childSync: SyncChildrenResultLike): void;
+export declare function emitMoveOps(ops: FlowSurfaceMutateOp[], desiredRefs: CompiledNodeRefLike[]): void;
+export declare function emitMoveTabOps(ops: FlowSurfaceMutateOp[], desiredRefs: CompiledNodeRefLike[]): void;
+export declare function emitMovePopupTabOps(ops: FlowSurfaceMutateOp[], desiredRefs: CompiledNodeRefLike[]): void;
+export { didItemRefsChange };