@nocobase/plugin-flow-engine 2.0.0-alpha.8 → 2.1.0-alpha.1

package/dist/server/repository.js

@@ -204,6 +204,9 @@ const _FlowModelRepository = class _FlowModelRepository extends import_database.
     }
     return this.doGetJsonSchema(uid2, options);
   }
+  static optionsToJson(options) {
+    return import_lodash.default.isPlainObject(options) ? options : JSON.parse(options);
+  }
   nodesToSchema(nodes, rootUid) {
     const nodeAttributeSanitize = (node) => {
       const schema = {
@@ -426,13 +429,122 @@ 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) {
+    let 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);
+    nodes = this.dedupeNodesForDuplicate(nodes, modelUid);
+    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 });
+  }
+  dedupeNodesForDuplicate(nodes, rootUid) {
+    if (!Array.isArray(nodes) || nodes.length <= 1) {
+      return nodes;
+    }
+    const rowsByUid = import_lodash.default.groupBy(nodes, "uid");
+    const uniqueUids = Object.keys(rowsByUid);
+    if (uniqueUids.length === nodes.length) {
+      return nodes;
+    }
+    const uidsInSubtree = new Set(uniqueUids);
+    const rootDepthByUid = /* @__PURE__ */ new Map();
+    for (const uid2 of uniqueUids) {
+      const rows = rowsByUid[uid2] || [];
+      const depths = rows.map((row) => Number((row == null ? void 0 : row.depth) ?? 0));
+      rootDepthByUid.set(uid2, depths.length ? Math.min(...depths) : 0);
+    }
+    const pickRowForUid = (uid2, rows) => {
+      if (!(rows == null ? void 0 : rows.length)) return null;
+      if (rows.length === 1) return rows[0];
+      if (uid2 === rootUid) return rows[0];
+      let bestRow = rows[0];
+      let bestParentRootDepth = -1;
+      for (const row of rows) {
+        const parentUid = row == null ? void 0 : row.parent;
+        if (!parentUid || !uidsInSubtree.has(parentUid)) {
+          continue;
+        }
+        const parentRootDepth = rootDepthByUid.get(parentUid) ?? -1;
+        if (parentRootDepth > bestParentRootDepth) {
+          bestParentRootDepth = parentRootDepth;
+          bestRow = row;
+        }
+      }
+      return bestRow;
+    };
+    const uidsInQueryOrder = [];
+    const seenUidsInQueryOrder = /* @__PURE__ */ new Set();
+    for (const row of nodes) {
+      const uid2 = row == null ? void 0 : row.uid;
+      if (!uid2 || seenUidsInQueryOrder.has(uid2)) continue;
+      seenUidsInQueryOrder.add(uid2);
+      uidsInQueryOrder.push(uid2);
+    }
+    return uidsInQueryOrder.map((uid2) => pickRowForUid(uid2, rowsByUid[uid2])).filter(Boolean);
+  }
+  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);
@@ -1025,11 +1137,11 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
     const children = nodes.filter((n) => n.parent === rootUid);
     const subModels = {};
     for (const child of children) {
-      const { subKey, subType } = child.options;
+      const { subKey, subType } = this.optionsToJson(child.options);
       if (!subKey) continue;
       const model = _FlowModelRepository.nodesToModel(nodes, child["uid"]) || {
         uid: child["uid"],
-        ...child.options,
+        ...this.optionsToJson(child.options),
         sortIndex: child.sort
       };
       model.sortIndex = child.sort;
@@ -1055,7 +1167,7 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
     }
     return {
       uid: rootNode["uid"],
-      ...rootNode.options,
+      ...this.optionsToJson(rootNode.options),
       ...Object.keys(filteredSubModels).length > 0 ? { subModels: filteredSubModels } : {}
     };
   }

package/dist/server/server.js

