@eclipse-glsp/client 1.1.0-next.fdfeeeb.193 → 2.0.0

package/lib/features/navigation/navigation-action-handler.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavigationActionHandler = exports.ProcessNavigationArgumentsAction = exports.NavigateAction = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -25,27 +25,26 @@ exports.NavigationActionHandler = exports.ProcessNavigationArgumentsAction = exp
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const types_1 = require("../../base/types");
+const sprotty_1 = require("@eclipse-glsp/sprotty");
 const navigation_target_resolver_1 = require("./navigation-target-resolver");
 var NavigateAction;
 (function (NavigateAction) {
     NavigateAction.KIND = 'navigate';
     function is(object) {
-        return protocol_1.Action.hasKind(object, NavigateAction.KIND) && (0, protocol_1.hasStringProp)(object, 'targetTypeId');
+        return sprotty_1.Action.hasKind(object, NavigateAction.KIND) && (0, sprotty_1.hasStringProp)(object, 'targetTypeId');
     }
     NavigateAction.is = is;
     function create(targetTypeId, options = {}) {
         return Object.assign({ kind: NavigateAction.KIND, targetTypeId }, options);
     }
     NavigateAction.create = create;
-})(NavigateAction = exports.NavigateAction || (exports.NavigateAction = {}));
+})(NavigateAction || (exports.NavigateAction = NavigateAction = {}));
 var ProcessNavigationArgumentsAction;
 (function (ProcessNavigationArgumentsAction) {
     ProcessNavigationArgumentsAction.KIND = 'processNavigationArguments';
     function is(object) {
-        return protocol_1.Action.hasKind(object, ProcessNavigationArgumentsAction.KIND) && (0, protocol_1.hasObjectProp)(object, 'args');
+        return sprotty_1.Action.hasKind(object, ProcessNavigationArgumentsAction.KIND) && (0, sprotty_1.hasObjectProp)(object, 'args');
     }
     ProcessNavigationArgumentsAction.is = is;
     function create(args) {
@@ -55,7 +54,7 @@ var ProcessNavigationArgumentsAction;
         };
     }
     ProcessNavigationArgumentsAction.create = create;
-})(ProcessNavigationArgumentsAction = exports.ProcessNavigationArgumentsAction || (exports.ProcessNavigationArgumentsAction = {}));
+})(ProcessNavigationArgumentsAction || (exports.ProcessNavigationArgumentsAction = ProcessNavigationArgumentsAction = {}));
 /**
  * Default handler for all actions that are related to the navigation.
  *
@@ -71,7 +70,7 @@ var ProcessNavigationArgumentsAction;
  *   *(a)* the navigation target already specifies element IDs, in which case this action handler navigates
  *         to the specified elements directly, by the selecting them and centering them in the viewport.
  *   *(b)* the arguments of the navigation targets don't contain element IDs, but other arguments, the
- *         navigation target needs to be resolved into actual elment IDs by the `NavigationTargetResolver`.
+ *         navigation target needs to be resolved into actual element IDs by the `NavigationTargetResolver`.
  *         This can for instance be useful, if the navigation deals with queries or some other more complex
  *         logic that can't be dealt with on the client.
  *  *(c)* the target isn't resolved by the `NavigationTargetResolver`, e.g. because the `uri` doesn't match
@@ -86,13 +85,13 @@ let NavigationActionHandler = class NavigationActionHandler {
         if (NavigateAction.is(action)) {
             this.handleNavigateAction(action);
         }
-        else if (protocol_1.NavigateToTargetAction.is(action)) {
+        else if (sprotty_1.NavigateToTargetAction.is(action)) {
             this.handleNavigateToTarget(action);
         }
         else if (ProcessNavigationArgumentsAction.is(action)) {
             this.processNavigationArguments(action.args);
         }
-        else if (protocol_1.NavigateToExternalTargetAction.is(action)) {
+        else if (sprotty_1.NavigateToExternalTargetAction.is(action)) {
             this.handleNavigateToExternalTarget(action);
         }
     }
@@ -100,12 +99,12 @@ let NavigationActionHandler = class NavigationActionHandler {
         try {
             const editorContextService = await this.editorContextService();
             const editorContext = editorContextService.get(action.args);
-            const response = await this.dispatcher.request(protocol_1.RequestNavigationTargetsAction.create({ targetTypeId: action.targetTypeId, editorContext }));
-            if (protocol_1.SetNavigationTargetsAction.is(response) && response.targets && response.targets.length === 1) {
+            const response = await this.dispatcher.request(sprotty_1.RequestNavigationTargetsAction.create({ targetTypeId: action.targetTypeId, editorContext }));
+            if (sprotty_1.SetNavigationTargetsAction.is(response) && response.targets && response.targets.length === 1) {
                 if (response.targets.length > 1) {
                     this.logger.warn(this, 'Processing of multiple targets is not supported yet. ' + 'Only the first is being processed.', response.targets);
                 }
-                return this.dispatcher.dispatch(protocol_1.NavigateToTargetAction.create(response.targets[0]));
+                return this.dispatcher.dispatch(sprotty_1.NavigateToTargetAction.create(response.targets[0]));
             }
             this.warnAboutFailedNavigation('No valid navigation target found');
         }
@@ -148,9 +147,9 @@ let NavigationActionHandler = class NavigationActionHandler {
             return;
         }
         this.dispatcher.dispatchAll([
-            protocol_1.SelectAllAction.create(false),
-            protocol_1.SelectAction.create({ selectedElementsIDs: elementIds }),
-            protocol_1.CenterAction.create(elementIds)
+            sprotty_1.SelectAllAction.create(false),
+            sprotty_1.SelectAction.create({ selectedElementsIDs: elementIds }),
+            sprotty_1.CenterAction.create(elementIds)
         ]);
     }
     handleResolutionArguments(target) {
@@ -161,7 +160,7 @@ let NavigationActionHandler = class NavigationActionHandler {
         this.dispatcher.dispatch(ProcessNavigationArgumentsAction.create(args));
     }
     navigateToExternal(target) {
-        return this.dispatcher.dispatch(protocol_1.NavigateToExternalTargetAction.create(target));
+        return this.dispatcher.dispatch(sprotty_1.NavigateToExternalTargetAction.create(target));
     }
     processNavigationArguments(args) {
         if (args.info && args.info.toString().length > 0) {
@@ -176,7 +175,7 @@ let NavigationActionHandler = class NavigationActionHandler {
     }
     async handleNavigateToExternalTarget(action) {
         const registry = await this.actionHandlerRegistryProvider();
-        const handlers = registry.get(protocol_1.NavigateToExternalTargetAction.KIND);
+        const handlers = registry.get(sprotty_1.NavigateToExternalTargetAction.KIND);
         if (handlers.length === 1) {
             // we are the only handler so we know nobody took care of it
             this.warnAboutFailedNavigation('Could not resolve or navigate to target', action.target);
@@ -189,34 +188,31 @@ let NavigationActionHandler = class NavigationActionHandler {
     }
     notify(severity, message) {
         const timeout = this.notificationTimeout;
-        this.dispatcher.dispatchAll([
-            protocol_1.ServerStatusAction.create(message, { severity, timeout }),
-            protocol_1.ServerMessageAction.create(message, { severity, timeout })
-        ]);
+        this.dispatcher.dispatchAll([sprotty_1.StatusAction.create(message, { severity, timeout }), sprotty_1.MessageAction.create(message, { severity })]);
     }
 };
+exports.NavigationActionHandler = NavigationActionHandler;
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ILogger),
+    (0, inversify_1.inject)(sprotty_1.TYPES.ILogger),
     __metadata("design:type", Object)
 ], NavigationActionHandler.prototype, "logger", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
     __metadata("design:type", Object)
 ], NavigationActionHandler.prototype, "dispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ActionHandlerRegistryProvider),
+    (0, inversify_1.inject)(sprotty_1.TYPES.ActionHandlerRegistryProvider),
     __metadata("design:type", Function)
 ], NavigationActionHandler.prototype, "actionHandlerRegistryProvider", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IEditorContextServiceProvider),
+    (0, inversify_1.inject)(sprotty_1.TYPES.IEditorContextServiceProvider),
     __metadata("design:type", Function)
 ], NavigationActionHandler.prototype, "editorContextService", void 0);
 __decorate([
     (0, inversify_1.inject)(navigation_target_resolver_1.NavigationTargetResolver),
     __metadata("design:type", navigation_target_resolver_1.NavigationTargetResolver)
 ], NavigationActionHandler.prototype, "resolver", void 0);
-NavigationActionHandler = __decorate([
+exports.NavigationActionHandler = NavigationActionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], NavigationActionHandler);
-exports.NavigationActionHandler = NavigationActionHandler;
 //# sourceMappingURL=navigation-action-handler.js.map

package/lib/features/navigation/navigation-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-action-handler.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-action-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"navigation-action-handler.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-action-handler.ts"],"names":[],"mappings":"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"}

package/lib/features/navigation/navigation-module.d.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2020-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 { FeatureModule } from '@eclipse-glsp/sprotty';
+export declare const navigationModule: FeatureModule;
+//# sourceMappingURL=navigation-module.d.ts.map

package/lib/features/navigation/navigation-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation-module.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAkF,MAAM,uBAAuB,CAAC;AAItI,eAAO,MAAM,gBAAgB,eAO3B,CAAC"}

package/lib/features/navigation/navigation-module.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.navigationModule = void 0;
+/********************************************************************************
+ * Copyright (c) 2020-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
+ ********************************************************************************/
+const sprotty_1 = require("@eclipse-glsp/sprotty");
+const navigation_action_handler_1 = require("./navigation-action-handler");
+const navigation_target_resolver_1 = require("./navigation-target-resolver");
+exports.navigationModule = new sprotty_1.FeatureModule((bind, _unbind, isBound) => {
+    bind(navigation_target_resolver_1.NavigationTargetResolver).toSelf().inSingletonScope();
+    bind(navigation_action_handler_1.NavigationActionHandler).toSelf().inSingletonScope();
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, navigation_action_handler_1.NavigateAction.KIND, navigation_action_handler_1.NavigationActionHandler);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, sprotty_1.NavigateToTargetAction.KIND, navigation_action_handler_1.NavigationActionHandler);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, navigation_action_handler_1.ProcessNavigationArgumentsAction.KIND, navigation_action_handler_1.NavigationActionHandler);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, sprotty_1.NavigateToExternalTargetAction.KIND, navigation_action_handler_1.NavigationActionHandler);
+});
+//# sourceMappingURL=navigation-module.js.map

