@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

package/src/utils/params-resolvers.ts

@@ -409,8 +409,13 @@ export async function preprocessExpression(expression: string, ctx: FlowContext)
 async function compileExpression<TModel extends FlowModel = FlowModel>(expression: string, ctx: FlowContext) {
   // 仅点号路径匹配：ctx.a.b.c（不支持括号/函数/索引），用于数组聚合取值
   const matchDotOnly = (expr: string): string | null => {
-    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;
+    // 顶层变量名仍使用 JS 标识符规则（与 ctx.defineProperty 保持一致）；
+    // 子路径允许包含 '-'（例如 formValues.oho-test.o2m-users）。
+    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];
   };
 
   // 基于 getValuesByPath 的聚合取值：支持数组扁平化，仅支持 '.' 访问
@@ -423,6 +428,20 @@ async function compileExpression<TModel extends FlowModel = FlowModel>(expressio
     return getValuesByPath(base as object, segs.join('.'));
   };
 
+  const resolveInnerExpression = async (innerExpr: string): Promise<any> => {
+    const dotPath = matchDotOnly(innerExpr);
+    if (dotPath) {
+      const resolved = await resolveDotOnlyPath(dotPath);
+      // 当 dotPath 含 '-' 时可能与减号运算符存在歧义，例如：ctx.aa.bb-ctx.cc。
+      // 若按 path 解析未取到值，则回退到 JS 表达式解析，尽量保持兼容。
+      if (resolved === undefined && dotPath.includes('-')) {
+        return await processExpression(innerExpr, ctx);
+      }
+      return resolved;
+    }
+    return await processExpression(innerExpr, ctx);
+  };
+
   /**
    * 单个表达式模式匹配
    *
@@ -443,11 +462,7 @@ async function compileExpression<TModel extends FlowModel = FlowModel>(expressio
   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);
   }
 
   /**
@@ -470,8 +485,7 @@ async function compileExpression<TModel extends FlowModel = FlowModel>(expressio
   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 !== undefined) {
       const replacement = typeof value === 'object' && value !== null ? JSON.stringify(value) : String(value);
       result = result.replace(fullMatch, replacement);

package/src/utils/resolveModuleUrl.ts

@@ -0,0 +1,91 @@
+/**
+ * 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.
+ */
+
+/**
+ * 解析模块 URL，将相对路径转换为完整的 CDN URL
+ *
+ * @param url - 模块地址（支持相对路径或完整 URL）
+ * @param options - 可选配置
+ * @param options.addSuffix - 是否添加 ESM_CDN_SUFFIX 后缀（如 `+esm`），默认为 `true`
+ * @returns 解析后的完整 URL
+ *
+ * @example
+ * ```ts
+ * // 相对路径会被拼接上 CDN 前缀和后缀（默认添加）
+ * // 如果使用 esm.sh（默认），不需要后缀
+ * resolveModuleUrl('vue@3.4.0')
+ * // => 'https://esm.sh/vue@3.4.0'
+ *
+ * // 如果使用 jsdelivr，需要配置 ESM_CDN_SUFFIX='/+esm'
+ * // resolveModuleUrl('vue@3.4.0') => 'https://cdn.jsdelivr.net/npm/vue@3.4.0/+esm'
+ *
+ * // 不添加后缀（适用于 UMD 库或 CSS 文件）
+ * resolveModuleUrl('vue@3.4.0', { addSuffix: false })
+ * // => 'https://esm.sh/vue@3.4.0' (即使配置了 suffix 也不会添加)
+ *
+ * // 原始 URL（适用于 UMD 库）
+ * resolveModuleUrl('lodash@4.17.21/lodash.js', { raw: true })
+ * // => 'https://esm.sh/lodash@4.17.21/lodash.js?raw' (即使配置了 suffix 也不会添加)
+ *
+ * // 完整 URL 保持不变
+ * resolveModuleUrl('https://cdn.jsdelivr.net/npm/vue@3.4.0')
+ * // => 'https://cdn.jsdelivr.net/npm/vue@3.4.0'
+ * ```
+ */
+export function resolveModuleUrl(url: string, options?: { addSuffix?: boolean; raw?: boolean }): string {
+  if (!url || typeof url !== 'string') {
+    throw new Error('invalid url');
+  }
+
+  const u = url.trim();
+
+  // 如果是完整 URL（http:// 或 https://），直接返回
+  if (u.startsWith('http://') || u.startsWith('https://')) {
+    return u;
+  }
+
+  // 相对路径：拼接 CDN 前缀和后缀
+  const ESM_CDN_BASE_URL = (window as any)['__esm_cdn_base_url__'] || 'https://esm.sh';
+  const ESM_CDN_SUFFIX = options?.addSuffix ? (window as any)['__esm_cdn_suffix__'] || '' : '';
+
+  // 移除 base URL 末尾的斜杠，移除相对路径开头的斜杠
+  const base = ESM_CDN_BASE_URL.replace(/\/$/, '');
+  const path = u.replace(/^\//, '');
+
+  if (options?.raw) {
+    const sep = path.includes('?') ? '&' : '?';
+    return `${base}/${path}${sep}raw`;
+  }
+
+  return `${base}/${path}${ESM_CDN_SUFFIX}`;
+}
+
+/**
+ * 判断 URL 是否为 CSS 文件
+ *
+ * @param url - 文件 URL（支持带 query 和 hash，如 `example.css?v=123`）
+ * @returns 如果是 CSS 文件返回 `true`，否则返回 `false`
+ *
+ * @example
+ * ```ts
+ * isCssFile('style.css') // => true
+ * isCssFile('style.css?v=123') // => true
+ * isCssFile('style.css#section') // => true
+ * isCssFile('script.js') // => false
+ * ```
+ */
+export function isCssFile(url: string): boolean {
+  if (!url || typeof url !== 'string') {
+    return false;
+  }
+
+  // 去掉 query 和 hash 后判断文件扩展名
+  const pathPart = url.split('?')[0].split('#')[0];
+  return pathPart.endsWith('.css');
+}

package/src/utils/resolveRunJSObjectValues.ts

@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+
+import { isRunJSValue, normalizeRunJSValue } from './runjsValue';
+import { runjsWithSafeGlobals } from './safeGlobals';
+
+/**
+ * Resolve an object's values, executing any RunJSValue entries via ctx.runjs.
+ *
+ * - Skips `undefined` values
+ * - Skips empty RunJS code (treated as not configured)
+ * - Throws when a RunJS execution fails
+ */
+export async function resolveRunJSObjectValues(ctx: unknown, raw: unknown): Promise<Record<string, any>> {
+  const out: Record<string, any> = {};
+
+  if (!raw || typeof raw !== 'object') return out;
+  if (Array.isArray(raw)) return out;
+
+  for (const [key, value] of Object.entries(raw as Record<string, any>)) {
+    if (typeof value === 'undefined') continue;
+
+    if (isRunJSValue(value)) {
+      const { code, version } = normalizeRunJSValue(value);
+      if (!code.trim()) continue;
+      const ret = await runjsWithSafeGlobals(ctx, code, { version });
+      if (!ret?.success) {
+        throw new Error(`RunJS execution failed for "${key}"`);
+      }
+      if (typeof ret.value !== 'undefined') {
+        out[key] = ret.value;
+      }
+      continue;
+    }
+
+    out[key] = value;
+  }
+
+  return out;
+}