ngx-vflow 0.7.0 → 0.8.0

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

@@ -9,11 +9,11 @@ export declare class NodeComponent implements OnInit, AfterViewInit, OnDestroy,
     private handleService;
     private draggableService;
     private flowStatusService;
-    private flowEntitiesService;
     private nodeRenderingService;
     private flowSettingsService;
     private selectionService;
     private hostRef;
+    private connectionController;
     nodeModel: NodeModel;
     nodeHtmlTemplate?: TemplateRef<any>;
     nodeContentRef: ElementRef<SVGGraphicsElement>;
@@ -21,23 +21,15 @@ export declare class NodeComponent implements OnInit, AfterViewInit, OnDestroy,
     protected showMagnet: import("@angular/core").Signal<boolean>;
     protected styleWidth: import("@angular/core").Signal<string>;
     protected styleHeight: import("@angular/core").Signal<string>;
-    private subscription;
     ngOnInit(): void;
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
     protected startConnection(event: Event, handle: HandleModel): void;
-    protected endConnection(): void;
-    /**
-     * TODO srp
-     */
-    protected validateTargetHandle(targetHandle: HandleModel): void;
-    /**
-     * TODO srp
-     */
-    protected resetValidateTargetHandle(targetHandle: HandleModel): void;
+    protected validateConnection(handle: HandleModel): void;
+    protected resetValidateConnection(targetHandle: HandleModel): void;
+    protected endConnection(handle: HandleModel): void;
     protected pullNode(): void;
     protected selectNode(): void;
-    private setInitialHandles;
     static ɵfac: i0.ɵɵFactoryDeclaration<NodeComponent, 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

@@ -12,6 +12,7 @@ import { ConnectionModel } from '../../models/connection.model';
 import { NodeChange } from '../../types/node-change.type';
 import { EdgeChange } from '../../types/edge-change.type';
 import { Background } from '../../types/background.type';
+import { SpacePointContextDirective } from '../../directives/space-point-context.directive';
 import * as i0 from "@angular/core";
 import * as i1 from "../../directives/connection-controller.directive";
 import * as i2 from "../../directives/changes-controller.directive";
