@mrclrchtr/supi-code-intelligence 11.3.0 → 11.4.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.
- package/CHANGELOG.md +11 -0
- package/README.md +3 -3
- package/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +2 -1
- package/node_modules/@mrclrchtr/supi-code-runtime/src/declaration-level.ts +34 -0
- package/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +13 -5
- package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/README.md +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +2 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/declaration-level.ts +34 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +13 -5
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/semver/classes/range.js +2 -2
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/semver/internal/constants.js +30 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/semver/internal/trim-comparator-whitespace.js +438 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/semver/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/package.json +3 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/config/tsconfig-scope.ts +10 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-typescript-coverage.ts +118 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts +64 -2
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/typescript-file-local.ts +87 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/semantic-symbol-mapper.ts +22 -17
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts +49 -4
- package/node_modules/@mrclrchtr/supi-tree-sitter/README.md +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +2 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/declaration-level.ts +34 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +13 -5
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/package.json +3 -3
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/tree-sitter-tsx.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/tree-sitter-tsx.wasm.json +5 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/tree-sitter-typescript.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/tree-sitter-typescript.wasm.json +5 -1
- package/package.json +5 -5
- package/src/analysis/helpers.ts +0 -7
- package/src/analysis/relations/implementations.ts +5 -0
- package/src/analysis/relations/references.ts +5 -0
- package/src/analysis/target/file-merge.ts +162 -0
- package/src/analysis/target/file-outline-omissions.ts +146 -0
- package/src/analysis/target/file-refinement.ts +7 -7
- package/src/analysis/target/file.ts +44 -156
- package/src/analysis/target/symbol.ts +5 -1
- package/src/analysis/target/types.ts +32 -6
- package/src/api.ts +1 -1
- package/src/app/app.ts +9 -3
- package/src/session/graph/collect.ts +2 -0
- package/src/session/graph-types.ts +3 -1
- package/src/session/graph-workflow.ts +5 -4
- package/src/session/orientation/workspace-context.ts +3 -0
- package/src/session/orientation-workflow.ts +6 -3
- package/src/session/refactor-workflow.ts +3 -2
- package/src/session/session.ts +87 -12
- package/src/session/target-workflow.ts +23 -21
- package/src/tool/code_graph/section.ts +4 -0
- package/src/tool/code_orientation/directory-navigation.ts +20 -31
- package/src/tool/code_orientation/workspace-output.ts +40 -13
- package/src/tool/code_orientation/workspace-sections.ts +45 -2
- package/src/tool/code_resolve/guidance.ts +1 -1
- package/src/tool/code_resolve/markdown.ts +121 -34
- package/src/tool/code_resolve/result.ts +18 -15
- package/src/tool/code_resolve/structured.ts +43 -10
- package/src/tool/result/model-budget.ts +2 -2
- package/src/tool/result/types.ts +13 -10
- package/src/ui/tui/common.ts +10 -10
package/node_modules/@mrclrchtr/supi-lsp/node_modules/semver/internal/trim-comparator-whitespace.js
ADDED
|
@@ -0,0 +1,438 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
'use strict'
|
|
3
|
+
|
|
4
|
+
// Reproduce safeRe[COMPARATORTRIM] replacement boundaries, not version
|
|
5
|
+
// validation. Each end-index finder returns an exclusive end, or its start
|
|
6
|
+
// on no match.
|
|
7
|
+
// Positions count from zero. An end of 3 means characters 0, 1, and 2 were read;
|
|
8
|
+
// range.slice(start, end) gives the matched text, not a converted number.
|
|
9
|
+
const {
|
|
10
|
+
MAX_LENGTH,
|
|
11
|
+
MAX_SAFE_BUILD_LENGTH,
|
|
12
|
+
WHITESPACE_CHARACTERS,
|
|
13
|
+
} = require('./constants')
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Remembers the last two rows of digits so their characters need not be reread.
|
|
17
|
+
* Positions start at -1 until a row has been found.
|
|
18
|
+
*
|
|
19
|
+
* @typedef {object} DigitRunCache
|
|
20
|
+
* @property {number} start The first character of the most recently found row.
|
|
21
|
+
* @property {number} end The position after that row's last character.
|
|
22
|
+
* @property {number} previousStart The first character of the previous row.
|
|
23
|
+
* @property {number} previousEnd The position after the previous row.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
// One entry per UTF-16 code unit keeps membership checks constant-time.
|
|
27
|
+
const whitespace = new Uint8Array(0x10000)
|
|
28
|
+
for (const char of WHITESPACE_CHARACTERS) {
|
|
29
|
+
whitespace[char.charCodeAt(0)] = 1
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Checks whether a character is whitespace, like a space, tab, or newline.
|
|
34
|
+
* Looking past the end of the string returns false.
|
|
35
|
+
*
|
|
36
|
+
* @param {string|undefined} char One character, or undefined past the string's end.
|
|
37
|
+
* @returns {boolean} Whether the character is whitespace.
|
|
38
|
+
* @example isWhitespace(' ') // true
|
|
39
|
+
* @example isWhitespace('1') // false
|
|
40
|
+
*/
|
|
41
|
+
const isWhitespace = char =>
|
|
42
|
+
char !== undefined && whitespace[char.charCodeAt(0)] === 1
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Checks for v, =, or whitespace before the version number.
|
|
46
|
+
* These are historical version prefixes, not range operators:
|
|
47
|
+
* < and > are handled separately, as are tilde and caret ranges.
|
|
48
|
+
*
|
|
49
|
+
* @param {string|undefined} char One character to check.
|
|
50
|
+
* @returns {boolean} Whether the character can belong to a version prefix.
|
|
51
|
+
* @example isVersionPrefix('=') // true
|
|
52
|
+
* @example isVersionPrefix('>') // false
|
|
53
|
+
*/
|
|
54
|
+
const isVersionPrefix = char =>
|
|
55
|
+
char === 'v' ||
|
|
56
|
+
char === '=' ||
|
|
57
|
+
isWhitespace(char)
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Checks whether a character is one of the digits 0 through 9.
|
|
61
|
+
*
|
|
62
|
+
* @param {string|undefined} char One character to check.
|
|
63
|
+
* @returns {boolean} Whether the character is an ASCII digit.
|
|
64
|
+
* @example isDigit('7') // true
|
|
65
|
+
* @example isDigit('.') // false
|
|
66
|
+
*/
|
|
67
|
+
const isDigit = char => char !== undefined && char >= '0' && char <= '9'
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Checks whether a character is an English letter, uppercase or lowercase.
|
|
71
|
+
*
|
|
72
|
+
* @param {string|undefined} char One character to check.
|
|
73
|
+
* @returns {boolean} Whether the character is an ASCII letter.
|
|
74
|
+
* @example isLetter('b') // true
|
|
75
|
+
* @example isLetter('7') // false
|
|
76
|
+
*/
|
|
77
|
+
const isLetter = char =>
|
|
78
|
+
char !== undefined && (
|
|
79
|
+
(char >= 'a' && char <= 'z') ||
|
|
80
|
+
(char >= 'A' && char <= 'Z')
|
|
81
|
+
)
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Checks for a letter, digit, or hyphen: the characters allowed inside
|
|
85
|
+
* prerelease and build names such as beta-1.
|
|
86
|
+
*
|
|
87
|
+
* @param {string|undefined} char One character to check.
|
|
88
|
+
* @returns {boolean} Whether the character can be part of an identifier.
|
|
89
|
+
* @example isIdentifierCharacter('-') // true
|
|
90
|
+
* @example isIdentifierCharacter('.') // false; dots separate identifiers
|
|
91
|
+
*/
|
|
92
|
+
const isIdentifierCharacter = char => isDigit(char) || isLetter(char) || char === '-'
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Checks whether a version component can begin here: with a digit or
|
|
96
|
+
* a wildcard such as x, X, or *.
|
|
97
|
+
*
|
|
98
|
+
* @param {string|undefined} char One character to check.
|
|
99
|
+
* @returns {boolean} Whether a number or wildcard can start with this character.
|
|
100
|
+
* @example isVersionStart('x') // true
|
|
101
|
+
* @example isVersionStart('v') // false; v belongs to the prefix
|
|
102
|
+
*/
|
|
103
|
+
const isVersionStart = char =>
|
|
104
|
+
isDigit(char) ||
|
|
105
|
+
char === 'x' ||
|
|
106
|
+
char === 'X' ||
|
|
107
|
+
char === '*'
|
|
108
|
+
|
|
109
|
+
/**
|
|
110
|
+
* Finds the end of a row of digits, but returns no more than limit digits.
|
|
111
|
+
* Remembers the last two rows so looking at them again does not reread them.
|
|
112
|
+
*
|
|
113
|
+
* @param {string} range The text to read; it is not changed.
|
|
114
|
+
* @param {number} start The position of the first character to check.
|
|
115
|
+
* @param {number} limit The most digit characters the returned match can include.
|
|
116
|
+
* @param {DigitRunCache} digitRuns Shared cache of digit-run positions, updated in place.
|
|
117
|
+
* @returns {number} The position after the matched digits, or start if none match.
|
|
118
|
+
* @example findDigitsEndIndex('123abc', 0, 10, digitRuns) // 3, pointing at a
|
|
119
|
+
* @example findDigitsEndIndex('123abc', 0, 2, digitRuns) // 2, pointing at the unread 3
|
|
120
|
+
*/
|
|
121
|
+
const findDigitsEndIndex = (range, start, limit, digitRuns) => {
|
|
122
|
+
if (!isDigit(range[start])) {
|
|
123
|
+
return start
|
|
124
|
+
}
|
|
125
|
+
if (start >= digitRuns.start && start < digitRuns.end) {
|
|
126
|
+
return Math.min(start + limit, digitRuns.end)
|
|
127
|
+
}
|
|
128
|
+
if (start >= digitRuns.previousStart && start < digitRuns.previousEnd) {
|
|
129
|
+
return Math.min(start + limit, digitRuns.previousEnd)
|
|
130
|
+
}
|
|
131
|
+
let end = start + 1
|
|
132
|
+
while (isDigit(range[end])) {
|
|
133
|
+
end++
|
|
134
|
+
}
|
|
135
|
+
// A failed full version can rewind from its second run to its first.
|
|
136
|
+
digitRuns.previousStart = digitRuns.start
|
|
137
|
+
digitRuns.previousEnd = digitRuns.end
|
|
138
|
+
digitRuns.start = start
|
|
139
|
+
digitRuns.end = end
|
|
140
|
+
return Math.min(start + limit, end)
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* Reads a number using the old regex's length and leading-zero rules.
|
|
145
|
+
* Strict mode reads just the first zero in 012; loose mode can read all three.
|
|
146
|
+
*
|
|
147
|
+
* @param {string} range The text to read; it is not changed.
|
|
148
|
+
* @param {number} start The position where the number should begin.
|
|
149
|
+
* @param {boolean} loose Whether to allow leading zeros.
|
|
150
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
151
|
+
* @returns {number} The position after the matched digits, not their numeric value.
|
|
152
|
+
* @example findVersionNumberEndIndex('012', 0, false, digitRuns) // 1
|
|
153
|
+
* @example findVersionNumberEndIndex('012', 0, true, digitRuns) // 3
|
|
154
|
+
*/
|
|
155
|
+
const findVersionNumberEndIndex = (range, start, loose, digitRuns) => {
|
|
156
|
+
if (!loose && range[start] === '0') {
|
|
157
|
+
return start + 1
|
|
158
|
+
}
|
|
159
|
+
// Strict syntax allows an initial nonzero digit plus MAX_LENGTH digits.
|
|
160
|
+
return findDigitsEndIndex(range, start, loose ? MAX_LENGTH : MAX_LENGTH + 1, digitRuns)
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
/**
|
|
164
|
+
* Reads one piece of a prerelease name, such as beta or 1 in beta.1.
|
|
165
|
+
* Tries the letter-or-hyphen form first, then the number-only form.
|
|
166
|
+
*
|
|
167
|
+
* @param {string} range The text to read; it is not changed.
|
|
168
|
+
* @param {number} start The position where the identifier should begin.
|
|
169
|
+
* @param {boolean} loose Whether numeric identifiers may have leading zeros.
|
|
170
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
171
|
+
* @returns {number} The position after the identifier, or start if none matches.
|
|
172
|
+
* @example findPrereleaseIdentifierEndIndex('beta.1', 0, false, digitRuns) // 4, at the dot
|
|
173
|
+
* @example findPrereleaseIdentifierEndIndex('001beta', 0, false, digitRuns) // 7
|
|
174
|
+
*/
|
|
175
|
+
const findPrereleaseIdentifierEndIndex = (range, start, loose, digitRuns) => {
|
|
176
|
+
const digitsEnd = findDigitsEndIndex(range, start, MAX_LENGTH, digitRuns)
|
|
177
|
+
// The legacy regex tries a nonnumeric identifier before a numeric one.
|
|
178
|
+
if (isLetter(range[digitsEnd]) || range[digitsEnd] === '-') {
|
|
179
|
+
let end = digitsEnd + 1
|
|
180
|
+
const limit = end + MAX_SAFE_BUILD_LENGTH
|
|
181
|
+
while (end < limit && isIdentifierCharacter(range[end])) {
|
|
182
|
+
end++
|
|
183
|
+
}
|
|
184
|
+
return end
|
|
185
|
+
}
|
|
186
|
+
return findVersionNumberEndIndex(range, start, loose, digitRuns)
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* Reads a prerelease suffix such as -beta.1, one dot-separated piece at a time.
|
|
191
|
+
* Loose mode also allows the name without its opening hyphen.
|
|
192
|
+
*
|
|
193
|
+
* @param {string} range The text to read; it is not changed.
|
|
194
|
+
* @param {number} start The position where the suffix should begin, including -.
|
|
195
|
+
* @param {boolean} loose Whether the opening hyphen is optional and zeros allowed.
|
|
196
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
197
|
+
* @returns {number} The position after the matched suffix, or start if absent.
|
|
198
|
+
* @example findPrereleaseEndIndex('-beta.1+sha', 0, false, digitRuns) // 7, at the plus
|
|
199
|
+
* @example findPrereleaseEndIndex('beta', 0, false, digitRuns) // 0; no opening hyphen
|
|
200
|
+
*/
|
|
201
|
+
const findPrereleaseEndIndex = (range, start, loose, digitRuns) => {
|
|
202
|
+
const hyphen = range[start] === '-'
|
|
203
|
+
if (!loose && !hyphen) {
|
|
204
|
+
return start
|
|
205
|
+
}
|
|
206
|
+
const identifierStart = start + (hyphen ? 1 : 0)
|
|
207
|
+
let end = findPrereleaseIdentifierEndIndex(range, identifierStart, loose, digitRuns)
|
|
208
|
+
if (end === identifierStart) {
|
|
209
|
+
if (!loose || !hyphen) {
|
|
210
|
+
return start
|
|
211
|
+
}
|
|
212
|
+
// In loose syntax, a lone hyphen can itself be the identifier.
|
|
213
|
+
end = findPrereleaseIdentifierEndIndex(range, start, loose, digitRuns)
|
|
214
|
+
}
|
|
215
|
+
while (range[end] === '.') {
|
|
216
|
+
const next = findPrereleaseIdentifierEndIndex(range, end + 1, loose, digitRuns)
|
|
217
|
+
if (next === end + 1) {
|
|
218
|
+
break
|
|
219
|
+
}
|
|
220
|
+
end = next
|
|
221
|
+
}
|
|
222
|
+
return end
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
/**
|
|
226
|
+
* Reads one build-name piece, such as sha or 123 in +sha.123.
|
|
227
|
+
* Stops at a disallowed character or the old regex's length limit.
|
|
228
|
+
*
|
|
229
|
+
* @param {string} range The text to read; it is not changed.
|
|
230
|
+
* @param {number} start The position where the identifier should begin.
|
|
231
|
+
* @returns {number} The position after the identifier, or start if none matches.
|
|
232
|
+
* @example findBuildIdentifierEndIndex('sha.123', 0) // 3, at the dot
|
|
233
|
+
* @example findBuildIdentifierEndIndex('001', 0) // 3; leading zeros are allowed
|
|
234
|
+
*/
|
|
235
|
+
const findBuildIdentifierEndIndex = (range, start) => {
|
|
236
|
+
let end = start
|
|
237
|
+
while (end - start < MAX_SAFE_BUILD_LENGTH && isIdentifierCharacter(range[end])) {
|
|
238
|
+
end++
|
|
239
|
+
}
|
|
240
|
+
return end
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
/**
|
|
244
|
+
* Reads optional build metadata such as +sha.123.
|
|
245
|
+
* Leaves the position unchanged if there is no plus sign followed by a name.
|
|
246
|
+
*
|
|
247
|
+
* @param {string} range The text to read; it is not changed.
|
|
248
|
+
* @param {number} start The position where the opening + should be.
|
|
249
|
+
* @returns {number} The position after the matched metadata, or start if absent.
|
|
250
|
+
* @example findBuildEndIndex('+sha.123 <2', 0) // 8, at the space
|
|
251
|
+
* @example findBuildEndIndex('+', 0) // 0; a plus sign alone is not a match
|
|
252
|
+
*/
|
|
253
|
+
const findBuildEndIndex = (range, start) => {
|
|
254
|
+
if (range[start] !== '+') {
|
|
255
|
+
return start
|
|
256
|
+
}
|
|
257
|
+
let end = findBuildIdentifierEndIndex(range, start + 1)
|
|
258
|
+
if (end === start + 1) {
|
|
259
|
+
return start
|
|
260
|
+
}
|
|
261
|
+
while (range[end] === '.') {
|
|
262
|
+
const next = findBuildIdentifierEndIndex(range, end + 1)
|
|
263
|
+
if (next === end + 1) {
|
|
264
|
+
break
|
|
265
|
+
}
|
|
266
|
+
end = next
|
|
267
|
+
}
|
|
268
|
+
return end
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
/**
|
|
272
|
+
* Reads three numbers separated by dots, then any prerelease and build suffixes.
|
|
273
|
+
* Uses loose rules, so forms such as 01.02.03beta can match here.
|
|
274
|
+
*
|
|
275
|
+
* @param {string} range The text to read; it is not changed.
|
|
276
|
+
* @param {number} start The position of the first number, after any prefix.
|
|
277
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
278
|
+
* @returns {number} The position after the version match, or start if none matches.
|
|
279
|
+
* @example findLooseFullVersionEndIndex('1.2.3-beta+sha <2', 0, digitRuns) // 14
|
|
280
|
+
* @example findLooseFullVersionEndIndex('1.2', 0, digitRuns) // 0; needs three numbers
|
|
281
|
+
*/
|
|
282
|
+
const findLooseFullVersionEndIndex = (range, start, digitRuns) => {
|
|
283
|
+
let end = start
|
|
284
|
+
for (let component = 0; component < 3; component++) {
|
|
285
|
+
const next = findVersionNumberEndIndex(range, end, true, digitRuns)
|
|
286
|
+
if (next === end) {
|
|
287
|
+
return start
|
|
288
|
+
}
|
|
289
|
+
end = next
|
|
290
|
+
if (component < 2) {
|
|
291
|
+
if (range[end] !== '.') {
|
|
292
|
+
return start
|
|
293
|
+
}
|
|
294
|
+
end++
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
const prereleaseEnd = findPrereleaseEndIndex(range, end, true, digitRuns)
|
|
298
|
+
return findBuildEndIndex(range, prereleaseEnd)
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
/**
|
|
302
|
+
* Reads one component of a partial or wildcard version, such as 2 or x in 2.x.
|
|
303
|
+
* Numbers use strict leading-zero rules; wildcards take up one character.
|
|
304
|
+
*
|
|
305
|
+
* @param {string} range The text to read; it is not changed.
|
|
306
|
+
* @param {number} start The position where the component should begin.
|
|
307
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
308
|
+
* @returns {number} The position after the component, or start if none matches.
|
|
309
|
+
* @example findPartialVersionComponentEndIndex('2.x', 0, digitRuns) // 1, at the dot
|
|
310
|
+
* @example findPartialVersionComponentEndIndex('2.x', 2, digitRuns) // 3, after x
|
|
311
|
+
*/
|
|
312
|
+
const findPartialVersionComponentEndIndex = (range, start, digitRuns) => {
|
|
313
|
+
if (isDigit(range[start])) {
|
|
314
|
+
return findVersionNumberEndIndex(range, start, false, digitRuns)
|
|
315
|
+
}
|
|
316
|
+
return isVersionStart(range[start]) ? start + 1 : start
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
/**
|
|
320
|
+
* Reads up to three components, allowing forms such as 1, 1.2, or 1.x.
|
|
321
|
+
* After the third component, also reads any strict prerelease and build suffixes.
|
|
322
|
+
*
|
|
323
|
+
* @param {string} range The text to read; it is not changed.
|
|
324
|
+
* @param {number} start The position of a number or wildcard, after any prefix.
|
|
325
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
326
|
+
* @returns {number} The position after the matched version text.
|
|
327
|
+
* @example findPartialVersionEndIndex('1.x <2', 0, digitRuns) // 3, at the space
|
|
328
|
+
* @example findPartialVersionEndIndex('1.', 0, digitRuns) // 1; the trailing dot is unread
|
|
329
|
+
*/
|
|
330
|
+
const findPartialVersionEndIndex = (range, start, digitRuns) => {
|
|
331
|
+
let end = findPartialVersionComponentEndIndex(range, start, digitRuns)
|
|
332
|
+
for (let component = 0; component < 2; component++) {
|
|
333
|
+
if (range[end] !== '.') {
|
|
334
|
+
return end
|
|
335
|
+
}
|
|
336
|
+
const next = findPartialVersionComponentEndIndex(range, end + 1, digitRuns)
|
|
337
|
+
if (next === end + 1) {
|
|
338
|
+
return end
|
|
339
|
+
}
|
|
340
|
+
end = next
|
|
341
|
+
}
|
|
342
|
+
const prereleaseEnd = findPrereleaseEndIndex(range, end, false, digitRuns)
|
|
343
|
+
return findBuildEndIndex(range, prereleaseEnd)
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
/**
|
|
347
|
+
* Finds where a version match ends, without deciding whether the range is valid.
|
|
348
|
+
* Tries a loose full version first, then a partial or wildcard version, just
|
|
349
|
+
* like the old regex's LOOSEPLAIN and XRANGEPLAIN alternatives.
|
|
350
|
+
*
|
|
351
|
+
* @param {string} range The text to read; it is not changed.
|
|
352
|
+
* @param {number} start The position of a number or wildcard, after any prefix.
|
|
353
|
+
* @param {DigitRunCache} digitRuns Shared digit-run cache, updated as needed.
|
|
354
|
+
* @returns {number} The position where scanning the next candidate can resume.
|
|
355
|
+
* @example findVersionEndIndex('1.2.3 <2', 0, digitRuns) // 5, at the space
|
|
356
|
+
* @example findVersionEndIndex('1.x <2', 0, digitRuns) // 3, at the space
|
|
357
|
+
*/
|
|
358
|
+
const findVersionEndIndex = (range, start, digitRuns) => {
|
|
359
|
+
const fullVersionEnd = findLooseFullVersionEndIndex(range, start, digitRuns)
|
|
360
|
+
return fullVersionEnd !== start
|
|
361
|
+
? fullVersionEnd
|
|
362
|
+
: findPartialVersionEndIndex(range, start, digitRuns)
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
/**
|
|
366
|
+
* Finds the one whitespace character the old replacement would remove.
|
|
367
|
+
* Keeps leading whitespace, skips an optional operator, and checks immediately
|
|
368
|
+
* after it. Returns -1 if there is nothing to remove.
|
|
369
|
+
*
|
|
370
|
+
* @param {string} range The text containing a candidate already found by the caller.
|
|
371
|
+
* @param {number} matchStart The candidate's position, including leading whitespace.
|
|
372
|
+
* @returns {number} The position of the removable whitespace, or -1 if absent.
|
|
373
|
+
* @example findRemovableWhitespaceIndex(' > 1', 0) // 2; keep the space at position 0
|
|
374
|
+
* @example findRemovableWhitespaceIndex('>1', 0) // -1
|
|
375
|
+
*/
|
|
376
|
+
const findRemovableWhitespaceIndex = (range, matchStart) => {
|
|
377
|
+
let position = matchStart
|
|
378
|
+
if (isWhitespace(range[position])) {
|
|
379
|
+
position++
|
|
380
|
+
}
|
|
381
|
+
if (range[position] === '<' || range[position] === '>') {
|
|
382
|
+
position++
|
|
383
|
+
}
|
|
384
|
+
if (range[position] === '=') {
|
|
385
|
+
position++
|
|
386
|
+
}
|
|
387
|
+
return isWhitespace(range[position]) ? position : -1
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
/**
|
|
391
|
+
* Joins an operator to its version, turning > 1.2.3 into >1.2.3.
|
|
392
|
+
* Copies everything else according to the old regex's matching rules.
|
|
393
|
+
* Moves forward through prefixes and whole versions to avoid repeatedly
|
|
394
|
+
* searching the same characters on long inputs.
|
|
395
|
+
*
|
|
396
|
+
* @param {string} range The range text to process; the original string is unchanged.
|
|
397
|
+
* @returns {string} The range with matched operator whitespace removed.
|
|
398
|
+
* @example trimComparatorWhitespace('> 1.2.3 < 2') // '>1.2.3 <2'
|
|
399
|
+
* @example trimComparatorWhitespace('> invalid') // '> invalid'
|
|
400
|
+
*/
|
|
401
|
+
const trimComparatorWhitespace = range => {
|
|
402
|
+
let result = ''
|
|
403
|
+
let copyFrom = 0
|
|
404
|
+
let cursor = 0
|
|
405
|
+
const digitRuns = { start: -1, end: -1, previousStart: -1, previousEnd: -1 }
|
|
406
|
+
|
|
407
|
+
while (cursor < range.length) {
|
|
408
|
+
const matchStart = cursor
|
|
409
|
+
if (range[cursor] === '<' || range[cursor] === '>') {
|
|
410
|
+
cursor++
|
|
411
|
+
} else if (!isVersionPrefix(range[cursor]) && !isVersionStart(range[cursor])) {
|
|
412
|
+
cursor++
|
|
413
|
+
continue
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
// Consume a v/=/whitespace run once, even when no version follows it.
|
|
417
|
+
while (cursor < range.length && isVersionPrefix(range[cursor])) {
|
|
418
|
+
cursor++
|
|
419
|
+
}
|
|
420
|
+
if (!isVersionStart(range[cursor])) {
|
|
421
|
+
continue
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
const whitespacePosition = findRemovableWhitespaceIndex(range, matchStart)
|
|
425
|
+
if (whitespacePosition !== -1) {
|
|
426
|
+
result += range.slice(copyFrom, whitespacePosition)
|
|
427
|
+
copyFrom = whitespacePosition + 1
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
// Skip the entire match, so a prerelease's trailing v cannot be
|
|
431
|
+
// reconsidered as the prefix of another version.
|
|
432
|
+
cursor = findVersionEndIndex(range, cursor, digitRuns)
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
return result + range.slice(copyFrom)
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
module.exports = trimComparatorWhitespace
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mrclrchtr/supi-lsp",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.4.0",
|
|
4
4
|
"description": "Language Server Protocol runtime for SuPi code intelligence",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"vscode-jsonrpc": "^10.0.0",
|
|
39
39
|
"vscode-languageserver-protocol": "^3.18.5",
|
|
40
40
|
"vscode-languageserver-types": "^3.18.5",
|
|
41
|
-
"@mrclrchtr/supi-
|
|
42
|
-
"@mrclrchtr/supi-
|
|
41
|
+
"@mrclrchtr/supi-code-runtime": "11.4.0",
|
|
42
|
+
"@mrclrchtr/supi-core": "11.4.0"
|
|
43
43
|
},
|
|
44
44
|
"bundledDependencies": [
|
|
45
45
|
"@mrclrchtr/supi-code-runtime",
|
|
@@ -162,6 +162,16 @@ export function getFileScopeDecision(filePath: string, cwd: string): FileScopeDe
|
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
|
|
165
|
+
/**
|
|
166
|
+
* Whether a project config's program includes a file, by its own file set or
|
|
167
|
+
* include/exclude rules. Unlike {@link getFileScopeDecision}, the config need
|
|
168
|
+
* not be the file's nearest one (e.g. a test config including `../src`).
|
|
169
|
+
*/
|
|
170
|
+
export function projectConfigIncludesFile(configPath: string, filePath: string): boolean {
|
|
171
|
+
const parsed = parseProjectConfig(configPath);
|
|
172
|
+
return parsed !== null && decideFileScope(parsed, path.resolve(filePath)).included;
|
|
173
|
+
}
|
|
174
|
+
|
|
165
175
|
function isOutOfTree(cwd: string, absolutePath: string): boolean {
|
|
166
176
|
const relative = path.relative(path.resolve(cwd), absolutePath);
|
|
167
177
|
return relative.startsWith(`..${path.sep}`) || relative === "..";
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import * as path from "node:path";
|
|
2
|
+
import { collectExtendedProjectConfigs } from "../config/tsconfig-extends.ts";
|
|
3
|
+
import { normalizeTsconfigPath } from "../config/tsconfig-path.ts";
|
|
4
|
+
import { getFileScopeDecision, projectConfigIncludesFile } from "../config/tsconfig-scope.ts";
|
|
5
|
+
import { type AutomaticLspPathPolicy, walkAutomaticLspTree } from "../workspace-path-policy.ts";
|
|
6
|
+
|
|
7
|
+
/** Directory depth searched for project configs below a TypeScript route root. */
|
|
8
|
+
const PROJECT_CONFIG_SCAN_DEPTH = 8;
|
|
9
|
+
/** Project config paths named in one coverage reason. */
|
|
10
|
+
const MAX_NAMED_PROJECTS = 3;
|
|
11
|
+
/** File names tsserver loads as projects; `tsconfig.*.json` variants are never auto-loaded. */
|
|
12
|
+
const LOADABLE_PROJECT_CONFIGS = new Set(["tsconfig.json", "jsconfig.json"]);
|
|
13
|
+
|
|
14
|
+
/** Find loadable project configs under a route root, honoring the automatic path policy. */
|
|
15
|
+
export function discoverTypeScriptProjectConfigs(
|
|
16
|
+
root: string,
|
|
17
|
+
policy: AutomaticLspPathPolicy,
|
|
18
|
+
): string[] {
|
|
19
|
+
const configs: string[] = [];
|
|
20
|
+
walkAutomaticLspTree(policy, root, PROJECT_CONFIG_SCAN_DEPTH, (directory, entries) => {
|
|
21
|
+
for (const entry of entries) {
|
|
22
|
+
if (entry.isFile() && LOADABLE_PROJECT_CONFIGS.has(entry.name)) {
|
|
23
|
+
configs.push(path.join(directory, entry.name));
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return false;
|
|
27
|
+
});
|
|
28
|
+
return configs;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Project configs whose program includes `file` but show no sign of being loaded.
|
|
33
|
+
*
|
|
34
|
+
* tsserver answers project-wide requests such as references and
|
|
35
|
+
* implementations only from loaded projects, and loads a project only when one
|
|
36
|
+
* of its files is open. An unloaded including project (typically a test
|
|
37
|
+
* config that includes `../src`) can hold matches the answer omits.
|
|
38
|
+
*
|
|
39
|
+
* A project counts as loaded when it is the nearest config of an open file or
|
|
40
|
+
* of a file in the answer (`resultFiles`): tsserver also loads projects on its
|
|
41
|
+
* own during a search, and a match from a project's own file proves it was searched.
|
|
42
|
+
*
|
|
43
|
+
* Base configs extended by another discovered config are skipped: their
|
|
44
|
+
* default include usually spans the whole tree while they own only root
|
|
45
|
+
* tooling files, so counting them would mark nearly every answer partial.
|
|
46
|
+
*/
|
|
47
|
+
export function findUnloadedTypeScriptProjects(options: {
|
|
48
|
+
readonly file: string;
|
|
49
|
+
readonly cwd: string;
|
|
50
|
+
readonly openFiles: readonly string[];
|
|
51
|
+
readonly resultFiles?: readonly string[];
|
|
52
|
+
readonly configs: readonly string[];
|
|
53
|
+
}): string[] {
|
|
54
|
+
const baseConfigs = new Set(
|
|
55
|
+
options.configs.flatMap((config) => [...collectExtendedProjectConfigs(config)]),
|
|
56
|
+
);
|
|
57
|
+
const loaded = new Set<string>();
|
|
58
|
+
for (const loadedFile of [...options.openFiles, ...(options.resultFiles ?? [])]) {
|
|
59
|
+
const decision = getFileScopeDecision(loadedFile, options.cwd);
|
|
60
|
+
if (decision.status === "included" && decision.configPath) {
|
|
61
|
+
loaded.add(normalizeTsconfigPath(decision.configPath));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return options.configs.filter((config) => {
|
|
65
|
+
const key = normalizeTsconfigPath(config);
|
|
66
|
+
return (
|
|
67
|
+
!loaded.has(key) && !baseConfigs.has(key) && projectConfigIncludesFile(config, options.file)
|
|
68
|
+
);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Other projects that tsserver's implementation search skips for `file`.
|
|
74
|
+
*
|
|
75
|
+
* tsserver 6 and earlier answer `textDocument/implementation` from the file's
|
|
76
|
+
* default project only, unlike references, which span loaded projects. Any
|
|
77
|
+
* other non-base project may implement the target through an import, and
|
|
78
|
+
* opening its files does not change the answer.
|
|
79
|
+
*/
|
|
80
|
+
export function findSkippedImplementationProjects(options: {
|
|
81
|
+
readonly file: string;
|
|
82
|
+
readonly cwd: string;
|
|
83
|
+
readonly configs: readonly string[];
|
|
84
|
+
}): string[] {
|
|
85
|
+
const baseConfigs = new Set(
|
|
86
|
+
options.configs.flatMap((config) => [...collectExtendedProjectConfigs(config)]),
|
|
87
|
+
);
|
|
88
|
+
const decision = getFileScopeDecision(options.file, options.cwd);
|
|
89
|
+
const own = decision.configPath ? normalizeTsconfigPath(decision.configPath) : undefined;
|
|
90
|
+
return options.configs.filter((config) => {
|
|
91
|
+
const key = normalizeTsconfigPath(config);
|
|
92
|
+
return key !== own && !baseConfigs.has(key);
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** Partial-result reason for tsserver's single-project implementation search. */
|
|
97
|
+
export function singleProjectImplementationReason(skipped: readonly string[]): string {
|
|
98
|
+
const noun = skipped.length === 1 ? "1 other project is" : `${skipped.length} other projects are`;
|
|
99
|
+
return (
|
|
100
|
+
"TypeScript coverage is limited: the TypeScript 6 or earlier server (tsserver) " +
|
|
101
|
+
`searches implementations only in this file's project; ${noun} not searched. ` +
|
|
102
|
+
"Use references to find uses in other projects, or use TypeScript 7."
|
|
103
|
+
);
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/** Actionable partial-result reason naming a bounded set of unloaded projects. */
|
|
107
|
+
export function typeScriptCoverageGapReason(unloaded: readonly string[], cwd: string): string {
|
|
108
|
+
const named = unloaded
|
|
109
|
+
.slice(0, MAX_NAMED_PROJECTS)
|
|
110
|
+
.map((config) => path.relative(cwd, config) || path.basename(config));
|
|
111
|
+
const more = unloaded.length > named.length ? `, +${unloaded.length - named.length} more` : "";
|
|
112
|
+
const noun = unloaded.length === 1 ? "project that includes" : "projects that include";
|
|
113
|
+
return (
|
|
114
|
+
`TypeScript coverage is limited: ${unloaded.length} ${noun} this file ` +
|
|
115
|
+
`${unloaded.length === 1 ? "is" : "are"} not loaded (${named.join(", ")}${more}). ` +
|
|
116
|
+
"Open a file from each project and retry."
|
|
117
|
+
);
|
|
118
|
+
}
|