diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4213b..873504f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Eclipse GLSP Server Changelog -## v2.2.0- active +## 2.3.0 - active + +### Changes + +### Potentially breaking changes + +## [v2.2.1 - 22/07/2024](https://github.com/eclipse-glsp/glsp-server-node/releases/tag/v2.2.1) + +### Changes - [layout] Ensure that model is updated correctly when using `automatic` server layout [#74](https://github.com/eclipse-glsp/glsp-server-node/pull/74) - [gmodel] Add proper undefined/null handling in GModel builder functions [#76](https://github.com/eclipse-glsp/glsp-server-node/pull/76) diff --git a/examples/workflow-server-bundled/package.json b/examples/workflow-server-bundled/package.json index e291068..5c7c309 100644 --- a/examples/workflow-server-bundled/package.json +++ b/examples/workflow-server-bundled/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-glsp-examples/workflow-server-bundled", - "version": "2.2.0-next", + "version": "2.3.0-next", "description": "GLSP node server for the workflow example (bundled)", "keywords": [ "eclipse", diff --git a/examples/workflow-server/package.json b/examples/workflow-server/package.json index 44c2389..93dd0d0 100644 --- a/examples/workflow-server/package.json +++ b/examples/workflow-server/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-glsp-examples/workflow-server", - "version": "2.2.0-next", + "version": "2.3.0-next", "description": "GLSP node server for the workflow example", "keywords": [ "eclipse", @@ -56,9 +56,9 @@ "watch:bundle": "webpack -w" }, "dependencies": { - "@eclipse-glsp/layout-elk": "2.2.0-next", - "@eclipse-glsp/server": "2.2.0-next", - "inversify": "^6.0.1" + "@eclipse-glsp/layout-elk": "2.3.0-next", + "@eclipse-glsp/server": "2.3.0-next", + "inversify": "~6.0.2" }, "devDependencies": { "source-map-loader": "^4.0.1", diff --git a/examples/workflow-server/src/common/provider/node-documentation-navigation-target-provider.ts b/examples/workflow-server/src/common/provider/node-documentation-navigation-target-provider.ts index 32f8709..054bde4 100644 --- a/examples/workflow-server/src/common/provider/node-documentation-navigation-target-provider.ts +++ b/examples/workflow-server/src/common/provider/node-documentation-navigation-target-provider.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 diff --git a/examples/workflow-server/src/common/workflow-popup-factory.ts b/examples/workflow-server/src/common/workflow-popup-factory.ts index d55432a..ea1f494 100644 --- a/examples/workflow-server/src/common/workflow-popup-factory.ts +++ b/examples/workflow-server/src/common/workflow-popup-factory.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2023 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 diff --git a/lerna.json b/lerna.json index 7fbde4c..b6adae3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.0", + "version": "2.2.1", "npmClient": "yarn", "command": { "run": { diff --git a/package.json b/package.json index 098d423..f7a0b91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parent", - "version": "2.1.0", + "version": "2.3.0-next", "private": true, "workspaces": [ "packages/*", diff --git a/packages/graph/package.json b/packages/graph/package.json index b8a11db..ea7fc3c 100644 --- a/packages/graph/package.json +++ b/packages/graph/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-glsp/graph", - "version": "2.2.0-next", + "version": "2.3.0-next", "description": "The typescript implementation of the GLSP graphical model (GModel)", "keywords": [ "eclipse", diff --git a/packages/graph/src/gedge-layoutable.ts b/packages/graph/src/gedge-layoutable.ts index 72d571a..afbf09f 100644 --- a/packages/graph/src/gedge-layoutable.ts +++ b/packages/graph/src/gedge-layoutable.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2023 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 diff --git a/packages/graph/src/gissue-marker.ts b/packages/graph/src/gissue-marker.ts index 1250925..2399663 100644 --- a/packages/graph/src/gissue-marker.ts +++ b/packages/graph/src/gissue-marker.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2022 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 diff --git a/packages/layout-elk/package.json b/packages/layout-elk/package.json index 0f94953..2036e58 100644 --- a/packages/layout-elk/package.json +++ b/packages/layout-elk/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-glsp/layout-elk", - "version": "2.2.0-next", + "version": "2.3.0-next", "description": "Integration of ELK graph layout algorithms in GLSP Node Server", "keywords": [ "eclipse", @@ -49,11 +49,11 @@ "watch": "tsc -w" }, "dependencies": { - "@eclipse-glsp/server": "2.2.0-next", + "@eclipse-glsp/server": "2.3.0-next", "elkjs": "^0.7.1" }, "peerDependencies": { - "inversify": "^6.0.0" + "inversify": "~6.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/layout-elk/src/glsp-elk-layout-engine.ts b/packages/layout-elk/src/glsp-elk-layout-engine.ts index cc39589..9373731 100644 --- a/packages/layout-elk/src/glsp-elk-layout-engine.ts +++ b/packages/layout-elk/src/glsp-elk-layout-engine.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2018-2023 TypeFox and others. + * Copyright (c) 2018-2024 TypeFox 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. @@ -93,7 +93,7 @@ export class GlspElkLayoutEngine implements LayoutEngine { } else if (model instanceof GEdge) { return this.transformEdge(model); } else if (model instanceof GLabel) { - return this.transformPort(model); + return this.transformLabel(model); } else if (model instanceof GPort) { return this.transformPort(model); } diff --git a/packages/server/package.json b/packages/server/package.json index 8084843..b313ba6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-glsp/server", - "version": "2.2.0-next", + "version": "2.3.0-next", "description": "A js server framework for Eclipse GLSP", "keywords": [ "eclipse", @@ -58,7 +58,7 @@ "watch": "tsc -w" }, "dependencies": { - "@eclipse-glsp/graph": "2.2.0-next", + "@eclipse-glsp/graph": "2.3.0-next", "@eclipse-glsp/protocol": "next", "@types/uuid": "8.3.1", "commander": "^8.3.0", @@ -71,7 +71,7 @@ "@types/ws": "^8.5.4" }, "peerDependencies": { - "inversify": "^6.0.0" + "inversify": "~6.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/server/src/common/actions/action-dispatcher.ts b/packages/server/src/common/actions/action-dispatcher.ts index 3f7cc82..63fc208 100644 --- a/packages/server/src/common/actions/action-dispatcher.ts +++ b/packages/server/src/common/actions/action-dispatcher.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2023 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 diff --git a/packages/server/src/common/features/model/request-model-action-handler.ts b/packages/server/src/common/features/model/request-model-action-handler.ts index 093a10e..621d70a 100644 --- a/packages/server/src/common/features/model/request-model-action-handler.ts +++ b/packages/server/src/common/features/model/request-model-action-handler.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2023 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 diff --git a/packages/server/src/common/utils/client-options-util.ts b/packages/server/src/common/utils/client-options-util.ts index 80496f9..beb5d2e 100644 --- a/packages/server/src/common/utils/client-options-util.ts +++ b/packages/server/src/common/utils/client-options-util.ts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022-2024 STMicroelectronics and others. + * Copyright (c) 2022-2023 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 diff --git a/yarn.lock b/yarn.lock index b508f5f..dd87a95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,10 +223,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@eclipse-glsp/cli@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/cli/-/cli-2.2.0-next.c32aadb.160.tgz#1171b21aec7bddfcc73e68cc41d0b9dcb199c258" - integrity sha512-Clw0YKkMg41vQnd3UY9quIConKdQoQ98+dp15ouKps5yG8l3xpmjCC44V10N4LJ5l2Jmol6UTJfPGmA9FyrGdw== +"@eclipse-glsp/cli@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/cli/-/cli-2.3.0-next.170.tgz#df6be145da2999c50436612d01ff67fcfe208a3e" + integrity sha512-67c3w81u+13YiZVlsKjylfsZa2otKDI1pznEZBoRBi0v6a81icsR4mTul0COijDfBGHw+WiqjY0lX9DdIlLqAA== dependencies: commander "^10.0.1" glob "^10.3.10" @@ -237,13 +237,13 @@ semver "^7.5.1" shelljs "^0.8.5" -"@eclipse-glsp/config-test@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/config-test/-/config-test-2.2.0-next.c32aadb.160.tgz#30f409221024544604f5030caf092ac89d22867d" - integrity sha512-STBp0y+SmvpWz+D8wdyiVMelE7jFAGVxicFekalmoNaDO3pUSR3QmuxGHsSwWQ3qOB30vic4eMc3rSMrR4dABw== +"@eclipse-glsp/config-test@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/config-test/-/config-test-2.3.0-next.170.tgz#7747baf22005727d3c634d2f2e43f43f413db443" + integrity sha512-UihpWrwnKY5YrBpW/5Cw4PhSXQuxHfag0BgbC0Utpa7eNrXTwau/DLU2ZZ97qfo/RW4EMK4XbAd9Ck3faiuC3g== dependencies: - "@eclipse-glsp/mocha-config" "2.2.0-next.c32aadb.160+c32aadb" - "@eclipse-glsp/nyc-config" "2.2.0-next.c32aadb.160+c32aadb" + "@eclipse-glsp/mocha-config" "2.3.0-next.170+899acc6" + "@eclipse-glsp/nyc-config" "2.3.0-next.170+899acc6" "@istanbuljs/nyc-config-typescript" "^1.0.2" "@types/chai" "^4.3.7" "@types/mocha" "^10.0.2" @@ -257,14 +257,14 @@ sinon "^15.1.0" ts-node "^10.9.1" -"@eclipse-glsp/config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.2.0-next.c32aadb.160.tgz#5e0c25ef98f2aad44de9cb3de1cb8c2523543835" - integrity sha512-rFpykLbc3VC+Nx9iR5dOQUGU9FXYOrxC8qnOOBt+ou+xkSvdDTUYHKC4QKmXRZbiVnhfpbj7CIauBoU2XxineA== +"@eclipse-glsp/config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.3.0-next.170.tgz#e8448953db59c8bb7f512712f4321ad2a476e7e6" + integrity sha512-Zci6w0P+4IYNdYwflG8JoWudUvbRbKfzrTU0ylDY0L5dynrZHikPwhzxvviSLnyWzJdsIua6mdZPYYWr61gzag== dependencies: - "@eclipse-glsp/eslint-config" "2.2.0-next.c32aadb.160+c32aadb" - "@eclipse-glsp/prettier-config" "2.2.0-next.c32aadb.160+c32aadb" - "@eclipse-glsp/ts-config" "2.2.0-next.c32aadb.160+c32aadb" + "@eclipse-glsp/eslint-config" "2.3.0-next.170+899acc6" + "@eclipse-glsp/prettier-config" "2.3.0-next.170+899acc6" + "@eclipse-glsp/ts-config" "2.3.0-next.170+899acc6" "@typescript-eslint/eslint-plugin" "^6.7.5" "@typescript-eslint/parser" "^6.7.5" eslint "^8.51.0" @@ -279,49 +279,49 @@ rimraf "^5.0.5" "@eclipse-glsp/dev@next": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/dev/-/dev-2.2.0-next.c32aadb.160.tgz#d67cdceed91cb779e9495d06b6b4c7106541bc4f" - integrity sha512-ns0jJBxcW3qkzx8RV8JB/YYHOrK/9OXy7qrvhNabqAPRTpzn5ovp2kv7rZd97JGMPenq+2iSgbcY39eqq4zAHg== - dependencies: - "@eclipse-glsp/cli" "2.2.0-next.c32aadb.160+c32aadb" - "@eclipse-glsp/config" "2.2.0-next.c32aadb.160+c32aadb" - "@eclipse-glsp/config-test" "2.2.0-next.c32aadb.160+c32aadb" - -"@eclipse-glsp/eslint-config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.2.0-next.c32aadb.160.tgz#40a2f916d662b5bd5eefac469214b2e74ba8d28c" - integrity sha512-BDYLSB9lkgGmwA2fPB8OjnZTD4r48AHWAYSwkFdy/1RwJxL/F8fWlfWu6c8o5AVuNyMkrqedtmfdehSZA01u7A== - -"@eclipse-glsp/mocha-config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/mocha-config/-/mocha-config-2.2.0-next.c32aadb.160.tgz#c440d499ced653d342dcb39c52944e03b879ec40" - integrity sha512-n3T212zAl5oKMGQM1V8L/GvDsZwyIDdZAVh25yHjh0hFgVfraaGqzvGPTZxlKmJBuD0++6LH9FDhUNcNhMllHQ== - -"@eclipse-glsp/nyc-config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/nyc-config/-/nyc-config-2.2.0-next.c32aadb.160.tgz#9f84da72015c90aa2beb1394e14643f353a16158" - integrity sha512-m00F5RLly63TNDe76pW2yk/BLGKWpoD+qvga7ZSVDf2KPpdjf2cBjw2ei816H+Avl1TI+ufauQO8NdRu5O5Vuw== - -"@eclipse-glsp/prettier-config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.2.0-next.c32aadb.160.tgz#c4e019dbbafd04483cc7916f25c8b3a151f7d916" - integrity sha512-xqfSe+UMS4p5WGimZnX5iIm1AX+x1CAAippobgogGRnbA5RBsUdOh/odFgfRcme6/IfyFWj5m4IY7IHlFPZwCw== + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/dev/-/dev-2.3.0-next.170.tgz#e5f0eb069e6abdfbf607d565d7d4f6e384fbbb50" + integrity sha512-dG7/RKXJ1ytxhvCkYx2nbGrHTWDfnTQXaaHYMk//KImz9IdKCOMh6twaofzdzeiiX7Bnf44A1lucBX5rJaMhCg== + dependencies: + "@eclipse-glsp/cli" "2.3.0-next.170+899acc6" + "@eclipse-glsp/config" "2.3.0-next.170+899acc6" + "@eclipse-glsp/config-test" "2.3.0-next.170+899acc6" + +"@eclipse-glsp/eslint-config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.3.0-next.170.tgz#22d9301f09fd0e3cab5bebe983d27b6aee4dbac9" + integrity sha512-HIgiT2pby6vKGoFDmv5AEzJxANETX2Mda2X354RU+x7TIuvMOFvApwvIyoicPt+CqMMeDPmlKxsWIzcbWAiI/A== + +"@eclipse-glsp/mocha-config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/mocha-config/-/mocha-config-2.3.0-next.170.tgz#66fd2af5e4392150538d6c3d77f1b321ee9c31d6" + integrity sha512-4bYx4e+aZ5HFj2/Byzfznk5PQ3pGGjLM7jGTPVY1hF4rvu5pdlgGD0JySrS2bVmS6dTlW+UPHWZLTtAjE06tpA== + +"@eclipse-glsp/nyc-config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/nyc-config/-/nyc-config-2.3.0-next.170.tgz#40b8f9a271d9c1b4f616daa671009e67636a82d7" + integrity sha512-HNAWJuW3pwW2LH3nuj+r8EuC1bEYJ/vCUNV/g6YXVxgM7fkIAaWpfx7C1VMm0FCSCuXuzCOjd3yK3LNKaLLHjA== + +"@eclipse-glsp/prettier-config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.3.0-next.170.tgz#92c564ef47e927f9b36b5280867200ae2d2ad4b2" + integrity sha512-3CnDsjBPV/PdduXM5gDCXnvDdfVyM8Ga48jkWKgQcQx1ihrE6gG83ENb/PuQgVwmZTdiZ4gDBe564PUWYvo7Xg== dependencies: prettier-plugin-packagejson "~2.4.6" "@eclipse-glsp/protocol@next": - version "2.2.0-next.353" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.2.0-next.353.tgz#5effcb22dd25ffae5a7264324c2752cf89754629" - integrity sha512-LARvLG1bEmmfR8e6wFoEyYwOfMiQMyHEi/2SD/c08BUIDjEAuxbUEQyx2g+d9btfHdVEZJXfwfvy5oIuLEuI1Q== + version "2.3.0-next.374" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.3.0-next.374.tgz#9323d1841427f6dbf5fa66dbe1ef3dce4d596b10" + integrity sha512-ENZO29yLO7l5asyaDpvkQanGj5jDXGBkvQbZU+D4ULKmvWvDWYle+BBSKMxl7sI6L77tz7kGBLMEhAuhRky4kg== dependencies: sprotty-protocol "1.2.0" uuid "~10.0.0" vscode-jsonrpc "8.2.0" -"@eclipse-glsp/ts-config@2.2.0-next.c32aadb.160+c32aadb": - version "2.2.0-next.c32aadb.160" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.2.0-next.c32aadb.160.tgz#d660cd736056a91c0c79fb2076835073ad12d7b9" - integrity sha512-05D85X5tUY/M23rTDs1b9MfF+YbV7j97rTFss5PHad7YI2DOByqMGRxaoPI+xzyoQUUAHTxKekGb5KbE8douDQ== +"@eclipse-glsp/ts-config@2.3.0-next.170+899acc6": + version "2.3.0-next.170" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.3.0-next.170.tgz#011a41f9f1df36a42fbf30fef1454c761eb458ea" + integrity sha512-jhU2aSIndwbhSbUmKvZ0gjP8U1K+TP7QwuS6nMPZkvH9MChq3PWnn244IAAgzcDLjd6tz+VprfAyY6hE8IQo4Q== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -3984,7 +3984,7 @@ interpret@^3.1.1: resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== -inversify@^6.0.1: +inversify@~6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/inversify/-/inversify-6.0.2.tgz#dc7fa0348213d789d35ffb719dea9685570989c7" integrity sha512-i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA==