From 93bc791b099996e0dc18fee9fe281a3af0947130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Sp=C3=B6nemann?= Date: Thu, 5 Oct 2023 18:01:35 +0000 Subject: [PATCH] Several improvements to generator-sprotty, fixed links --- CONTRIBUTING.md | 4 +- README.md | 12 +- examples/circlegraph/circlegraph.html | 2 +- examples/classdiagram/class-diagram.html | 2 +- examples/index.html | 4 +- examples/multicore/multicore.html | 2 +- .../random-graph.html | 2 +- examples/random-graph/random-graph.html | 2 +- examples/svg/svg-prerendered.html | 2 +- packages/generator-sprotty/LICENSE | 277 +++++++ packages/generator-sprotty/README.md | 2 +- packages/generator-sprotty/package.json | 63 +- .../sprotty-local-template/package-lock.json | 711 ------------------ .../sprotty-local-template/package.json | 15 +- .../sprotty-local-template/src/di.config.ts | 11 +- .../sprotty-local-template/src/index.ts | 2 +- .../src/model-source.ts | 8 +- .../sprotty-local-template/src/views.tsx | 9 +- .../sprotty-local-template/static/styles.css | 38 +- packages/generator-sprotty/src/index.ts | 40 +- packages/generator-sprotty/tsconfig.json | 11 +- packages/sprotty-elk/CHANGELOG.md | 22 +- packages/sprotty-elk/package.json | 23 +- packages/sprotty-protocol/CHANGELOG.md | 10 +- packages/sprotty-protocol/package.json | 13 +- packages/sprotty/CHANGELOG.md | 96 +-- packages/sprotty/README.md | 4 +- packages/sprotty/package.json | 36 +- yarn.lock | 7 +- 29 files changed, 481 insertions(+), 949 deletions(-) create mode 100644 packages/generator-sprotty/LICENSE delete mode 100644 packages/generator-sprotty/sprotty-local-template/package-lock.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c6c2d20d..fc067af7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,12 +10,12 @@ This project is governed by the [Eclipse Community Code of Conduct](https://gith The following communication channels are available: - * [GitHub issues](https://github.com/eclipse/sprotty/issues) - for bug reports, feature requests, etc. + * [GitHub issues](https://github.com/eclipse-sprotty/sprotty/issues) - for bug reports, feature requests, etc. * [Eclipse community forum](https://www.eclipse.org/forums/index.php/f/443/) - for questions * [Gitter chat](https://gitter.im/eclipse/sprotty) - for questions and project-related discussion * [Developer mailing list](https://accounts.eclipse.org/mailing-list/sprotty-dev) - for organizational issues (e.g. elections of new committers) -In case you have a question, please look into the [documentation in the Wiki](https://github.com/eclipse/sprotty/wiki) first. If you don't find any answer there, feel free to use the chat, forum or issues to get help. +In case you have a question, please look into the [documentation](https://sprotty.org/docs/) first. If you don't find any answer there, feel free to use the chat, forum or issues to get help. ## How to Contribute diff --git a/README.md b/README.md index a8921232..fc195ee8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Sprotty](./sprotty-logo-500px.png) -[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/eclipse/sprotty) +[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/eclipse-sprotty/sprotty) [![Join the chat at https://gitter.im/eclipse/sprotty](https://badges.gitter.im/eclipse/sprotty.svg)](https://gitter.im/eclipse/sprotty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) This is the client part of _Sprotty_, a next-generation, open-source diagramming framework built with web technologies. @@ -26,16 +26,16 @@ Some selected features: The Sprotty project spans across four GitHub repositories. -* [sprotty](https://github.com/eclipse/sprotty) (this repository) contains the client code (`sprotty`), shared code for Node.js servers (`sprotty-protocol`), ELK layout integration (`sprotty-elk`) and examples. -* [sprotty-server](https://github.com/eclipse/sprotty-server) contains server code for Java and includes server-side diagram layout, the extension of the Language Server Protocol, and the integration with the Xtext framework. -* [sprotty-theia](https://github.com/eclipse/sprotty-theia) contains the glue code to integrate Sprotty views in the Theia IDE. -* [sprotty-vscode](https://github.com/eclipse/sprotty-vscode) contains the glue code to integrate Sprotty views in VS Code. +* [sprotty](https://github.com/eclipse-sprotty/sprotty) (this repository) contains the client code (`sprotty`), shared code for Node.js servers (`sprotty-protocol`), ELK layout integration (`sprotty-elk`) and examples. +* [sprotty-server](https://github.com/eclipse-sprotty/sprotty-server) contains server code for Java and includes server-side diagram layout, the extension of the Language Server Protocol, and the integration with the Xtext framework. +* [sprotty-theia](https://github.com/eclipse-sprotty/sprotty-theia) contains the glue code to integrate Sprotty views in the Theia IDE. +* [sprotty-vscode](https://github.com/eclipse-sprotty/sprotty-vscode) contains the glue code to integrate Sprotty views in VS Code. The project is built on [ci.eclipse.org/sprotty](https://ci.eclipse.org/sprotty/). ## Docs -For further information please consult the [Wiki](https://github.com/eclipse/sprotty/wiki). +For further information please consult the [documentation on the website](https://sprotty.org/docs/). The version history is documented in the [CHANGELOG](https://github.com/eclipse-sprotty/sprotty/blob/master/CHANGELOG.md). Changes are tracked seperately for each package. diff --git a/examples/circlegraph/circlegraph.html b/examples/circlegraph/circlegraph.html index c7c0f1d1..d85d36c2 100644 --- a/examples/circlegraph/circlegraph.html +++ b/examples/circlegraph/circlegraph.html @@ -21,7 +21,7 @@

Sprotty Circles Example

- Help + Help
diff --git a/examples/classdiagram/class-diagram.html b/examples/classdiagram/class-diagram.html index 11e10150..79d0ce45 100644 --- a/examples/classdiagram/class-diagram.html +++ b/examples/classdiagram/class-diagram.html @@ -18,7 +18,7 @@

Sprotty Class Diagram Example

- Help + Help
diff --git a/examples/index.html b/examples/index.html index 4106e158..1d9e2a54 100644 --- a/examples/index.html +++ b/examples/index.html @@ -11,8 +11,8 @@

Sprotty Examples

- Sprotty is a web-based diagramming framework. - For information how to use these examples see Using Sprotty. + Sprotty is a web-based diagramming framework. + For information how to use these examples see the documentation.

Without Server

The following examples run completely in the browser and do not require any additional component. diff --git a/examples/multicore/multicore.html b/examples/multicore/multicore.html index 318e2252..fcf7208f 100644 --- a/examples/multicore/multicore.html +++ b/examples/multicore/multicore.html @@ -16,7 +16,7 @@

Sprotty Multicore Example

- Help + Help
diff --git a/examples/random-graph-distributed/random-graph.html b/examples/random-graph-distributed/random-graph.html index 989dc03d..e6f6419e 100644 --- a/examples/random-graph-distributed/random-graph.html +++ b/examples/random-graph-distributed/random-graph.html @@ -16,7 +16,7 @@

Sprotty Random Graph Example

- Help + Help
diff --git a/examples/random-graph/random-graph.html b/examples/random-graph/random-graph.html index 224b4424..d62c609e 100644 --- a/examples/random-graph/random-graph.html +++ b/examples/random-graph/random-graph.html @@ -25,7 +25,7 @@

Sprotty Random Graph Example

- Help + Help
diff --git a/examples/svg/svg-prerendered.html b/examples/svg/svg-prerendered.html index d119aeb6..df81eeef 100644 --- a/examples/svg/svg-prerendered.html +++ b/examples/svg/svg-prerendered.html @@ -16,7 +16,7 @@

Sprotty Prerendered SVG / HTML Example

- Help + Help
diff --git a/packages/generator-sprotty/LICENSE b/packages/generator-sprotty/LICENSE new file mode 100644 index 00000000..e23ece2c --- /dev/null +++ b/packages/generator-sprotty/LICENSE @@ -0,0 +1,277 @@ +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"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: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. \ No newline at end of file diff --git a/packages/generator-sprotty/README.md b/packages/generator-sprotty/README.md index c50f62c7..cb23fb74 100644 --- a/packages/generator-sprotty/README.md +++ b/packages/generator-sprotty/README.md @@ -1,3 +1,3 @@ # Langium Package Generator -This [Yeoman](https://yeoman.io) generator is used to create a new Sprotty project. \ No newline at end of file +This [Yeoman](https://yeoman.io) generator is used to create a new Sprotty project. See the [Sprotty documentation](https://sprotty.org/docs/getting_started/) to learn how to use it. diff --git a/packages/generator-sprotty/package.json b/packages/generator-sprotty/package.json index d5f85826..2df2c8a6 100644 --- a/packages/generator-sprotty/package.json +++ b/packages/generator-sprotty/package.json @@ -2,33 +2,30 @@ "name": "generator-sprotty", "version": "0.14.0", "description": "Yeoman generator for Sprotty", + "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)", "engines": { "node": ">=14.0.0" }, "keywords": [ "yeoman-generator", - "diagram" + "graphics", + "diagram", + "modeling", + "visualization", + "svg" ], - "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)", - "files": [ - "app", - "sprotty-local-template", - "src" - ], - "main": "app/index.js", - "types": "app/index.d.ts", - "scripts": { - "prepare": "yarn run clean && yarn run build", - "clean": "rimraf app", - "build": "tsc --skipLibCheck", - "watch": "tsc --watch --skipLibCheck", - "lint": "eslint src test --ext .ts", - "run": "yo sprotty", - "debug": "npx --node-arg=--inspect yo sprotty", - "test": "echo \"No tests defined.\"" + "homepage": "https://github.com/eclipse-sprotty/sprotty", + "bugs": "https://github.com/eclipse-sprotty/sprotty/issues", + "author": { + "name": "Eclipse Sprotty" + }, + "repository": { + "type": "git", + "url": "https://github.com/eclipse-sprotty/sprotty", + "directory": "packages/generator-sprotty" }, "dependencies": { - "chalk": "^5.3.0", + "chalk": "^4.1.2", "lodash": "^4.17.21", "which": "^2.0.2", "yeoman-generator": "^5.9.0" @@ -40,17 +37,21 @@ "@types/yeoman-test": "^4.0.4", "yeoman-test": "^7.4.0" }, - "volta": { - "node": "16.19.0", - "npm": "8.19.3" - }, - "repository": { - "type": "git", - "url": "https://github.com/eclipse-sprotty/sprotty", - "directory": "packages/generator-sprotty" + "scripts": { + "prepare": "yarn run clean && yarn run build", + "clean": "rimraf app", + "build": "tsc --skipLibCheck", + "watch": "tsc --watch --skipLibCheck", + "lint": "eslint src test --ext .ts", + "run": "yo sprotty", + "debug": "npx --node-arg=--inspect yo sprotty", + "test": "echo \"No tests defined.\"" }, - "author": { - "name": "TypeFox", - "url": "https://www.typefox.io" - } + "files": [ + "app", + "sprotty-local-template", + "src" + ], + "main": "app/index", + "types": "app/index" } diff --git a/packages/generator-sprotty/sprotty-local-template/package-lock.json b/packages/generator-sprotty/sprotty-local-template/package-lock.json deleted file mode 100644 index 20f30f0c..00000000 --- a/packages/generator-sprotty/sprotty-local-template/package-lock.json +++ /dev/null @@ -1,711 +0,0 @@ -{ - "name": "<%= project-name %>", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "<%= project-name %>", - "dependencies": { - "reflect-metadata": "^0.1.13", - "sprotty": "^0.13.0" - }, - "devDependencies": { - "esbuild": "^0.17.8", - "typescript": "4.9.5" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz", - "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz", - "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz", - "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz", - "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz", - "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz", - "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz", - "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz", - "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz", - "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz", - "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz", - "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz", - "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz", - "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz", - "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz", - "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz", - "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz", - "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz", - "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz", - "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz", - "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz", - "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz", - "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/autocompleter": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/autocompleter/-/autocompleter-7.1.0.tgz", - "integrity": "sha512-uCToOnq7eAD/GJAteDbYuQ7ksDtrYWOy5CIAq43wh0dT+5frMpPlyD9tp+y5fz8KIcsP+zR2MjzoTAdW5aJESw==" - }, - "node_modules/esbuild": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz", - "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.17.10", - "@esbuild/android-arm64": "0.17.10", - "@esbuild/android-x64": "0.17.10", - "@esbuild/darwin-arm64": "0.17.10", - "@esbuild/darwin-x64": "0.17.10", - "@esbuild/freebsd-arm64": "0.17.10", - "@esbuild/freebsd-x64": "0.17.10", - "@esbuild/linux-arm": "0.17.10", - "@esbuild/linux-arm64": "0.17.10", - "@esbuild/linux-ia32": "0.17.10", - "@esbuild/linux-loong64": "0.17.10", - "@esbuild/linux-mips64el": "0.17.10", - "@esbuild/linux-ppc64": "0.17.10", - "@esbuild/linux-riscv64": "0.17.10", - "@esbuild/linux-s390x": "0.17.10", - "@esbuild/linux-x64": "0.17.10", - "@esbuild/netbsd-x64": "0.17.10", - "@esbuild/openbsd-x64": "0.17.10", - "@esbuild/sunos-x64": "0.17.10", - "@esbuild/win32-arm64": "0.17.10", - "@esbuild/win32-ia32": "0.17.10", - "@esbuild/win32-x64": "0.17.10" - } - }, - "node_modules/file-saver": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", - "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" - }, - "node_modules/inversify": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz", - "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==" - }, - "node_modules/reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" - }, - "node_modules/snabbdom": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.5.1.tgz", - "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==", - "engines": { - "node": ">=8.3.0" - } - }, - "node_modules/sprotty": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/sprotty/-/sprotty-0.13.0.tgz", - "integrity": "sha512-XA5GV1IhdqBcdQn14qXUy9vQ/cDe/az6+gANOIA+LWrI+5iYH8hoEwbkXILJnWyV/a9T/66IP9sEQ8U0g90o0Q==", - "dependencies": { - "autocompleter": "^7.0.1", - "file-saver": "^2.0.5", - "inversify": "^5.1.1", - "snabbdom": "^3.5.1", - "sprotty-protocol": "^0.13.0", - "tinyqueue": "^2.0.3" - } - }, - "node_modules/sprotty-protocol": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/sprotty-protocol/-/sprotty-protocol-0.13.0.tgz", - "integrity": "sha512-yOaah3BNDwso6gS1yo/ceh+g/KOHeWLbajGiiyz9ngWLV4UUyP9VOWXN8jFI57k/0iAF5qhHTI7nkAeTqHFdLA==" - }, - "node_modules/tinyqueue": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", - "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" - }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - } - }, - "dependencies": { - "@esbuild/android-arm": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.10.tgz", - "integrity": "sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz", - "integrity": "sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.10.tgz", - "integrity": "sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz", - "integrity": "sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz", - "integrity": "sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz", - "integrity": "sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz", - "integrity": "sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz", - "integrity": "sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz", - "integrity": "sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz", - "integrity": "sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz", - "integrity": "sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz", - "integrity": "sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz", - "integrity": "sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz", - "integrity": "sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz", - "integrity": "sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz", - "integrity": "sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz", - "integrity": "sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz", - "integrity": "sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz", - "integrity": "sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz", - "integrity": "sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz", - "integrity": "sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz", - "integrity": "sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==", - "dev": true, - "optional": true - }, - "autocompleter": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/autocompleter/-/autocompleter-7.1.0.tgz", - "integrity": "sha512-uCToOnq7eAD/GJAteDbYuQ7ksDtrYWOy5CIAq43wh0dT+5frMpPlyD9tp+y5fz8KIcsP+zR2MjzoTAdW5aJESw==" - }, - "esbuild": { - "version": "0.17.10", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.10.tgz", - "integrity": "sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.17.10", - "@esbuild/android-arm64": "0.17.10", - "@esbuild/android-x64": "0.17.10", - "@esbuild/darwin-arm64": "0.17.10", - "@esbuild/darwin-x64": "0.17.10", - "@esbuild/freebsd-arm64": "0.17.10", - "@esbuild/freebsd-x64": "0.17.10", - "@esbuild/linux-arm": "0.17.10", - "@esbuild/linux-arm64": "0.17.10", - "@esbuild/linux-ia32": "0.17.10", - "@esbuild/linux-loong64": "0.17.10", - "@esbuild/linux-mips64el": "0.17.10", - "@esbuild/linux-ppc64": "0.17.10", - "@esbuild/linux-riscv64": "0.17.10", - "@esbuild/linux-s390x": "0.17.10", - "@esbuild/linux-x64": "0.17.10", - "@esbuild/netbsd-x64": "0.17.10", - "@esbuild/openbsd-x64": "0.17.10", - "@esbuild/sunos-x64": "0.17.10", - "@esbuild/win32-arm64": "0.17.10", - "@esbuild/win32-ia32": "0.17.10", - "@esbuild/win32-x64": "0.17.10" - } - }, - "file-saver": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", - "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" - }, - "inversify": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz", - "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==" - }, - "reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" - }, - "snabbdom": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.5.1.tgz", - "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==" - }, - "sprotty": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/sprotty/-/sprotty-0.13.0.tgz", - "integrity": "sha512-XA5GV1IhdqBcdQn14qXUy9vQ/cDe/az6+gANOIA+LWrI+5iYH8hoEwbkXILJnWyV/a9T/66IP9sEQ8U0g90o0Q==", - "requires": { - "autocompleter": "^7.0.1", - "file-saver": "^2.0.5", - "inversify": "^5.1.1", - "snabbdom": "^3.5.1", - "sprotty-protocol": "^0.13.0", - "tinyqueue": "^2.0.3" - } - }, - "sprotty-protocol": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/sprotty-protocol/-/sprotty-protocol-0.13.0.tgz", - "integrity": "sha512-yOaah3BNDwso6gS1yo/ceh+g/KOHeWLbajGiiyz9ngWLV4UUyP9VOWXN8jFI57k/0iAF5qhHTI7nkAeTqHFdLA==" - }, - "tinyqueue": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", - "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" - }, - "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true - } - } -} diff --git a/packages/generator-sprotty/sprotty-local-template/package.json b/packages/generator-sprotty/sprotty-local-template/package.json index b6a1fa75..80c957cd 100644 --- a/packages/generator-sprotty/sprotty-local-template/package.json +++ b/packages/generator-sprotty/sprotty-local-template/package.json @@ -1,15 +1,16 @@ { "name": "<%= project-name %>", "description": "Please enter a brief description here", - "scripts": { - "build": "esbuild ./src/index.ts --bundle --sourcemap --outfile=./<%= out-path %>/index.js" + "dependencies": { + "inversify": "^6.0.1", + "reflect-metadata": "^0.1.13", + "sprotty": "^0.14.0" }, "devDependencies": { - "typescript": "4.9.5", - "esbuild": "^0.17.8" + "typescript": "~5.2.2", + "esbuild": "^0.19.4" }, - "dependencies": { - "sprotty": "^0.13.0", - "reflect-metadata": "^0.1.13" + "scripts": { + "build": "esbuild ./src/index.ts --bundle --sourcemap --outfile=./<%= out-path %>/index.js" } } \ No newline at end of file diff --git a/packages/generator-sprotty/sprotty-local-template/src/di.config.ts b/packages/generator-sprotty/sprotty-local-template/src/di.config.ts index 4aba0213..f94de758 100644 --- a/packages/generator-sprotty/sprotty-local-template/src/di.config.ts +++ b/packages/generator-sprotty/sprotty-local-template/src/di.config.ts @@ -1,8 +1,8 @@ import { Container, ContainerModule } from 'inversify'; import { - configureModelElement, configureViewerOptions, ConsoleLogger, edgeIntersectionModule, - loadDefaultModules, LocalModelSource, LogLevel, PolylineEdgeView, RectangularNode, - SEdgeImpl, SGraphImpl, SGraphView, TYPES + configureModelElement, configureViewerOptions, ConsoleLogger, loadDefaultModules, + LocalModelSource, LogLevel, PolylineEdgeView, RectangularNode, SEdgeImpl, + SGraphImpl, SGraphView, SRoutingHandleImpl, SRoutingHandleView, TYPES } from 'sprotty'; import { TaskNodeView } from './views'; @@ -11,11 +11,13 @@ export default (containerId: string) => { bind(TYPES.ModelSource).to(LocalModelSource).inSingletonScope(); rebind(TYPES.ILogger).to(ConsoleLogger).inSingletonScope(); rebind(TYPES.LogLevel).toConstantValue(LogLevel.log); - const context = { bind, unbind, isBound, rebind }; + const context = { bind, unbind, isBound, rebind }; configureModelElement(context, 'graph', SGraphImpl, SGraphView); configureModelElement(context, 'task', RectangularNode, TaskNodeView); configureModelElement(context, 'edge', SEdgeImpl, PolylineEdgeView); + configureModelElement(context, 'routing-point', SRoutingHandleImpl, SRoutingHandleView); + configureModelElement(context, 'volatile-routing-point', SRoutingHandleImpl, SRoutingHandleView); configureViewerOptions(context, { needsClientLayout: false, @@ -26,6 +28,5 @@ export default (containerId: string) => { const container = new Container(); loadDefaultModules(container); container.load(myModule); - container.load(edgeIntersectionModule) return container; } diff --git a/packages/generator-sprotty/sprotty-local-template/src/index.ts b/packages/generator-sprotty/sprotty-local-template/src/index.ts index 6ea7f128..86f7883d 100644 --- a/packages/generator-sprotty/sprotty-local-template/src/index.ts +++ b/packages/generator-sprotty/sprotty-local-template/src/index.ts @@ -4,7 +4,7 @@ import { LocalModelSource, TYPES } from 'sprotty'; import createContainer from './di.config'; import { graph } from './model-source'; -document.addEventListener("DOMContentLoaded", () => { +document.addEventListener('DOMContentLoaded', () => { const container = createContainer('<%= html-element-id %>'); const modelSource = container.get(TYPES.ModelSource); modelSource.setModel(graph); diff --git a/packages/generator-sprotty/sprotty-local-template/src/model-source.ts b/packages/generator-sprotty/sprotty-local-template/src/model-source.ts index 46275b7a..94d01dab 100644 --- a/packages/generator-sprotty/sprotty-local-template/src/model-source.ts +++ b/packages/generator-sprotty/sprotty-local-template/src/model-source.ts @@ -1,11 +1,11 @@ -import { SEdge, SGraph, SNode } from 'sprotty-protocol'; +import { SEdge, SGraph } from 'sprotty-protocol'; import { TaskNode } from './model'; export const graph: SGraph = { type: 'graph', id: 'graph', children: [ - { + { type: 'task', id: 'task01', name: 'First Task', @@ -14,7 +14,7 @@ export const graph: SGraph = { position: { x: 0, y: 0 }, size: { width: 100, height: 100 } }, - { + { type: 'task', id: 'task02', name: 'Second Task', @@ -23,7 +23,7 @@ export const graph: SGraph = { position: { x: 0, y: 200 }, size: { width: 100, height: 100 } }, - { + { type: 'task', id: 'task03', name: 'Third Task', diff --git a/packages/generator-sprotty/sprotty-local-template/src/views.tsx b/packages/generator-sprotty/sprotty-local-template/src/views.tsx index 4570a0b1..0efa2599 100644 --- a/packages/generator-sprotty/sprotty-local-template/src/views.tsx +++ b/packages/generator-sprotty/sprotty-local-template/src/views.tsx @@ -9,14 +9,17 @@ import { TaskNode } from './model'; export class TaskNodeView implements IView { render(node: Readonly, context: RenderingContext): VNode { return - + height={node.size.height} > {node.name} + {context.renderChildren(node)} ; } } diff --git a/packages/generator-sprotty/sprotty-local-template/static/styles.css b/packages/generator-sprotty/sprotty-local-template/static/styles.css index 522820f5..69647c42 100644 --- a/packages/generator-sprotty/sprotty-local-template/static/styles.css +++ b/packages/generator-sprotty/sprotty-local-template/static/styles.css @@ -1,3 +1,8 @@ +body > .sprotty { + height: calc(100vh - 22px); + border: 3px solid #eee; +} + .sprotty-graph { height: 100%; width: 100%; @@ -9,25 +14,42 @@ stroke-width: 1; } +.sprotty-node.task.mouseover { + stroke: #bebebe; +} + +.sprotty-node.task.selected { + stroke-width: 2; +} + .sprotty-node.task.running { - fill: #aa2d2d; + fill: #b54949; } .sprotty-node.task.finished { fill: #81BB41; } +.sprotty-edge { + fill: none; + stroke: #252525; + stroke-width: 2px; +} + +.sprotty-edge.mouseover { + stroke: #949494; +} + +.sprotty-routing-handle { + fill: #bebebe; + stroke: #949494; + stroke-width: 2px; +} + text { stroke-width: 0; - stroke: #000; fill: #000; font-family: sans-serif; font-size: 10pt; text-anchor: middle; } - -.sprotty-edge { - fill: none; - stroke: #000; - stroke-width: 1px; -} \ No newline at end of file diff --git a/packages/generator-sprotty/src/index.ts b/packages/generator-sprotty/src/index.ts index 94138239..a1918685 100644 --- a/packages/generator-sprotty/src/index.ts +++ b/packages/generator-sprotty/src/index.ts @@ -43,28 +43,28 @@ class SprottyGenerator extends Generator { writing(): void { this.sourceRoot(path.join(__dirname, TEMPLATE_DIR)); - for (const path of ['package.json', 'tsconfig.json', 'src']) { + for (const file of ['package.json', 'tsconfig.json', 'src']) { this.fs.copy( - this.templatePath(path), - this._projectPath(path), + this.templatePath(file), + this._projectPath(file), { process: content => this._replaceTemplateWords(content), - processDestinationPath: path => - this._replaceTemplateNames(path), + processDestinationPath: destPath => + this._replaceTemplateNames(destPath), } ); } - console.log('generate static: ' + this.answers.generateStatic) - if(this.answers.generateStatic) { + console.log('generate static: ' + this.answers.generateStatic); + if (this.answers.generateStatic) { this.fs.copy( this.templatePath('static'), this._projectPath('static'), { process: content => this._replaceTemplateWords(content), - processDestinationPath: path => - this._replaceTemplateNames(path), + processDestinationPath: destPath => + this._replaceTemplateNames(destPath), } ); } @@ -85,7 +85,7 @@ class SprottyGenerator extends Generator { name: 'projectName', prefix: description( 'Welcome to Sprotty!\n' + - 'This tool generates a new Sprotty Project.\n' + + 'This tool generates a new Sprotty project.\n' + 'The project name identifies the npm package and can be used by other packages to depend on this project.' ), message: 'Your project name:', @@ -94,21 +94,21 @@ class SprottyGenerator extends Generator { { type: 'input', name: 'mainElementId', - prefix: description("Your Sprotty diagram will be rendered inside this element"), - message: 'Main HTML element ID', + prefix: description('Your Sprotty diagram will be rendered inside this element.'), + message: 'Main HTML element ID:', default: 'sprotty-diagram', }, { type: 'confirm', name: 'generateStatic', - prefix: description("Generate a static folder with index.html and styles.css for simple dev setup"), - message: 'generate static folder', + prefix: description('Generate a static folder with index.html and styles.css for simple dev setup.'), + message: 'Generate static folder', }, - ]) + ]); } - _projectPath(...path: string[]): string { - return this.destinationPath(USER_DIR, this.answers.projectName, ...path); + _projectPath(...projectPath: string[]): string { + return this.destinationPath(USER_DIR, this.answers.projectName, ...projectPath); } _replaceTemplateWords(content: Buffer): string { @@ -118,10 +118,10 @@ class SprottyGenerator extends Generator { .replace(OUT_PATH, this.answers.generateStatic ? 'static' : 'out'); } - _replaceTemplateNames(path: string): string { - return path.replace(PROJECT_PATH, this.answers.projectName); + _replaceTemplateNames(templatePath: string): string { + return templatePath.replace(PROJECT_PATH, this.answers.projectName); } } -export = SprottyGenerator \ No newline at end of file +export = SprottyGenerator; diff --git a/packages/generator-sprotty/tsconfig.json b/packages/generator-sprotty/tsconfig.json index 6a1daa50..fcd1b7d2 100644 --- a/packages/generator-sprotty/tsconfig.json +++ b/packages/generator-sprotty/tsconfig.json @@ -1,15 +1,12 @@ { - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "../../tsconfig.json", + "extends": "../../configs/base.tsconfig.json", "compilerOptions": { - "rootDir": "src", "outDir": "app" }, "include": [ - "src/**/*" + "src" ], "exclude": [ - "app", - "/node_modules" - ], + "app" + ] } \ No newline at end of file diff --git a/packages/sprotty-elk/CHANGELOG.md b/packages/sprotty-elk/CHANGELOG.md index f0e97075..91cf485f 100644 --- a/packages/sprotty-elk/CHANGELOG.md +++ b/packages/sprotty-elk/CHANGELOG.md @@ -8,29 +8,29 @@ This change log covers only the `elkjs` layout of Sprotty. See [here](https://gi * Added support for compartments to the `ElkLayoutEngine` and introduced optional pre/post processors ([#362](https://github.com/eclipse-sprotty/sprotty/pull/362)) -Fixed issues: https://github.com/eclipse/sprotty/milestone/10?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/10?closed=1 ----- ### v0.13.1 (Jan. 2023) - * Fixed edge layout with elk-server ([#334](https://github.com/eclipse/sprotty/pull/334)). + * Fixed edge layout with elk-server ([#334](https://github.com/eclipse-sprotty/sprotty/pull/334)). ### v0.13.0 (Dec. 2022) - * Updated to elkjs 0.8.2 ([#329](https://github.com/eclipse/sprotty/pull/329)). This update has breaking API changes. + * Updated to elkjs 0.8.2 ([#329](https://github.com/eclipse-sprotty/sprotty/pull/329)). This update has breaking API changes. -Fixed issues: https://github.com/eclipse/sprotty/milestone/9?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/9?closed=1 ----- ### v0.12.0 (Jun. 2022) - * Implemented client for running ELK layout in a separate process ([#282](https://github.com/eclipse/sprotty/pull/282)). + * Implemented client for running ELK layout in a separate process ([#282](https://github.com/eclipse-sprotty/sprotty/pull/282)). Adds `SocketElkServer` and `StdioElkServer` that enable to run the ELK layout engine in a separate Java process. * Aligned dependency to `inversify`: version constraint is now `^5.1.1` in all sprotty packages. -Fixed issues: https://github.com/eclipse/sprotty/milestone/8?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/8?closed=1 ----- @@ -61,20 +61,20 @@ No changes since v0.9.0; this release is to keep the versions of the Sprotty com ### v0.9.0 (Aug. 2020) -Fixed issues: https://github.com/eclipse/sprotty-layout/milestone/4?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty-layout/milestone/4?closed=1 Breaking API changes: - * Removed SModelIndexWithParent in favor of new functionality from Sprotty main package ([eclipse/sprotty#187](https://github.com/eclipse/sprotty/pull/187)) + * Removed SModelIndexWithParent in favor of new functionality from Sprotty main package ([eclipse/sprotty#187](https://github.com/eclipse-sprotty/sprotty/pull/187)) ----- ### v0.8.0 (Apr. 2020) New features: - * Port labels ([#9](https://github.com/eclipse/sprotty-layout/pull/9)) - * Edge source and target for ports ([#10](https://github.com/eclipse/sprotty-layout/pull/10)) + * Port labels ([#9](https://github.com/eclipse-sprotty/sprotty-layout/pull/9)) + * Edge source and target for ports ([#10](https://github.com/eclipse-sprotty/sprotty-layout/pull/10)) -Fixed issues: https://github.com/eclipse/sprotty-layout/milestone/3?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty-layout/milestone/3?closed=1 ----- diff --git a/packages/sprotty-elk/package.json b/packages/sprotty-elk/package.json index 1b325d36..49285ac2 100644 --- a/packages/sprotty-elk/package.json +++ b/packages/sprotty-elk/package.json @@ -10,31 +10,14 @@ "layout", "sprotty" ], - "homepage": "https://github.com/eclipse/sprotty-layout", - "bugs": "https://github.com/eclipse/sprotty-layout/issues", + "homepage": "https://github.com/eclipse-sprotty/sprotty-layout", + "bugs": "https://github.com/eclipse-sprotty/sprotty-layout/issues", "author": { "name": "Eclipse Sprotty" }, - "contributors": [ - { - "name": "Jan Köhnlein", - "email": "jan.koehnlein@typefox.io", - "url": "https://www.typefox.io" - }, - { - "name": "Philip Langer", - "email": "planger@eclipsesource.com", - "url": "https://www.eclipsesource.com" - }, - { - "name": "Miro Spönemann", - "email": "miro.spoenemann@typefox.io", - "url": "https://www.typefox.io" - } - ], "repository": { "type": "git", - "url": "https://github.com/eclipse/sprotty", + "url": "https://github.com/eclipse-sprotty/sprotty", "directory": "packages/sprotty-elk" }, "dependencies": { diff --git a/packages/sprotty-protocol/CHANGELOG.md b/packages/sprotty-protocol/CHANGELOG.md index ab77b1d7..88baae0d 100644 --- a/packages/sprotty-protocol/CHANGELOG.md +++ b/packages/sprotty-protocol/CHANGELOG.md @@ -4,20 +4,20 @@ This change log covers only the client-server protocol of Sprotty. See [here](ht ## v.0.14.0 (Aug. 2023) -Fixed issues: https://github.com/eclipse/sprotty/milestone/10?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/10?closed=1 ----- ### v0.13.0 (Dec. 2022) - * Moved more actions from `sprotty` to `sprotty-protocol` to make them available in backend applications ([#326](https://github.com/eclipse/sprotty/pull/326)). + * Moved more actions from `sprotty` to `sprotty-protocol` to make them available in backend applications ([#326](https://github.com/eclipse-sprotty/sprotty/pull/326)). -Fixed issues: https://github.com/eclipse/sprotty/milestone/9?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/9?closed=1 ----- ### v0.12.0 (Jun. 2022) - * Added `ServerActionHandlerRegistry` service to register action handlers for all `DiagramServer` instances ([#260](https://github.com/eclipse/sprotty/pull/260)). + * Added `ServerActionHandlerRegistry` service to register action handlers for all `DiagramServer` instances ([#260](https://github.com/eclipse-sprotty/sprotty/pull/260)). -Fixed issues: https://github.com/eclipse/sprotty/milestone/8?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/8?closed=1 diff --git a/packages/sprotty-protocol/package.json b/packages/sprotty-protocol/package.json index 60e1b411..8ed03db9 100644 --- a/packages/sprotty-protocol/package.json +++ b/packages/sprotty-protocol/package.json @@ -11,21 +11,14 @@ "modeling", "visualization" ], - "homepage": "https://github.com/eclipse/sprotty", - "bugs": "https://github.com/eclipse/sprotty/issues", + "homepage": "https://github.com/eclipse-sprotty/sprotty", + "bugs": "https://github.com/eclipse-sprotty/sprotty/issues", "author": { "name": "Eclipse Sprotty" }, - "contributors": [ - { - "name": "Miro Spönemann", - "email": "miro.spoenemann@typefox.io", - "url": "https://www.typefox.io" - } - ], "repository": { "type": "git", - "url": "https://github.com/eclipse/sprotty", + "url": "https://github.com/eclipse-sprotty/sprotty", "directory": "packages/sprotty-protocol" }, "devDependencies": { diff --git a/packages/sprotty/CHANGELOG.md b/packages/sprotty/CHANGELOG.md index dcb60ae1..77e38156 100644 --- a/packages/sprotty/CHANGELOG.md +++ b/packages/sprotty/CHANGELOG.md @@ -9,27 +9,27 @@ This change log covers only the client part of Sprotty. See [here](https://githu * The `ToolManager API` and related concepts have been deprecated. They are are no longer actively used and support will be dropped in future versions ([#371](https://github.com/eclipse-sprotty/sprotty/pull/371)) -Fixed issues: https://github.com/eclipse/sprotty/milestone/10?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/10?closed=1 ----- ### v0.13.0 (Dec. 2022) - * Removed dependency to `@vscode/codicons` ([#312](https://github.com/eclipse/sprotty/pull/312)): You now have to add the dependency to your application and include it via import or other means. See classdiagram [di.config.ts](../../examples/classdiagram/src/di.config.ts) for an example. - * New function `configureButtonHandler` to register a button handler for a button type ([#303](https://github.com/eclipse/sprotty/pull/303)) - * Added `dragover` and `drop` events to mouse listeners ([#309](https://github.com/eclipse/sprotty/pull/309)) - * Moved more actions from `sprotty` to `sprotty-protocol` to make them available in backend applications ([#326](https://github.com/eclipse/sprotty/pull/326)). + * Removed dependency to `@vscode/codicons` ([#312](https://github.com/eclipse-sprotty/sprotty/pull/312)): You now have to add the dependency to your application and include it via import or other means. See classdiagram [di.config.ts](../../examples/classdiagram/src/di.config.ts) for an example. + * New function `configureButtonHandler` to register a button handler for a button type ([#303](https://github.com/eclipse-sprotty/sprotty/pull/303)) + * Added `dragover` and `drop` events to mouse listeners ([#309](https://github.com/eclipse-sprotty/sprotty/pull/309)) + * Moved more actions from `sprotty` to `sprotty-protocol` to make them available in backend applications ([#326](https://github.com/eclipse-sprotty/sprotty/pull/326)). -Fixed issues: https://github.com/eclipse/sprotty/milestone/9?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/9?closed=1 ----- ### v0.12.0 (Jun. 2022) - * Aligned dependency to `inversify` ([#292](https://github.com/eclipse/sprotty/pull/292)): version constraint is now `^5.1.1` in all sprotty packages. + * Aligned dependency to `inversify` ([#292](https://github.com/eclipse-sprotty/sprotty/pull/292)): version constraint is now `^5.1.1` in all sprotty packages. -Fixed issues: https://github.com/eclipse/sprotty/milestone/8?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/8?closed=1 ----- @@ -42,7 +42,7 @@ Fixed dependency to `sprotty-protocol`: version constraint is now `~0.11.0` (equ This version introduces a dependency to the new package `sprotty-protocol`. Many definitions have been copied to the new package and the original definitions are marked as deprecated, so you need to update your imports to stay compatible with future versions. New features: - * Edges rendered as Bézier curves ([#245](https://github.com/eclipse/sprotty/pull/245)). Use the new `BezierCurveEdgeView` to display edges as smooth curves. This requires the routing points of the edges to be provided as a series of curve segments, each with two control points and one target point (except the last segment, which connects to the target node). The expected number of routing points is of the form `3*n-1`: 2, 5, 8, 11... + * Edges rendered as Bézier curves ([#245](https://github.com/eclipse-sprotty/sprotty/pull/245)). Use the new `BezierCurveEdgeView` to display edges as smooth curves. This requires the routing points of the edges to be provided as a series of curve segments, each with two control points and one target point (except the last segment, which connects to the target node). The expected number of routing points is of the form `3*n-1`: 2, 5, 8, 11... Breaking API changes: * Actions are consistently declared as interfaces, not as classes, to emphasize that they must be serializable to enable transfer between client and server. Instead of a constructor, use the `create` function defined in the namespace with the same name as the corresponding action interface. @@ -54,14 +54,14 @@ Breaking API changes: ### v0.10.0 (Oct. 2021) New features: - * Line jumps (`JumpingPolylineEdgeView`) or gaps (`PolylineEdgeViewWithGapsOnIntersections`) to visually clarify intersecting edges ([#226](https://github.com/eclipse/sprotty/pull/226)) - * `TYPES.IEdgeRoutePostprocessor` can be registered to analyse and/or change computed routes ([#226](https://github.com/eclipse/sprotty/pull/226)) - * `EdgeRouterRegistry` can route all edges contained in a parent element at once. These pre-computed routes are then added to the `args` that are passed on to the views. This allows `IView` and `IEdgeRoutePostprocessor` implementations to consider all computed routes before the routed edges have been rendered. ([#226](https://github.com/eclipse/sprotty/pull/226)) - * Added "projection bars" that can serve as scroll bars and display horizontal / vertical projections of model elements. Use `ProjectedViewportView` as root element view to enable this feature. ([#240](https://github.com/eclipse/sprotty/pull/240)) - * Added support for Codicons ([#248](https://github.com/eclipse/sprotty/issues/248)) + * Line jumps (`JumpingPolylineEdgeView`) or gaps (`PolylineEdgeViewWithGapsOnIntersections`) to visually clarify intersecting edges ([#226](https://github.com/eclipse-sprotty/sprotty/pull/226)) + * `TYPES.IEdgeRoutePostprocessor` can be registered to analyse and/or change computed routes ([#226](https://github.com/eclipse-sprotty/sprotty/pull/226)) + * `EdgeRouterRegistry` can route all edges contained in a parent element at once. These pre-computed routes are then added to the `args` that are passed on to the views. This allows `IView` and `IEdgeRoutePostprocessor` implementations to consider all computed routes before the routed edges have been rendered. ([#226](https://github.com/eclipse-sprotty/sprotty/pull/226)) + * Added "projection bars" that can serve as scroll bars and display horizontal / vertical projections of model elements. Use `ProjectedViewportView` as root element view to enable this feature. ([#240](https://github.com/eclipse-sprotty/sprotty/pull/240)) + * Added support for Codicons ([#248](https://github.com/eclipse-sprotty/sprotty/issues/248)) Breaking API changes: - * It is recommended that implementations of the `IView` for `SGraph` instances compute the routes of its children with `edgeRouterRegistry.routeAllChildren(model)` and pass on the routes as arguments to its child views. See implementation of `SGraphView` ([#226](https://github.com/eclipse/sprotty/pull/226)) + * It is recommended that implementations of the `IView` for `SGraph` instances compute the routes of its children with `edgeRouterRegistry.routeAllChildren(model)` and pass on the routes as arguments to its child views. See implementation of `SGraphView` ([#226](https://github.com/eclipse-sprotty/sprotty/pull/226)) * Upgrade to snabbdom 3.0.3. The imports of snabbdom functions have changed. The main snabbdom package exports all of the public API.This means consumers of the snabbdom package need to update their imports. before @@ -95,40 +95,40 @@ import { svg } from 'sprotty'; * The `on` function API of `vnode-utils` has been changed due to the API change of Snabbdom's event listener. Listeners must `bind` elements. (see [snabbdom#802](https://github.com/snabbdom/snabbdom/issues/802)) -Fixed issues: https://github.com/eclipse/sprotty/milestone/5?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/5?closed=1 ----- ### v0.9.0 (Aug. 2020) New features: - * Skip rendering elements that are not in viewport ([#182](https://github.com/eclipse/sprotty/pull/182)) - * Rejecting request actions ([#184](https://github.com/eclipse/sprotty/pull/184)) + * Skip rendering elements that are not in viewport ([#182](https://github.com/eclipse-sprotty/sprotty/pull/182)) + * Rejecting request actions ([#184](https://github.com/eclipse-sprotty/sprotty/pull/184)) -Fixed issues: https://github.com/eclipse/sprotty/milestone/4?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/4?closed=1 ----- ### v0.8.0 (Apr. 2020) New features: - * CenterAction retains zoom level ([#138](https://github.com/eclipse/sprotty/pull/138)) - * Cycling through command palettes ([#141](https://github.com/eclipse/sprotty/pull/141)) - * Context menus ([#139](https://github.com/eclipse/sprotty/pull/139)[#144](https://github.com/eclipse/sprotty/pull/144)) - * Use element subtype as css style ([#145](https://github.com/eclipse/sprotty/pull/145)) - * Improve loading indicator of command palette ([#148](https://github.com/eclipse/sprotty/pull/148), [#151](https://github.com/eclipse/sprotty/pull/151)) - * Reset previous hover feedback on mouseover ([#153](https://github.com/eclipse/sprotty/pull/153)) - * Edge changes are animated ([#158](https://github.com/eclipse/sprotty/pull/158)) - * Fix scrolling on all browsers ([#163](https://github.com/eclipse/sprotty/pull/163)) - * Multi-line Label editing and ForeignObjects ([#171](https://github.com/eclipse/sprotty/pull/171), [#173](https://github.com/eclipse/sprotty/pull/173)) - -Fixed issues: https://github.com/eclipse/sprotty/milestone/3?closed=1 + * CenterAction retains zoom level ([#138](https://github.com/eclipse-sprotty/sprotty/pull/138)) + * Cycling through command palettes ([#141](https://github.com/eclipse-sprotty/sprotty/pull/141)) + * Context menus ([#139](https://github.com/eclipse-sprotty/sprotty/pull/139)[#144](https://github.com/eclipse-sprotty/sprotty/pull/144)) + * Use element subtype as css style ([#145](https://github.com/eclipse-sprotty/sprotty/pull/145)) + * Improve loading indicator of command palette ([#148](https://github.com/eclipse-sprotty/sprotty/pull/148), [#151](https://github.com/eclipse-sprotty/sprotty/pull/151)) + * Reset previous hover feedback on mouseover ([#153](https://github.com/eclipse-sprotty/sprotty/pull/153)) + * Edge changes are animated ([#158](https://github.com/eclipse-sprotty/sprotty/pull/158)) + * Fix scrolling on all browsers ([#163](https://github.com/eclipse-sprotty/sprotty/pull/163)) + * Multi-line Label editing and ForeignObjects ([#171](https://github.com/eclipse-sprotty/sprotty/pull/171), [#173](https://github.com/eclipse-sprotty/sprotty/pull/173)) + +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/3?closed=1 Breaking API changes: - * `DeleteContextMenuProviderRegistry` has been renamed to `DeleteContextMenuProvider` ([#157](https://github.com/eclipse/sprotty/pull/#157)) - * `MenuItem.isEnabled()`, `MenuItem.isToggled()`and `MenuItem.isVisible()` no longer return promises ([#157](https://github.com/eclipse/sprotty/pull/#157)) - * `IUIExtension.id` and `IUIExtension.containerClass` have become methods ([#171](https://github.com/eclipse/sprotty/pull/#171)) - * `EdgeSnapshot` additionally stores `routedPoints` ([#158](https://github.com/eclipse/sprotty/pull/#158)) + * `DeleteContextMenuProviderRegistry` has been renamed to `DeleteContextMenuProvider` ([#157](https://github.com/eclipse-sprotty/sprotty/pull/#157)) + * `MenuItem.isEnabled()`, `MenuItem.isToggled()`and `MenuItem.isVisible()` no longer return promises ([#157](https://github.com/eclipse-sprotty/sprotty/pull/#157)) + * `IUIExtension.id` and `IUIExtension.containerClass` have become methods ([#171](https://github.com/eclipse-sprotty/sprotty/pull/#171)) + * `EdgeSnapshot` additionally stores `routedPoints` ([#158](https://github.com/eclipse-sprotty/sprotty/pull/#158)) ----- @@ -136,24 +136,24 @@ Breaking API changes: New features: - * Command palette ([#63](https://github.com/eclipse/sprotty/pull/63)) - * UI extensions ([#63](https://github.com/eclipse/sprotty/pull/63)) - * Snap-to-grid ([#87](https://github.com/eclipse/sprotty/pull/87)) - * Label editing ([#88](https://github.com/eclipse/sprotty/pull/88)) - * Request-response actions ([#103](https://github.com/eclipse/sprotty/pull/103)) - * Configure _features_ as parameter to `configureModelElement` ([#109](https://github.com/eclipse/sprotty/pull/109)) - * New function `loadDefaultModules` ([#111](https://github.com/eclipse/sprotty/pull/111)) - * New function `configureActionHandler` ([#117](https://github.com/eclipse/sprotty/pull/117)) + * Command palette ([#63](https://github.com/eclipse-sprotty/sprotty/pull/63)) + * UI extensions ([#63](https://github.com/eclipse-sprotty/sprotty/pull/63)) + * Snap-to-grid ([#87](https://github.com/eclipse-sprotty/sprotty/pull/87)) + * Label editing ([#88](https://github.com/eclipse-sprotty/sprotty/pull/88)) + * Request-response actions ([#103](https://github.com/eclipse-sprotty/sprotty/pull/103)) + * Configure _features_ as parameter to `configureModelElement` ([#109](https://github.com/eclipse-sprotty/sprotty/pull/109)) + * New function `loadDefaultModules` ([#111](https://github.com/eclipse-sprotty/sprotty/pull/111)) + * New function `configureActionHandler` ([#117](https://github.com/eclipse-sprotty/sprotty/pull/117)) -Fixed issues: https://github.com/eclipse/sprotty/milestone/2?closed=1 +Fixed issues: https://github.com/eclipse-sprotty/sprotty/milestone/2?closed=1 Breaking API changes: - * Split `Viewer` in three classes `ModelViewer`, `HiddenModelViewer`, `PopupModelViewer` ([#103](https://github.com/eclipse/sprotty/pull/103)). - * Renamed `CommandResult` type to `CommandReturn` ([#103](https://github.com/eclipse/sprotty/pull/103)). - * Renamed `IVNodeDecorator` to `IVNodePostprocessor` ([#113](https://github.com/eclipse/sprotty/pull/113), [#116](https://github.com/eclipse/sprotty/pull/116)). - * Changed `ComputedBoundsAction` ([#119](https://github.com/eclipse/sprotty/pull/119)) - * `SGraphFactory` is deprecated ([#109](https://github.com/eclipse/sprotty/pull/109)). + * Split `Viewer` in three classes `ModelViewer`, `HiddenModelViewer`, `PopupModelViewer` ([#103](https://github.com/eclipse-sprotty/sprotty/pull/103)). + * Renamed `CommandResult` type to `CommandReturn` ([#103](https://github.com/eclipse-sprotty/sprotty/pull/103)). + * Renamed `IVNodeDecorator` to `IVNodePostprocessor` ([#113](https://github.com/eclipse-sprotty/sprotty/pull/113), [#116](https://github.com/eclipse-sprotty/sprotty/pull/116)). + * Changed `ComputedBoundsAction` ([#119](https://github.com/eclipse-sprotty/sprotty/pull/119)) + * `SGraphFactory` is deprecated ([#109](https://github.com/eclipse-sprotty/sprotty/pull/109)). ----- diff --git a/packages/sprotty/README.md b/packages/sprotty/README.md index ec82a57b..c803a74b 100644 --- a/packages/sprotty/README.md +++ b/packages/sprotty/README.md @@ -21,9 +21,9 @@ Some selected features: ## Docs -For further information please consult the [Wiki](https://github.com/eclipse/sprotty/wiki). +For further information please consult the [documentation on the website](https://sprotty.org/docs/). -The version history is documented in the [CHANGELOG](https://github.com/eclipse/sprotty/blob/master/packages/sprotty/CHANGELOG.md). +The version history is documented in the [CHANGELOG](https://github.com/eclipse-sprotty/sprotty/blob/master/packages/sprotty/CHANGELOG.md). ## References diff --git a/packages/sprotty/package.json b/packages/sprotty/package.json index 3d9be54d..a4233a6f 100644 --- a/packages/sprotty/package.json +++ b/packages/sprotty/package.json @@ -11,44 +11,14 @@ "visualization", "svg" ], - "homepage": "https://github.com/eclipse/sprotty", - "bugs": "https://github.com/eclipse/sprotty/issues", + "homepage": "https://github.com/eclipse-sprotty/sprotty", + "bugs": "https://github.com/eclipse-sprotty/sprotty/issues", "author": { "name": "Eclipse Sprotty" }, - "contributors": [ - { - "name": "Marc Dumais", - "email": "marc.dumais@ericsson.com", - "url": "https://www.ericsson.com/" - }, - { - "name": "Takashi Katou" - }, - { - "name": "Jan Köhnlein", - "email": "jan.koehnlein@typefox.io", - "url": "https://www.typefox.io" - }, - { - "name": "Philip Langer", - "email": "planger@eclipsesource.com", - "url": "https://www.eclipsesource.com" - }, - { - "name": "Tobias Ortmayr", - "email": "tortmayr@eclipsesource.com", - "url": "https://www.eclipsesource.com" - }, - { - "name": "Miro Spönemann", - "email": "miro.spoenemann@typefox.io", - "url": "https://www.typefox.io" - } - ], "repository": { "type": "git", - "url": "https://github.com/eclipse/sprotty", + "url": "https://github.com/eclipse-sprotty/sprotty", "directory": "packages/sprotty" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 500ccf8f..e9ac45fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1709,7 +1709,7 @@ chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -1717,11 +1717,6 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"