@nocobase/flow-engine 2.0.0-alpha.3 → 2.0.0-alpha.5

package/src/data-source/__tests__/sortCollectionsByInherits.test.ts

@@ -0,0 +1,125 @@
+/**
+ * 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 { describe, expect, it } from 'vitest';
+import { sortCollectionsByInherits } from '../sortCollectionsByInherits';
+
+describe('sortCollectionsByInherits', () => {
+  it('should sort collections by their inherits in correct order', () => {
+    const collections = [
+      { name: 'posts', inherits: [] },
+      { name: 'comments', inherits: ['posts'] },
+      { name: 'users', inherits: ['comments'] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['posts', 'comments', 'users']);
+  });
+
+  it('should handle collections with no inherits', () => {
+    const collections = [
+      { name: 'users', inherits: [] },
+      { name: 'posts', inherits: [] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['users', 'posts']);
+  });
+
+  it('should handle collections with undefined inherits', () => {
+    const collections = [{ name: 'users' }, { name: 'posts' }];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['users', 'posts']);
+  });
+
+  it('should handle complex inheritance chains', () => {
+    const collections = [
+      { name: 'base', inherits: [] },
+      { name: 'middle', inherits: ['base'] },
+      { name: 'top', inherits: ['middle'] },
+      { name: 'independent', inherits: [] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['base', 'middle', 'top', 'independent']);
+  });
+
+  it('should handle multiple inheritance', () => {
+    const collections = [
+      { name: 'user', inherits: [] },
+      { name: 'post', inherits: [] },
+      { name: 'comment', inherits: ['user', 'post'] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['user', 'post', 'comment']);
+  });
+
+  it('should throw error for circular dependencies', () => {
+    const collections = [
+      { name: 'a', inherits: ['b'] },
+      { name: 'b', inherits: ['a'] },
+    ];
+    expect(() => sortCollectionsByInherits(collections)).toThrow('Circular dependency detected');
+  });
+
+  it('should gracefully handle missing inherit collections', () => {
+    const collections = [
+      { name: 'posts', inherits: ['nonexistent'] },
+      { name: 'users', inherits: [] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['posts', 'users']);
+  });
+
+  it('should handle self-inheritance circular dependency', () => {
+    const collections = [{ name: 'posts', inherits: ['posts'] }];
+    expect(() => sortCollectionsByInherits(collections)).toThrow('Circular dependency detected');
+  });
+
+  it('should maintain order for collections without dependencies', () => {
+    const collections = [
+      { name: 'z', inherits: [] },
+      { name: 'a', inherits: [] },
+      { name: 'm', inherits: [] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['z', 'a', 'm']);
+  });
+
+  it('should handle empty collections array', () => {
+    const sorted = sortCollectionsByInherits([]);
+    expect(sorted).toEqual([]);
+  });
+
+  it('should handle collections with multiple missing inherits', () => {
+    const collections = [
+      { name: 'posts', inherits: ['missing1', 'missing2'] },
+      { name: 'users', inherits: ['missing3'] },
+      { name: 'comments', inherits: ['posts', 'missing4'] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['posts', 'users', 'comments']);
+  });
+
+  it('should handle mixed existing and missing inherits', () => {
+    const collections = [
+      { name: 'base', inherits: [] },
+      { name: 'middle', inherits: ['base', 'missing'] },
+      { name: 'top', inherits: ['middle'] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['base', 'middle', 'top']);
+  });
+
+  it('should handle all inherits missing', () => {
+    const collections = [
+      { name: 'posts', inherits: ['missing1', 'missing2'] },
+      { name: 'users', inherits: ['missing3'] },
+    ];
+    const sorted = sortCollectionsByInherits(collections);
+    expect(sorted.map((c) => c.name)).toEqual(['posts', 'users']);
+  });
+});

package/src/data-source/index.ts

@@ -11,6 +11,7 @@ import { observable } from '@formily/reactive';
 import _ from 'lodash';
 import { FlowEngine } from '../flowEngine';
 import { jioToJoiSchema } from './jioToJoiSchema';
+import { sortCollectionsByInherits } from './sortCollectionsByInherits';
 export interface DataSourceOptions extends Record<string, any> {
   key: string;
   displayName?: string;
@@ -227,7 +228,7 @@ export class CollectionManager {
   }
 
   upsertCollections(collections: CollectionOptions[]) {
-    for (const collection of this.sortCollectionsByInherits(collections)) {
+    for (const collection of sortCollectionsByInherits(collections)) {
       if (this.collections.has(collection.name)) {
         this.updateCollection(collection);
       } else {
@@ -400,7 +401,8 @@ export class Collection {
     for (const inherit of this.options.inherits || []) {
       const collection = this.collectionManager.getCollection(inherit);
       if (!collection) {
-        throw new Error(`Collection ${inherit} not found`);
+        console.warn(`Warning: Collection ${inherit} not found for collection ${this.name}`);
+        continue;
       }
       this.inherits.set(inherit, collection);
     }

package/src/data-source/sortCollectionsByInherits.ts

@@ -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.
+ */
+
+import { CollectionOptions } from '.';
+
+export function sortCollectionsByInherits(collections: CollectionOptions[]): CollectionOptions[] {
+  const sorted: CollectionOptions[] = [];
+  const visited = new Set<string>();
+  const visiting = new Set<string>();
+  const map = new Map<string, CollectionOptions>();
+
+  // Create a map for O(1) lookup
+  collections.forEach((col) => {
+    map.set(col.name, col);
+  });
+
+  const addToSorted = (col: CollectionOptions): void => {
+    // Check for circular dependency
+    if (visiting.has(col.name)) {
+      throw new Error(`Circular dependency detected: ${col.name} inherits from itself through a chain`);
+    }
+
+    // Skip if already processed
+    if (visited.has(col.name)) {
+      return;
+    }
+
+    // Mark as currently being processed
+    visiting.add(col.name);
+
+    // Process inherits first (dependencies)
+    const inherits = col.inherits || [];
+    for (const inheritName of inherits) {
+      const inheritCol = map.get(inheritName);
+      if (!inheritCol) {
+        console.warn(`Warning: Collection ${inheritName}, inherited by ${col.name}, not found.`);
+        continue;
+      }
+      addToSorted(inheritCol);
+      // Silently skip missing inherit collections
+    }
+
+    // Mark as processed and add to sorted array
+    visiting.delete(col.name);
+    visited.add(col.name);
+    sorted.push(col);
+  };
+
+  // Process all collections
+  for (const col of collections) {
+    addToSorted(col);
+  }
+
+  return sorted;
+}