package/lib/features/navigation/navigation-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation-module.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAsI;AACtI,2EAAwH;AACxH,6EAAwE;AAE3D,QAAA,gBAAgB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACzE,IAAI,CAAC,qDAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,0CAAc,CAAC,IAAI,EAAE,mDAAuB,CAAC,CAAC;IACxF,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,gCAAsB,CAAC,IAAI,EAAE,mDAAuB,CAAC,CAAC;IAChG,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4DAAgC,CAAC,IAAI,EAAE,mDAAuB,CAAC,CAAC;IAC1G,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,wCAA8B,CAAC,IAAI,EAAE,mDAAuB,CAAC,CAAC;AAC5G,CAAC,CAAC,CAAC"}

package/lib/features/navigation/navigation-target-resolver.d.ts

@@ -1,21 +1,5 @@
-/********************************************************************************
- * Copyright (c) 2020-2022 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 { NavigationTarget, ResponseAction, SetResolvedNavigationTargetAction } from '@eclipse-glsp/protocol';
-import { IActionDispatcher, ILogger } from 'sprotty';
-import { EditorContextServiceProvider } from '../../base/editor-context-service';
+import { IActionDispatcher, ILogger, NavigationTarget, ResponseAction, SetResolvedNavigationTargetAction } from '@eclipse-glsp/sprotty';
+import { IDiagramOptions } from '../../base/model/diagram-loader';
 /**
  * Resolves `NavigationTargets` to element ids.
  *
@@ -23,9 +7,9 @@ import { EditorContextServiceProvider } from '../../base/editor-context-service'
  * `ResolveNavigationTargetAction` for element ids.
  */
 export declare class NavigationTargetResolver {
-    protected editorContextService: EditorContextServiceProvider;
     protected dispatcher: IActionDispatcher;
-    protected readonly logger: ILogger;
+    protected logger: ILogger;
+    protected diagramOptions: IDiagramOptions;
     resolve(navigationTarget: NavigationTarget): Promise<SetResolvedNavigationTargetAction | undefined>;
     resolveWithSourceUri(sourceUri: string | undefined, target: NavigationTarget): Promise<SetResolvedNavigationTargetAction | undefined>;
     protected requestResolution(target: NavigationTarget): Promise<ResponseAction>;

package/lib/features/navigation/navigation-target-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-target-resolver.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAiC,cAAc,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAE5I,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF;;;;;GAKG;AACH,qBACa,wBAAwB;IACY,SAAS,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;IACzE,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEpD,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAMnG,oBAAoB,CACtB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,gBAAgB,GACzB,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAiBzD,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;CAGjF"}
+{"version":3,"file":"navigation-target-resolver.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,iBAAiB,EACjB,OAAO,EACP,gBAAgB,EAEhB,cAAc,EACd,iCAAiC,EAEpC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE;;;;;GAKG;AACH,qBACa,wBAAwB;IAEjC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAEpC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAInG,oBAAoB,CACtB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,gBAAgB,GACzB,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAiBzD,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;CAGjF"}

package/lib/features/navigation/navigation-target-resolver.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavigationTargetResolver = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -25,9 +25,8 @@ exports.NavigationTargetResolver = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const types_1 = require("../../base/types");
+const sprotty_1 = require("@eclipse-glsp/sprotty");
 /**
  * Resolves `NavigationTargets` to element ids.
  *
@@ -36,9 +35,7 @@ const types_1 = require("../../base/types");
  */
 let NavigationTargetResolver = class NavigationTargetResolver {
     async resolve(navigationTarget) {
-        const contextService = await this.editorContextService();
-        const sourceUri = await contextService.getSourceUri();
-        return this.resolveWithSourceUri(sourceUri, navigationTarget);
+        return this.resolveWithSourceUri(this.diagramOptions.sourceUri, navigationTarget);
     }
     async resolveWithSourceUri(sourceUri, target) {
         const targetUri = decodeURIComponent(target.uri);
@@ -47,33 +44,33 @@ let NavigationTargetResolver = class NavigationTargetResolver {
             this.logger.info("Source and Target URI are different. Can't resolve locally.", sourceUri, targetUri);
             return undefined;
         }
-        if (protocol_1.NavigationTarget.getElementIds(target).length > 0) {
-            return protocol_1.SetResolvedNavigationTargetAction.create(protocol_1.NavigationTarget.getElementIds(target));
+        if (sprotty_1.NavigationTarget.getElementIds(target).length > 0) {
+            return sprotty_1.SetResolvedNavigationTargetAction.create(sprotty_1.NavigationTarget.getElementIds(target));
         }
         const response = await this.requestResolution(target);
-        if (protocol_1.SetResolvedNavigationTargetAction.is(response)) {
+        if (sprotty_1.SetResolvedNavigationTargetAction.is(response)) {
             return response;
         }
         return undefined;
     }
     requestResolution(target) {
-        return this.dispatcher.request(protocol_1.ResolveNavigationTargetAction.create(target));
+        return this.dispatcher.request(sprotty_1.ResolveNavigationTargetAction.create(target));
     }
 };
+exports.NavigationTargetResolver = NavigationTargetResolver;
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IEditorContextServiceProvider),
-    __metadata("design:type", Function)
-], NavigationTargetResolver.prototype, "editorContextService", void 0);
-__decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
     __metadata("design:type", Object)
 ], NavigationTargetResolver.prototype, "dispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ILogger),
