@nocobase/plugin-flow-engine 2.0.0-alpha.6 → 2.0.0-alpha.60

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>;

package/dist/server/variables/utils.js

@@ -0,0 +1,123 @@
+/**
+ * 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 utils_exports = {};
+__export(utils_exports, {
+  prefetchRecordsForResolve: () => prefetchRecordsForResolve
+});
+module.exports = __toCommonJS(utils_exports);
+var import_registry = require("./registry");
+var import_selects = require("./selects");
+async function prefetchRecordsForResolve(koaCtx, items) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  try {
+    const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" });
+    const groupMap = /* @__PURE__ */ new Map();
+    const ensureGroup = (dataSourceKey, collection, filterByTk) => {
+      const groupKey = JSON.stringify({ ds: dataSourceKey, collection, tk: filterByTk });
+      let group = groupMap.get(groupKey);
+      if (!group) {
+        group = { dataSourceKey, collection, filterByTk, fields: /* @__PURE__ */ new Set(), appends: /* @__PURE__ */ new Set() };
+        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 group = ensureGroup(dataSourceKey, collection, filterByTk);
+        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));
+      }
+    }
+    if (!groupMap.size) return;
+    const stateObj = koaCtx.state;
+    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()) {
+      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 pkAttr = modelInfo == null ? void 0 : modelInfo.primaryKeyAttribute;
+        const pkIsValid = pkAttr && (modelInfo == null ? void 0 : modelInfo.rawAttributes) && Object.prototype.hasOwnProperty.call(modelInfo.rawAttributes, pkAttr);
+        if (fields.size && pkIsValid) {
+          fields.add(pkAttr);
+        }
+        const fld = fields.size ? Array.from(fields).sort() : void 0;
+        const app = appends.size ? Array.from(appends).sort() : void 0;
+        const rec = await repo.findOne({ filterByTk, fields: fld, appends: app });
+        const json = rec ? rec.toJSON() : void 0;
+        if (cache) {
+          const key = JSON.stringify({ ds: dataSourceKey, c: collection, tk: filterByTk, f: fld, a: app });
+          cache.set(key, json);
+        }
+      } catch (e) {
+        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)
+        });
+      }
+    }
+  } 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) });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  prefetchRecordsForResolve
+});

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.60",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "276a65c0656bbace2df7593be0f53c96b7b0725b"
+  "gitHead": "9113d61ce85b60b7ba3d0e5ca64182d92a15ece4"
 }