@nocobase/plugin-flow-engine 2.0.0-alpha.19 → 2.0.0-alpha.20

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.19",
+  "@nocobase/client": "2.0.0-alpha.20",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-alpha.19",
-  "@nocobase/data-source-manager": "2.0.0-alpha.19",
-  "@nocobase/resourcer": "2.0.0-alpha.19",
-  "@nocobase/server": "2.0.0-alpha.19",
-  "@nocobase/cache": "2.0.0-alpha.19",
-  "@nocobase/utils": "2.0.0-alpha.19",
-  "@nocobase/plugin-localization": "2.0.0-alpha.19",
-  "@nocobase/actions": "2.0.0-alpha.19"
+  "@nocobase/database": "2.0.0-alpha.20",
+  "@nocobase/data-source-manager": "2.0.0-alpha.20",
+  "@nocobase/resourcer": "2.0.0-alpha.20",
+  "@nocobase/server": "2.0.0-alpha.20",
+  "@nocobase/cache": "2.0.0-alpha.20",
+  "@nocobase/utils": "2.0.0-alpha.20",
+  "@nocobase/plugin-localization": "2.0.0-alpha.20",
+  "@nocobase/actions": "2.0.0-alpha.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":"2025-10-22T07:27:54.387Z"}
+{"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":"2025-10-23T00:53:44.685Z"}

package/dist/server/variables/registry.js

@@ -194,13 +194,14 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
       submodule: "variables.resolve",
       method: "fetchRecordWithRequestCache"
     });
-    log == null ? void 0 : log.debug("[variables.resolve] fetchRecordWithRequestCache error", {
+    const errMsg = e instanceof Error ? e.message : String(e);
+    log == null ? void 0 : log.warn("[variables.resolve] fetchRecordWithRequestCache error", {
       ds: dataSourceKey,
       collection,
       tk: filterByTk,
       fields,
       appends,
-      error: (e == null ? void 0 : e.message) || String(e)
+      error: errMsg
     });
     return void 0;
   }
@@ -261,29 +262,34 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
       segmentMap.set(seg, arr);
     }
     const segEntries = Array.from(segmentMap.entries());
-    const recordChildren = segEntries.filter(([seg]) => {
+    const oneLevelRecordChildren = segEntries.filter(([seg]) => {
       const idx = parseIndexSegment(seg);
       const nestedObj = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0);
       const dotted = (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
       return isRecordParams(nestedObj) || isRecordParams(dotted);
     });
-    if (!recordChildren.length) continue;
+    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 subContext = new import_contexts.ServerBaseContext();
-        for (const [seg, remainders] of recordChildren) {
-          const idx = parseIndexSegment(seg);
-          const recordParams = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0) ?? (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
-          let effRemainders = remainders.filter((r) => !!r);
-          if (!effRemainders.length) {
-            const all = usedPaths.map(
-              (p) => p.startsWith(`${seg}.`) ? p.slice(seg.length + 1) : p.startsWith(`${seg}[`) ? p.slice(seg.length) : ""
-            ).filter((x) => !!x);
-            if (all.length) effRemainders = all;
-          }
-          const { generatedAppends, generatedFields } = inferSelectsFromUsage(effRemainders, recordParams);
-          const definitionKey = idx ?? seg;
-          subContext.defineProperty(definitionKey, {
+        const root = new import_contexts.ServerBaseContext();
+        const definedFirstLevel = /* @__PURE__ */ new Set();
+        const defineRecordGetter = (container, key, recordParams, subPaths = []) => {
+          const { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
+          container.defineProperty(key, {
             get: async () => {
               const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
               return await fetchRecordWithRequestCache(
@@ -297,8 +303,54 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
             },
             cache: true
           });
+        };
+        const subContainers = /* @__PURE__ */ new Map();
+        const ensureSubContainer = (parent, key) => {
+          let map = subContainers.get(parent);
+          if (!map) {
+            map = /* @__PURE__ */ new Map();
+            subContainers.set(parent, map);
+          }
+          let child = map.get(key);
+          if (!child) {
+            const inst = new import_contexts.ServerBaseContext();
+            parent.defineProperty(key, { get: () => inst.createProxy(), cache: true });
+            map.set(key, inst);
+            child = inst;
+          }
+          return child;
+        };
+        for (const [seg, remainders] of oneLevelRecordChildren) {
+          const idx = parseIndexSegment(seg);
+          const recordParams = import_lodash.default.get(contextParams, [varName, seg]) ?? (idx ? import_lodash.default.get(contextParams, [varName, idx]) : void 0) ?? (contextParams || {})[`${varName}.${seg}`] ?? (idx ? (contextParams || {})[`${varName}.${idx}`] : void 0);
+          let effRemainders = (remainders || []).filter((r) => !!r);
+          if (!effRemainders.length) {
+            const all = usedPaths.map(
+              (p) => p.startsWith(`${seg}.`) ? p.slice(seg.length + 1) : p.startsWith(`${seg}[`) ? p.slice(seg.length) : ""
+            ).filter((x) => !!x);
+            if (all.length) effRemainders = all;
+          }
+          defineRecordGetter(root, idx ?? seg, recordParams, effRemainders);
+          definedFirstLevel.add(idx ?? seg);
+        }
+        for (const [relative, recordParams] of deepRecordMap.entries()) {
+          const segs = String(relative).split(".").filter(Boolean);
+          if (segs.length === 0) continue;
+          const first = segs[0];
+          let container;
+          if (definedFirstLevel.has(first)) {
+            continue;
+          } else {
+            container = root;
+            for (let i = 0; i < segs.length - 1; i++) {
+              container = ensureSubContainer(container, segs[i]);
+            }
+          }
+          const leaf = segs[segs.length - 1];
+          const subPaths = (usedPaths || []).map((p) => p === relative ? "" : p.startsWith(relative + ".") ? p.slice(relative.length + 1) : "").filter((x) => x !== "");
+          defineRecordGetter(container, leaf, recordParams, subPaths);
         }
-        return subContext.createProxy();
+        return root.createProxy();
       },
       cache: true
     });

package/package.json

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