@nocobase/plugin-flow-engine 2.0.0-alpha.7 → 2.0.0-alpha.71

package/dist/server/variables/registry.js

@@ -36,12 +36,15 @@ 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);
 var import_lodash = __toESM(require("lodash"));
 var import_contexts = require("../template/contexts");
 var import_utils = require("@nocobase/utils");
+var import_selects = require("./selects");
+var import_records = require("./records");
 class VariableRegistry {
   vars = /* @__PURE__ */ new Map();
   register(def) {
@@ -90,40 +93,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;
+    }
+    for (let i = 0; i < segments.length - 1; i++) {
+      appendSet.add(segments.slice(0, i + 1).join("."));
     }
-    if (!first) continue;
-    const hasDeep = rest.includes(".") || rest.includes("[");
-    if (hasDeep) appendSet.add(first);
-    else fieldSet.add(first);
+    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) {
+async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, filterByTk, fields, appends, strictSelects, 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",
+      submodule: "variables.resolve",
+      method: "fetchRecordWithRequestCache"
+    });
     const kctx = koaCtx;
     if (!kctx.state) kctx.state = {};
     if (!kctx.state["__varResolveBatchCache"]) {
@@ -133,42 +147,89 @@ 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 collectionInfo = repo == null ? void 0 : repo.collection;
+    const filterTargetKey = collectionInfo == null ? void 0 : collectionInfo.filterTargetKey;
+    const extraKeys = (0, import_records.getExtraKeyFieldsForSelect)(filterByTk, {
+      filterTargetKey,
+      pkAttr,
+      pkIsValid,
+      rawAttributes: (modelInfo == null ? void 0 : modelInfo.rawAttributes) || void 0
+    });
+    const effectiveExtras = strictSelects && Array.isArray(extraKeys) && extraKeys.length ? extraKeys.filter((k) => k === pkAttr) : extraKeys;
+    const fieldsWithExtras = (0, import_records.mergeFieldsWithExtras)(fields, effectiveExtras);
+    const cacheKeyFields = preferFullRecord && pkIsValid ? void 0 : Array.isArray(fieldsWithExtras) ? [...fieldsWithExtras].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;
-      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;
+      if (cache.has(key)) {
+        return cache.get(key);
+      }
+      if (!strictSelects) {
+        const needFields = !preferFullRecord && Array.isArray(fieldsWithExtras) ? [...new Set(fieldsWithExtras)] : 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 || !import_lodash.default.isEqual(parsed.tk, keyObj.tk) || parsed.assoc !== keyObj.assoc || !import_lodash.default.isEqual(parsed.sid, keyObj.sid))
+            continue;
+          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)) : parsed.f === void 0;
+          const appendsOk = !needAppends || [...needAppends].every((a) => cachedAppends.has(a));
+          const fullOk = preferFullRecord ? parsed.full === true : true;
+          if (fieldsOk && appendsOk && fullOk) {
+            return cacheVal;
+          }
+        }
       }
-      if (typeof fallbackAny !== "undefined") return fallbackAny;
     }
-    const tk = filterByTk;
-    const rec = await repo.findOne({
-      filterByTk: tk,
-      fields,
-      appends
+    const json = await (0, import_records.fetchRecordOrRecordsJson)(repo, {
+      filterByTk,
+      preferFullRecord,
+      fields: fieldsWithExtras,
+      appends,
+      filterTargetKey,
+      pkAttr,
+      pkIsValid
     });
-    const json = rec ? rec.toJSON() : void 0;
     if (cache) cache.set(key, json);
     return json;
-  } catch (_2) {
+  } catch (e) {
+    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"
+    });
+    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;
   }
 }
