@joint/core 4.1.3 → 4.2.0-alpha.1

package/dist/joint.d.ts

@@ -1,10 +1,10 @@
-/*! JointJS v4.1.3 (2025-02-04) - JavaScript diagramming library
-
+/*! JointJS v4.2.0-alpha.1 (2025-09-25) - JavaScript diagramming library
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
+
 // Definitions by:
 // Aidan Reel <http://github.com/areel>,
 // David Durman <http://github.com/DavidDurman>,
@@ -20,7 +20,11 @@ export as namespace joint;
 
 export declare namespace anchors {
 
-    export interface RotateAnchorArguments {
+    export interface ElementAnchorArguments {
+        useModelGeometry?: boolean;
+    }
+
+    export interface RotateAnchorArguments extends ElementAnchorArguments {
         rotate?: boolean;
     }
 
@@ -29,12 +33,13 @@ export declare namespace anchors {
         dy?: number | string;
     }
 
-    export interface PaddingAnchorArguments {
+    export interface PaddingAnchorArguments extends ElementAnchorArguments {
         padding?: number;
     }
 
     export interface MidSideAnchorArguments extends RotateAnchorArguments, PaddingAnchorArguments {
-
+        mode?: 'prefer-horizontal' | 'prefer-vertical' | 'horizontal' | 'vertical' | 'auto';
+        preferenceThreshold?: dia.Sides;
     }
 
     export interface ModelCenterAnchorArguments {
@@ -424,6 +429,8 @@ export declare namespace config {
     var classNamePrefix: string;
     var defaultTheme: string;
     var doubleTapInterval: number;
+    var cellMergeStrategy: util.MergeCustomizer | null;
+    var cellDefaultsMergeStrategy: util.MergeCustomizer | null;
 }
 
 export declare namespace connectionPoints {
@@ -936,6 +943,7 @@ export declare namespace dia {
         export interface GenericAttributes<T> {
             attrs?: T;
             z?: number;
+            layer?: string;
             [key: string]: any;
         }
 
@@ -1124,6 +1132,8 @@ export declare namespace dia {
 
         getBBox(): g.Rect;
 
+        getCenter(): g.Point;
+
         getPointFromConnectedLink(link: dia.Link, endType: dia.LinkEnd): g.Point;
 
         getPointRotatedAroundCenter(angle: number, x: number, y: number): g.Point;
@@ -1139,6 +1149,8 @@ export declare namespace dia {
 
         static define(type: string, defaults?: any, protoProps?: any, staticProps?: any): Cell.Constructor<Cell>;
 
+        static getAttributeDefinition(attrName: string): Cell.PresentationAttributeDefinition<CellView> | null;
+
         /**
          * @deprecated
          */
