@nocobase/plugin-flow-engine 2.0.0-beta.2 → 2.0.0-beta.20

package/dist/externalVersion.js

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

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-01-04T03:43:16.826Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-02-05T04:38:23.535Z"}

package/dist/server/template/resolver.js

@@ -78,14 +78,18 @@ async function replacePlaceholders(input, ctx) {
 async function evaluate(expr, ctx) {
   try {
     const raw = expr.trim();
-    const dotOnly = raw.match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)*)$/);
+    const dotOnly = raw.match(
+      /^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\.([a-zA-Z_$][a-zA-Z0-9_$-]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$-]*)*))?$/
+    );
     if (dotOnly) {
-      const path = dotOnly[1];
-      const segs = path.split(".");
-      const first = segs.shift();
+      const first = dotOnly[1];
+      const rest = dotOnly[2];
       const base = await ctx[first];
-      if (!segs.length) return base;
-      return await asyncGetValuesByPath(base, segs.join("."));
+      if (!rest) return base;
+      const resolved = await asyncGetValuesByPath(base, rest);
+      if (typeof resolved !== "undefined" || !rest.includes("-")) {
+        return resolved;
+      }
     }
     const transformed = preprocessExpression(raw);
     const compartment = new Compartment({

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

@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+type FilterTargetKey = string | string[] | undefined;
+/**
+ * 为了：
+ * - 关联加载/缓存：fields 模式下确保包含主键
+ * - filterByTk 为数组时：尽量包含 filterTargetKey，以便按输入顺序对齐结果
+ *
+ * 该函数只返回“建议追加”的 key 字段（不会决定是否追加，由调用方根据是否启用 fields 决定）。
+ */
+export declare function getExtraKeyFieldsForSelect(filterByTk: unknown, options: {
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+    rawAttributes?: Record<string, unknown>;
+}): string[];
+export declare function mergeFieldsWithExtras(fields?: string[], extras?: string[]): string[] | undefined;
+/**
+ * 根据 filterByTk 类型（单值/数组）查询并返回 JSON 数据：
+ * - 单值：返回 object | undefined
+ * - 数组：返回 array（空数组时返回 []，不会退化为无条件查询）
+ */
+export declare function fetchRecordOrRecordsJson(repo: any, params: {
+    filterByTk: unknown;
+    preferFullRecord?: boolean;
+    fields?: string[];
+    appends?: string[];
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+}): Promise<unknown>;
+export {};

package/dist/server/variables/records.js

@@ -0,0 +1,120 @@
+/**
+ * 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 records_exports = {};
+__export(records_exports, {
+  fetchRecordOrRecordsJson: () => fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect: () => getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras: () => mergeFieldsWithExtras
+});
+module.exports = __toCommonJS(records_exports);
+function uniqStrings(list) {
+  return Array.from(new Set(list));
+}
+function isPrimitiveTkArray(arr) {
+  return arr.every((v) => typeof v === "string" || typeof v === "number");
+}
+function getOrderKey(options) {
+  if (typeof options.filterTargetKey === "string") return options.filterTargetKey;
+  if (options.pkIsValid && options.pkAttr) return options.pkAttr;
+  return void 0;
+}
+function getExtraKeyFieldsForSelect(filterByTk, options) {
+  const extra = [];
+  if (options.pkIsValid && options.pkAttr) {
+    extra.push(options.pkAttr);
+  }
+  if (Array.isArray(filterByTk) && filterByTk.length > 0) {
+    const tkKeys = typeof options.filterTargetKey === "string" ? [options.filterTargetKey] : Array.isArray(options.filterTargetKey) ? options.filterTargetKey : [];
+    if (options.rawAttributes) {
+      for (const k of tkKeys) {
+        if (k && Object.prototype.hasOwnProperty.call(options.rawAttributes, k)) {
+          extra.push(k);
+        }
+      }
+    }
+  }
+  return uniqStrings(extra);
+}
+function mergeFieldsWithExtras(fields, extras = []) {
+  if (!Array.isArray(fields) || fields.length === 0 || extras.length === 0) return fields;
+  return uniqStrings([...fields, ...extras]);
+}
+function toJsonArray(rows) {
+  if (!Array.isArray(rows)) return [];
+  return rows.map((r) => (r == null ? void 0 : r.toJSON) ? r.toJSON() : r);
+}
+function reorderRecordsByFilterByTk(records, filterByTk, options) {
+  if (!Array.isArray(filterByTk) || filterByTk.length === 0) return records;
+  if (!isPrimitiveTkArray(filterByTk)) return records;
+  const orderKey = getOrderKey(options);
+  if (!orderKey) return records;
+  const map = /* @__PURE__ */ new Map();
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    if (typeof k !== "undefined" && k !== null) {
+      map.set(String(k), rec);
+    }
+  }
+  const ordered = [];
+  const used = /* @__PURE__ */ new Set();
+  for (const tk of filterByTk) {
+    const k = String(tk);
+    const rec = map.get(k);
+    if (typeof rec !== "undefined") {
+      ordered.push(rec);
+      used.add(k);
+    }
+  }
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    const ks = typeof k === "undefined" || k === null ? void 0 : String(k);
+    if (!ks || used.has(ks)) continue;
+    ordered.push(rec);
+  }
+  return ordered;
+}
+async function fetchRecordOrRecordsJson(repo, params) {
+  const { filterByTk, preferFullRecord, fields, appends } = params;
+  if (Array.isArray(filterByTk)) {
+    if (filterByTk.length === 0) return [];
+    const rows = await repo.find(
+      preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+    );
+    const jsonArr = toJsonArray(rows);
+    return reorderRecordsByFilterByTk(jsonArr, filterByTk, params);
+  }
+  const rec = await repo.findOne(
+    preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+  );
+  return rec ? rec.toJSON() : void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras
+});

