@nocobase/plugin-flow-engine 2.3.0-alpha.1 → 2.3.0-beta.3

package/dist/server/template/contexts.js

@@ -38,17 +38,21 @@ var contexts_exports = {};
 __export(contexts_exports, {
   GlobalContext: () => GlobalContext,
   HttpRequestContext: () => HttpRequestContext,
+  SERVER_CONTEXT_PROVIDER_TOKEN: () => SERVER_CONTEXT_PROVIDER_TOKEN,
   ServerBaseContext: () => ServerBaseContext
 });
 module.exports = __toCommonJS(contexts_exports);
 var import_lodash = __toESM(require("lodash"));
-const BLOCKED_SANDBOX_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor", "then"]);
+var import_context_keys = require("./context-keys");
+const SERVER_CONTEXT_PROVIDER_TOKEN = Symbol("server-context-provider");
+const PROVIDER_KEYS = /* @__PURE__ */ new Set([...import_context_keys.GLOBAL_CONTEXT_KEYS, ...import_context_keys.HTTP_REQUEST_CONTEXT_KEYS]);
+const INTERNAL_KEYS = new Set(import_context_keys.SERVER_CONTEXT_INTERNAL_KEYS);
+const BLOCKED_SANDBOX_KEYS = /* @__PURE__ */ new Set([...import_context_keys.SERVER_CONTEXT_PROTOTYPE_KEYS, ...import_context_keys.SERVER_CONTEXT_INTERNAL_KEYS]);
 function isBlockedSandboxKey(key) {
   return BLOCKED_SANDBOX_KEYS.has(key);
 }
 class ServerBaseContext {
   _props = {};
-  _methods = {};
   _cache = {};
   _delegates = [];
   _proxy;
@@ -74,10 +78,14 @@ class ServerBaseContext {
    * - get：惰性 getter（默认带缓存）
    * - once：已存在时忽略重复定义
    */
-  defineProperty(key, options) {
+  defineProperty(key, options, providerToken) {
     var _a;
-    if (this._props[key] && ((_a = this._props[key]) == null ? void 0 : _a.once)) return;
-    this._props[key] = options;
+    if (BLOCKED_SANDBOX_KEYS.has(key)) return;
+    if (PROVIDER_KEYS.has(key) && (this instanceof HttpRequestContext || this instanceof GlobalContext) && providerToken !== SERVER_CONTEXT_PROVIDER_TOKEN) {
+      return;
+    }
+    if (((_a = this._props[key]) == null ? void 0 : _a.once) && providerToken !== SERVER_CONTEXT_PROVIDER_TOKEN) return;
+    this._props[key] = providerToken === SERVER_CONTEXT_PROVIDER_TOKEN ? { ...options, once: true } : options;
     delete this._cache[key];
     Object.defineProperty(this, key, {
       configurable: true,
@@ -85,20 +93,9 @@ class ServerBaseContext {
       get: () => this._getOwn(key, this.createProxy())
     });
   }
-  /** 定义一个方法（不可枚举、不可写），访问时会自动绑定到对应实例 */
-  defineMethod(name, fn) {
-    this._methods[name] = fn;
-    Object.defineProperty(this, name, {
-      configurable: true,
-      enumerable: false,
-      writable: false,
-      value: fn
-      // bind at proxy access to keep delegate binding consistent
-    });
-  }
   /**
    * 委托到另一个 ServerBaseContext：
-   * - 访问属性/方法找不到时，会回退到被委托者进行解析
+   * - 访问属性找不到时，会回退到被委托者进行解析
    */
   delegate(ctx) {
     if (!(ctx instanceof ServerBaseContext)) {
@@ -115,9 +112,6 @@ class ServerBaseContext {
     for (const key of Object.keys(this._props)) {
       if (!isBlockedSandboxKey(key)) keys.add(key);
     }
-    for (const key of Object.keys(this._methods)) {
-      if (!isBlockedSandboxKey(key)) keys.add(key);
-    }
     for (const d of this._delegates) {
       for (const key of d.getSandboxKeys()) {
         if (!isBlockedSandboxKey(key)) keys.add(key);
@@ -130,10 +124,6 @@ class ServerBaseContext {
     if (Object.prototype.hasOwnProperty.call(this._props, key)) {
       return this._getOwn(key, current);
     }
-    if (Object.prototype.hasOwnProperty.call(this._methods, key)) {
-      const fn = this._methods[key];
-      return typeof fn === "function" ? fn.bind(this) : fn;
-    }
     for (const d of this._delegates) {
       if (!d.getSandboxKeys().includes(key)) continue;
       return d.getSandboxValue(key, current);
@@ -145,8 +135,11 @@ class ServerBaseContext {
     if (this._proxy) return this._proxy;
     this._proxy = new Proxy(this, {
       get: (target, key, receiver) => {
-        var _a;
         if (typeof key !== "string") return Reflect.get(target, key, receiver);
+        if (import_context_keys.SERVER_CONTEXT_PROTOTYPE_KEYS.includes(key)) {
+          return void 0;
+        }
+        if (INTERNAL_KEYS.has(key) && key.startsWith("_")) return void 0;
         if (Reflect.has(target, key)) {
           const v = Reflect.get(target, key, receiver);
           return typeof v === "function" ? v.bind(target) : v;
@@ -154,28 +147,18 @@ class ServerBaseContext {
         if (Object.prototype.hasOwnProperty.call(target._props, key)) {
           return target._getOwn(key, this.createProxy());
         }
-        if (Object.prototype.hasOwnProperty.call(target._methods, key)) {
-          const fn = target._methods[key];
-          return typeof fn === "function" ? fn.bind(target) : fn;
-        }
         for (const d of target._delegates) {
-          const candidate = (_a = d._getOwn) == null ? void 0 : _a.call(d, key, this.createProxy());
+          const candidate = d.getSandboxValue(key, this.createProxy());
           if (typeof candidate !== "undefined") return candidate;
-          if (Object.prototype.hasOwnProperty.call(d._methods || {}, key)) {
-            const fn = d._methods[key];
-            return typeof fn === "function" ? fn.bind(d) : fn;
-          }
         }
         return void 0;
       },
       has: (target, key) => {
         if (typeof key !== "string") return Reflect.has(target, key);
+        if (isBlockedSandboxKey(key)) return false;
         if (Reflect.has(target, key)) return true;
         if (Object.prototype.hasOwnProperty.call(target._props, key)) return true;
-        if (Object.prototype.hasOwnProperty.call(target._methods, key)) return true;
-        return target._delegates.some(
-          (d) => Object.prototype.hasOwnProperty.call(d._props, key) || Object.prototype.hasOwnProperty.call(d._methods, key)
-        );
+        return target._delegates.some((d) => d.getSandboxKeys().includes(key));
       }
     });
     return this._proxy;
@@ -184,9 +167,9 @@ class ServerBaseContext {
 class GlobalContext extends ServerBaseContext {
   constructor(env) {
     super();
-    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("now", { get: () => (/* @__PURE__ */ new Date()).toISOString(), cache: false }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    this.defineProperty("timestamp", { get: () => Date.now(), cache: false }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    if (env) this.defineProperty("env", { value: filterEnv(env) }, SERVER_CONTEXT_PROVIDER_TOKEN);
   }
 }
 class HttpRequestContext extends ServerBaseContext {
@@ -194,16 +177,24 @@ class HttpRequestContext extends ServerBaseContext {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     super();
     this.koaCtx = koaCtx;
-    this.defineProperty("user", { get: async () => {
-      var _a2, _b2;
-      return (_b2 = (_a2 = this.koaCtx) == null ? void 0 : _a2.auth) == null ? void 0 : _b2.user;
-    }, cache: true });
-    this.defineProperty("roleName", { value: (_b = (_a = this.koaCtx) == null ? void 0 : _a.auth) == null ? void 0 : _b.role });
-    this.defineProperty("locale", { value: (_d = (_c = this.koaCtx) == null ? void 0 : _c.getCurrentLocale) == null ? void 0 : _d.call(_c) });
-    this.defineProperty("ip", { value: ((_f = (_e = this.koaCtx) == null ? void 0 : _e.state) == null ? void 0 : _f.clientIp) || ((_h = (_g = this.koaCtx) == null ? void 0 : _g.request) == null ? void 0 : _h.ip) });
-    this.defineProperty("headers", { value: (_i = this.koaCtx) == null ? void 0 : _i.headers });
-    this.defineProperty("query", { value: (_k = (_j = this.koaCtx) == null ? void 0 : _j.request) == null ? void 0 : _k.query });
-    this.defineProperty("params", { value: import_lodash.default.get(this.koaCtx, "action.params") });
+    this.defineProperty(
+      "user",
+      { get: async () => {
+        var _a2, _b2;
+        return (_b2 = (_a2 = this.koaCtx) == null ? void 0 : _a2.auth) == null ? void 0 : _b2.user;
+      }, cache: true },
+      SERVER_CONTEXT_PROVIDER_TOKEN
+    );
+    this.defineProperty("roleName", { value: (_b = (_a = this.koaCtx) == null ? void 0 : _a.auth) == null ? void 0 : _b.role }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    this.defineProperty("locale", { value: (_d = (_c = this.koaCtx) == null ? void 0 : _c.getCurrentLocale) == null ? void 0 : _d.call(_c) }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    this.defineProperty(
+      "ip",
+      { value: ((_f = (_e = this.koaCtx) == null ? void 0 : _e.state) == null ? void 0 : _f.clientIp) || ((_h = (_g = this.koaCtx) == null ? void 0 : _g.request) == null ? void 0 : _h.ip) },
+      SERVER_CONTEXT_PROVIDER_TOKEN
+    );
+    this.defineProperty("headers", { value: (_i = this.koaCtx) == null ? void 0 : _i.headers }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    this.defineProperty("query", { value: (_k = (_j = this.koaCtx) == null ? void 0 : _j.request) == null ? void 0 : _k.query }, SERVER_CONTEXT_PROVIDER_TOKEN);
+    this.defineProperty("params", { value: import_lodash.default.get(this.koaCtx, "action.params") }, SERVER_CONTEXT_PROVIDER_TOKEN);
   }
 }
 const DEFAULT_ENV_PREFIXES = ["PUBLIC_", "NEXT_PUBLIC_", "NCB_PUBLIC_"];
@@ -224,5 +215,6 @@ function filterEnv(env, allowedPrefixes = DEFAULT_ENV_PREFIXES) {
 0 && (module.exports = {
   GlobalContext,
   HttpRequestContext,
+  SERVER_CONTEXT_PROVIDER_TOKEN,
   ServerBaseContext
 });

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

@@ -7,24 +7,16 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import 'ses';
-export type JSONValue = string | {
+import { type AnalyzedTemplate, type ResolvePathPolicy } from './variable-expression';
+export type JSONValue = string | number | boolean | null | {
     [key: string]: JSONValue;
 } | JSONValue[];
 /**
  * 解析 JSON 模板中形如 {{ ... }} 的占位符（服务端解析）。
- * 仅支持以 ctx 开头的路径与表达式（如：{{ ctx.user.id }}、{{ ctx.record.roles[0].name }}）。
  * 无法解析或不受支持的表达式将原样保留。
- *
- * @param template 要解析的对象/数组/字符串模板
- * @param ctx 变量上下文（实现了所需属性/方法的代理对象）
- * @returns 解析后的结果，与输入结构相同
  */
-export declare function resolveJsonTemplate(template: JSONValue, ctx: any): Promise<any>;
+export declare function resolveJsonTemplate(template: JSONValue, ctx: unknown): Promise<any>;
 /**
- * 将表达式中的 ctx 访问改写为内部 __get 调用。
- * 例如：ctx.user.id + 1 => (await __get('user', '.id')) + 1
- *
- * @param expression 原始表达式字符串
- * @returns 改写后的表达式字符串
+ * 执行已分析的模板。授权、挂载和执行链路应复用同一个 analysis 与 policy。
  */
-export declare function preprocessExpression(expression: string): string;
+export declare function resolveAnalyzedJsonTemplate(analysis: AnalyzedTemplate, ctx: unknown, policy: ResolvePathPolicy): Promise<any>;