ngx-vflow 0.1.14 → 0.2.0

package/lib/vflow/components/handle/handle.component.d.ts

@@ -0,0 +1,23 @@
+import { OnInit } from '@angular/core';
+import { Position } from '../../types/position.type';
+import * as i0 from "@angular/core";
+export declare class HandleComponent implements OnInit {
+    private handleService;
+    private element;
+    /**
+     * At what side of node this component should be placed
+     */
+    position: Position;
+    /**
+     * Source or target
+     */
+    type: 'source' | 'target';
+    /**
+     * Should be used if node has more than one source/target
+     */
+    id?: string;
+    ngOnInit(): void;
+    private parentRect;
+    static ɵfac: i0.ɵɵFactoryDeclaration<HandleComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<HandleComponent, "handle", never, { "position": { "alias": "position"; "required": true; }; "type": { "alias": "type"; "required": true; }; "id": { "alias": "id"; "required": false; }; }, {}, never, never, false, never>;
+}

package/lib/vflow/components/node/node.component.d.ts

@@ -1,53 +1,36 @@
-import { AfterViewInit, ElementRef, OnDestroy, OnInit, TemplateRef } from '@angular/core';
+import { AfterViewInit, ElementRef, Injector, OnDestroy, OnInit, TemplateRef } from '@angular/core';
 import { NodeModel } from '../../models/node.model';
