@nocobase/plugin-flow-engine 2.3.0-alpha.1 → 2.3.0-beta.2

package/dist/server/variables/utils.js

@@ -30,131 +30,70 @@ __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, _h, _i;
+async function prefetchRecordsForResolve(koaCtx, bindings) {
+  var _a, _b, _c, _d;
+  const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" });
   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, 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
+    const groups = /* @__PURE__ */ new Map();
+    for (const binding of bindings) {
+      if (!(0, import_registry.isSafeRecordBinding)(binding)) continue;
+      const target = (0, import_records.resolveRecordTarget)(koaCtx, binding.params);
+      if (!target) continue;
+      const strictSelects = Array.isArray(binding.params.fields) || Array.isArray(binding.params.appends);
+      const key = JSON.stringify({
+        ...target.cacheIdentity,
+        tk: binding.params.filterByTk,
+        strict: strictSelects,
+        f: strictSelects && binding.params.fields ? binding.params.fields.slice().sort() : void 0,
+        a: strictSelects && binding.params.appends ? binding.params.appends.slice().sort() : void 0
       });
-      let group = groupMap.get(groupKey);
+      let group = groups.get(key);
       if (!group) {
         group = {
-          dataSourceKey,
-          collection,
-          filterByTk,
-          strictSelects,
+          appends: /* @__PURE__ */ new Set(),
           fields: /* @__PURE__ */ new Set(),
-          appends: /* @__PURE__ */ new Set()
+          filterByTk: binding.params.filterByTk,
+          preferFullRecord: false,
+          strictSelects,
+          target
         };
-        groupMap.set(groupKey, group);
-      }
-      return group;
-    };
-    const normalizeNestedSeg = (segment) => /^\d+$/.test(segment) ? `[${segment}]` : segment;
-    for (const it of items) {
-      const template = (it == null ? void 0 : it.template) ?? {};
-      const contextParams = (it == null ? void 0 : it.contextParams) || {};
-      const usage = import_registry.variables.extractUsage(template);
-      for (const [cpKey, recordParams] of Object.entries(contextParams)) {
-        const parts = String(cpKey).split(".");
-        const varName = parts[0];
-        const nestedSeg = parts.slice(1).join(".");
-        const paths = (usage == null ? void 0 : usage[varName]) || [];
-        if (!paths.length) continue;
-        const segNorm = nestedSeg ? normalizeNestedSeg(nestedSeg) : "";
-        const remainders = [];
-        for (const p of paths) {
-          if (!segNorm) remainders.push(p);
-          else if (p === segNorm) remainders.push("");
-          else if (p.startsWith(`${segNorm}.`) || p.startsWith(`${segNorm}[`))
-            remainders.push(p.slice(segNorm.length + 1));
-        }
-        if (!remainders.length) continue;
-        const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
-        const collection = recordParams == null ? void 0 : recordParams.collection;
-        const filterByTk = recordParams == null ? void 0 : recordParams.filterByTk;
-        if (!collection || typeof filterByTk === "undefined") continue;
-        const 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;
-        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));
+        groups.set(key, group);
       }
+      const activeGroup = group;
+      activeGroup.preferFullRecord ||= binding.preferFullRecord || binding.relativePaths.some(
+        (path) => path.length === 0 || path.some((segment) => typeof segment === "string" && segment.includes("."))
+      );
+      const selects = strictSelects ? { generatedFields: binding.params.fields, generatedAppends: binding.params.appends } : (0, import_registry.inferSelectsFromUsage)(binding.relativePaths);
+      (_c = selects.generatedFields) == null ? void 0 : _c.forEach((field) => activeGroup.fields.add(field));
+      (_d = selects.generatedAppends) == null ? void 0 : _d.forEach((append) => activeGroup.appends.add(append));
     }
-    if (!groupMap.size) return;
-    const stateObj = koaCtx.state;
-    if (stateObj && !stateObj["__varResolveBatchCache"]) {
-      stateObj["__varResolveBatchCache"] = /* @__PURE__ */ new Map();
-    }
-    const cache = (_e = koaCtx.state) == null ? void 0 : _e["__varResolveBatchCache"];
-    for (const { dataSourceKey, collection, filterByTk, strictSelects, fields, appends } of groupMap.values()) {
+    const cache = (0, import_records.getRecordRequestCache)(koaCtx);
+    for (const group of groups.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 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 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 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);
-        }
-      } catch (e) {
+        const query = (0, import_records.prepareRecordQuery)(
+          koaCtx,
+          group.target,
+          group.filterByTk,
+          group.fields.size ? [...group.fields] : void 0,
+          group.appends.size ? [...group.appends] : void 0,
+          group.strictSelects,
+          group.preferFullRecord
+        );
+        if ((0, import_records.findRecordRequestCacheValue)(cache, query).hit) continue;
+        (0, import_records.setRecordRequestCache)(cache, query, await (0, import_records.fetchRecordOrRecordsJson)(query.repository, query, koaCtx));
+      } catch (error) {
         log == null ? void 0 : log.debug("[variables.resolve] prefetch query error", {
-          ds: dataSourceKey,
-          collection,
-          tk: filterByTk,
-          error: (e == null ? void 0 : e.message) || String(e)
+          ...group.target.cacheIdentity,
+          tk: group.filterByTk,
+          error: error instanceof Error ? error.message : String(error)
         });
       }
     }
-  } catch (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) });
+  } catch (error) {
+    log == null ? void 0 : log.debug("[variables.resolve] prefetch fatal error", {
+      error: error instanceof Error ? error.message : String(error)
+    });
   }
 }
 // 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.3.0-alpha.1",
+  "version": "2.3.0-beta.2",
   "main": "./dist/server/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -26,5 +26,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2"
+  "gitHead": "2e5b43a39d3f3e7cff58cb5e5a36a8c8e599dfb5"
 }