@eclipse-glsp/server 2.2.0-next.87 → 2.2.0-next.89

package/src/browser/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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,6 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '../common/index';
 export * from './di/app-module';
 export * from './launch/worker-server-launcher';
+export * from './reexport';

package/src/browser/launch/worker-server-launcher.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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,13 +16,12 @@
 
 import { injectable } from 'inversify';
 import * as jsonrpc from 'vscode-jsonrpc/browser';
-import { MaybePromise } from '../../common/index';
-import { JsonRpcGLSPServerLauncher, JsonRpcServerInstance } from '../../common/launch/jsonrpc-server-launcher';
+import { JsonRpcGLSPServerLauncher, JsonRpcServerInstance, MaybePromise } from '../../common';
 export interface WorkerLaunchOptions {
     context?: Worker;
 }
 
-export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed.';
+export const WORKER_START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed.';
 
 @injectable()
 export class WorkerServerLauncher extends JsonRpcGLSPServerLauncher<WorkerLaunchOptions> {
@@ -35,7 +34,7 @@ export class WorkerServerLauncher extends JsonRpcGLSPServerLauncher<WorkerLaunch
         this.connection = this.createConnection(options);
         this.createServerInstance(this.connection);
         this.logger.info('GLSP server worker connection established');
-        postMessage(START_UP_COMPLETE_MSG);
+        postMessage(WORKER_START_UP_COMPLETE_MSG);
         return new Promise((resolve, rejects) => {
             this.connection?.onClose(() => resolve(undefined));
             this.connection?.onError(error => rejects(error));

package/src/browser/reexport.ts

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

package/src/common/.indexignore

@@ -0,0 +1,2 @@
+# Don't export test resources to avoid an implicit dependency on chai/sinon
+test

package/src/common/command/recording-command.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -28,7 +28,10 @@ interface TestModel {
 let jsonObject: TestModel;
 
 class TestRecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
-    constructor(protected jsonObject: JsonObject, protected doExecute: () => MaybePromise<void>) {
+    constructor(
+        protected jsonObject: JsonObject,
+        protected doExecute: () => MaybePromise<void>
+    ) {
         super();
     }
 

package/src/common/command/recording-command.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -93,7 +93,11 @@ export abstract class AbstractRecordingCommand<JsonObject extends AnyObject> imp
  * to the `GModelRoot` ({@link ModelState.root}) during the given `doExecute` function
  */
 export class GModelRecordingCommand extends AbstractRecordingCommand<GModelRootSchema> {
-    constructor(protected modelState: ModelState, protected serializer: GModelSerializer, protected doExecute: () => MaybePromise<void>) {
+    constructor(
+        protected modelState: ModelState,
+        protected serializer: GModelSerializer,
+        protected doExecute: () => MaybePromise<void>
+    ) {
         super();
     }
 

package/src/common/di/client-session-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GLSPClientProxy, bindOrRebind } from '@eclipse-glsp/protocol';
+import { GLSPClientProxy } from '@eclipse-glsp/protocol';
+import { bindOrRebind } from '@eclipse-glsp/protocol/lib/di';
 import { ContainerModule } from 'inversify';
 import { ClientActionKinds, ClientId } from './service-identifiers';
 

package/src/common/di/glsp-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BindingContext } from '@eclipse-glsp/protocol';
+import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import { ContainerModule, injectable, interfaces } from 'inversify';
 import { AbstractMultiBinding } from './multi-binding';
 

package/src/common/di/multi-binding.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BindingContext, distinctAdd, flatPush, MaybeArray, remove } from '@eclipse-glsp/protocol';
+import { distinctAdd, flatPush, MaybeArray, remove } from '@eclipse-glsp/protocol';
+import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import { applyBindingTarget, BindingTarget } from './binding-target';
 
 /**

package/src/common/features/directediting/context-edit-validator.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -37,7 +37,10 @@ export interface ContextEditValidator {
 
 export class ValidateLabelEditAdapter implements ContextEditValidator {
     labelEditValidator: LabelEditValidator;
-    constructor(readonly modelState: ModelState, labelEditValidator: LabelEditValidator) {
+    constructor(
+        readonly modelState: ModelState,
+        labelEditValidator: LabelEditValidator
+    ) {
         this.labelEditValidator = labelEditValidator;
     }
 

package/src/common/features/model/model-submission-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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

package/src/common/features/navigation/navigation-target-resolution.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,5 +18,8 @@ import { Args } from '@eclipse-glsp/protocol';
 export class NavigationTargetResolution {
     static readonly EMPTY = new NavigationTargetResolution([]);
 
-    constructor(readonly elementIds: string[], readonly args?: Args) {}
+    constructor(
+        readonly elementIds: string[],
+        readonly args?: Args
+    ) {}
 }

package/src/common/gmodel/gmodel-create-node-operation-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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,7 +16,12 @@
 
 import { GModelElement, GNode } from '@eclipse-glsp/graph';
 import {
-    Args, CreateNodeOperation, GhostElement, MaybePromise, Point, SelectAction,
+    Args,
+    CreateNodeOperation,
+    GhostElement,
+    MaybePromise,
+    Point,
+    SelectAction,
     TriggerNodeCreationAction
 } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
@@ -62,8 +67,10 @@ export abstract class GModelCreateNodeOperationHandler extends GModelOperationHa
     }
 
     protected createTriggerNodeCreationAction(elementTypeId: string): TriggerNodeCreationAction {
-        return TriggerNodeCreationAction.create(elementTypeId,
-            { ghostElement: this.createTriggerGhostElement(elementTypeId), args: this.createTriggerArgs(elementTypeId) } );
+        return TriggerNodeCreationAction.create(elementTypeId, {
+            ghostElement: this.createTriggerGhostElement(elementTypeId),
+            args: this.createTriggerArgs(elementTypeId)
+        });
     }
 
     protected createTriggerGhostElement(elementTypeId: string): GhostElement | undefined {

package/src/common/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -14,8 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-export * from '@eclipse-glsp/graph';
-export * from '@eclipse-glsp/protocol';
 export * from './actions/action-dispatcher';
 export * from './actions/action-handler';
 export * from './actions/action-handler-registry';
@@ -64,19 +62,34 @@ export * from './features/navigation/request-navigation-targets-action-handler';
 export * from './features/navigation/resolve-navigation-targets-action-handler';
 export * from './features/popup/popup-model-factory';
 export * from './features/popup/request-popup-model-action-handler';
+export * from './features/progress/progress-service';
 export * from './features/type-hints/edge-creation-checker';
+export * from './features/type-hints/request-check-edge-action-handler';
 export * from './features/type-hints/request-type-hints-action-handler';
 export * from './features/validation/model-validator';
 export * from './features/validation/request-markers-handler';
-export * from './gmodel/index';
+export * from './gmodel/apply-label-edit-operation-handler';
+export * from './gmodel/change-bounds-operation-handler';
+export * from './gmodel/change-routing-points-operation-handler';
+export * from './gmodel/cut-operation-handler';
+export * from './gmodel/delete-operation-handler';
+export * from './gmodel/gmodel-create-edge-operation-handler';
+export * from './gmodel/gmodel-create-node-operation-handler';
+export * from './gmodel/gmodel-diagram-module';
+export * from './gmodel/gmodel-operation-handler';
+export * from './gmodel/paste-operation-handler';
+export * from './gmodel/reconnect-edge-operation-handler';
 export * from './launch/glsp-server-launcher';
+export * from './launch/jsonrpc-server-launcher';
 export * from './operations/compound-operation-handler';
 export * from './operations/create-operation-handler';
 export * from './operations/json-operation-handler';
 export * from './operations/operation-action-handler';
 export * from './operations/operation-handler';
 export * from './operations/operation-handler-registry';
+export * from './protocol/client-action';
 export * from './protocol/glsp-server';
+export * from './reexport';
 export * from './session/client-session';
 export * from './session/client-session-factory';
 export * from './session/client-session-initializer';

package/src/common/{gmodel/index.ts → reexport.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2024 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
@@ -14,14 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-export * from './apply-label-edit-operation-handler';
-export * from './change-bounds-operation-handler';
-export * from './change-routing-points-operation-handler';
-export * from './cut-operation-handler';
-export * from './delete-operation-handler';
-export * from './gmodel-create-edge-operation-handler';
-export * from './gmodel-create-node-operation-handler';
-export * from './gmodel-diagram-module';
-export * from './gmodel-operation-handler';
-export * from './paste-operation-handler';
-export * from './reconnect-edge-operation-handler';
+export * from '@eclipse-glsp/graph';
+export * from '@eclipse-glsp/protocol';
+export * from '@eclipse-glsp/protocol/lib/di';

package/src/common/test/mock-util.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -43,7 +43,8 @@ import { Command } from '../command/command';
 import { DiagramConfiguration, ServerLayoutKind } from '../diagram/diagram-configuration';
 import { ContextEditValidator } from '../features/directediting/context-edit-validator';
 import { LabelEditValidator } from '../features/directediting/label-edit-validator';
-import { GModelCreateEdgeOperationHandler, GModelCreateNodeOperationHandler } from '../gmodel/index';
+import { GModelCreateEdgeOperationHandler } from '../gmodel/gmodel-create-edge-operation-handler';
+import { GModelCreateNodeOperationHandler } from '../gmodel/gmodel-create-node-operation-handler';
 import { ClientSession } from '../session/client-session';
 import { ClientSessionFactory } from '../session/client-session-factory';
 import { ClientSessionInitializer } from '../session/client-session-initializer';

package/src/common/utils/console-logger.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { BindingContext } from '@eclipse-glsp/protocol';
+import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import { injectable } from 'inversify';
 import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, getRequestParentName } from './logger';
 
@@ -24,7 +24,10 @@ import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, getRe
  */
 @injectable()
 export class ConsoleLogger extends Logger {
-    constructor(public logLevel: LogLevel = LogLevel.none, public caller?: string) {
+    constructor(
+        public logLevel: LogLevel = LogLevel.none,
+        public caller?: string
+    ) {
         super();
     }
 

package/src/common/utils/glsp-server-error.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -14,7 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export class GLSPServerError extends Error {
-    constructor(message: string, readonly cause?: unknown) {
+    constructor(
+        message: string,
+        readonly cause?: unknown
+    ) {
         super(message);
     }
 }

package/src/node/di/app-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BindingContext } from '@eclipse-glsp/protocol';
+import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import { ContainerModule } from 'inversify';
 import * as winston from 'winston';
 import { InjectionContainer, LogLevel, Logger, LoggerFactory, getRequestParentName } from '../../common';

package/src/node/di/winston-logger.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -17,7 +17,10 @@ import * as winston from 'winston';
 import { asLogLevel, Logger, LogLevel } from '../../common/utils/logger';
 
 export class WinstonLogger extends Logger {
-    constructor(protected baseLogger: winston.Logger, public caller?: string) {
+    constructor(
+        protected baseLogger: winston.Logger,
+        public caller?: string
+    ) {
         super();
     }
 

package/src/node/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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,7 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '../common/index';
 export * from './abstract-json-model-storage';
 export * from './di/app-module';
 export * from './di/winston-logger';
@@ -22,3 +21,4 @@ export * from './launch/cli-parser';
 export * from './launch/socket-cli-parser';
 export * from './launch/socket-server-launcher';
 export * from './launch/websocket-server-launcher';
+export * from './reexport';

package/src/node/launch/socket-server-launcher.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics 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
@@ -20,8 +20,6 @@ import * as jsonrpc from 'vscode-jsonrpc/node';
 import { JsonRpcGLSPServerLauncher } from '../../common/launch/jsonrpc-server-launcher';
 import { Logger } from '../../common/utils/logger';
 
-export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
-
 @injectable()
 export class SocketServerLauncher extends JsonRpcGLSPServerLauncher<net.TcpSocketConnectOpts> {
     @inject(Logger) protected override logger: Logger;

package/src/node/reexport.ts

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

package/lib/common/gmodel/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC"}

package/lib/common/gmodel/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,uEAAqD;AACrD,oEAAkD;AAClD,4EAA0D;AAC1D,0DAAwC;AACxC,6DAA2C;AAC3C,yEAAuD;AACvD,yEAAuD;AACvD,0DAAwC;AACxC,6DAA2C;AAC3C,4DAA0C;AAC1C,qEAAmD"}