feat: add docking type assertions

Quasi-Studio · Nov 10, 2023 · c07d92a · c07d92a
1 parent 8860d40
commit c07d92a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/packages/block-data/src/components/index.ts b/packages/block-data/src/components/index.ts
@@ -53,7 +53,7 @@ export default {
     output("value", "string"),
     event("onInput", t.string),
     method("clear", []),
-    plugin("validator", "validator"),
+    plugin("validator", "input-plugin"),
   ),
 
   appbar: component(

diff --git a/packages/northstar/src/blocks/component/updatePlugins.ts b/packages/northstar/src/blocks/component/updatePlugins.ts
@@ -6,6 +6,6 @@ export function updatePlugins(block: ComponentBlock) {
   const { plugins } = info;
 
   for (const plugin of plugins) {
-    block.dockableDirections.push(plugin.direction);
+    block.dockableDirections.push([plugin.direction, plugin.dataType]);
   }
 }
diff --git a/packages/northstar/src/blocks/special/state.ts b/packages/northstar/src/blocks/special/state.ts
@@ -10,7 +10,9 @@ export class StateBlock extends FuncBlockBase {
   placeholder = "initial value";
   outputLabel = "current";
 
-  dockableDirections: Direction[] = [Direction.LEFT];
+  dockableDirections: [Direction, string][] = [
+    [Direction.LEFT, "state-plugin"],
+  ];
 
   get slots(): string[] {
     return [];

diff --git a/packages/northstar/src/blocks/special/stateSetter.r.ts b/packages/northstar/src/blocks/special/stateSetter.r.ts
@@ -22,8 +22,8 @@ export class StateSetterBlock extends RectBlock {
   removable = true;
   duplicateable = true;
 
-  dockingDirections: Direction[] = [Direction.LEFT];
-  dockableDirections: Direction[] = [Direction.LEFT];
+  dockingDirections: [Direction, string][] = [[Direction.LEFT, "state-plugin"]];
+  dockableDirections: [Direction, string][] = [[Direction.LEFT, "state-plugin"]];
 
   get onsetSocket() {
     return this.getSocketByName("set") as MultiInSocket;

diff --git a/packages/northstar/src/blocks/special/validator.ts b/packages/northstar/src/blocks/special/validator.ts
@@ -9,8 +9,10 @@ export class ValidatorBlock extends FuncBlockBase {
 
   errorMessages: string = "Invalid input";
 
-  dockingDirections = [Direction.LEFT];
-  dockableDirections = [Direction.LEFT];
+  dockingDirections: [Direction, string][] = [[Direction.LEFT, "input-plugin"]];
+  dockableDirections: [Direction, string][] = [
+    [Direction.LEFT, "input-plugin"],
+  ];
 
   get slots(): string[] {
     return [];

diff --git a/packages/visual-flow/src/model/block.ts b/packages/visual-flow/src/model/block.ts
@@ -95,8 +95,8 @@ export abstract class Block extends ModelBase {
    */
   attached = false;
 
-  dockableDirections: Direction[] = [];
-  dockingDirections: Direction[] = [];
+  dockableDirections: [Direction, string][] = [];
+  dockingDirections: [Direction, string][] = [];
   dockedToBlock: Block | null = null;
   dockedByBlocks: [Direction, Block][] = [];
 
@@ -322,10 +322,12 @@ export abstract class Block extends ModelBase {
     if (this === block || this.predicting) return null;
     let minDockingDistanceSquare = MIN_DOCKING_DISTANCE_SQUARE;
     let dockingInfo: [Direction, Point] | null = null;
-    for (const direction of this.dockableDirections) {
+    for (const [direction, type] of this.dockableDirections) {
       if (
-        block.dockingDirections.includes(direction) &&
-        !this.dockedByBlocks.some(([d, _b]) => d === direction)
+        block.dockingDirections.some(
+          (d) => d[0] == direction && d[1] == type,
+        ) &&
+        this.dockedByBlocks.every(([d, _b]) => d !== direction)
       ) {
         const p1 = this.getDockedBenchmarkBoardPos(direction);
         const p2 = block.getDockingBenchmarkBoardPos(direction);
@@ -465,8 +467,8 @@ export interface BlockRecord {
   id: number;
   boardX: number;
   boardY: number;
-  dockableDirections: Direction[];
-  dockingDirection: Direction[];
+  dockableDirections: [Direction, string][];
+  dockingDirection: [Direction, string][];
   dockedToBlock: number | null;
   dockedByBlocks: [Direction, number][];
   sockets: [string, number][];