@@ -1163,23 +1175,40 @@ export declare namespace dia {
         export interface Attributes extends GenericAttributes<Cell.Selectors> {
         }
 
-        export type PortPositionCallback = (ports: Port[], bbox: g.Rect) => dia.Point[];
+        export interface ConstructorOptions extends Cell.ConstructorOptions {
+            portLayoutNamespace?: { [key: string]: layout.Port.LayoutFunction };
+            portLabelLayoutNamespace?: { [key: string]: layout.PortLabel.LayoutFunction };
+        }
+
+        export type PortPositionCallback = layout.Port.LayoutFunction;
+
+        export type PortLabelPositionCallback = layout.PortLabel.LayoutFunction;
 
         export interface PortPositionJSON {
             name?: string;
-            args?: { [key: string]: any };
+            args?: layout.Port.Options;
+        }
+
+        export interface PortLabelPositionJSON {
+            name?: string;
+            args?: layout.PortLabel.Options;
         }
 
         export type PositionType = string | PortPositionCallback | PortPositionJSON;
 
+        export type PortLabelPositionType = PortLabelPositionCallback | PortPositionJSON;
+
         export interface PortGroup {
             position?: PositionType;
             markup?: string | MarkupJSON;
             attrs?: Cell.Selectors;
-            label?: {
-                markup?: string | MarkupJSON;
-                position?: PositionType;
-            };
+            size?: Size;
+            label?: PortLabel;
+        }
+
+        export interface PortLabel {
+            markup?: string | MarkupJSON;
+            position?: PortLabelPositionType;
         }
 
         export interface Port {
@@ -1187,11 +1216,13 @@ export declare namespace dia {
             markup?: string | MarkupJSON;
             group?: string;
             attrs?: Cell.Selectors;
-            args?: { [key: string]: any };
-            label?: {
-                markup?: string | MarkupJSON;
-                position?: PositionType;
+            position?: {
+                args?: layout.Port.Options;
             };
+            /** @deprecated use `position.args` instead */
+            args?: layout.Port.Options;
+            size?: Size;
+            label?: PortLabel;
             z?: number | 'auto';
         }
 
@@ -1199,6 +1230,10 @@ export declare namespace dia {
             angle: number;
         }
 
+        export interface PortRect extends BBox {
+            angle: number;
+        }
+
         export interface TranslateOptions extends Cell.Options {
             restrictedArea?: BBox | Paper.PointConstraintCallback;
             transition?: Cell.TransitionOptions;
@@ -1213,13 +1248,32 @@ export declare namespace dia {
             direction?: Direction;
         }
 
-        export interface BBoxOptions extends Cell.EmbeddableOptions {
+        export interface FitToChildrenOptions {
+            filter?: (cell: Cell) => boolean;
+            deep?: boolean;
+            padding?: Padding;
+            minRect?: Partial<BBox>;
+            expandOnly?: boolean;
+            shrinkOnly?: boolean;
+        }
+
+        export interface FitParentOptions extends FitToChildrenOptions {
+            terminator?: Cell | Cell.ID;
+        }
+
+        export interface RotateOptions {
             rotate?: boolean;
         }
+
+        export interface BBoxOptions extends Cell.EmbeddableOptions, RotateOptions {
+
+        }
     }
 
     export class Element<A extends ObjectHash = Element.Attributes, S extends mvc.ModelSetOptions = dia.ModelSetOptions> extends Cell<A, S> {
 
+        constructor(attributes?: DeepPartial<A>, opt?: Element.ConstructorOptions);
+
         translate(tx: number, ty?: number, opt?: Element.TranslateOptions): this;
 
         position(opt?: Element.PositionOptions): g.Point;
@@ -1237,10 +1291,10 @@ export declare namespace dia {
 
         scale(scaleX: number, scaleY: number, origin?: Point, opt?: { [key: string]: any }): this;
 
-        fitEmbeds(opt?: { deep?: boolean, padding?: Padding, expandOnly?: boolean, shrinkOnly?: boolean }): this;
-        fitToChildren(opt?: { deep?: boolean, padding?: Padding, expandOnly?: boolean, shrinkOnly?: boolean }): this;
+        fitEmbeds(opt?: Element.FitToChildrenOptions): this;
+        fitToChildren(opt?: Element.FitToChildrenOptions): this;
 
-        fitParent(opt?: { deep?: boolean, padding?: Padding, expandOnly?: boolean, shrinkOnly?: boolean, terminator?: Cell | Cell.ID }): this;
+        fitParent(opt?: Element.FitParentOptions): this;
 
         getBBox(opt?: Element.BBoxOptions): g.Rect;
 
@@ -1267,6 +1321,14 @@ export declare namespace dia {
 
         getPortsPositions(groupName: string): { [id: string]: Element.PortPosition };
 
+        getPortRelativePosition(portId: string): Element.PortPosition;
+
+        getPortRelativeRect(portId: string): Element.PortRect;
+
+        getPortCenter(portId: string): g.Point;
+
+        getPortBBox(portId: string, opt?: Element.RotateOptions): g.Rect;
+
         getPortIndex(port: string | Element.Port): number;
 
         getPortGroupNames(): string[];
@@ -1549,6 +1611,10 @@ export declare namespace dia {
 
         isIntersecting(geometryShape: g.Shape, geometryData?: g.SegmentSubdivisionsOpt | null): boolean;
 
+        cleanNodesCache(): void;
+
+        cleanNodeCache(node: SVGElement): void
+
         protected isEnclosedIn(area: g.Rect): boolean;
 
         protected isInArea(area: g.Rect, options: g.StrictOpt): boolean;
@@ -1605,8 +1671,6 @@ export declare namespace dia {
 
         protected addLinkFromMagnet(magnet: SVGElement, x: number, y: number): LinkView;
 
-        protected cleanNodesCache(): void;
-
         protected nodeCache(magnet: SVGElement): CellView.NodeMetrics;
 
         protected getNodeData(magnet: SVGElement): CellView.NodeData;
@@ -1929,36 +1993,94 @@ export declare namespace dia {
             GRID = 'grid',
         }
 
-        export type UpdateStats = {
+        export interface RenderStats {
             priority: number;
             updated: number;
-            empty?: boolean;
-            postponed?: number;
-            unmounted?: number;
-            mounted?: number;
+        }
+
+        export interface UpdateVisibilityStats {
+            mounted: number;
+            unmounted: number;
+        }
+
+        export interface RenderBatchStats extends RenderStats, UpdateVisibilityStats {
+            postponed: number;
+            empty: boolean;
+        }
+
+        export type UpdateStats = RenderStats & Partial<RenderBatchStats> & {
             batches?: number;
         };
 
         export type ViewportCallback = (view: mvc.View<any, any>, isMounted: boolean, paper: Paper) => boolean;
+        export type CellVisibilityCallback = (cell: Cell, isMounted: boolean, paper: Paper) => boolean;
         export type ProgressCallback = (done: boolean, processed: number, total: number, stats: UpdateStats, paper: Paper) => void;
         export type BeforeRenderCallback = (opt: { [key: string]: any }, paper: Paper) => void;
         export type AfterRenderCallback = (stats: UpdateStats, opt: { [key: string]: any }, paper: Paper) => void;
 
-        export interface FreezeOptions {
-            key?: string;
+        export interface CellVisibilityOptions {
+            cellVisibility?: CellVisibilityCallback | null;
+
+            /** @deprecated disable `legacyMode` and use `cellVisibility` instead */
+            viewport?: ViewportCallback | null;
         }
 
-        export interface UnfreezeOptions {
-            key?: string;
+        export interface MountOptions {
             mountBatchSize?: number;
+        }
+
+        export interface UnmountOptions {
             unmountBatchSize?: number;
+        }
+
+        export interface BatchSizeOptions {
             batchSize?: number;
-            viewport?: ViewportCallback;
-            progress?: ProgressCallback;
+        }
+
+        export interface BeforeRenderOptions {
             beforeRender?: BeforeRenderCallback;
+        }
+
+        export interface AfterRenderOptions {
             afterRender?: AfterRenderCallback;
         }
 
+        export interface RenderCallbackOptions extends BeforeRenderOptions, AfterRenderOptions, mvc.Silenceable {
+
+        }
+
+        export interface KeyOptions {
+            key?: string;
+        }
+
+        export interface UpdateViewOptions {
+            [key: string]: any;
+        }
+
+        export interface UpdateViewsBatchOptions extends UpdateViewOptions, BatchSizeOptions, CellVisibilityOptions {
+
+        }
+
+        export interface UpdateViewsOptions extends UpdateViewsBatchOptions, RenderCallbackOptions {
+
+        }
+
+        export interface UpdateViewsAsyncOptions extends UpdateViewsBatchOptions, ScheduleCellsVisibilityUpdateOptions, RenderCallbackOptions {
+            progress?: ProgressCallback;
+        }
+
+        export interface ScheduleCellsVisibilityUpdateOptions extends CellVisibilityOptions, MountOptions, UnmountOptions {
+
+        }
+
+        export interface FreezeOptions extends KeyOptions {
+
+        }
+
+        export interface UnfreezeOptions extends KeyOptions, UpdateViewsAsyncOptions, UpdateViewsOptions {
+
+        }
+
         export interface SnapLinksOptions {
             radius?: number;
             findInAreaOptions?: FindInAreaOptions;
@@ -1968,8 +2090,9 @@ export declare namespace dia {
         export type RestrictTranslateCallback = (elementView: ElementView, x0: number, y0: number) => BBox | boolean | PointConstraintCallback;
         export type FindParentByType = 'bbox' | 'pointer' | PositionName;
         export type FindParentByCallback = ((this: dia.Graph, elementView: ElementView, evt: dia.Event, x: number, y: number) => Cell[]);
+        export type MeasureNodeCallback = (node: SVGGraphicsElement, cellView: dia.CellView) => g.Rect;
 
-        export interface Options extends mvc.ViewOptions<Graph> {
+        export interface Options extends mvc.ViewOptions<Graph>, CellVisibilityOptions, BeforeRenderOptions, AfterRenderOptions {
             // appearance
             width?: Dimension;
             height?: Dimension;
@@ -2003,6 +2126,7 @@ export declare namespace dia {
             // views
             elementView?: typeof ElementView | ((element: Element) => typeof ElementView);
             linkView?: typeof LinkView | ((link: Link) => typeof LinkView);
+            measureNode?: MeasureNodeCallback;
             // embedding
             embeddingMode?: boolean;
             frontParentOnly?: boolean;
@@ -2030,14 +2154,17 @@ export declare namespace dia {
             sorting?: sorting;
             frozen?: boolean;
             autoFreeze?: boolean;
-            viewport?: ViewportCallback | null;
+            viewManagement?: ViewManagementOptions | boolean;
             onViewUpdate?: (view: mvc.View<any, any>, flag: number, priority: number, opt: { [key: string]: any }, paper: Paper) => void;
             onViewPostponed?: (view: mvc.View<any, any>, flag: number, paper: Paper) => boolean;
-            beforeRender?: Paper.BeforeRenderCallback;
-            afterRender?: Paper.AfterRenderCallback;
             overflow?: boolean;
         }
 
+        export interface ViewManagementOptions {
+            lazyInitialize?: boolean;
+            disposeHidden?: boolean;
+        }
+
         export interface TransformToFitContentOptions {
             padding?: Padding;
             preserveAspectRatio?: boolean;
@@ -2170,6 +2297,17 @@ export declare namespace dia {
 
         export interface FindInAreaOptions extends Graph.FindInAreaOptions, BufferOptions {
         }
+
+        export interface FindClosestMagnetToPointOptions {
+            radius?: number;
+            findInAreaOptions?: FindInAreaOptions;
+            filter?: (view: CellView, magnet: SVGElement) => boolean;
+        }
+
+        export interface ClosestMagnet {
+            view: CellView;
+            magnet: SVGElement;
+        }
     }
 
     export class Paper extends mvc.View<Graph> {
@@ -2305,6 +2443,13 @@ export declare namespace dia {
          */
         findCellViewsInArea(area: BBox, opt?: Paper.FindInAreaOptions): CellView[];
 
+        /**
+         * Finds the closest magnet to the specified point
+         * @param point a point in local paper coordinates
+         * @param opt options for the search
+         */
+        findClosestMagnetToPoint(point: Point, opt?: Paper.FindClosestMagnetToPointOptions): Paper.ClosestMagnet | null;
+
         fitToContent(opt?: Paper.FitToContentOptions): g.Rect;
         fitToContent(gridWidth?: number, gridHeight?: number, padding?: number, opt?: any): g.Rect;
 
@@ -2354,7 +2499,7 @@ export declare namespace dia {
 
         getLayerNode(layerName: Paper.Layers | string): SVGGElement;
 
-        getLayerView(layerName: Paper.Layers | string): any;
+        getLayerView(layerName: Paper.Layers | string): PaperLayer;
 
         hasLayerView(layerName: Paper.Layers | string): boolean;
 
@@ -2364,44 +2509,48 @@ export declare namespace dia {
 
         protected resetLayers(): void;
 
+        addLayer(layerName: string, layerView: PaperLayer, options?: { insertBefore?: string }): void;
+
+        removeLayer(layer: string | PaperLayer): void;
+
+        moveLayer(layer: string | PaperLayer, insertBefore: string | PaperLayer | null): void;
+
+        hasLayer(layer: string | PaperLayer): boolean;
+
+        getLayerNames(): string[];
+
+        getLayers(): Array<PaperLayer>;
+
         // rendering
 
         freeze(opt?: Paper.FreezeOptions): void;
 
         unfreeze(opt?: Paper.UnfreezeOptions): void;
 
+        wakeUp(): void;
+
         isFrozen(): boolean;
 
         requestViewUpdate(view: mvc.View<any, any>, flag: number, priority: number, opt?: { [key: string]: any }): void;
 
-        requireView<T extends ElementView | LinkView>(model: Cell | Cell.ID, opt?: dia.Cell.Options): T;
+        requireView<T extends ElementView | LinkView>(cellOrId: Cell | Cell.ID, opt?: Paper.UpdateViewOptions & Paper.RenderCallbackOptions): T;
 
-        dumpViews(opt?: {
-            batchSize?: number;
-            mountBatchSize?: number;
-            unmountBatchSize?: number;
-            viewport?: Paper.ViewportCallback;
-        }): void;
+        updateViews(opt?: Paper.UpdateViewsOptions): Paper.RenderStats & { batches: number };
 
-        checkViewport(opt?: {
-            mountBatchSize?: number;
-            unmountBatchSize?: number;
-            viewport?: Paper.ViewportCallback;
-        }): {
-            mounted: number;
-            unmounted: number;
-        };
+        hasScheduledUpdates(): boolean;
 
-        updateViews(opt?: {
-            batchSize?: number;
-            viewport?: Paper.ViewportCallback;
-        }): {
-            updated: number;
-            batches: number;
-            priority: number;
-        };
+        disposeHiddenCellViews(): void;
 
-        hasScheduledUpdates(): boolean;
+        isCellVisible(cellOrId: dia.Cell | dia.Cell.ID): boolean;
+
+        updateCellVisibility(
+        cell: Cell | Cell.ID,
+        opt?: Paper.CellVisibilityOptions & Paper.UpdateViewOptions & Paper.RenderCallbackOptions
+        ): void;
+
+        updateCellsVisibility(
+        opt?: Paper.ScheduleCellsVisibilityUpdateOptions & Paper.UpdateViewsOptions
+        ): void;
 
         // events
 
@@ -2412,52 +2561,51 @@ export declare namespace dia {
         // protected
 
         /**
-         * For the specified view, calls the visibility viewport function specified by the paper.options.viewport function.
+         * For the specified view, calls the cell visibility function specified by the `paper.options.cellVisibility` function.
          * If the function returns true, the view is attached to the DOM; in other case it is detached.
-         * While async papers do this automatically, synchronous papers require an explicit call to this method for this functionality to be applied. To show the view again, use paper.requestView().
-         * If you are using autoFreeze option you should call this function if you are calling paper.requestView() if you want paper.options.viewport function to be applied.
+         * While async papers do this automatically, synchronous papers require an explicit call to this method for this functionality to be applied. To show the view again, use `paper.requestView()`.
+         * If you are using `autoFreeze` option you should call this function if you are calling `paper.requestView()` if you want `paper.options.cellVisibility` function to be applied.
          * @param cellView cellView for which the visibility check is performed
-         * @param opt if opt.viewport is provided, it is used as the callback function instead of paper.options.viewport.
+         * @param opt if opt.cellVisibility is provided, it is used as the callback function instead of paper.options.cellVisibility.
          */
-        protected checkViewVisibility(cellView: dia.CellView, opt?: {
-            viewport?: Paper.ViewportCallback;
-        }): {
-            mounted: number;
-            unmounted: number;
-        };
+        protected checkViewVisibility(
+        cellView: dia.CellView,
+        opt?: Paper.CellVisibilityOptions
+        ): Paper.UpdateVisibilityStats;
+
+
+        protected scheduleCellsVisibilityUpdate(opt?: Paper.ScheduleCellsVisibilityUpdateOptions): Paper.UpdateVisibilityStats;
 
         protected scheduleViewUpdate(view: mvc.View<any, any>, flag: number, priority: number, opt?: { [key: string]: any }): void;
 
         protected dumpViewUpdate(view: mvc.View<any, any>): number;
 
-        protected dumpView(view: mvc.View<any, any>, opt?: { [key: string]: any }): number;
+        protected dumpView(view: mvc.View<any, any>, opt?: Paper.UpdateViewOptions & Paper.RenderCallbackOptions): number;
 
-        protected updateView(view: mvc.View<any, any>, flag: number, opt?: { [key: string]: any }): number;
+        protected updateView(view: mvc.View<any, any>, flag: number, opt?: Paper.UpdateViewOptions): number;
 
         protected registerUnmountedView(view: mvc.View<any, any>): number;
 
         protected registerMountedView(view: mvc.View<any, any>): number;
 
-        protected updateViewsAsync(opt?: {
-            batchSize?: number;
-            mountBatchSize?: number;
-            unmountBatchSize?: number;
-            viewport?: Paper.ViewportCallback;
-            progress?: Paper.ProgressCallback;
-            before?: Paper.BeforeRenderCallback;
-        }): void;
+        protected updateViewsAsync(opt?: Paper.UpdateViewsAsyncOptions): void;
 
-        protected updateViewsBatch(opt?: {
-            batchSize?: number;
-            viewport?: Paper.ViewportCallback;
-        }): Paper.UpdateStats;
+        protected updateViewsBatch(opt?: Paper.UpdateViewsBatchOptions): Paper.RenderBatchStats;
+
+        protected checkMountedViews(viewport: Paper.ViewportCallback, opt?: Paper.UnmountOptions): number;
+
+        protected checkUnmountedViews(viewport: Paper.ViewportCallback, opt?: Paper.MountOptions): number;
 
-        protected checkMountedViews(viewport: Paper.ViewportCallback, opt?: { unmountBatchSize?: number }): number;
+        protected prioritizeCellViewMount(cellOrId: dia.Cell | dia.Cell.ID): boolean;
 
-        protected checkUnmountedViews(viewport: Paper.ViewportCallback, opt?: { mountBatchSize?: number }): number;
+        protected prioritizeCellViewUnmount(cellOrId: dia.Cell | dia.Cell.ID): boolean;
+
+        protected isViewMounted(viewOrCid: dia.CellView | string): boolean;
 
         protected isAsync(): boolean;
 
+        protected isIdle(): boolean;
+
         protected isExactSorting(): boolean;
 
         protected sortViews(): void;
@@ -2533,7 +2681,9 @@ export declare namespace dia {
 
         protected insertView(cellView: CellView, isInitialInsert: boolean): void;
 
-        protected detachView(cellView: CellView): void;
+        protected _hideCellView(cellView: CellView): void;
+
+        protected _detachCellView(cellView: CellView): void;
 
         protected customEventTrigger(event: dia.Event, view: CellView, rootNode?: SVGElement): dia.Event | null;
 
@@ -2553,6 +2703,16 @@ export declare namespace dia {
          * @deprecated use transformToFitContent
          */
         scaleContentToFit(opt?: Paper.ScaleContentOptions): void;
+
+        /**
+         * @deprecated Use `updateCellsVisibility()`
+         */
+        checkViewport(opt?: Paper.ScheduleCellsVisibilityUpdateOptions): Paper.UpdateVisibilityStats;
+
+        /**
+         * @deprecated Use `updateCellsVisibility()`
+         */
+        dumpViews(opt?: Paper.ScheduleCellsVisibilityUpdateOptions & Paper.UpdateViewsOptions): void;
     }
 
     export namespace PaperLayer {
@@ -2611,6 +2771,10 @@ export declare namespace dia {
         hide(): this;
 
         mount(): this;
+
+        getLayer(): string | null;
+
+        hasLayer(): boolean;
     }
 
     export namespace ToolView {
@@ -2654,6 +2818,8 @@ export declare namespace dia {
 
         update(): void;
 
+        isOverlay(): boolean;
+
         protected guard(evt: dia.Event): boolean;
     }
 
@@ -2745,6 +2911,8 @@ export declare namespace dia {
         id?: string
         ): T[];
 
+        static has(cellView: dia.CellView, id?: string): boolean;
+
         static update(cellView: dia.CellView, id?: string): void;
 
         static transform(cellView: dia.CellView, id?: string): void;
@@ -2822,7 +2990,7 @@ export declare namespace elementTools {
 
     export namespace Boundary {
         export interface Options extends dia.ToolView.Options<dia.ElementView> {
-            padding?: number | dia.Sides;
+            padding?: dia.Sides;
             useModelGeometry?: boolean;
             rotate?: boolean;
         }
@@ -2900,12 +3068,16 @@ export declare namespace g {
     }
 
     export type Shape = Path | Point | Line | Polyline | Polygon | Rect | Ellipse;
+
     export interface PlainPoint {
 
         x: number;
         y: number;
     }
 
+    /** Can be understood by `g.Point` constructor */
+    export type PointInit = Partial<PlainPoint> | string;
+
     export interface PlainRect {
 
         x: number;
@@ -2965,15 +3137,15 @@ export declare namespace g {
 
         clone(): Segment;
 
-        closestPoint(p: Point, opt?: SubdivisionsOpt): Point;
+        closestPoint(p: PlainPoint, opt?: SubdivisionsOpt): Point;
 
-        closestPointLength(p: Point, opt?: SubdivisionsOpt): number;
+        closestPointLength(p: PlainPoint, opt?: SubdivisionsOpt): number;
 
-        closestPointNormalizedLength(p: Point, opt?: SubdivisionsOpt): number;
+        closestPointNormalizedLength(p: PlainPoint, opt?: SubdivisionsOpt): number;
 
-        closestPointT(p: Point): number;
+        closestPointT(p: PlainPoint): number;
 
-        closestPointTangent(p: Point): Line | null;
+        closestPointTangent(p: PlainPoint): Line | null;
 
         divideAt(ratio: number, opt?: SubdivisionsOpt): [Segment, Segment];
 
@@ -2999,7 +3171,7 @@ export declare namespace g {
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         tangentAt(ratio: number): Line | null;
 
@@ -3056,7 +3228,7 @@ export declare namespace g {
         end: Point;
         type: types.Curve;
 
-        constructor(p1: PlainPoint | string, p2: PlainPoint | string, p3: PlainPoint | string, p4: PlainPoint | string);
+        constructor(p1: PointInit, p2: PointInit, p3: PointInit, p4: PointInit);
         constructor(curve: Curve);
 
         bbox(): Rect;
@@ -3104,7 +3276,7 @@ export declare namespace g {
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint | string): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         tangentAt(ratio: number, opt?: SubdivisionsOpt): Line | null;
 
@@ -3136,7 +3308,7 @@ export declare namespace g {
         b: number;
         type: types.Ellipse;
 
-        constructor(center: PlainPoint | string, a: number, b: number);
+        constructor(center: PointInit, a: number, b: number);
         constructor(ellipse: Ellipse);
 
         bbox(): Rect;
@@ -3153,7 +3325,7 @@ export declare namespace g {
 
         intersectionWithLine(l: Line): Point[] | null;
 
-        intersectionWithLineFromCenterToPoint(p: PlainPoint, angle?: number): Point;
+        intersectionWithLineFromCenterToPoint(p: PointInit, angle?: number): Point;
 
         normalizedDistance(point: PlainPoint): number;
 
@@ -3172,7 +3344,7 @@ export declare namespace g {
         end: Point;
         type: types.Line;
 
-        constructor(p1: PlainPoint | string, p2: PlainPoint | string);
+        constructor(p1: PointInit, p2: PointInit);
         constructor(line: Line);
         constructor();
 
@@ -3186,13 +3358,13 @@ export declare namespace g {
 
         parallel(distance: number): Line;
 
-        closestPoint(p: PlainPoint | string): Point;
+        closestPoint(p: PointInit): Point;
 
-        closestPointLength(p: PlainPoint | string): number;
+        closestPointLength(p: PointInit): number;
 
-        closestPointNormalizedLength(p: PlainPoint | string): number;
+        closestPointNormalizedLength(p: PointInit): number;
 
-        closestPointTangent(p: PlainPoint | string): Line | null;
+        closestPointTangent(p: PointInit): Line | null;
 
         containsPoint(p: PlainPoint): boolean;
 
@@ -3220,13 +3392,13 @@ export declare namespace g {
 
         pointAtLength(length: number): Point;
 
-        pointOffset(p: PlainPoint | string): number;
+        pointOffset(p: PointInit): number;
 
         rotate(origin: PlainPoint, angle: number): this;
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         setLength(length: number): this;
 
@@ -3265,13 +3437,13 @@ export declare namespace g {
 
         clone(): Path;
 
-        closestPoint(p: Point, opt?: SegmentSubdivisionsOpt): Point | null;
+        closestPoint(p: PlainPoint, opt?: SegmentSubdivisionsOpt): Point | null;
 
-        closestPointLength(p: Point, opt?: SegmentSubdivisionsOpt): number;
+        closestPointLength(p: PlainPoint, opt?: SegmentSubdivisionsOpt): number;
 
-        closestPointNormalizedLength(p: Point, opt?: SegmentSubdivisionsOpt): number;
+        closestPointNormalizedLength(p: PlainPoint, opt?: SegmentSubdivisionsOpt): number;
 
-        closestPointTangent(p: Point, opt?: SegmentSubdivisionsOpt): Line | null;
+        closestPointTangent(p: PlainPoint, opt?: SegmentSubdivisionsOpt): Line | null;
 
         containsPoint(p: PlainPoint, opt?: SegmentSubdivisionsOpt): boolean;
 
@@ -3307,7 +3479,7 @@ export declare namespace g {
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint | string): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         segmentAt(ratio: number, opt?: SegmentSubdivisionsOpt): Segment | null;
 
@@ -3334,7 +3506,7 @@ export declare namespace g {
 
         validate(): this;
 
-        private closestPointT(p: Point, opt?: SegmentSubdivisionsOpt): PathT | null;
+        private closestPointT(p: PlainPoint, opt?: SegmentSubdivisionsOpt): PathT | null;
 
         private lengthAtT(t: PathT, opt?: SegmentSubdivisionsOpt): number;
 
@@ -3362,17 +3534,17 @@ export declare namespace g {
         type: types.Point;
 
         constructor(x?: number, y?: number);
-        constructor(p: PlainPoint | string);
+        constructor(p: PointInit);
 
-        chooseClosest(points: PlainPoint[]): Point | null;
+        chooseClosest(points: PointInit[]): Point | null;
 
         adhereToRect(r: Rect): this;
 
         angleBetween(p1: PlainPoint, p2: PlainPoint): number;
 
-        bearing(p: Point): CardinalDirection;
+        bearing(p: PlainPoint): CardinalDirection;
 
-        changeInAngle(dx: number, dy: number, ref: PlainPoint | string): number;
+        changeInAngle(dx: number, dy: number, ref: PointInit): number;
 
         clone(): Point;
 
@@ -3381,42 +3553,42 @@ export declare namespace g {
         difference(dx?: number, dy?: number): Point;
         difference(p: PlainPoint): Point;
 
-        distance(p: PlainPoint | string): number;
+        distance(p: PlainPoint): number;
 
         dot(p: PlainPoint): number;
 
-        equals(p: Point): boolean;
+        equals(p: PlainPoint): boolean;
 
-        lerp(p: Point, t: number): Point;
+        lerp(p: PlainPoint, t: number): Point;
 
         magnitude(): number;
 
         manhattanDistance(p: PlainPoint): number;
 
-        move(ref: PlainPoint | string, distance: number): this;
+        move(ref: PointInit, distance: number): this;
 
         normalize(length: number): this;
 
         offset(dx?: number, dy?: number): this;
         offset(p: PlainPoint): this;
 
-        reflection(ref: PlainPoint | string): Point;
+        reflection(ref: PointInit): Point;
 
-        rotate(origin: PlainPoint | string, angle: number): this;
+        rotate(origin: PlainPoint, angle: number): this;
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint | string): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         snapToGrid(gx: number, gy?: number): this;
 
-        squaredDistance(p: PlainPoint | string): number;
+        squaredDistance(p: PlainPoint): number;
 
-        theta(p: PlainPoint | string): number;
+        theta(p: PointInit): number;
 
         toJSON(): PlainPoint;
 
-        toPolar(origin?: PlainPoint | string): this;
+        toPolar(origin?: PointInit): this;
 
         toString(): string;
 
@@ -3430,7 +3602,7 @@ export declare namespace g {
 
         vectorAngle(p: PlainPoint): number;
 
-        static fromPolar(distance: number, angle: number, origin?: PlainPoint | string): Point;
+        static fromPolar(distance: number, angle: number, origin?: PointInit): Point;
 
         static random(x1: number, x2: number, y1: number, y2: number): Point;
     }
@@ -3442,17 +3614,17 @@ export declare namespace g {
 
         constructor();
         constructor(svgString: string);
-        constructor(points: PlainPoint[]);
+        constructor(points: PointInit[]);
 
         bbox(): Rect | null;
 
-        closestPoint(p: PlainPoint | string): Point | null;
+        closestPoint(p: PlainPoint): Point | null;
 
-        closestPointLength(p: PlainPoint | string): number;
+        closestPointLength(p: PlainPoint): number;
 
-        closestPointNormalizedLength(p: PlainPoint | string): number;
+        closestPointNormalizedLength(p: PlainPoint): number;
 
-        closestPointTangent(p: PlainPoint | string): Line | null;
+        closestPointTangent(p: PlainPoint): Line | null;
 
         containsPoint(p: PlainPoint): boolean;
 
@@ -3472,7 +3644,7 @@ export declare namespace g {
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint | string): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
         simplify(opt?: { threshold?: number }): this;
 
@@ -3537,7 +3709,7 @@ export declare namespace g {
 
         clone(): Rect;
 
-        containsPoint(p: PlainPoint | string, opt?: StrictOpt): boolean;
+        containsPoint(p: PointInit, opt?: StrictOpt): boolean;
 
         containsRect(r: PlainRect): boolean;
 
@@ -3551,7 +3723,7 @@ export declare namespace g {
 
         intersectionWithLine(l: Line): Point[] | null;
 
-        intersectionWithLineFromCenterToPoint(p: PlainPoint | string, angle?: number): Point;
+        intersectionWithLineFromCenterToPoint(p: PointInit, angle?: number): Point;
 
         leftLine(): Line;
 
@@ -3563,6 +3735,8 @@ export declare namespace g {
 
         moveAndExpand(r: PlainRect): this;
 
+        moveAroundPoint(origin: PlainPoint, angle: number): this;
+
         normalize(): this;
 
         offset(dx?: number, dy?: number): this;
@@ -3570,7 +3744,7 @@ export declare namespace g {
 
         origin(): Point;
 
-        pointNearestToPoint(point: PlainPoint | string): Point;
+        pointNearestToPoint(point: PointInit): Point;
 
         rightLine(): Line;
 
@@ -3578,9 +3752,9 @@ export declare namespace g {
 
         round(precision?: number): this;
 
-        scale(sx: number, sy: number, origin?: PlainPoint | string): this;
+        scale(sx: number, sy: number, origin?: PointInit): this;
 
-        sideNearestToPoint(point: PlainPoint | string): RectangleSide;
+        sideNearestToPoint(point: PointInit): RectangleSide;
 
         snapToGrid(gx: number, gy?: number): this;
 
@@ -3620,24 +3794,24 @@ export declare namespace g {
             p3: Point;
         }
 
-        export function curveThroughPoints(points: PlainPoint[] | Point[]): string[];
+        export function curveThroughPoints(points: PlainPoint[]): string[];
 
-        export function getCurveControlPoints(points: PlainPoint[] | Point[]): [Point[], Point[]];
+        export function getCurveControlPoints(points: PlainPoint[]): [Point[], Point[]];
 
         export function getCurveDivider(
-        p0: string | PlainPoint,
-        p1: string | PlainPoint,
-        p2: string | PlainPoint,
-        p3: string | PlainPoint
+        p0: PointInit,
+        p1: PointInit,
+        p2: PointInit,
+        p3: PointInit
         ): (t: number) => [IBezierCurve, IBezierCurve];
 
         export function getFirstControlPoints(rhs: number[]): number[];
 
         export function getInversionSolver(
-        p0: PlainPoint,
-        p1: PlainPoint,
-        p2: PlainPoint,
-        p3: PlainPoint
+        p0: PointInit,
+        p1: PointInit,
+        p2: PointInit,
+        p3: PointInit
         ): (p: PlainPoint) => number;
     }
 
@@ -3823,7 +3997,7 @@ export declare namespace highlighters {
             position?: Positions | dia.PositionName;
             size?: number | dia.Size;
             gap?: number;
-            margin?: number | dia.Sides;
+            margin?: dia.Sides;
         }
     }
 
@@ -3872,7 +4046,7 @@ export declare namespace layout {
             angle: number;
         };
 
-        export type LayoutFunction = (ports: Array<Object>, elBBox: g.Rect, opt: Options) => Array<Transformation>;
+        export type LayoutFunction = (ports: Array<dia.Element.Port>, elBBox: g.Rect, opt: Options) => Array<Transformation>;
 
         export interface Options {
             x?: number | string;
@@ -3885,9 +4059,11 @@ export declare namespace layout {
             startAngle?: number;
             step?: number;
             compensateRotation?: boolean;
+            [key: string]: any;
         }
 
         var absolute: LayoutFunction;
+        /** @deprecated */
         var fn: LayoutFunction;
         var line: LayoutFunction;
         var left: LayoutFunction;
@@ -3906,6 +4082,7 @@ export declare namespace layout {
             angle?: number;
             offset?: number;
             attrs?: dia.Cell.Selectors;
+            [key: string]: any;
         }
 
         export interface LabelAttributes {
@@ -4142,7 +4319,7 @@ export declare namespace linkTools {
 
     export namespace Boundary {
         export interface Options extends dia.ToolView.Options<dia.LinkView> {
-            padding?: number | dia.Sides;
+            padding?: dia.Sides;
             useModelGeometry?: boolean;
         }
     }
@@ -4640,6 +4817,7 @@ export declare namespace mvc {
         collection?: Collection<any> | undefined; // was: Collection<TModel>;
         el?: $Element<TElement> | string | undefined;
         id?: string | undefined;
+        cid?: string | undefined;
         attributes?: Record<string, any> | undefined;
         className?: string | undefined;
         tagName?: string | undefined;
@@ -4666,7 +4844,7 @@ export declare namespace mvc {
 
         /**
          * Events hash or a method returning the events hash that maps events/selectors to methods on your View.
-         * For assigning events as object hash, do it like this: this.events = <any>{ "event:selector": callback, ... };
+         * For assigning events as object hash, do it like this: `this.events = <any>{ "event:selector": callback, ... };`
          * That works only if you set it in the constructor or the initialize method.
          */
         events(): EventsHash;
@@ -4682,9 +4860,9 @@ export declare namespace mvc {
 
         el: TElement;
         attributes: Record<string, any>;
-        /* @deprecated use `el` instead */
+        /** @deprecated use `el` instead */
         $el: Dom;
-        /* @deprecated use `el.querySelector()` instead */
+        /** @deprecated use `el.querySelector()` instead */
         $(selector: string): Dom;
         render(): this;
         remove(): this;
@@ -5221,11 +5399,7 @@ export declare namespace util {
 
     export function parseCssNumeric(val: any, restrictUnits: string | string[]): { value: number, unit?: string } | null;
 
-    export type BreakTextFunction = (
-    text: string,
-    size: { width: number, height?: number },
-    attrs?: attributes.NativeSVGAttributes,
-    opt?: {
+    export type BreakTextOptions = {
         svgDocument?: SVGElement;
         separator?: string | any;
         eol?: string;
@@ -5234,6 +5408,12 @@ export declare namespace util {
         maxLineCount?: number;
         preserveSpaces?: boolean;
     }
+
+    export type BreakTextFunction = (
+    text: string,
+    size: { width: number, height?: number },
+    attrs?: attributes.NativeSVGAttributes,
+    opt?: BreakTextOptions
     ) => string;
 
     var breakText: BreakTextFunction;
@@ -5494,6 +5674,8 @@ export declare namespace util {
 
     export function merge(destinationObject: object, ...args: any[]): object;
 
+    export type MergeCustomizer = (value: any, srcValue: any, key: string, object: any, source: any, stack: any) => any;
+
     // ADDITIONAL SIMPLE UTIL FUNCTIONS:
 
     export function isBoolean(value: any): boolean;
@@ -5545,6 +5727,7 @@ export declare namespace Vectorizer {
         annotations?: TextAnnotation[];
         includeAnnotationIndices?: boolean;
         displayEmpty?: boolean;
+        useNoBreakSpace?: boolean;
     }
 
     export interface GetBBoxOptions {
@@ -5566,6 +5749,10 @@ export declare namespace Vectorizer {
         attrs: { [key: string]: any };
     }
 
+    export interface TransformToElementOptions {
+        safe?: boolean;
+    }
+
     // modifiable Matrix. SVGMatrix doesn't allow set on properties or a constructor.
     export interface Matrix {
         a: number;
@@ -5635,7 +5822,7 @@ export declare class VElement {
     id: string;
     node: SVGElement;
 
-    getTransformToElement(toElem: SVGGElement | VElement): SVGMatrix;
+    getTransformToElement(target: SVGElement | VElement, opt?: Vectorizer.TransformToElementOptions): SVGMatrix;
 
     transform(): SVGMatrix;
     transform(matrix: SVGMatrix | Vectorizer.Matrix, opt?: Vectorizer.TransformOptions): this;
@@ -5744,6 +5931,9 @@ declare interface VStatic {
 
     ensureId(node: SVGElement | VElement): string;
 
+    /**
+     * @deprecated Use regular spaces and rely on xml:space="preserve" instead.
+     */
     sanitizeText(text: string): string;
 
     isUndefined(value: any): boolean;
@@ -5758,6 +5948,8 @@ declare interface VStatic {
 
     qualifyAttr(name: string): Vectorizer.QualifiedAttribute;
 
+    getCommonAncestor(node1: SVGElement | VElement, node2: SVGElement | VElement): SVGElement | null;
+
     transformStringToMatrix(transform: string): SVGMatrix;
 
     matrixToTransformString(matrix: SVGMatrix | Vectorizer.Matrix): string;