typescript-language-server 0.11.0 → 1.0.0

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 (132) hide show
  1. package/CHANGELOG.md +42 -0
  2. package/README.md +32 -6
  3. package/lib/calls.d.ts +3 -3
  4. package/lib/calls.d.ts.map +1 -1
  5. package/lib/calls.js +18 -46
  6. package/lib/calls.js.map +1 -1
  7. package/lib/cli.js +8 -32
  8. package/lib/cli.js.map +1 -1
  9. package/lib/commands.js +1 -4
  10. package/lib/commands.js.map +1 -1
  11. package/lib/completion.d.ts +7 -6
  12. package/lib/completion.d.ts.map +1 -1
  13. package/lib/completion.js +95 -115
  14. package/lib/completion.js.map +1 -1
  15. package/lib/diagnostic-queue.d.ts +5 -5
  16. package/lib/diagnostic-queue.d.ts.map +1 -1
  17. package/lib/diagnostic-queue.js +7 -14
  18. package/lib/diagnostic-queue.js.map +1 -1
  19. package/lib/document-symbol.d.ts +2 -2
  20. package/lib/document-symbol.d.ts.map +1 -1
  21. package/lib/document-symbol.js +16 -22
  22. package/lib/document-symbol.js.map +1 -1
  23. package/lib/document.d.ts +1 -1
  24. package/lib/document.d.ts.map +1 -1
  25. package/lib/document.js +6 -34
  26. package/lib/document.js.map +1 -1
  27. package/lib/features/fix-all.d.ts +4 -4
  28. package/lib/features/fix-all.d.ts.map +1 -1
  29. package/lib/features/fix-all.js +17 -44
  30. package/lib/features/fix-all.js.map +1 -1
  31. package/lib/file-lsp-server.spec.js +17 -18
  32. package/lib/file-lsp-server.spec.js.map +1 -1
  33. package/lib/hover.d.ts +2 -2
  34. package/lib/hover.d.ts.map +1 -1
  35. package/lib/hover.js +8 -12
  36. package/lib/hover.js.map +1 -1
  37. package/lib/logger.d.ts +12 -4
  38. package/lib/logger.d.ts.map +1 -1
  39. package/lib/logger.js +36 -43
  40. package/lib/logger.js.map +1 -1
  41. package/lib/lsp-client.d.ts +3 -3
  42. package/lib/lsp-client.d.ts.map +1 -1
  43. package/lib/lsp-client.js +4 -31
  44. package/lib/lsp-client.js.map +1 -1
  45. package/lib/lsp-connection.d.ts +1 -1
  46. package/lib/lsp-connection.d.ts.map +1 -1
  47. package/lib/lsp-connection.js +10 -37
  48. package/lib/lsp-connection.js.map +1 -1
  49. package/lib/lsp-protocol.calls.proposed.d.ts +1 -1
  50. package/lib/lsp-protocol.calls.proposed.d.ts.map +1 -1
  51. package/lib/lsp-protocol.calls.proposed.js +7 -32
  52. package/lib/lsp-protocol.calls.proposed.js.map +1 -1
  53. package/lib/lsp-protocol.inlayHints.proposed.d.ts +2 -2
  54. package/lib/lsp-protocol.inlayHints.proposed.d.ts.map +1 -1
  55. package/lib/lsp-protocol.inlayHints.proposed.js +2 -28
  56. package/lib/lsp-protocol.inlayHints.proposed.js.map +1 -1
  57. package/lib/lsp-server.d.ts +13 -9
  58. package/lib/lsp-server.d.ts.map +1 -1
  59. package/lib/lsp-server.js +234 -192
  60. package/lib/lsp-server.js.map +1 -1
  61. package/lib/lsp-server.spec.js +338 -232
  62. package/lib/lsp-server.spec.js.map +1 -1
  63. package/lib/organize-imports.d.ts +3 -3
  64. package/lib/organize-imports.d.ts.map +1 -1
  65. package/lib/organize-imports.js +5 -32
  66. package/lib/organize-imports.js.map +1 -1
  67. package/lib/organize-imports.spec.js +9 -34
  68. package/lib/organize-imports.spec.js.map +1 -1
  69. package/lib/protocol-translation.d.ts +3 -3
  70. package/lib/protocol-translation.d.ts.map +1 -1
  71. package/lib/protocol-translation.js +30 -72
  72. package/lib/protocol-translation.js.map +1 -1
  73. package/lib/quickfix.d.ts +3 -3
  74. package/lib/quickfix.d.ts.map +1 -1
  75. package/lib/quickfix.js +7 -35
  76. package/lib/quickfix.js.map +1 -1
  77. package/lib/refactor.d.ts +2 -2
  78. package/lib/refactor.d.ts.map +1 -1
  79. package/lib/refactor.js +7 -36
  80. package/lib/refactor.js.map +1 -1
  81. package/lib/semantic-tokens.d.ts +1 -1
  82. package/lib/semantic-tokens.d.ts.map +1 -1
  83. package/lib/semantic-tokens.js +1 -5
  84. package/lib/semantic-tokens.js.map +1 -1
  85. package/lib/test-utils.d.ts +8 -3
  86. package/lib/test-utils.d.ts.map +1 -1
  87. package/lib/test-utils.js +51 -60
  88. package/lib/test-utils.js.map +1 -1
  89. package/lib/ts-protocol.d.ts +7 -4
  90. package/lib/ts-protocol.d.ts.map +1 -1
  91. package/lib/ts-protocol.js +4 -31
  92. package/lib/ts-protocol.js.map +1 -1
  93. package/lib/tsp-client.d.ts +42 -43
  94. package/lib/tsp-client.d.ts.map +1 -1
  95. package/lib/tsp-client.js +23 -46
  96. package/lib/tsp-client.js.map +1 -1
  97. package/lib/tsp-client.spec.js +36 -56
  98. package/lib/tsp-client.spec.js.map +1 -1
  99. package/lib/tsp-command-types.js +3 -7
  100. package/lib/tsp-command-types.js.map +1 -1
  101. package/lib/utils/SnippetString.js +1 -4
  102. package/lib/utils/SnippetString.js.map +1 -1
  103. package/lib/utils/api.d.ts +1 -0
  104. package/lib/utils/api.d.ts.map +1 -1
  105. package/lib/utils/api.js +3 -28
  106. package/lib/utils/api.js.map +1 -1
  107. package/lib/utils/configuration.d.ts +2 -2
  108. package/lib/utils/configuration.d.ts.map +1 -1
  109. package/lib/utils/configuration.js +1 -2
  110. package/lib/utils/errorCodes.js +11 -14
  111. package/lib/utils/errorCodes.js.map +1 -1
  112. package/lib/utils/fixNames.js +13 -16
  113. package/lib/utils/fixNames.js.map +1 -1
  114. package/lib/utils/modules-resolver.js +7 -34
  115. package/lib/utils/modules-resolver.js.map +1 -1
  116. package/lib/utils/modules-resolver.spec.d.ts +1 -1
  117. package/lib/utils/modules-resolver.spec.d.ts.map +1 -1
  118. package/lib/utils/modules-resolver.spec.js +11 -34
  119. package/lib/utils/modules-resolver.spec.js.map +1 -1
  120. package/lib/utils/typeConverters.d.ts +1 -1
  121. package/lib/utils/typeConverters.d.ts.map +1 -1
  122. package/lib/utils/typeConverters.js +2 -5
  123. package/lib/utils/typeConverters.js.map +1 -1
  124. package/lib/utils/types.js +2 -29
  125. package/lib/utils/types.js.map +1 -1
  126. package/lib/utils/versionProvider.d.ts +3 -3
  127. package/lib/utils/versionProvider.d.ts.map +1 -1
  128. package/lib/utils/versionProvider.js +35 -41
  129. package/lib/utils/versionProvider.js.map +1 -1
  130. package/lib/utils.js +1 -5
  131. package/lib/utils.js.map +1 -1
  132. package/package.json +35 -33
