@metadev/daga 4.2.10 → 4.2.11

package/Changelog.md

@@ -6,6 +6,13 @@ List of releases and changes.
 
 ## Next release Joyeuse
 
+## v. 4.2.11
+
+- Version branch to avoid error in ng-packagr
+- Ensure that an array remains an array after cloning [#349](https://github.com/metadevpro/daga/pull/349)
+- When checking if a port is being shared, ignore connections that have been removed [#350](https://github.com/metadevpro/daga/pull/350)
+- Create `DiagramZoomEvent` to enable listening to user zooming and panning events [#351](https://github.com/metadevpro/daga/pull/351)
+
 ## v. 4.2.10
 
 - Fix errors with cloned objects containing functions [#345](https://github.com/metadevpro/daga/pull/345)

package/index.cjs.js

@@ -2529,18 +2529,18 @@ class DiagramConnection extends DiagramElement {
           // alternative start port not valid, it doesn't allow outgoing connections
           continue checkAlternativeStartPorts;
         }
-        if (!allowSharingPorts && (alternativeStartPort.incomingConnections.length === 1 && alternativeStartPort.incomingConnections[0] !== this || alternativeStartPort.incomingConnections.length > 1 || alternativeStartPort.outgoingConnections.length === 1 && alternativeStartPort.outgoingConnections[0] !== this || alternativeStartPort.outgoingConnections.length > 1)) {
+        if (!allowSharingPorts && (alternativeStartPort.incomingConnections.filter(c => !c.removed && c !== this).length > 0 || alternativeStartPort.outgoingConnections.filter(c => !c.removed && c !== this).length > 0)) {
           // alternative start port not valid, it already has other connections
           continue checkAlternativeStartPorts;
         }
         if (!allowSharingBothPorts) {
-          for (const connection of alternativeStartPort.outgoingConnections) {
+          for (const connection of alternativeStartPort.outgoingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.end === this.end) {
               // alternative start port not valid, there is a connection whose start and end matches the alternative start port and this connection's end
               continue checkAlternativeStartPorts;
             }
           }
-          for (const connection of alternativeStartPort.incomingConnections) {
+          for (const connection of alternativeStartPort.incomingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.start === this.end) {
               // alternative start port not valid, there is a connection whose start and end matches the alternative start port and this connection's end
               continue checkAlternativeStartPorts;
@@ -2567,18 +2567,18 @@ class DiagramConnection extends DiagramElement {
           // alternative end port not valid, it doesn't allow incoming connections
           continue checkAlternativeEndPorts;
         }
-        if (!allowSharingPorts && (alternativeEndPort.outgoingConnections.length === 1 && alternativeEndPort.outgoingConnections[0] !== this || alternativeEndPort.outgoingConnections.length > 1 || alternativeEndPort.incomingConnections.length === 1 && alternativeEndPort.incomingConnections[0] !== this || alternativeEndPort.incomingConnections.length > 1)) {
+        if (!allowSharingPorts && (alternativeEndPort.incomingConnections.filter(c => !c.removed && c !== this).length > 0 || alternativeEndPort.outgoingConnections.filter(c => !c.removed && c !== this).length > 0)) {
           // alternative end port not valid, it already has other connections
           continue checkAlternativeEndPorts;
         }
         if (!allowSharingBothPorts) {
-          for (const connection of alternativeEndPort.incomingConnections) {
+          for (const connection of alternativeEndPort.incomingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.start === this.start) {
               // alternative end port not valid, there is a connection whose start and end matches the alternative end port and this connection's start
               continue checkAlternativeEndPorts;
             }
           }
-          for (const connection of alternativeEndPort.outgoingConnections) {
+          for (const connection of alternativeEndPort.outgoingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.end === this.start) {
               // alternative end port not valid, there is a connection whose start and end matches the alternative end port and this connection's start
               continue checkAlternativeEndPorts;
@@ -6301,11 +6301,27 @@ class DiagramEvent {
  */
 exports.DiagramEvents = void 0;
 (function (DiagramEvents) {
-  DiagramEvents[DiagramEvents["DoubleClick"] = 0] = "DoubleClick";
-  DiagramEvents[DiagramEvents["SecondaryClick"] = 1] = "SecondaryClick";
-  DiagramEvents[DiagramEvents["Selection"] = 2] = "Selection";
-  DiagramEvents[DiagramEvents["Highlight"] = 3] = "Highlight";
+  DiagramEvents[DiagramEvents["Zoom"] = 0] = "Zoom";
+  DiagramEvents[DiagramEvents["DoubleClick"] = 1] = "DoubleClick";
+  DiagramEvents[DiagramEvents["SecondaryClick"] = 2] = "SecondaryClick";
+  DiagramEvents[DiagramEvents["Selection"] = 3] = "Selection";
+  DiagramEvents[DiagramEvents["Highlight"] = 4] = "Highlight";
 })(exports.DiagramEvents || (exports.DiagramEvents = {}));
+/**
+ * Diagram event which consists of the user zooming or panning.
+ */
+class DiagramZoomEvent extends DiagramEvent {
+  /**
+   * Create a diagram zoom event.
+   *
+   * @param coords .
+   */
+  constructor(coords, zoom) {
+    super(exports.DiagramEvents.Zoom);
+    this.coords = coords;
+    this.zoom = zoom;
+  }
+}
 /**
  * Diagram event which consists of the user performing a double click on the diagram.
  */
@@ -7697,6 +7713,7 @@ class DiagramCanvas {
       this.selectCanvasElements().attr('transform', transformAttribute);
       d3__namespace.select(`#${this.backgroundPatternId}`).attr('patternTransform', transformAttribute);
       this.contextMenu.close();
+      this.diagramEvent$.next(new DiagramZoomEvent([this.zoomTransform.x, this.zoomTransform.y], this.zoomTransform.k));
     }).on(exports.ZoomEvents.End, () => {
       setCursorStyle();
     }));
@@ -8357,7 +8374,7 @@ class DiagramCanvas {
       if (this.multipleSelectionOn || this.secondaryButton) {
         this.startMultipleSelection(event);
       } else {
-        if (this.canUserPerformAction(exports.DiagramActions.AddConnection) && (this.allowSharingPorts || d.incomingConnections.length === 0 && d.outgoingConnections.length === 0) && !d.removed) {
+        if (this.canUserPerformAction(exports.DiagramActions.AddConnection) && (this.allowSharingPorts || d.incomingConnections.filter(c => !c.removed).length === 0 && d.outgoingConnections.filter(c => !c.removed).length === 0) && !d.removed) {
           setCursorStyle(exports.CursorStyle.Grabbing);
           this.startConnection(d);
           // should be true after having called this.startConnection()
@@ -9107,13 +9124,13 @@ class DiagramCanvas {
         this.dropConnection();
         return;
       }
-      if (!this.allowSharingPorts && (port.incomingConnections.length > 0 || port.outgoingConnections.length > 0)) {
+      if (!this.allowSharingPorts && (port.incomingConnections.filter(c => !c.removed).length > 0 || port.outgoingConnections.filter(c => !c.removed).length > 0)) {
         this.dropConnection();
         return;
       }
       if (!this.allowSharingBothPorts && this.model.connections.find(c => {
         var _a, _b;
-        return c.start === ((_a = this.unfinishedConnection) === null || _a === void 0 ? void 0 : _a.start) && c.end === port || c.end === ((_b = this.unfinishedConnection) === null || _b === void 0 ? void 0 : _b.start) && c.start === port;
+        return !c.removed && (c.start === ((_a = this.unfinishedConnection) === null || _a === void 0 ? void 0 : _a.start) && c.end === port || c.end === ((_b = this.unfinishedConnection) === null || _b === void 0 ? void 0 : _b.start) && c.start === port);
       }) !== undefined) {
         this.dropConnection();
         return;
@@ -10325,6 +10342,7 @@ exports.DiagramSectionSet = DiagramSectionSet;
 exports.DiagramSelectionEvent = DiagramSelectionEvent;
 exports.DiagramUserHighlight = DiagramUserHighlight;
 exports.DiagramUserSelection = DiagramUserSelection;
+exports.DiagramZoomEvent = DiagramZoomEvent;
 exports.EditFieldAction = EditFieldAction;
 exports.ForceLayout = ForceLayout;
 exports.HorizontalLayout = HorizontalLayout;

package/index.esm.js

@@ -2508,18 +2508,18 @@ class DiagramConnection extends DiagramElement {
           // alternative start port not valid, it doesn't allow outgoing connections
           continue checkAlternativeStartPorts;
         }
-        if (!allowSharingPorts && (alternativeStartPort.incomingConnections.length === 1 && alternativeStartPort.incomingConnections[0] !== this || alternativeStartPort.incomingConnections.length > 1 || alternativeStartPort.outgoingConnections.length === 1 && alternativeStartPort.outgoingConnections[0] !== this || alternativeStartPort.outgoingConnections.length > 1)) {
+        if (!allowSharingPorts && (alternativeStartPort.incomingConnections.filter(c => !c.removed && c !== this).length > 0 || alternativeStartPort.outgoingConnections.filter(c => !c.removed && c !== this).length > 0)) {
           // alternative start port not valid, it already has other connections
           continue checkAlternativeStartPorts;
         }
         if (!allowSharingBothPorts) {
-          for (const connection of alternativeStartPort.outgoingConnections) {
+          for (const connection of alternativeStartPort.outgoingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.end === this.end) {
               // alternative start port not valid, there is a connection whose start and end matches the alternative start port and this connection's end
               continue checkAlternativeStartPorts;
             }
           }
-          for (const connection of alternativeStartPort.incomingConnections) {
+          for (const connection of alternativeStartPort.incomingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.start === this.end) {
               // alternative start port not valid, there is a connection whose start and end matches the alternative start port and this connection's end
               continue checkAlternativeStartPorts;
@@ -2546,18 +2546,18 @@ class DiagramConnection extends DiagramElement {
           // alternative end port not valid, it doesn't allow incoming connections
           continue checkAlternativeEndPorts;
         }
-        if (!allowSharingPorts && (alternativeEndPort.outgoingConnections.length === 1 && alternativeEndPort.outgoingConnections[0] !== this || alternativeEndPort.outgoingConnections.length > 1 || alternativeEndPort.incomingConnections.length === 1 && alternativeEndPort.incomingConnections[0] !== this || alternativeEndPort.incomingConnections.length > 1)) {
+        if (!allowSharingPorts && (alternativeEndPort.incomingConnections.filter(c => !c.removed && c !== this).length > 0 || alternativeEndPort.outgoingConnections.filter(c => !c.removed && c !== this).length > 0)) {
           // alternative end port not valid, it already has other connections
           continue checkAlternativeEndPorts;
         }
         if (!allowSharingBothPorts) {
-          for (const connection of alternativeEndPort.incomingConnections) {
+          for (const connection of alternativeEndPort.incomingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.start === this.start) {
               // alternative end port not valid, there is a connection whose start and end matches the alternative end port and this connection's start
               continue checkAlternativeEndPorts;
             }
           }
-          for (const connection of alternativeEndPort.outgoingConnections) {
+          for (const connection of alternativeEndPort.outgoingConnections.filter(c => !c.removed)) {
             if (connection !== this && connection.end === this.start) {
               // alternative end port not valid, there is a connection whose start and end matches the alternative end port and this connection's start
               continue checkAlternativeEndPorts;
@@ -6280,11 +6280,27 @@ class DiagramEvent {
  */
 var DiagramEvents;
 (function (DiagramEvents) {
-  DiagramEvents[DiagramEvents["DoubleClick"] = 0] = "DoubleClick";
-  DiagramEvents[DiagramEvents["SecondaryClick"] = 1] = "SecondaryClick";
-  DiagramEvents[DiagramEvents["Selection"] = 2] = "Selection";
-  DiagramEvents[DiagramEvents["Highlight"] = 3] = "Highlight";
+  DiagramEvents[DiagramEvents["Zoom"] = 0] = "Zoom";
+  DiagramEvents[DiagramEvents["DoubleClick"] = 1] = "DoubleClick";
+  DiagramEvents[DiagramEvents["SecondaryClick"] = 2] = "SecondaryClick";
+  DiagramEvents[DiagramEvents["Selection"] = 3] = "Selection";
+  DiagramEvents[DiagramEvents["Highlight"] = 4] = "Highlight";
 })(DiagramEvents || (DiagramEvents = {}));
+/**
+ * Diagram event which consists of the user zooming or panning.
+ */
+class DiagramZoomEvent extends DiagramEvent {
+  /**
+   * Create a diagram zoom event.
+   *
+   * @param coords .
+   */
+  constructor(coords, zoom) {
+    super(DiagramEvents.Zoom);
+    this.coords = coords;
+    this.zoom = zoom;
+  }
+}
 /**
  * Diagram event which consists of the user performing a double click on the diagram.
  */
@@ -7676,6 +7692,7 @@ class DiagramCanvas {
       this.selectCanvasElements().attr('transform', transformAttribute);
       d3.select(`#${this.backgroundPatternId}`).attr('patternTransform', transformAttribute);
       this.contextMenu.close();
+      this.diagramEvent$.next(new DiagramZoomEvent([this.zoomTransform.x, this.zoomTransform.y], this.zoomTransform.k));
     }).on(ZoomEvents.End, () => {
       setCursorStyle();
     }));
@@ -8336,7 +8353,7 @@ class DiagramCanvas {
       if (this.multipleSelectionOn || this.secondaryButton) {
         this.startMultipleSelection(event);
       } else {
-        if (this.canUserPerformAction(DiagramActions.AddConnection) && (this.allowSharingPorts || d.incomingConnections.length === 0 && d.outgoingConnections.length === 0) && !d.removed) {
+        if (this.canUserPerformAction(DiagramActions.AddConnection) && (this.allowSharingPorts || d.incomingConnections.filter(c => !c.removed).length === 0 && d.outgoingConnections.filter(c => !c.removed).length === 0) && !d.removed) {
           setCursorStyle(CursorStyle.Grabbing);
           this.startConnection(d);
           // should be true after having called this.startConnection()
@@ -9086,13 +9103,13 @@ class DiagramCanvas {
         this.dropConnection();
         return;
       }
-      if (!this.allowSharingPorts && (port.incomingConnections.length > 0 || port.outgoingConnections.length > 0)) {
+      if (!this.allowSharingPorts && (port.incomingConnections.filter(c => !c.removed).length > 0 || port.outgoingConnections.filter(c => !c.removed).length > 0)) {
         this.dropConnection();
         return;
       }
       if (!this.allowSharingBothPorts && this.model.connections.find(c => {
         var _a, _b;
-        return c.start === ((_a = this.unfinishedConnection) === null || _a === void 0 ? void 0 : _a.start) && c.end === port || c.end === ((_b = this.unfinishedConnection) === null || _b === void 0 ? void 0 : _b.start) && c.start === port;
+        return !c.removed && (c.start === ((_a = this.unfinishedConnection) === null || _a === void 0 ? void 0 : _a.start) && c.end === port || c.end === ((_b = this.unfinishedConnection) === null || _b === void 0 ? void 0 : _b.start) && c.start === port);
       }) !== undefined) {
         this.dropConnection();
         return;
@@ -10262,4 +10279,4 @@ const getLocationsOfNodes = model => {
   return locations;
 };
 
-export { ACTION_STACK_SIZE, ActionStack, AddConnectionAction, AddNodeAction, AdjacencyLayout, ApplyLayoutAction, BreadthAdjacencyLayout, BreadthLayout, ClosedShape, CollabClient, Corner, CursorStyle, DIAGRAM_FIELD_DEFAULTS, DagaExporter, DagaImporter, DiagramActionMethod, DiagramActions, DiagramCanvas, DiagramConnection, DiagramConnectionSet, DiagramConnectionType, DiagramContextMenu, DiagramDecorator, DiagramDecoratorSet, DiagramDoubleClickEvent, DiagramElement, DiagramElementSet, DiagramEntitySet, DiagramEvent, DiagramEvents, DiagramField, DiagramFieldSet, DiagramHighlightedEvent, DiagramModel, DiagramNode, DiagramNodeSet, DiagramNodeType, DiagramObject, DiagramObjectSet, DiagramPort, DiagramPortSet, DiagramPortType, DiagramSecondaryClickEvent, DiagramSection, DiagramSectionSet, DiagramSelectionEvent, DiagramUserHighlight, DiagramUserSelection, DragEvents, EditFieldAction, Events, ForceLayout, HorizontalAlign, HorizontalLayout, Keys, LineShape, LineStyle, MoveAction, PasteAction, PriorityLayout, Property, PropertySet, RemoveAction, SetGeometryAction, SetParentAction, Side, TreeLayout, Type, UpdateValuesAction, ValueSet, VerticalAlign, VerticalLayout, ZoomEvents, addIfNotExists, diff, equals, filterByOnlyAncestors, filterByOnlyDescendants, generalClosedPath, getBottomMargin, getBottomPadding$1 as getBottomPadding, getLeftMargin, getLeftPadding$1 as getLeftPadding, getLocationsOfNodes, getRightMargin, getRightPadding$1 as getRightPadding, getTopMargin, getTopPadding$1 as getTopPadding, isObject, layouts, linePath, lineStyleDasharray, removeIfExists, setCursorStyle };
+export { ACTION_STACK_SIZE, ActionStack, AddConnectionAction, AddNodeAction, AdjacencyLayout, ApplyLayoutAction, BreadthAdjacencyLayout, BreadthLayout, ClosedShape, CollabClient, Corner, CursorStyle, DIAGRAM_FIELD_DEFAULTS, DagaExporter, DagaImporter, DiagramActionMethod, DiagramActions, DiagramCanvas, DiagramConnection, DiagramConnectionSet, DiagramConnectionType, DiagramContextMenu, DiagramDecorator, DiagramDecoratorSet, DiagramDoubleClickEvent, DiagramElement, DiagramElementSet, DiagramEntitySet, DiagramEvent, DiagramEvents, DiagramField, DiagramFieldSet, DiagramHighlightedEvent, DiagramModel, DiagramNode, DiagramNodeSet, DiagramNodeType, DiagramObject, DiagramObjectSet, DiagramPort, DiagramPortSet, DiagramPortType, DiagramSecondaryClickEvent, DiagramSection, DiagramSectionSet, DiagramSelectionEvent, DiagramUserHighlight, DiagramUserSelection, DiagramZoomEvent, DragEvents, EditFieldAction, Events, ForceLayout, HorizontalAlign, HorizontalLayout, Keys, LineShape, LineStyle, MoveAction, PasteAction, PriorityLayout, Property, PropertySet, RemoveAction, SetGeometryAction, SetParentAction, Side, TreeLayout, Type, UpdateValuesAction, ValueSet, VerticalAlign, VerticalLayout, ZoomEvents, addIfNotExists, diff, equals, filterByOnlyAncestors, filterByOnlyDescendants, generalClosedPath, getBottomMargin, getBottomPadding$1 as getBottomPadding, getLeftMargin, getLeftPadding$1 as getLeftPadding, getLocationsOfNodes, getRightMargin, getRightPadding$1 as getRightPadding, getTopMargin, getTopPadding$1 as getTopPadding, isObject, layouts, linePath, lineStyleDasharray, removeIfExists, setCursorStyle };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@metadev/daga",
-  "version": "4.2.10",
+  "version": "4.2.11",
   "dependencies": {},
   "peerDependencies": {
     "d3": "^7.9.0",
     "rxjs": "~7.8.1",
-    "uuid": "^11.0.3"
+    "uuid": "^13.0.0"
   },
   "main": "./index.cjs.js",
   "typings": "./src/index.d.ts",

package/src/index.d.ts

@@ -18,7 +18,7 @@ export type { DiagramModelExporter } from './lib/diagram/converters/diagram-mode
 export type { DiagramModelImporter } from './lib/diagram/converters/diagram-model-importer';
 export { ActionStack, AddConnectionAction, AddNodeAction, ApplyLayoutAction, DiagramActionMethod, DiagramActions, EditFieldAction, MoveAction, PasteAction, RemoveAction, SetGeometryAction, SetParentAction, UpdateValuesAction } from './lib/diagram/diagram-action';
 export type { DiagramAction } from './lib/diagram/diagram-action';
-export { DiagramDoubleClickEvent, DiagramEvent, DiagramEvents, DiagramHighlightedEvent, DiagramSecondaryClickEvent, DiagramSelectionEvent } from './lib/diagram/diagram-event';
+export { DiagramDoubleClickEvent, DiagramEvent, DiagramEvents, DiagramHighlightedEvent, DiagramSecondaryClickEvent, DiagramSelectionEvent, DiagramZoomEvent } from './lib/diagram/diagram-event';
 export { AdjacencyLayout } from './lib/diagram/layout/adjacency-layout';
 export { BreadthAdjacencyLayout } from './lib/diagram/layout/breadth-adjacency-layout';
 export { BreadthLayout } from './lib/diagram/layout/breadth-layout';

package/src/lib/diagram/diagram-event.d.ts

@@ -16,10 +16,24 @@ export declare abstract class DiagramEvent {
  * @public
  */
 export declare enum DiagramEvents {
-    DoubleClick = 0,
-    SecondaryClick = 1,
-    Selection = 2,
-    Highlight = 3
+    Zoom = 0,
+    DoubleClick = 1,
+    SecondaryClick = 2,
+    Selection = 3,
+    Highlight = 4
+}
+/**
+ * Diagram event which consists of the user zooming or panning.
+ */
+export declare class DiagramZoomEvent extends DiagramEvent {
+    coords: Point;
+    zoom: number;
+    /**
+     * Create a diagram zoom event.
+     *
+     * @param coords .
+     */
+    constructor(coords: Point, zoom: number);
 }
 /**
  * Diagram event which consists of the user performing a double click on the diagram.