@nocobase/flow-engine 2.0.0-alpha.7 → 2.0.0-alpha.71

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) {
@@ -188,6 +188,8 @@ const _CollectionManager = class _CollectionManager {
     this.collections = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
   }
   collections;
+  allCollectionsInheritChain;
+  childrenCollectionsName = {};
   get flowEngine() {
     return this.dataSource.flowEngine;
   }
@@ -205,12 +207,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 +222,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 +302,93 @@ 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);
+  }
+  getChildrenCollectionsName(name, isSupportView = false) {
+    const cacheKey = isSupportView ? "supportView" : "notSupportView";
+    if (this.childrenCollectionsName[cacheKey]) {
+      return this.childrenCollectionsName[cacheKey].slice();
+    }
+    const children = [];
+    const collections = [...this.getCollections()];
+    const getChildrenCollectionsInner = /* @__PURE__ */ __name((collectionName) => {
+      const inheritCollections = collections.filter((v) => {
+        var _a;
+        return (_a = [...v.inherits]) == null ? void 0 : _a.includes(collectionName);
+      });
+      inheritCollections.forEach((v) => {
+        const collectionKey = v.name;
+        children.push(collectionKey);
+        return getChildrenCollectionsInner(collectionKey);
+      });
+      if (isSupportView) {
+        const sourceCollections = collections.filter((v) => {
+          var _a;
+          return ((_a = [...v.sources]) == null ? void 0 : _a.length) === 1 && (v == null ? void 0 : v.sources[0]) === collectionName;
+        });
+        sourceCollections.forEach((v) => {
+          const collectionKey = v.name;
+          children.push(v.name);
+          return getChildrenCollectionsInner(collectionKey);
+        });
+      }
+      return import_lodash.default.uniq(children);
+    }, "getChildrenCollectionsInner");
+    this.childrenCollectionsName[cacheKey] = getChildrenCollectionsInner(name);
+    return this.childrenCollectionsName[cacheKey];
+  }
+  getAllCollectionsInheritChain(name) {
+    if (this.allCollectionsInheritChain) {
+      return this.allCollectionsInheritChain.slice();
+    }
+    const collectionsInheritChain = [name];
+    const getInheritChain = /* @__PURE__ */ __name((name2) => {
+      const collection = this.getCollection(name2);
+      if (collection) {
+        const { inherits } = collection;
+        const children = this.getChildrenCollectionsName(name2);
+        if (inherits) {
+          for (let index = 0; index < inherits.length; index++) {
+            const collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+        if (children) {
+          for (let index = 0; index < children.length; index++) {
+            const collection2 = this.getCollection(children[index]);
+            const collectionKey = collection2.name;
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+      }
+      return collectionsInheritChain;
+    }, "getInheritChain");
+    this.allCollectionsInheritChain = getInheritChain(name);
+    return this.allCollectionsInheritChain || [];
+  }
 };
 __name(_CollectionManager, "CollectionManager");
 let CollectionManager = _CollectionManager;
@@ -314,6 +403,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");
@@ -327,8 +421,14 @@ 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() {
+    return this.getFields().filter((field) => field.titleable);
+  }
   get hidden() {
     return this.options.hidden || false;
   }
@@ -378,10 +478,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 +543,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 +663,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;
   }
@@ -587,7 +692,7 @@ const _CollectionField = class _CollectionField {
   }
   get title() {
     var _a, _b, _c;
-    const titleValue = ((_a = this.options) == null ? void 0 : _a.title) || ((_c = (_b = this.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.title) || this.options.name;
+    const titleValue = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b.title) || ((_c = this.options) == null ? void 0 : _c.title) || this.options.name;
     return this.flowEngine.translate(titleValue);
   }
   set title(value) {
@@ -595,7 +700,22 @@ 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;
+        }
+        if (v.value === null || v.value === void 0) {
+          return v;
+        }
+        return {
+          ...v,
+          value: Number(v.value)
+        };
+      });
+    }
+    return options;
   }
   get defaultValue() {
     return this.options.defaultValue == null ? void 0 : this.options.defaultValue;
@@ -621,7 +741,7 @@ const _CollectionField = class _CollectionField {
     return this.options.validation;
   }
   getComponentProps() {
-    var _a;
+    var _a, _b;
     const { type, target } = this.options;
     const componentProps = import_lodash.default.omitBy(
       {
@@ -630,7 +750,8 @@ const _CollectionField = class _CollectionField {
         mode: this.type === "array" ? "multiple" : void 0,
         multiple: target ? ["belongsToMany", "hasMany", "belongsToArray"].includes(type) : void 0,
         maxCount: target && !["belongsToMany", "hasMany", "belongsToArray"].includes(type) ? 1 : void 0,
-        target
+        target,
+        template: (_b = this.targetCollection) == null ? void 0 : _b.template
       },
       import_lodash.default.isUndefined
     );

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

@@ -8,19 +8,19 @@
  */
 import { FlowEngine } from '../flowEngine';
 import type { FlowModel } from '../models';
+import type { DispatchEventOptions } from '../types';
 export declare class FlowExecutor {
     private readonly engine;
     constructor(engine: FlowEngine);
+    private emitModelEventIf;
+    /** Cache wrapper for applyFlow cache lifecycle */
+    private withApplyFlowCache;
     /**
      * Execute a single flow on model.
      */
-    runFlow(model: FlowModel, flowKey: string, inputArgs?: Record<string, any>, runId?: string): Promise<any>;
-    /**
-     * Execute all auto-apply flows for model.
-     */
-    runAutoFlows(model: FlowModel, inputArgs?: Record<string, any>, useCache?: boolean): Promise<any[]>;
+    runFlow(model: FlowModel, flowKey: string, inputArgs?: Record<string, any>, runId?: string, eventName?: string): Promise<any>;
     /**
      * Dispatch an event to flows bound via flow.on and execute them.
      */
-    dispatchEvent(model: FlowModel, eventName: string, inputArgs?: Record<string, any>): Promise<void>;
+    dispatchEvent(model: FlowModel, eventName: string, inputArgs?: Record<string, any>, options?: DispatchEventOptions): Promise<any>;
 }