@eclipse-glsp/client 1.1.0-next.cab84ec.250 → 1.1.0-next.cc57a50.267

package/src/features/tool-feedback/di.config.ts

@@ -1,65 +0,0 @@
-/********************************************************************************
- * 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
- * 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 { ContainerModule } from 'inversify';
-import { bindAsService, configureCommand, configureView, LocationPostprocessor, MoveCommand, TYPES } from '~glsp-sprotty';
-import { SResizeHandle } from '../change-bounds/model';
-import { HideChangeBoundsToolResizeFeedbackCommand, ShowChangeBoundsToolResizeFeedbackCommand } from './change-bounds-tool-feedback';
-import { DrawFeedbackEdgeCommand, FeedbackEdgeEnd, RemoveFeedbackEdgeCommand } from './creation-tool-feedback';
-import { ModifyCssFeedbackCommand } from './css-feedback';
-import {
-    DrawFeedbackEdgeSourceCommand,
-    HideEdgeReconnectHandlesFeedbackCommand,
-    ShowEdgeReconnectHandlesFeedbackCommand,
-    SwitchRoutingModeCommand
-} from './edge-edit-tool-feedback';
-import { FeedbackActionDispatcher } from './feedback-action-dispatcher';
-import { DrawMarqueeCommand, RemoveMarqueeCommand } from './marquee-tool-feedback';
-import { FeedbackEdgeEndView, SResizeHandleView } from './view';
-
-const toolFeedbackModule = new ContainerModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    bind(TYPES.IFeedbackActionDispatcher).to(FeedbackActionDispatcher).inSingletonScope();
-
-    configureCommand(context, ModifyCssFeedbackCommand);
-
-    // create node and edge tool feedback
-    configureCommand(context, DrawFeedbackEdgeCommand);
-    configureCommand(context, RemoveFeedbackEdgeCommand);
-
-    configureCommand(context, DrawMarqueeCommand);
-    configureCommand(context, RemoveMarqueeCommand);
-
-    configureView(context, FeedbackEdgeEnd.TYPE, FeedbackEdgeEndView);
-    // move tool feedback: we use sprotty's MoveCommand as client-side visual feedback
-    configureCommand(context, MoveCommand);
-
-    // resize tool feedback
-    configureCommand(context, ShowChangeBoundsToolResizeFeedbackCommand);
-    configureCommand(context, HideChangeBoundsToolResizeFeedbackCommand);
-    configureView(context, SResizeHandle.TYPE, SResizeHandleView);
-
-    // reconnect edge tool feedback
-    configureCommand(context, ShowEdgeReconnectHandlesFeedbackCommand);
-    configureCommand(context, HideEdgeReconnectHandlesFeedbackCommand);
-    configureCommand(context, DrawFeedbackEdgeSourceCommand);
-
-    configureCommand(context, SwitchRoutingModeCommand);
-
-    bindAsService(context, TYPES.IVNodePostprocessor, LocationPostprocessor);
-    bind(TYPES.HiddenVNodePostprocessor).toService(LocationPostprocessor);
-});
-
-export default toolFeedbackModule;

package/src/features/tools/di.config.ts

@@ -1,77 +0,0 @@
-/********************************************************************************
- * 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
- * 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 { ContainerModule } from 'inversify';
-import {
-    bindAsService,
-    BindingContext,
-    bindOrRebind,
-    configureActionHandler,
-    configureModelElement,
-    ManhattanEdgeRouter,
-    TriggerEdgeCreationAction,
-    TriggerNodeCreationAction,
-    TYPES
-} from '~glsp-sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { MARQUEE } from '../tool-feedback/marquee-tool-feedback';
-import { ChangeBoundsTool } from './change-bounds-tool';
-import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
-import { EdgeCreationTool } from './edge-creation-tool';
-import { EdgeEditTool } from './edge-edit-tool';
-import { EnableDefaultToolsOnFocusLossHandler } from './enable-default-tools-on-focus-loss';
-import { GLSPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
-import { MarqueeMouseTool } from './marquee-mouse-tool';
-import { MarqueeTool } from './marquee-tool';
-import { MarqueeNode } from './model';
-import { NodeCreationTool } from './node-creation-tool';
-import { MarqueeView } from './view';
-
-/**
- * Registers the default tools of GLSP (node and edge creation, changing bounds, edge editing, deletion)
- * and adds the marquee selection tool.
- */
-export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
-    const context = { bind, isBound, rebind };
-    // Register default tools
-    bindAsService(context, TYPES.IDefaultTool, ChangeBoundsTool);
-    bindAsService(context, TYPES.IDefaultTool, EdgeEditTool);
-    bindAsService(context, TYPES.IDefaultTool, DelKeyDeleteTool);
-
-    // Register  tools
-    bindAsService(context, TYPES.ITool, MouseDeleteTool);
-    bindAsService(context, TYPES.ITool, NodeCreationTool);
-    bindAsService(context, TYPES.ITool, EdgeCreationTool);
-
-    configureMarqueeTool(context);
-    configureActionHandler(context, TriggerNodeCreationAction.KIND, NodeCreationTool);
-    configureActionHandler(context, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
-
-    bind(GLSPManhattanEdgeRouter).toSelf().inSingletonScope();
-    bindOrRebind(context, ManhattanEdgeRouter).toService(GLSPManhattanEdgeRouter);
-});
-
-export function configureMarqueeTool(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
-    configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
-    bindAsService(context, TYPES.IDefaultTool, MarqueeTool);
-    bindAsService(context, TYPES.ITool, MarqueeMouseTool);
-}
-
-/**
- * Enables the default tools in the tool manager if the diagram looses focus.
- */
-export const enableDefaultToolsOnFocusLossModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
-});