+    (0, inversify_1.inject)(sprotty_1.TYPES.ILogger),
     __metadata("design:type", Object)
 ], NavigationTargetResolver.prototype, "logger", void 0);
-NavigationTargetResolver = __decorate([
+__decorate([
+    (0, inversify_1.inject)(sprotty_1.TYPES.IDiagramOptions),
+    __metadata("design:type", Object)
+], NavigationTargetResolver.prototype, "diagramOptions", void 0);
+exports.NavigationTargetResolver = NavigationTargetResolver = __decorate([
     (0, inversify_1.injectable)()
 ], NavigationTargetResolver);
-exports.NavigationTargetResolver = NavigationTargetResolver;
 //# sourceMappingURL=navigation-target-resolver.js.map

package/lib/features/navigation/navigation-target-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-target-resolver.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4I;AAC5I,yCAA+C;AAG/C,4CAAyC;AAEzC;;;;;GAKG;AAEH,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAKjC,KAAK,CAAC,OAAO,CAAC,gBAAkC;QAC5C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,SAA6B,EAC7B,MAAwB;QAExB,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,SAAS,IAAI,SAAS,KAAK,SAAS,IAAI,UAAU,SAAS,EAAE,KAAK,SAAS,EAAE;YAC7E,gDAAgD;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACtG,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,2BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACnD,OAAO,4CAAiC,CAAC,MAAM,CAAC,2BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,4CAAiC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;YAChD,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,iBAAiB,CAAC,MAAwB;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,wCAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AAjCgD;IAA5C,IAAA,kBAAM,EAAC,aAAK,CAAC,6BAA6B,CAAC;;sEAA8D;AACzE;IAAhC,IAAA,kBAAM,EAAC,aAAK,CAAC,iBAAiB,CAAC;;4DAAyC;AAClD;IAAtB,IAAA,kBAAM,EAAC,aAAK,CAAC,OAAO,CAAC;;wDAAoC;AAHjD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAkCpC;AAlCY,4DAAwB"}
+{"version":3,"file":"navigation-target-resolver.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,mDAQ+B;AAG/B;;;;;GAKG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAUjC,KAAK,CAAC,OAAO,CAAC,gBAAkC;QAC5C,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,SAA6B,EAC7B,MAAwB;QAExB,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,SAAS,IAAI,SAAS,KAAK,SAAS,IAAI,UAAU,SAAS,EAAE,KAAK,SAAS,EAAE;YAC7E,gDAAgD;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACtG,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,0BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACnD,OAAO,2CAAiC,CAAC,MAAM,CAAC,0BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,2CAAiC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;YAChD,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,iBAAiB,CAAC,MAAwB;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,uCAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AArCY,4DAAwB;AAEvB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;;4DACQ;AAG9B;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,OAAO,CAAC;;wDACI;AAGhB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,eAAe,CAAC;;gEACY;mCARjC,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAqCpC"}

package/lib/features/navigation/navigation-target-resolver.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-target-resolver.spec.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.spec.ts"],"names":[],"mappings":"AAkBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}
+{"version":3,"file":"navigation-target-resolver.spec.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.spec.ts"],"names":[],"mappings":"AAgBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}

package/lib/features/navigation/navigation-target-resolver.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -15,40 +15,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable no-unused-expressions */
-const protocol_1 = require("@eclipse-glsp/protocol");
 const chai_1 = require("chai");
 require("mocha");
 require("reflect-metadata");
+const sprotty_1 = require("@eclipse-glsp/sprotty");
 describe('NavigationTarget', () => {
     it('should be able to set and get element IDs', () => {
         const navigationTarget = { uri: 'uri' };
-        protocol_1.NavigationTarget.setElementIds(navigationTarget, 'id1', 'id2');
-        (0, chai_1.expect)(protocol_1.NavigationTarget.getElementIds(navigationTarget)).to.be.eql(['id1', 'id2']);
+        sprotty_1.NavigationTarget.setElementIds(navigationTarget, 'id1', 'id2');
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.getElementIds(navigationTarget)).to.be.eql(['id1', 'id2']);
     });
     it('should be able to set and get textual positions', () => {
         const navigationTarget = { uri: 'uri' };
-        protocol_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
-        (0, chai_1.expect)(protocol_1.NavigationTarget.getTextPosition(navigationTarget)).to.be.eql({ line: 1, character: 2 });
+        sprotty_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.getTextPosition(navigationTarget)).to.be.eql({ line: 1, character: 2 });
     });
     it('should be able to set and get custom query arguments', () => {
         const navigationTarget = { uri: 'uri' };
-        protocol_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
+        sprotty_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
         (0, chai_1.expect)(navigationTarget.args.name).to.be.eql('test');
     });
     it('should specify whether it has arguments', () => {
         let navigationTarget = { uri: 'uri' };
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        protocol_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        sprotty_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
         navigationTarget = { uri: 'uri' };
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        protocol_1.NavigationTarget.setElementIds(navigationTarget, 'id1', 'id2');
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        sprotty_1.NavigationTarget.setElementIds(navigationTarget, 'id1', 'id2');
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
         navigationTarget = { uri: 'uri' };
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        protocol_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
-        (0, chai_1.expect)(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        sprotty_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
+        (0, chai_1.expect)(sprotty_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
     });
 });
 //# sourceMappingURL=navigation-target-resolver.spec.js.map

package/lib/features/navigation/navigation-target-resolver.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-target-resolver.spec.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"navigation-target-resolver.spec.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.spec.ts"],"names":[],"mappings":"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"}