package/src/flowContext.ts

@@ -1392,10 +1392,12 @@ export class FlowModelContext extends BaseFlowModelContext {
     this.defineProperty('model', {
       value: model,
     });
+    // 提供稳定的 ref 实例，确保渲染端与运行时上下文使用同一对象
+    const stableRef = createRef<HTMLDivElement>();
     this.defineProperty('ref', {
       get: () => {
         this.model['_refCreated'] = true;
-        return createRef<HTMLDivElement>();
+        return stableRef;
       },
     });
     this.defineMethod('openView', async function (uid: string, options) {
@@ -1516,10 +1518,12 @@ export class FlowForkModelContext extends BaseFlowModelContext {
     this.defineProperty('model', {
       get: () => this.fork,
     });
+    // 提供稳定的 ref 实例，确保渲染端与运行时上下文使用同一对象
+    const stableRef = createRef<HTMLDivElement>();
     this.defineProperty('ref', {
       get: () => {
         this.fork['_refCreated'] = true;
-        return createRef<HTMLDivElement>();
+        return stableRef;
       },
     });
     this.defineMethod('runjs', async (code, variables, options?: { version?: string }) => {

package/lib/components/dnd/getMousePositionOnElement.d.ts

@@ -1,50 +0,0 @@
-/**
- * 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.
- */
-export declare enum ElementPosition {
-    TOP = "top",
-    BOTTOM = "bottom",
-    LEFT = "left",
-    RIGHT = "right",
-    TOP_EDGE = "top-edge",
-    BOTTOM_EDGE = "bottom-edge",
-    LEFT_EDGE = "left-edge",
-    RIGHT_EDGE = "right-edge"
-}
-interface MousePosition {
-    x: number;
-    y: number;
-}
-interface ElementBounds {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-}
-interface GetMousePositionOptions {
-    initialMousePos: MousePosition;
-    mouseOffset: MousePosition;
-    elementBounds: ElementBounds;
-    edgeThreshold?: number;
-    topBottomHeightRatio?: number;
-}
-/**
- * 计算鼠标指针在元素上的位置
- *
- * 区域划分逻辑：
- * 1. 上区域：宽度=元素宽度，高度=元素高度*topBottomHeightRatio，位于元素顶部
- * 2. 下区域：宽度=元素宽度，高度=元素高度*topBottomHeightRatio，位于元素底部
- * 3. 左区域：剩余中间部分的左侧
- * 4. 右区域：剩余中间部分的右侧
- * 5. 边缘区域：在各个区域的边缘处，厚度为edgeThreshold
- *
- * @param options 配置选项
- * @returns 鼠标在元素上的位置
- */
-export declare const getMousePositionOnElement: ({ initialMousePos, mouseOffset, elementBounds, edgeThreshold, topBottomHeightRatio, }: GetMousePositionOptions) => ElementPosition;
-export {};

package/lib/components/dnd/getMousePositionOnElement.js

@@ -1,95 +0,0 @@
-/**
- * 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 getMousePositionOnElement_exports = {};
-__export(getMousePositionOnElement_exports, {
-  ElementPosition: () => ElementPosition,
-  getMousePositionOnElement: () => getMousePositionOnElement
-});
-module.exports = __toCommonJS(getMousePositionOnElement_exports);
-var ElementPosition = /* @__PURE__ */ ((ElementPosition2) => {
-  ElementPosition2["TOP"] = "top";
-  ElementPosition2["BOTTOM"] = "bottom";
-  ElementPosition2["LEFT"] = "left";
-  ElementPosition2["RIGHT"] = "right";
-  ElementPosition2["TOP_EDGE"] = "top-edge";
-  ElementPosition2["BOTTOM_EDGE"] = "bottom-edge";
-  ElementPosition2["LEFT_EDGE"] = "left-edge";
-  ElementPosition2["RIGHT_EDGE"] = "right-edge";
-  return ElementPosition2;
-})(ElementPosition || {});
-const getMousePositionOnElement = /* @__PURE__ */ __name(({
-  initialMousePos,
-  mouseOffset,
-  elementBounds,
-  edgeThreshold = 5,
-  topBottomHeightRatio = 0.25
-}) => {
-  const currentMouseX = initialMousePos.x + mouseOffset.x;
-  const currentMouseY = initialMousePos.y + mouseOffset.y;
-  const relativeX = currentMouseX - elementBounds.x;
-  const relativeY = currentMouseY - elementBounds.y;
-  if (relativeX < 0 || relativeX > elementBounds.width || relativeY < 0 || relativeY > elementBounds.height) {
-    if (relativeY < 0) return "top" /* TOP */;
-    if (relativeY > elementBounds.height) return "bottom" /* BOTTOM */;
-    if (relativeX < 0) return "left" /* LEFT */;
-    return "right" /* RIGHT */;
-  }
-  const topBottomHeight = elementBounds.height * topBottomHeightRatio;
-  const middleAreaTop = topBottomHeight;
-  const middleAreaBottom = elementBounds.height - topBottomHeight;
-  const middleAreaHeight = middleAreaBottom - middleAreaTop;
-  if (relativeY <= topBottomHeight) {
-    if (relativeY <= edgeThreshold) {
-      return "top-edge" /* TOP_EDGE */;
-    }
-    return "top" /* TOP */;
-  } else if (relativeY >= middleAreaBottom) {
-    if (relativeY >= elementBounds.height - edgeThreshold) {
-      return "bottom-edge" /* BOTTOM_EDGE */;
-    }
-    return "bottom" /* BOTTOM */;
-  } else {
-    const middleAreaCenterX = elementBounds.width / 2;
-    if (relativeX <= middleAreaCenterX) {
-      if (relativeX <= edgeThreshold) {
-        return "left-edge" /* LEFT_EDGE */;
-      }
-      return "left" /* LEFT */;
-    } else {
-      if (relativeX >= elementBounds.width - edgeThreshold) {
-        return "right-edge" /* RIGHT_EDGE */;
-      }
-      return "right" /* RIGHT */;
-    }
-  }
-}, "getMousePositionOnElement");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ElementPosition,
-  getMousePositionOnElement
-});

package/lib/components/dnd/moveBlock.d.ts

@@ -1,33 +0,0 @@
-/**
- * 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 { ElementPosition } from './getMousePositionOnElement';
-type MoveDirection = 'insert-row-above' | 'insert-row-below' | 'insert-same-column-above' | 'insert-same-column-below' | 'insert-column-left' | 'insert-column-right';
-interface GridLayoutData {
-    rows: Record<string, string[][]>;
-    sizes: Record<string, number[]>;
-}
-export declare const findModelUidPosition: (uid: string, rows: Record<string, string[][]>) => {
-    rowId: string;
-    columnIndex: number;
-    itemIndex: number;
-};
-export declare const moveBlock: ({ sourceUid, targetUid, direction, layoutData, }: {
-    sourceUid: string;
-    targetUid: string;
-    direction: MoveDirection;
-    layoutData: GridLayoutData;
-}) => GridLayoutData;
-/**
- * 将鼠标在元素上的位置转换为区块移动方向
- *
- * @param position 鼠标在元素上的位置
- * @returns 对应的移动方向
- */
-export declare const positionToDirection: (position: ElementPosition) => MoveDirection;
-export {};