package/src/model-source/glsp-diagram-server.ts

@@ -1,115 +0,0 @@
-/********************************************************************************
- * 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
- * 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 { injectable } from 'inversify';
-import {
-    Action,
-    ActionHandlerRegistry,
-    ActionMessage,
-    ComputedBoundsAction,
-    DiagramServerProxy,
-    ExportSvgAction,
-    GLSPClient,
-    ICommand,
-    RequestModelAction,
-    ServerMessageAction,
-    ServerStatusAction,
-    SetEditModeAction,
-    SwitchEditModeCommand
-} from '~glsp-sprotty';
-import { SourceUriAware } from '../base/source-uri-aware';
-
-const receivedFromServerProperty = '__receivedFromServer';
-
-@injectable()
-export class GLSPDiagramServer extends DiagramServerProxy implements SourceUriAware {
-    protected _sourceUri: string;
-    protected _glspClient?: GLSPClient;
-    protected ready = false;
-
-    async connect(client: GLSPClient): Promise<GLSPClient> {
-        await client.start();
-        client.onActionMessage(message => this.messageReceived(message));
-        this._glspClient = client;
-        return this._glspClient;
-    }
-
-    public get glspClient(): GLSPClient | undefined {
-        return this._glspClient;
-    }
-
-    protected sendMessage(message: ActionMessage): void {
-        if (this.glspClient) {
-            this.glspClient.sendActionMessage(message);
-        } else {
-            throw new Error('GLSPClient is not connected');
-        }
-    }
-
-    override initialize(registry: ActionHandlerRegistry): void {
-        registerDefaultGLSPServerActions(registry, this);
-        if (!this.clientId) {
-            this.clientId = this.viewerOptions.baseDiv;
-        }
-    }
-
-    override handle(action: Action): void | ICommand | Action {
-        if (RequestModelAction.is(action) && action.options) {
-            this._sourceUri = action.options.sourceUri as string;
-        }
-        return super.handle(action);
-    }
-
-    override handleLocally(action: Action): boolean {
-        if (ServerMessageAction.is(action)) {
-            return this.handleServerMessageAction(action);
-        }
-        if (SetEditModeAction.is(action)) {
-            return this.handleSetEditModeAction(action);
-        }
-        return super.handleLocally(action);
-    }
-
-    protected handleServerMessageAction(action: ServerMessageAction): boolean {
-        this.logger.log('GLSPDiagramServer', `[${action.severity}] -${action.message}`);
-        return false;
-    }
-
-    protected override handleComputedBounds(_action: ComputedBoundsAction): boolean {
-        return true;
-    }
-
-    protected handleSetEditModeAction(action: SetEditModeAction): boolean {
-        return !isReceivedFromServer(action);
-    }
-
-    public get sourceURI(): string {
-        return this._sourceUri;
-    }
-}
-
-export function isReceivedFromServer(action: Action): boolean {
-    return (action as any)[receivedFromServerProperty] === true;
-}
-
-export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServerProxy): void {
-    registry.register(ServerMessageAction.KIND, diagramServer);
-    registry.register(ServerStatusAction.KIND, diagramServer);
-    registry.register(ExportSvgAction.KIND, diagramServer);
-
-    // Register an empty handler for SwitchEditMode, to avoid runtime exceptions.
-    // We don't support SwitchEditMode, but Sprotty still sends those actions, so ignore them.
-    registry.register(SwitchEditModeCommand.KIND, { handle: action => undefined });
-}