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

package/lib/flowContext.js

@@ -57,7 +57,6 @@ __export(flowContext_exports, {
 module.exports = __toCommonJS(flowContext_exports);
 var import_reactive = require("@formily/reactive");
 var antd = __toESM(require("antd"));
-var antdIcons = __toESM(require("@ant-design/icons"));
 var import_lodash = __toESM(require("lodash"));
 var import_qs = __toESM(require("qs"));
 var import_react = __toESM(require("react"));
@@ -78,6 +77,7 @@ 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"));
+var import_runjsLibs = require("./runjsLibs");
 var _proxy, _FlowContext_instances, createChildNodes_fn, findMetaByPath_fn, findMetaInDelegatesDeep_fn, findMetaInProperty_fn, resolvePathInMeta_fn, resolvePathInMetaAsync_fn, buildParentTitles_fn, toTreeNode_fn;
 function isRecordRefLike(val) {
   return !!(val && typeof val === "object" && "collection" in val && "filterByTk" in val);
@@ -1390,14 +1390,7 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
       }, "createRoot")
     };
     this.defineProperty("ReactDOM", { value: ReactDOMShim });
-    const libs = Object.freeze({
-      React: import_react.default,
-      ReactDOM: ReactDOMShim,
-      antd,
-      dayjs: import_dayjs.default,
-      antdIcons
-    });
-    this.defineProperty("libs", { value: libs });
+    (0, import_runjsLibs.setupRunJSLibs)(this);
     this.defineMethod(
       "render",
       function(vnode, container) {

package/lib/flowSettings.js

@@ -63,6 +63,7 @@ var import__ = require(".");
 var import_useFlowSettingsContext = require("./hooks/useFlowSettingsContext");
 var import_utils = require("./utils");
 var import_useFlowStep = require("./hooks/useFlowStep");
+var import_views = require("./views");
 var _forceEnabled, _emitter;
 const Panel = import_antd.Collapse.Panel;
 const _FlowSettings = class _FlowSettings {
@@ -536,12 +537,9 @@ const _FlowSettings = class _FlowSettings {
     };
     let modeProps = typeof resolvedUiMode === "object" && resolvedUiMode ? resolvedUiMode.props || {} : {};
     if (modeType === "embed") {
-      const target = document.querySelector("#nocobase-embed-container");
+      const target = document.querySelector(`#${import_views.GLOBAL_EMBED_CONTAINER_ID}`);
       const onOpen = modeProps.onOpen;
       const onClose = modeProps.onClose;
-      if (target) {
-        target.innerHTML = "";
-      }
       modeProps = {
         target,
         styles: {
@@ -551,15 +549,19 @@ const _FlowSettings = class _FlowSettings {
         },
         ...modeProps,
         onOpen() {
-          target.style.width = modeProps.width || "33.3%";
-          target.style.maxWidth = modeProps.maxWidth || "800px";
-          target.style.minWidth = modeProps.minWidth || "0px";
+          if (target) {
+            target.style.width = modeProps.width || "33.3%";
+            target.style.maxWidth = modeProps.maxWidth || "800px";
+            target.style.minWidth = modeProps.minWidth || "0px";
+          }
           onOpen == null ? void 0 : onOpen();
         },
         onClose() {
-          target.style.width = "auto";
-          target.style.maxWidth = "none";
-          target.style.minWidth = "auto";
+          if (target && target.dataset[import_views.EMBED_REPLACING_DATA_KEY] !== "1") {
+            target.style.width = "auto";
+            target.style.maxWidth = "none";
+            target.style.minWidth = "auto";
+          }
           onClose == null ? void 0 : onClose();
         }
       };

package/lib/index.d.ts

@@ -9,6 +9,8 @@
 export * from './types';
 export * from './utils';
 export { compileRunJs } from './utils/jsxTransform';
+export { registerRunJSLib } from './runjsLibs';
+export type { RunJSLibCache, RunJSLibLoader } from './runjsLibs';
 export * from './resources';
 export * from './flowEngine';
 export * from './hooks';

package/lib/index.js

@@ -38,12 +38,14 @@ __export(src_exports, {
   getRunJSScenesForModel: () => import_helpers.getRunJSScenesForModel,
   getSnippetBody: () => import_snippets.getSnippetBody,
   listSnippetsForContext: () => import_snippets.listSnippetsForContext,
+  registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
   setupRunJSContexts: () => import_setup.setupRunJSContexts
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./utils"), module.exports);
 var import_jsxTransform = require("./utils/jsxTransform");
+var import_runjsLibs = require("./runjsLibs");
 __reExport(src_exports, require("./resources"), module.exports);
 __reExport(src_exports, require("./flowEngine"), module.exports);
 __reExport(src_exports, require("./hooks"), module.exports);
@@ -78,6 +80,7 @@ var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
   getRunJSScenesForModel,
   getSnippetBody,
   listSnippetsForContext,
+  registerRunJSLib,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/runjs-context/contexts/base.js

@@ -67,14 +67,17 @@ function defineBaseContextMeta() {
       ReactDOM: "ReactDOM client API including createRoot for rendering React components. Also available via `ctx.libs.ReactDOM`.",
       antd: "Ant Design component library. Recommended access path: `ctx.libs.antd`.",
       libs: {
-        description: "Namespace for third-party and shared libraries. Includes React, ReactDOM, Ant Design, and dayjs.",
+        description: "Namespace for third-party and shared libraries. Includes React, ReactDOM, Ant Design, dayjs, lodash, math.js, and formula.js.",
         detail: "Libraries namespace",
         properties: {
           React: "React namespace (same as ctx.React).",
           ReactDOM: "ReactDOM client API (same as ctx.ReactDOM).",
           antd: "Ant Design component library (same as ctx.antd).",
           dayjs: "dayjs date-time utility library.",
-          antdIcons: "Ant Design icons library. Example: `ctx.libs.antdIcons.PlusOutlined`."
+          antdIcons: "Ant Design icons library. Example: `ctx.libs.antdIcons.PlusOutlined`.",
+          lodash: 'Lodash utility library. Example: `ctx.libs.lodash.get(obj, "a.b.c")`.',
+          math: 'Math.js library for mathematical operations. Example: `ctx.libs.math.evaluate("2 + 3 * 4")`.',
+          formula: "Formula.js library for spreadsheet-like formulas. Example: `ctx.libs.formula.SUM([1, 2, 3])`."
         }
       }
     },
@@ -156,14 +159,17 @@ function defineBaseContextMeta() {
         ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF0C\u542B createRoot \u7B49\u6E32\u67D3\u65B9\u6CD5\u3002\u63A8\u8350\u901A\u8FC7 `ctx.libs.ReactDOM` \u8BBF\u95EE\u3002",
         antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09\u3002\u63A8\u8350\u4F7F\u7528 `ctx.libs.antd` \u8BBF\u95EE\u3002",
         libs: {
-          description: "\u7B2C\u4E09\u65B9/\u901A\u7528\u5E93\u7684\u7EDF\u4E00\u547D\u540D\u7A7A\u95F4\uFF0C\u5305\u542B React\u3001ReactDOM\u3001Ant Design\u3001dayjs \u7B49\u3002\u540E\u7EED\u65B0\u589E\u5E93\u4F1A\u4F18\u5148\u6302\u5728\u6B64\u5904\u3002",
+          description: "\u7B2C\u4E09\u65B9/\u901A\u7528\u5E93\u7684\u7EDF\u4E00\u547D\u540D\u7A7A\u95F4\uFF0C\u5305\u542B React\u3001ReactDOM\u3001Ant Design\u3001dayjs\u3001lodash\u3001math.js\u3001formula.js \u7B49\u3002\u540E\u7EED\u65B0\u589E\u5E93\u4F1A\u4F18\u5148\u6302\u5728\u6B64\u5904\u3002",
           detail: "\u901A\u7528\u5E93\u547D\u540D\u7A7A\u95F4",
           properties: {
             React: "React \u547D\u540D\u7A7A\u95F4\uFF08\u7B49\u4EF7\u4E8E ctx.React\uFF09\u3002",
             ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF08\u7B49\u4EF7\u4E8E ctx.ReactDOM\uFF09\u3002",
             antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08\u7B49\u4EF7\u4E8E ctx.antd\uFF09\u3002",
             dayjs: "dayjs \u65E5\u671F\u65F6\u95F4\u5DE5\u5177\u5E93\u3002",
-            antdIcons: "Ant Design \u56FE\u6807\u5E93\u3002 \u4F8B\u5982\uFF1A`ctx.libs.antdIcons.PlusOutlined`\u3002"
+            antdIcons: "Ant Design \u56FE\u6807\u5E93\u3002 \u4F8B\u5982\uFF1A`ctx.libs.antdIcons.PlusOutlined`\u3002",
+            lodash: 'Lodash \u5DE5\u5177\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.lodash.get(obj, "a.b.c")`\u3002',
+            math: 'Math.js \u6570\u5B66\u8FD0\u7B97\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.math.evaluate("2 + 3 * 4")`\u3002',
+            formula: "Formula.js \u7535\u5B50\u8868\u683C\u516C\u5F0F\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.formula.SUM([1, 2, 3])`\u3002"
           }
         }
       },

package/lib/runjsLibs.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 type { FlowContext } from './flowContext';
+export type RunJSLibCache = 'global' | 'context';
+export type RunJSLibLoader<T = any> = (ctx: FlowContext) => T | Promise<T>;
+export declare function registerRunJSLib(name: string, loader: RunJSLibLoader, options?: {
+    cache?: RunJSLibCache;
+}): void;
+export declare function setupRunJSLibs(ctx: FlowContext): void;

package/lib/runjsLibs.js

@@ -0,0 +1,223 @@
+/**
+ * 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 __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) => {
+  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 __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 runjsLibs_exports = {};
+__export(runjsLibs_exports, {
+  registerRunJSLib: () => registerRunJSLib,
+  setupRunJSLibs: () => setupRunJSLibs
+});
+module.exports = __toCommonJS(runjsLibs_exports);
+var antdIcons = __toESM(require("@ant-design/icons"));
+const __runjsLibRegistry = /* @__PURE__ */ new Map();
+const __runjsLibResolvedCache = /* @__PURE__ */ new Map();
+const __runjsLibPendingCache = /* @__PURE__ */ new Map();
+const __runjsLibPendingByCtx = /* @__PURE__ */ new WeakMap();
+function __runjsGetPendingMapForCtx(ctx) {
+  let m = __runjsLibPendingByCtx.get(ctx);
+  if (!m) {
+    m = /* @__PURE__ */ new Map();
+    __runjsLibPendingByCtx.set(ctx, m);
+  }
+  return m;
+}
+__name(__runjsGetPendingMapForCtx, "__runjsGetPendingMapForCtx");
+function registerRunJSLib(name, loader, options) {
+  if (typeof name !== "string" || !name) return;
+  if (typeof loader !== "function") return;
+  __runjsLibRegistry.set(name, { loader, cache: (options == null ? void 0 : options.cache) || "global" });
+  __runjsLibResolvedCache.delete(name);
+  __runjsLibPendingCache.delete(name);
+}
+__name(registerRunJSLib, "registerRunJSLib");
+function __runjsIsObject(val) {
+  return !!val && typeof val === "object";
+}
+__name(__runjsIsObject, "__runjsIsObject");
+function __runjsHasOwn(obj, key) {
+  return __runjsIsObject(obj) && Object.prototype.hasOwnProperty.call(obj, key);
+}
+__name(__runjsHasOwn, "__runjsHasOwn");
+function __runjsIsPromiseLike(val) {
+  if (!__runjsIsObject(val)) return false;
+  const then = val.then;
+  return typeof then === "function";
+}
+__name(__runjsIsPromiseLike, "__runjsIsPromiseLike");
+function __runjsGetCtxValue(ctx, key) {
+  return ctx[key];
+}
+__name(__runjsGetCtxValue, "__runjsGetCtxValue");
+async function __runjsEnsureLib(ctx, name) {
+  const libs = ctx == null ? void 0 : ctx.libs;
+  if (__runjsHasOwn(libs, name)) {
+    const existing = libs[name];
+    if (typeof existing !== "undefined") return existing;
+  }
+  const entry = __runjsLibRegistry.get(name);
+  if (!entry) return __runjsIsObject(libs) ? libs[name] : void 0;
+  const setLib = /* @__PURE__ */ __name((v2) => {
+    if (__runjsIsObject(libs)) libs[name] = v2;
+  }, "setLib");
+  if (entry.cache === "context") {
+    const pendingMap = __runjsGetPendingMapForCtx(ctx);
+    const existingPending2 = pendingMap.get(name);
+    if (existingPending2) {
+      const v3 = await existingPending2;
+      setLib(v3);
+      return v3;
+    }
+    const task2 = Promise.resolve().then(() => entry.loader(ctx)).then(
+      (v3) => {
+        pendingMap.delete(name);
+        return v3;
+      },
+      (err) => {
+        pendingMap.delete(name);
+        throw err;
+      }
+    );
+    pendingMap.set(name, task2);
+    const v2 = await task2;
+    setLib(v2);
+    return v2;
+  }
+  if (__runjsLibResolvedCache.has(name)) {
+    const v2 = __runjsLibResolvedCache.get(name);
+    setLib(v2);
+    return v2;
+  }
+  const existingPending = __runjsLibPendingCache.get(name);
+  if (existingPending) {
+    const v2 = await existingPending;
+    setLib(v2);
+    return v2;
+  }
+  const task = Promise.resolve().then(() => entry.loader(ctx)).then(
+    (v2) => {
+      __runjsLibResolvedCache.set(name, v2);
+      __runjsLibPendingCache.delete(name);
+      return v2;
+    },
+    (err) => {
+      __runjsLibPendingCache.delete(name);
+      throw err;
+    }
+  );
+  __runjsLibPendingCache.set(name, task);
+  const v = await task;
+  setLib(v);
+  return v;
+}
+__name(__runjsEnsureLib, "__runjsEnsureLib");
+function setupRunJSLibAPIs(ctx) {
+  if (!ctx || typeof ctx !== "object") return;
+  if (typeof ctx.defineMethod !== "function") return;
+  ctx.defineMethod("__ensureLib", async function(name) {
+    if (typeof name !== "string" || !name) return void 0;
+    return await __runjsEnsureLib(this, name);
+  });
+  ctx.defineMethod("__ensureLibs", async function(names) {
+    if (!Array.isArray(names)) return;
+    for (const n of names) {
+      if (typeof n !== "string" || !n) continue;
+      await __runjsEnsureLib(this, n);
+    }
+  });
+}
+__name(setupRunJSLibAPIs, "setupRunJSLibAPIs");
+const DEFAULT_RUNJS_LIBS = [
+  { name: "React", cache: "context", loader: /* @__PURE__ */ __name((ctx) => __runjsGetCtxValue(ctx, "React"), "loader") },
+  { name: "ReactDOM", cache: "context", loader: /* @__PURE__ */ __name((ctx) => __runjsGetCtxValue(ctx, "ReactDOM"), "loader") },
+  { name: "antd", cache: "context", loader: /* @__PURE__ */ __name((ctx) => __runjsGetCtxValue(ctx, "antd"), "loader") },
+  { name: "dayjs", cache: "context", loader: /* @__PURE__ */ __name((ctx) => __runjsGetCtxValue(ctx, "dayjs"), "loader") },
+  { name: "antdIcons", cache: "global", loader: /* @__PURE__ */ __name(() => antdIcons, "loader") },
+  { name: "lodash", cache: "global", loader: /* @__PURE__ */ __name(() => import("lodash").then((m) => m.default || m), "loader") },
+  { name: "formula", cache: "global", loader: /* @__PURE__ */ __name(() => import("@formulajs/formulajs").then((m) => m.default || m), "loader") },
+  { name: "math", cache: "global", loader: /* @__PURE__ */ __name(() => import("mathjs").then((m) => m), "loader") }
+];
+let __defaultRunJSLibsRegistered = false;
+function ensureDefaultRunJSLibsRegistered() {
+  if (__defaultRunJSLibsRegistered) return;
+  __defaultRunJSLibsRegistered = true;
+  for (const { name, loader, cache } of DEFAULT_RUNJS_LIBS) {
+    if (__runjsLibRegistry.has(name)) continue;
+    registerRunJSLib(name, loader, { cache });
+  }
+}
+__name(ensureDefaultRunJSLibsRegistered, "ensureDefaultRunJSLibsRegistered");
+function resolveRegisteredLibSync(ctx, name) {
+  const entry = __runjsLibRegistry.get(name);
+  if (!entry) return void 0;
+  if (entry.cache === "global" && __runjsLibResolvedCache.has(name)) {
+    return __runjsLibResolvedCache.get(name);
+  }
+  const v = entry.loader(ctx);
+  if (__runjsIsPromiseLike(v)) return void 0;
+  if (entry.cache === "global") __runjsLibResolvedCache.set(name, v);
+  return v;
+}
+__name(resolveRegisteredLibSync, "resolveRegisteredLibSync");
+function setupRunJSLibs(ctx) {
+  if (!ctx || typeof ctx !== "object") return;
+  if (typeof ctx.defineProperty !== "function") return;
+  ensureDefaultRunJSLibsRegistered();
+  const libs = {};
+  for (const { name } of DEFAULT_RUNJS_LIBS) {
+    Object.defineProperty(libs, name, {
+      configurable: true,
+      enumerable: true,
+      get() {
+        const v = resolveRegisteredLibSync(ctx, name);
+        Object.defineProperty(libs, name, {
+          configurable: true,
+          enumerable: true,
+          writable: true,
+          value: v
+        });
+        return v;
+      }
+    });
+  }
+  ctx.defineProperty("libs", { value: libs });
+  setupRunJSLibAPIs(ctx);
+}
+__name(setupRunJSLibs, "setupRunJSLibs");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerRunJSLib,
+  setupRunJSLibs
+});