@mrclrchtr/supi-lsp 1.11.1 → 1.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/node_modules/@mrclrchtr/supi-code-runtime/node_modules/@mrclrchtr/supi-core/package.json +1 -1
  2. package/node_modules/@mrclrchtr/supi-code-runtime/package.json +2 -2
  3. package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
  4. package/node_modules/vscode-jsonrpc/README.md +2 -17
  5. package/node_modules/vscode-jsonrpc/eslint.config.js +12 -0
  6. package/node_modules/vscode-jsonrpc/lib/browser/main.js +10 -3
  7. package/node_modules/vscode-jsonrpc/lib/browser/ril.d.ts +11 -1
  8. package/node_modules/vscode-jsonrpc/lib/browser/ril.js +58 -4
  9. package/node_modules/vscode-jsonrpc/lib/common/api.d.ts +3 -3
  10. package/node_modules/vscode-jsonrpc/lib/common/api.js +10 -4
  11. package/node_modules/vscode-jsonrpc/lib/common/cancellation.js +41 -5
  12. package/node_modules/vscode-jsonrpc/lib/common/connection.d.ts +76 -67
  13. package/node_modules/vscode-jsonrpc/lib/common/connection.js +217 -160
  14. package/node_modules/vscode-jsonrpc/lib/common/events.js +10 -3
  15. package/node_modules/vscode-jsonrpc/lib/common/is.js +7 -8
  16. package/node_modules/vscode-jsonrpc/lib/common/linkedMap.d.ts +3 -1
  17. package/node_modules/vscode-jsonrpc/lib/common/linkedMap.js +17 -3
  18. package/node_modules/vscode-jsonrpc/lib/common/messageBuffer.js +5 -2
  19. package/node_modules/vscode-jsonrpc/lib/common/messageReader.js +52 -3
  20. package/node_modules/vscode-jsonrpc/lib/common/messageWriter.js +45 -3
  21. package/node_modules/vscode-jsonrpc/lib/common/messages.js +147 -17
  22. package/node_modules/vscode-jsonrpc/lib/common/semaphore.js +8 -2
  23. package/node_modules/vscode-jsonrpc/lib/common/sharedArrayCancellation.js +4 -3
  24. package/node_modules/vscode-jsonrpc/lib/node/main.d.ts +0 -5
  25. package/node_modules/vscode-jsonrpc/lib/node/main.js +56 -24
  26. package/node_modules/vscode-jsonrpc/lib/node/ril.d.ts +0 -1
  27. package/node_modules/vscode-jsonrpc/lib/node/ril.js +3 -1
  28. package/node_modules/vscode-jsonrpc/package.json +20 -11
  29. package/node_modules/vscode-jsonrpc/tsconfig.tsbuildinfo +1 -0
  30. package/package.json +4 -4
  31. package/node_modules/vscode-jsonrpc/browser.d.ts +0 -6
  32. package/node_modules/vscode-jsonrpc/browser.js +0 -7
  33. package/node_modules/vscode-jsonrpc/node.cmd +0 -5
  34. package/node_modules/vscode-jsonrpc/node.d.ts +0 -6
  35. package/node_modules/vscode-jsonrpc/node.js +0 -7
@@ -3,10 +3,16 @@
3
3
  * Copyright (c) Microsoft Corporation. All rights reserved.
4
4
  * Licensed under the MIT License. See License.txt in the project root for license information.
5
5
  * ------------------------------------------------------------------------------------------ */
6
+ var __importDefault = (this && this.__importDefault) || function (mod) {
7
+ return (mod && mod.__esModule) ? mod : { "default": mod };
8
+ };
6
9
  Object.defineProperty(exports, "__esModule", { value: true });
7
10
  exports.Semaphore = void 0;
