@eclipse-glsp/client 2.1.0-next.300 → 2.1.0-next.302

package/src/re-exports.ts

@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '@eclipse-glsp/sprotty';

package/src/utils/geometry-util.ts

@@ -0,0 +1,101 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { Bounds, Point } from '@eclipse-glsp/sprotty';
+
+export function left(bounds: Bounds): number {
+    return bounds.x;
+}
+
+export function center(bounds: Bounds): number {
+    return bounds.x + (bounds.width >= 0 ? bounds.width * 0.5 : 0);
+}
+
+export function right(bounds: Bounds): number {
+    return bounds.x + bounds.width;
+}
+
+export function top(bounds: Bounds): number {
+    return bounds.y;
+}
+
+export function middle(bounds: Bounds): number {
+    return bounds.y + (bounds.height >= 0 ? bounds.height * 0.5 : 0);
+}
+
+export function bottom(bounds: Bounds): number {
+    return bounds.y + bounds.height;
+}
+
+export function topLeft(bounds: Bounds): Point {
+    return { x: left(bounds), y: top(bounds) };
+}
+
+export function topCenter(bounds: Bounds): Point {
+    return { x: center(bounds), y: top(bounds) };
+}
+
+export function topRight(bounds: Bounds): Point {
+    return { x: right(bounds), y: top(bounds) };
+}
+
+export function middleLeft(bounds: Bounds): Point {
+    return { x: left(bounds), y: middle(bounds) };
+}
+
+export function middleCenter(bounds: Bounds): Point {
+    return { x: center(bounds), y: middle(bounds) };
+}
+
+export function middleRight(bounds: Bounds): Point {
+    return { x: right(bounds), y: middle(bounds) };
+}
+
+export function bottomLeft(bounds: Bounds): Point {
+    return { x: left(bounds), y: bottom(bounds) };
+}
+
+export function bottomCenter(bounds: Bounds): Point {
+    return { x: center(bounds), y: bottom(bounds) };
+}
+
+export function bottomRight(bounds: Bounds): Point {
+    return { x: right(bounds), y: bottom(bounds) };
+}
+
+export function sortBy(rankFunc: (elem: Bounds) => number, ...points: Bounds[]): Bounds[] {
+    return points.sort(compareFunction(rankFunc));
+}
+
+export function compareFunction<T>(rankFunc: (elem: T) => number): (left: T, right: T) => number {
+    return (elemLeft, elemRight) => rankFunc(elemLeft) - rankFunc(elemRight);
+}
+
+export function isAbove(leftBounds: Bounds, rightBounds: Bounds): boolean {
+    return top(leftBounds) <= top(rightBounds);
+}
+
+export function isBelow(leftBounds: Bounds, rightBounds: Bounds): boolean {
+    return top(leftBounds) >= top(rightBounds);
+}
+
+export function isBefore(leftBounds: Bounds, rightBounds: Bounds): boolean {
+    return left(leftBounds) < left(rightBounds);
+}
+
+export function isAfter(leftBounds: Bounds, rightBounds: Bounds): boolean {
+    return left(leftBounds) >= left(rightBounds);
+}

package/src/utils/gmodel-util.ts

