@nocobase/flow-engine 2.0.0-beta.11 → 2.0.0-beta.13

package/lib/JSRunner.d.ts

@@ -11,6 +11,12 @@ export interface JSRunnerOptions {
     timeoutMs?: number;
     globals?: Record<string, any>;
     version?: string;
+    /**
+     * Enable RunJS template compatibility preprocessing for `{{ ... }}`.
+     * When enabled via `ctx.runjs(code, vars, { preprocessTemplates: true })` (default),
+     * the code will be rewritten to call `ctx.resolveJsonTemplate(...)` at runtime.
+     */
+    preprocessTemplates?: boolean;
 }
 export declare class JSRunner {
     private globals;

package/lib/JSRunner.js

@@ -62,7 +62,8 @@ const _JSRunner = class _JSRunner {
    * 异步运行代码，带错误处理和超时机制
    */
   async run(code) {
-    if (location == null ? void 0 : location.search.includes("skipRunJs=true")) {
+    const search = typeof location !== "undefined" ? location.search : void 0;
+    if (typeof search === "string" && search.includes("skipRunJs=true")) {
       return { success: true, value: null };
     }
     const wrapped = `(async () => {

package/lib/acl/Acl.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,13 +26,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Acl_exports = {};
 __export(Acl_exports, {
   ACL: () => ACL
 });
 module.exports = __toCommonJS(Acl_exports);
-var import_lodash = require("lodash");
+var import_lodash = __toESM(require("lodash"));
 const _ACL = class _ACL {
   constructor(flowEngine) {
     this.flowEngine = flowEngine;
@@ -43,10 +53,10 @@ const _ACL = class _ACL {
   // 记录上一次用于鉴权的 token，用于识别登录态变更
   lastToken = null;
   setData(data) {
-    this.data = data;
+    this.data = import_lodash.default.cloneDeep(data);
   }
   setMeta(data) {
-    this.meta = data;
+    this.meta = import_lodash.default.cloneDeep(data);
   }
   async load() {
     var _a, _b, _c, _d;

package/lib/components/settings/wrappers/component/SwitchWithTitle.js

@@ -73,7 +73,8 @@ const SwitchWithTitle = (0, import_reactive.observer)(
       setChecked(val);
       onChange == null ? void 0 : onChange({ [itemKey]: val });
     }, "handleChange");
-    const handleWrapperClick = /* @__PURE__ */ __name(() => {
+    const handleWrapperClick = /* @__PURE__ */ __name((e) => {
+      e.stopPropagation();
       if (disabled) return;
       handleChange(!checked);
     }, "handleWrapperClick");

package/lib/components/settings/wrappers/contextual/DefaultSettingsIcon.js

@@ -153,6 +153,9 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
   const [visible, setVisible] = (0, import_react.useState)(false);
   const [refreshTick, setRefreshTick] = (0, import_react.useState)(0);
   const [extraMenuItems, setExtraMenuItems] = (0, import_react.useState)([]);
+  const closeDropdown = (0, import_react.useCallback)(() => {
+    setVisible(false);
+  }, []);
   const handleOpenChange = (0, import_react.useCallback)((nextOpen, info) => {
     if (info.source === "trigger" || nextOpen) {
       (0, import_react.startTransition)(() => {
@@ -249,6 +252,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
     [model, copyUidToClipboard]
   );
   const handleDelete = (0, import_react.useCallback)(() => {
+    closeDropdown();
     import_antd.Modal.confirm({
       title: t("Confirm delete"),
       icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ExclamationCircleOutlined, null),
@@ -269,7 +273,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
         }
       }
     });
-  }, [model]);
+  }, [closeDropdown, model, t]);
   const handleStepConfiguration = (0, import_react.useCallback)(
     (key) => {
       const keyParts = key.split(":");
@@ -294,6 +298,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
         [flowKey, stepKey] = keyParts;
       }
       try {
+        closeDropdown();
         targetModel.openFlowSettings({
           flowKey,
           stepKey
@@ -302,23 +307,26 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
         console.log(t("Configuration popup cancelled or error"), ":", error);
       }
     },
-    [model]
+    [closeDropdown, model, t]
   );
   const handleMenuClick = (0, import_react.useCallback)(
     ({ key }) => {
       const originalKey = key;
       const cleanKey = key.includes("-") && /^(.+)-\d+$/.test(key) ? key.replace(/-\d+$/, "") : key;
       if (cleanKey.startsWith("copy-pop-uid:")) {
+        closeDropdown();
         handleCopyPopupUid(cleanKey);
         return;
       }
       const extra = extraMenuItems.find((it) => (it == null ? void 0 : it.key) === originalKey || (it == null ? void 0 : it.key) === cleanKey);
       if (extra == null ? void 0 : extra.onClick) {
+        closeDropdown();
         extra.onClick();
         return;
       }
       switch (cleanKey) {
         case "copy-uid":
+          closeDropdown();
           handleCopyUid();
           break;
         case "delete":
@@ -329,7 +337,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
           break;
       }
     },
-    [handleCopyUid, handleDelete, handleStepConfiguration, handleCopyPopupUid, extraMenuItems]
+    [closeDropdown, handleCopyUid, handleDelete, handleStepConfiguration, handleCopyPopupUid, extraMenuItems]
   );
   const getModelConfigurableFlowsAndSteps = (0, import_react.useCallback)(
     async (targetModel, modelKey) => {

package/lib/executor/FlowExecutor.js

@@ -238,7 +238,6 @@ const _FlowExecutor = class _FlowExecutor {
     });
     return Promise.resolve(stepResults);
   }
-  // runAutoFlows 已移除：统一通过 dispatchEvent('beforeRender') + useCache 控制
   /**
    * Dispatch an event to flows bound via flow.on and execute them.
    */
@@ -279,10 +278,17 @@ const _FlowExecutor = class _FlowExecutor {
       if (typeof on === "object") return on.eventName === eventName;
       return false;
     });
+    const isRouterReplayClick = eventName === "click" && (inputArgs == null ? void 0 : inputArgs.triggerByRouter) === true;
+    const flowsToRun = isRouterReplayClick ? flows.filter((flow) => {
+      var _a2;
+      const reg = flow["flowRegistry"];
+      const type = (_a2 = reg == null ? void 0 : reg.constructor) == null ? void 0 : _a2._type;
+      return type !== "instance";
+    }) : flows;
     const scheduledCancels = [];
     const execute = /* @__PURE__ */ __name(async () => {
       if (sequential) {
-        const flowsWithIndex = flows.map((f, i) => ({ f, i }));
+        const flowsWithIndex = flowsToRun.map((f, i) => ({ f, i }));
         const ordered = flowsWithIndex.slice().sort((a, b) => {
           var _a2, _b2;
           const regA = a.f["flowRegistry"];
@@ -396,7 +402,7 @@ const _FlowExecutor = class _FlowExecutor {
         return results2;
       }
       const results = await Promise.all(
-        flows.map(async (flow) => {
+        flowsToRun.map(async (flow) => {
           logger.debug(`BaseModel '${model.uid}' dispatching event '${eventName}' to flow '${flow.key}'.`);
           try {
             return await this.runFlow(model, flow.key, inputArgs, runId, eventName);

package/lib/flowContext.d.ts

@@ -147,7 +147,7 @@ declare class BaseFlowEngineContext extends FlowContext {
     dataSourceManager: DataSourceManager;
     requireAsync: (url: string) => Promise<any>;
     importAsync: (url: string) => Promise<any>;
-    createJSRunner: (options?: JSRunnerOptions) => JSRunner;
+    createJSRunner: (options?: JSRunnerOptions) => Promise<JSRunner>;
     pageInfo: {
         version?: 'v1' | 'v2';
     };
@@ -172,6 +172,7 @@ declare class BaseFlowEngineContext extends FlowContext {
     location: Location;
     sql: FlowSQLRepository;
     logger: pino.Logger;
+    constructor();
 }
 declare class BaseFlowModelContext extends BaseFlowEngineContext {
     model: FlowModel;

package/lib/flowContext.js

@@ -74,6 +74,7 @@ var import_utils = require("./utils");
 var import_exceptions = require("./utils/exceptions");
 var import_params_resolvers = require("./utils/params-resolvers");
 var import_serverContextParams = require("./utils/serverContextParams");
+var import_variablesParams = require("./utils/variablesParams");
 var import_registry = require("./runjs-context/registry");
 var import_createEphemeralContext = require("./utils/createEphemeralContext");
 var import_dayjs = __toESM(require("dayjs"));
@@ -96,6 +97,50 @@ function filterBuilderOutputByPaths(built, neededPaths) {
   return void 0;
 }
 __name(filterBuilderOutputByPaths, "filterBuilderOutputByPaths");
+function topLevelOf(subPath) {
+  if (!subPath) return void 0;
+  const m = String(subPath).match(/^([^.[]+)/);
+  return m == null ? void 0 : m[1];
+}
+__name(topLevelOf, "topLevelOf");
+function inferSelectsFromUsage(paths = []) {
+  if (!Array.isArray(paths) || paths.length === 0) {
+    return { generatedAppends: void 0, generatedFields: void 0 };
+  }
+  const appendSet = /* @__PURE__ */ new Set();
+  const fieldSet = /* @__PURE__ */ new Set();
+  const normalizePath = /* @__PURE__ */ __name((raw) => {
+    if (!raw) return "";
+    let s = String(raw);
+    s = s.replace(/\[(?:\d+)\]/g, "");
+    s = s.replace(/\[(?:"((?:[^"\\]|\\.)*)"|'((?:[^'\\]|\\.)*)')\]/g, (_m, g1, g2) => `.${g1 || g2}`);
+    s = s.replace(/\.\.+/g, ".");
+    s = s.replace(/^\./, "").replace(/\.$/, "");
+    return s;
+  }, "normalizePath");
+  for (let path of paths) {
+    if (!path) continue;
+    while (/^\[(\d+)\](\.|$)/.test(path)) {
+      path = path.replace(/^\[(\d+)\]\.?/, "");
+    }
+    const norm = normalizePath(path);
+    if (!norm) continue;
+    const segments = norm.split(".").filter(Boolean);
+    if (segments.length === 0) continue;
+    if (segments.length === 1) {
+      fieldSet.add(segments[0]);
+      continue;
+    }
+    for (let i = 0; i < segments.length - 1; i++) {
+      appendSet.add(segments.slice(0, i + 1).join("."));
+    }
+    fieldSet.add(segments.join("."));
+  }
+  const generatedAppends = appendSet.size ? Array.from(appendSet) : void 0;
+  const generatedFields = fieldSet.size ? Array.from(fieldSet) : void 0;
+  return { generatedAppends, generatedFields };
+}
+__name(inferSelectsFromUsage, "inferSelectsFromUsage");
 const _FlowContext = class _FlowContext {
   constructor() {
     __privateAdd(this, _FlowContext_instances);
@@ -670,6 +715,23 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
 __name(_FlowContext, "FlowContext");
 let FlowContext = _FlowContext;
 const _BaseFlowEngineContext = class _BaseFlowEngineContext extends FlowContext {
+  constructor() {
+    super();
+    this.defineMethod(
+      "runjs",
+      async function(code, variables, options) {
+        const { preprocessTemplates, ...runnerOptions } = options || {};
+        const mergedGlobals = { ...(runnerOptions == null ? void 0 : runnerOptions.globals) || {}, ...variables || {} };
+        const runner = await this.createJSRunner({
+          ...runnerOptions || {},
+          globals: mergedGlobals
+        });
+        const shouldPreprocessTemplates = preprocessTemplates !== false;
+        const jsCode = await (0, import_utils.prepareRunJsCode)(String(code ?? ""), { preprocessTemplates: shouldPreprocessTemplates });
+        return runner.run(jsCode);
+      }
+    );
+  }
 };
 __name(_BaseFlowEngineContext, "BaseFlowEngineContext");
 let BaseFlowEngineContext = _BaseFlowEngineContext;
@@ -706,14 +768,6 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
     this.defineMethod("t", (keyOrTemplate, options) => {
       return i18n.translate(keyOrTemplate, options);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const mergedGlobals = { ...(options == null ? void 0 : options.globals) || {}, ...variables || {} };
-      const runner = await this.createJSRunner({
-        ...options || {},
-        globals: mergedGlobals
-      });
-      return runner.run(code);
-    });
     this.defineMethod("renderJson", function(template) {
       return this.resolveJsonTemplate(template);
     });
@@ -745,6 +799,21 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       const needServer = Object.keys(serverVarPaths).length > 0;
       let serverResolved = template;
       if (needServer) {
+        const inferRecordRefWithMeta = /* @__PURE__ */ __name((ctx) => {
+          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+          const ref = (0, import_variablesParams.inferRecordRef)(ctx);
+          if (ref) return ref;
+          try {
+            const tk = (_b2 = (_a2 = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _a2.getMeta) == null ? void 0 : _b2.call(_a2, "currentFilterByTk");
+            if (typeof tk === "undefined" || tk === null) return void 0;
+            const collection = ((_c = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _c.name) || ((_j = (_i = (_h = (_g = (_f = (_e = (_d = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _d.getResourceName) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.split) == null ? void 0 : _g.call(_f, ".")) == null ? void 0 : _h.slice) == null ? void 0 : _i.call(_h, -1)) == null ? void 0 : _j[0]);
+            if (!collection) return void 0;
+            const dataSourceKey = ((_k = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _k.dataSourceKey) || ((_m = (_l = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _l.getDataSourceKey) == null ? void 0 : _m.call(_l));
+            return { collection, dataSourceKey, filterByTk: tk };
+          } catch (_2) {
+            return void 0;
+          }
+        }, "inferRecordRefWithMeta");
         const collectFromMeta = /* @__PURE__ */ __name(async () => {
           var _a2;
           const out = {};
@@ -780,6 +849,43 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         }, "collectFromMeta");
         const inputFromMeta = await collectFromMeta();
         const autoInput = { ...inputFromMeta };
+        try {
+          const varName = "formValues";
+          const neededPaths = serverVarPaths[varName] || [];
+          if (neededPaths.length) {
+            const requiredTop = /* @__PURE__ */ new Set();
+            for (const p of neededPaths) {
+              const top = topLevelOf(p);
+              if (top) requiredTop.add(top);
+            }
+            const metaOut = inputFromMeta == null ? void 0 : inputFromMeta[varName];
+            const builtTop = /* @__PURE__ */ new Set();
+            if (metaOut && typeof metaOut === "object" && !Array.isArray(metaOut) && !isRecordRefLike(metaOut)) {
+              Object.keys(metaOut).forEach((k) => builtTop.add(k));
+            }
+            const missing = [...requiredTop].filter((k) => !builtTop.has(k));
+            if (missing.length) {
+              const ref = inferRecordRefWithMeta(this);
+              if (ref) {
+                const { generatedFields, generatedAppends } = inferSelectsFromUsage(neededPaths);
+                const recordRef = {
+                  ...ref,
+                  fields: generatedFields,
+                  appends: generatedAppends
+                };
+                const existing = autoInput[varName];
+                if (existing && typeof existing === "object" && !Array.isArray(existing) && !isRecordRefLike(existing)) {
+                  for (const [k, v] of Object.entries(existing)) {
+                    autoInput[`${varName}.${k}`] = v;
+                  }
+                  delete autoInput[varName];
+                }
+                autoInput[varName] = recordRef;
+              }
+            }
+          }
+        } catch (_2) {
+        }
         const autoContextParams = Object.keys(autoInput).length ? (0, import_serverContextParams.buildServerContextParams)(this, autoInput) : void 0;
         if (!autoContextParams) {
           const keys = Object.keys(serverVarPaths);
@@ -964,11 +1070,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       }
       const version = (options == null ? void 0 : options.version) || "v1";
       const modelClass = (0, import_registry.getModelClassName)(this);
-      const Ctor = import_registry.RunJSContextRegistry.resolve(version, modelClass) || import_registry.RunJSContextRegistry.resolve(version, "*") || FlowRunJSContext;
-      let runCtx;
-      if (Ctor) {
-        runCtx = new Ctor(this);
-      }
+      const Ctor = import_registry.RunJSContextRegistry.resolve(version, modelClass) || FlowRunJSContext;
+      const runCtx = new Ctor(this);
       const globals = { ctx: runCtx, ...(options == null ? void 0 : options.globals) || {} };
       const { timeoutMs } = options || {};
       return new import_JSRunner.JSRunner({ globals, timeoutMs });
@@ -1045,13 +1148,6 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
     this.defineMethod("onRefReady", (ref, cb, timeout) => {
       this.engine.reactView.onRefReady(ref, cb, timeout);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
     this.defineProperty("model", {
       value: model
     });
@@ -1183,13 +1279,6 @@ const _FlowForkModelContext = class _FlowForkModelContext extends BaseFlowModelC
         return stableRef;
       }, "get")
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
   }
 };
 __name(_FlowForkModelContext, "FlowForkModelContext");
@@ -1234,13 +1323,6 @@ const _FlowRuntimeContext = class _FlowRuntimeContext extends BaseFlowModelConte
     this.defineMethod("onRefReady", (ref, cb, timeout) => {
       this.engine.reactView.onRefReady(ref, cb, timeout);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
   }
   stepResults = {};
   _getOwnProperty(key) {

package/lib/utils/index.d.ts

@@ -21,6 +21,7 @@ export { extractPropertyPath, formatPathToVariable, isVariableExpression } from
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';
 export { createSafeDocument, createSafeWindow, createSafeNavigator } from './safeGlobals';
+export { prepareRunJsCode, preprocessRunJsTemplates } from './runjsTemplateCompat';
 export { createEphemeralContext } from './createEphemeralContext';
 export { pruneFilter } from './pruneFilter';
 export { isBeforeRenderFlow } from './flows';

package/lib/utils/index.js

@@ -58,6 +58,8 @@ __export(utils_exports, {
   isInheritedFrom: () => import_inheritance.isInheritedFrom,
   isVariableExpression: () => import_context.isVariableExpression,
   parsePathnameToViewParams: () => import_parsePathnameToViewParams.parsePathnameToViewParams,
+  prepareRunJsCode: () => import_runjsTemplateCompat.prepareRunJsCode,
+  preprocessRunJsTemplates: () => import_runjsTemplateCompat.preprocessRunJsTemplates,
   pruneFilter: () => import_pruneFilter.pruneFilter,
   resolveCreateModelOptions: () => import_params_resolvers.resolveCreateModelOptions,
   resolveDefaultParams: () => import_params_resolvers.resolveDefaultParams,
@@ -85,6 +87,7 @@ var import_context = require("./context");
 var import_autoFlowError = require("./autoFlowError");
 var import_parsePathnameToViewParams = require("./parsePathnameToViewParams");
 var import_safeGlobals = require("./safeGlobals");
+var import_runjsTemplateCompat = require("./runjsTemplateCompat");
 var import_createEphemeralContext = require("./createEphemeralContext");
 var import_pruneFilter = require("./pruneFilter");
 var import_flows = require("./flows");
@@ -122,6 +125,8 @@ var import_flows = require("./flows");
   isInheritedFrom,
   isVariableExpression,
   parsePathnameToViewParams,
+  prepareRunJsCode,
+  preprocessRunJsTemplates,
   pruneFilter,
   resolveCreateModelOptions,
   resolveDefaultParams,

package/lib/utils/params-resolvers.js

@@ -266,8 +266,9 @@ async function preprocessExpression(expression, ctx) {
 __name(preprocessExpression, "preprocessExpression");
 async function compileExpression(expression, ctx) {
   const matchDotOnly = /* @__PURE__ */ __name((expr) => {
-    const m = expr.trim().match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)*)$/);
-    return m ? m[1] : null;
+    const m = expr.trim().match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\.([a-zA-Z_$][a-zA-Z0-9_$-]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$-]*)*))?$/);
+    if (!m) return null;
+    return m[2] ? `${m[1]}.${m[2]}` : m[1];
   }, "matchDotOnly");
   const resolveDotOnlyPath = /* @__PURE__ */ __name(async (dotPath) => {
     const segs = dotPath.split(".");
@@ -277,20 +278,26 @@ async function compileExpression(expression, ctx) {
     if (segs.length === 0) return base;
     return (0, import_shared.getValuesByPath)(base, segs.join("."));
   }, "resolveDotOnlyPath");
+  const resolveInnerExpression = /* @__PURE__ */ __name(async (innerExpr) => {
+    const dotPath = matchDotOnly(innerExpr);
+    if (dotPath) {
+      const resolved = await resolveDotOnlyPath(dotPath);
+      if (resolved === void 0 && dotPath.includes("-")) {
+        return await processExpression(innerExpr, ctx);
+      }
+      return resolved;
+    }
+    return await processExpression(innerExpr, ctx);
+  }, "resolveInnerExpression");
   const singleMatch = expression.match(/^\s*\{\{\s*([^{}]+?)\s*\}\}\s*$/);
   if (singleMatch) {
     const inner = singleMatch[1];
-    const dotPath = matchDotOnly(inner);
-    if (dotPath) {
-      return await resolveDotOnlyPath(dotPath);
-    }
-    return await processExpression(inner, ctx);
+    return await resolveInnerExpression(inner);
   }
   const matches = [...expression.matchAll(/\{\{\s*(.+?)\s*\}\}/g)];
   let result = expression;
   for (const [fullMatch, innerExpr] of matches) {
-    const dotPath = matchDotOnly(innerExpr);
-    const value = dotPath ? await resolveDotOnlyPath(dotPath) : await processExpression(innerExpr, ctx);
+    const value = await resolveInnerExpression(innerExpr);
     if (value !== void 0) {
       const replacement = typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
       result = result.replace(fullMatch, replacement);

package/lib/utils/runjsTemplateCompat.d.ts

@@ -0,0 +1,35 @@
+/**
+ * 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 PrepareRunJsCodeOptions = {
+    preprocessTemplates?: boolean;
+};
+/**
+ * 预处理 RunJS 源码，兼容旧版 `{{ ... }}` 占位符。
+ *
+ * 注意：这不是“变量解析”（这里不会计算任何值）。
+ * 它会把代码重写为合法的 JS，并在执行期间调用 `ctx.resolveJsonTemplate(...)` 来解析 {{ ... }}。
+ *
+ * 设计说明：
+ * - 为避免出现 “await is only valid in async functions” 之类的语法错误，会把所有模板解析提升到
+ *   RunJS 程序的顶层，再用变量替换各处的出现位置。
+ * - 对于字符串/模板字面量，不在原位置直接包一层 `await ...`。而是保留原字面量表达式，并通过
+ *   一个小 helper 用 `.split().join()` 做替换，以匹配 `resolveJsonTemplate` 对 object/undefined
+ *   的字符串替换行为。
+ */
+export declare function preprocessRunJsTemplates(code: string, options?: {
+    processBarePlaceholders?: boolean;
+    processStringLiterals?: boolean;
+}): string;
+/**
+ * 为执行准备用户的 RunJS 源码。
+ * - 可选：运行时模板兼容重写
+ * - JSX 转换（sucrase），确保 RunJS 可以安全使用 JSX
+ */
+export declare function prepareRunJsCode(code: string, options?: PrepareRunJsCodeOptions): Promise<string>;
+export {};