package/dist/server/variables/registry.js

@@ -44,6 +44,7 @@ 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) {
@@ -129,7 +130,7 @@ 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, preferFullRecord, associationName, sourceId) {
+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({
@@ -150,8 +151,17 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
     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 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",
@@ -168,40 +178,41 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
       if (cache.has(key)) {
         return cache.get(key);
       }
-      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 || parsed.assoc !== keyObj.assoc || 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;
+      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;
           }
-          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;
         }
       }
     }
-    const rec = await repo.findOne(
-      preferFullRecord ? {
-        filterByTk
-      } : {
-        filterByTk,
-        fields: fieldsWithPk,
-        appends
-      }
-    );
-    const json = rec ? rec.toJSON() : void 0;
+    const json = await (0, import_records.fetchRecordOrRecordsJson)(repo, {
+      filterByTk,
+      preferFullRecord,
+      fields: fieldsWithExtras,
+      appends,
+      filterTargetKey,
+      pkAttr,
+      pkIsValid
+    });
     if (cache) cache.set(key, json);
     return json;
   } catch (e) {
@@ -233,12 +244,37 @@ 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 hasDirectRefTop = (usedPaths || []).some((p) => p === "");
+      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";
+          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,
@@ -246,17 +282,69 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
             generatedFields,
             generatedAppends
           );
-          return await fetchRecordWithRequestCache(
+          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
       });
@@ -295,27 +383,16 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
       const dotted = (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
       return isRecordParams(nestedObj) || isRecordParams(dotted);
     });
