@nocobase/plugin-flow-engine 2.0.0-beta.9 → 2.1.0-beta.1

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.9",
+  "version": "2.1.0-beta.1",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "36ef50291e22fe1024c819b8748d51a59a5ea4f8"
+  "gitHead": "de3efeb357b6a98b813f1c14831afa832aed1780"
 }