@@ -183,19 +244,107 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
   for (const varName of Object.keys(usage)) {
     const usedPaths = usage[varName] || [];
     const topParams = import_lodash.default.get(contextParams, varName);
+    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 (isRecordParams(topParams)) {
-      const { generatedAppends, generatedFields } = inferSelectsFromUsage(usedPaths, topParams);
+      const usedPathsForBase = deepRecordMap.size ? (usedPaths || []).filter((p) => {
+        if (!p) return true;
+        for (const relative of deepRecordMap.keys()) {
+          if (!relative) continue;
+          if (p === relative || p.startsWith(relative + ".") || p.startsWith(relative + "[")) return false;
+        }
+        return true;
+      }) : usedPaths || [];
+      const hasDirectRefTop = usedPathsForBase.some((p) => p === "");
       flowCtx.defineProperty(varName, {
         get: async () => {
           const dataSourceKey = (topParams == null ? void 0 : topParams.dataSourceKey) || "main";
-          return await fetchRecordWithRequestCache(
+          const strictSelects = Array.isArray(topParams == null ? void 0 : topParams.fields) || Array.isArray(topParams == null ? void 0 : topParams.appends);
+          let { generatedAppends, generatedFields } = inferSelectsFromUsage(usedPathsForBase, topParams);
+          if (Array.isArray(topParams == null ? void 0 : topParams.fields)) generatedFields = topParams.fields;
+          if (Array.isArray(topParams == null ? void 0 : topParams.appends)) generatedAppends = topParams.appends;
+          const fixed = (0, import_selects.adjustSelectsForCollection)(
             koaCtx,
             dataSourceKey,
             topParams.collection,
-            topParams.filterByTk,
             generatedFields,
             generatedAppends
           );
+          const base = await fetchRecordWithRequestCache(
+            koaCtx,
+            dataSourceKey,
+            topParams.collection,
+            topParams.filterByTk,
+            fixed.fields,
+            fixed.appends,
+            strictSelects,
+            hasDirectRefTop,
+            topParams.associationName,
+            topParams.sourceId
+          );
+          if (!deepRecordMap.size) return base;
+          const merged = base && typeof base === "object" && !Array.isArray(base) ? { ...base } : {};
+          const setClonedPath = (obj, path, value) => {
+            const segs = String(path || "").split(".").filter(Boolean);
+            if (!segs.length) return;
+            if (segs.length === 1) {
+              obj[segs[0]] = value;
+              return;
+            }
+            let cur = obj;
+            for (let i = 0; i < segs.length - 1; i++) {
+              const seg = segs[i];
+              const prev = cur[seg];
+              const next = prev && typeof prev === "object" && !Array.isArray(prev) ? { ...prev } : {};
+              cur[seg] = next;
+              cur = next;
+            }
+            cur[segs[segs.length - 1]] = value;
+          };
+          const buildNestedPromise = (recordParams, relative) => {
+            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);
+            const dataSourceKey2 = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
+            const strictSelects2 = Array.isArray(recordParams == null ? void 0 : recordParams.fields) || Array.isArray(recordParams == null ? void 0 : recordParams.appends);
+            let { generatedAppends: generatedAppends2, generatedFields: generatedFields2 } = inferSelectsFromUsage(subPaths, recordParams);
+            if (Array.isArray(recordParams == null ? void 0 : recordParams.fields)) generatedFields2 = recordParams.fields;
+            if (Array.isArray(recordParams == null ? void 0 : recordParams.appends)) generatedAppends2 = recordParams.appends;
+            const fixed2 = (0, import_selects.adjustSelectsForCollection)(
+              koaCtx,
+              dataSourceKey2,
+              recordParams.collection,
+              generatedFields2,
+              generatedAppends2
+            );
+            return fetchRecordWithRequestCache(
+              koaCtx,
+              dataSourceKey2,
+              recordParams.collection,
+              recordParams.filterByTk,
+              fixed2.fields,
+              fixed2.appends,
+              strictSelects2,
+              hasDirectRef,
+              recordParams.associationName,
+              recordParams.sourceId
+            );
+          };
+          for (const [relative, recordParams] of deepRecordMap.entries()) {
+            setClonedPath(merged, relative, buildNestedPromise(recordParams, relative));
+          }
+          return merged;
         },
         cache: true
       });
@@ -228,44 +377,97 @@ 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;
+    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 strictSelects = Array.isArray(recordParams == null ? void 0 : recordParams.fields) || Array.isArray(recordParams == null ? void 0 : recordParams.appends);
+          let { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
+          if (Array.isArray(recordParams == null ? void 0 : recordParams.fields)) generatedFields = recordParams.fields;
+          if (Array.isArray(recordParams == null ? void 0 : recordParams.appends)) generatedAppends = recordParams.appends;
+          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,
+                strictSelects,
+                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);
+        }
+        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 subContext.createProxy();
+        return root.createProxy();
       },
       cache: true
     });
@@ -285,7 +487,18 @@ 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,
+            false,
+            void 0,
+            void 0,
+            void 0
+          );
         },
         cache: true
       });
@@ -295,5 +508,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/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.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>;