@@ -15,25 +15,28 @@
  ********************************************************************************/
 import {
     BoundsAware,
-    distinctAdd,
     EdgeRouterRegistry,
     ElementAndBounds,
     ElementAndRoutingPoints,
     FluentIterable,
-    isBoundsAware,
-    isMoveable,
-    isSelectable,
-    isSelected,
+    GChildElement,
+    GModelElement,
+    GModelElementSchema,
+    GRoutableElement,
+    GRoutingHandle,
     ModelIndexImpl,
     Point,
-    remove,
     RoutedPoint,
     Selectable,
-    GModelElement,
-    GRoutableElement,
-    GRoutingHandle,
     TypeGuard,
-    GModelElementSchema
+    distinctAdd,
+    findParentByFeature,
+    isBoundsAware,
+    isMoveable,
+    isSelectable,
+    isSelected,
+    isViewport,
+    remove
 } from '@eclipse-glsp/sprotty';
 
 /**
@@ -319,3 +322,31 @@ export function getElementTypeId(input: GModelElement | GModelElementSchema | st
         return input.type;
     }
 }
+
+export function findTopLevelElementByFeature<T>(
+    element: GModelElement,
+    predicate: (t: GModelElement) => t is GModelElement & T,
+    skip: (t: GModelElement) => boolean = _t => false
+): (GModelElement & T) | undefined {
+    let match: (GModelElement & T) | undefined;
+    let current: GModelElement | undefined = element;
+    while (current !== undefined) {
+        if (!skip(current) && predicate(current)) {
+            match = current;
+        }
+        if (current instanceof GChildElement) {
+            current = current.parent;
+        } else {
+            current = undefined;
+        }
+    }
+    return match;
+}
+
+export function calculateDeltaBetweenPoints(target: Point, source: Point, element: GModelElement): Point {
+    const delta = Point.subtract(target, source);
+    const viewport = findParentByFeature(element, isViewport);
+    const zoom = viewport?.zoom ?? 1;
+    const adaptedDelta = { x: delta.x / zoom, y: delta.y / zoom };
+    return adaptedDelta;
+}

package/src/utils/html-utils.ts

@@ -13,6 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { AnyObject, hasNumberProp } from '@eclipse-glsp/sprotty';
+
 export function createElementFromHTML(html: string): HTMLElement | undefined {
     const template = document.createElement('template');
     html = html.trim(); // Never return a text node of whitespace as the result
@@ -23,3 +25,7 @@ export function createElementFromHTML(html: string): HTMLElement | undefined {
     }
     return undefined;
 }
+
+export function isMouseEvent(object: unknown): object is MouseEvent {
+    return AnyObject.is(object) && hasNumberProp(object, 'pageX') && hasNumberProp(object, 'pageY');
+}

package/src/utils/index.ts

@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './argument-utils';
+export * from './geometry-util';
+export * from './gmodel-util';
+export * from './html-utils';
+export * from './layout-utils';
+export * from './marker';
+export * from './viewpoint-util';

package/src/utils/viewpoint-util.ts

@@ -29,6 +29,7 @@ import {
     isViewport,
     translateBounds
 } from '@eclipse-glsp/sprotty';
+import { bottomRight, topLeft } from './geometry-util';
 import { BoundsAwareModelElement } from './gmodel-util';
 
 /**
@@ -47,6 +48,7 @@ import { BoundsAwareModelElement } from './gmodel-util';
 export function getAbsolutePosition(target: GModelElement, mouseEvent: MouseEvent): Point {
     return getAbsolutePositionByPoint(target, { x: mouseEvent.pageX, y: mouseEvent.pageY });
 }
+
 export function getAbsolutePositionByPoint(target: GModelElement, point: Point): Point {
     let xPos = point.x;
     let yPos = point.y;
@@ -71,6 +73,12 @@ export function getAbsolutePositionByPoint(target: GModelElement, point: Point):
     };
 }
 
+export function getViewportBounds(target: GModelElement, bounds: Bounds): Bounds {
+    const start = getAbsolutePositionByPoint(target, topLeft(bounds));
+    const end = getAbsolutePositionByPoint(target, bottomRight(bounds));
+    return { ...start, width: end.x - start.x, height: end.y - start.y };
+}
+
 /**
  * Translates the bounds of the diagram element (local coordinates) into the diagram coordinates system
  * (i.e. relative to the Diagram's 0;0 point)

package/src/views/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,5 +18,5 @@ export * from './compartments';
 export * from './gedge-view';
 export * from './glsp-projection-view';
 export * from './issue-marker-view';
-export * from './rounded-corner';
 export * from './rounded-corner-view';
+export * from './rounded-corner';

package/lib/features/source-model-watcher/source-model-wacher-module.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"source-model-wacher-module.d.ts","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-wacher-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAoD,MAAM,uBAAuB,CAAC;AAGxG,eAAO,MAAM,wBAAwB,eAEnC,CAAC"}

package/lib/features/source-model-watcher/source-model-wacher-module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"source-model-wacher-module.js","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-wacher-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAwG;AACxG,+FAAwF;AAE3E,QAAA,wBAAwB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACjF,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAwB,CAAC,IAAI,EAAE,qEAA+B,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAC"}

package/lib/features/tools/change-bounds/change-boounds-tool-module.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"change-boounds-tool-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-boounds-tool-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAyD,MAAM,uBAAuB,CAAC;AAM7G,eAAO,MAAM,sBAAsB,eAMjC,CAAC"}

package/lib/features/tools/change-bounds/change-boounds-tool-module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"change-boounds-tool-module.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-boounds-tool-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA6G;AAC7G,qDAA0D;AAC1D,6DAAwD;AACxD,+EAAqI;AACrI,iCAA2C;AAE9B,QAAA,sBAAsB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACtF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,qCAAgB,CAAC,CAAC;IAC7D,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,uBAAa,EAAC,OAAO,EAAE,qBAAa,CAAC,IAAI,EAAE,wBAAiB,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}