package/lib/features/reconnect/model.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,18 +13,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { RoutingHandleKind, SModelElement, SModelExtension, SRoutableElement, SRoutingHandle } from 'sprotty';
+import { GModelElement, GRoutableElement, GRoutingHandle, RoutingHandleKind } from '@eclipse-glsp/sprotty';
 export declare const reconnectFeature: unique symbol;
-export interface Reconnectable extends SModelExtension {
+/**
+ * Feature extension interface for {@link reconnectFeature}.
+ */
+export interface Reconnectable {
 }
-export declare function isReconnectable(element: SModelElement): element is SRoutableElement & Reconnectable;
-export declare function isReconnectHandle(element: SModelElement | undefined): element is SReconnectHandle;
-export declare function addReconnectHandles(element: SRoutableElement): void;
-export declare function removeReconnectHandles(element: SRoutableElement): void;
-export declare function isSourceRoutingHandle(edge: SRoutableElement, routingHandle: SReconnectHandle): boolean;
-export declare function isTargetRoutingHandle(edge: SRoutableElement, routingHandle: SReconnectHandle): boolean;
-export declare function createReconnectHandle(edge: SRoutableElement, kind: RoutingHandleKind, routingPointIndex: number): SReconnectHandle;
-export declare class SReconnectHandle extends SRoutingHandle {
+export declare function isReconnectable(element: GModelElement): element is GRoutableElement & Reconnectable;
+export declare function isReconnectHandle(element: GModelElement | undefined): element is GReconnectHandle;
+export declare function addReconnectHandles(element: GRoutableElement): void;
+export declare function removeReconnectHandles(element: GRoutableElement): void;
+export declare function isSourceRoutingHandle(edge: GRoutableElement, routingHandle: GReconnectHandle): boolean;
+export declare function isTargetRoutingHandle(edge: GRoutableElement, routingHandle: GReconnectHandle): boolean;
+export declare function createReconnectHandle(edge: GRoutableElement, kind: RoutingHandleKind, routingPointIndex: number): GReconnectHandle;
+export declare class GReconnectHandle extends GRoutingHandle {
     hasFeature(feature: symbol): boolean;
 }
 //# sourceMappingURL=model.d.ts.map

package/lib/features/reconnect/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/reconnect/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAGH,iBAAiB,EAEjB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D,MAAM,WAAW,aAAc,SAAQ,eAAe;CAAG;AAEzD,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,gBAAgB,GAAG,aAAa,CAEnG;AAID,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,IAAI,gBAAgB,CAEjG;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAInE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEtE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAEtG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAEtG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,GAAG,gBAAgB,CAUlI;AAED,qBAAa,gBAAiB,SAAQ,cAAc;IACvC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGhD"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/reconnect/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EAIpB,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AAEjC,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,gBAAgB,GAAG,aAAa,CAEnG;AAID,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,IAAI,gBAAgB,CAEjG;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAInE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEtE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAEtG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAEtG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,GAAG,gBAAgB,CAUlI;AAED,qBAAa,gBAAiB,SAAQ,cAAc;IACvC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGhD"}

package/lib/features/reconnect/model.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SReconnectHandle = exports.createReconnectHandle = exports.isTargetRoutingHandle = exports.isSourceRoutingHandle = exports.removeReconnectHandles = exports.addReconnectHandles = exports.isReconnectHandle = exports.isReconnectable = exports.reconnectFeature = void 0;
+exports.GReconnectHandle = exports.createReconnectHandle = exports.isTargetRoutingHandle = exports.isSourceRoutingHandle = exports.removeReconnectHandles = exports.addReconnectHandles = exports.isReconnectHandle = exports.isReconnectable = exports.reconnectFeature = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -16,15 +16,15 @@ exports.SReconnectHandle = exports.createReconnectHandle = exports.isTargetRouti
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const sprotty_1 = require("sprotty");
+const sprotty_1 = require("@eclipse-glsp/sprotty");
 exports.reconnectFeature = Symbol('reconnectFeature');
 function isReconnectable(element) {
-    return element instanceof sprotty_1.SRoutableElement && element.hasFeature(exports.reconnectFeature);
+    return element instanceof sprotty_1.GRoutableElement && element.hasFeature(exports.reconnectFeature);
 }
 exports.isReconnectable = isReconnectable;
 const ROUTING_HANDLE_SOURCE_INDEX = -2;
 function isReconnectHandle(element) {
-    return element !== undefined && element instanceof SReconnectHandle;
+    return element !== undefined && element instanceof GReconnectHandle;
 }
 exports.isReconnectHandle = isReconnectHandle;
 function addReconnectHandles(element) {
@@ -34,7 +34,7 @@ function addReconnectHandles(element) {
 }
 exports.addReconnectHandles = addReconnectHandles;
 function removeReconnectHandles(element) {
-    element.removeAll(child => child instanceof SReconnectHandle);
+    element.removeAll(child => child instanceof GReconnectHandle);
 }
 exports.removeReconnectHandles = removeReconnectHandles;
 function isSourceRoutingHandle(edge, routingHandle) {
@@ -46,7 +46,7 @@ function isTargetRoutingHandle(edge, routingHandle) {
 }
 exports.isTargetRoutingHandle = isTargetRoutingHandle;
 function createReconnectHandle(edge, kind, routingPointIndex) {
-    const handle = new SReconnectHandle();
+    const handle = new GReconnectHandle();
     handle.kind = kind;
     handle.pointIndex = routingPointIndex;
     handle.type = 'routing-point';
@@ -57,10 +57,10 @@ function createReconnectHandle(edge, kind, routingPointIndex) {
     return handle;
 }
 exports.createReconnectHandle = createReconnectHandle;
-class SReconnectHandle extends sprotty_1.SRoutingHandle {
+class GReconnectHandle extends sprotty_1.GRoutingHandle {
     hasFeature(feature) {
         return feature !== sprotty_1.selectFeature && super.hasFeature(feature);
     }
 }
-exports.SReconnectHandle = SReconnectHandle;
+exports.GReconnectHandle = GReconnectHandle;
 //# sourceMappingURL=model.js.map

package/lib/features/reconnect/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/reconnect/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qCASiB;AAEJ,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAI3D,SAAgB,eAAe,CAAC,OAAsB;IAClD,OAAO,OAAO,YAAY,0BAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AACvF,CAAC;AAFD,0CAEC;AAED,MAAM,2BAA2B,GAAG,CAAC,CAAC,CAAC;AAEvC,SAAgB,iBAAiB,CAAC,OAAkC;IAChE,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,YAAY,gBAAgB,CAAC;AACxE,CAAC;AAFD,8CAEC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IACzD,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IACtE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAC3E,CAAC;AAJD,kDAIC;AAED,SAAgB,sBAAsB,CAAC,OAAyB;IAC5D,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,gBAAgB,CAAC,CAAC;AAClE,CAAC;AAFD,wDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,aAA+B;IACzF,OAAO,aAAa,CAAC,UAAU,KAAK,2BAA2B,CAAC;AACpE,CAAC;AAFD,sDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,aAA+B;IACzF,OAAO,aAAa,CAAC,UAAU,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;AAClE,CAAC;AAFD,sDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,IAAuB,EAAE,iBAAyB;IAC5G,MAAM,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACtC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,MAAM,CAAC,UAAU,GAAG,iBAAiB,CAAC;IACtC,MAAM,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,KAAK,0BAAgB,EAAE;QACnD,MAAM,CAAC,EAAE,GAAG,sCAA4B,CAAC;KAC5C;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO,MAAM,CAAC;AAClB,CAAC;AAVD,sDAUC;AAED,MAAa,gBAAiB,SAAQ,wBAAc;IACvC,UAAU,CAAC,OAAe;QAC/B,OAAO,OAAO,KAAK,uBAAa,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;CACJ;AAJD,4CAIC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/reconnect/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAQ+B;AAElB,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAO3D,SAAgB,eAAe,CAAC,OAAsB;IAClD,OAAO,OAAO,YAAY,0BAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AACvF,CAAC;AAFD,0CAEC;AAED,MAAM,2BAA2B,GAAG,CAAC,CAAC,CAAC;AAEvC,SAAgB,iBAAiB,CAAC,OAAkC;IAChE,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,YAAY,gBAAgB,CAAC;AACxE,CAAC;AAFD,8CAEC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IACzD,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IACtE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAC3E,CAAC;AAJD,kDAIC;AAED,SAAgB,sBAAsB,CAAC,OAAyB;IAC5D,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,gBAAgB,CAAC,CAAC;AAClE,CAAC;AAFD,wDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,aAA+B;IACzF,OAAO,aAAa,CAAC,UAAU,KAAK,2BAA2B,CAAC;AACpE,CAAC;AAFD,sDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,aAA+B;IACzF,OAAO,aAAa,CAAC,UAAU,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;AAClE,CAAC;AAFD,sDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAsB,EAAE,IAAuB,EAAE,iBAAyB;IAC5G,MAAM,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACtC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,MAAM,CAAC,UAAU,GAAG,iBAAiB,CAAC;IACtC,MAAM,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,KAAK,0BAAgB,EAAE;QACnD,MAAM,CAAC,EAAE,GAAG,sCAA4B,CAAC;KAC5C;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO,MAAM,CAAC;AAClB,CAAC;AAVD,sDAUC;AAED,MAAa,gBAAiB,SAAQ,wBAAc;IACvC,UAAU,CAAC,OAAe;QAC/B,OAAO,OAAO,KAAK,uBAAa,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;CACJ;AAJD,4CAIC"}

package/lib/features/routing/glsp-manhattan-edge-router.d.ts

@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (c) 2022-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 { ManhattanEdgeRouter, ResolvedHandleMove, GRoutableElement } from '@eclipse-glsp/sprotty';
+export declare class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
+    protected applyInnerHandleMoves(edge: GRoutableElement, moves: ResolvedHandleMove[]): void;
+}
+//# sourceMappingURL=glsp-manhattan-edge-router.d.ts.map

package/lib/features/routing/glsp-manhattan-edge-router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-manhattan-edge-router.d.ts","sourceRoot":"","sources":["../../../src/features/routing/glsp-manhattan-edge-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAC;AAEhH,qBAAa,uBAAwB,SAAQ,mBAAmB;cACzC,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,IAAI;CAuCtG"}