8
- const ral_1 = require("./ral");
11
+ const ral_1 = __importDefault(require("./ral"));
9
12
  class Semaphore {
13
+ _capacity;
14
+ _active;
15
+ _waiting;
10
16
  constructor(capacity = 1) {
11
17
  if (capacity <= 0) {
12
18
  throw new Error('Capacity must be greater than 0');
@@ -37,7 +43,7 @@ class Semaphore {
37
43
  const next = this._waiting.shift();
38
44
  this._active++;
39
45
  if (this._active > this._capacity) {
40
- throw new Error(`To many thunks active`);
46
+ throw new Error(`Too many thunks active`);
41
47
  }
42
48
  try {
43
49
  const result = next.thunk();
@@ -12,6 +12,7 @@ var CancellationState;
12
12
  CancellationState.Cancelled = 1;
13
13
  })(CancellationState || (CancellationState = {}));
14
14
  class SharedArraySenderStrategy {
15
+ buffers;
15
16
  constructor() {
16
17
  this.buffers = new Map();
17
18
  }
@@ -42,6 +43,7 @@ class SharedArraySenderStrategy {
42
43
  }
43
44
  exports.SharedArraySenderStrategy = SharedArraySenderStrategy;
44
45
  class SharedArrayBufferCancellationToken {
46
+ data;
45
47
  constructor(buffer) {
46
48
  this.data = new Int32Array(buffer, 0, 1);
47
49
  }
@@ -53,6 +55,7 @@ class SharedArrayBufferCancellationToken {
53
55
  }
54
56
  }
55
57
  class SharedArrayBufferCancellationTokenSource {
58
+ token;
56
59
  constructor(buffer) {
57
60
  this.token = new SharedArrayBufferCancellationToken(buffer);
58
61
  }
@@ -62,9 +65,7 @@ class SharedArrayBufferCancellationTokenSource {
62
65
  }
63
66
  }
64
67
  class SharedArrayReceiverStrategy {
65
- constructor() {
66
- this.kind = 'request';
67
- }
68
+ kind = 'request';
68
69
  createCancellationTokenSource(request) {
69
70
  const buffer = request.$cancellationData;
70
71
  if (buffer === undefined) {
@@ -1,8 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
- /// <reference types="node" />
4
- /// <reference types="node" />
5
- /// <reference types="node" />
6
1
  import { ChildProcess } from 'child_process';
7
2
  import { Socket } from 'net';
8
3
  import { MessagePort, Worker } from 'worker_threads';
@@ -10,29 +10,62 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
10
10
  if (k2 === undefined) k2 = k;
11
11
  o[k2] = m[k];
12
12
  }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
13
35
  var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
36
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
37
  };
38
+ var __importDefault = (this && this.__importDefault) || function (mod) {
39
+ return (mod && mod.__esModule) ? mod : { "default": mod };
40
+ };
16
41
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.createMessageConnection = exports.createServerSocketTransport = exports.createClientSocketTransport = exports.createServerPipeTransport = exports.createClientPipeTransport = exports.generateRandomPipeName = exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
42
+ exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
43
+ exports.generateRandomPipeName = generateRandomPipeName;
44
+ exports.createClientPipeTransport = createClientPipeTransport;
45
+ exports.createServerPipeTransport = createServerPipeTransport;
46
+ exports.createClientSocketTransport = createClientSocketTransport;
47
+ exports.createServerSocketTransport = createServerSocketTransport;
48
+ exports.createMessageConnection = createMessageConnection;
18
49
  /* --------------------------------------------------------------------------------------------
19
50
  * Copyright (c) Microsoft Corporation. All rights reserved.
20
51
  * Licensed under the MIT License. See License.txt in the project root for license information.
21
52
  * ----------------------------------------------------------------------------------------- */
22
- const ril_1 = require("./ril");
53
+ const ril_1 = __importDefault(require("./ril"));
23
54
  // Install the node runtime abstract.
24
55
  ril_1.default.install();
25
- const path = require("path");
26
- const os = require("os");
56
+ const path = __importStar(require("path"));
57
+ const os = __importStar(require("os"));
58
+ const fs = __importStar(require("fs"));
27
59
  const crypto_1 = require("crypto");
28
60
  const net_1 = require("net");
29
61
  const api_1 = require("../common/api");
30
62
  __exportStar(require("../common/api"), exports);
31
63
  class IPCMessageReader extends api_1.AbstractMessageReader {
64
+ process;
32
65
  constructor(process) {
33
66
  super();
34
67
  this.process = process;
35
- let eventEmitter = this.process;
68
+ const eventEmitter = this.process;
36
69
  eventEmitter.on('error', (error) => this.fireError(error));
37
70
  eventEmitter.on('close', () => this.fireClose());
38
71
  }
@@ -43,6 +76,8 @@ class IPCMessageReader extends api_1.AbstractMessageReader {
43
76
  }
44
77
  exports.IPCMessageReader = IPCMessageReader;
45
78
  class IPCMessageWriter extends api_1.AbstractMessageWriter {
79
+ process;
80
+ errorCount;
46
81
  constructor(process) {
47
82
  super();
48
83
  this.process = process;
@@ -80,6 +115,7 @@ class IPCMessageWriter extends api_1.AbstractMessageWriter {
80
115
  }
81
116
  exports.IPCMessageWriter = IPCMessageWriter;
82
117
  class PortMessageReader extends api_1.AbstractMessageReader {
118
+ onData;
83
119
  constructor(port) {
84
120
  super();
85
121
  this.onData = new api_1.Emitter;
@@ -95,6 +131,8 @@ class PortMessageReader extends api_1.AbstractMessageReader {
95
131
  }
96
132
  exports.PortMessageReader = PortMessageReader;
97
133
  class PortMessageWriter extends api_1.AbstractMessageWriter {
134
+ port;
135
+ errorCount;
98
136
  constructor(port) {
99
137
  super();
100
138
  this.port = port;
@@ -127,6 +165,7 @@ class SocketMessageReader extends api_1.ReadableStreamMessageReader {
127
165
  }
128
166
  exports.SocketMessageReader = SocketMessageReader;
129
167
  class SocketMessageWriter extends api_1.WriteableStreamMessageWriter {
168
+ socket;
130
169
  constructor(socket, options) {
131
170
  super((0, ril_1.default)().stream.asWritableStream(socket), options);
132
171
  this.socket = socket;
@@ -155,31 +194,29 @@ const safeIpcPathLengths = new Map([
155
194
  ['darwin', 103]
156
195
  ]);
157
196
  function generateRandomPipeName() {
158
- const randomSuffix = (0, crypto_1.randomBytes)(21).toString('hex');
159
197
  if (process.platform === 'win32') {
160
- return `\\\\.\\pipe\\vscode-jsonrpc-${randomSuffix}-sock`;
161
- }
162
- let result;
163
- if (XDG_RUNTIME_DIR) {
164
- result = path.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
165
- }
166
- else {
167
- result = path.join(os.tmpdir(), `vscode-${randomSuffix}.sock`);
198
+ return `\\\\.\\pipe\\lsp-${(0, crypto_1.randomBytes)(16).toString('hex')}-sock`;
168
199
  }
200
+ let randomLength = 32;
201
+ const fixedLength = '/lsp-.sock'.length;
202
+ const tmpDir = fs.realpathSync(XDG_RUNTIME_DIR ?? os.tmpdir());
169
203
  const limit = safeIpcPathLengths.get(process.platform);
170
- if (limit !== undefined && result.length > limit) {
171
- (0, ril_1.default)().console.warn(`WARNING: IPC handle "${result}" is longer than ${limit} characters.`);
204
+ if (limit !== undefined) {
205
+ randomLength = Math.min(limit - tmpDir.length - fixedLength, randomLength);
206
+ }
207
+ if (randomLength < 16) {
208
+ throw new Error(`Unable to generate a random pipe name with ${randomLength} characters.`);
172
209
  }
173
- return result;
210
+ const randomSuffix = (0, crypto_1.randomBytes)(Math.floor(randomLength / 2)).toString('hex');
211
+ return path.join(tmpDir, `lsp-${randomSuffix}.sock`);
174
212
  }
175
- exports.generateRandomPipeName = generateRandomPipeName;
176
213
  function createClientPipeTransport(pipeName, encoding = 'utf-8') {
177
214
  let connectResolve;
178
215
  const connected = new Promise((resolve, _reject) => {
179
216
  connectResolve = resolve;
180
217
  });
181
218
  return new Promise((resolve, reject) => {
182
- let server = (0, net_1.createServer)((socket) => {
219
+ const server = (0, net_1.createServer)((socket) => {
183
220
  server.close();
184
221
  connectResolve([
185
222
  new SocketMessageReader(socket, encoding),
@@ -195,7 +232,6 @@ function createClientPipeTransport(pipeName, encoding = 'utf-8') {
195
232
  });
196
233
  });
197
234
  }
198
- exports.createClientPipeTransport = createClientPipeTransport;
199
235
  function createServerPipeTransport(pipeName, encoding = 'utf-8') {
200
236
  const socket = (0, net_1.createConnection)(pipeName);
201
237
  return [
@@ -203,7 +239,6 @@ function createServerPipeTransport(pipeName, encoding = 'utf-8') {
203
239
  new SocketMessageWriter(socket, encoding)
204
240
  ];
205
241
  }
206
- exports.createServerPipeTransport = createServerPipeTransport;
207
242
  function createClientSocketTransport(port, encoding = 'utf-8') {
208
243
  let connectResolve;
209
244
  const connected = new Promise((resolve, _reject) => {
@@ -226,7 +261,6 @@ function createClientSocketTransport(port, encoding = 'utf-8') {
226
261
  });
227
262
  });
228
263
  }
229
- exports.createClientSocketTransport = createClientSocketTransport;
230
264
  function createServerSocketTransport(port, encoding = 'utf-8') {
231
265
  const socket = (0, net_1.createConnection)(port, '127.0.0.1');
232
266
  return [
@@ -234,7 +268,6 @@ function createServerSocketTransport(port, encoding = 'utf-8') {
234
268
  new SocketMessageWriter(socket, encoding)
235
269
  ];
236
270
  }
237
- exports.createServerSocketTransport = createServerSocketTransport;
238
271
  function isReadableStream(value) {
239
272
  const candidate = value;
240
273
  return candidate.read !== undefined && candidate.addListener !== undefined;
@@ -254,4 +287,3 @@ function createMessageConnection(input, output, logger, options) {
254
287
  }
255
288
  return (0, api_1.createMessageConnection)(reader, writer, logger, options);
256
289
  }
257
- exports.createMessageConnection = createMessageConnection;
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { RAL } from '../common/api';
3
2
  interface RIL extends RAL {
4
3
  readonly stream: {
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
7
7
  const util_1 = require("util");
8
8
  const api_1 = require("../common/api");
9
9
  class MessageBuffer extends api_1.AbstractMessageBuffer {
10
+ static emptyBuffer = Buffer.allocUnsafe(0);
10
11
  constructor(encoding = 'utf-8') {
11
12
  super(encoding);
12
13
  }
@@ -36,8 +37,8 @@ class MessageBuffer extends api_1.AbstractMessageBuffer {
36
37
  return Buffer.allocUnsafe(length);
37
38
  }
38
39
  }
39
- MessageBuffer.emptyBuffer = Buffer.allocUnsafe(0);
40
40
  class ReadableStreamWrapper {
41
+ stream;
41
42
  constructor(stream) {
42
43
  this.stream = stream;
43
44
  }
@@ -59,6 +60,7 @@ class ReadableStreamWrapper {
59
60
  }
60
61
  }
61
62
  class WritableStreamWrapper {
63
+ stream;
62
64
  constructor(stream) {
63
65
  this.stream = stream;
64
66
  }
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "vscode-jsonrpc",
3
3
  "description": "A json rpc implementation over streams",
4
- "version": "8.2.1",
4
+ "version": "9.0.0",
5
5
  "author": "Microsoft Corporation",
6
6
  "license": "MIT",
7
7
  "repository": {
@@ -15,23 +15,32 @@
15
15
  "engines": {
16
16
  "node": ">=14.0.0"
17
17
  },
18
- "main": "./lib/node/main.js",
19
- "browser": {
20
- "./lib/node/main.js": "./lib/browser/main.js"
18
+ "exports": {
19
+ ".": {
20
+ "types": "./lib/common/api.d.ts",
21
+ "default": "./lib/common/api.js"
22
+ },
23
+ "./node": {
24
+ "types": "./lib/node/main.d.ts",
25
+ "node": "./lib/node/main.js"
26
+ },
27
+ "./browser": {
28
+ "types": "./lib/browser/main.d.ts",
29
+ "browser": "./lib/browser/main.js"
30
+ }
21
31
  },
22
- "typings": "./lib/common/api.d.ts",
23
32
  "devDependencies": {
24
- "@types/msgpack-lite": "^0.1.7",
33
+ "@types/msgpack-lite": "^0.1.12",
25
34
  "msgpack-lite": "^0.1.26"
26
35
  },
27
36
  "scripts": {
28
37
  "prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/npm/fail",
29
38
  "prepack": "npm run all:publish",
30
39
  "preversion": "npm test",
31
- "compile": "node ../build/bin/tsc -b ./tsconfig.json",
32
- "watch": "node ../build/bin/tsc -b ./tsconfig.watch.json -w",
33
- "clean": "node ../node_modules/.bin/rimraf lib && node ../node_modules/.bin/rimraf dist",
34
- "lint": "node ../node_modules/eslint/bin/eslint.js --ext ts src",
40
+ "compile": "tsc -b ./tsconfig.json",
41
+ "watch": "tsc -b ./tsconfig.watch.json -w",
42
+ "clean": "rimraf lib && rimraf dist",
43
+ "lint": "eslint src",
35
44
  "test": "npm run test:node && npm run test:browser",
36
45
  "test:node": "node ../node_modules/mocha/bin/_mocha",
37
46
  "test:browser": "npm run webpack:test:silent && node ../build/bin/runBrowserTests.js http://127.0.0.1:8080/jsonrpc/src/browser/test/",
@@ -39,7 +48,7 @@
39
48
  "webpack:test": "node ../build/bin/webpack --mode none --config ./src/browser/test/webpack.config.js",
40
49
  "webpack:test:silent": "node ../build/bin/webpack --no-stats --mode none --config ./src/browser/test/webpack.config.js",
41
50
  "all": "npm run clean && npm run compile && npm run lint && npm run test",
42
- "compile:publish": "node ../build/bin/tsc -b ./tsconfig.publish.json",
51
+ "compile:publish": "tsc -b ./tsconfig.publish.json",
43
52
  "all:publish": "git clean -xfd . && npm install && npm run compile:publish && npm run lint && npm run test"
44
53
  }
45
54
  }
@@ -0,0 +1 @@
1
+ {"program":{"fileNames":[],"fileInfos":[],"root":[],"options":{"composite":true}},"version":"5.5.2"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mrclrchtr/supi-lsp",
3
- "version": "1.11.1",
3
+ "version": "1.11.2",
4
4
  "description": "SuPi LSP extension — Language Server Protocol integration for pi",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -23,11 +23,11 @@
23
23
  "dependencies": {
24
24
  "ignore": "^7.0.5",
25
25
  "typescript": "6.0.3",
26
- "vscode-jsonrpc": "^8.2.1",
26
+ "vscode-jsonrpc": "^9.0.0",
27
27
  "vscode-languageserver-protocol": "^3.17.5",
28
28
  "vscode-languageserver-types": "^3.17.5",
29
- "@mrclrchtr/supi-code-runtime": "1.11.1",
30
- "@mrclrchtr/supi-core": "1.11.1"
29
+ "@mrclrchtr/supi-code-runtime": "1.11.2",
30
+ "@mrclrchtr/supi-core": "1.11.2"
31
31
  },
32
32
  "bundledDependencies": [
33
33
  "@mrclrchtr/supi-code-runtime",
@@ -1,6 +0,0 @@
1
- /* --------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- * ----------------------------------------------------------------------------------------- */
5
-
6
- export * from './lib/browser/main';
@@ -1,7 +0,0 @@
1
- /* --------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- * ----------------------------------------------------------------------------------------- */
5
- 'use strict';
6
-
7
- module.exports = require('./lib/browser/main');
@@ -1,5 +0,0 @@
1
- @echo off
2
- REM This file is necessary to ensure that under Windows we don't
3
- REM run the node.js file in the Windows Script Host when using
4
- REM node in packakge.json scripts. See also PATHEXT setting
5
- node.exe %*
@@ -1,6 +0,0 @@
1
- /* --------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- * ----------------------------------------------------------------------------------------- */
5
-
6
- export * from './lib/node/main';
@@ -1,7 +0,0 @@
1
- /* --------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- * ----------------------------------------------------------------------------------------- */
5
- 'use strict';
6
-
7
- module.exports = require('./lib/node/main');