@eclipse-glsp/client 0.9.0-next.f6bfed94 → 0.10.0-next.06ee84f.156

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

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavigationActionHandler = exports.isProcessNavigationArgumentsAction = exports.ProcessNavigationArgumentsAction = exports.isNavigateToExternalTargetAction = exports.NavigateToExternalTargetAction = exports.isNavigateToTargetAction = exports.NavigateToTargetAction = exports.isSetNavigationTargetsAction = exports.SetNavigationTargetsAction = exports.RequestNavigationTargetsAction = exports.isNavigateAction = exports.NavigateAction = void 0;
+exports.NavigationActionHandler = exports.isProcessNavigationArgumentsAction = exports.ProcessNavigationArgumentsAction = exports.isNavigateAction = exports.NavigateAction = void 0;
 /********************************************************************************
  * Copyright (c) 2020-2021 EclipseSource and others.
  *
@@ -25,10 +25,10 @@ exports.NavigationActionHandler = exports.isProcessNavigationArgumentsAction = e
  *
  * 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 sprotty_1 = require("sprotty");
 const types_1 = require("../../base/types");
-const glsp_server_status_1 = require("../../model-source/glsp-server-status");
 const navigation_target_resolver_1 = require("./navigation-target-resolver");
 /**
  * Action for triggering a navigation of a certain target type.
@@ -54,61 +54,6 @@ function isNavigateAction(action) {
     return action !== undefined && action.kind === NavigateAction.KIND && action.targetTypeId !== undefined;
 }
 exports.isNavigateAction = isNavigateAction;
-/** Action that is usually sent to the server to request navigation targets for a navigation type. */
-class RequestNavigationTargetsAction {
-    constructor(targetTypeId, editorContext, requestId = sprotty_1.generateRequestId()) {
-        this.targetTypeId = targetTypeId;
-        this.editorContext = editorContext;
-        this.requestId = requestId;
-        this.kind = RequestNavigationTargetsAction.KIND;
-    }
-}
-exports.RequestNavigationTargetsAction = RequestNavigationTargetsAction;
-RequestNavigationTargetsAction.KIND = 'requestNavigationTargets';
-/** Action that is usually sent from the server to the client as a repsonse to a `RequestNavigationTargetsAction`. */
-class SetNavigationTargetsAction {
-    constructor(targets, responseId = '', args) {
-        this.targets = targets;
-        this.responseId = responseId;
-        this.args = args;
-        this.kind = SetNavigationTargetsAction.KIND;
-    }
-}
-exports.SetNavigationTargetsAction = SetNavigationTargetsAction;
-SetNavigationTargetsAction.KIND = 'setNavigationTargets';
-function isSetNavigationTargetsAction(action) {
-    return (action !== undefined &&
-        action.kind === SetNavigationTargetsAction.KIND &&
-        action.targets !== undefined);
-}
-exports.isSetNavigationTargetsAction = isSetNavigationTargetsAction;
-/** Action that triggers the navigation to a particular navigation target, such as element IDs, queries, etc.. */
-class NavigateToTargetAction {
-    constructor(target) {
-        this.target = target;
-        this.kind = NavigateToTargetAction.KIND;
-    }
-}
-exports.NavigateToTargetAction = NavigateToTargetAction;
-NavigateToTargetAction.KIND = 'navigateToTarget';
-function isNavigateToTargetAction(action) {
-    return action !== undefined && action.kind === NavigateToTargetAction.KIND && action.target !== undefined;
-}
-exports.isNavigateToTargetAction = isNavigateToTargetAction;
-class NavigateToExternalTargetAction {
-    constructor(target) {
-        this.target = target;
-        this.kind = NavigateToExternalTargetAction.KIND;
-    }
-}
-exports.NavigateToExternalTargetAction = NavigateToExternalTargetAction;
-NavigateToExternalTargetAction.KIND = 'navigateToExternalTarget';
-function isNavigateToExternalTargetAction(action) {
-    return (action !== undefined &&
-        action.kind === NavigateToExternalTargetAction.KIND &&
-        action.target !== undefined);
-}
-exports.isNavigateToExternalTargetAction = isNavigateToExternalTargetAction;
 /** Action to trigger the processing of additional navigation arguments.
  *
  * The resolution of a `NavigationTarget` may entail additional arguments. In this case, this action is
@@ -161,13 +106,13 @@ let NavigationActionHandler = class NavigationActionHandler {
         if (isNavigateAction(action)) {
             this.handleNavigateAction(action);
         }
-        else if (isNavigateToTargetAction(action)) {
+        else if (protocol_1.isNavigateToTargetAction(action)) {
             this.handleNavigateToTarget(action);
         }
         else if (isProcessNavigationArgumentsAction(action)) {
             this.processNavigationArguments(action.args);
         }
-        else if (isNavigateToExternalTargetAction(action)) {
+        else if (protocol_1.isNavigateToExternalTargetAction(action)) {
             this.handleNavigateToExternalTarget(action);
         }
     }
@@ -175,12 +120,12 @@ let NavigationActionHandler = class NavigationActionHandler {
         try {
             const editorContextService = await this.editorContextService();
             const context = editorContextService.get(action.args);
-            const response = await this.dispatcher.request(new RequestNavigationTargetsAction(action.targetTypeId, context));
-            if (isSetNavigationTargetsAction(response) && response.targets && response.targets.length === 1) {
+            const response = await this.dispatcher.request(new protocol_1.RequestNavigationTargetsAction(action.targetTypeId, context));
+            if (protocol_1.isSetNavigationTargetsAction(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(new NavigateToTargetAction(response.targets[0]));
+                return this.dispatcher.dispatch(new protocol_1.NavigateToTargetAction(response.targets[0]));
             }
             this.warnAboutFailedNavigation('No valid navigation target found');
         }
@@ -222,7 +167,7 @@ let NavigationActionHandler = class NavigationActionHandler {
         if (!this.containsElementIds(elementIds)) {
             return;
         }
-        this.dispatcher.dispatchAll([new sprotty_1.SelectAllAction(false), new sprotty_1.SelectAction(elementIds), new sprotty_1.CenterAction(elementIds)]);
+        this.dispatcher.dispatchAll([new protocol_1.SelectAllAction(false), new protocol_1.SelectAction(elementIds), new protocol_1.CenterAction(elementIds)]);
     }
     handleResolutionArguments(target) {
         const args = target.args;
@@ -232,7 +177,7 @@ let NavigationActionHandler = class NavigationActionHandler {
         this.dispatcher.dispatch(new ProcessNavigationArgumentsAction(args));
     }
     navigateToExternal(target) {
-        return this.dispatcher.dispatch(new NavigateToExternalTargetAction(target));
+        return this.dispatcher.dispatch(new protocol_1.NavigateToExternalTargetAction(target));
     }
     processNavigationArguments(args) {
         if (args.info && args.info.toString().length > 0) {
@@ -247,7 +192,7 @@ let NavigationActionHandler = class NavigationActionHandler {
     }
     async handleNavigateToExternalTarget(action) {
         const registry = await this.actionHandlerRegistryProvider();
-        const handlers = registry.get(NavigateToExternalTargetAction.KIND);
+        const handlers = registry.get(protocol_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);
@@ -261,8 +206,8 @@ let NavigationActionHandler = class NavigationActionHandler {
     notify(severity, message) {
         const timeout = this.notificationTimeout;
         this.dispatcher.dispatchAll([
-            { kind: glsp_server_status_1.GLSPServerStatusAction.KIND, severity, timeout, message },
-            { kind: glsp_server_status_1.ServerMessageAction.KIND, severity, timeout, message }
+            { kind: protocol_1.GLSPServerStatusAction.KIND, severity, timeout, message },
+            { kind: protocol_1.ServerMessageAction.KIND, severity, timeout, message }
         ]);
     }
 };

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-target-resolver.d.ts

@@ -1,43 +1,21 @@
-import { Action, IActionDispatcher, ILogger, RequestAction, ResponseAction } from 'sprotty';
-import { Args } from '../../base/args';
-import { EditorContextServiceProvider } from '../../base/editor-context';
-export interface NavigationTarget {
-    uri: string;
-    label?: string;
-    args?: Args;
-}
-export declare namespace NavigationTarget {
-    const ELEMENT_IDS = "elementIds";
-    const ELEMENT_IDS_SEPARATOR = "&";
-    const TEXT_LINE = "line";
-    const TEXT_COLUMN = "column";
-    function hasArguments(target: NavigationTarget): boolean;
-    function addArgument(target: NavigationTarget, key: string, value: string | number | boolean): void;
-    function getElementIds(target: NavigationTarget): string[];
-    function setElementIds(target: NavigationTarget, elementIds: string[]): string;
-    function setTextPosition(target: NavigationTarget, position: TextPosition | undefined): void;
-    function getTextPosition(target: NavigationTarget): TextPosition | undefined;
-}
-export interface TextPosition {
-    line: number;
-    character: number;
-}
-export declare class ResolveNavigationTargetAction implements RequestAction<SetResolvedNavigationTargetAction> {
-    readonly navigationTarget: NavigationTarget;
-    readonly requestId: string;
-    static readonly KIND = "resolveNavigationTarget";
-    kind: string;
-    constructor(navigationTarget: NavigationTarget, requestId?: string);
-}
-export declare class SetResolvedNavigationTargetAction implements ResponseAction {
-    readonly elementIds: string[];
-    readonly args?: Args | undefined;
-    readonly responseId: string;
-    static readonly KIND = "setResolvedNavigationTarget";
-    kind: string;
-    constructor(elementIds?: string[], args?: Args | undefined, responseId?: string);
-}
-export declare function isSetResolvedNavigationTargets(action: Action): action is SetResolvedNavigationTargetAction;
+/********************************************************************************
+ * Copyright (c) 2020-2021 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, SetResolvedNavigationTargetAction } from '@eclipse-glsp/protocol';
+import { IActionDispatcher, ILogger, ResponseAction } from 'sprotty';
+import { EditorContextServiceProvider } from '../../base/editor-context-service';
 /**
  * Resolves `NavigationTargets` to element ids.
  *

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":"AAgBA,OAAO,EAAE,MAAM,EAAqB,iBAAiB,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAS,MAAM,SAAS,CAAC;AAEtH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGzE,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,IAAI,CAAC;CACf;AAED,yBAAiB,gBAAgB,CAAC;IACvB,MAAM,WAAW,eAAe,CAAC;IACjC,MAAM,qBAAqB,MAAM,CAAC;IAClC,MAAM,SAAS,SAAS,CAAC;IACzB,MAAM,WAAW,WAAW,CAAC;IAEpC,SAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAE9D;IAED,SAAgB,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAKzG;IAED,SAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAMhE;IAED,SAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAKpF;IAED,SAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,CAQlG;IAED,SAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,YAAY,GAAG,SAAS,CAYlF;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,6BAA8B,YAAW,aAAa,CAAC,iCAAiC,CAAC;IAGtF,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;aAAkB,SAAS,EAAE,MAAM;IAF1F,MAAM,CAAC,QAAQ,CAAC,IAAI,6BAA6B;IACjD,IAAI,SAAsC;gBACrB,gBAAgB,EAAE,gBAAgB,EAAkB,SAAS,GAAE,MAA4B;CACnH;AAED,qBAAa,iCAAkC,YAAW,cAAc;IAGxD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE;IAAO,QAAQ,CAAC,IAAI,CAAC;IAAQ,QAAQ,CAAC,UAAU,EAAE,MAAM;IAFjG,MAAM,CAAC,QAAQ,CAAC,IAAI,iCAAiC;IACrD,IAAI,SAA0C;gBACzB,UAAU,GAAE,MAAM,EAAO,EAAW,IAAI,CAAC,kBAAM,EAAW,UAAU,GAAE,MAAW;CACzG;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,iCAAiC,CAE1G;AAED;;;;;GAKG;AACH,qBACa,wBAAwB;IACiB,SAAS,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;IAC9E,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":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,gBAAgB,EAEhB,iCAAiC,EACpC,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF;;;;;GAKG;AACH,qBACa,wBAAwB;IACiB,SAAS,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;IAC9E,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"}

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

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavigationTargetResolver = exports.isSetResolvedNavigationTargets = exports.SetResolvedNavigationTargetAction = exports.ResolveNavigationTargetAction = exports.NavigationTarget = void 0;
+exports.NavigationTargetResolver = void 0;
 /********************************************************************************
  * Copyright (c) 2020-2021 EclipseSource and others.
  *
@@ -25,87 +25,10 @@ exports.NavigationTargetResolver = exports.isSetResolvedNavigationTargets = expo
  *
  * 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 sprotty_1 = require("sprotty");
 const types_1 = require("../../base/types");
-var NavigationTarget;
-(function (NavigationTarget) {
-    NavigationTarget.ELEMENT_IDS = 'elementIds';
-    NavigationTarget.ELEMENT_IDS_SEPARATOR = '&';
-    NavigationTarget.TEXT_LINE = 'line';
-    NavigationTarget.TEXT_COLUMN = 'column';
-    function hasArguments(target) {
-        return target.args !== undefined && Object.keys(target.args).length > 0;
-    }
-    NavigationTarget.hasArguments = hasArguments;
-    function addArgument(target, key, value) {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        target.args[key] = value;
-    }
-    NavigationTarget.addArgument = addArgument;
-    function getElementIds(target) {
-        if (target.args === undefined || target.args[NavigationTarget.ELEMENT_IDS] === undefined) {
-            return [];
-        }
-        const elementIdsValue = target.args[NavigationTarget.ELEMENT_IDS].toString();
-        return elementIdsValue.split(NavigationTarget.ELEMENT_IDS_SEPARATOR);
-    }
-    NavigationTarget.getElementIds = getElementIds;
-    function setElementIds(target, elementIds) {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        return (target.args[NavigationTarget.ELEMENT_IDS] = elementIds.join(NavigationTarget.ELEMENT_IDS_SEPARATOR));
-    }
-    NavigationTarget.setElementIds = setElementIds;
-    function setTextPosition(target, position) {
-        if (position) {
-            if (target.args === undefined) {
-                target.args = {};
-            }
-            target.args[NavigationTarget.TEXT_LINE] = position.line;
-            target.args[NavigationTarget.TEXT_COLUMN] = position.character;
-        }
-    }
-    NavigationTarget.setTextPosition = setTextPosition;
-    function getTextPosition(target) {
-        if (target.args === undefined ||
-            target.args[NavigationTarget.TEXT_LINE] === undefined ||
-            target.args[NavigationTarget.TEXT_COLUMN] === undefined) {
-            return undefined;
-        }
-        return {
-            line: Number(target.args[NavigationTarget.TEXT_LINE]),
-            character: Number(target.args[NavigationTarget.TEXT_COLUMN])
-        };
-    }
-    NavigationTarget.getTextPosition = getTextPosition;
-})(NavigationTarget = exports.NavigationTarget || (exports.NavigationTarget = {}));
-class ResolveNavigationTargetAction {
-    constructor(navigationTarget, requestId = sprotty_1.generateRequestId()) {
-        this.navigationTarget = navigationTarget;
-        this.requestId = requestId;
-        this.kind = ResolveNavigationTargetAction.KIND;
-    }
-}
-exports.ResolveNavigationTargetAction = ResolveNavigationTargetAction;
-ResolveNavigationTargetAction.KIND = 'resolveNavigationTarget';
-class SetResolvedNavigationTargetAction {
-    constructor(elementIds = [], args, responseId = '') {
-        this.elementIds = elementIds;
-        this.args = args;
-        this.responseId = responseId;
-        this.kind = SetResolvedNavigationTargetAction.KIND;
-    }
-}
-exports.SetResolvedNavigationTargetAction = SetResolvedNavigationTargetAction;
-SetResolvedNavigationTargetAction.KIND = 'setResolvedNavigationTarget';
-function isSetResolvedNavigationTargets(action) {
-    return action !== undefined && action.kind === SetResolvedNavigationTargetAction.KIND;
-}
-exports.isSetResolvedNavigationTargets = isSetResolvedNavigationTargets;
 /**
  * Resolves `NavigationTargets` to element ids.
  *
@@ -125,17 +48,17 @@ let NavigationTargetResolver = class NavigationTargetResolver {
             this.logger.info("Source and Target URI are different. Can't resolve locally.", sourceUri, targetUri);
             return undefined;
         }
-        if (NavigationTarget.getElementIds(target).length > 0) {
-            return new SetResolvedNavigationTargetAction(NavigationTarget.getElementIds(target));
+        if (protocol_1.NavigationTarget.getElementIds(target).length > 0) {
+            return new protocol_1.SetResolvedNavigationTargetAction(protocol_1.NavigationTarget.getElementIds(target));
         }
         const response = await this.requestResolution(target);
-        if (isSetResolvedNavigationTargets(response)) {
+        if (protocol_1.isSetResolvedNavigationTargets(response)) {
             return response;
         }
         return undefined;
     }
     requestResolution(target) {
-        return this.dispatcher.request(new ResolveNavigationTargetAction(target));
+        return this.dispatcher.request(new protocol_1.ResolveNavigationTargetAction(target));
     }
 };
 __decorate([

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":"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"}
+{"version":3,"file":"navigation-target-resolver.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAKgC;AAChC,yCAA+C;AAC/C,qCAA4E;AAE5E,4CAA8C;AAE9C;;;;;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,IAAI,4CAAiC,CAAC,2BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;SACxF;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,yCAA8B,CAAC,QAAQ,CAAC,EAAE;YAC1C,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,iBAAiB,CAAC,MAAwB;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,wCAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,CAAC;CACJ,CAAA;AAjCqD;IAAjD,kBAAM,CAAC,kBAAU,CAAC,6BAA6B,CAAC;;sEAA8D;AAC9E;IAAhC,kBAAM,CAAC,eAAK,CAAC,iBAAiB,CAAC;;4DAAyC;AAClD;IAAtB,kBAAM,CAAC,eAAK,CAAC,OAAO,CAAC;;wDAAoC;AAHjD,wBAAwB;IADpC,sBAAU,EAAE;GACA,wBAAwB,CAkCpC;AAlCY,4DAAwB"}

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

@@ -1,18 +1,3 @@
-/********************************************************************************
- * Copyright (c) 2020-2021 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 'mocha';
 import 'reflect-metadata';
 //# sourceMappingURL=navigation-target-resolver.spec.d.ts.map

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":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,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":"AAkBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}

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

@@ -16,39 +16,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 chai_1 = require("chai");
-const navigation_target_resolver_1 = require("./navigation-target-resolver");
 describe('NavigationTarget', () => {
     it('should be able to set and get element IDs', () => {
         const navigationTarget = { uri: 'uri' };
-        navigation_target_resolver_1.NavigationTarget.setElementIds(navigationTarget, ['id1', 'id2']);
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.getElementIds(navigationTarget)).to.be.eql(['id1', 'id2']);
+        protocol_1.NavigationTarget.setElementIds(navigationTarget, ['id1', 'id2']);
+        chai_1.expect(protocol_1.NavigationTarget.getElementIds(navigationTarget)).to.be.eql(['id1', 'id2']);
     });
     it('should be able to set and get textual positions', () => {
         const navigationTarget = { uri: 'uri' };
-        navigation_target_resolver_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.getTextPosition(navigationTarget)).to.be.eql({ line: 1, character: 2 });
+        protocol_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
+        chai_1.expect(protocol_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' };
-        navigation_target_resolver_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
+        protocol_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
         chai_1.expect(navigationTarget.args.name).to.be.eql('test');
     });
     it('should specify whether it has arguments', () => {
         let navigationTarget = { uri: 'uri' };
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        navigation_target_resolver_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        chai_1.expect(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        protocol_1.NavigationTarget.addArgument(navigationTarget, 'name', 'test');
+        chai_1.expect(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
         navigationTarget = { uri: 'uri' };
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        navigation_target_resolver_1.NavigationTarget.setElementIds(navigationTarget, ['id1', 'id2']);
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        chai_1.expect(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        protocol_1.NavigationTarget.setElementIds(navigationTarget, ['id1', 'id2']);
+        chai_1.expect(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
         navigationTarget = { uri: 'uri' };
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
-        navigation_target_resolver_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
-        chai_1.expect(navigation_target_resolver_1.NavigationTarget.hasArguments(navigationTarget)).to.be.true;
+        chai_1.expect(protocol_1.NavigationTarget.hasArguments(navigationTarget)).to.be.false;
+        protocol_1.NavigationTarget.setTextPosition(navigationTarget, { line: 1, character: 2 });
+        chai_1.expect(protocol_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/save/di.config.js

@@ -17,13 +17,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  ********************************************************************************/
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
-const save_1 = require("./save");
+const save_keylistener_1 = require("./save-keylistener");
 /**
  * This module is not required the diagram is deployed in Theia with the `GLSPDiagramWidget`
  * but only intended to be used in a standalone deployment of GLSP.
  */
 const saveModule = new inversify_1.ContainerModule(bind => {
-    bind(sprotty_1.TYPES.KeyListener).to(save_1.SaveModelKeyboardListener);
+    bind(sprotty_1.TYPES.KeyListener).to(save_keylistener_1.SaveModelKeyboardListener);
 });
 exports.default = saveModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/save/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/save/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAgC;AAEhC,iCAAmD;AAEnD;;;GAGG;AACH,MAAM,UAAU,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC1C,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,gCAAyB,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/save/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAgC;AAEhC,yDAA+D;AAE/D;;;GAGG;AACH,MAAM,UAAU,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC1C,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,4CAAyB,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,kBAAe,UAAU,CAAC"}

