@nocobase/plugin-flow-engine 2.1.0-alpha.1 → 2.1.0-alpha.11

package/dist/server/server.d.ts

@@ -7,10 +7,17 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Plugin } from '@nocobase/server';
+import { FlowSchemaContributionCollector, RegisterFlowSchemasOptions } from './flow-models/schema-contribution-collector';
+import { FlowModelValidationFacade } from './flow-models/validation-facade';
+import { FlowSchemaService } from './flow-schema-service';
 export declare const compile: (title: string) => string;
 export declare class PluginUISchemaStorageServer extends Plugin {
+    protected readonly flowSchemaService: FlowSchemaService;
+    protected createFlowSchemaContributionCollector(): FlowSchemaContributionCollector;
+    protected createFlowModelValidationFacade(): FlowModelValidationFacade;
     registerRepository(): void;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
+    registerFlowSchemas(options: RegisterFlowSchemasOptions): void;
 }
 export default PluginUISchemaStorageServer;

package/dist/server/server.js

@@ -44,6 +44,11 @@ module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
+var import_action_handlers = require("./flow-models/action-handlers");
+var import_mutate_executor = require("./flow-models/mutate-executor");
+var import_schema_contribution_collector = require("./flow-models/schema-contribution-collector");
+var import_validation_facade = require("./flow-models/validation-facade");
+var import_flow_schema_service = require("./flow-schema-service");
 var import_model = require("./model");
 var import_repository = __toESM(require("./repository"));
 const compile = (title) => (title || "").replace(/{{\s*t\(["|'|`](.*)["|'|`]\)\s*}}/g, "$1");
@@ -68,6 +73,13 @@ function extractFields(obj) {
   return fields.filter((value) => value !== void 0 && value !== "");
 }
 class PluginUISchemaStorageServer extends import_server.Plugin {
+  flowSchemaService = new import_flow_schema_service.FlowSchemaService();
+  createFlowSchemaContributionCollector() {
+    return new import_schema_contribution_collector.FlowSchemaContributionCollector(this.app, this.flowSchemaService);
+  }
+  createFlowModelValidationFacade() {
+    return new import_validation_facade.FlowModelValidationFacade(this.flowSchemaService, this.app);
+  }
   registerRepository() {
     this.app.db.registerRepositories({
       FlowModelRepository: import_repository.default
@@ -76,8 +88,10 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
   async beforeLoad() {
     const db = this.app.db;
     const pm = this.app.pm;
+    this.flowSchemaService.setApp(this.app);
     this.app.db.registerModels({ MagicAttributeModel: import_database.MagicAttributeModel, FlowSchemaModel: import_model.FlowSchemaModel });
     this.registerRepository();
+    await this.createFlowSchemaContributionCollector().collectPluginFlowSchemaContributions();
     this.app.acl.registerSnippet({
       name: "ui.flowModels",
       actions: ["flowModels:*"]
@@ -123,50 +137,15 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
       const uiSchemaRepository = db.getCollection("flowModels").repository;
       await uiSchemaRepository.remove(model.get("name"), { transaction });
     });
+    this.app.resourceManager.use((0, import_mutate_executor.createFlowModelsMutateTransactionMiddleware)());
     this.app.resourceManager.define({
       name: "flowModels",
-      actions: {
-        findOne: async (ctx, next) => {
-          const { uid: uid2, parentId, subKey, includeAsyncNode = false } = ctx.action.params;
-          const repository = ctx.db.getRepository("flowModels");
-          if (uid2) {
-            ctx.body = await repository.findModelById(uid2, { includeAsyncNode });
-          } else if (parentId) {
-            ctx.body = await repository.findModelByParentId(parentId, { subKey, includeAsyncNode });
-          }
-          await next();
-        },
-        duplicate: async (ctx, next) => {
-          const { uid: uid2 } = ctx.action.params;
-          const repository = ctx.db.getRepository("flowModels");
-          const duplicated = await repository.duplicate(uid2);
-          ctx.body = duplicated;
-          await next();
-        },
-        move: async (ctx, next) => {
-          const { sourceId, targetId, position } = ctx.action.params;
-          const repository = ctx.db.getRepository("flowModels");
-          await repository.move({ sourceId, targetId, position });
-          ctx.body = "ok";
-          await next();
-        },
-        save: async (ctx, next) => {
-          const { values } = ctx.action.params;
-          const repository = ctx.db.getRepository("flowModels");
-          const uid2 = await repository.upsertModel(values);
-          ctx.body = uid2;
-          await next();
-        },
-        destroy: async (ctx, next) => {
-          const { filterByTk } = ctx.action.params;
-          const repository = ctx.db.getRepository("flowModels");
-          await repository.remove(filterByTk);
-          ctx.body = "ok";
-          await next();
-        }
-      }
+      actions: (0, import_action_handlers.createFlowModelActions)({
+        flowSchemaService: this.flowSchemaService,
+        validationFacade: this.createFlowModelValidationFacade()
+      })
     });
-    this.app.acl.allow("flowModels", ["findOne"], "loggedIn");
+    this.app.acl.allow("flowModels", ["findOne", "schema", "schemas", "schemaBundle", "ensure"], "loggedIn");
   }
   async load() {
     const getSourceAndTargetForRemoveAction = async (ctx) => {
@@ -196,6 +175,9 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
       { name: "flowModels:patch", getSourceAndTarget: getSourceAndTargetForPatchAction }
     ]);
   }
+  registerFlowSchemas(options) {
+    this.createFlowSchemaContributionCollector().registerFlowSchemas(options);
+  }
 }
 var server_default = PluginUISchemaStorageServer;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/template/contexts.d.ts

@@ -57,7 +57,6 @@ export declare class ServerBaseContext {
  * 全局上下文：
  * - now/timestamp：时间值（不缓存）
  * - env：环境变量（仅暴露白名单前缀）
- * - date：日期快捷变量集合（包含前天等）
  */
 export declare class GlobalContext extends ServerBaseContext {
     constructor(env?: Record<string, any>);

package/dist/server/template/contexts.js

@@ -42,7 +42,6 @@ __export(contexts_exports, {
 });
 module.exports = __toCommonJS(contexts_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("@nocobase/utils");
 class ServerBaseContext {
   _props = {};
   _methods = {};
@@ -154,10 +153,6 @@ class GlobalContext extends ServerBaseContext {
     this.defineProperty("now", { get: () => (/* @__PURE__ */ new Date()).toISOString(), cache: false });
     this.defineProperty("timestamp", { get: () => Date.now(), cache: false });
     if (env) this.defineProperty("env", { value: filterEnv(env) });
-    this.defineProperty("date", {
-      get: (_ctx) => buildDateVariables(),
-      cache: false
-    });
   }
 }
 class HttpRequestContext extends ServerBaseContext {
@@ -191,40 +186,6 @@ function filterEnv(env, allowedPrefixes = DEFAULT_ENV_PREFIXES) {
     return {};
   }
 }
-function buildDateVariables() {
-  const timezone = getServerTimezone();
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  const base = (0, import_utils.getDateVars)();
-  base.dayBeforeYesterday = (0, import_utils.toUnit)("day", -2);
-  const out = {};
-  for (const [key, val] of Object.entries(base)) {
-    try {
-      out[key] = typeof val === "function" ? val({ timezone, now }) : val;
-    } catch (_2) {
-    }
-  }
-  return out;
-}
-function getServerTimezone() {
-  var _a, _b;
-  const tzEnv = ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.DB_TIMEZONE) || ((_b = process == null ? void 0 : process.env) == null ? void 0 : _b.TZ);
-  if (tzEnv) {
-    const m = tzEnv.match(/^([+-])(\d{1,2}):(\d{2})$/);
-    if (m) {
-      const sign2 = m[1];
-      const hh2 = m[2].padStart(2, "0");
-      const mm2 = m[3];
-      return `${sign2}${hh2}:${mm2}`;
-    }
-    return tzEnv;
-  }
-  const offsetMinutes = -(/* @__PURE__ */ new Date()).getTimezoneOffset();
-  const sign = offsetMinutes >= 0 ? "+" : "-";
-  const abs = Math.abs(offsetMinutes);
-  const hh = String(Math.floor(abs / 60)).padStart(2, "0");
-  const mm = String(abs % 60).padStart(2, "0");
-  return `${sign}${hh}:${mm}`;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   GlobalContext,

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/records.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+type FilterTargetKey = string | string[] | undefined;
+/**
+ * 为了：
+ * - 关联加载/缓存：fields 模式下确保包含主键
+ * - filterByTk 为数组时：尽量包含 filterTargetKey，以便按输入顺序对齐结果
+ *
+ * 该函数只返回“建议追加”的 key 字段（不会决定是否追加，由调用方根据是否启用 fields 决定）。
+ */
+export declare function getExtraKeyFieldsForSelect(filterByTk: unknown, options: {
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+    rawAttributes?: Record<string, unknown>;
+}): string[];
+export declare function mergeFieldsWithExtras(fields?: string[], extras?: string[]): string[] | undefined;
+/**
+ * 根据 filterByTk 类型（单值/数组）查询并返回 JSON 数据：
+ * - 单值：返回 object | undefined
+ * - 数组：返回 array（空数组时返回 []，不会退化为无条件查询）
+ */
+export declare function fetchRecordOrRecordsJson(repo: any, params: {
+    filterByTk: unknown;
+    preferFullRecord?: boolean;
+    fields?: string[];
+    appends?: string[];
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+}): Promise<unknown>;
+export {};

package/dist/server/variables/records.js

@@ -0,0 +1,120 @@
+/**
+ * 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 records_exports = {};
+__export(records_exports, {
+  fetchRecordOrRecordsJson: () => fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect: () => getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras: () => mergeFieldsWithExtras
+});
+module.exports = __toCommonJS(records_exports);
+function uniqStrings(list) {
+  return Array.from(new Set(list));
+}
+function isPrimitiveTkArray(arr) {
+  return arr.every((v) => typeof v === "string" || typeof v === "number");
+}
+function getOrderKey(options) {
+  if (typeof options.filterTargetKey === "string") return options.filterTargetKey;
+  if (options.pkIsValid && options.pkAttr) return options.pkAttr;
+  return void 0;
+}
+function getExtraKeyFieldsForSelect(filterByTk, options) {
+  const extra = [];
+  if (options.pkIsValid && options.pkAttr) {
+    extra.push(options.pkAttr);
+  }
+  if (Array.isArray(filterByTk) && filterByTk.length > 0) {
+    const tkKeys = typeof options.filterTargetKey === "string" ? [options.filterTargetKey] : Array.isArray(options.filterTargetKey) ? options.filterTargetKey : [];
+    if (options.rawAttributes) {
+      for (const k of tkKeys) {
+        if (k && Object.prototype.hasOwnProperty.call(options.rawAttributes, k)) {
+          extra.push(k);
+        }
+      }
+    }
+  }
+  return uniqStrings(extra);
+}
+function mergeFieldsWithExtras(fields, extras = []) {
+  if (!Array.isArray(fields) || fields.length === 0 || extras.length === 0) return fields;
+  return uniqStrings([...fields, ...extras]);
+}
+function toJsonArray(rows) {
+  if (!Array.isArray(rows)) return [];
+  return rows.map((r) => (r == null ? void 0 : r.toJSON) ? r.toJSON() : r);
+}
+function reorderRecordsByFilterByTk(records, filterByTk, options) {
+  if (!Array.isArray(filterByTk) || filterByTk.length === 0) return records;
+  if (!isPrimitiveTkArray(filterByTk)) return records;
+  const orderKey = getOrderKey(options);
+  if (!orderKey) return records;
+  const map = /* @__PURE__ */ new Map();
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    if (typeof k !== "undefined" && k !== null) {
+      map.set(String(k), rec);
+    }
+  }
+  const ordered = [];
+  const used = /* @__PURE__ */ new Set();
+  for (const tk of filterByTk) {
+    const k = String(tk);
+    const rec = map.get(k);
+    if (typeof rec !== "undefined") {
+      ordered.push(rec);
+      used.add(k);
+    }
+  }
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    const ks = typeof k === "undefined" || k === null ? void 0 : String(k);
+    if (!ks || used.has(ks)) continue;
+    ordered.push(rec);
+  }
+  return ordered;
+}
+async function fetchRecordOrRecordsJson(repo, params) {
+  const { filterByTk, preferFullRecord, fields, appends } = params;
+  if (Array.isArray(filterByTk)) {
+    if (filterByTk.length === 0) return [];
+    const rows = await repo.find(
+      preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+    );
+    const jsonArr = toJsonArray(rows);
+    return reorderRecordsByFilterByTk(jsonArr, filterByTk, params);
+  }
+  const rec = await repo.findOne(
+    preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+  );
+  return rec ? rec.toJSON() : void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras
+});

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