@nocobase/flow-engine 2.0.0-alpha.9 → 2.0.0-beta.2

package/lib/components/subModel/LazyDropdown.js

@@ -342,20 +342,18 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       }
       setRootItems(resolvedItems);
     }, "loadRootItems");
-    if (menuVisible) {
-      loadRootItems();
-    }
-  }, [menuVisible, stateVersion, menuItems]);
+    loadRootItems();
+  }, [stateVersion, menuItems]);
   function buildSearchChildren(children, item, keyPath, path, menuVisible2, resolve) {
     const searchKey = keyPath;
     const currentSearchValue = searchValues[searchKey] || "";
-    const filteredChildren = currentSearchValue ? (/* @__PURE__ */ __name(function deepFilter(items) {
+    const filteredChildren = currentSearchValue ? (/* @__PURE__ */ __name(function deepFilter(items2) {
       const searchText = currentSearchValue.toLowerCase();
       const tryString = /* @__PURE__ */ __name((v) => {
         if (!v) return "";
         return typeof v === "string" ? v : String(v);
       }, "tryString");
-      return items.map((child) => {
+      return items2.map((child) => {
         const labelStr = tryString(child.label).toLowerCase();
         const selfMatch = labelStr.includes(searchText) || child.key && String(child.key).toLowerCase().includes(searchText);
         if (child.type === "group" && Array.isArray(child.children)) {
@@ -377,8 +375,8 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
     return [searchItem, dividerItem, ...resolvedFiltered];
   }
   __name(buildSearchChildren, "buildSearchChildren");
-  const resolveItems = /* @__PURE__ */ __name((items, path = []) => {
-    return items.map((item) => {
+  const resolveItems = /* @__PURE__ */ __name((items2, path = []) => {
+    return items2.map((item) => {
       const keyPath = getKeyPath(path, item.key);
       const isGroup = item.type === "group";
       const hasAsyncChildren = typeof item.children === "function";
@@ -483,6 +481,13 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       }
     `;
   }, [dropdownMaxHeight]);
+  const items = rootLoading && rootItems.length === 0 ? [
+    {
+      key: "root-loading",
+      label: /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { size: "small" }),
+      disabled: true
+    }
+  ] : resolveItems(rootItems);
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Dropdown,
     {
@@ -493,13 +498,7 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       placement: "bottomLeft",
       menu: {
         ...dropdownMenuProps,
-        items: rootLoading && rootItems.length === 0 ? [
-          {
-            key: "root-loading",
-            label: /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { size: "small" }),
-            disabled: true
-          }
-        ] : resolveItems(rootItems),
+        items,
         onClick: /* @__PURE__ */ __name(() => {
         }, "onClick"),
         style: {

package/lib/components/subModel/utils.d.ts

@@ -10,7 +10,7 @@ import type { Collection } from '../../data-source';
 import { FlowModelContext } from '../../flowContext';
 import { ModelConstructor } from '../../types';
 import { SubModelItem } from './AddSubModelButton';
-export declare function buildSubModelItem(M: ModelConstructor, ctx: FlowModelContext, skipHide?: boolean): SubModelItem;
+export declare function buildSubModelItem(M: ModelConstructor, ctx: FlowModelContext, skipHide?: boolean): Promise<SubModelItem | undefined>;
 export declare function buildItems(subModelBaseClass: string | ModelConstructor): (ctx: FlowModelContext) => Promise<any>;
 export declare function buildSubModelItems(subModelBaseClass: string | ModelConstructor, exclude?: any[]): (ctx: FlowModelContext) => Promise<SubModelItem[]>;
 export declare function buildSubModelGroups(subModelBaseClasses?: (string | ModelConstructor)[]): (ctx: FlowModelContext) => Promise<SubModelItem[]>;

package/lib/components/subModel/utils.js

@@ -46,9 +46,16 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var _ = __toESM(require("lodash"));
 var import_utils = require("../../utils");
-function buildSubModelItem(M, ctx, skipHide = false) {
+async function callHideFunction(hide, ctx) {
+  if (typeof hide === "function") {
+    return await hide(ctx);
+  }
+  return hide;
+}
+__name(callHideFunction, "callHideFunction");
+async function buildSubModelItem(M, ctx, skipHide = false) {
   const meta = M.meta ?? {};
-  if (meta.hide && !skipHide) {
+  if (await callHideFunction(meta.hide, ctx) && !skipHide) {
     return;
   }
   const item = {
@@ -127,12 +134,15 @@ function buildItems(subModelBaseClass) {
 __name(buildItems, "buildItems");
 function buildSubModelItems(subModelBaseClass, exclude = []) {
   return async (ctx) => {
-    var _a;
+    var _a, _b;
     const SubModelClasses = ctx.engine.getSubclassesOf(subModelBaseClass);
-    let candidates = Array.from(SubModelClasses.values()).filter((C) => {
-      var _a2;
-      return !((_a2 = C.meta) == null ? void 0 : _a2.hide);
-    }).filter((C) => {
+    let candidates = [];
+    for (const C of Array.from(SubModelClasses.values())) {
+      if (!await callHideFunction((_a = C.meta) == null ? void 0 : _a.hide, ctx)) {
+        candidates.push(C);
+      }
+    }
+    candidates = candidates.filter((C) => {
       for (const P of exclude) {
         if (typeof P === "string") {
           if (C.name === P) return false;
@@ -142,18 +152,18 @@ function buildSubModelItems(subModelBaseClass, exclude = []) {
       }
       return true;
     }).sort((A, B) => {
-      var _a2, _b;
-      return (((_a2 = A.meta) == null ? void 0 : _a2.sort) ?? 1e3) - (((_b = B.meta) == null ? void 0 : _b.sort) ?? 1e3);
+      var _a2, _b2;
+      return (((_a2 = A.meta) == null ? void 0 : _a2.sort) ?? 1e3) - (((_b2 = B.meta) == null ? void 0 : _b2.sort) ?? 1e3);
     });
     if (candidates.length === 0) {
       const BaseClass = typeof subModelBaseClass === "string" ? ctx.engine.getModelClass(subModelBaseClass) : subModelBaseClass;
-      if (BaseClass && !((_a = BaseClass.meta) == null ? void 0 : _a.hide)) {
+      if (BaseClass && !await callHideFunction((_b = BaseClass.meta) == null ? void 0 : _b.hide, ctx)) {
         candidates = [BaseClass];
       }
     }
     const items = [];
     for (const M of candidates) {
-      const item = buildSubModelItem(M, ctx);
+      const item = await buildSubModelItem(M, ctx);
       if (item) items.push(item);
     }
     return items;

package/lib/components/variables/VariableInput.js

@@ -94,6 +94,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   showValueComponent = true,
   onlyLeafSelectable = false,
   clearValue,
+  ignoreFieldNames,
   ...restProps
 }) => {
   const [currentMetaTreeNode, setCurrentMetaTreeNode] = (0, import_react.useState)(null);
@@ -143,7 +144,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   }, [currentMetaTreeNode, innerValue, resolvedMetaTree, resolvePathFromValue]);
   (0, import_react.useEffect)(() => {
     const restoreFromValue = /* @__PURE__ */ __name(async () => {
-      if (!Array.isArray(resolvedMetaTree) || !value) return;
+      if (!Array.isArray(resolvedMetaTree) || value == null) return;
       if (currentMetaTreeNode) {
         return;
       }
@@ -196,7 +197,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   }, [renderInputComponent, resolvedMetaTreeNode, innerValue]);
   (0, import_react.useEffect)(() => {
     if (!resolvedMetaTreeNode) return;
-    if (!Array.isArray(resolvedMetaTree) || !innerValue) return;
+    if (!Array.isArray(resolvedMetaTree) || innerValue == null) return;
     const finalValue = (resolveValueFromPath == null ? void 0 : resolveValueFromPath(resolvedMetaTreeNode)) || innerValue;
     emitChange(finalValue, resolvedMetaTreeNode);
     setCurrentMetaTreeNode(resolvedMetaTreeNode);
@@ -264,7 +265,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   }, [restProps]);
   const inputProps = (0, import_react.useMemo)(() => {
     const baseProps = {
-      value: innerValue || "",
+      value: innerValue ?? "",
       onChange: handleInputChange,
       disabled
     };
@@ -323,6 +324,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
       parseValueToPath: resolvePathFromValue,
       formatPathToValue: resolveValueFromPath,
       onlyLeafSelectable,
+      ignoreFieldNames,
       ...!showValueComponent && { children: null, placeholder: restProps == null ? void 0 : restProps.placeholder }
     }
   ));

package/lib/components/variables/types.d.ts

@@ -18,6 +18,7 @@ export interface FlowContextSelectorProps extends Omit<CascaderProps<ContextSele
     formatPathToValue?: (item: MetaTreeNode) => string;
     open?: boolean;
     onlyLeafSelectable?: boolean;
+    ignoreFieldNames?: string[];
 }
 export interface ContextSelectorItem {
     label: React.ReactNode;
@@ -62,6 +63,7 @@ export interface VariableInputProps {
      * 默认行为为 null；可设置为 '' 等，以便清空后默认切换为“常量-空字符串”。
      */
     clearValue?: any;
+    ignoreFieldNames?: string[];
     [key: string]: any;
 }
 export interface VariableTagProps {

package/lib/components/variables/utils.js

@@ -92,6 +92,8 @@ const buildContextSelectorItems = /* @__PURE__ */ __name((metaTree) => {
     return [];
   }
   const convertNode = /* @__PURE__ */ __name((node) => {
+    const hidden = !!(typeof node.hidden === "function" ? node.hidden() : node.hidden);
+    if (hidden) return null;
     const hasChildren = !!(node.children && (typeof node.children === "function" || Array.isArray(node.children) && node.children.length > 0));
     const disabled = !!(typeof node.disabled === "function" ? node.disabled() : node.disabled);
     const option = {
@@ -103,11 +105,11 @@ const buildContextSelectorItems = /* @__PURE__ */ __name((metaTree) => {
       disabled
     };
     if (Array.isArray(node.children) && node.children.length > 0) {
-      option.children = node.children.map((child) => convertNode(child));
+      option.children = node.children.map((child) => convertNode(child)).filter((item) => item !== null);
     }
     return option;
   }, "convertNode");
-  return metaTree.map((node) => convertNode(node));
+  return metaTree.map((node) => convertNode(node)).filter((item) => item !== null);
 }, "buildContextSelectorItems");
 const preloadContextSelectorPath = /* @__PURE__ */ __name(async (options, pathSegments, triggerUpdate) => {
   if (!options || !Array.isArray(options) || !pathSegments || pathSegments.length === 0) return;

package/lib/data-source/index.d.ts

@@ -49,7 +49,9 @@ export declare class DataSource {
     addCollection(collection: Collection | CollectionOptions): void;
     updateCollection(newOptions: CollectionOptions): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     removeCollection(name: string): void;
     clearCollections(): void;
     setOptions(newOptions?: any): void;
@@ -68,14 +70,46 @@ export declare class CollectionManager {
     get flowEngine(): FlowEngine;
     addCollection(collection: Collection | CollectionOptions): void;
     removeCollection(name: string): void;
-    updateCollection(newOptions: CollectionOptions): void;
+    updateCollection(newOptions: CollectionOptions, options?: {
+        clearFields?: boolean;
+    }): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     sortCollectionsByInherits(collections: CollectionOptions[]): CollectionOptions[];
     getCollection(name: string): Collection | undefined;
     getCollections(): Collection[];
     clearCollections(): void;
     getAssociation(associationName: string): CollectionField | undefined;
+    getChildrenCollections(name: any): any[];
+    getCollectionFieldsOptions(collectionName: string, type?: string | string[], interfaces?: string | string[], opts?: {
+        dataSource?: string;
+        cached?: Record<string, any>;
+        collectionNames?: string[];
+        /**
+         * 为 true 时允许查询所有关联字段
+         * 为 Array<string> 时仅允许查询指定的关联字段
+         */
+        association?: boolean | string[];
+        /**
+         * Max depth of recursion
+         */
+        maxDepth?: number;
+        allowAllTypes?: boolean;
+        /**
+         * 排除这些接口的字段
+         */
+        exceptInterfaces?: string[];
+        /**
+         * field value 的前缀，用 . 连接，比如 a.b.c
+         */
+        prefixFieldValue?: string;
+        /**
+         * 是否使用 prefixFieldValue 作为 field value
+         */
+        usePrefix?: boolean;
+    }): any;
 }
 export declare class Collection {
     fields: Map<string, CollectionField>;
@@ -83,7 +117,9 @@ export declare class Collection {
     inherits: Map<string, Collection>;
     dataSource: DataSource;
     constructor(options?: Record<string, any>);
+    clone(): Collection;
     getFilterByTK(record: any): any;
+    get titleableFields(): CollectionField[];
     get hidden(): any;
     get flowEngine(): FlowEngine;
     get collectionManager(): CollectionManager;
@@ -97,7 +133,9 @@ export declare class Collection {
     get titleCollectionField(): CollectionField;
     initInherits(): void;
     setDataSource(dataSource: DataSource): void;
-    setOptions(newOptions?: any): void;
+    setOptions(newOptions?: any, options?: {
+        clearFields?: boolean;
+    }): void;
     getFields(): CollectionField[];
     getToOneAssociationFields(): CollectionField[];
     getAssociationFields(types?: any[]): CollectionField[];
@@ -140,6 +178,7 @@ export declare class CollectionField {
     get resourceName(): string;
     get collectionName(): any;
     get readonly(): any;
+    get titleable(): boolean;
     get fullpath(): string;
     get name(): any;
     get type(): any;

package/lib/data-source/index.js

@@ -153,8 +153,8 @@ const _DataSource = class _DataSource {
   upsertCollection(options) {
     return this.collectionManager.upsertCollection(options);
   }
-  upsertCollections(collections) {
-    return this.collectionManager.upsertCollections(collections);
+  upsertCollections(collections, options = {}) {
+    return this.collectionManager.upsertCollections(collections, options);
   }
   removeCollection(name) {
     return this.collectionManager.removeCollection(name);
@@ -171,7 +171,7 @@ const _DataSource = class _DataSource {
     const fieldName = otherKeys.join(".");
     const collection = this.getCollection(collectionName);
     if (!collection) {
-      throw new Error(`Collection ${collectionName} not found in data source ${this.key}`);
+      return;
     }
     const field = collection.getFieldByPath(fieldName);
     if (!field) {
@@ -205,12 +205,12 @@ const _CollectionManager = class _CollectionManager {
   removeCollection(name) {
     this.collections.delete(name);
   }
-  updateCollection(newOptions) {
+  updateCollection(newOptions, options = {}) {
     const collection = this.getCollection(newOptions.name);
     if (!collection) {
       throw new Error(`Collection ${newOptions.name} not found`);
     }
-    collection.setOptions(newOptions);
+    collection.setOptions(newOptions, options);
   }
   upsertCollection(options) {
     if (this.collections.has(options.name)) {
@@ -220,10 +220,10 @@ const _CollectionManager = class _CollectionManager {
     }
     return this.getCollection(options.name);
   }
-  upsertCollections(collections) {
+  upsertCollections(collections, options = {}) {
     for (const collection of (0, import_sortCollectionsByInherits.sortCollectionsByInherits)(collections)) {
       if (this.collections.has(collection.name)) {
-        this.updateCollection(collection);
+        this.updateCollection(collection, options);
       } else {
         this.addCollection(collection);
       }
@@ -300,6 +300,74 @@ const _CollectionManager = class _CollectionManager {
     }
     return collection.getField(fieldName);
   }
+  getChildrenCollections(name) {
+    const childrens = [];
+    const collections = Array.from(this.collections.values());
+    const getChildrens = /* @__PURE__ */ __name((name2) => {
+      const inheritCollections = collections.filter((v) => {
+        var _a;
+        return (_a = v.options.inherits) == null ? void 0 : _a.includes(name2);
+      });
+      inheritCollections.forEach((v) => {
+        const collectionKey = v.name;
+        childrens.push(v);
+        return getChildrens(collectionKey);
+      });
+      return childrens;
+    }, "getChildrens");
+    return getChildrens(name);
+  }
+  getCollectionFieldsOptions(collectionName, type, interfaces, opts) {
+    var _a;
+    const {
+      association = false,
+      cached = {},
+      collectionNames = [collectionName],
+      maxDepth = 1,
+      allowAllTypes = false,
+      exceptInterfaces = [],
+      prefixFieldValue = "",
+      usePrefix = false,
+      dataSource: customDataSourceNameValue
+    } = opts || {};
+    if (collectionNames.length - 1 > maxDepth) {
+      return;
+    }
+    if (cached[collectionName]) {
+      return import_lodash.default.cloneDeep(cached[collectionName]);
+    }
+    const collection = this.getCollection(collectionName);
+    if (!collection) {
+      throw new Error(`Collection ${collectionName} not found`);
+    }
+    const fields = collection.getFields();
+    const options = (_a = fields == null ? void 0 : fields.filter(
+      (field) => field.interface && !exceptInterfaces.includes(field.interface) && (allowAllTypes || type && type.includes(field.type) || interfaces && interfaces.includes(field.interface) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false))
+    )) == null ? void 0 : _a.map((field) => {
+      var _a2, _b;
+      const result = {
+        value: usePrefix && prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name,
+        label: ((_a2 = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a2.title) || field.name,
+        ...field
+      };
+      if (association && field.target) {
+        result.children = collectionNames.includes(field.target) ? [] : this.getCollectionFieldsOptions(field.target, type, interfaces, {
+          ...opts,
+          cached,
+          dataSource: customDataSourceNameValue,
+          collectionNames: [...collectionNames, field.target],
+          prefixFieldValue: usePrefix ? prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name : "",
+          usePrefix
+        });
+        if (!((_b = result.children) == null ? void 0 : _b.length)) {
+          return null;
+        }
+      }
+      return result;
+    }).filter(Boolean);
+    cached[collectionName] = options;
+    return options;
+  }
 };
 __name(_CollectionManager, "CollectionManager");
 let CollectionManager = _CollectionManager;
@@ -314,6 +382,11 @@ const _Collection = class _Collection {
     this.inherits = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
     this.setFields(options.fields || []);
   }
+  clone() {
+    const newCollection = new _Collection(import_lodash.default.cloneDeep(this.options));
+    newCollection.setDataSource(this.dataSource);
+    return newCollection;
+  }
   getFilterByTK(record) {
     if (!record) {
       throw new Error("Record is required to get filterByTk");
@@ -329,6 +402,9 @@ const _Collection = class _Collection {
     }
     return import_lodash.default.pick(record, this.filterTargetKey);
   }
+  get titleableFields() {
+    return this.getFields().filter((field) => field.titleable);
+  }
   get hidden() {
     return this.options.hidden || false;
   }
@@ -378,10 +454,13 @@ const _Collection = class _Collection {
   setDataSource(dataSource) {
     this.dataSource = dataSource;
   }
-  setOptions(newOptions = {}) {
+  setOptions(newOptions = {}, options = {}) {
     Object.keys(this.options).forEach((key) => delete this.options[key]);
     Object.assign(this.options, newOptions);
     this.initInherits();
+    if (options.clearFields) {
+      this.clearFields();
+    }
     this.upsertFields(this.options.fields || []);
   }
   getFields() {
@@ -440,13 +519,12 @@ const _Collection = class _Collection {
     if (otherKeys.length === 0) {
       return field;
     }
-    if (!field.targetCollection) {
+    if (!(field == null ? void 0 : field.targetCollection)) {
       return null;
     }
     return field.targetCollection.getFieldByPath(otherKeys.join("."));
   }
   getField(fieldName) {
-    this.setFields(this.options.fields);
     return this.fields.get(fieldName);
   }
   getFullFieldPath(name) {
@@ -561,6 +639,9 @@ const _CollectionField = class _CollectionField {
     var _a;
     return this.options.readonly || ((_a = this.options.uiSchema) == null ? void 0 : _a["x-read-pretty"]) || false;
   }
+  get titleable() {
+    return !!(this.options.titleable ?? this.options.titleUsable);
+  }
   get fullpath() {
     return this.collection.dataSource.key + "." + this.collection.name + "." + this.name;
   }
@@ -595,7 +676,19 @@ const _CollectionField = class _CollectionField {
   }
   get enum() {
     var _a;
-    return ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
+    const options = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
+    if (this.type === "integer") {
+      return options.map((v) => {
+        if (typeof v !== "object") {
+          return v;
+        }
+        return {
+          ...v,
+          value: Number(v.value)
+        };
+      });
+    }
+    return options;
   }
   get defaultValue() {
     return this.options.defaultValue == null ? void 0 : this.options.defaultValue;

package/lib/data-source/jioToJoiSchema.js

@@ -104,6 +104,7 @@ function jioToJoiSchema(jioConfig) {
   });
   if (!hasRequired) {
     schema = schema.optional().allow("");
+    schema = schema.optional().allow(null);
   }
   return schema;
 }

package/lib/emitter.d.ts

@@ -13,4 +13,10 @@ export declare class Emitter {
     on(event: string, callback: (...args: any[]) => void): void;
     off(event: string, callback: (...args: any[]) => void): void;
     emit(event: string, ...args: any[]): void;
+    /**
+     * 异步触发事件：按监听器注册顺序依次（串行）等待执行完成。
+     * - 若某个监听器抛错/Promise reject，将中断后续执行并将异常向上传递（便于调用方统一处理）。
+     * - 当前不提供并行触发能力；如需并发处理，请在监听器内部自行管理（例如在回调内使用 Promise.all）。
+     */
+    emitAsync(event: string, ...args: any[]): Promise<void>;
 }

package/lib/emitter.js

@@ -49,6 +49,18 @@ const _Emitter = class _Emitter {
     }
     (this.events[event] || []).forEach((fn) => fn(...args));
   }
+  /**
+   * 异步触发事件：按监听器注册顺序依次（串行）等待执行完成。
+   * - 若某个监听器抛错/Promise reject，将中断后续执行并将异常向上传递（便于调用方统一处理）。
+   * - 当前不提供并行触发能力；如需并发处理，请在监听器内部自行管理（例如在回调内使用 Promise.all）。
+   */
+  async emitAsync(event, ...args) {
+    if (this.paused) return;
+    const listeners = (this.events[event] || []).slice();
+    for (const fn of listeners) {
+      await fn(...args);
+    }
+  }
 };
 __name(_Emitter, "Emitter");
 let Emitter = _Emitter;

package/lib/executor/FlowExecutor.js

@@ -46,6 +46,7 @@ var import_flowEngine = require("../flowEngine");
 var import_utils = require("../utils");
 var import_exceptions = require("../utils/exceptions");
 var import_setupRuntimeContextSteps = require("../utils/setupRuntimeContextSteps");
+var import_createEphemeralContext = require("../utils/createEphemeralContext");
 const _FlowExecutor = class _FlowExecutor {
   constructor(engine) {
     this.engine = engine;
@@ -116,6 +117,7 @@ const _FlowExecutor = class _FlowExecutor {
       let handler;
       let combinedParams = {};
       let useRawParams = step.useRawParams;
+      let runtimeCtx;
       if (step.use) {
         const actionDefinition = model.getAction(step.use);
         if (!actionDefinition) {
@@ -124,14 +126,19 @@ const _FlowExecutor = class _FlowExecutor {
           );
           continue;
         }
+        runtimeCtx = await (0, import_createEphemeralContext.createEphemeralContext)(flowContext, {
+          ...actionDefinition,
+          ...step
+        });
         handler = step.handler || actionDefinition.handler;
         useRawParams = useRawParams ?? actionDefinition.useRawParams;
-        const actionDefaultParams = await (0, import_utils.resolveDefaultParams)(actionDefinition.defaultParams, flowContext);
-        const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, flowContext);
+        const actionDefaultParams = await (0, import_utils.resolveDefaultParams)(actionDefinition.defaultParams, runtimeCtx);
+        const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, runtimeCtx);
         combinedParams = { ...actionDefaultParams, ...stepDefaultParams };
       } else if (step.handler) {
+        runtimeCtx = await (0, import_createEphemeralContext.createEphemeralContext)(flowContext, step);
         handler = step.handler;
-        const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, flowContext);
+        const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, runtimeCtx);
         combinedParams = { ...stepDefaultParams };
       } else {
         flowContext.logger.error(
@@ -144,10 +151,10 @@ const _FlowExecutor = class _FlowExecutor {
         combinedParams = { ...combinedParams, ...modelStepParams };
       }
       if (typeof useRawParams === "function") {
-        useRawParams = await useRawParams(flowContext);
+        useRawParams = await useRawParams(runtimeCtx);
       }
       if (!useRawParams) {
-        combinedParams = await flowContext.resolveJsonTemplate(combinedParams);
+        combinedParams = await runtimeCtx.resolveJsonTemplate(combinedParams);
       }
       try {
         if (!handler) {
@@ -156,7 +163,7 @@ const _FlowExecutor = class _FlowExecutor {
           );
           continue;
         }
-        const currentStepResult = handler(flowContext, combinedParams);
+        const currentStepResult = handler(runtimeCtx, combinedParams);
         const isAwait = step.isAwait !== false;
         lastResult = isAwait ? await currentStepResult : currentStepResult;
         stepResults[stepKey] = lastResult;
@@ -192,6 +199,12 @@ const _FlowExecutor = class _FlowExecutor {
     const runId = `${model.uid}-${eventName}-${Date.now()}`;
     const logger = model.context.logger;
     try {
+      await this.engine.emitter.emitAsync(`model:event:${eventName}:start`, {
+        uid: model.uid,
+        model,
+        runId,
+        inputArgs
+      });
       await ((_a = model.onDispatchEventStart) == null ? void 0 : _a.call(model, eventName, options, inputArgs));
     } catch (err) {
       if (isBeforeRender && err instanceof import_utils.FlowExitException) {
@@ -215,7 +228,21 @@ const _FlowExecutor = class _FlowExecutor {
     });
     const execute = /* @__PURE__ */ __name(async () => {
       if (sequential) {
-        const ordered = flows.slice().sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
+        const flowsWithIndex = flows.map((f, i) => ({ f, i }));
+        const ordered = flowsWithIndex.slice().sort((a, b) => {
+          var _a2, _b2;
+          const regA = a.f["flowRegistry"];
+          const regB = b.f["flowRegistry"];
+          const typeA = (_a2 = regA == null ? void 0 : regA.constructor) == null ? void 0 : _a2._type;
+          const typeB = (_b2 = regB == null ? void 0 : regB.constructor) == null ? void 0 : _b2._type;
+          const groupA = typeA === "instance" ? 0 : 1;
+          const groupB = typeB === "instance" ? 0 : 1;
+          if (groupA !== groupB) return groupA - groupB;
+          const sa = a.f.sort ?? 0;
+          const sb = b.f.sort ?? 0;
+          if (sa !== sb) return sa - sb;
+          return a.i - b.i;
+        }).map((x) => x.f);
         const results2 = [];
         for (const flow of ordered) {
           try {
@@ -268,6 +295,13 @@ const _FlowExecutor = class _FlowExecutor {
       } catch (hookErr) {
         logger.error({ err: hookErr }, `BaseModel.dispatchEvent: End hook error for event '${eventName}'`);
       }
+      await this.engine.emitter.emitAsync(`model:event:${eventName}:end`, {
+        uid: model.uid,
+        model,
+        runId,
+        inputArgs,
+        result
+      });
       return result;
     } catch (error) {
       try {
@@ -278,6 +312,13 @@ const _FlowExecutor = class _FlowExecutor {
         { err: error },
         `BaseModel.dispatchEvent: Error executing event '${eventName}' for model '${model.uid}':`
       );
+      await this.engine.emitter.emitAsync(`model:event:${eventName}:error`, {
+        uid: model.uid,
+        model,
+        runId,
+        inputArgs,
+        error
+      });
       if (throwOnError) throw error;
     }
   }