package/lib/features/save/{save.d.ts → save-keylistener.d.ts}

@@ -13,15 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, KeyListener, SModelRoot } from 'sprotty';
-export declare class SaveModelAction implements Action {
-    readonly fileUri?: string | undefined;
-    readonly kind: string;
-    static readonly KIND = "saveModel";
-    constructor(fileUri?: string | undefined, kind?: string);
-}
-export declare function isSaveModelAction(action: Action): action is SaveModelAction;
+import { Action } from '@eclipse-glsp/protocol';
+import { KeyListener, SModelRoot } from 'sprotty';
 export declare class SaveModelKeyboardListener extends KeyListener {
     keyDown(_element: SModelRoot, event: KeyboardEvent): Action[];
 }
-//# sourceMappingURL=save.d.ts.map
+//# sourceMappingURL=save-keylistener.d.ts.map

package/lib/features/save/save-keylistener.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-keylistener.d.ts","sourceRoot":"","sources":["../../../src/features/save/save-keylistener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAmB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGlD,qBAAa,yBAA0B,SAAQ,WAAW;IACtD,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMhE"}

package/lib/features/save/{save.js → save-keylistener.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SaveModelKeyboardListener = exports.isSaveModelAction = exports.SaveModelAction = void 0;
+exports.SaveModelKeyboardListener = void 0;
 /********************************************************************************
  * Copyright (c) 2019-2021 EclipseSource and others.
  *
@@ -16,27 +16,16 @@ exports.SaveModelKeyboardListener = exports.isSaveModelAction = exports.SaveMode
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const sprotty_1 = require("sprotty");
 const keyboard_1 = require("sprotty/lib/utils/keyboard");
-class SaveModelAction {
-    constructor(fileUri, kind = SaveModelAction.KIND) {
-        this.fileUri = fileUri;
-        this.kind = kind;
-    }
-}
-exports.SaveModelAction = SaveModelAction;
-SaveModelAction.KIND = 'saveModel';
-function isSaveModelAction(action) {
-    return action.kind === SaveModelAction.KIND;
-}
-exports.isSaveModelAction = isSaveModelAction;
 class SaveModelKeyboardListener extends sprotty_1.KeyListener {
     keyDown(_element, event) {
         if (keyboard_1.matchesKeystroke(event, 'KeyS', 'ctrlCmd')) {
-            return [new SaveModelAction()];
+            return [new protocol_1.SaveModelAction()];
         }
         return [];
     }
 }
 exports.SaveModelKeyboardListener = SaveModelKeyboardListener;
-//# sourceMappingURL=save.js.map
+//# sourceMappingURL=save-keylistener.js.map

package/lib/features/save/save-keylistener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-keylistener.js","sourceRoot":"","sources":["../../../src/features/save/save-keylistener.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAiE;AACjE,qCAAkD;AAClD,yDAA8D;AAE9D,MAAa,yBAA0B,SAAQ,qBAAW;IACtD,OAAO,CAAC,QAAoB,EAAE,KAAoB;QAC9C,IAAI,2BAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE;YAC5C,OAAO,CAAC,IAAI,0BAAe,EAAE,CAAC,CAAC;SAClC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAPD,8DAOC"}

package/lib/features/select/selection-service.d.ts

@@ -1,4 +1,20 @@
-import { Action, Command, CommandExecutionContext, ILogger, SelectAction, SelectAllAction, SModelElement, SModelRoot, SParentElement } from 'sprotty';
+/********************************************************************************
+ * Copyright (c) 2019-2021 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 { Action, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
+import { Command, CommandExecutionContext, ILogger, SModelElement, SModelRoot, SParentElement } from 'sprotty';
 import { SModelRootListener } from '../../base/model/update-model-command';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 export interface SelectionListener {

package/lib/features/select/selection-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,OAAO,EAIP,YAAY,EACZ,eAAe,EAGf,aAAa,EACb,UAAU,EACV,cAAc,EAEjB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAClF;AAED,qBACa,gBAAiB,YAAW,kBAAkB;IAOY,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,EAAE;IANpH,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,kBAAkB,CAA0B;IAEN,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAC/E,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;gBAE4B,kBAAkB,GAAE,iBAAiB,EAAO;IAEzH,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAIpD,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAItD,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAIlD,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAkDvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;IAIxE,YAAY,IAAI,QAAQ,CAAC,UAAU,CAAC;IAIpC,mBAAmB,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;IAIhD;;OAEG;IAEH,qBAAqB,IAAI,GAAG,CAAC,MAAM,CAAC;IAIpC,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,IAAI,OAAO;IAI5B,gBAAgB,IAAI,OAAO;CAG9B;AAED,qBACa,aAAc,SAAQ,OAAO;IAOL,MAAM,EAAE,YAAY;IACL,gBAAgB,EAAE,gBAAgB;IAPlF,MAAM,CAAC,QAAQ,CAAC,IAAI,qBAA6B;IAEjD,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAM;IACzC,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,CAAM;gBAGV,MAAM,EAAE,YAAY,EACL,gBAAgB,EAAE,gBAAgB;IAKlF,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAiBrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAOlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAMrD;AAED,qBACa,gBAAiB,SAAQ,OAAO;IAKR,MAAM,EAAE,eAAe;IACR,gBAAgB,EAAE,gBAAgB;IALlF,MAAM,CAAC,QAAQ,CAAC,IAAI,iBAAgC;IACpD,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAA8B;gBAG9C,MAAM,EAAE,eAAe,EACR,gBAAgB,EAAE,gBAAgB;IAKlF,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAIrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAWlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAWlD,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;CAS5F"}
+{"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"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"}