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

package/lib/utils/index.js

@@ -29,6 +29,7 @@ __export(utils_exports, {
   BLOCK_GROUP_CONFIGS: () => import_constants.BLOCK_GROUP_CONFIGS,
   BLOCK_TYPES: () => import_constants.BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE: () => import_constants.FLOW_ENGINE_NAMESPACE,
+  FlowCancelSaveException: () => import_exceptions.FlowCancelSaveException,
   FlowExitException: () => import_exceptions.FlowExitException,
   MENU_KEYS: () => import_constants.MENU_KEYS,
   buildRecordMeta: () => import_variablesParams.buildRecordMeta,
@@ -44,26 +45,45 @@ __export(utils_exports, {
   createRecordResolveOnServerWithLocal: () => import_variablesParams.createRecordResolveOnServerWithLocal,
   createSafeDocument: () => import_safeGlobals.createSafeDocument,
   createSafeNavigator: () => import_safeGlobals.createSafeNavigator,
+  createSafeRunJSGlobals: () => import_safeGlobals.createSafeRunJSGlobals,
   createSafeWindow: () => import_safeGlobals.createSafeWindow,
+  decodeBase64Url: () => import_dateVariable.decodeBase64Url,
   defineAction: () => import_flow_definitions.defineAction,
+  encodeBase64Url: () => import_dateVariable.encodeBase64Url,
   escapeT: () => import_translation.escapeT,
   extractPropertyPath: () => import_context.extractPropertyPath,
   extractUsedVariableNames: () => import_variablesParams.extractUsedVariableNames,
   extractUsedVariablePaths: () => import_variablesParams.extractUsedVariablePaths,
+  extractUsedVariablePathsFromRunJS: () => import_runjsValue.extractUsedVariablePathsFromRunJS,
   formatPathToVariable: () => import_context.formatPathToVariable,
   getAutoFlowError: () => import_autoFlowError.getAutoFlowError,
   getT: () => import_translation.getT,
   inferRecordRef: () => import_variablesParams.inferRecordRef,
   isBeforeRenderFlow: () => import_flows.isBeforeRenderFlow,
+  isCompleteCtxDatePath: () => import_dateVariable.isCompleteCtxDatePath,
+  isCssFile: () => import_resolveModuleUrl.isCssFile,
+  isCtxDateExpression: () => import_dateVariable.isCtxDateExpression,
+  isCtxDatePathPrefix: () => import_dateVariable.isCtxDatePathPrefix,
   isInheritedFrom: () => import_inheritance.isInheritedFrom,
+  isRunJSValue: () => import_runjsValue.isRunJSValue,
   isVariableExpression: () => import_context.isVariableExpression,
+  normalizeRunJSValue: () => import_runjsValue.normalizeRunJSValue,
+  parseCtxDateExpression: () => import_dateVariable.parseCtxDateExpression,
   parsePathnameToViewParams: () => import_parsePathnameToViewParams.parsePathnameToViewParams,
+  prepareRunJsCode: () => import_runjsTemplateCompat.prepareRunJsCode,
+  preprocessRunJsTemplates: () => import_runjsTemplateCompat.preprocessRunJsTemplates,
   pruneFilter: () => import_pruneFilter.pruneFilter,
   resolveCreateModelOptions: () => import_params_resolvers.resolveCreateModelOptions,
+  resolveCtxDatePath: () => import_dateVariable.resolveCtxDatePath,
   resolveDefaultParams: () => import_params_resolvers.resolveDefaultParams,
   resolveExpressions: () => import_params_resolvers.resolveExpressions,
+  resolveModuleUrl: () => import_resolveModuleUrl.resolveModuleUrl,
+  resolveRunJSObjectValues: () => import_resolveRunJSObjectValues.resolveRunJSObjectValues,
+  resolveStepDisabledInSettings: () => import_schema_utils.resolveStepDisabledInSettings,
   resolveStepUiSchema: () => import_schema_utils.resolveStepUiSchema,
   resolveUiMode: () => import_schema_utils.resolveUiMode,
+  runjsWithSafeGlobals: () => import_safeGlobals.runjsWithSafeGlobals,
+  serializeCtxDateValue: () => import_dateVariable.serializeCtxDateValue,
   setAutoFlowError: () => import_autoFlowError.setAutoFlowError,
   setupRuntimeContextSteps: () => import_setupRuntimeContextSteps.setupRuntimeContextSteps,
   shouldHideStepInSettings: () => import_schema_utils.shouldHideStepInSettings,
@@ -84,15 +104,21 @@ var import_variablesParams = require("./variablesParams");
 var import_context = require("./context");
 var import_autoFlowError = require("./autoFlowError");
 var import_parsePathnameToViewParams = require("./parsePathnameToViewParams");
+var import_dateVariable = require("./dateVariable");
 var import_safeGlobals = require("./safeGlobals");
+var import_runjsValue = require("./runjsValue");
+var import_resolveRunJSObjectValues = require("./resolveRunJSObjectValues");
+var import_runjsTemplateCompat = require("./runjsTemplateCompat");
 var import_createEphemeralContext = require("./createEphemeralContext");
 var import_pruneFilter = require("./pruneFilter");
 var import_flows = require("./flows");
+var import_resolveModuleUrl = require("./resolveModuleUrl");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BLOCK_GROUP_CONFIGS,
   BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE,
+  FlowCancelSaveException,
   FlowExitException,
   MENU_KEYS,
   buildRecordMeta,
@@ -108,26 +134,45 @@ var import_flows = require("./flows");
   createRecordResolveOnServerWithLocal,
   createSafeDocument,
   createSafeNavigator,
+  createSafeRunJSGlobals,
   createSafeWindow,
+  decodeBase64Url,
   defineAction,
+  encodeBase64Url,
   escapeT,
   extractPropertyPath,
   extractUsedVariableNames,
   extractUsedVariablePaths,
+  extractUsedVariablePathsFromRunJS,
   formatPathToVariable,
   getAutoFlowError,
   getT,
   inferRecordRef,
   isBeforeRenderFlow,
+  isCompleteCtxDatePath,
+  isCssFile,
+  isCtxDateExpression,
+  isCtxDatePathPrefix,
   isInheritedFrom,
+  isRunJSValue,
   isVariableExpression,
+  normalizeRunJSValue,
+  parseCtxDateExpression,
   parsePathnameToViewParams,
+  prepareRunJsCode,
+  preprocessRunJsTemplates,
   pruneFilter,
   resolveCreateModelOptions,
+  resolveCtxDatePath,
   resolveDefaultParams,
   resolveExpressions,
+  resolveModuleUrl,
+  resolveRunJSObjectValues,
+  resolveStepDisabledInSettings,
   resolveStepUiSchema,
   resolveUiMode,
+  runjsWithSafeGlobals,
+  serializeCtxDateValue,
   setAutoFlowError,
   setupRuntimeContextSteps,
   shouldHideStepInSettings,

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

@@ -0,0 +1,58 @@
+/**
+ * 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 declare function resolveModuleUrl(url: string, options?: {
+    addSuffix?: boolean;
+    raw?: boolean;
+}): string;
+/**
+ * 判断 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 declare function isCssFile(url: string): boolean;

package/lib/utils/resolveModuleUrl.js

@@ -0,0 +1,65 @@
+/**
+ * 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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 resolveModuleUrl_exports = {};
+__export(resolveModuleUrl_exports, {
+  isCssFile: () => isCssFile,
+  resolveModuleUrl: () => resolveModuleUrl
+});
+module.exports = __toCommonJS(resolveModuleUrl_exports);
+function resolveModuleUrl(url, options) {
+  if (!url || typeof url !== "string") {
+    throw new Error("invalid url");
+  }
+  const u = url.trim();
+  if (u.startsWith("http://") || u.startsWith("https://")) {
+    return u;
+  }
+  const ESM_CDN_BASE_URL = window["__esm_cdn_base_url__"] || "https://esm.sh";
+  const ESM_CDN_SUFFIX = (options == null ? void 0 : options.addSuffix) ? window["__esm_cdn_suffix__"] || "" : "";
+  const base = ESM_CDN_BASE_URL.replace(/\/$/, "");
+  const path = u.replace(/^\//, "");
+  if (options == null ? void 0 : options.raw) {
+    const sep = path.includes("?") ? "&" : "?";
+    return `${base}/${path}${sep}raw`;
+  }
+  return `${base}/${path}${ESM_CDN_SUFFIX}`;
+}
+__name(resolveModuleUrl, "resolveModuleUrl");
+function isCssFile(url) {
+  if (!url || typeof url !== "string") {
+    return false;
+  }
+  const pathPart = url.split("?")[0].split("#")[0];
+  return pathPart.endsWith(".css");
+}
+__name(isCssFile, "isCssFile");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isCssFile,
+  resolveModuleUrl
+});

package/lib/utils/resolveRunJSObjectValues.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+/**
+ * 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 declare function resolveRunJSObjectValues(ctx: unknown, raw: unknown): Promise<Record<string, any>>;

package/lib/utils/resolveRunJSObjectValues.js

@@ -0,0 +1,61 @@
+/**
+ * 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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 resolveRunJSObjectValues_exports = {};
+__export(resolveRunJSObjectValues_exports, {
+  resolveRunJSObjectValues: () => resolveRunJSObjectValues
+});
+module.exports = __toCommonJS(resolveRunJSObjectValues_exports);
+var import_runjsValue = require("./runjsValue");
+var import_safeGlobals = require("./safeGlobals");
+async function resolveRunJSObjectValues(ctx, raw) {
+  const out = {};
+  if (!raw || typeof raw !== "object") return out;
+  if (Array.isArray(raw)) return out;
+  for (const [key, value] of Object.entries(raw)) {
+    if (typeof value === "undefined") continue;
+    if ((0, import_runjsValue.isRunJSValue)(value)) {
+      const { code, version } = (0, import_runjsValue.normalizeRunJSValue)(value);
+      if (!code.trim()) continue;
+      const ret = await (0, import_safeGlobals.runjsWithSafeGlobals)(ctx, code, { version });
+      if (!(ret == null ? void 0 : 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;
+}
+__name(resolveRunJSObjectValues, "resolveRunJSObjectValues");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolveRunJSObjectValues
+});

package/lib/utils/runjsModuleLoader.d.ts

@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+/**
+ * RunJS 外部模块加载辅助（浏览器侧）。
+ *
+ * 背景：
+ * - NocoBase 前端整体使用 requirejs（AMD）来加载插件与模块；
+ * - RunJS 场景下又需要支持 `ctx.importAsync(url)` 直接用浏览器原生 `import()` 加载远端 ESM；
+ * - 某些第三方库（典型：UMD/CJS 产物，例如 lodash）会在运行时探测 `define.amd`：
+ *   - 若存在 AMD，则优先走 `define(...)` 分支；
+ *   - 但像 esm.sh 这类 CDN 的“CJS/UMD → ESM 包装”往往依赖 `module.exports` 提取导出；
+ *   - 当 UMD 走了 AMD 分支时，`module.exports` 不会被赋值，最终表现为 ESM 导出（default/命名导出）为 `undefined`。
+ *
+ * 这里的策略：
+ * 1) 全局串行锁：避免 `requireAsync` / `importAsync` 并发时互相影响（尤其是临时 patch 全局 `define.amd`）。
+ * 2) 尽量缩小影响窗口：先预取模块（不改全局），再等待 requirejs 空闲，最后只在真正执行 `import()` 的瞬间临时屏蔽 `define.amd`。
+ * 3) 所有操作均为 best-effort：内部结构变化、浏览器能力差异等情况下不会阻断正常流程。
+ */
+type RequireJsLike = ((deps: string[], onLoad: (...args: any[]) => void, onError: (err: any) => void) => void) | undefined;
+/**
+ * 在 RunJS 内部按 URL 通过 requirejs 加载模块：
+ * - 与 `runjsImportAsync` 共用同一把锁，避免并发加载期间全局 patch 互相干扰；
+ * - 返回 requirejs 回调的第一个模块值（与现有 `ctx.requireAsync` 行为保持一致）。
+ */
+export declare function runjsRequireAsync(requirejs: RequireJsLike, url: string): Promise<any>;
+/**
+ * 在 RunJS 内部按 URL 动态导入 ESM 模块（返回模块命名空间对象）。
+ *
+ * 兼容点：
+ * - 若检测到 `globalThis.define.amd`，则会在导入前做预取，并在真正执行 `import()` 时短暂屏蔽 `define.amd`；
+ * - 为了进一步降低风险，会先等待 requirejs 没有挂起加载；
+ * - 使用带 `@vite-ignore` / `webpackIgnore: true` 标记的 dynamic import，避免被打包器重写；
+ * - 若仍被拦截，再用 `eval('u => import(u)')` 兜底。
+ *
+ * 重要说明：
+ * - 这里不做 URL 解析（如拼 CDN base/suffix），调用方应传入“最终可 import 的 URL”；
+ * - 缓存通常由上层（例如 `ctx.importAsync`）按 URL 做 Map 缓存，此处只负责导入与兼容逻辑。
+ */
+export declare function runjsImportAsync(url: string): Promise<any>;
+/**
+ * RunJS 专用：按“用户 specifier”导入模块，并在导入 core UI libs 时自动覆盖 ctx/libs。
+ *
+ * 说明：
+ * - 这里负责：specifier rewrite（如 esm.sh antd bundle）、URL 解析、全局 import cache、以及 override。
+ * - 具体的 dynamic import 由 `options.importer` 执行（默认使用 `runjsImportAsync`）。
+ *   这样在测试中可注入 mock importer，避免真实网络导入。
+ */
+export declare function runjsImportModule(ctx: any, specifier: string, options?: {
+    importer?: (url: string) => Promise<any>;
+    addSuffix?: boolean;
+}): Promise<any>;
+export {};