@nocobase/plugin-flow-engine 2.0.0-alpha.2 → 2.0.0-alpha.21

package/dist/externalVersion.js

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

package/dist/locale/en-US.json

@@ -57,5 +57,6 @@
   "Name": "Name",
   "Model with ID {{uid}} not found": "Model with ID {{uid}} not found",
   "Common actions": "Common actions",
-  "This variable is not available": "This variable is not available"
+  "This variable is not available": "This variable is not available",
+  "Copy popup UID": "Copy popup UID"
 }

package/dist/locale/index.d.ts

@@ -67,6 +67,7 @@ export declare const locales: {
         "Model with ID {{uid}} not found": string;
         "Common actions": string;
         "This variable is not available": string;
+        "Copy popup UID": string;
     };
     'zh-CN': {
         "Invalid model provided": string;
@@ -128,6 +129,7 @@ export declare const locales: {
         "Model with ID {{uid}} not found": string;
         "Common actions": string;
         "This variable is not available": string;
+        "Copy popup UID": string;
     };
 };
 /**

package/dist/locale/zh-CN.json

@@ -57,5 +57,6 @@
   "Name": "名称",
   "Model with ID {{uid}} not found": "未找到 ID 为 {{uid}} 的模型",
   "Common actions": "通用操作",
-  "This variable is not available": "此变量不可用"
+  "This variable is not available": "此变量不可用",
+  "Copy popup UID": "复制弹窗 UID"
 }

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":"2025-09-30T13:20:00.167Z"}
+{"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":"2025-10-24T05:12:47.107Z"}

package/dist/server/plugin.d.ts

@@ -12,7 +12,6 @@ export declare class PluginFlowEngineServer extends PluginUISchemaStorageServer
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;
     getDatabaseByDataSourceKey(dataSourceKey?: string): import("@nocobase/database").default;
-    private prefetchRecordsForResolve;
     transformSQL(template: string): {
         sql: string;
         bind: {};

package/dist/server/plugin.js

@@ -44,6 +44,7 @@ var import_server2 = __toESM(require("./server"));
 var import_contexts = require("./template/contexts");
 var import_resolver = require("./template/resolver");
 var import_registry = require("./variables/registry");
+var import_utils = require("./variables/utils");
 class PluginFlowEngineServer extends import_server2.default {
   globalContext;
   async afterAdd() {
@@ -59,86 +60,6 @@ class PluginFlowEngineServer extends import_server2.default {
     }
     return cm.db;
   }
-  // 预取：构建“同记录”的字段/关联并集，一次查询写入 ctx.state.__varResolveBatchCache，供后续解析复用
-  async prefetchRecordsForResolve(koaCtx, items) {
-    var _a;
-    try {
-      const groupMap = /* @__PURE__ */ new Map();
-      const ensureGroup = (dataSourceKey, collection, filterByTk) => {
-        const groupKey = JSON.stringify({ ds: dataSourceKey, collection, tk: filterByTk });
-        let group = groupMap.get(groupKey);
-        if (!group) {
-          group = { dataSourceKey, collection, filterByTk, fields: /* @__PURE__ */ new Set(), appends: /* @__PURE__ */ new Set() };
-          groupMap.set(groupKey, group);
-        }
-        return group;
-      };
-      const normalizeNestedSeg = (segment) => /^\d+$/.test(segment) ? `[${segment}]` : segment;
-      const toFirstSeg = (path) => {
-        const m = path.match(/^([^.[]+|\[[^\]]+\])([\s\S]*)$/);
-        const segment = m ? m[1] : "";
-        const rest = m ? m[2] : "";
-        return { segment, hasDeep: rest.includes(".") || rest.includes("[") || rest.length > 0 };
-      };
-      for (const it of items) {
-        const template = (it == null ? void 0 : it.template) ?? {};
-        const contextParams = (it == null ? void 0 : it.contextParams) || {};
-        const usage = import_registry.variables.extractUsage(template);
-        for (const [cpKey, recordParams] of Object.entries(contextParams)) {
-          const parts = String(cpKey).split(".");
-          const varName = parts[0];
-          const nestedSeg = parts.slice(1).join(".");
-          const paths = (usage == null ? void 0 : usage[varName]) || [];
-          if (!paths.length) continue;
-          const segNorm = nestedSeg ? normalizeNestedSeg(nestedSeg) : "";
-          const remainders = [];
-          for (const p of paths) {
-            if (!segNorm) remainders.push(p);
-            else if (p === segNorm) remainders.push("");
-            else if (p.startsWith(`${segNorm}.`) || p.startsWith(`${segNorm}[`))
-              remainders.push(p.slice(segNorm.length + 1));
-          }
-          if (!remainders.length) continue;
-          const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
-          const collection = recordParams == null ? void 0 : recordParams.collection;
-          const filterByTk = recordParams == null ? void 0 : recordParams.filterByTk;
-          if (!collection || typeof filterByTk === "undefined") continue;
-          const group = ensureGroup(dataSourceKey, collection, filterByTk);
-          for (const r of remainders) {
-            const { segment, hasDeep } = toFirstSeg(r);
-            if (!segment) continue;
-            const key = segment.replace(/^\[(.+)\]$/, "$1");
-            if (hasDeep) group.appends.add(key);
-            else group.fields.add(key);
-          }
-        }
-      }
-      if (!groupMap.size) return;
-      const stateObj = koaCtx.state;
-      if (stateObj && !stateObj["__varResolveBatchCache"]) {
-        stateObj["__varResolveBatchCache"] = /* @__PURE__ */ new Map();
-      }
-      const cache = (_a = koaCtx.state) == null ? void 0 : _a["__varResolveBatchCache"];
-      for (const { dataSourceKey, collection, filterByTk, fields, appends } of groupMap.values()) {
-        try {
-          const dataSource = this.app.dataSourceManager.get(dataSourceKey);
-          const cm = dataSource.collectionManager;
-          if (!(cm == null ? void 0 : cm.db)) continue;
-          const repo = cm.db.getRepository(collection);
-          const fld = fields.size ? Array.from(fields) : void 0;
-          const app = appends.size ? Array.from(appends) : void 0;
-          const rec = await repo.findOne({ filterByTk, fields: fld, appends: app });
-          const json = rec ? rec.toJSON() : void 0;
-          if (cache) {
-            const key = JSON.stringify({ ds: dataSourceKey, c: collection, tk: filterByTk, f: fld, a: app });
-            cache.set(key, json);
-          }
-        } catch {
-        }
-      }
-    } catch {
-    }
-  }
   transformSQL(template) {
     let index = 1;
     const bind = {};
@@ -167,7 +88,7 @@ class PluginFlowEngineServer extends import_server2.default {
           const values = typeof (raw == null ? void 0 : raw.values) !== "undefined" ? raw.values : raw;
           if (Array.isArray(values == null ? void 0 : values.batch)) {
             const batchItems = values.batch;
-            await this.prefetchRecordsForResolve(
+            await (0, import_utils.prefetchRecordsForResolve)(
               ctx,
               batchItems.map((it) => ({
                 template: it.template,
@@ -196,7 +117,7 @@ class PluginFlowEngineServer extends import_server2.default {
           }
           const template = values.template;
           const contextParams = (values == null ? void 0 : values.contextParams) || {};
-          await this.prefetchRecordsForResolve(ctx, [{ template, contextParams }]);
+          await (0, import_utils.prefetchRecordsForResolve)(ctx, [{ template, contextParams }]);
           const requestCtx = new import_contexts.HttpRequestContext(ctx);
           requestCtx.delegate(this.globalContext);
           await import_registry.variables.attachUsedVariables(requestCtx, ctx, template, contextParams);

package/dist/server/repository.d.ts

@@ -70,7 +70,8 @@ export declare class FlowModelRepository extends Repository {
     }): Promise<void>;
     remove(uid: string, options?: Transactionable & removeParentOptions): Promise<void>;
     insertAdjacent(position: 'beforeBegin' | 'afterBegin' | 'beforeEnd' | 'afterEnd', target: string, schema: any, options?: InsertAdjacentOptions): Promise<any>;
-    duplicate(uid: string, options?: Transactionable): Promise<any>;
+    duplicate(modelUid: string, options?: Transactionable): Promise<any>;
+    private replaceStepParamsModelUids;
     insert(schema: any, options?: Transactionable): Promise<any>;
     insertNewSchema(schema: any, options?: Transactionable & {
         returnNode?: boolean;

package/dist/server/repository.js

@@ -426,13 +426,76 @@ const _FlowModelRepository = class _FlowModelRepository extends import_database.
     await this.clearXUidPathCache(result["uid"], transaction2);
     return result;
   }
-  async duplicate(uid2, options) {
-    const s = await this.getJsonSchema(uid2, { ...options, includeAsyncNode: true });
-    if (!(s == null ? void 0 : s["uid"])) {
+  async duplicate(modelUid, options) {
+    const nodes = await this.findNodesById(modelUid, { ...options, includeAsyncNode: true });
+    if (!(nodes == null ? void 0 : nodes.length)) {
       return null;
     }
-    this.regenerateUid(s);
-    return this.insert(s, options);
+    const uidMap = {};
+    for (const n of nodes) {
+      uidMap[n["uid"]] = (0, import_utils.uid)();
+    }
+    const sorted = [...nodes].sort((a, b) => {
+      if (a.depth !== b.depth) return a.depth - b.depth;
+      const ap = a.parent || "";
+      const bp = b.parent || "";
+      if (ap !== bp) return ap < bp ? -1 : 1;
+      const at = a.type || "";
+      const bt = b.type || "";
+      if (at !== bt) return at < bt ? -1 : 1;
+      const as = a.sort ?? 0;
+      const bs = b.sort ?? 0;
+      return as - bs;
+    });
+    for (const n of sorted) {
+      const oldUid = n["uid"];
+      const newUid = uidMap[oldUid];
+      const oldParentUid = n["parent"];
+      const newParentUid = uidMap[oldParentUid] ?? null;
+      const optionsObj = this.replaceStepParamsModelUids(
+        import_lodash.default.isPlainObject(n.options) ? n.options : JSON.parse(n.options),
+        uidMap
+      );
+      if (newParentUid) {
+        optionsObj.parent = newParentUid;
+        optionsObj.parentId = newParentUid;
+      }
+      const schemaNode = {
+        uid: newUid,
+        ["x-async"]: !!n.async,
+        ...optionsObj
+      };
+      if (newParentUid) {
+        schemaNode.childOptions = {
+          parentUid: newParentUid,
+          type: n.type,
+          position: "last"
+        };
+      }
+      await this.insertSingleNode(schemaNode, { transaction: options == null ? void 0 : options.transaction });
+    }
+    return this.findModelById(uidMap[modelUid], { ...options });
+  }
+  replaceStepParamsModelUids(options, uidMap) {
+    const opts = options && typeof options === "object" ? options : {};
+    const replaceUidString = (v) => typeof v === "string" && uidMap[v] ? uidMap[v] : v;
+    const replaceInPlace = (val) => {
+      if (Array.isArray(val)) {
+        for (let i = 0; i < val.length; i++) {
+          val[i] = replaceInPlace(val[i]);
+        }
+        return val;
+      }
+      if (val && typeof val === "object") {
+        for (const k of Object.keys(val)) {
+          val[k] = replaceInPlace(val[k]);
+        }
+        return val;
+      }
+      return replaceUidString(val);
+    };
+    if (opts.stepParams) opts.stepParams = replaceInPlace(opts.stepParams);
+    return opts;
   }
   async insert(schema, options) {
     const nodes = _FlowModelRepository.schemaToSingleNodes(schema);

package/dist/server/server.js

@@ -136,6 +136,13 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
           }
           await next();
         },
+        duplicate: async (ctx, next) => {
+          const { uid: uid2 } = ctx.action.params;
+          const repository = ctx.db.getRepository("flowModels");
+          const duplicated = await repository.duplicate(uid2);
+          ctx.body = duplicated;
+          await next();
+        },
         move: async (ctx, next) => {
           const { sourceId, targetId, position } = ctx.action.params;
           const repository = ctx.db.getRepository("flowModels");

package/dist/server/variables/registry.d.ts

@@ -39,4 +39,14 @@ declare class VariableRegistry {
     attachUsedVariables(ctx: HttpRequestContext, koaCtx: ResourcerContext, template: JSONValue, contextParams: any): Promise<void>;
 }
 export declare const variables: VariableRegistry;
+/** 仅测试使用：重置变量注册表为内置默认集 */
+/**
+ * 从使用路径推断查询所需的 fields 与 appends。
+ * @param paths 使用到的子路径数组
+ * @param params 显式参数（仅用于兼容签名）
+ */
+export declare function inferSelectsFromUsage(paths?: string[], _params?: unknown): {
+    generatedAppends?: string[];
+    generatedFields?: string[];
+};
 export {};

package/dist/server/variables/registry.js

@@ -36,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var registry_exports = {};
 __export(registry_exports, {
+  inferSelectsFromUsage: () => inferSelectsFromUsage,
   variables: () => variables
 });
 module.exports = __toCommonJS(registry_exports);
@@ -90,40 +91,51 @@ if (!g[GLOBAL_KEY]) {
   g[GLOBAL_KEY] = new VariableRegistry();
 }
 const variables = g[GLOBAL_KEY];
-function inferSelectsFromUsage(paths = [], params) {
+function inferSelectsFromUsage(paths = [], _params) {
   if (!Array.isArray(paths) || paths.length === 0) {
     return { generatedAppends: void 0, generatedFields: void 0 };
   }
   const appendSet = /* @__PURE__ */ new Set();
   const fieldSet = /* @__PURE__ */ new Set();
+  const normalizePath = (raw) => {
+    if (!raw) return "";
+    let s = String(raw);
+    s = s.replace(/\[(?:\d+)\]/g, "");
+    s = s.replace(/\[(?:"((?:[^"\\]|\\.)*)"|'((?:[^'\\]|\\.)*)')\]/g, (_m, g1, g2) => `.${g1 || g2}`);
+    s = s.replace(/\.\.+/g, ".");
+    s = s.replace(/^\./, "").replace(/\.$/, "");
+    return s;
+  };
   for (let path of paths) {
     if (!path) continue;
     while (/^\[(\d+)\](\.|$)/.test(path)) {
       path = path.replace(/^\[(\d+)\]\.?/, "");
     }
-    if (!path) continue;
-    let first = "";
-    let rest = "";
-    const mStr = path.match(/^\[(?:"((?:[^"\\]|\\.)*)"|'((?:[^'\\]|\\.)*)')\](.*)$/);
-    if (mStr) {
-      first = (mStr[1] ?? mStr[2]) || "";
-      rest = mStr[3] || "";
-    } else {
-      const m = path.match(/^([^.[]+)([\s\S]*)$/);
-      first = (m == null ? void 0 : m[1]) ?? "";
-      rest = (m == null ? void 0 : m[2]) ?? "";
+    const norm = normalizePath(path);
+    if (!norm) continue;
+    const segments = norm.split(".").filter(Boolean);
+    if (segments.length === 0) continue;
+    if (segments.length === 1) {
+      fieldSet.add(segments[0]);
+      continue;
     }
-    if (!first) continue;
-    const hasDeep = rest.includes(".") || rest.includes("[");
-    if (hasDeep) appendSet.add(first);
-    else fieldSet.add(first);
+    for (let i = 0; i < segments.length - 1; i++) {
+      appendSet.add(segments.slice(0, i + 1).join("."));
+    }
+    fieldSet.add(segments.join("."));
   }
   const generatedAppends = appendSet.size ? Array.from(appendSet) : void 0;
   const generatedFields = fieldSet.size ? Array.from(fieldSet) : void 0;
   return { generatedAppends, generatedFields };
 }
 async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, filterByTk, fields, appends) {
+  var _a, _b, _c, _d;
   try {
+    const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({
+      module: "plugin-flow-engine",
+      submodule: "variables.resolve",
+      method: "fetchRecordWithRequestCache"
+    });
     const kctx = koaCtx;
     if (!kctx.state) kctx.state = {};
     if (!kctx.state["__varResolveBatchCache"]) {
@@ -143,32 +155,54 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
     };
     const key = JSON.stringify(keyObj);
     if (cache) {
-      if (cache.has(key)) return cache.get(key);
-      const needFields = Array.isArray(fields) ? new Set(fields) : void 0;
+      if (cache.has(key)) {
+        return cache.get(key);
+      }
+      const needFields = Array.isArray(fields) ? [...new Set(fields)] : void 0;
       const needAppends = Array.isArray(appends) ? new Set(appends) : void 0;
-      let fallbackAny = void 0;
       for (const [cacheKey, cacheVal] of cache.entries()) {
         const parsed = JSON.parse(cacheKey);
         if (!parsed || parsed.ds !== keyObj.ds || parsed.c !== keyObj.c || parsed.tk !== keyObj.tk) continue;
-        const cachedFields = Array.isArray(parsed.f) ? new Set(parsed.f) : void 0;
-        const cachedAppends = Array.isArray(parsed.a) ? new Set(parsed.a) : void 0;
-        const fieldsOk = !needFields || cachedFields && [...needFields].every((x) => cachedFields.has(x));
-        const appendsOk = !needAppends || cachedAppends && [...needAppends].every((x) => cachedAppends.has(x));
-        if (fieldsOk && appendsOk) return cacheVal;
-        if (typeof fallbackAny === "undefined") fallbackAny = cacheVal;
+        const cachedFields = new Set(parsed.f || []);
+        const cachedAppends = new Set(parsed.a || []);
+        const fieldCoveredByAppends = (fieldPath) => {
+          const p = String(fieldPath || "");
+          for (const a of cachedAppends) {
+            if (!a) continue;
+            if (p === a || p.startsWith(a + ".")) return true;
+          }
+          return false;
+        };
+        const fieldsOk = !needFields || needFields.every((f) => cachedFields.has(f) || fieldCoveredByAppends(f));
+        const appendsOk = !needAppends || [...needAppends].every((a) => cachedAppends.has(a));
+        if (fieldsOk && appendsOk) {
+          return cacheVal;
+        }
       }
-      if (typeof fallbackAny !== "undefined") return fallbackAny;
     }
-    const tk = filterByTk;
     const rec = await repo.findOne({
-      filterByTk: tk,
+      filterByTk,
       fields,
       appends
     });
     const json = rec ? rec.toJSON() : void 0;
     if (cache) cache.set(key, json);
     return json;
-  } catch (_2) {
+  } catch (e) {
+    const log = (_d = (_c = koaCtx.app) == null ? void 0 : _c.logger) == null ? void 0 : _d.child({
+      module: "plugin-flow-engine",
+      submodule: "variables.resolve",
+      method: "fetchRecordWithRequestCache"
+    });
+    const errMsg = e instanceof Error ? e.message : String(e);
+    log == null ? void 0 : log.warn("[variables.resolve] fetchRecordWithRequestCache error", {
+      ds: dataSourceKey,
+      collection,
+      tk: filterByTk,
+      fields,
+      appends,
+      error: errMsg
+    });
     return void 0;
   }
 }
@@ -228,29 +262,34 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
       segmentMap.set(seg, arr);
     }
     const segEntries = Array.from(segmentMap.entries());
-    const recordChildren = segEntries.filter(([seg]) => {
+    const oneLevelRecordChildren = segEntries.filter(([seg]) => {
       const idx = parseIndexSegment(seg);
       const nestedObj = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0);
       const dotted = (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
       return isRecordParams(nestedObj) || isRecordParams(dotted);
     });
-    if (!recordChildren.length) continue;
+    const deepRecordMap = /* @__PURE__ */ new Map();
+    const cp = contextParams;
+    if (cp && typeof cp === "object") {
+      const cpRec = cp;
+      for (const key of Object.keys(cpRec)) {
+        if (!key || key !== varName && !key.startsWith(`${varName}.`)) continue;
+        if (key === varName) continue;
+        const val = cpRec[key];
+        if (!isRecordParams(val)) continue;
+        const relative = key.slice(varName.length + 1);
+        if (!relative) continue;
+        deepRecordMap.set(relative, val);
+      }
+    }
+    if (!oneLevelRecordChildren.length && deepRecordMap.size === 0) continue;
     flowCtx.defineProperty(varName, {
       get: () => {
-        const subContext = new import_contexts.ServerBaseContext();
-        for (const [seg, remainders] of recordChildren) {
-          const idx = parseIndexSegment(seg);
-          const recordParams = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0) ?? (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
-          let effRemainders = remainders.filter((r) => !!r);
-          if (!effRemainders.length) {
-            const all = usedPaths.map(
-              (p) => p.startsWith(`${seg}.`) ? p.slice(seg.length + 1) : p.startsWith(`${seg}[`) ? p.slice(seg.length) : ""
-            ).filter((x) => !!x);
-            if (all.length) effRemainders = all;
-          }
-          const { generatedAppends, generatedFields } = inferSelectsFromUsage(effRemainders, recordParams);
-          const definitionKey = idx ?? seg;
-          subContext.defineProperty(definitionKey, {
+        const root = new import_contexts.ServerBaseContext();
+        const definedFirstLevel = /* @__PURE__ */ new Set();
+        const defineRecordGetter = (container, key, recordParams, subPaths = []) => {
+          const { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
+          container.defineProperty(key, {
             get: async () => {
               const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
               return await fetchRecordWithRequestCache(
@@ -264,8 +303,54 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
             },
             cache: true
           });
+        };
+        const subContainers = /* @__PURE__ */ new Map();
+        const ensureSubContainer = (parent, key) => {
+          let map = subContainers.get(parent);
+          if (!map) {
+            map = /* @__PURE__ */ new Map();
+            subContainers.set(parent, map);
+          }
+          let child = map.get(key);
+          if (!child) {
+            const inst = new import_contexts.ServerBaseContext();
+            parent.defineProperty(key, { get: () => inst.createProxy(), cache: true });
+            map.set(key, inst);
+            child = inst;
+          }
+          return child;
+        };
+        for (const [seg, remainders] of oneLevelRecordChildren) {
+          const idx = parseIndexSegment(seg);
+          const recordParams = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0) ?? (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
+          let effRemainders = (remainders || []).filter((r) => !!r);
+          if (!effRemainders.length) {
+            const all = usedPaths.map(
+              (p) => p.startsWith(`${seg}.`) ? p.slice(seg.length + 1) : p.startsWith(`${seg}[`) ? p.slice(seg.length) : ""
+            ).filter((x) => !!x);
+            if (all.length) effRemainders = all;
+          }
+          defineRecordGetter(root, idx ?? seg, recordParams, effRemainders);
+          definedFirstLevel.add(idx ?? seg);
+        }
+        for (const [relative, recordParams] of deepRecordMap.entries()) {
+          const segs = String(relative).split(".").filter(Boolean);
+          if (segs.length === 0) continue;
+          const first = segs[0];
+          let container;
+          if (definedFirstLevel.has(first)) {
+            continue;
+          } else {
+            container = root;
+            for (let i = 0; i < segs.length - 1; i++) {
+              container = ensureSubContainer(container, segs[i]);
+            }
+          }
+          const leaf = segs[segs.length - 1];
+          const subPaths = (usedPaths || []).map((p) => p === relative ? "" : p.startsWith(relative + ".") ? p.slice(relative.length + 1) : "").filter((x) => x !== "");
+          defineRecordGetter(container, leaf, recordParams, subPaths);
         }
-        return subContext.createProxy();
+        return root.createProxy();
       },
       cache: true
     });
@@ -295,5 +380,6 @@ function registerBuiltInVariables(reg) {
 registerBuiltInVariables(variables);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  inferSelectsFromUsage,
   variables
 });

package/dist/server/variables/utils.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { ResourcerContext } from '@nocobase/resourcer';
+import type { JSONValue } from '../template/resolver';
+/**
+ * 预取：构建“同记录”的字段/关联并集，一次查询写入 ctx.state.__varResolveBatchCache，供后续解析复用
+ */
+export declare function prefetchRecordsForResolve(koaCtx: ResourcerContext, items: Array<{
+    template: JSONValue;
+    contextParams?: Record<string, unknown>;
+}>): Promise<void>;

package/dist/server/variables/utils.js

@@ -0,0 +1,113 @@
+/**
+ * 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 __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  prefetchRecordsForResolve: () => prefetchRecordsForResolve
+});
+module.exports = __toCommonJS(utils_exports);
+var import_registry = require("./registry");
+async function prefetchRecordsForResolve(koaCtx, items) {
+  var _a, _b, _c, _d, _e, _f;
+  try {
+    const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" });
+    const groupMap = /* @__PURE__ */ new Map();
+    const ensureGroup = (dataSourceKey, collection, filterByTk) => {
+      const groupKey = JSON.stringify({ ds: dataSourceKey, collection, tk: filterByTk });
+      let group = groupMap.get(groupKey);
+      if (!group) {
+        group = { dataSourceKey, collection, filterByTk, fields: /* @__PURE__ */ new Set(), appends: /* @__PURE__ */ new Set() };
+        groupMap.set(groupKey, group);
+      }
+      return group;
+    };
+    const normalizeNestedSeg = (segment) => /^\d+$/.test(segment) ? `[${segment}]` : segment;
+    for (const it of items) {
+      const template = (it == null ? void 0 : it.template) ?? {};
+      const contextParams = (it == null ? void 0 : it.contextParams) || {};
+      const usage = import_registry.variables.extractUsage(template);
+      for (const [cpKey, recordParams] of Object.entries(contextParams)) {
+        const parts = String(cpKey).split(".");
+        const varName = parts[0];
+        const nestedSeg = parts.slice(1).join(".");
+        const paths = (usage == null ? void 0 : usage[varName]) || [];
+        if (!paths.length) continue;
+        const segNorm = nestedSeg ? normalizeNestedSeg(nestedSeg) : "";
+        const remainders = [];
+        for (const p of paths) {
+          if (!segNorm) remainders.push(p);
+          else if (p === segNorm) remainders.push("");
+          else if (p.startsWith(`${segNorm}.`) || p.startsWith(`${segNorm}[`))
+            remainders.push(p.slice(segNorm.length + 1));
+        }
+        if (!remainders.length) continue;
+        const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
+        const collection = recordParams == null ? void 0 : recordParams.collection;
+        const filterByTk = recordParams == null ? void 0 : recordParams.filterByTk;
+        if (!collection || typeof filterByTk === "undefined") continue;
+        const group = ensureGroup(dataSourceKey, collection, filterByTk);
+        const { generatedAppends, generatedFields } = (0, import_registry.inferSelectsFromUsage)(remainders);
+        if (generatedFields == null ? void 0 : generatedFields.length) generatedFields.forEach((f) => group.fields.add(f));
+        if (generatedAppends == null ? void 0 : generatedAppends.length) generatedAppends.forEach((a) => group.appends.add(a));
+      }
+    }
+    if (!groupMap.size) return;
+    const stateObj = koaCtx.state;
+    if (stateObj && !stateObj["__varResolveBatchCache"]) {
+      stateObj["__varResolveBatchCache"] = /* @__PURE__ */ new Map();
+    }
+    const cache = (_c = koaCtx.state) == null ? void 0 : _c["__varResolveBatchCache"];
+    for (const { dataSourceKey, collection, filterByTk, fields, appends } of groupMap.values()) {
+      try {
+        const ds = koaCtx.app.dataSourceManager.get(dataSourceKey);
+        const cm = ds.collectionManager;
+        if (!(cm == null ? void 0 : cm.db)) continue;
+        const repo = cm.db.getRepository(collection);
+        const fld = fields.size ? Array.from(fields).sort() : void 0;
+        const app = appends.size ? Array.from(appends).sort() : void 0;
+        const rec = await repo.findOne({ filterByTk, fields: fld, appends: app });
+        const json = rec ? rec.toJSON() : void 0;
+        if (cache) {
+          const key = JSON.stringify({ ds: dataSourceKey, c: collection, tk: filterByTk, f: fld, a: app });
+          cache.set(key, json);
+        }
+      } catch (e) {
+        log == null ? void 0 : log.debug("[variables.resolve] prefetch query error", {
+          ds: dataSourceKey,
+          collection,
+          tk: filterByTk,
+          error: (e == null ? void 0 : e.message) || String(e)
+        });
+      }
+    }
+  } catch (e) {
+    (_f = (_e = (_d = koaCtx.app) == null ? void 0 : _d.logger) == null ? void 0 : _e.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" })) == null ? void 0 : _f.debug("[variables.resolve] prefetch fatal error", { error: (e == null ? void 0 : e.message) || String(e) });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  prefetchRecordsForResolve
+});

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.21",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "1322f486b248bef53ed8c8f42f0a39dfd02125fd"
+  "gitHead": "0398c85e979d09e834952e71c5c1a1ccf1a3a8e1"
 }