@@ -89,6 +90,7 @@ export declare class VflowComponent {
     protected edgeLabelHtmlDirective?: EdgeLabelHtmlTemplateDirective;
     protected connectionTemplateDirective?: ConnectionTemplateDirective;
     protected mapContext: MapContextDirective;
+    protected spacePointContext: SpacePointContextDirective;
     /**
      * Signal for reading viewport change
      */
@@ -144,6 +146,10 @@ export declare class VflowComponent {
      * Sync method to get detached edges
      */
     getDetachedEdges(): Edge[];
+    /**
+     * Convert point received from document to point on the flow
+     */
+    documentPointToFlowPoint(point: Point): Point;
     protected trackNodes(idx: number, { node }: NodeModel): Node<unknown>;
     protected trackEdges(idx: number, { edge }: EdgeModel): Edge<unknown>;
     static ɵfac: i0.ɵɵFactoryDeclaration<VflowComponent, never>;

package/lib/vflow/directives/connection-controller.directive.d.ts

@@ -1,5 +1,6 @@
 import { EventEmitter } from '@angular/core';
 import { Connection } from '../interfaces/connection.interface';
+import { HandleModel } from '../models/handle.model';
 import * as i0 from "@angular/core";
 export declare class ConnectionControllerDirective {
     /**
@@ -14,6 +15,11 @@ export declare class ConnectionControllerDirective {
     private statusService;
     private flowEntitiesService;
     protected connectEffect: import("@angular/core").EffectRef;
+    protected isStrictMode: import("@angular/core").Signal<boolean>;
+    startConnection(handle: HandleModel): void;
+    validateConnection(handle: HandleModel): void;
+    resetValidateConnection(targetHandle: HandleModel): void;
+    endConnection(handle: HandleModel): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ConnectionControllerDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<ConnectionControllerDirective, "[connectionController]", never, {}, { "onConnect": "onConnect"; }, never, never, true, never>;
 }

package/lib/vflow/directives/space-point-context.directive.d.ts

@@ -19,6 +19,7 @@ export declare class SpacePointContextDirective {
         target: Element | null;
         originalEvent: TouchEvent;
     } | undefined>;
+    documentPointToFlowPoint(documentPoint: Point): DOMPoint;
     static ɵfac: i0.ɵɵFactoryDeclaration<SpacePointContextDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<SpacePointContextDirective, "g[spacePointContext]", never, {}, {}, never, never, false, never>;
 }

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

@@ -1,3 +1,4 @@
+import { ConnectionMode } from "../types/connection-mode.type";
 import { Connection } from "./connection.interface";
 import { Curve, EdgeType } from "./edge.interface";
 import { Marker } from "./marker.interface";
@@ -7,4 +8,5 @@ export interface ConnectionSettings {
     type?: EdgeType;
     validator?: ConnectionValidatorFn;
     marker?: Marker;
+    mode?: ConnectionMode;
 }

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

@@ -0,0 +1,8 @@
+import { HandleModel } from "../models/handle.model";
+import { NodeModel } from "../models/node.model";
+export interface ConnectionInternal {
+    source: NodeModel;
+    target: NodeModel;
+    sourceHandle: HandleModel;
+    targetHandle: HandleModel;
+}

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

@@ -1,9 +1,12 @@
 import { ConnectionSettings, ConnectionValidatorFn } from "../interfaces/connection-settings.interface";
 import { Curve, EdgeType } from "../interfaces/edge.interface";
+import { ConnectionMode } from "../types/connection-mode.type";
 export declare class ConnectionModel {
-    connection: ConnectionSettings;
+    settings: ConnectionSettings;
     curve: Curve;
     type: EdgeType;
     validator: ConnectionValidatorFn;
-    constructor(connection: ConnectionSettings);
+    mode: ConnectionMode;
+    constructor(settings: ConnectionSettings);
+    private getValidators;
 }

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

@@ -3,7 +3,7 @@ import { NodeModel } from "./node.model";
 export type HandleState = 'valid' | 'invalid' | 'idle';
 export declare class HandleModel {
     rawHandle: NodeHandle;
-    private parentNode;
+    parentNode: NodeModel;
     readonly strokeWidth = 2;
     /**
      * Pre-computed size for default handle, changed dynamically

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

@@ -1,5 +1,6 @@
 import { NodeModel } from '../models/node.model';
 import { HandleModel } from '../models/handle.model';
+import { ConnectionInternal } from '../interfaces/connection.internal.interface';
 import * as i0 from "@angular/core";
 export interface FlowStatusIdle {
     state: 'idle';
@@ -7,37 +8,25 @@ export interface FlowStatusIdle {
 }
 export interface FlowStatusConnectionStart {
     state: 'connection-start';
-    payload: {
-        sourceNode: NodeModel;
-        sourceHandle: HandleModel;
-    };
+    payload: Omit<ConnectionInternal, 'target' | 'targetHandle'>;
 }
 export interface FlowStatusConnectionValidation {
     state: 'connection-validation';
-    payload: {
-        sourceNode: NodeModel;
-        targetNode: NodeModel;
-        sourceHandle: HandleModel;
-        targetHandle: HandleModel;
+    payload: ConnectionInternal & {
         valid: boolean;
     };
 }
 export interface FlowStatusConnectionEnd {
     state: 'connection-end';
-    payload: {
-        sourceNode: NodeModel;
-        targetNode: NodeModel;
-        sourceHandle: HandleModel;
-        targetHandle: HandleModel;
-    };
+    payload: ConnectionInternal;
 }
 export type FlowStatus = FlowStatusIdle | FlowStatusConnectionStart | FlowStatusConnectionValidation | FlowStatusConnectionEnd;
 export declare class FlowStatusService {
     readonly status: import("@angular/core").WritableSignal<FlowStatus>;
     setIdleStatus(): 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;
+    setConnectionStartStatus(source: NodeModel, sourceHandle: HandleModel): void;
+    setConnectionValidationStatus(valid: boolean, source: NodeModel, target: NodeModel, sourceHandle: HandleModel, targetHandle: HandleModel): void;
+    setConnectionEndStatus(source: NodeModel, target: NodeModel, sourceHandle: HandleModel, targetHandle: HandleModel): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FlowStatusService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<FlowStatusService>;
 }

package/lib/vflow/types/connection-mode.type.d.ts

@@ -0,0 +1 @@
+export type ConnectionMode = 'loose' | 'strict';

package/lib/vflow/utils/adjust-direction.d.ts

@@ -0,0 +1,11 @@
+import { ConnectionInternal } from "../interfaces/connection.internal.interface";
+/**
+ * This function contains a hack-y behavior.
+ * If the handles are of the same type (source-source or target-target),
+ * it returns nodes where source === target and
+ * handles where sourceHandle === targetHandle
+ *
+ * This leads to that notSelfValidator returns false for these cases,
+ * exactly what we need for strict connection type
+ */
+export declare function adjustDirection(connection: ConnectionInternal): ConnectionInternal;

package/package.json

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

package/public-api.d.ts

@@ -14,6 +14,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/types/background.type';
+export * from './lib/vflow/types/connection-mode.type';
 export * from './lib/vflow/components/vflow/vflow.component';
 export * from './lib/vflow/components/handle/handle.component';
 export * from './lib/vflow/public-components/custom-node.component';