@nocobase/flow-engine 2.0.0-alpha.67 → 2.0.0-alpha.69

package/lib/BlockScopedFlowEngine.js

@@ -37,7 +37,6 @@ function createBlockScopedEngine(parent) {
     local.setModelRepository(parent.modelRepository);
   }
   local.context.addDelegate(parent.context);
-  const originalUnlink = local.unlinkFromStack.bind(local);
   local.unlinkFromStack = function() {
     const prev = local._previousEngine;
     const next = local._nextEngine;

package/lib/ViewScopedFlowEngine.js

@@ -31,8 +31,10 @@ __export(ViewScopedFlowEngine_exports, {
 });
 module.exports = __toCommonJS(ViewScopedFlowEngine_exports);
 var import_flowEngine = require("./flowEngine");
+var import_viewEvents = require("./views/viewEvents");
 function createViewScopedEngine(parent) {
   const local = new import_flowEngine.FlowEngine();
+  Object.defineProperty(local, import_viewEvents.ENGINE_SCOPE_KEY, { value: import_viewEvents.VIEW_ENGINE_SCOPE, configurable: true });
   if (parent.modelRepository) {
     local.setModelRepository(parent.modelRepository);
   }
@@ -48,6 +50,7 @@ function createViewScopedEngine(parent) {
     "_applyFlowCache",
     "executor",
     "context",
+    import_viewEvents.ENGINE_SCOPE_KEY,
     "previousEngine",
     "nextEngine",
     // 调度器与事件总线局部化

package/lib/components/variables/VariableInput.js

@@ -230,12 +230,18 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   );
   const handleVariableSelect = (0, import_react.useCallback)(
     (variableValue, metaTreeNode) => {
+      if (!metaTreeNode && variableValue === "") {
+        const cleared = clearValue !== void 0 ? clearValue : null;
+        setInnerValue(cleared);
+        emitChange(cleared);
+        return;
+      }
       setCurrentMetaTreeNode(metaTreeNode);
       const finalValue = (resolveValueFromPath == null ? void 0 : resolveValueFromPath(metaTreeNode)) || variableValue;
       setInnerValue(finalValue);
       emitChange(finalValue, metaTreeNode);
     },
-    [emitChange, resolveValueFromPath]
+    [emitChange, resolveValueFromPath, clearValue]
   );
   const { disabled } = restProps;
   const handleClear = (0, import_react.useCallback)(() => {
@@ -265,7 +271,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   }, [restProps]);
   const inputProps = (0, import_react.useMemo)(() => {
     const baseProps = {
-      value: innerValue ?? "",
+      value: ValueComponent === import_antd.Input ? innerValue ?? "" : innerValue,
       onChange: handleInputChange,
       disabled
     };

package/lib/data-source/index.js

@@ -400,6 +400,9 @@ const _Collection = class _Collection {
     if (typeof this.filterTargetKey === "string") {
       return record[this.filterTargetKey];
     }
+    if (Array.isArray(this.filterTargetKey) && this.filterTargetKey.length === 1) {
+      return record[this.filterTargetKey[0]];
+    }
     return import_lodash.default.pick(record, this.filterTargetKey);
   }
   get titleableFields() {

package/lib/flowContext.d.ts

@@ -31,6 +31,7 @@ export interface MetaTreeNode {
     title: string;
     type: string;
     interface?: string;
+    options?: any;
     uiSchema?: ISchema;
     render?: (props: any) => JSX.Element;
     paths: string[];
@@ -44,6 +45,7 @@ export interface PropertyMeta {
     type: string;
     title: string;
     interface?: string;
+    options?: any;
     uiSchema?: ISchema;
     render?: (props: any) => JSX.Element;
     sort?: number;
@@ -141,6 +143,29 @@ export declare class FlowContext {
      * @returns 属性定义选项，或 undefined（未定义）
      */
     getPropertyOptions(key: string): PropertyOptions | undefined;
+    /**
+     * 获取当前上下文可用的顶层 API 信息（主要用于编辑器补全/工具）。
+     *
+     * 注意：
+     * - 目前返回值以“尽量可用”为目标，允许不完整。
+     * - 该方法不会展开变量 meta（变量结构应由 `getPropertyMetaTree()`/VariableInput 等机制负责）。
+     */
+    getApiInfos(options?: {
+        version?: string;
+    }): Promise<Record<string, any>>;
+    /**
+     * 变量结构信息（保留给编辑器/工具使用）。
+     * 当前实现为保底空对象，避免 RunJS doc 中补全到该方法时调用报错。
+     */
+    getVarInfos(_options?: {
+        path?: string | string[];
+        maxDepth?: number;
+    }): Promise<Record<string, any>>;
+    /**
+     * 运行时环境信息（保留给编辑器/工具使用）。
+     * 当前实现为保底空对象，避免 RunJS doc 中补全到该方法时调用报错。
+     */
+    getEnvInfos(): Promise<Record<string, any>>;
 }
 declare class BaseFlowEngineContext extends FlowContext {
     router: Router;
@@ -156,6 +181,7 @@ declare class BaseFlowEngineContext extends FlowContext {
      */
     renderJson: (template: JSONValue) => Promise<any>;
     resolveJsonTemplate: (template: JSONValue) => Promise<any>;
+    getVar: (path: string) => Promise<any>;
     runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;
     getAction: <TModel extends FlowModel = FlowModel, TCtx extends FlowContext = FlowContext>(name: string) => ActionDefinition<TModel, TCtx> | undefined;
     getActions: <TModel extends FlowModel = FlowModel, TCtx extends FlowContext = FlowContext>() => Map<string, ActionDefinition<TModel, TCtx>>;
@@ -217,22 +243,60 @@ export declare class FlowRuntimeContext<TModel extends FlowModel = FlowModel, TM
     get mode(): TMode;
 }
 export type FlowSettingsContext<TModel extends FlowModel = FlowModel> = FlowRuntimeContext<TModel, 'settings'>;
+export type FlowContextDocRef = string | {
+    url: string;
+    title?: string;
+};
+export type FlowDeprecationDoc = boolean | {
+    message?: string;
+    replacedBy?: string | string[];
+    since?: string;
+    removedIn?: string;
+    ref?: FlowContextDocRef;
+};
+export type FlowContextDocParam = {
+    name: string;
+    description?: string;
+    type?: string;
+    optional?: boolean;
+    default?: JSONValue;
+};
+export type FlowContextDocReturn = {
+    description?: string;
+    type?: string;
+};
 export type RunJSDocCompletionDoc = {
     insertText?: string;
 };
+export type RunJSDocHiddenDoc = boolean | ((ctx: any) => boolean | Promise<boolean>);
+export type RunJSDocHiddenOrPathsDoc = boolean | string[] | ((ctx: any) => boolean | string[] | Promise<boolean | string[]>);
 export type RunJSDocPropertyDoc = string | {
     description?: string;
     detail?: string;
     type?: string;
     examples?: string[];
     completion?: RunJSDocCompletionDoc;
+    ref?: FlowContextDocRef;
+    deprecated?: FlowDeprecationDoc;
+    params?: FlowContextDocParam[];
+    returns?: FlowContextDocReturn;
     properties?: Record<string, RunJSDocPropertyDoc>;
+    hidden?: RunJSDocHiddenOrPathsDoc;
+    disabled?: boolean | ((ctx: any) => boolean | Promise<boolean>);
+    disabledReason?: string | ((ctx: any) => string | undefined | Promise<string | undefined>);
 };
 export type RunJSDocMethodDoc = string | {
     description?: string;
     detail?: string;
     examples?: string[];
     completion?: RunJSDocCompletionDoc;
+    ref?: FlowContextDocRef;
+    deprecated?: FlowDeprecationDoc;
+    params?: FlowContextDocParam[];
+    returns?: FlowContextDocReturn;
+    hidden?: RunJSDocHiddenDoc;
+    disabled?: boolean | ((ctx: any) => boolean | Promise<boolean>);
+    disabledReason?: string | ((ctx: any) => string | undefined | Promise<string | undefined>);
 };
 export type RunJSDocMeta = {
     label?: string;

package/lib/flowContext.js

@@ -78,6 +78,7 @@ 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 import_runjsModuleLoader = require("./utils/runjsModuleLoader");
 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);
@@ -468,6 +469,73 @@ const _FlowContext = class _FlowContext {
     }
     return this._findPropertyInDelegates(this._delegates, key);
   }
+  /**
+   * 获取当前上下文可用的顶层 API 信息（主要用于编辑器补全/工具）。
+   *
+   * 注意：
+   * - 目前返回值以“尽量可用”为目标，允许不完整。
+   * - 该方法不会展开变量 meta（变量结构应由 `getPropertyMetaTree()`/VariableInput 等机制负责）。
+   */
+  async getApiInfos(options = {}) {
+    var _a, _b, _c, _d, _e;
+    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, "*");
+    const locale = ((_b = (_a = this == null ? void 0 : this.api) == null ? void 0 : _a.auth) == null ? void 0 : _b.locale) || ((_c = this == null ? void 0 : this.i18n) == null ? void 0 : _c.language) || (this == null ? void 0 : this.locale);
+    let doc = {};
+    try {
+      if ((_d = Ctor == null ? void 0 : Ctor.getDoc) == null ? void 0 : _d.length) doc = Ctor.getDoc(locale) || {};
+      else doc = ((_e = Ctor == null ? void 0 : Ctor.getDoc) == null ? void 0 : _e.call(Ctor)) || {};
+    } catch (_2) {
+      doc = {};
+    }
+    const isPrivateKey = /* @__PURE__ */ __name((key) => typeof key === "string" && key.startsWith("_"), "isPrivateKey");
+    const out = {};
+    const visited = /* @__PURE__ */ new WeakSet();
+    const walk = /* @__PURE__ */ __name((ctx) => {
+      if (!ctx || visited.has(ctx)) return;
+      visited.add(ctx);
+      try {
+        for (const key of Object.keys(ctx._props || {})) {
+          if (isPrivateKey(key)) continue;
+          if (typeof out[key] === "undefined") out[key] = { type: "property" };
+        }
+      } catch (_2) {
+      }
+      try {
+        for (const key of Object.keys(ctx._methods || {})) {
+          if (isPrivateKey(key)) continue;
+          if (typeof out[key] === "undefined") out[key] = { type: "function" };
+        }
+      } catch (_2) {
+      }
+      try {
+        const delegates = Array.isArray(ctx._delegates) ? ctx._delegates : [];
+        for (const d of delegates) walk(d);
+      } catch (_2) {
+      }
+    }, "walk");
+    walk(this);
+    return {
+      ...out,
+      ...(doc == null ? void 0 : doc.properties) || {},
+      ...(doc == null ? void 0 : doc.methods) || {}
+    };
+  }
+  /**
+   * 变量结构信息（保留给编辑器/工具使用）。
+   * 当前实现为保底空对象，避免 RunJS doc 中补全到该方法时调用报错。
+   */
+  async getVarInfos(_options = {}) {
+    return {};
+  }
+  /**
+   * 运行时环境信息（保留给编辑器/工具使用）。
+   * 当前实现为保底空对象，避免 RunJS doc 中补全到该方法时调用报错。
+   */
+  async getEnvInfos() {
+    return {};
+  }
 };
 _proxy = new WeakMap();
 _FlowContext_instances = new WeakSet();
@@ -652,6 +720,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
       type: "object",
       // 初始类型
       interface: void 0,
+      options: void 0,
       uiSchema: void 0,
       paths,
       parentTitles: parentTitles.length > 0 ? parentTitles : void 0,
@@ -680,6 +749,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
           node.title = finalTitle;
           node.type = meta == null ? void 0 : meta.type;
           node.interface = meta == null ? void 0 : meta.interface;
+          node.options = meta == null ? void 0 : meta.options;
           node.uiSchema = meta == null ? void 0 : meta.uiSchema;
           if (!(meta == null ? void 0 : meta.properties)) return [];
           const childNodes = __privateMethod(this, _FlowContext_instances, createChildNodes_fn).call(this, meta.properties, paths, [...parentTitles, finalTitle], meta);
@@ -700,6 +770,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
       title: nodeTitle,
       type: metaOrFactory.type,
       interface: metaOrFactory.interface,
+      options: metaOrFactory.options,
       uiSchema: metaOrFactory.uiSchema,
       paths,
       parentTitles: parentTitles.length > 0 ? parentTitles : void 0,
@@ -911,6 +982,19 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       }
       return (0, import_utils.resolveExpressions)(serverResolved, this);
     });
+    this.defineMethod(
+      "getVar",
+      async function(varPath) {
+        const raw = typeof varPath === "string" ? varPath : String(varPath ?? "");
+        const s = raw.trim();
+        if (!s) return void 0;
+        if (s !== "ctx" && !s.startsWith("ctx.")) {
+          throw new Error(`ctx.getVar(path) expects an expression starting with "ctx.", got: "${s}"`);
+        }
+        return this.resolveJsonTemplate(`{{ ${s} }}`);
+      },
+      'Resolve a ctx expression value by path (expression starts with "ctx.").'
+    );
     this.defineProperty("requirejs", {
       get: /* @__PURE__ */ __name(() => {
         var _a, _b;
@@ -1000,7 +1084,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         user: this.user
       }), "get")
     });
-    this.defineMethod("loadCSS", async (url) => {
+    this.defineMethod("loadCSS", async (href) => {
+      const url = (0, import_utils.resolveModuleUrl)(href);
       return new Promise((resolve, reject) => {
         const existingLink = document.querySelector(`link[href="${url}"]`);
         if (existingLink) {
@@ -1016,51 +1101,14 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       });
     });
     this.defineMethod("requireAsync", async (url) => {
-      return new Promise((resolve, reject) => {
-        if (!this.requirejs) {
-          reject(new Error("requirejs is not available"));
-          return;
-        }
-        this.requirejs(
-          [url],
-          (...args) => {
-            resolve(args[0]);
-          },
-          reject
-        );
-      });
+      const u = (0, import_utils.resolveModuleUrl)(url, { raw: true });
+      return await (0, import_runjsModuleLoader.runjsRequireAsync)(this.requirejs, u);
     });
-    this.defineMethod("importAsync", async (url) => {
-      if (!url || typeof url !== "string") {
-        throw new Error("invalid url");
+    this.defineMethod("importAsync", async function(url) {
+      if ((0, import_utils.isCssFile)(url)) {
+        return this.loadCSS(url);
       }
-      const u = url.trim();
-      const g = globalThis;
-      g.__nocobaseImportAsyncCache = g.__nocobaseImportAsyncCache || /* @__PURE__ */ new Map();
-      const cache = g.__nocobaseImportAsyncCache;
-      if (cache.has(u)) return cache.get(u);
-      const nativeImport = /* @__PURE__ */ __name(() => import(
-        /* @vite-ignore */
-        /* webpackIgnore: true */
-        u
-      ), "nativeImport");
-      const evalImport = /* @__PURE__ */ __name(() => {
-        const importer = (0, eval)("u => import(u)");
-        return importer(u);
-      }, "evalImport");
-      const p = (async () => {
-        try {
-          return await nativeImport();
-        } catch (err) {
-          try {
-            return await evalImport();
-          } catch (err2) {
-            throw err2 || err;
-          }
-        }
-      })();
-      cache.set(u, p);
-      return p;
+      return await (0, import_runjsModuleLoader.runjsImportModule)(this, url, { importer: import_runjsModuleLoader.runjsImportAsync });
     });
     this.defineMethod("createJSRunner", async function(options) {
       try {
@@ -1389,6 +1437,7 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
         return this.engine.reactView.createRoot(realContainer, options);
       }, "createRoot")
     };
+    ReactDOMShim.__nbRunjsInternalShim = true;
     this.defineProperty("ReactDOM", { value: ReactDOMShim });
     (0, import_runjsLibs.setupRunJSLibs)(this);
     this.defineMethod(
@@ -1400,39 +1449,64 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
         const globalRef = globalThis;
         globalRef.__nbRunjsRoots = globalRef.__nbRunjsRoots || /* @__PURE__ */ new WeakMap();
         const rootMap = globalRef.__nbRunjsRoots;
-        if (typeof vnode === "string") {
-          const existingRoot = rootMap.get(containerEl);
-          if (existingRoot && typeof existingRoot.unmount === "function") {
+        const disposeEntry = /* @__PURE__ */ __name((entry2) => {
+          if (!entry2) return;
+          if (entry2.disposeTheme && typeof entry2.disposeTheme === "function") {
             try {
-              existingRoot.unmount();
-            } finally {
-              rootMap.delete(containerEl);
+              entry2.disposeTheme();
+            } catch (_2) {
+            }
+            entry2.disposeTheme = void 0;
+          }
+          const root = entry2.root || entry2;
+          if (root && typeof root.unmount === "function") {
+            try {
+              root.unmount();
+            } catch (_2) {
             }
           }
+        }, "disposeEntry");
+        const unmountContainerRoot = /* @__PURE__ */ __name(() => {
+          const existing = rootMap.get(containerEl);
+          if (existing) {
+            disposeEntry(existing);
+            rootMap.delete(containerEl);
+          }
+        }, "unmountContainerRoot");
+        if (typeof vnode === "string") {
+          unmountContainerRoot();
           const proxy = new import_ElementProxy.ElementProxy(containerEl);
           proxy.innerHTML = String(vnode ?? "");
           return null;
         }
         if (vnode && vnode.nodeType && (vnode.nodeType === 1 || vnode.nodeType === 3 || vnode.nodeType === 11)) {
-          const existingRoot = rootMap.get(containerEl);
-          if (existingRoot && typeof existingRoot.unmount === "function") {
-            try {
-              existingRoot.unmount();
-            } finally {
-              rootMap.delete(containerEl);
-            }
-          }
+          unmountContainerRoot();
           while (containerEl.firstChild) containerEl.removeChild(containerEl.firstChild);
           containerEl.appendChild(vnode);
           return null;
         }
-        let root = rootMap.get(containerEl);
-        if (!root) {
-          root = this.ReactDOM.createRoot(containerEl);
-          rootMap.set(containerEl, root);
+        const rendererKey = this.ReactDOM;
+        const ownerKey = this;
+        let entry = rootMap.get(containerEl);
+        if (!entry || entry.rendererKey !== rendererKey || entry.ownerKey !== ownerKey) {
+          if (entry) {
+            disposeEntry(entry);
+            rootMap.delete(containerEl);
+          }
+          const root = this.ReactDOM.createRoot(containerEl);
+          entry = { rendererKey, ownerKey, root, disposeTheme: void 0, lastVnode: void 0 };
+          rootMap.set(containerEl, entry);
         }
-        root.render(vnode);
-        return root;
+        return (0, import_runjsLibs.externalReactRender)({
+          ctx: this,
+          entry,
+          vnode,
+          containerEl,
+          rootMap,
+          unmountContainerRoot,
+          internalReact: import_react.default,
+          internalAntd: antd
+        });
       }
     );
   }

package/lib/flowEngine.d.ts

@@ -84,6 +84,17 @@ export declare class FlowEngine {
     private _previousEngine?;
     private _nextEngine?;
     private _resources;
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    private _dataSourceDirtyVersions;
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -116,6 +127,16 @@ export declare class FlowEngine {
     getScheduler(): ModelOperationScheduler;
     /** 释放并清理当前引擎本地调度器（若存在） */
     disposeScheduler(): void;
+    /**
+     * Mark a data source resource as "dirty" (changed).
+     * This is used by data blocks to decide whether to refresh when a view becomes active.
+     */
+    markDataSourceDirty(dataSourceKey: string, resourceName: string): number;
+    /**
+     * Get current dirty version for a data source resource.
+     * Returns 0 when no writes have been recorded.
+     */
+    getDataSourceDirtyVersion(dataSourceKey: string, resourceName: string): number;
     /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
     scheduleModelOperation(fromModelOrUid: FlowModel | string, toUid: string, fn: (model: FlowModel) => Promise<void> | void, options?: ScheduleOptions): ScheduledCancel;
     /** 上一个引擎（根引擎为 undefined） */

package/lib/flowEngine.js

@@ -120,6 +120,17 @@ const _FlowEngine = class _FlowEngine {
     __publicField(this, "_previousEngine");
     __publicField(this, "_nextEngine");
     __publicField(this, "_resources", /* @__PURE__ */ new Map());
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    __publicField(this, "_dataSourceDirtyVersions", /* @__PURE__ */ new Map());
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -187,6 +198,33 @@ const _FlowEngine = class _FlowEngine {
       }
     }
   }
+  /**
+   * Mark a data source resource as "dirty" (changed).
+   * This is used by data blocks to decide whether to refresh when a view becomes active.
+   */
+  markDataSourceDirty(dataSourceKey, resourceName) {
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return this.getDataSourceDirtyVersion(dsKey, resName);
+    const ds = this._dataSourceDirtyVersions.get(dsKey) || /* @__PURE__ */ new Map();
+    if (!this._dataSourceDirtyVersions.has(dsKey)) {
+      this._dataSourceDirtyVersions.set(dsKey, ds);
+    }
+    const next = (ds.get(resName) || 0) + 1;
+    ds.set(resName, next);
+    return next;
+  }
+  /**
+   * Get current dirty version for a data source resource.
+   * Returns 0 when no writes have been recorded.
+   */
+  getDataSourceDirtyVersion(dataSourceKey, resourceName) {
+    var _a;
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return 0;
+    return ((_a = this._dataSourceDirtyVersions.get(dsKey)) == null ? void 0 : _a.get(resName)) || 0;
+  }
   /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
   scheduleModelOperation(fromModelOrUid, toUid, fn, options) {
     return this.getScheduler().schedule(fromModelOrUid, toUid, fn, options);

package/lib/index.d.ts

@@ -27,8 +27,12 @@ export * from './JSRunner';
 export { getRunJSDocFor, createJSRunnerWithVersion, getRunJSScenesForModel, getRunJSScenesForContext, } from './runjs-context/helpers';
 export { RunJSContextRegistry, getModelClassName } from './runjs-context/registry';
 export { setupRunJSContexts } from './runjs-context/setup';
-export { getSnippetBody, listSnippetsForContext } from './runjs-context/snippets';
+export type { RunJSContextContribution, RunJSContextContributionApi } from './runjs-context/contributions';
+export { registerRunJSContextContribution } from './runjs-context/contributions';
+export type { RunJSSnippetLoader } from './runjs-context/snippets';
+export { getSnippetBody, listSnippetsForContext, registerRunJSSnippet } from './runjs-context/snippets';
 export * from './views';
+export { DATA_SOURCE_DIRTY_EVENT, ENGINE_SCOPE_KEY, getEmitterViewActivatedVersion, VIEW_ACTIVATED_EVENT, VIEW_ACTIVATED_VERSION, VIEW_ENGINE_SCOPE, } from './views/viewEvents';
 export * from './FlowDefinition';
 export { createViewScopedEngine } from './ViewScopedFlowEngine';
 export { createBlockScopedEngine } from './BlockScopedFlowEngine';

package/lib/index.js

@@ -27,18 +27,26 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
+  DATA_SOURCE_DIRTY_EVENT: () => import_viewEvents.DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY: () => import_viewEvents.ENGINE_SCOPE_KEY,
   RunJSContextRegistry: () => import_registry.RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT: () => import_viewEvents.VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION: () => import_viewEvents.VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE: () => import_viewEvents.VIEW_ENGINE_SCOPE,
   compileRunJs: () => import_jsxTransform.compileRunJs,
   createBlockScopedEngine: () => import_BlockScopedFlowEngine.createBlockScopedEngine,
   createJSRunnerWithVersion: () => import_helpers.createJSRunnerWithVersion,
   createViewScopedEngine: () => import_ViewScopedFlowEngine.createViewScopedEngine,
+  getEmitterViewActivatedVersion: () => import_viewEvents.getEmitterViewActivatedVersion,
   getModelClassName: () => import_registry.getModelClassName,
   getRunJSDocFor: () => import_helpers.getRunJSDocFor,
   getRunJSScenesForContext: () => import_helpers.getRunJSScenesForContext,
   getRunJSScenesForModel: () => import_helpers.getRunJSScenesForModel,
   getSnippetBody: () => import_snippets.getSnippetBody,
   listSnippetsForContext: () => import_snippets.listSnippetsForContext,
+  registerRunJSContextContribution: () => import_contributions.registerRunJSContextContribution,
   registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
+  registerRunJSSnippet: () => import_snippets.registerRunJSSnippet,
   setupRunJSContexts: () => import_setup.setupRunJSContexts
 });
 module.exports = __toCommonJS(src_exports);
@@ -62,25 +70,35 @@ __reExport(src_exports, require("./JSRunner"), module.exports);
 var import_helpers = require("./runjs-context/helpers");
 var import_registry = require("./runjs-context/registry");
 var import_setup = require("./runjs-context/setup");
+var import_contributions = require("./runjs-context/contributions");
 var import_snippets = require("./runjs-context/snippets");
 __reExport(src_exports, require("./views"), module.exports);
+var import_viewEvents = require("./views/viewEvents");
 __reExport(src_exports, require("./FlowDefinition"), module.exports);
 var import_ViewScopedFlowEngine = require("./ViewScopedFlowEngine");
 var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY,
   RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE,
   compileRunJs,
   createBlockScopedEngine,
   createJSRunnerWithVersion,
   createViewScopedEngine,
+  getEmitterViewActivatedVersion,
   getModelClassName,
   getRunJSDocFor,
   getRunJSScenesForContext,
   getRunJSScenesForModel,
   getSnippetBody,
   listSnippetsForContext,
+  registerRunJSContextContribution,
   registerRunJSLib,
+  registerRunJSSnippet,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/models/flowModel.js

@@ -353,7 +353,18 @@ const _FlowModel = class _FlowModel {
       const meta = Cls.meta;
       const metaCreate = meta == null ? void 0 : meta.createModelOptions;
       if (metaCreate && typeof metaCreate === "object" && metaCreate.subModels) {
-        mergedSubModels = import_lodash.default.merge({}, import_lodash.default.cloneDeep(metaCreate.subModels || {}), import_lodash.default.cloneDeep(subModels || {}));
+        const replaceArrays = /* @__PURE__ */ __name((objValue, srcValue) => {
+          if (Array.isArray(objValue) && Array.isArray(srcValue)) {
+            return srcValue;
+          }
+          return void 0;
+        }, "replaceArrays");
+        mergedSubModels = import_lodash.default.mergeWith(
+          {},
+          import_lodash.default.cloneDeep(metaCreate.subModels || {}),
+          import_lodash.default.cloneDeep(subModels || {}),
+          replaceArrays
+        );
       }
     } catch (e) {
     }