@@ -1,35 +1,9 @@
1
- "use strict";
2
1
  /*---------------------------------------------------------------------------------------------
3
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
4
3
  * Licensed under the MIT License. See License.txt in the project root for license information.
5
4
  *--------------------------------------------------------------------------------------------*/
6
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
7
- if (k2 === undefined) k2 = k;
8
- var desc = Object.getOwnPropertyDescriptor(m, k);
9
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
10
- desc = { enumerable: true, get: function() { return m[k]; } };
11
- }
12
- Object.defineProperty(o, k2, desc);
13
- }) : (function(o, m, k, k2) {
14
- if (k2 === undefined) k2 = k;
15
- o[k2] = m[k];
16
- }));
17
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
18
- Object.defineProperty(o, "default", { enumerable: true, value: v });
19
- }) : function(o, v) {
20
- o["default"] = v;
21
- });
22
- var __importStar = (this && this.__importStar) || function (mod) {
23
- if (mod && mod.__esModule) return mod;
24
- var result = {};
25
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
26
- __setModuleDefault(result, mod);
27
- return result;
28
- };
29
- Object.defineProperty(exports, "__esModule", { value: true });
30
- exports.CodeActionKind = void 0;
31
- const lsp = __importStar(require("vscode-languageserver/node"));
32
- class CodeActionKind {
5
+ import * as lsp from 'vscode-languageserver';
6
+ export class CodeActionKind {
33
7
  constructor(value) {
34
8
  this.value = value;
35
9
  }
@@ -67,7 +41,6 @@ class CodeActionKind {
67
41
  return new CodeActionKind(this.value + CodeActionKind.sep + part);
68
42
  }
69
43
  }
70
- exports.CodeActionKind = CodeActionKind;
71
44
  CodeActionKind.sep = '.';
72
45
  CodeActionKind.Empty = new CodeActionKind(lsp.CodeActionKind.Empty);
73
46
  CodeActionKind.QuickFix = new CodeActionKind(lsp.CodeActionKind.QuickFix);
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhG,gEAAkD;AAElD,MAAa,cAAc;IAcvB,YACoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAC7B,CAAC;IAEE,MAAM,CAAC,KAAqB;QAC/B,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IACI,QAAQ,CAAC,KAAqB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAC9G,CAAC;IAED;;;;;;;OAOG;IACI,UAAU,CAAC,KAAqB;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,IAAY;QACtB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACtE,CAAC;;AArDL,wCAsDC;AArD2B,kBAAG,GAAG,GAAG,CAAC;AAEX,oBAAK,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AACrD,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,qBAAM,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AACvD,wCAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC3F,mCAAoB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACjF,oCAAqB,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;AACrF,sCAAuB,GAAG,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5E,2BAAY,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AACnE,6BAAc,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAE7C,MAAM,OAAO,cAAc;IAcvB,YACoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAC7B,CAAC;IAEE,MAAM,CAAC,KAAqB;QAC/B,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IACI,QAAQ,CAAC,KAAqB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAC9G,CAAC;IAED;;;;;;;OAOG;IACI,UAAU,CAAC,KAAqB;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,IAAY;QACtB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACtE,CAAC;;AApDuB,kBAAG,GAAG,GAAG,CAAC;AAEX,oBAAK,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AACrD,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,qBAAM,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AACvD,wCAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC3F,mCAAoB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACjF,oCAAqB,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;AACrF,sCAAuB,GAAG,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5E,2BAAY,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AACnE,6BAAc,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC"}
@@ -1,6 +1,6 @@
1
- import API from './api';
2
- import { IServerOptions } from './configuration';
3
- import type { Logger } from '../logger';
1
+ import API from './api.js';
2
+ import { IServerOptions } from './configuration.js';
3
+ import type { Logger } from '../logger.js';
4
4
  export declare const enum TypeScriptVersionSource {
5
5
  Bundled = "bundled",
6
6
  UserSetting = "user-setting",
@@ -1 +1 @@
1
- {"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AAQA,OAAO,GAAG,MAAM,OAAO,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,0BAAkB,uBAAuB;IACrC,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,SAAS,cAAc;CAC1B;AAED,qBAAa,iBAAiB;aAGN,MAAM,EAAE,uBAAuB;aAC/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAL5B,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,UAAU,CAAC,oBAAQ,EACnB,MAAM,CAAC,oBAAQ;IAKpC,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,IAAI,GAAG,GAAG,IAAI,CAM/B;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAGxC;IAED,OAAO,CAAC,oBAAoB;CA0C/B;AAED,eAAO,MAAM,cAAc,UAAgG,CAAC;AAE5H,qBAAa,yBAAyB;IACf,OAAO,CAAC,aAAa,CAAC;IAAkB,OAAO,CAAC,MAAM,CAAC;gBAA/C,aAAa,CAAC,4BAAgB,EAAU,MAAM,CAAC,oBAAQ;IAE3E,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IA8CjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAazE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAapD"}
1
+ {"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AASA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,0BAAkB,uBAAuB;IACrC,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,SAAS,cAAc;CAC1B;AAED,qBAAa,iBAAiB;aAGN,MAAM,EAAE,uBAAuB;aAC/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAL5B,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,UAAU,CAAC,oBAAQ,EACnB,MAAM,CAAC,oBAAQ;IAKpC,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,IAAI,GAAG,GAAG,IAAI,CAM/B;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAGxC;IAED,OAAO,CAAC,oBAAoB;CA0C/B;AAED,eAAO,MAAM,cAAc,UAAgG,CAAC;AAE5H,qBAAa,yBAAyB;IACf,OAAO,CAAC,aAAa,CAAC;IAAkB,OAAO,CAAC,MAAM,CAAC;gBAA/C,aAAa,CAAC,4BAAgB,EAAU,MAAM,CAAC,oBAAQ;IAE3E,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IA8CjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAazE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAcpD"}
@@ -1,20 +1,15 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.TypeScriptVersionProvider = exports.MODULE_FOLDERS = exports.TypeScriptVersion = void 0;
7
1
  /*---------------------------------------------------------------------------------------------
8
2
  * Copyright (c) Microsoft Corporation. All rights reserved.
9
3
  * Licensed under the MIT License. See License.txt in the project root for license information.
10
4
  *--------------------------------------------------------------------------------------------*/
11
- const fs_1 = __importDefault(require("fs"));
12
- const path_1 = __importDefault(require("path"));
13
- const which_1 = __importDefault(require("which"));
14
- const pkg_up_1 = __importDefault(require("pkg-up"));
15
- const api_1 = __importDefault(require("./api"));
16
- const modules_resolver_1 = require("./modules-resolver");
17
- class TypeScriptVersion {
5
+ import fs from 'node:fs';
6
+ import { createRequire } from 'node:module';
7
+ import path from 'node:path';
8
+ import which from 'which';
9
+ import { pkgUpSync } from 'pkg-up';
10
+ import API from './api.js';
11
+ import { findPathToModule } from './modules-resolver.js';
12
+ export class TypeScriptVersion {
18
13
  constructor(source, path, _pathLabel, logger) {
19
14
  this.source = source;
20
15
  this.path = path;
@@ -23,10 +18,10 @@ class TypeScriptVersion {
23
18
  this._api = null;
24
19
  }
25
20
  get tscPath() {
26
- return path_1.default.resolve(this.path, '../bin/tsc');
21
+ return path.resolve(this.path, '../bin/tsc');
27
22
  }
28
23
  get tsServerPath() {
29
- return path_1.default.resolve(this.path, 'tsserver.js');
24
+ return path.resolve(this.path, 'tsserver.js');
30
25
  }
31
26
  get pathLabel() {
32
27
  return typeof this._pathLabel === 'undefined' ? this.path : this._pathLabel;
@@ -48,30 +43,30 @@ class TypeScriptVersion {
48
43
  getTypeScriptVersion(serverPath) {
49
44
  var _a, _b, _c, _d, _e, _f, _g, _h;
50
45
  (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Resolving TypeScript version from path "${serverPath}"...`);
51
- if (!fs_1.default.existsSync(serverPath)) {
46
+ if (!fs.existsSync(serverPath)) {
52
47
  (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info('Server path does not exist on disk');
53
48
  return null;
54
49
  }
55
- const p = serverPath.split(path_1.default.sep);
50
+ const p = serverPath.split(path.sep);
56
51
  if (p.length <= 2) {
57
52
  (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info('Server path is invalid (has less than two path components).');
58
53
  return null;
59
54
  }
60
55
  const p2 = p.slice(0, -2);
61
- const modulePath = p2.join(path_1.default.sep);
62
- let fileName = path_1.default.join(modulePath, 'package.json');
63
- if (!fs_1.default.existsSync(fileName)) {
56
+ const modulePath = p2.join(path.sep);
57
+ let fileName = path.join(modulePath, 'package.json');
58
+ if (!fs.existsSync(fileName)) {
64
59
  // Special case for ts dev versions
65
- if (path_1.default.basename(modulePath) === 'built') {
66
- fileName = path_1.default.join(modulePath, '..', 'package.json');
60
+ if (path.basename(modulePath) === 'built') {
61
+ fileName = path.join(modulePath, '..', 'package.json');
67
62
  }
68
63
  }
69
- if (!fs_1.default.existsSync(fileName)) {
64
+ if (!fs.existsSync(fileName)) {
70
65
  (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`Failed to find package.json at path "${fileName}"`);
71
66
  return null;
72
67
  }
73
68
  (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`Reading version from package.json at "${fileName}"`);
74
- const contents = fs_1.default.readFileSync(fileName).toString();
69
+ const contents = fs.readFileSync(fileName).toString();
75
70
  let desc = null;
76
71
  try {
77
72
  desc = JSON.parse(contents);
@@ -85,12 +80,11 @@ class TypeScriptVersion {
85
80
  return null;
86
81
  }
87
82
  (_h = this.logger) === null || _h === void 0 ? void 0 : _h.info(`Resolved TypeScript version to "${desc.version}"`);
88
- return api_1.default.fromVersionString(desc.version);
83
+ return API.fromVersionString(desc.version);
89
84
  }
90
85
  }
91
- exports.TypeScriptVersion = TypeScriptVersion;
92
- exports.MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
93
- class TypeScriptVersionProvider {
86
+ export const MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
87
+ export class TypeScriptVersionProvider {
94
88
  constructor(configuration, logger) {
95
89
  this.configuration = configuration;
96
90
  this.logger = logger;
@@ -104,44 +98,44 @@ class TypeScriptVersionProvider {
104
98
  (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Resolving user-provided tsserver path "${tsserverPath}"...`);
105
99
  let resolvedPath = tsserverPath;
106
100
  // Resolve full path to the binary if path is not absolute.
107
- if (!path_1.default.isAbsolute(resolvedPath)) {
108
- const binaryPath = which_1.default.sync(tsserverPath, { nothrow: true });
101
+ if (!path.isAbsolute(resolvedPath)) {
102
+ const binaryPath = which.sync(tsserverPath, { nothrow: true });
109
103
  if (binaryPath) {
110
104
  resolvedPath = binaryPath;
111
105
  }
112
106
  (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(`Non-absolute tsserver path resolved to "${binaryPath ? resolvedPath : '<failed>'}"`);
113
107
  }
114
108
  // Resolve symbolic link.
115
- let stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
109
+ let stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
116
110
  if (stat === null || stat === void 0 ? void 0 : stat.isSymbolicLink()) {
117
- resolvedPath = fs_1.default.realpathSync(resolvedPath);
111
+ resolvedPath = fs.realpathSync(resolvedPath);
118
112
  (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info(`Symbolic link tsserver path resolved to "${resolvedPath}"`);
119
113
  }
120
114
  // Get directory path
121
- stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
115
+ stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
122
116
  if (stat === null || stat === void 0 ? void 0 : stat.isFile()) {
123
- resolvedPath = path_1.default.dirname(resolvedPath);
117
+ resolvedPath = path.dirname(resolvedPath);
124
118
  (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`Resolved directory path from a file path: ${resolvedPath}`);
125
119
  }
126
120
  // Resolve path to the "lib" dir.
127
121
  try {
128
- const packageJsonPath = pkg_up_1.default.sync({ cwd: resolvedPath });
122
+ const packageJsonPath = pkgUpSync({ cwd: resolvedPath });
129
123
  (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`Resolved package.json location: "${packageJsonPath}"`);
130
124
  if (packageJsonPath) {
131
- resolvedPath = path_1.default.join(path_1.default.dirname(packageJsonPath), 'lib');
125
+ resolvedPath = path.join(path.dirname(packageJsonPath), 'lib');
132
126
  (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`Assumed tsserver lib location: "${resolvedPath}"`);
133
127
  }
134
128
  }
135
129
  catch (_g) {
136
130
  // ignore
137
131
  }
138
- return new TypeScriptVersion("user-setting" /* UserSetting */, resolvedPath, undefined, this.logger);
132
+ return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, undefined, this.logger);
139
133
  }
140
134
  getWorkspaceVersion(workspaceFolders) {
141
135
  for (const p of workspaceFolders) {
142
- const libFolder = (0, modules_resolver_1.findPathToModule)(p, exports.MODULE_FOLDERS);
136
+ const libFolder = findPathToModule(p, MODULE_FOLDERS);
143
137
  if (libFolder) {
144
- const version = new TypeScriptVersion("workspace" /* Workspace */, libFolder);
138
+ const version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, libFolder);
145
139
  if (version.isValid) {
146
140
  return version;
147
141
  }
@@ -150,9 +144,10 @@ class TypeScriptVersionProvider {
150
144
  return null;
151
145
  }
152
146
  bundledVersion() {
147
+ const require = createRequire(import.meta.url);
153
148
  try {
154
149
  const file = require.resolve('typescript');
155
- const bundledVersion = new TypeScriptVersion("bundled" /* Bundled */, path_1.default.dirname(file), '');
150
+ const bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, path.dirname(file), '');
156
151
  return bundledVersion;
157
152
  }
158
153
  catch (e) {
@@ -161,5 +156,4 @@ class TypeScriptVersionProvider {
161
156
  }
162
157
  }
163
158
  }
164
- exports.TypeScriptVersionProvider = TypeScriptVersionProvider;
165
159
  //# sourceMappingURL=versionProvider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AASzD,MAAM,OAAO,iBAAiB;IAE1B,YACoB,MAA+B,EAC/B,IAAY,EACX,UAAmB,EACnB,MAAe;QAHhB,WAAM,GAAN,MAAM,CAAyB;QAC/B,SAAI,GAAJ,IAAI,CAAQ;QACX,eAAU,GAAV,UAAU,CAAS;QACnB,WAAM,GAAN,MAAM,CAAS;QAEhC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACjD,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAClD,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,OAAO,IAAI,CAAC,UAAU,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IAChF,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACjC,CAAC;IAED,IAAW,OAAO;QACd,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,OAAO,IAAI,CAAC,IAAI,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAW,aAAa;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAEO,oBAAoB,CAAC,UAAkB;;QAC3C,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,2CAA2C,UAAU,MAAM,CAAC,CAAC;QAC/E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC5B,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;SACf;QAED,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;YACf,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,6DAA6D,CAAC,CAAC;YACjF,OAAO,IAAI,CAAC;SACf;QACD,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,mCAAmC;YACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,OAAO,EAAE;gBACvC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;aAC1D;SACJ;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,wCAAwC,QAAQ,GAAG,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;SACf;QAED,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,yCAAyC,QAAQ,GAAG,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtD,IAAI,IAAI,GAAQ,IAAI,CAAC;QACrB,IAAI;YACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC/B;QAAC,OAAO,GAAG,EAAE;YACV,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,kDAAkD,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;SACf;QACD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,mCAAmC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACtE,OAAO,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,6BAA6B,EAAE,+BAA+B,EAAE,2BAA2B,CAAC,CAAC;AAE5H,MAAM,OAAO,yBAAyB;IAClC,YAA2B,aAA8B,EAAU,MAAe;QAAvD,kBAAa,GAAb,aAAa,CAAiB;QAAU,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAE/E,qBAAqB;;QACxB,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;QAClD,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,IAAI,CAAC;SACf;QACD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,0CAA0C,YAAY,MAAM,CAAC,CAAC;QAChF,IAAI,YAAY,GAAG,YAAY,CAAC;QAChC,2DAA2D;QAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAChC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,IAAI,UAAU,EAAE;gBACZ,YAAY,GAAG,UAAU,CAAC;aAC7B;YACD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,2CAA2C,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;SAC3G;QACD,yBAAyB;QACzB,IAAI,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,EAAE,EAAE;YACxB,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7C,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,4CAA4C,YAAY,GAAG,CAAC,CAAC;SAClF;QACD,qBAAqB;QACrB,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,EAAE;YAChB,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC1C,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,6CAA6C,YAAY,EAAE,CAAC,CAAC;SAClF;QACD,iCAAiC;QACjC,IAAI;YACA,MAAM,eAAe,GAAG,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;YACzD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,oCAAoC,eAAe,GAAG,CAAC,CAAC;YAC1E,IAAI,eAAe,EAAE;gBACjB,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,CAAC;gBAC/D,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,mCAAmC,YAAY,GAAG,CAAC,CAAC;aACzE;SACJ;QAAC,WAAM;YACJ,SAAS;SACZ;QACD,OAAO,IAAI,iBAAiB,2DAExB,YAAY,EACZ,SAAS,EACT,IAAI,CAAC,MAAM,CACd,CAAC;IACN,CAAC;IAEM,mBAAmB,CAAC,gBAA0B;QACjD,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;YAC9B,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YACtD,IAAI,SAAS,EAAE;gBACX,MAAM,OAAO,GAAG,IAAI,iBAAiB,sDAAoC,SAAS,CAAC,CAAC;gBACpF,IAAI,OAAO,CAAC,OAAO,EAAE;oBACjB,OAAO,OAAO,CAAC;iBAClB;aACJ;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc;QACjB,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI;YACA,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,cAAc,GAAG,IAAI,iBAAiB,kDAExC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAClB,EAAE,CAAC,CAAC;YACR,OAAO,cAAc,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACR,sEAAsE;YACtE,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ"}
package/lib/utils.js CHANGED
@@ -1,13 +1,10 @@
1
- "use strict";
2
1
  /*
3
2
  * Copyright (C) 2017, 2018 TypeFox and others.
4
3
  *
5
4
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
6
5
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
7
6
  */
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.Deferred = void 0;
10
- class Deferred {
7
+ export class Deferred {
11
8
  constructor() {
12
9
  this.promise = new Promise((resolve, reject) => {
13
10
  this.resolve = resolve;
@@ -15,5 +12,4 @@ class Deferred {
15
12
  });
16
13
  }
17
14
  }
18
- exports.Deferred = Deferred;
19
15
  //# sourceMappingURL=utils.js.map
package/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,MAAa,QAAQ;IAArB;QAII,YAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AARD,4BAQC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,OAAO,QAAQ;IAArB;QAII,YAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}
package/package.json CHANGED
@@ -1,19 +1,17 @@
1
1
  {
2
2
  "name": "typescript-language-server",
3
- "version": "0.11.0",
3
+ "version": "1.0.0",
4
4
  "description": "Language Server Protocol (LSP) implementation for TypeScript using tsserver",
5
5
  "author": "TypeFox and others",
6
6
  "license": "Apache-2.0",
7
- "engines": {
8
- "node": ">=12"
9
- },
10
- "eslintIgnore": [
11
- "!.eslintrc.js"
12
- ],
13
7
  "repository": {
14
8
  "type": "git",
15
9
  "url": "https://github.com/typescript-language-server/typescript-language-server.git"
16
10
  },
11
+ "type": "module",
12
+ "engines": {
13
+ "node": ">=14.16"
14
+ },
17
15
  "files": [
18
16
  "lib"
19
17
  ],
@@ -22,9 +20,9 @@
22
20
  },
23
21
  "scripts": {
24
22
  "clean": "rimraf lib *.tsbuildinfo",
25
- "test": "cross-env TS_NODE_PROJECT=./tsconfig.json mocha --exit --watch-files \"./src/**/*.ts\" --reporter spec \"./src/**/*.spec.ts\" --require source-map-support/register --require ts-node/register",
26
- "test:watch": "cross-env TS_NODE_PROJECT=./tsconfig.json mocha --exit --watch-files \"./src/**/*.ts\" --reporter spec \"./src/**/*.spec.ts\" --require source-map-support/register --require ts-node/register --watch",
27
- "test:compiled": "mocha --exit --reporter spec \"./lib/**/*.spec.js\"",
23
+ "test": "cross-env CONSOLE_LOG_LEVEL=warn TS_NODE_PROJECT=./tsconfig.json mocha",
24
+ "test:watch": "cross-env CONSOLE_LOG_LEVEL=warn TS_NODE_PROJECT=./tsconfig.json mocha --watch",
25
+ "test:compiled": "cross-env CONSOLE_LOG_LEVEL=warn mocha \"./lib/**/*.spec.js\"",
28
26
  "lint": "eslint --ext \".js,.ts\" src",
29
27
  "build": "concurrently -n compile,lint -c blue,green \"yarn compile\" \"yarn lint\"",
30
28
  "compile": "tsc -b",
@@ -32,6 +30,9 @@
32
30
  "postversion": "git push --follow-tags",
33
31
  "prepare": "cd test-data/jsx && yarn"
34
32
  },
33
+ "eslintIgnore": [
34
+ "!.eslintrc.cjs"
35
+ ],
35
36
  "husky": {
36
37
  "hooks": {
37
38
  "pre-commit": "yarn lint && yarn build && yarn test:compiled",
@@ -39,35 +40,36 @@
39
40
  }
40
41
  },
41
42
  "dependencies": {
42
- "commander": "^9.0.0",
43
- "fs-extra": "^10.0.0",
44
- "p-debounce": "^2.1.0",
45
- "pkg-up": "^3.1.0",
46
- "semver": "^7.3.5",
47
- "tempy": "^1.0.1",
48
- "vscode-languageserver": "^7.0.0",
49
- "vscode-languageserver-protocol": "3.16.0",
43
+ "commander": "^9.4.0",
44
+ "fs-extra": "^10.1.0",
45
+ "p-debounce": "^4.0.0",
46
+ "pkg-up": "^4.0.0",
47
+ "semver": "^7.3.7",
48
+ "tempy": "^3.0.0",
49
+ "vscode-languageserver": "^8.0.2",
50
+ "vscode-languageserver-protocol": "^3.17.2",
50
51
  "vscode-languageserver-textdocument": "1.0.5",
51
- "vscode-uri": "^3.0.2",
52
+ "vscode-uri": "^3.0.3",
52
53
  "which": "^2.0.2"
53
54
  },
54
55
  "devDependencies": {
55
- "@types/chai": "^4.2.19",
56
- "@types/fs-extra": "^9.0.11",
57
- "@types/mocha": "^9.0.0",
58
- "@types/node": "^16.11.6",
56
+ "@types/chai": "^4.3.1",
57
+ "@types/fs-extra": "^9.0.13",
58
+ "@types/mocha": "^9.1.1",
59
+ "@types/node": "^16.11.47",
60
+ "@types/semver": "^7.3.10",
59
61
  "@types/which": "^2.0.1",
60
- "@typescript-eslint/eslint-plugin": "^5.3.1",
61
- "@typescript-eslint/parser": "^5.3.1",
62
- "chai": "^4.3.4",
63
- "concurrently": "^7.0.0",
62
+ "@typescript-eslint/eslint-plugin": "^5.32.0",
63
+ "@typescript-eslint/parser": "^5.32.0",
64
+ "chai": "^4.3.6",
65
+ "concurrently": "^7.3.0",
64
66
  "cross-env": "^7.0.3",
65
- "eslint": "^8.2.0",
66
- "husky": "4.x.x",
67
- "mocha": "^9.0.1",
67
+ "eslint": "^8.21.0",
68
+ "husky": "4.x",
69
+ "mocha": "^10.0.0",
68
70
  "rimraf": "^3.0.2",
69
- "source-map-support": "^0.5.19",
70
- "ts-node": "^10.4.0",
71
- "typescript": "^4.4.3"
71
+ "source-map-support": "^0.5.21",
72
+ "ts-node": "^10.9.1",
73
+ "typescript": "^4.7.4"
72
74
  }
73
75
  }