+import { HandleService } from '../../services/handle.service';
+import { HandleModel } from '../../models/handle.model';
 import * as i0 from "@angular/core";
 export type HandleState = 'valid' | 'invalid' | 'idle';
 export declare class NodeComponent implements OnInit, AfterViewInit, OnDestroy {
+    protected handleService: HandleService;
+    protected injector: Injector;
     nodeModel: NodeModel;
     nodeHtmlTemplate?: TemplateRef<any>;
-    handleTemplate?: TemplateRef<any>;
     nodeContentRef: ElementRef<SVGGraphicsElement>;
     htmlWrapperRef: ElementRef<HTMLDivElement>;
-    sourceHandleRef: ElementRef<SVGGElement | SVGCircleElement>;
-    targetHandleRef: ElementRef<SVGGElement | SVGCircleElement>;
     private draggableService;
     private flowStatusService;
     private flowEntitiesService;
     private hostRef;
     protected showMagnet: import("@angular/core").Signal<boolean>;
-    protected readonly defaultHandleStrokeWidth = 2;
     private sourceHanldeState;
     private targetHandleState;
-    private sourceHanldeStateReadonly;
-    private targetHanldeStateReadonly;
     ngOnInit(): void;
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
-    protected startConnection(event: MouseEvent): void;
+    protected startConnection(event: MouseEvent, handle: HandleModel): void;
     protected endConnection(): void;
     /**
      * TODO srp
      */
-    protected validateTargetHandle(): void;
+    protected validateTargetHandle(targetHandle: HandleModel): void;
     /**
      * TODO srp
      */
     protected resetValidateTargetHandle(): void;
-    protected getHandleContext(type: 'source' | 'target'): {
-        $implicit: {
-            point: import("@angular/core").Signal<{
-                x: number;
-                y: number;
-            }>;
-            alignedPoint: import("@angular/core").Signal<{
-                x: number;
-                y: number;
-            }>;
-            state: import("@angular/core").Signal<HandleState>;
-        };
-    };
-    private setSourceHandleSize;
-    private setTargetHandleSize;
     static ɵfac: i0.ɵɵFactoryDeclaration<NodeComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<NodeComponent, "g[node]", never, { "nodeModel": { "alias": "nodeModel"; "required": false; }; "nodeHtmlTemplate": { "alias": "nodeHtmlTemplate"; "required": false; }; "handleTemplate": { "alias": "handleTemplate"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<NodeComponent, "g[node]", never, { "nodeModel": { "alias": "nodeModel"; "required": false; }; "nodeHtmlTemplate": { "alias": "nodeHtmlTemplate"; "required": false; }; }, {}, never, never, false, never>;
 }

package/lib/vflow/components/vflow/vflow.component.d.ts

@@ -4,7 +4,7 @@ import { MapContextDirective } from '../../directives/map-context.directive';
 import { NodeModel } from '../../models/node.model';
 import { Edge } from '../../interfaces/edge.interface';
 import { EdgeModel } from '../../models/edge.model';
-import { ConnectionTemplateDirective, EdgeLabelHtmlTemplateDirective, EdgeTemplateDirective, HandleTemplateDirective, NodeHtmlTemplateDirective } from '../../directives/template.directive';
+import { ConnectionTemplateDirective, EdgeLabelHtmlTemplateDirective, EdgeTemplateDirective, NodeHtmlTemplateDirective } from '../../directives/template.directive';
 import { HandlePositions } from '../../interfaces/handle-positions.interface';
 import { FlowModel } from '../../models/flow.model';
 import { Point } from '../../interfaces/point.interface';
@@ -47,7 +47,7 @@ export declare class VflowComponent {
      * For example, if you want to archieve right to left direction
      * then you need to pass these positions { source: 'left', target: 'right' }
      *
-     * ! Be carefult using this field, it may depricate in future releases !
+     * @deprecated
      */
     set handlePositions(handlePositions: HandlePositions);
     /**
@@ -75,7 +75,6 @@ export declare class VflowComponent {
     protected edgeTemplateDirective?: EdgeTemplateDirective;
     protected edgeLabelHtmlDirective?: EdgeLabelHtmlTemplateDirective;
     protected connectionTemplateDirective?: ConnectionTemplateDirective;
-    protected handleTemplateDirective?: HandleTemplateDirective;
     protected mapContext: MapContextDirective;
     /**
      * Signal for reading viewport change
@@ -130,6 +129,6 @@ export declare class VflowComponent {
     protected trackNodes(idx: number, { node }: NodeModel): string;
     protected trackEdges(idx: number, { edge }: EdgeModel): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<VflowComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<VflowComponent, "vflow", never, { "view": { "alias": "view"; "required": false; }; "minZoom": { "alias": "minZoom"; "required": false; }; "maxZoom": { "alias": "maxZoom"; "required": false; }; "handlePositions": { "alias": "handlePositions"; "required": false; }; "background": { "alias": "background"; "required": false; }; "connection": { "alias": "connection"; "required": false; }; "nodes": { "alias": "nodes"; "required": true; }; "edges": { "alias": "edges"; "required": false; }; }, {}, ["nodeHtmlDirective", "edgeTemplateDirective", "edgeLabelHtmlDirective", "connectionTemplateDirective", "handleTemplateDirective"], never, false, [{ directive: typeof i1.ConnectionControllerDirective; inputs: {}; outputs: { "onConnect": "onConnect"; }; }, { directive: typeof i2.ChangesControllerDirective; inputs: {}; outputs: { "onNodesChange": "onNodesChange"; "onEdgesChange": "onEdgesChange"; }; }]>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<VflowComponent, "vflow", never, { "view": { "alias": "view"; "required": false; }; "minZoom": { "alias": "minZoom"; "required": false; }; "maxZoom": { "alias": "maxZoom"; "required": false; }; "handlePositions": { "alias": "handlePositions"; "required": false; }; "background": { "alias": "background"; "required": false; }; "connection": { "alias": "connection"; "required": false; }; "nodes": { "alias": "nodes"; "required": true; }; "edges": { "alias": "edges"; "required": false; }; }, {}, ["nodeHtmlDirective", "edgeTemplateDirective", "edgeLabelHtmlDirective", "connectionTemplateDirective"], never, false, [{ directive: typeof i1.ConnectionControllerDirective; inputs: {}; outputs: { "onConnect": "onConnect"; }; }, { directive: typeof i2.ChangesControllerDirective; inputs: {}; outputs: { "onNodesChange": "onNodesChange"; "onEdgesChange": "onEdgesChange"; }; }]>;
     static ngAcceptInputType_connection: i3.ConnectionSettings;
 }

package/lib/vflow/interfaces/connection.interface.d.ts

@@ -1,4 +1,6 @@
 export interface Connection {
     source: string;
     target: string;
+    sourceHandle?: string;
+    targetHandle?: string;
 }

package/lib/vflow/models/flow.model.d.ts

@@ -3,6 +3,8 @@ import { HandlePositions } from "../interfaces/handle-positions.interface";
 export declare class FlowModel {
     /**
      * Global setting with handle positions. Nodes derive this value
+     *
+     * @deprecated
      */
     handlePositions: WritableSignal<HandlePositions>;
     /**

package/lib/vflow/models/handle.model.d.ts

@@ -0,0 +1,24 @@
+import { NodeHandle } from "../services/handle.service";
+import { NodeModel } from "./node.model";
+export declare class HandleModel {
+    rawHandle: NodeHandle;
+    private parentNode;
+    readonly strokeWidth = 2;
+    size: import("@angular/core").WritableSignal<{
+        width: number;
+        height: number;
+    }>;
+    offset: import("@angular/core").Signal<{
+        x: number;
+        y: number;
+    }>;
+    sizeOffset: import("@angular/core").Signal<{
+        x: number;
+        y: number;
+    }>;
+    pointAbsolute: import("@angular/core").Signal<{
+        x: number;
+        y: number;
+    }>;
+    constructor(rawHandle: NodeHandle, parentNode: NodeModel);
+}

package/lib/vflow/models/node.model.d.ts

@@ -1,5 +1,7 @@
 import { Node } from '../interfaces/node.interface';
 import { FlowModel } from './flow.model';
+import { NodeHandle } from '../services/handle.service';
+import { HandleModel } from './handle.model';
 export declare class NodeModel<T = unknown> {
     node: Node<T>;
     point: import("@angular/core").WritableSignal<{
@@ -15,48 +17,10 @@ export declare class NodeModel<T = unknown> {
         height: number;
     }>;
     pointTransform: import("@angular/core").Signal<string>;
-    sourceOffset: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    targetOffset: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    sourcePointAbsolute: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    targetPointAbsolute: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
     sourcePosition: import("@angular/core").Signal<import("ngx-vflow").Position>;
     targetPosition: import("@angular/core").Signal<import("ngx-vflow").Position>;
-    sourceHandleSize: import("@angular/core").WritableSignal<{
-        width: number;
-        height: number;
-    }>;
-    targetHandleSize: import("@angular/core").WritableSignal<{
-        width: number;
-        height: number;
-    }>;
-    sourceHandleOffset: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    targetHandleOffset: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    sourceOffsetAligned: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
-    targetOffsetAligned: import("@angular/core").Signal<{
-        x: number;
-        y: number;
-    }>;
+    handles: import("@angular/core").Signal<HandleModel[]>;
+    rawHandles: import("@angular/core").WritableSignal<NodeHandle[]>;
     draggable: boolean;
     readonly magnetRadius = 20;
     private flow;

package/lib/vflow/services/flow-status.service.d.ts

@@ -1,4 +1,5 @@
 import { NodeModel } from '../models/node.model';
+import { HandleModel } from '../models/handle.model';
 import * as i0 from "@angular/core";
 export interface FlowStatusIdle {
     state: 'idle';
@@ -8,6 +9,7 @@ export interface FlowStatusConnectionStart {
     state: 'connection-start';
     payload: {
         sourceNode: NodeModel;
+        sourceHandle: HandleModel;
     };
 }
 export interface FlowStatusConnectionValidation {
@@ -15,6 +17,8 @@ export interface FlowStatusConnectionValidation {
     payload: {
         sourceNode: NodeModel;
         targetNode: NodeModel;
+        sourceHandle: HandleModel;
+        targetHandle: HandleModel;
         valid: boolean;
     };
 }
@@ -23,15 +27,17 @@ export interface FlowStatusConnectionEnd {
     payload: {
         sourceNode: NodeModel;
         targetNode: NodeModel;
+        sourceHandle: HandleModel;
+        targetHandle: HandleModel;
     };
 }
 export type FlowStatus = FlowStatusIdle | FlowStatusConnectionStart | FlowStatusConnectionValidation | FlowStatusConnectionEnd;
 export declare class FlowStatusService {
     readonly status: import("@angular/core").WritableSignal<FlowStatus>;
     setIdleStatus(): void;
-    setConnectionStartStatus(sourceNode: NodeModel): void;
-    setConnectionValidationStatus(sourceNode: NodeModel, targetNode: NodeModel, valid: boolean): void;
-    setConnectionEndStatus(sourceNode: NodeModel, targetNode: NodeModel): void;
+    setConnectionStartStatus(sourceNode: NodeModel, sourceHandle: HandleModel): void;
+    setConnectionValidationStatus(valid: boolean, sourceNode: NodeModel, targetNode: NodeModel, sourceHandle: HandleModel, targetHandle: HandleModel): void;
+    setConnectionEndStatus(sourceNode: NodeModel, targetNode: NodeModel, sourceHandle: HandleModel, targetHandle: HandleModel): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FlowStatusService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<FlowStatusService>;
 }

package/lib/vflow/services/handle.service.d.ts

@@ -0,0 +1,22 @@
+import { Signal } from '@angular/core';
+import { Position } from '../types/position.type';
+import { HandleType } from '../types/handle-type.type';
+import { Point } from '../interfaces/point.interface';
+import * as i0 from "@angular/core";
+export interface NodeHandle {
+    position: Position;
+    type: HandleType;
+    parentPosition: Signal<Point>;
+    parentSize: Signal<{
+        width: number;
+        height: number;
+    }>;
+    id?: string;
+}
+export declare class HandleService {
+    readonly handles: import("@angular/core").WritableSignal<NodeHandle[]>;
+    createHandle(newHandle: NodeHandle): void;
+    destroyHandle(handleToDestoy: NodeHandle): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<HandleService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<HandleService>;
+}

package/lib/vflow/types/handle-type.type.d.ts

@@ -0,0 +1 @@
+export type HandleType = 'source' | 'target';

package/lib/vflow/vflow.module.d.ts

@@ -4,15 +4,16 @@ import * as i2 from "./components/node/node.component";
 import * as i3 from "./components/edge/edge.component";
 import * as i4 from "./components/edge-label/edge-label.component";
 import * as i5 from "./components/connection/connection.component";
-import * as i6 from "./components/defs/defs.component";
-import * as i7 from "./directives/space-point-context.directive";
-import * as i8 from "./directives/map-context.directive";
-import * as i9 from "./directives/reference.directive";
-import * as i10 from "./directives/root-svg-context.directive";
-import * as i11 from "./directives/template.directive";
-import * as i12 from "@angular/common";
+import * as i6 from "./components/handle/handle.component";
+import * as i7 from "./components/defs/defs.component";
+import * as i8 from "./directives/space-point-context.directive";
+import * as i9 from "./directives/map-context.directive";
+import * as i10 from "./directives/reference.directive";
+import * as i11 from "./directives/root-svg-context.directive";
+import * as i12 from "./directives/template.directive";
+import * as i13 from "@angular/common";
 export declare class VflowModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<VflowModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<VflowModule, [typeof i1.VflowComponent, typeof i2.NodeComponent, typeof i3.EdgeComponent, typeof i4.EdgeLabelComponent, typeof i5.ConnectionComponent, typeof i6.DefsComponent, typeof i7.SpacePointContextDirective, typeof i8.MapContextDirective, typeof i9.RootSvgReferenceDirective, typeof i10.RootSvgContextDirective, typeof i11.NodeHtmlTemplateDirective, typeof i11.EdgeLabelHtmlTemplateDirective, typeof i11.EdgeTemplateDirective, typeof i11.ConnectionTemplateDirective, typeof i11.HandleTemplateDirective], [typeof i12.CommonModule], [typeof i1.VflowComponent, typeof i11.NodeHtmlTemplateDirective, typeof i11.EdgeLabelHtmlTemplateDirective, typeof i11.EdgeTemplateDirective, typeof i11.ConnectionTemplateDirective, typeof i11.HandleTemplateDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<VflowModule, [typeof i1.VflowComponent, typeof i2.NodeComponent, typeof i3.EdgeComponent, typeof i4.EdgeLabelComponent, typeof i5.ConnectionComponent, typeof i6.HandleComponent, typeof i7.DefsComponent, typeof i8.SpacePointContextDirective, typeof i9.MapContextDirective, typeof i10.RootSvgReferenceDirective, typeof i11.RootSvgContextDirective, typeof i12.NodeHtmlTemplateDirective, typeof i12.EdgeLabelHtmlTemplateDirective, typeof i12.EdgeTemplateDirective, typeof i12.ConnectionTemplateDirective, typeof i12.HandleTemplateDirective], [typeof i13.CommonModule], [typeof i1.VflowComponent, typeof i6.HandleComponent, typeof i12.NodeHtmlTemplateDirective, typeof i12.EdgeLabelHtmlTemplateDirective, typeof i12.EdgeTemplateDirective, typeof i12.ConnectionTemplateDirective, typeof i12.HandleTemplateDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<VflowModule>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-vflow",
-  "version": "0.1.14",
+  "version": "0.2.0",
   "license": "MIT",
   "homepage": "https://www.ngx-vflow.org/",
   "author": "Artem Mangilev",

package/public-api.d.ts

@@ -13,6 +13,7 @@ export * from './lib/vflow/types/node-change.type';
 export * from './lib/vflow/types/edge-change.type';
 export * from './lib/vflow/types/position.type';
 export * from './lib/vflow/components/vflow/vflow.component';
+export * from './lib/vflow/components/handle/handle.component';
 export * from './lib/vflow/directives/template.directive';
 export * from './lib/vflow/directives/connection-controller.directive';
 export * from './lib/vflow/directives/changes-controller.directive';