-    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 root = new import_contexts.ServerBaseContext();
         const definedFirstLevel = /* @__PURE__ */ new Set();
         const defineRecordGetter = (container, key, recordParams, subPaths = [], preferFull) => {
-          const { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
+          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";
@@ -333,6 +410,7 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
                 recordParams.filterByTk,
                 fixed.fields,
                 fixed.appends,
+                strictSelects,
                 preferFull || ((subPaths == null ? void 0 : subPaths.length) ?? 0) === 0,
                 recordParams.associationName,
                 recordParams.sourceId
@@ -416,6 +494,7 @@ function registerBuiltInVariables(reg) {
             uid,
             generatedFields,
             generatedAppends,
+            false,
             void 0,
             void 0,
             void 0

package/dist/server/variables/utils.js

@@ -31,16 +31,30 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_registry = require("./registry");
 var import_selects = require("./selects");
+var import_records = require("./records");
 async function prefetchRecordsForResolve(koaCtx, items) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   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 });
+    const ensureGroup = (dataSourceKey, collection, filterByTk, strictSelects, opts) => {
+      const groupKey = JSON.stringify({
+        ds: dataSourceKey,
+        collection,
+        tk: filterByTk,
+        f: Array.isArray(opts == null ? void 0 : opts.fields) ? [...opts.fields].sort() : void 0,
+        a: Array.isArray(opts == null ? void 0 : opts.appends) ? [...opts.appends].sort() : void 0
+      });
       let group = groupMap.get(groupKey);
       if (!group) {
-        group = { dataSourceKey, collection, filterByTk, fields: /* @__PURE__ */ new Set(), appends: /* @__PURE__ */ new Set() };
+        group = {
+          dataSourceKey,
+          collection,
+          filterByTk,
+          strictSelects,
+          fields: /* @__PURE__ */ new Set(),
+          appends: /* @__PURE__ */ new Set()
+        };
         groupMap.set(groupKey, group);
       }
       return group;
@@ -69,7 +83,19 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         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 explicitFields = recordParams == null ? void 0 : recordParams.fields;
+        const explicitAppends = recordParams == null ? void 0 : recordParams.appends;
+        const hasExplicit = Array.isArray(explicitFields) || Array.isArray(explicitAppends);
+        const group = ensureGroup(dataSourceKey, collection, filterByTk, hasExplicit, {
+          fields: hasExplicit ? explicitFields : void 0,
+          appends: hasExplicit ? explicitAppends : void 0
+        });
+        if (hasExplicit) {
+          const fixed2 = (0, import_selects.adjustSelectsForCollection)(koaCtx, dataSourceKey, collection, explicitFields, explicitAppends);
+          (_c = fixed2.fields) == null ? void 0 : _c.forEach((f) => group.fields.add(f));
+          (_d = fixed2.appends) == null ? void 0 : _d.forEach((a) => group.appends.add(a));
+          continue;
+        }
         let { generatedAppends, generatedFields } = (0, import_registry.inferSelectsFromUsage)(remainders);
         const fixed = (0, import_selects.adjustSelectsForCollection)(koaCtx, dataSourceKey, collection, generatedFields, generatedAppends);
         generatedFields = fixed.fields;
@@ -83,23 +109,37 @@ async function prefetchRecordsForResolve(koaCtx, items) {
     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()) {
+    const cache = (_e = koaCtx.state) == null ? void 0 : _e["__varResolveBatchCache"];
+    for (const { dataSourceKey, collection, filterByTk, strictSelects, 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 modelInfo = (_d = repo.collection) == null ? void 0 : _d.model;
+        const collectionInfo = repo == null ? void 0 : repo.collection;
+        const filterTargetKey = collectionInfo == null ? void 0 : collectionInfo.filterTargetKey;
+        const modelInfo = (_f = repo.collection) == null ? void 0 : _f.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 rawAttributes = (modelInfo == null ? void 0 : modelInfo.rawAttributes) || void 0;
+        const pkIsValid = !!(pkAttr && rawAttributes && Object.prototype.hasOwnProperty.call(rawAttributes, pkAttr));
+        const fldBase = fields.size ? Array.from(fields).sort() : void 0;
+        const extraKeys = (0, import_records.getExtraKeyFieldsForSelect)(filterByTk, {
+          filterTargetKey,
+          pkAttr,
+          pkIsValid,
+          rawAttributes
+        });
+        const effectiveExtras = strictSelects && Array.isArray(extraKeys) && extraKeys.length ? extraKeys.filter((k) => k === pkAttr) : extraKeys;
+        const fld = (0, import_records.mergeFieldsWithExtras)(fldBase, effectiveExtras);
         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;
+        const json = await (0, import_records.fetchRecordOrRecordsJson)(repo, {
+          filterByTk,
+          fields: fld,
+          appends: app,
+          filterTargetKey,
+          pkAttr,
+          pkIsValid
+        });
         if (cache) {
           const key = JSON.stringify({ ds: dataSourceKey, c: collection, tk: filterByTk, f: fld, a: app });
           cache.set(key, json);
@@ -114,7 +154,7 @@ async function prefetchRecordsForResolve(koaCtx, items) {
       }
     }
   } catch (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) });
+    (_i = (_h = (_g = koaCtx.app) == null ? void 0 : _g.logger) == null ? void 0 : _h.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" })) == null ? void 0 : _i.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-beta.2",
+  "version": "2.0.0-beta.20",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
+  "gitHead": "f4ab788fc6c17915157617026dfbba6f0d78eaac"
 }