@@ -127,15 +127,22 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
       name: "flowModels",
       actions: {
         findOne: async (ctx, next) => {
-          const { uid: uid2, parentId, subKey } = ctx.action.params;
+          const { uid: uid2, parentId, subKey, includeAsyncNode = false } = ctx.action.params;
           const repository = ctx.db.getRepository("flowModels");
           if (uid2) {
-            ctx.body = await repository.findModelById(uid2);
+            ctx.body = await repository.findModelById(uid2, { includeAsyncNode });
           } else if (parentId) {
-            ctx.body = await repository.findModelByParentId(parentId, { subKey });
+            ctx.body = await repository.findModelByParentId(parentId, { subKey, includeAsyncNode });
           }
           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.js

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(registry_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_contexts = require("../template/contexts");
 var import_utils = require("@nocobase/utils");
+var import_selects = require("./selects");
 class VariableRegistry {
   vars = /* @__PURE__ */ new Map();
   register(def) {
@@ -128,8 +129,8 @@ function inferSelectsFromUsage(paths = [], _params) {
   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;
+async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, filterByTk, fields, appends, preferFullRecord, associationName, sourceId) {
+  var _a, _b, _c, _d, _e;
   try {
     const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({
       module: "plugin-flow-engine",
@@ -145,24 +146,34 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
     const ds = koaCtx.app.dataSourceManager.get(dataSourceKey || "main");
     const cm = ds.collectionManager;
     if (!(cm == null ? void 0 : cm.db)) return void 0;
-    const repo = cm.db.getRepository(collection);
+    const repo = associationName && typeof sourceId !== "undefined" ? cm.db.getRepository(associationName, sourceId) : cm.db.getRepository(collection);
+    const modelInfo = (_c = repo.collection) == null ? void 0 : _c.model;
+    const pkAttr = modelInfo == null ? void 0 : modelInfo.primaryKeyAttribute;
+    const pkIsValid = pkAttr && (modelInfo == null ? void 0 : modelInfo.rawAttributes) && Object.prototype.hasOwnProperty.call(modelInfo.rawAttributes, pkAttr);
+    const fieldsWithPk = Array.isArray(fields) && fields.length > 0 && pkIsValid ? Array.from(/* @__PURE__ */ new Set([...fields, pkAttr])) : fields;
+    const cacheKeyFields = preferFullRecord && pkIsValid ? void 0 : Array.isArray(fieldsWithPk) ? [...fieldsWithPk].sort() : void 0;
+    const cacheKeyAppends = preferFullRecord ? void 0 : Array.isArray(appends) ? [...appends].sort() : void 0;
     const keyObj = {
       ds: dataSourceKey || "main",
       c: collection,
       tk: filterByTk,
-      f: Array.isArray(fields) ? [...fields].sort() : void 0,
-      a: Array.isArray(appends) ? [...appends].sort() : void 0
+      f: cacheKeyFields,
+      a: cacheKeyAppends,
+      full: preferFullRecord ? true : void 0,
+      assoc: associationName,
+      sid: typeof sourceId === "undefined" ? void 0 : sourceId
     };
     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;
-      const needAppends = Array.isArray(appends) ? new Set(appends) : void 0;
+      const needFields = !preferFullRecord && Array.isArray(fieldsWithPk) ? [...new Set(fieldsWithPk)] : void 0;
+      const needAppends = !preferFullRecord && Array.isArray(appends) ? new Set(appends) : 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;
+        if (!parsed || parsed.ds !== keyObj.ds || parsed.c !== keyObj.c || parsed.tk !== keyObj.tk || parsed.assoc !== keyObj.assoc || parsed.sid !== keyObj.sid)
+          continue;
         const cachedFields = new Set(parsed.f || []);
         const cachedAppends = new Set(parsed.a || []);
         const fieldCoveredByAppends = (fieldPath) => {
@@ -173,34 +184,40 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
           }
           return false;
         };
-        const fieldsOk = !needFields || needFields.every((f) => cachedFields.has(f) || fieldCoveredByAppends(f));
+        const fieldsOk = needFields ? needFields.every((f) => cachedFields.has(f) || fieldCoveredByAppends(f)) : parsed.f === void 0;
         const appendsOk = !needAppends || [...needAppends].every((a) => cachedAppends.has(a));
-        if (fieldsOk && appendsOk) {
+        const fullOk = preferFullRecord ? parsed.full === true : true;
+        if (fieldsOk && appendsOk && fullOk) {
           return cacheVal;
         }
       }
     }
-    const rec = await repo.findOne({
-      filterByTk,
-      fields,
-      appends
-    });
+    const rec = await repo.findOne(
+      preferFullRecord ? {
+        filterByTk
+      } : {
+        filterByTk,
+        fields: fieldsWithPk,
+        appends
+      }
+    );
     const json = rec ? rec.toJSON() : void 0;
     if (cache) cache.set(key, json);
     return json;
   } catch (e) {
-    const log = (_d = (_c = koaCtx.app) == null ? void 0 : _c.logger) == null ? void 0 : _d.child({
+    const log = (_e = (_d = koaCtx.app) == null ? void 0 : _d.logger) == null ? void 0 : _e.child({
       module: "plugin-flow-engine",
       submodule: "variables.resolve",
       method: "fetchRecordWithRequestCache"
     });
-    log == null ? void 0 : log.debug("[variables.resolve] fetchRecordWithRequestCache error", {
+    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: (e == null ? void 0 : e.message) || String(e)
+      error: errMsg
     });
     return void 0;
   }
@@ -218,17 +235,28 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
     const topParams = import_lodash.default.get(contextParams, varName);
     if (isRecordParams(topParams)) {
       const { generatedAppends, generatedFields } = inferSelectsFromUsage(usedPaths, topParams);
+      const hasDirectRefTop = (usedPaths || []).some((p) => p === "");
       flowCtx.defineProperty(varName, {
         get: async () => {
           const dataSourceKey = (topParams == null ? void 0 : topParams.dataSourceKey) || "main";
-          return await fetchRecordWithRequestCache(
+          const fixed = (0, import_selects.adjustSelectsForCollection)(
             koaCtx,
             dataSourceKey,
             topParams.collection,
-            topParams.filterByTk,
             generatedFields,
             generatedAppends
           );
+          return await fetchRecordWithRequestCache(
+            koaCtx,
+            dataSourceKey,
+            topParams.collection,
+            topParams.filterByTk,
+            fixed.fields,
+            fixed.appends,
+            hasDirectRefTop,
+            topParams.associationName,
+            topParams.sourceId
+          );
         },
         cache: true
       });
@@ -261,44 +289,107 @@ 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 = [], preferFull) => {
+          const { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
+          container.defineProperty(key, {
             get: async () => {
               const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
-              return await fetchRecordWithRequestCache(
+              const fixed = (0, import_selects.adjustSelectsForCollection)(
                 koaCtx,
                 dataSourceKey,
                 recordParams.collection,
-                recordParams.filterByTk,
                 generatedFields,
                 generatedAppends
               );
+              return await fetchRecordWithRequestCache(
+                koaCtx,
+                dataSourceKey,
+                recordParams.collection,
+                recordParams.filterByTk,
+                fixed.fields,
+                fixed.appends,
+                preferFull || ((subPaths == null ? void 0 : subPaths.length) ?? 0) === 0,
+                recordParams.associationName,
+                recordParams.sourceId
+              );
             },
             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;
+          }
+          const hasDirectRefOne = (usedPaths || []).some((p) => p === seg || !!idx && p === `[${idx}]`);
+          defineRecordGetter(root, idx ?? seg, recordParams, effRemainders, hasDirectRefOne);
+          definedFirstLevel.add(idx ?? seg);
         }
-        return subContext.createProxy();
+        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 !== "");
+          const hasDirectRef = (usedPaths || []).some((p) => p === relative);
+          defineRecordGetter(container, leaf, recordParams, subPaths, hasDirectRef);
+        }
+        return root.createProxy();
       },
       cache: true
     });
@@ -318,7 +409,17 @@ function registerBuiltInVariables(reg) {
           const authObj = koaCtx.auth;
           const uid = (_a = authObj == null ? void 0 : authObj.user) == null ? void 0 : _a.id;
           if (typeof uid === "undefined" || uid === null) return void 0;
-          return await fetchRecordWithRequestCache(koaCtx, "main", "users", uid, generatedFields, generatedAppends);
+          return await fetchRecordWithRequestCache(
+            koaCtx,
+            "main",
+            "users",
+            uid,
+            generatedFields,
+            generatedAppends,
+            void 0,
+            void 0,
+            void 0
+          );
         },
         cache: true
       });

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

@@ -0,0 +1,19 @@
+/**
+ * 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 { ResourcerContext } from '@nocobase/resourcer';
+/**
+ * 针对给定集合，修正 selects：
+ * - 若 fields 中包含单段且为关联名（如 'roles'），则将其从 fields 移到 appends。
+ * - 若 fields 中包含多段且首段为关联名（如 'roles.name'），确保 appends 包含该关联名，并将首段替换为模型真实关联名。
+ * - 非关联字段：仅当模型存在该属性（或其 snake/camel 变体）时才保留，否则丢弃以避免数据库错误。
+ */
+export declare function adjustSelectsForCollection(koaCtx: ResourcerContext, dataSourceKey: string, collection: string, fields?: string[], appends?: string[]): {
+    fields?: string[];
+    appends?: string[];
+};

package/dist/server/variables/selects.js

@@ -0,0 +1,80 @@
+/**
+ * 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 selects_exports = {};
+__export(selects_exports, {
+  adjustSelectsForCollection: () => adjustSelectsForCollection
+});
+module.exports = __toCommonJS(selects_exports);
+function adjustSelectsForCollection(koaCtx, dataSourceKey, collection, fields, appends) {
+  var _a, _b, _c, _d;
+  const ds = koaCtx.app.dataSourceManager.get(dataSourceKey || "main");
+  const cm = ds.collectionManager;
+  const coll = (_b = (_a = cm == null ? void 0 : cm.db) == null ? void 0 : _a.getCollection) == null ? void 0 : _b.call(_a, collection);
+  const assocKeys = Object.keys(((_c = coll == null ? void 0 : coll.model) == null ? void 0 : _c.associations) || {});
+  const rawAttrs = ((_d = coll == null ? void 0 : coll.model) == null ? void 0 : _d.rawAttributes) || {};
+  const toCamel = (s) => s.replace(/_([a-zA-Z0-9])/g, (_m, c) => String(c).toUpperCase());
+  const toSnake = (s) => s.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
+  const assocMap = /* @__PURE__ */ new Map();
+  for (const k of assocKeys) {
+    assocMap.set(k, k);
+    assocMap.set(toSnake(k), k);
+    assocMap.set(toCamel(k), k);
+  }
+  const outFields = [];
+  const outAppends = new Set(appends || []);
+  for (const f of fields || []) {
+    const segs = String(f).split(".").filter(Boolean);
+    if (!segs.length) continue;
+    const first = segs[0];
+    const assocCanonical = assocMap.get(first) || assocMap.get(toCamel(first)) || assocMap.get(toSnake(first));
+    if (assocCanonical) {
+      outAppends.add(assocCanonical);
+      if (segs.length === 1) {
+        continue;
+      }
+      outFields.push([assocCanonical, ...segs.slice(1)].join("."));
+      continue;
+    }
+    if (rawAttrs[first]) {
+      outFields.push(f);
+    } else if (rawAttrs[toSnake(first)]) {
+      outFields.push([toSnake(first), ...segs.slice(1)].join("."));
+    } else if (rawAttrs[toCamel(first)]) {
+      outFields.push([toCamel(first), ...segs.slice(1)].join("."));
+    } else {
+      continue;
+    }
+  }
+  return {
+    fields: outFields.length ? outFields : void 0,
+    appends: outAppends.size ? Array.from(outAppends) : void 0
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  adjustSelectsForCollection
+});

package/dist/server/variables/utils.js

@@ -30,8 +30,9 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_registry = require("./registry");
+var import_selects = require("./selects");
 async function prefetchRecordsForResolve(koaCtx, items) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   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();
@@ -69,7 +70,10 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         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);
+        let { generatedAppends, generatedFields } = (0, import_registry.inferSelectsFromUsage)(remainders);
+        const fixed = (0, import_selects.adjustSelectsForCollection)(koaCtx, dataSourceKey, collection, generatedFields, generatedAppends);
+        generatedFields = fixed.fields;
+        generatedAppends = fixed.appends;
         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));
       }
@@ -86,6 +90,12 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         const cm = ds.collectionManager;
         if (!(cm == null ? void 0 : cm.db)) continue;
         const repo = cm.db.getRepository(collection);
+        const modelInfo = (_d = repo.collection) == null ? void 0 : _d.model;
+        const pkAttr = modelInfo == null ? void 0 : modelInfo.primaryKeyAttribute;
+        const pkIsValid = pkAttr && (modelInfo == null ? void 0 : modelInfo.rawAttributes) && Object.prototype.hasOwnProperty.call(modelInfo.rawAttributes, pkAttr);
+        if (fields.size && pkIsValid) {
+          fields.add(pkAttr);
+        }
         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 });
@@ -104,7 +114,7 @@ async function prefetchRecordsForResolve(koaCtx, items) {
       }
     }
   } 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) });
+    (_g = (_f = (_e = koaCtx.app) == null ? void 0 : _e.logger) == null ? void 0 : _f.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" })) == null ? void 0 : _g.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:

package/package.json

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