Release v3.4.2 (#1515)

CHANGELOG

@@ -1,3 +1,9 @@
+06-09-2021 (v3.4.2)
+  * dia.CellView - update typings for ES6 class extension
+  * dia.Cell -  fix toJSON() when defaults() is defined as a method
+  * util - prevent prototype pollution in `setByPath()`
+  * Vectorizer - fix multi-line text line heights when 100% of the line is annotated
+
 18-08-2021 (v3.4.1)
   * dia.ElementView - prevent unnecessary re-parenting after invalid un-embedding
   * dia.CellView - support calc() in `transform` attribute

dist/geometry.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.core.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public
@@ -7691,7 +7691,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 	                if (includeAnnotationIndices) { vTSpan.attr('annotations', annotation.annotations); }
 	                // Check for max font size
 	                fontSize = parseFloat(annotationAttrs['font-size']);
-	                if (fontSize === undefined) { fontSize = baseSize; }
+	                if (!isFinite(fontSize)) { fontSize = baseSize; }
 	                if (fontSize && fontSize > maxFontSize) { maxFontSize = fontSize; }
 	            } else {
 	                if (eol && j === lastJ) { annotation += eol; }
@@ -9900,6 +9900,9 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 	var isGetSafe = function(obj, key) {
 	    // Prevent prototype pollution
 	    // https://snyk.io/vuln/SNYK-JS-JSON8MERGEPATCH-1038399
+	    if (typeof key !== 'string' && typeof key !== 'number') {
+	        key = String(key);
+	    }
 	    if (key === 'constructor' && typeof obj[key] === 'function') {
 	        return false;
 	    }
@@ -12288,12 +12291,13 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 	    toJSON: function() {
 
-	        var defaultAttrs = this.constructor.prototype.defaults.attrs || {};
+	        var defaults = result(this.constructor.prototype, 'defaults');
+	        var defaultAttrs = defaults.attrs || {};
 	        var attrs = this.attributes.attrs;
 	        var finalAttrs = {};
 
 	        // Loop through all the attributes and
-	        // omit the default attributes as they are implicitly reconstructable by the cell 'type'.
+	        // omit the default attributes as they are implicitly reconstructible by the cell 'type'.
 	        forIn(attrs, function(attr, selector) {
 
 	            var defaultAttr = defaultAttrs[selector];
@@ -29766,7 +29770,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 		Boundary: Boundary
 	});
 
-	var version = "3.4.1";
+	var version = "3.4.2";
 
 	var Vectorizer = V;
 	var layout = { PortLabel: PortLabel, Port: Port };

dist/joint.d.ts

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public
@@ -24,6 +24,7 @@ export as namespace joint;
 
 export namespace g {
 
+    export type Shape = Path | Point | Line | Polyline | Rect | Ellipse;
     export interface PlainPoint {
 
         x: number;
@@ -947,6 +948,8 @@ export class Vectorizer {
 
     findIntersection(ref: g.PlainPoint, target: SVGElement | Vectorizer): g.PlainPoint | undefined;
 
+    toGeometryShape(): g.Shape;
+
     private setAttributes(attrs: { [key: string]: any }): this;
 
     private setAttribute(name: string, value: string): this;
@@ -1657,6 +1660,15 @@ export namespace dia {
 
         type FlagLabel = string | string[];
         type PresentationAttributes = { [key: string]: FlagLabel };
+
+        type NodeData = { [key: string]: any };
+
+        type NodeMetrics = {
+            data: NodeData;
+            boundingRect: g.Rect;
+            magnetMatrix: SVGMatrix;
+            geometryShape: g.Shape;
+        }
     }
 
     abstract class CellViewGeneric<T extends Cell> extends mvc.View<T> {
@@ -1665,9 +1677,9 @@ export namespace dia {
 
         paper: Paper | null;
 
-        initFlag: CellView.FlagLabel;
+        initFlag(): CellView.FlagLabel;
 
-        presentationAttributes: CellView.PresentationAttributes;
+        presentationAttributes(): CellView.PresentationAttributes;
 
         highlight(el?: SVGElement | JQuery | string, opt?: { [key: string]: any }): this;
 
@@ -1757,11 +1769,21 @@ export namespace dia {
 
         protected onmagnet(evt: dia.Event, x: number, y: number): void;
 
-        static addPresentationAttributes(attributes: CellView.PresentationAttributes): CellView.PresentationAttributes;
-
         protected getLinkEnd(magnet: SVGElement, x: number, y: number, link: dia.Link, endType: dia.LinkEnd): dia.Link.EndJSON;
 
+        protected getMagnetFromLinkEnd(end: dia.Link.EndJSON): SVGElement;
+
         protected customizeLinkEnd(end: dia.Link.EndJSON, magnet: SVGElement, x: number, y: number, link: dia.Link, endType: dia.LinkEnd): dia.Link.EndJSON;
+
+        protected cleanNodesCache(): void;
+
+        protected nodeCache(magnet: SVGElement): CellView.NodeMetrics;
+
+        protected getNodeData(magnet: SVGElement): CellView.NodeData;
+
+        protected getNodeShape(magnet: SVGElement): g.Shape;
+
+        static addPresentationAttributes(attributes: CellView.PresentationAttributes): CellView.PresentationAttributes;
     }
 
     class CellView extends CellViewGeneric<Cell> {
@@ -1806,6 +1828,18 @@ export namespace dia {
 
         protected renderStringMarkup(markup: string): void;
 
+        protected updateTransformation(): void;
+
+        protected resize(): void;
+
+        protected translate(): void;
+
+        protected rotate(): void;
+
+        protected getTranslateString(): string;
+
+        protected getRotateString(): string;
+
         protected dragStart(evt: dia.Event, x: number, y: number): void;
 
         protected dragMagnetStart(evt: dia.Event, x: number, y: number): void;

dist/joint.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public
@@ -7832,7 +7832,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 	                if (includeAnnotationIndices) { vTSpan.attr('annotations', annotation.annotations); }
 	                // Check for max font size
 	                fontSize = parseFloat(annotationAttrs['font-size']);
-	                if (fontSize === undefined) { fontSize = baseSize; }
+	                if (!isFinite(fontSize)) { fontSize = baseSize; }
 	                if (fontSize && fontSize > maxFontSize) { maxFontSize = fontSize; }
 	            } else {
 	                if (eol && j === lastJ) { annotation += eol; }
@@ -10041,6 +10041,9 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 	var isGetSafe = function(obj, key) {
 	    // Prevent prototype pollution
 	    // https://snyk.io/vuln/SNYK-JS-JSON8MERGEPATCH-1038399
+	    if (typeof key !== 'string' && typeof key !== 'number') {
+	        key = String(key);
+	    }
 	    if (key === 'constructor' && typeof obj[key] === 'function') {
 	        return false;
 	    }
@@ -12429,12 +12432,13 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 	    toJSON: function() {
 
-	        var defaultAttrs = this.constructor.prototype.defaults.attrs || {};
+	        var defaults = result(this.constructor.prototype, 'defaults');
+	        var defaultAttrs = defaults.attrs || {};
 	        var attrs = this.attributes.attrs;
 	        var finalAttrs = {};
 
 	        // Loop through all the attributes and
-	        // omit the default attributes as they are implicitly reconstructable by the cell 'type'.
+	        // omit the default attributes as they are implicitly reconstructible by the cell 'type'.
 	        forIn(attrs, function(attr, selector) {
 
 	            var defaultAttr = defaultAttrs[selector];
@@ -31335,7 +31339,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 		Boundary: Boundary
 	});
 
-	var version = "3.4.1";
+	var version = "3.4.2";
 
 	var Vectorizer = V;
 	var layout = { PortLabel: PortLabel, Port: Port };

dist/joint.layout.DirectedGraph.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.nowrap.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public
@@ -7829,7 +7829,7 @@ var joint = (function (exports, Backbone, _, $) {
 	                if (includeAnnotationIndices) { vTSpan.attr('annotations', annotation.annotations); }
 	                // Check for max font size
 	                fontSize = parseFloat(annotationAttrs['font-size']);
-	                if (fontSize === undefined) { fontSize = baseSize; }
+	                if (!isFinite(fontSize)) { fontSize = baseSize; }
 	                if (fontSize && fontSize > maxFontSize) { maxFontSize = fontSize; }
 	            } else {
 	                if (eol && j === lastJ) { annotation += eol; }
@@ -10038,6 +10038,9 @@ var joint = (function (exports, Backbone, _, $) {
 	var isGetSafe = function(obj, key) {
 	    // Prevent prototype pollution
 	    // https://snyk.io/vuln/SNYK-JS-JSON8MERGEPATCH-1038399
+	    if (typeof key !== 'string' && typeof key !== 'number') {
+	        key = String(key);
+	    }
 	    if (key === 'constructor' && typeof obj[key] === 'function') {
 	        return false;
 	    }
@@ -12426,12 +12429,13 @@ var joint = (function (exports, Backbone, _, $) {
 
 	    toJSON: function() {
 
-	        var defaultAttrs = this.constructor.prototype.defaults.attrs || {};
+	        var defaults = result(this.constructor.prototype, 'defaults');
+	        var defaultAttrs = defaults.attrs || {};
 	        var attrs = this.attributes.attrs;
 	        var finalAttrs = {};
 
 	        // Loop through all the attributes and
-	        // omit the default attributes as they are implicitly reconstructable by the cell 'type'.
+	        // omit the default attributes as they are implicitly reconstructible by the cell 'type'.
 	        forIn(attrs, function(attr, selector) {
 
 	            var defaultAttr = defaultAttrs[selector];
@@ -31332,7 +31336,7 @@ var joint = (function (exports, Backbone, _, $) {
 		Boundary: Boundary
 	});
 
-	var version = "3.4.1";
+	var version = "3.4.2";
 
 	var Vectorizer = V;
 	var layout = { PortLabel: PortLabel, Port: Port };

dist/joint.shapes.devs.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.shapes.erd.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.shapes.fsa.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.shapes.org.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.shapes.pn.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

dist/joint.shapes.uml.js

@@ -1,4 +1,4 @@
-/*! JointJS v3.4.1 (2021-08-18) - JavaScript diagramming library
+/*! JointJS v3.4.2 (2021-09-06) - JavaScript diagramming library
 
 
 This Source Code Form is subject to the terms of the Mozilla Public