@nocobase/plugin-flow-engine 2.0.0-beta.12 → 2.0.0-beta.14

package/dist/externalVersion.js

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

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-16T01:59:26.562Z"}
+{"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-23T00:06:36.516Z"}

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/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) {
@@ -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",
@@ -169,11 +179,11 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
         return cache.get(key);
       }
       if (!strictSelects) {
-        const needFields = !preferFullRecord && Array.isArray(fieldsWithPk) ? [...new Set(fieldsWithPk)] : void 0;
+        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 || parsed.tk !== keyObj.tk || parsed.assoc !== keyObj.assoc || parsed.sid !== keyObj.sid)
+          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 || []);
@@ -194,16 +204,15 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
         }
       }
     }
-    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) {

package/dist/server/variables/utils.js

@@ -31,12 +31,13 @@ __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;
   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, opts) => {
+    const ensureGroup = (dataSourceKey, collection, filterByTk, strictSelects, opts) => {
       const groupKey = JSON.stringify({
         ds: dataSourceKey,
         collection,
@@ -46,7 +47,14 @@ async function prefetchRecordsForResolve(koaCtx, items) {
       });
       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;
@@ -78,7 +86,7 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         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, {
+        const group = ensureGroup(dataSourceKey, collection, filterByTk, hasExplicit, {
           fields: hasExplicit ? explicitFields : void 0,
           appends: hasExplicit ? explicitAppends : void 0
         });
@@ -102,22 +110,36 @@ async function prefetchRecordsForResolve(koaCtx, items) {
       stateObj["__varResolveBatchCache"] = /* @__PURE__ */ new Map();
     }
     const cache = (_e = koaCtx.state) == null ? void 0 : _e["__varResolveBatchCache"];
-    for (const { dataSourceKey, collection, filterByTk, fields, appends } of groupMap.values()) {
+    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 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);

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "184ac65ad8ca60618075936c990dc52addda79b7"
+  "gitHead": "e51bd3f094b93bd8bbb8fa3c6ff0f07fcca2e16d"
 }