diff --git a/package-lock.json b/package-lock.json index e71673b2..2405bee4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,11 +19,11 @@ } }, "node_modules/@codingame/monaco-jsonrpc": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.3.1.tgz", - "integrity": "sha512-Zxilei5fGV89uGJcFKDQFfZfUbWdP8/NGympXQUX/XRle4CYUabfvEOdY0Diq0NruttlRH3RdWVZ7Nw6f4TClQ==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.4.0.tgz", + "integrity": "sha512-5IQkYvFMyWQWutFhK77Tk5q1VIQoFySElqpAI1fUWXIIAepiYD7xJRawzMgJqhIzER7t44FbBN4uVvoXLRmJ6g==", "dependencies": { - "vscode-jsonrpc": "^6.0.0" + "vscode-jsonrpc": "^8.0.1" } }, "node_modules/@cspotcode/source-map-consumer": { @@ -126,9 +126,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.11.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz", - "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==" + "version": "16.11.35", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz", + "integrity": "sha512-QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ==" }, "node_modules/@types/qs": { "version": "6.9.7", @@ -153,9 +153,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz", - "integrity": "sha512-ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", + "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", "dev": true }, "node_modules/@types/ws": { @@ -179,9 +179,9 @@ } }, "node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -216,23 +216,26 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.8.1", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.9.7", - "raw-body": "2.4.3", - "type-is": "~1.6.18" + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, "node_modules/brace-expansion": { @@ -256,6 +259,18 @@ "node": ">= 0.8" } }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -287,9 +302,9 @@ } }, "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "engines": { "node": ">= 0.6" } @@ -314,17 +329,21 @@ } }, "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } }, "node_modules/diff": { "version": "4.0.2", @@ -364,9 +383,9 @@ } }, "node_modules/esbuild": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.32.tgz", - "integrity": "sha512-RuzVUP/bkStmnVHK6Gh3gjaMjfXNLqBqvYVDiS9JKl5KdRdRLUeW5Wo8NrbL7cL6CW7Cyak7SvACqyPOBuA8vA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.39.tgz", + "integrity": "sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==", "dev": true, "hasInstallScript": true, "bin": { @@ -376,32 +395,32 @@ "node": ">=12" }, "optionalDependencies": { - "esbuild-android-64": "0.14.32", - "esbuild-android-arm64": "0.14.32", - "esbuild-darwin-64": "0.14.32", - "esbuild-darwin-arm64": "0.14.32", - "esbuild-freebsd-64": "0.14.32", - "esbuild-freebsd-arm64": "0.14.32", - "esbuild-linux-32": "0.14.32", - "esbuild-linux-64": "0.14.32", - "esbuild-linux-arm": "0.14.32", - "esbuild-linux-arm64": "0.14.32", - "esbuild-linux-mips64le": "0.14.32", - "esbuild-linux-ppc64le": "0.14.32", - "esbuild-linux-riscv64": "0.14.32", - "esbuild-linux-s390x": "0.14.32", - "esbuild-netbsd-64": "0.14.32", - "esbuild-openbsd-64": "0.14.32", - "esbuild-sunos-64": "0.14.32", - "esbuild-windows-32": "0.14.32", - "esbuild-windows-64": "0.14.32", - "esbuild-windows-arm64": "0.14.32" + "esbuild-android-64": "0.14.39", + "esbuild-android-arm64": "0.14.39", + "esbuild-darwin-64": "0.14.39", + "esbuild-darwin-arm64": "0.14.39", + "esbuild-freebsd-64": "0.14.39", + "esbuild-freebsd-arm64": "0.14.39", + "esbuild-linux-32": "0.14.39", + "esbuild-linux-64": "0.14.39", + "esbuild-linux-arm": "0.14.39", + "esbuild-linux-arm64": "0.14.39", + "esbuild-linux-mips64le": "0.14.39", + "esbuild-linux-ppc64le": "0.14.39", + "esbuild-linux-riscv64": "0.14.39", + "esbuild-linux-s390x": "0.14.39", + "esbuild-netbsd-64": "0.14.39", + "esbuild-openbsd-64": "0.14.39", + "esbuild-sunos-64": "0.14.39", + "esbuild-windows-32": "0.14.39", + "esbuild-windows-64": "0.14.39", + "esbuild-windows-arm64": "0.14.39" } }, "node_modules/esbuild-android-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.32.tgz", - "integrity": "sha512-q1qjB2UcoWehR9Yp9dO2RdJUeLLrXAYsbOU4tkYa+GmJzxTwuvOrMdvaemsXYqb7F4STVTca9KpfqGicEChtUg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz", + "integrity": "sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==", "cpu": [ "x64" ], @@ -415,9 +434,9 @@ } }, "node_modules/esbuild-android-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.32.tgz", - "integrity": "sha512-bs1uu+RuM15f8yjFc0FhPDE/6NID4fKl7beDVsGCme6Q8ld2IzRXmp5QaHurlcH93PFyQnUgVvdahIWgtK2QZw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz", + "integrity": "sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==", "cpu": [ "arm64" ], @@ -431,9 +450,9 @@ } }, "node_modules/esbuild-darwin-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.32.tgz", - "integrity": "sha512-6MekflAld28wYtzanwZTxQlxMPeYw/yv1ToFG2hpo3LGxOIE2mBD5IJaMCcyy1//EYvGnGToO3p6XKdbS8E1QQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz", + "integrity": "sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==", "cpu": [ "x64" ], @@ -447,9 +466,9 @@ } }, "node_modules/esbuild-darwin-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.32.tgz", - "integrity": "sha512-BHYIjiPDYQTD+4zwqdqRo+I2bbg3fn9mah/gZm4SCCy+7uwTTYOYobIunHT7wVCgxnFCr50PJUdaMrEoCImRbw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz", + "integrity": "sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==", "cpu": [ "arm64" ], @@ -463,9 +482,9 @@ } }, "node_modules/esbuild-freebsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.32.tgz", - "integrity": "sha512-6BOBhtfAf9AlfjL1AvtfVOxwY82tHPfYrA0lskJpFjfiEMGTLU6e0vdOwb4+4x++gGz49azuGK0woYqdfL03uw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz", + "integrity": "sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==", "cpu": [ "x64" ], @@ -479,9 +498,9 @@ } }, "node_modules/esbuild-freebsd-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.32.tgz", - "integrity": "sha512-zIRR4gKQW56p/xLM8TlpxVBNiX0w3VoR9ZxfH4nrfJ7QiL0SYHRy8YPL5C7zMWRjSze2WxQRHfS9bHKdVrVXBw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz", + "integrity": "sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==", "cpu": [ "arm64" ], @@ -495,9 +514,9 @@ } }, "node_modules/esbuild-linux-32": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.32.tgz", - "integrity": "sha512-kn0AkGtPvzA6xiv93/mavvZ7DVinu/ewh2F2S0/8mE8/PXi3D4+svZ6V3beV5DIH7vcHVuGhoooWav8HPF04tg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz", + "integrity": "sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==", "cpu": [ "ia32" ], @@ -511,9 +530,9 @@ } }, "node_modules/esbuild-linux-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.32.tgz", - "integrity": "sha512-Ie+PMvrPj/HCOmSc0QubKttDxP2iBtPzDu+b+V3HGDGwkGmVpDkyXx1NXp5LjkIphIay2QekMwy1dSw3KDqCew==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz", + "integrity": "sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==", "cpu": [ "x64" ], @@ -527,9 +546,9 @@ } }, "node_modules/esbuild-linux-arm": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.32.tgz", - "integrity": "sha512-R/Bvn/YQNDyvfN0SERh/I7hKPqN+nSSruQdVeiYEJ+jc3fUi73jXYAscpTQgIBeER/yXnEsgJGU/UQ9+sscr7A==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz", + "integrity": "sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==", "cpu": [ "arm" ], @@ -543,9 +562,9 @@ } }, "node_modules/esbuild-linux-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.32.tgz", - "integrity": "sha512-ykoqKaxX95nB+lk2K/+qxr0ke+BxkeVi0yKOnymCR5Ive7IZDHa4BJX53NEGSBKLfWPwKE6SXTz8qcEewSntoA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz", + "integrity": "sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==", "cpu": [ "arm64" ], @@ -559,9 +578,9 @@ } }, "node_modules/esbuild-linux-mips64le": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.32.tgz", - "integrity": "sha512-IilnlBexpHpt/5po0cle/L/S6CYnwaq23UuAqWzxp+opHLOCNnyANpC1jOoP551aRx4JuZ7z3xZZ7bYQZB147w==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz", + "integrity": "sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==", "cpu": [ "mips64el" ], @@ -575,9 +594,9 @@ } }, "node_modules/esbuild-linux-ppc64le": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.32.tgz", - "integrity": "sha512-TR6l5nWZbfq7jSY+1vsiQjT4m67NWplNhbX6GBieZq6DBt0nTx1XgTZAdKROF7jTuaK7YrCYlPXtfO3w86Mysw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz", + "integrity": "sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==", "cpu": [ "ppc64" ], @@ -591,9 +610,9 @@ } }, "node_modules/esbuild-linux-riscv64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.32.tgz", - "integrity": "sha512-aSOcUzTeIAslfri8e+bMpyzQuxhcIiNhWyuCGGXum2PtxwYiUqR8/UCMYfwYtYkhr1yABOFOfs83mm9KBy5qCQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz", + "integrity": "sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==", "cpu": [ "riscv64" ], @@ -607,9 +626,9 @@ } }, "node_modules/esbuild-linux-s390x": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.32.tgz", - "integrity": "sha512-dNlip+EvexxKjRZitFCWCd7DVk64c7R5ySr8aFEMHCb/RriNiyDxYJGzYWm4EMJsMRMupMUHlMY64BAa3Op9FA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz", + "integrity": "sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==", "cpu": [ "s390x" ], @@ -623,9 +642,9 @@ } }, "node_modules/esbuild-netbsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.32.tgz", - "integrity": "sha512-Pa3QByYqxzlBFQQQhjYBPg3WUfSjwibqzh1hC6mPDRUHnCeUcrLoBuIiG4xqOYEpQM9/kDowIBsrGIQEVWWdQA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz", + "integrity": "sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==", "cpu": [ "x64" ], @@ -639,9 +658,9 @@ } }, "node_modules/esbuild-openbsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.32.tgz", - "integrity": "sha512-uWKKqpCjkMY8TCIobFvaSETonQY3OrmgnoTCC3tF+lvMoneYjppB6akx7L5Xv0kP+1tnSbrIof1ca8PfqGUyjw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz", + "integrity": "sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==", "cpu": [ "x64" ], @@ -655,9 +674,9 @@ } }, "node_modules/esbuild-sunos-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.32.tgz", - "integrity": "sha512-Ar+u3mBk0oVV4Fwv/qlinJZNIPPtTBSG+1W42o8lOaVxJ+rJgecDoeUN+5uyd9at0BK1SVrQ1qZ4wjHKB0qFpQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz", + "integrity": "sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==", "cpu": [ "x64" ], @@ -671,9 +690,9 @@ } }, "node_modules/esbuild-windows-32": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.32.tgz", - "integrity": "sha512-rLMsbflMY6Hjh3rmQnCDVZahJQ7n+XfT6o1+no5pHRpDlMh38MHthgGh35q+EcOMgrGP3ppnw70rhJq80SaYTQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz", + "integrity": "sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==", "cpu": [ "ia32" ], @@ -687,9 +706,9 @@ } }, "node_modules/esbuild-windows-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.32.tgz", - "integrity": "sha512-OHnMMxYufVgLXIMnwLynLMKguHMrsVnWcehieSP9i6ZX31KEsOFYWrorcnTWOn4rbZVLSL10ofxLuVIgRW3SWw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz", + "integrity": "sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==", "cpu": [ "x64" ], @@ -703,9 +722,9 @@ } }, "node_modules/esbuild-windows-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.32.tgz", - "integrity": "sha512-ddavy6IPUBySMfqDfG243TgtuqwQBNJQJPVaA4DaavmMfpBsUxFrSV+HzBWXTKU3I9EcuoEvIATLuQ7NJKxjwg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz", + "integrity": "sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==", "cpu": [ "arm64" ], @@ -736,37 +755,38 @@ "link": true }, "node_modules/express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", - "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.2", + "body-parser": "1.20.0", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.2", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "2.0.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "finalhandler": "1.2.0", "fresh": "0.5.2", + "http-errors": "2.0.0", "merge-descriptors": "1.0.1", "methods": "~1.1.2", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.9.7", + "qs": "6.10.3", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.17.2", - "serve-static": "1.14.2", + "send": "0.18.0", + "serve-static": "1.15.0", "setprototypeof": "1.2.0", - "statuses": "~1.5.0", + "statuses": "2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" @@ -776,16 +796,16 @@ } }, "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", - "statuses": "~1.5.0", + "statuses": "2.0.1", "unpipe": "~1.0.0" }, "engines": { @@ -831,8 +851,20 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/glob": { "version": "7.2.0", @@ -863,7 +895,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -871,19 +902,30 @@ "node": ">= 0.4.0" } }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dependencies": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/iconv-lite": { @@ -930,9 +972,9 @@ } }, "node_modules/is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -1036,9 +1078,9 @@ "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" }, "node_modules/monaco-editor-workers": { - "version": "0.33.0-next.3", - "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0-next.3.tgz", - "integrity": "sha512-kXFasCWwXzm8sqJ7vnVUiNRyhc6lohXO/2eW2xk8GZ1cd+bhGojfERNmu5yOSTDuisgu5hZB2Fwn3qHfS18CGQ==", + "version": "0.33.0-next.5", + "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0-next.5.tgz", + "integrity": "sha512-DGIyCpo1nhsOGtDHE0eD58rIuiQ8guC7SeTNd0JAk4KO1kapd+PqA8kMyhDwJKmJJRGXvOctbMOF+lH0+htshQ==", "dependencies": { "monaco-editor": "0.33.0" } @@ -1053,9 +1095,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/nanoid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz", - "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -1087,10 +1129,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dependencies": { "ee-first": "1.1.1" }, @@ -1142,9 +1192,9 @@ "dev": true }, "node_modules/postcss": { - "version": "8.4.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", - "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", + "version": "8.4.13", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz", + "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==", "dev": true, "funding": [ { @@ -1157,7 +1207,7 @@ } ], "dependencies": { - "nanoid": "^3.3.1", + "nanoid": "^3.3.3", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -1184,9 +1234,12 @@ "dev": true }, "node_modules/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "dependencies": { + "side-channel": "^1.0.4" + }, "engines": { "node": ">=0.6" }, @@ -1203,12 +1256,12 @@ } }, "node_modules/raw-body": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", - "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "dependencies": { "bytes": "3.1.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -1229,9 +1282,9 @@ } }, "node_modules/request-light": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz", - "integrity": "sha512-i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw==" + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.8.tgz", + "integrity": "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==" }, "node_modules/resolve": { "version": "1.22.0", @@ -1251,9 +1304,9 @@ } }, "node_modules/rollup": { - "version": "2.70.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz", - "integrity": "sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==", + "version": "2.72.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz", + "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -1299,23 +1352,23 @@ } }, "node_modules/send": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", - "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dependencies": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "engines": { "node": ">= 0.8.0" @@ -1327,14 +1380,14 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", - "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.2" + "send": "0.18.0" }, "engines": { "node": ">= 0.8.0" @@ -1378,6 +1431,19 @@ "node": ">=6" } }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -1394,11 +1460,11 @@ } }, "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/supports-preserve-symlinks-flag": { @@ -1465,9 +1531,9 @@ } }, "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, "node_modules/type-is": { @@ -1483,9 +1549,9 @@ } }, "node_modules/typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1512,9 +1578,9 @@ } }, "node_modules/v8-compile-cache-lib": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", - "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, "node_modules/vary": { @@ -1526,13 +1592,13 @@ } }, "node_modules/vite": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.1.tgz", - "integrity": "sha512-vSlsSdOYGcYEJfkQ/NeLXgnRv5zZfpAsdztkIrs7AZHV8RCMZQkwjo4DS5BnrYTqoWqLoUe1Cah4aVO4oNNqCQ==", + "version": "2.9.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.9.tgz", + "integrity": "sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==", "dev": true, "dependencies": { "esbuild": "^0.14.27", - "postcss": "^8.4.12", + "postcss": "^8.4.13", "resolve": "^1.22.0", "rollup": "^2.59.0" }, @@ -1575,24 +1641,24 @@ } }, "node_modules/vscode-jsonrpc": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", - "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", + "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==", "engines": { - "node": ">=8.0.0 || >=10.0.0" + "node": ">=14.0.0" } }, "node_modules/vscode-languageclient": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", - "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", + "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", "dependencies": { "minimatch": "^3.0.4", - "semver": "^7.3.4", - "vscode-languageserver-protocol": "3.16.0" + "semver": "^7.3.5", + "vscode-languageserver-protocol": "3.17.1" }, "engines": { - "vscode": "^1.52.0" + "vscode": "^1.67.0" } }, "node_modules/vscode-languageclient/node_modules/lru-cache": { @@ -1607,9 +1673,9 @@ } }, "node_modules/vscode-languageclient/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -1626,23 +1692,23 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/vscode-languageserver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz", - "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz", + "integrity": "sha512-sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==", "dependencies": { - "vscode-languageserver-protocol": "3.16.0" + "vscode-languageserver-protocol": "3.17.1" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", - "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", + "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", "dependencies": { - "vscode-jsonrpc": "6.0.0", - "vscode-languageserver-types": "3.16.0" + "vscode-jsonrpc": "8.0.1", + "vscode-languageserver-types": "3.17.1" } }, "node_modules/vscode-languageserver-textdocument": { @@ -1651,14 +1717,14 @@ "integrity": "sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==" }, "node_modules/vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", + "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" }, "node_modules/vscode-nls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", - "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz", + "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==" }, "node_modules/vscode-uri": { "version": "3.0.3", @@ -1672,9 +1738,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", + "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", "engines": { "node": ">=10.0.0" }, @@ -1712,15 +1778,15 @@ "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", - "vscode-jsonrpc": "6.0.0", - "vscode-languageclient": "7.0.0", + "vscode-jsonrpc": "8.0.1", + "vscode-languageclient": "8.0.1", "vscode-languageserver-textdocument": "1.0.4", "vscode-uri": "3.0.3" }, "devDependencies": { "@types/glob-to-regexp": "^0.4.1", "@types/node": "^16.11.7", - "@types/vscode": "1.66.0" + "@types/vscode": "1.67.0" } }, "packages/examples/browser": { @@ -1728,7 +1794,7 @@ "version": "0.19.0-next.1", "dependencies": { "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" } @@ -1737,9 +1803,9 @@ "name": "example-client", "version": "0.19.0-next.1", "dependencies": { - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", "normalize-url": "^7.0.3" } @@ -1748,13 +1814,13 @@ "name": "node-example", "version": "0.19.0-next.1", "dependencies": { - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "@types/ws": "^8.5.3", "express": "^4.17.3", "normalize-url": "^7.0.3", "request-light": "^0.5.7", "vscode-json-languageservice": "^4.2.1", - "vscode-languageserver": "7.0.0", + "vscode-languageserver": "8.0.1", "vscode-uri": "^3.0.3", "ws": "^8.5.0" }, @@ -1767,11 +1833,11 @@ }, "dependencies": { "@codingame/monaco-jsonrpc": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.3.1.tgz", - "integrity": "sha512-Zxilei5fGV89uGJcFKDQFfZfUbWdP8/NGympXQUX/XRle4CYUabfvEOdY0Diq0NruttlRH3RdWVZ7Nw6f4TClQ==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.4.0.tgz", + "integrity": "sha512-5IQkYvFMyWQWutFhK77Tk5q1VIQoFySElqpAI1fUWXIIAepiYD7xJRawzMgJqhIzER7t44FbBN4uVvoXLRmJ6g==", "requires": { - "vscode-jsonrpc": "^6.0.0" + "vscode-jsonrpc": "^8.0.1" } }, "@cspotcode/source-map-consumer": { @@ -1868,9 +1934,9 @@ "dev": true }, "@types/node": { - "version": "16.11.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz", - "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==" + "version": "16.11.35", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz", + "integrity": "sha512-QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ==" }, "@types/qs": { "version": "6.9.7", @@ -1895,9 +1961,9 @@ } }, "@types/vscode": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz", - "integrity": "sha512-ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", + "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", "dev": true }, "@types/ws": { @@ -1918,9 +1984,9 @@ } }, "acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, "acorn-walk": { @@ -1946,20 +2012,22 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.8.1", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.9.7", - "raw-body": "2.4.3", - "type-is": "~1.6.18" + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" } }, "brace-expansion": { @@ -1975,7 +2043,7 @@ "version": "file:packages/examples/browser", "requires": { "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" } @@ -1985,6 +2053,15 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -2010,9 +2087,9 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" }, "cookie-signature": { "version": "1.0.6", @@ -2034,14 +2111,14 @@ } }, "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" }, "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "diff": { "version": "4.0.2", @@ -2072,170 +2149,170 @@ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "esbuild": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.32.tgz", - "integrity": "sha512-RuzVUP/bkStmnVHK6Gh3gjaMjfXNLqBqvYVDiS9JKl5KdRdRLUeW5Wo8NrbL7cL6CW7Cyak7SvACqyPOBuA8vA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.39.tgz", + "integrity": "sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==", "dev": true, "requires": { - "esbuild-android-64": "0.14.32", - "esbuild-android-arm64": "0.14.32", - "esbuild-darwin-64": "0.14.32", - "esbuild-darwin-arm64": "0.14.32", - "esbuild-freebsd-64": "0.14.32", - "esbuild-freebsd-arm64": "0.14.32", - "esbuild-linux-32": "0.14.32", - "esbuild-linux-64": "0.14.32", - "esbuild-linux-arm": "0.14.32", - "esbuild-linux-arm64": "0.14.32", - "esbuild-linux-mips64le": "0.14.32", - "esbuild-linux-ppc64le": "0.14.32", - "esbuild-linux-riscv64": "0.14.32", - "esbuild-linux-s390x": "0.14.32", - "esbuild-netbsd-64": "0.14.32", - "esbuild-openbsd-64": "0.14.32", - "esbuild-sunos-64": "0.14.32", - "esbuild-windows-32": "0.14.32", - "esbuild-windows-64": "0.14.32", - "esbuild-windows-arm64": "0.14.32" + "esbuild-android-64": "0.14.39", + "esbuild-android-arm64": "0.14.39", + "esbuild-darwin-64": "0.14.39", + "esbuild-darwin-arm64": "0.14.39", + "esbuild-freebsd-64": "0.14.39", + "esbuild-freebsd-arm64": "0.14.39", + "esbuild-linux-32": "0.14.39", + "esbuild-linux-64": "0.14.39", + "esbuild-linux-arm": "0.14.39", + "esbuild-linux-arm64": "0.14.39", + "esbuild-linux-mips64le": "0.14.39", + "esbuild-linux-ppc64le": "0.14.39", + "esbuild-linux-riscv64": "0.14.39", + "esbuild-linux-s390x": "0.14.39", + "esbuild-netbsd-64": "0.14.39", + "esbuild-openbsd-64": "0.14.39", + "esbuild-sunos-64": "0.14.39", + "esbuild-windows-32": "0.14.39", + "esbuild-windows-64": "0.14.39", + "esbuild-windows-arm64": "0.14.39" } }, "esbuild-android-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.32.tgz", - "integrity": "sha512-q1qjB2UcoWehR9Yp9dO2RdJUeLLrXAYsbOU4tkYa+GmJzxTwuvOrMdvaemsXYqb7F4STVTca9KpfqGicEChtUg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz", + "integrity": "sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==", "dev": true, "optional": true }, "esbuild-android-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.32.tgz", - "integrity": "sha512-bs1uu+RuM15f8yjFc0FhPDE/6NID4fKl7beDVsGCme6Q8ld2IzRXmp5QaHurlcH93PFyQnUgVvdahIWgtK2QZw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz", + "integrity": "sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==", "dev": true, "optional": true }, "esbuild-darwin-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.32.tgz", - "integrity": "sha512-6MekflAld28wYtzanwZTxQlxMPeYw/yv1ToFG2hpo3LGxOIE2mBD5IJaMCcyy1//EYvGnGToO3p6XKdbS8E1QQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz", + "integrity": "sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==", "dev": true, "optional": true }, "esbuild-darwin-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.32.tgz", - "integrity": "sha512-BHYIjiPDYQTD+4zwqdqRo+I2bbg3fn9mah/gZm4SCCy+7uwTTYOYobIunHT7wVCgxnFCr50PJUdaMrEoCImRbw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz", + "integrity": "sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==", "dev": true, "optional": true }, "esbuild-freebsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.32.tgz", - "integrity": "sha512-6BOBhtfAf9AlfjL1AvtfVOxwY82tHPfYrA0lskJpFjfiEMGTLU6e0vdOwb4+4x++gGz49azuGK0woYqdfL03uw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz", + "integrity": "sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==", "dev": true, "optional": true }, "esbuild-freebsd-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.32.tgz", - "integrity": "sha512-zIRR4gKQW56p/xLM8TlpxVBNiX0w3VoR9ZxfH4nrfJ7QiL0SYHRy8YPL5C7zMWRjSze2WxQRHfS9bHKdVrVXBw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz", + "integrity": "sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==", "dev": true, "optional": true }, "esbuild-linux-32": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.32.tgz", - "integrity": "sha512-kn0AkGtPvzA6xiv93/mavvZ7DVinu/ewh2F2S0/8mE8/PXi3D4+svZ6V3beV5DIH7vcHVuGhoooWav8HPF04tg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz", + "integrity": "sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==", "dev": true, "optional": true }, "esbuild-linux-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.32.tgz", - "integrity": "sha512-Ie+PMvrPj/HCOmSc0QubKttDxP2iBtPzDu+b+V3HGDGwkGmVpDkyXx1NXp5LjkIphIay2QekMwy1dSw3KDqCew==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz", + "integrity": "sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==", "dev": true, "optional": true }, "esbuild-linux-arm": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.32.tgz", - "integrity": "sha512-R/Bvn/YQNDyvfN0SERh/I7hKPqN+nSSruQdVeiYEJ+jc3fUi73jXYAscpTQgIBeER/yXnEsgJGU/UQ9+sscr7A==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz", + "integrity": "sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==", "dev": true, "optional": true }, "esbuild-linux-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.32.tgz", - "integrity": "sha512-ykoqKaxX95nB+lk2K/+qxr0ke+BxkeVi0yKOnymCR5Ive7IZDHa4BJX53NEGSBKLfWPwKE6SXTz8qcEewSntoA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz", + "integrity": "sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==", "dev": true, "optional": true }, "esbuild-linux-mips64le": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.32.tgz", - "integrity": "sha512-IilnlBexpHpt/5po0cle/L/S6CYnwaq23UuAqWzxp+opHLOCNnyANpC1jOoP551aRx4JuZ7z3xZZ7bYQZB147w==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz", + "integrity": "sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==", "dev": true, "optional": true }, "esbuild-linux-ppc64le": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.32.tgz", - "integrity": "sha512-TR6l5nWZbfq7jSY+1vsiQjT4m67NWplNhbX6GBieZq6DBt0nTx1XgTZAdKROF7jTuaK7YrCYlPXtfO3w86Mysw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz", + "integrity": "sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==", "dev": true, "optional": true }, "esbuild-linux-riscv64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.32.tgz", - "integrity": "sha512-aSOcUzTeIAslfri8e+bMpyzQuxhcIiNhWyuCGGXum2PtxwYiUqR8/UCMYfwYtYkhr1yABOFOfs83mm9KBy5qCQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz", + "integrity": "sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==", "dev": true, "optional": true }, "esbuild-linux-s390x": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.32.tgz", - "integrity": "sha512-dNlip+EvexxKjRZitFCWCd7DVk64c7R5ySr8aFEMHCb/RriNiyDxYJGzYWm4EMJsMRMupMUHlMY64BAa3Op9FA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz", + "integrity": "sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==", "dev": true, "optional": true }, "esbuild-netbsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.32.tgz", - "integrity": "sha512-Pa3QByYqxzlBFQQQhjYBPg3WUfSjwibqzh1hC6mPDRUHnCeUcrLoBuIiG4xqOYEpQM9/kDowIBsrGIQEVWWdQA==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz", + "integrity": "sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==", "dev": true, "optional": true }, "esbuild-openbsd-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.32.tgz", - "integrity": "sha512-uWKKqpCjkMY8TCIobFvaSETonQY3OrmgnoTCC3tF+lvMoneYjppB6akx7L5Xv0kP+1tnSbrIof1ca8PfqGUyjw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz", + "integrity": "sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==", "dev": true, "optional": true }, "esbuild-sunos-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.32.tgz", - "integrity": "sha512-Ar+u3mBk0oVV4Fwv/qlinJZNIPPtTBSG+1W42o8lOaVxJ+rJgecDoeUN+5uyd9at0BK1SVrQ1qZ4wjHKB0qFpQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz", + "integrity": "sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==", "dev": true, "optional": true }, "esbuild-windows-32": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.32.tgz", - "integrity": "sha512-rLMsbflMY6Hjh3rmQnCDVZahJQ7n+XfT6o1+no5pHRpDlMh38MHthgGh35q+EcOMgrGP3ppnw70rhJq80SaYTQ==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz", + "integrity": "sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==", "dev": true, "optional": true }, "esbuild-windows-64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.32.tgz", - "integrity": "sha512-OHnMMxYufVgLXIMnwLynLMKguHMrsVnWcehieSP9i6ZX31KEsOFYWrorcnTWOn4rbZVLSL10ofxLuVIgRW3SWw==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz", + "integrity": "sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==", "dev": true, "optional": true }, "esbuild-windows-arm64": { - "version": "0.14.32", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.32.tgz", - "integrity": "sha512-ddavy6IPUBySMfqDfG243TgtuqwQBNJQJPVaA4DaavmMfpBsUxFrSV+HzBWXTKU3I9EcuoEvIATLuQ7NJKxjwg==", + "version": "0.14.39", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz", + "integrity": "sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==", "dev": true, "optional": true }, @@ -2252,61 +2329,62 @@ "example-client": { "version": "file:packages/examples/client", "requires": { - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", "normalize-url": "^7.0.3" } }, "express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", - "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.2", + "body-parser": "1.20.0", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.2", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "2.0.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "finalhandler": "1.2.0", "fresh": "0.5.2", + "http-errors": "2.0.0", "merge-descriptors": "1.0.1", "methods": "~1.1.2", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.9.7", + "qs": "6.10.3", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.17.2", - "serve-static": "1.14.2", + "send": "0.18.0", + "serve-static": "1.15.0", "setprototypeof": "1.2.0", - "statuses": "~1.5.0", + "statuses": "2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", - "statuses": "~1.5.0", + "statuses": "2.0.1", "unpipe": "~1.0.0" } }, @@ -2336,8 +2414,17 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } }, "glob": { "version": "7.2.0", @@ -2362,20 +2449,24 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, "http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "requires": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" } }, @@ -2414,9 +2505,9 @@ "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "requires": { "has": "^1.0.3" @@ -2496,9 +2587,9 @@ "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" }, "monaco-editor-workers": { - "version": "0.33.0-next.3", - "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0-next.3.tgz", - "integrity": "sha512-kXFasCWwXzm8sqJ7vnVUiNRyhc6lohXO/2eW2xk8GZ1cd+bhGojfERNmu5yOSTDuisgu5hZB2Fwn3qHfS18CGQ==", + "version": "0.33.0-next.5", + "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0-next.5.tgz", + "integrity": "sha512-DGIyCpo1nhsOGtDHE0eD58rIuiQ8guC7SeTNd0JAk4KO1kapd+PqA8kMyhDwJKmJJRGXvOctbMOF+lH0+htshQ==", "requires": { "monaco-editor": "0.33.0" } @@ -2508,10 +2599,10 @@ "requires": { "@types/glob-to-regexp": "^0.4.1", "@types/node": "^16.11.7", - "@types/vscode": "1.66.0", + "@types/vscode": "1.67.0", "glob-to-regexp": "^0.4.1", - "vscode-jsonrpc": "6.0.0", - "vscode-languageclient": "7.0.0", + "vscode-jsonrpc": "8.0.1", + "vscode-languageclient": "8.0.1", "vscode-languageserver-textdocument": "1.0.4", "vscode-uri": "3.0.3" } @@ -2522,9 +2613,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nanoid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz", - "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true }, "negotiator": { @@ -2535,7 +2626,7 @@ "node-example": { "version": "file:packages/examples/node", "requires": { - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "@types/express": "^4.17.13", "@types/node": "^16.11.7", "@types/ws": "^8.5.3", @@ -2544,7 +2635,7 @@ "request-light": "^0.5.7", "ts-node": "^10.7.0", "vscode-json-languageservice": "^4.2.1", - "vscode-languageserver": "7.0.0", + "vscode-languageserver": "8.0.1", "vscode-uri": "^3.0.3", "ws": "^8.5.0" } @@ -2554,10 +2645,15 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-7.0.3.tgz", "integrity": "sha512-RiCOdwdPnzvwcBFJE4iI1ss3dMVRIrEzFpn8ftje6iBfzBInqlnRrNhxcLwBEKjPPXQKzm1Ptlxtaiv9wdcj5w==" }, + "object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" + }, "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "requires": { "ee-first": "1.1.1" } @@ -2600,12 +2696,12 @@ "dev": true }, "postcss": { - "version": "8.4.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", - "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", + "version": "8.4.13", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz", + "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==", "dev": true, "requires": { - "nanoid": "^3.3.1", + "nanoid": "^3.3.3", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -2626,9 +2722,12 @@ "dev": true }, "qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "requires": { + "side-channel": "^1.0.4" + } }, "range-parser": { "version": "1.2.1", @@ -2636,12 +2735,12 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", - "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "requires": { "bytes": "3.1.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } @@ -2656,9 +2755,9 @@ } }, "request-light": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz", - "integrity": "sha512-i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw==" + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.8.tgz", + "integrity": "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==" }, "resolve": { "version": "1.22.0", @@ -2672,9 +2771,9 @@ } }, "rollup": { - "version": "2.70.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz", - "integrity": "sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==", + "version": "2.72.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz", + "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -2697,23 +2796,23 @@ "dev": true }, "send": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", - "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "dependencies": { "ms": { @@ -2724,14 +2823,14 @@ } }, "serve-static": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", - "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.2" + "send": "0.18.0" } }, "setprototypeof": { @@ -2760,6 +2859,16 @@ "shelljs": "^0.8.5" } }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -2773,9 +2882,9 @@ "dev": true }, "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, "supports-preserve-symlinks-flag": { "version": "1.0.0", @@ -2810,9 +2919,9 @@ } }, "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, "type-is": { @@ -2825,9 +2934,9 @@ } }, "typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", "dev": true }, "unpipe": { @@ -2841,9 +2950,9 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "v8-compile-cache-lib": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", - "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, "vary": { @@ -2852,14 +2961,14 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "vite": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.1.tgz", - "integrity": "sha512-vSlsSdOYGcYEJfkQ/NeLXgnRv5zZfpAsdztkIrs7AZHV8RCMZQkwjo4DS5BnrYTqoWqLoUe1Cah4aVO4oNNqCQ==", + "version": "2.9.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.9.tgz", + "integrity": "sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==", "dev": true, "requires": { "esbuild": "^0.14.27", "fsevents": "~2.3.2", - "postcss": "^8.4.12", + "postcss": "^8.4.13", "resolve": "^1.22.0", "rollup": "^2.59.0" } @@ -2877,18 +2986,18 @@ } }, "vscode-jsonrpc": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", - "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", + "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==" }, "vscode-languageclient": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", - "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", + "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", "requires": { "minimatch": "^3.0.4", - "semver": "^7.3.4", - "vscode-languageserver-protocol": "3.16.0" + "semver": "^7.3.5", + "vscode-languageserver-protocol": "3.17.1" }, "dependencies": { "lru-cache": { @@ -2900,9 +3009,9 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "requires": { "lru-cache": "^6.0.0" } @@ -2915,20 +3024,20 @@ } }, "vscode-languageserver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz", - "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz", + "integrity": "sha512-sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==", "requires": { - "vscode-languageserver-protocol": "3.16.0" + "vscode-languageserver-protocol": "3.17.1" } }, "vscode-languageserver-protocol": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", - "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", + "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", "requires": { - "vscode-jsonrpc": "6.0.0", - "vscode-languageserver-types": "3.16.0" + "vscode-jsonrpc": "8.0.1", + "vscode-languageserver-types": "3.17.1" } }, "vscode-languageserver-textdocument": { @@ -2937,14 +3046,14 @@ "integrity": "sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==" }, "vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", + "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" }, "vscode-nls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", - "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.1.tgz", + "integrity": "sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==" }, "vscode-uri": { "version": "3.0.3", @@ -2958,9 +3067,9 @@ "dev": true }, "ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", + "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", "requires": {} }, "yallist": { diff --git a/package.json b/package.json index 3d8e328b..69fa1d0f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "tslib": "^2.3.1" }, "resolutions": { - "vscode-languageserver-types": "3.16.0" + "vscode-languageserver-types": "3.17.1" }, "scripts": { "clean": "npm run clean --workspaces", diff --git a/packages/client/package.json b/packages/client/package.json index d5ca5998..76e3db8f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -41,13 +41,13 @@ ], "dependencies": { "glob-to-regexp": "^0.4.1", - "vscode-jsonrpc": "6.0.0", - "vscode-languageclient": "7.0.0", + "vscode-jsonrpc": "8.0.1", + "vscode-languageclient": "8.0.1", "vscode-languageserver-textdocument": "1.0.4", "vscode-uri": "3.0.3" }, "devDependencies": { - "@types/vscode": "1.66.0", + "@types/vscode": "1.67.0", "@types/node": "^16.11.7", "@types/glob-to-regexp": "^0.4.1" }, diff --git a/packages/client/src/connection.ts b/packages/client/src/connection.ts index 4255d46d..f259828c 100644 --- a/packages/client/src/connection.ts +++ b/packages/client/src/connection.ts @@ -11,6 +11,7 @@ import { NotificationHandler, NotificationHandler0, GenericNotificationHandler, Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable, ProgressType } from 'vscode-jsonrpc'; +import { MessageTransports } from 'vscode-languageclient'; import { InitializeRequest, InitializeParams, InitializeResult, @@ -29,8 +30,6 @@ import { import * as Is from 'vscode-languageserver-protocol/lib/common/utils/is'; -import { OutputChannel } from "./services"; - export interface IConnection { listen(): void; @@ -90,7 +89,7 @@ export interface ConnectionCloseHandler { (): void; } export interface IConnectionProvider { - get(errorHandler: ConnectionErrorHandler, closeHandler: ConnectionCloseHandler, outputChannel: OutputChannel | undefined): Thenable; + get(encoding: string): Promise; } export function createConnection(connection: MessageConnection, errorHandler: ConnectionErrorHandler, closeHandler: ConnectionCloseHandler): IConnection { connection.onError((data) => { errorHandler(data[0], data[1], data[2]) }); @@ -108,7 +107,7 @@ export function createConnection(connection: MessageConnection, errorHandler: Co onProgress:

(type: ProgressType

, token: string | number, handler: NotificationHandler

): Disposable => connection.onProgress(type, token, handler), sendProgress: async

(type: ProgressType

, token: string | number, value: P) => connection.sendProgress(type, token, value), - trace: (value: Trace, tracer: Tracer, sendNotification: boolean = false): void => connection.trace(value, tracer, sendNotification), + trace: (value: Trace, tracer: Tracer, sendNotification: boolean = false): Promise => connection.trace(value, tracer, sendNotification), initialize: (params: InitializeParams) => connection.sendRequest(InitializeRequest.type, params), shutdown: () => connection.sendRequest(ShutdownRequest.type, undefined), diff --git a/packages/client/src/monaco-converter.ts b/packages/client/src/monaco-converter.ts index 100ec2ee..037f2725 100644 --- a/packages/client/src/monaco-converter.ts +++ b/packages/client/src/monaco-converter.ts @@ -19,7 +19,7 @@ import { Command, CodeLens, FormattingOptions, TextEdit, WorkspaceEdit, DocumentLinkParams, DocumentLink, MarkedString, MarkupContent, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, DiagnosticRelatedInformation, MarkupKind, SymbolKind, DocumentSymbol, CodeAction, SignatureHelpContext, SignatureHelpTriggerKind, - SemanticTokens, InsertTextMode, AnnotatedTextEdit, ChangeAnnotation, CodeDescription + SemanticTokens, InsertTextMode, AnnotatedTextEdit, ChangeAnnotation, CodeDescription, InlayHint, InlayHintLabelPart } from './services'; export type RecursivePartial = { @@ -76,6 +76,16 @@ export namespace ProtocolCodeAction { } } +export interface ProtocolInlayHint extends monaco.languages.InlayHint { + data?: unknown; +} +export namespace ProtocolInlayHint { + export function is(item: any): item is ProtocolInlayHint { + return !!item && 'data' in item; + } +} + + type RangeReplace = { insert: monaco.IRange; replace: monaco.IRange } function isRangeReplace(v: Partial | RangeReplace): v is RangeReplace { @@ -127,6 +137,21 @@ export class MonacoToProtocolConverter { } } + asLocation(item: monaco.languages.Location): Location; + asLocation(item: undefined | null): undefined; + asLocation(item: monaco.languages.Location | undefined | null): Location | undefined; + asLocation(item: monaco.languages.Location | undefined | null): Location | undefined { + if (!item) { + return undefined; + } + const uri = item.uri.toString(); + const range = this.asRange(item.range); + return { + uri, + range + } + } + asTextDocumentIdentifier(model: monaco.editor.IReadOnlyModel): TextDocumentIdentifier { return { uri: model.uri.toString() @@ -493,7 +518,7 @@ export class MonacoToProtocolConverter { result.diagnostics = this.asDiagnostics(item.diagnostics); } if (item.edit) { - throw new Error (`VS Code code actions can only be converted to a protocol code action without an edit.`); + throw new Error(`VS Code code actions can only be converted to a protocol code action without an edit.`); } if (item.command) { result.command = this.asCommand(item.command); @@ -511,6 +536,34 @@ export class MonacoToProtocolConverter { } return result; } + + asInlayHintLabelPart(part: monaco.languages.InlayHintLabelPart): InlayHintLabelPart { + return { + value: part.label, + command: this.asCommand(part.command), + location: this.asLocation(part.location), + tooltip: this.asMarkupContent(part.tooltip) + } + } + + asInlayHintLabel(label: string | monaco.languages.InlayHintLabelPart[]): string | InlayHintLabelPart[] { + if (Array.isArray(label)) { + return label.map(part => this.asInlayHintLabelPart(part)) + } + return label + } + + asInlayHint(item: monaco.languages.InlayHint): InlayHint { + let result = InlayHint.create( + this.asPosition(item.position.lineNumber, item.position.column), + this.asInlayHintLabel(item.label), + item.kind + ); + if (ProtocolInlayHint.is(item)) { + if (item.data) { result.data = item.data }; + } + return result; + } } export class ProtocolToMonacoConverter { @@ -1235,4 +1288,45 @@ export class ProtocolToMonacoConverter { } } + asInlayHintLabelPart(part: InlayHintLabelPart): monaco.languages.InlayHintLabelPart { + return { + label: part.value, + command: this.asCommand(part.command), + location: this.asLocation(part.location), + tooltip: part.tooltip && this.asMarkdownString(part.tooltip) + } + } + + asInlayHintLabel(label: string | InlayHintLabelPart[]): string | monaco.languages.InlayHintLabelPart[] { + if (Array.isArray(label)) { + return label.map(part => this.asInlayHintLabelPart(part)) + } + return label + } + + asInlayHint(inlayHint: InlayHint): ProtocolInlayHint { + return { + data: inlayHint.data, + label: this.asInlayHintLabel(inlayHint.label), + position: this.asPosition(inlayHint.position), + kind: inlayHint.kind, + paddingLeft: inlayHint.paddingLeft, + paddingRight: inlayHint.paddingRight, + tooltip: inlayHint.tooltip && this.asMarkdownString(inlayHint.tooltip) + } + } + + asInlayHintList(items: InlayHint[]): monaco.languages.InlayHintList; + asInlayHintList(items: undefined | null): undefined; + asInlayHintList(items: InlayHint[] | undefined | null): monaco.languages.InlayHintList | undefined; + asInlayHintList(items: InlayHint[] | undefined | null): monaco.languages.InlayHintList | undefined { + if (!items) { + return undefined; + } + return { + hints: items.map((hint) => this.asInlayHint(hint)), + dispose: () => { } + }; + } + } diff --git a/packages/client/src/monaco-language-client.ts b/packages/client/src/monaco-language-client.ts index bb0abd95..9927b9fe 100644 --- a/packages/client/src/monaco-language-client.ts +++ b/packages/client/src/monaco-language-client.ts @@ -3,36 +3,25 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ import { - BaseLanguageClient, MessageTransports, LanguageClientOptions, - StaticFeature, DynamicFeature -} from "vscode-languageclient/lib/common/client"; -import { TypeDefinitionFeature } from "vscode-languageclient/lib/common/typeDefinition"; -import { ConfigurationFeature as PullConfigurationFeature } from "vscode-languageclient/lib/common/configuration"; -import { ImplementationFeature } from "vscode-languageclient/lib/common/implementation"; -import { ColorProviderFeature } from "vscode-languageclient/lib/common/colorProvider"; -import { WorkspaceFoldersFeature } from "vscode-languageclient/lib/common/workspaceFolders"; -import { FoldingRangeFeature } from "vscode-languageclient/lib/common/foldingRange"; -import { CallHierarchyFeature } from "vscode-languageclient/lib/common/callHierarchy"; -import { ProgressFeature } from "vscode-languageclient/lib/common/progress"; -import { SemanticTokensFeature } from "vscode-languageclient/lib/common/semanticTokens"; + BaseLanguageClient, MessageTransports, LanguageClientOptions +} from "vscode-languageclient"; import * as p2c from 'vscode-languageclient/lib/common/protocolConverter'; import * as c2p from 'vscode-languageclient/lib/common/codeConverter'; -import { IConnectionProvider, IConnection } from './connection'; -import { DeclarationFeature } from "vscode-languageclient/lib/common/declaration"; +import { IConnectionProvider } from './connection'; import { CompletionParams, WillSaveTextDocumentParams } from './services' export * from 'vscode-languageclient/lib/common/client'; +import type * as vscode from 'vscode' export class MonacoLanguageClient extends BaseLanguageClient { - static bypassConversion = (result: any) => result || undefined; + static bypassConversion = (result: any, token?: vscode.CancellationToken) => token != null ? Promise.resolve(result || undefined) : (result || undefined); protected readonly connectionProvider: IConnectionProvider; constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClient.Options) { super(id || name.toLowerCase(), name, clientOptions); this.connectionProvider = connectionProvider; - (this as any).createConnection = this.doCreateConnection.bind(this); // bypass LSP <=> VS Code conversion const self: { @@ -77,41 +66,8 @@ export class MonacoLanguageClient extends BaseLanguageClient { }); } - protected doCreateConnection(): Thenable { - const errorHandler = (this as any).handleConnectionError.bind(this); - const closeHandler = this.handleConnectionClosed.bind(this); - return this.connectionProvider.get(errorHandler, closeHandler, this.outputChannel); - } - protected createMessageTransports(encoding: string): Promise { - throw new Error('Unsupported'); - } - - protected registerBuiltinFeatures(): void { - super.registerBuiltinFeatures(); - this.registerFeature(new PullConfigurationFeature(this)); - this.registerFeature(new TypeDefinitionFeature(this)); - this.registerFeature(new ImplementationFeature(this)); - this.registerFeature(new ColorProviderFeature(this)); - this.registerFeature(new WorkspaceFoldersFeature(this)); - FoldingRangeFeature['asFoldingRanges'] = MonacoLanguageClient.bypassConversion; - this.registerFeature(new FoldingRangeFeature(this)); - this.registerFeature(new DeclarationFeature(this)); - this.registerFeature(new SemanticTokensFeature(this)); - this.registerFeature(new CallHierarchyFeature(this)); - this.registerFeature(new ProgressFeature(this)); - - const features = this['_features'] as ((StaticFeature | DynamicFeature)[]); - for (const feature of features) { - if (feature instanceof ColorProviderFeature) { - feature['asColor'] = MonacoLanguageClient.bypassConversion; - feature['asColorInformations'] = MonacoLanguageClient.bypassConversion; - feature['asColorPresentations'] = MonacoLanguageClient.bypassConversion; - } - } - } - - public registerProposedFeatures() { + return this.connectionProvider.get(encoding); } protected getLocale(): string { diff --git a/packages/client/src/monaco-languages.ts b/packages/client/src/monaco-languages.ts index 7156448a..44281503 100644 --- a/packages/client/src/monaco-languages.ts +++ b/packages/client/src/monaco-languages.ts @@ -11,7 +11,7 @@ import { OnTypeFormattingEditProvider, RenameProvider, DocumentFilter, DocumentSelector, DocumentLinkProvider, ImplementationProvider, TypeDefinitionProvider, DocumentColorProvider, FoldingRangeProvider, SemanticTokensLegend, - DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider + DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider, TextDocumentFilter, InlayHintsProvider } from "./services"; import { MonacoDiagnosticCollection } from './monaco-diagnostic-collection'; @@ -436,11 +436,41 @@ export class MonacoLanguages implements Languages { } } + registerInlayHintsProvider(selector: DocumentSelector, provider: InlayHintsProvider): Disposable { + const inlayHintsProvider = this.createInlayHintsProvider(provider); + return this._monaco.languages.registerInlayHintsProvider(selector, inlayHintsProvider); + } + + protected createInlayHintsProvider(provider: InlayHintsProvider): monaco.languages.InlayHintsProvider { + return { + onDidChangeInlayHints: provider.onDidChangeInlayHints, + provideInlayHints: async (model, range, token) => { + const textDocument = this.m2p.asTextDocumentIdentifier(model); + const result = await provider.provideInlayHints({ + textDocument, + range: this.m2p.asRange(range) + }, token); + return result && this.p2m.asInlayHintList(result) + }, + resolveInlayHint: async (hint: monaco.languages.InlayHint, token) => { + if (provider.resolveInlayHint) { + const documentLink = this.m2p.asInlayHint(hint); + const result = await provider.resolveInlayHint(documentLink, token); + if (result) { + const resolvedInlayHint = this.p2m.asInlayHint(result); + Object.assign(hint, resolvedInlayHint); + } + } + return hint; + } + } + } + protected matchModel(selector: string | DocumentFilter | DocumentSelector, model: MonacoModelIdentifier): boolean { if (Array.isArray(selector)) { return selector.some(filter => this.matchModel(filter, model)); } - if (DocumentFilter.is(selector)) { + if (TextDocumentFilter.is(selector)) { if (!!selector.language && selector.language !== model.languageId) { return false; } @@ -451,8 +481,11 @@ export class MonacoLanguages implements Languages { return false; } return true; + } else if (typeof selector === 'string') { + return selector === model.languageId; + } else { + return false } - return selector === model.languageId; } } diff --git a/packages/client/src/services.ts b/packages/client/src/services.ts index 33a337d9..f925ef1b 100644 --- a/packages/client/src/services.ts +++ b/packages/client/src/services.ts @@ -14,10 +14,10 @@ import { DocumentLink, TextDocumentSaveReason, DocumentSymbolParams, WorkspaceSymbolParams, TextDocumentContentChangeEvent, CompletionParams, ColorInformation, ColorPresentation, DocumentColorParams, ColorPresentationParams, - FoldingRange, FoldingRangeParams, DocumentFilter, DocumentSymbol, CodeAction, + FoldingRange, FoldingRangeParams, DocumentSymbol, CodeAction, Declaration, SelectionRangeParams, SelectionRange, SemanticTokensParams, SemanticTokens, SemanticTokensEdit, SemanticTokensLegend, SemanticTokensRangeParams, - SemanticTokensDeltaParams + SemanticTokensDeltaParams, InlayHint, InlayHintParams } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; @@ -27,6 +27,7 @@ import { } from 'vscode-jsonrpc'; import { URI as Uri } from 'vscode-uri'; +import { TextDocumentShowOptions } from 'vscode'; export { Disposable, CancellationToken, Event, Emitter @@ -42,6 +43,7 @@ export interface Services { workspace: Workspace; commands?: Commands; window?: Window; + env?: Env } export namespace Services { const global = window as any; @@ -64,13 +66,6 @@ export namespace Services { } } -export function isDocumentSelector(selector: any): selector is DocumentSelector { - if (!selector || !Array.isArray(selector)) { - return false; - } - return selector.every(value => typeof value === 'string' || DocumentFilter.is(value)); -} - export interface DiagnosticCollection extends Disposable { set(uri: string, diagnostics: Diagnostic[]): void; } @@ -215,6 +210,12 @@ export interface DocumentRangeSemanticTokensProvider { provideDocumentRangeSemanticTokens(params: SemanticTokensRangeParams, token: CancellationToken): ProviderResult; } +export interface InlayHintsProvider { + onDidChangeInlayHints?: Event; + provideInlayHints(params: InlayHintParams, token: CancellationToken): ProviderResult; + resolveInlayHint?(hint: T, token: CancellationToken): ProviderResult; +} + export interface Languages { match(selector: DocumentSelector, document: DocumentIdentifier): boolean; createDiagnosticCollection?(name?: string): DiagnosticCollection; @@ -241,6 +242,7 @@ export interface Languages { registerSelectionRangeProvider?(selector: DocumentSelector, provider: SelectionRangeProvider): Disposable; registerDocumentSemanticTokensProvider?(selector: DocumentSelector, provider: DocumentSemanticTokensProvider, legend: SemanticTokensLegend): Disposable; registerDocumentRangeSemanticTokensProvider?(selector: DocumentSelector, provider: DocumentRangeSemanticTokensProvider, legend: SemanticTokensLegend): Disposable; + registerInlayHintsProvider(selector: DocumentSelector, provider: InlayHintsProvider): Disposable; } export interface TextDocumentDidChangeEvent { @@ -314,5 +316,10 @@ export interface OutputChannel extends Disposable { export interface Window { showMessage(type: MessageType, message: string, ...actions: T[]): PromiseLike; createOutputChannel?(name: string): OutputChannel; - withProgress?: typeof import('vscode').window.withProgress + withProgress?: typeof import('vscode').window.withProgress; + showTextDocument?(document: Uri, options?: TextDocumentShowOptions): PromiseLike; +} + +export interface Env { + openExternal?(document: Uri): PromiseLike; } diff --git a/packages/client/src/vscode-api.ts b/packages/client/src/vscode-api.ts index 463a6316..86276ceb 100644 --- a/packages/client/src/vscode-api.ts +++ b/packages/client/src/vscode-api.ts @@ -7,13 +7,13 @@ import type * as vscode from "vscode"; import { URI } from "vscode-uri" import { Disposable } from "./disposable"; import { - Services, Event, DiagnosticCollection, WorkspaceEdit, isDocumentSelector, + Services, Event, DiagnosticCollection, WorkspaceEdit, MessageType, OutputChannel, CompletionTriggerKind, DocumentIdentifier, SignatureHelpTriggerKind, MessageActionItem } from "./services"; import * as ServicesModule from "./services"; -import { CancellationTokenSource, DiagnosticSeverity } from "vscode-languageserver-protocol"; +import { CancellationTokenSource, DiagnosticSeverity, DocumentSelector } from "vscode-languageserver-protocol"; export function createVSCodeApi(servicesProvider: Services.Provider): typeof vscode { const unsupported = () => { throw new Error('unsupported') }; @@ -69,6 +69,36 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc _itemId?: string; constructor(readonly kind: vscode.SymbolKind, readonly name: string, readonly detail: string, readonly uri: vscode.Uri, readonly range: vscode.Range, readonly selectionRange: vscode.Range) { } } + + class TypeHierarchyItem implements vscode.TypeHierarchyItem { + _sessionId?: string; + _itemId?: string; + constructor(readonly kind: vscode.SymbolKind, readonly name: string, readonly detail: string, readonly uri: URI, readonly range: vscode.Range, readonly selectionRange: vscode.Range) { } + } + + class SymbolInformation implements vscode.SymbolInformation { + location: vscode.Location; + tags?: vscode.SymbolTag[]; + readonly containerName: string + constructor(readonly name: string, readonly kind: vscode.SymbolKind, rangeOrContainer: string | undefined | vscode.Range, locationOrUri?: vscode.Location | vscode.Uri, containerName?: string) { + this.containerName = containerName! + if (typeof rangeOrContainer === 'string') { + this.containerName = rangeOrContainer; + } + } + } + + class InlayHint implements vscode.InlayHint { + constructor(readonly position: vscode.Position, readonly label: string | vscode.InlayHintLabelPart[], readonly kind?: vscode.InlayHintKind) { } + } + + class CancellationError extends Error { + constructor() { + super('Canceled'); + this.name = this.message; + } + } + class CodeAction implements vscode.CodeAction { edit?: vscode.WorkspaceEdit; diagnostics?: Diagnostic[]; @@ -151,7 +181,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc onDidChange: Event.None, onDidDelete: Event.None, dispose: () => { } - } + }; }, applyEdit: async (edit) => { const services = servicesProvider(); @@ -229,7 +259,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc reason: isUndoing ? TextDocumentChangeReason.Undo : isRedoing ? TextDocumentChangeReason.Redo : undefined }); }, undefined, disposables); - } + }; }, get onWillSaveTextDocument(): typeof vscode.workspace.onWillSaveTextDocument { const services = servicesProvider(); @@ -250,7 +280,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc } }); }, undefined, disposables); - } + }; }, get onDidSaveTextDocument(): typeof vscode.workspace.onDidSaveTextDocument { const services = servicesProvider(); @@ -278,11 +308,11 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }, get onDidRenameFiles(): vscode.Event { - return Event.None + return Event.None; }, get onDidGrantWorkspaceTrust(): vscode.Event { - return Event.None + return Event.None; }, getWorkspaceFolder: unsupported, @@ -301,7 +331,9 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc onDidCloseNotebookDocument: unsupported, isTrusted: true, rootPath: undefined, - name: undefined + name: undefined, + onDidChangeNotebookDocument: unsupported, + onDidSaveNotebookDocument: unsupported }; function isVsCodeUri(v: vscode.Uri | ReadonlyArray<[vscode.Uri, ReadonlyArray | undefined]>): v is vscode.Uri { @@ -399,14 +431,15 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc const languages: typeof vscode.languages = { match(selector, document): number { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } if (!DocumentIdentifier.is(document)) { throw new Error('unexpected document: ' + JSON.stringify(document)); } const services = servicesProvider(); - const result = services.languages.match(selector, document); + const result = services.languages.match(documentSelector, document); return result ? 1 : 0; }, registerCallHierarchyProvider( @@ -423,7 +456,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return new ApiDiagnosticCollection(name); }, registerCompletionItemProvider(selector, provider, ...triggerCharacters) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -431,7 +465,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); } const resolveCompletionItem = provider.resolveCompletionItem; - return languages.registerCompletionItemProvider(selector, { + return languages.registerCompletionItemProvider(documentSelector, { provideCompletionItems({ textDocument, position, context }, token) { return provider.provideCompletionItems(textDocument, position, token, { triggerKind: context?.triggerKind ?? CompletionTriggerKind.Invoked, @@ -444,14 +478,15 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }, ...triggerCharacters); }, registerCodeActionsProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerCodeActionsProvider) { return Disposable.create(() => { }); } - return languages.registerCodeActionsProvider(selector, { + return languages.registerCodeActionsProvider(documentSelector, { provideCodeActions({ textDocument, range, context }, token) { return provider.provideCodeActions(textDocument, range, context, token) as any; }, @@ -461,7 +496,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerCodeLensProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -469,7 +505,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); } const resolveCodeLens = provider.resolveCodeLens; - return languages.registerCodeLensProvider(selector, { + return languages.registerCodeLensProvider(documentSelector, { provideCodeLenses({ textDocument }, token) { return provider.provideCodeLenses(textDocument, token) as any; }, @@ -479,68 +515,73 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerDefinitionProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDefinitionProvider) { return Disposable.create(() => { }); } - return languages.registerDefinitionProvider(selector, { + return languages.registerDefinitionProvider(documentSelector, { provideDefinition({ textDocument, position }, token) { return provider.provideDefinition(textDocument, position, token) as any; } }); }, registerImplementationProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerImplementationProvider) { return Disposable.create(() => { }); } - return languages.registerImplementationProvider(selector, { + return languages.registerImplementationProvider(documentSelector, { provideImplementation({ textDocument, position }, token) { return provider.provideImplementation(textDocument, position, token) as any; } }); }, registerTypeDefinitionProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerTypeDefinitionProvider) { return Disposable.create(() => { }); } - return languages.registerTypeDefinitionProvider(selector, { + return languages.registerTypeDefinitionProvider(documentSelector, { provideTypeDefinition({ textDocument, position }, token) { return provider.provideTypeDefinition(textDocument, position, token) as any; } }); }, registerDeclarationProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDeclarationProvider) { return Disposable.create(() => { }); } - return languages.registerDeclarationProvider(selector, { + return languages.registerDeclarationProvider(documentSelector, { provideDeclaration({ textDocument, position }, token) { return provider.provideDeclaration(textDocument, position, token) as any; } }) }, registerHoverProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (languages.registerHoverProvider) { - return languages.registerHoverProvider(selector, { + return languages.registerHoverProvider(documentSelector, { provideHover({ textDocument, position }, token) { return provider.provideHover(textDocument, position, token) as any; } @@ -549,28 +590,30 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); }, registerDocumentHighlightProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDocumentHighlightProvider) { return Disposable.create(() => { }); } - return languages.registerDocumentHighlightProvider(selector, { + return languages.registerDocumentHighlightProvider(documentSelector, { provideDocumentHighlights({ textDocument, position }, token) { return provider.provideDocumentHighlights(textDocument, position, token) as any; } }); }, registerDocumentSymbolProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDocumentSymbolProvider) { return Disposable.create(() => { }); } - return languages.registerDocumentSymbolProvider(selector, { + return languages.registerDocumentSymbolProvider(documentSelector, { provideDocumentSymbols({ textDocument }, token) { return provider.provideDocumentSymbols(textDocument, token) as any; } @@ -588,77 +631,83 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerReferenceProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerReferenceProvider) { return Disposable.create(() => { }); } - return languages.registerReferenceProvider(selector, { + return languages.registerReferenceProvider(documentSelector, { provideReferences({ textDocument, position, context }, token) { return provider.provideReferences(textDocument, position, context, token) as any } }); }, registerRenameProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerRenameProvider) { return Disposable.create(() => { }); } - return languages.registerRenameProvider(selector, { + return languages.registerRenameProvider(documentSelector, { provideRenameEdits({ textDocument, position, newName }, token) { return provider.provideRenameEdits(textDocument, position, newName, token) as any } }); }, registerDocumentFormattingEditProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDocumentFormattingEditProvider) { return Disposable.create(() => { }); } - return languages.registerDocumentFormattingEditProvider(selector, { + return languages.registerDocumentFormattingEditProvider(documentSelector, { provideDocumentFormattingEdits({ textDocument, options }, token) { return provider.provideDocumentFormattingEdits(textDocument, options, token) as any } }); }, registerDocumentRangeFormattingEditProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerDocumentRangeFormattingEditProvider) { return Disposable.create(() => { }); } - return languages.registerDocumentRangeFormattingEditProvider(selector, { + return languages.registerDocumentRangeFormattingEditProvider(documentSelector, { provideDocumentRangeFormattingEdits({ textDocument, range, options }, token) { return provider.provideDocumentRangeFormattingEdits(textDocument, range, options, token) as any } }); }, registerOnTypeFormattingEditProvider(selector, provider, firstTriggerCharacter, ...moreTriggerCharacter) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerOnTypeFormattingEditProvider) { return Disposable.create(() => { }); } - return languages.registerOnTypeFormattingEditProvider(selector, { + return languages.registerOnTypeFormattingEditProvider(documentSelector, { provideOnTypeFormattingEdits({ textDocument, position, ch, options }, token) { return provider.provideOnTypeFormattingEdits(textDocument, position, ch, options, token) as any } }, firstTriggerCharacter, ...moreTriggerCharacter); }, registerSignatureHelpProvider(selector: vscode.DocumentSelector, provider: vscode.SignatureHelpProvider, firstItem?: string | vscode.SignatureHelpProviderMetadata, ...remaining: string[]) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -673,7 +722,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc triggerCharacters = firstItem.triggerCharacters; retriggerCharacters = firstItem.retriggerCharacters; } - return languages.registerSignatureHelpProvider(selector, { + return languages.registerSignatureHelpProvider(documentSelector, { triggerCharacters, retriggerCharacters, provideSignatureHelp({ textDocument, position }, token, context) { @@ -682,7 +731,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerDocumentLinkProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -690,7 +740,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); } const resolveDocumentLink = provider.resolveDocumentLink; - return languages.registerDocumentLinkProvider(selector, { + return languages.registerDocumentLinkProvider(documentSelector, { provideDocumentLinks({ textDocument }, token) { return provider.provideDocumentLinks(textDocument, token) as any }, @@ -700,14 +750,15 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerColorProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerColorProvider) { return Disposable.create(() => { }); } - return languages.registerColorProvider(selector, { + return languages.registerColorProvider(documentSelector, { provideDocumentColors({ textDocument }, token) { return provider.provideDocumentColors(textDocument, token) as any }, @@ -720,28 +771,30 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }); }, registerFoldingRangeProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerFoldingRangeProvider) { return Disposable.create(() => { }); } - return languages.registerFoldingRangeProvider(selector, { + return languages.registerFoldingRangeProvider(documentSelector, { provideFoldingRanges({ textDocument }, token) { return provider.provideFoldingRanges(textDocument, {}, token) as any; } }); }, registerSelectionRangeProvider(selector, provider) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); if (!languages.registerSelectionRangeProvider) { return Disposable.create(() => { }); } - return languages.registerSelectionRangeProvider(selector, { + return languages.registerSelectionRangeProvider(documentSelector, { provideSelectionRanges({ textDocument, positions }, token) { return provider.provideSelectionRanges(textDocument, positions, token) as any; } @@ -749,7 +802,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }, registerEvaluatableExpressionProvider: unsupported, registerDocumentSemanticTokensProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSemanticTokensProvider, legend: vscode.SemanticTokensLegend) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -757,7 +811,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); } - return languages.registerDocumentSemanticTokensProvider(selector, { + return languages.registerDocumentSemanticTokensProvider(documentSelector, { onDidChange: provider.onDidChangeSemanticTokens, provideDocumentSemanticTokens({ textDocument }, token) { return provider.provideDocumentSemanticTokens(textDocument, token) as any; @@ -768,7 +822,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc }, legend) }, registerDocumentRangeSemanticTokensProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentRangeSemanticTokensProvider, legend: vscode.SemanticTokensLegend) { - if (!isDocumentSelector(selector)) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { throw new Error('unexpected selector: ' + JSON.stringify(selector)); } const { languages } = servicesProvider(); @@ -776,12 +831,35 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc return Disposable.create(() => { }); } - return languages.registerDocumentRangeSemanticTokensProvider(selector, { + return languages.registerDocumentRangeSemanticTokensProvider(documentSelector, { provideDocumentRangeSemanticTokens({ textDocument, range }, token) { return provider.provideDocumentRangeSemanticTokens(textDocument, range, token) as any; } }, legend) }, + registerInlayHintsProvider(selector: vscode.DocumentSelector, provider: vscode.InlayHintsProvider) { + const documentSelector = Array.isArray(selector) ? selector : [selector] + if (!DocumentSelector.is(documentSelector)) { + throw new Error('unexpected selector: ' + JSON.stringify(selector)); + } + const { languages } = servicesProvider(); + if (!languages.registerInlayHintsProvider) { + return Disposable.create(() => { }); + } + + const resolveInlayHint = provider.resolveInlayHint; + return languages.registerInlayHintsProvider(documentSelector, { + onDidChangeInlayHints: provider.onDidChangeInlayHints, + provideInlayHints({ textDocument, range }, token) { + return provider.provideInlayHints(textDocument, range, token) as any + }, + resolveInlayHint: resolveInlayHint ? (link, token) => { + return resolveInlayHint(link, token) as any + } : undefined + }) + }, + // FIXME: Should be implemented with monaco 0.34 + registerInlineValuesProvider: unsupported, getLanguages: unsupported, setTextDocumentLanguage: unsupported, getDiagnostics: unsupported, @@ -789,8 +867,6 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc onDidChangeDiagnostics: unsupported, registerLinkedEditingRangeProvider: unsupported, createLanguageStatusItem: unsupported, - registerInlineValuesProvider: unsupported, - registerInlayHintsProvider: unsupported, registerTypeHierarchyProvider: unsupported }; function showMessage(type: MessageType, arg0: any, ...arg1: any[]): Thenable { @@ -825,7 +901,7 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc if (arg !== undefined && typeof arg !== 'boolean') { throw new Error('unexpected preserveFocus argument: ' + JSON.stringify(arg, undefined, 4)); } - return channel ? channel.show(arg) : () => { } + return channel ? channel.show(arg) : () => { }; }, hide: unsupported, replace: unsupported, @@ -839,7 +915,24 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc } return task({ report: () => { } }, new CancellationTokenSource().token); }, - showTextDocument: unsupported, + showTextDocument: async (textDocumentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions | undefined, preserveFocus?: boolean) => { + const { window } = servicesProvider(); + let options: vscode.TextDocumentShowOptions | undefined; + if (typeof columnOrOptions === 'number') { + options = { + viewColumn: columnOrOptions, + preserveFocus + }; + } else { + options = columnOrOptions + } + + if (window && window.showTextDocument) { + await window.showTextDocument((textDocumentOrUri as vscode.TextDocument).uri ?? textDocumentOrUri, options) + } + // The language client doesn't use the return value of this method + return undefined as unknown as vscode.TextEditor + }, createTextEditorDecorationType: unsupported, showQuickPick: unsupported, showWorkspaceFolderPick: unsupported, @@ -891,7 +984,10 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc onDidChangeActiveColorTheme: unsupported, registerFileDecorationProvider: unsupported, registerTerminalProfileProvider: unsupported, - onDidChangeTerminalState: unsupported + onDidChangeTerminalState: unsupported, + get tabGroups() { + return unsupported(); + } }; const commands: typeof vscode.commands = { registerCommand(command, callback, thisArg): Disposable { @@ -947,7 +1043,14 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc shell: '', uiKind: 2, // vscode.UIKind.Web, asExternalUri: unsupported, - openExternal: unsupported, + openExternal: async (uri: vscode.Uri) => { + const { env } = servicesProvider(); + + if (env && env.openExternal) { + return env.openExternal(uri) + } + return false + }, get appHost() { return unsupported(); }, @@ -970,14 +1073,18 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc CodeAction, Diagnostic, CallHierarchyItem, + TypeHierarchyItem, SemanticTokens, Disposable: CodeDisposable, - SignatureHelpTriggerKind: SignatureHelpTriggerKind, + SignatureHelpTriggerKind, DiagnosticSeverity: ServicesModule.DiagnosticSeverity, EventEmitter: ServicesModule.Emitter, CancellationTokenSource, ProgressLocation: ServicesModule.ProgressLocation, - TextDocumentChangeReason + TextDocumentChangeReason, + SymbolInformation, + InlayHint, + CancellationError }; return partialApi as any; diff --git a/packages/examples/browser/package.json b/packages/examples/browser/package.json index 90191501..31bd23c4 100644 --- a/packages/examples/browser/package.json +++ b/packages/examples/browser/package.json @@ -4,7 +4,7 @@ "version": "0.19.0-next.1", "dependencies": { "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", "vscode-json-languageservice": "^4.2.1" }, diff --git a/packages/examples/client/package.json b/packages/examples/client/package.json index 186d134c..e1bfcb8d 100644 --- a/packages/examples/client/package.json +++ b/packages/examples/client/package.json @@ -4,9 +4,9 @@ "version": "0.19.0-next.1", "dependencies": { "monaco-editor": "0.33.0", - "monaco-editor-workers": "0.33.0-next.3", + "monaco-editor-workers": "0.33.0-next.5", "monaco-languageclient": "../../client", - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "normalize-url": "^7.0.3" }, "scripts": { diff --git a/packages/examples/client/src/client.ts b/packages/examples/client/src/client.ts index 32e8e9fb..9e3636e7 100644 --- a/packages/examples/client/src/client.ts +++ b/packages/examples/client/src/client.ts @@ -23,8 +23,8 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; import { buildWorkerDefinition } from "monaco-editor-workers"; buildWorkerDefinition('../../../../node_modules/monaco-editor-workers/dist/workers', import.meta.url, false); -import { MonacoLanguageClient, MessageConnection, CloseAction, ErrorAction, MonacoServices, createConnection } from 'monaco-languageclient'; -import { listen } from '@codingame/monaco-jsonrpc'; +import { MonacoLanguageClient, CloseAction, ErrorAction, MonacoServices, MessageTransports } from 'monaco-languageclient'; +import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from '@codingame/monaco-jsonrpc'; import normalizeUrl from 'normalize-url'; // register Monaco languages @@ -55,20 +55,19 @@ MonacoServices.install(monaco); const url = createUrl('localhost', 3000, '/sampleServer') const webSocket = new WebSocket(url); -// listen when the web socket is opened -listen({ - webSocket, - onConnection: connection => { - // create and start the language client - const languageClient = createLanguageClient(connection); - const disposable = languageClient.start(); - connection.onClose(() => disposable.dispose()); - - console.log(`Connected to "${url}" and started the language client.`); - } -}); +webSocket.onopen = () => { + const socket = toSocket(webSocket); + const reader = new WebSocketMessageReader(socket); + const writer = new WebSocketMessageWriter(socket); + const languageClient = createLanguageClient({ + reader, + writer + }); + languageClient.start(); + reader.onClose(() => languageClient.stop()); +}; -function createLanguageClient(connection: MessageConnection): MonacoLanguageClient { +function createLanguageClient(transports: MessageTransports): MonacoLanguageClient { return new MonacoLanguageClient({ name: "Sample Language Client", clientOptions: { @@ -76,14 +75,14 @@ function createLanguageClient(connection: MessageConnection): MonacoLanguageClie documentSelector: ['json'], // disable the default error handler errorHandler: { - error: () => ErrorAction.Continue, - closed: () => CloseAction.DoNotRestart + error: () => ({ action: ErrorAction.Continue }), + closed: () => ({ action: CloseAction.DoNotRestart }) } }, // create a language client connection from the JSON RPC connection on demand connectionProvider: { - get: (errorHandler, closeHandler) => { - return Promise.resolve(createConnection(connection, errorHandler, closeHandler)) + get: () => { + return Promise.resolve(transports) } } }); diff --git a/packages/examples/node/package.json b/packages/examples/node/package.json index d56b2971..5d34c50b 100644 --- a/packages/examples/node/package.json +++ b/packages/examples/node/package.json @@ -4,11 +4,11 @@ "version": "0.19.0-next.1", "dependencies": { "@types/ws": "^8.5.3", - "@codingame/monaco-jsonrpc": "^0.3.1", + "@codingame/monaco-jsonrpc": "^0.4.0", "express": "^4.17.3", "request-light": "^0.5.7", "vscode-json-languageservice": "^4.2.1", - "vscode-languageserver": "7.0.0", + "vscode-languageserver": "8.0.1", "normalize-url": "^7.0.3", "vscode-uri": "^3.0.3", "ws": "^8.5.0" diff --git a/packages/examples/node/src/json-server-launcher.ts b/packages/examples/node/src/json-server-launcher.ts index 1b75f3c8..6e5dbe3f 100644 --- a/packages/examples/node/src/json-server-launcher.ts +++ b/packages/examples/node/src/json-server-launcher.ts @@ -7,18 +7,19 @@ import * as rpc from "@codingame/monaco-jsonrpc"; import * as server from "@codingame/monaco-jsonrpc/lib/server"; import * as lsp from "vscode-languageserver"; import { start } from "./json-server"; +import { Message } from 'vscode-languageserver'; export function launch(socket: rpc.IWebSocket) { const reader = new rpc.WebSocketMessageReader(socket); const writer = new rpc.WebSocketMessageWriter(socket); const asExternalProccess = process.argv.findIndex(value => value === '--external') !== -1; - if (asExternalProccess)  { + if (asExternalProccess) { // start the language server as an external process const extJsonServerPath = path.resolve(__dirname, 'ext-json-server.js'); const socketConnection = server.createConnection(reader, writer, () => socket.dispose()); const serverConnection = server.createServerProcess('JSON', 'node', [extJsonServerPath]); server.forward(socketConnection, serverConnection, message => { - if (rpc.isRequestMessage(message)) { + if (Message.isRequest(message)) { if (message.method === lsp.InitializeRequest.type.method) { const initializeParams = message.params as lsp.InitializeParams; initializeParams.processId = process.pid;