@mrclrchtr/supi-code-intelligence 11.3.0 → 12.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.
- package/CHANGELOG.md +33 -0
- package/README.md +15 -9
- package/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts +3 -1
- package/node_modules/@mrclrchtr/supi-code-runtime/src/declaration-level.ts +34 -0
- package/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts +64 -28
- package/node_modules/@mrclrchtr/supi-core/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/README.md +22 -17
- 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 +3 -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 +64 -28
- 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/api.ts +2 -2
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-capabilities.ts +13 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostics.ts +25 -9
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-document-sync.ts +7 -5
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-edit-capture.ts +258 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client.ts +64 -11
- package/node_modules/@mrclrchtr/supi-lsp/src/config/capabilities.ts +8 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/config/operation-support.ts +48 -79
- 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 +67 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/typescript-file-local.ts +87 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/lsp-refactor-provider.ts +21 -35
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/refactor-command-capture.ts +139 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/refactor-planning.ts +202 -47
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/semantic-symbol-mapper.ts +22 -17
- package/node_modules/@mrclrchtr/supi-lsp/src/session/route-boundary.ts +26 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts +106 -16
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-rename.ts +3 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/session/workspace-lsp-runtime.ts +22 -1
- 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 +3 -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 +64 -28
- 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/node_modules/@mrclrchtr/supi-tree-sitter/src/coordinates.ts +16 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/session/structural-worker-client.ts +3 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/syntax-errors.ts +2 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-range.ts +94 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/call-sites.ts +26 -6
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/callees.ts +6 -3
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/tool/exports.ts +13 -4
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/worker/runtime.ts +1 -9
- package/package.json +5 -5
- package/src/analysis/health/server-status.ts +41 -12
- 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/anchored-structural.ts +4 -1
- 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/find-types.ts +8 -4
- package/src/session/find-workflow.ts +11 -16
- 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/input/health-refactor.ts +48 -34
- package/src/session/input/workflows.ts +45 -46
- package/src/session/inspect/file-point.ts +2 -2
- package/src/session/inspect-types.ts +1 -1
- package/src/session/inspect-workflow.ts +3 -3
- package/src/session/orientation/workspace-context.ts +3 -0
- package/src/session/orientation-workflow.ts +6 -3
- package/src/session/refactor-file-actions.ts +122 -0
- package/src/session/refactor-plan-pipeline.ts +152 -0
- package/src/session/refactor-plans.ts +18 -15
- package/src/session/refactor-types.ts +24 -12
- package/src/session/refactor-workflow.ts +70 -244
- package/src/session/session.ts +87 -12
- package/src/session/target-workflow.ts +23 -21
- package/src/tool/code_find/execute.ts +6 -7
- package/src/tool/code_find/spec.ts +9 -16
- package/src/tool/code_find/tui.ts +12 -6
- package/src/tool/code_graph/section.ts +4 -0
- package/src/tool/code_graph/spec.ts +6 -0
- package/src/tool/code_health/spec.ts +6 -0
- package/src/tool/code_health/structured-schema.ts +4 -4
- package/src/tool/code_health/structured.ts +15 -17
- package/src/tool/code_inspect/execute.ts +1 -1
- package/src/tool/code_inspect/markdown.ts +33 -6
- package/src/tool/code_inspect/result.ts +1 -1
- package/src/tool/code_inspect/spec.ts +14 -6
- package/src/tool/code_inspect/structured.ts +2 -2
- package/src/tool/code_inspect/tui.ts +2 -2
- package/src/tool/code_orientation/directory-navigation.ts +20 -31
- package/src/tool/code_orientation/spec.ts +8 -0
- package/src/tool/code_orientation/workspace-output.ts +40 -13
- package/src/tool/code_orientation/workspace-sections.ts +45 -2
- package/src/tool/code_refactor_apply/result.ts +2 -1
- package/src/tool/code_refactor_apply/spec.ts +7 -0
- package/src/tool/code_refactor_plan/execute.ts +0 -2
- package/src/tool/code_refactor_plan/result.ts +23 -13
- package/src/tool/code_refactor_plan/spec.ts +8 -2
- package/src/tool/code_refactor_plan/structured.ts +59 -12
- package/src/tool/code_refactor_plan/tui.ts +14 -17
- 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/spec.ts +6 -0
- package/src/tool/code_resolve/structured.ts +43 -10
- package/src/tool/namespace.ts +14 -0
- package/src/tool/refactor-markdown.ts +55 -15
- package/src/tool/register.ts +3 -0
- package/src/tool/result/model-budget.ts +2 -2
- package/src/tool/result/refactor-preview.ts +118 -0
- package/src/tool/result/refactor-unavailable.ts +16 -0
- package/src/tool/result/refactor.ts +8 -2
- package/src/tool/result/types.ts +13 -10
- package/src/tool/schemas.ts +63 -20
- package/src/tool/specs.ts +3 -0
- package/src/ui/status-overlay.ts +1 -1
- package/src/ui/tui/common.ts +10 -10
package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts
CHANGED
|
@@ -34,8 +34,16 @@ export interface SymbolAnchor {
|
|
|
34
34
|
character: number;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
/**
|
|
38
|
-
|
|
37
|
+
/**
|
|
38
|
+
* Where a declaration sits within its file, as reported by a provider.
|
|
39
|
+
*
|
|
40
|
+
* - `top-level`: directly in the file, not inside another declaration.
|
|
41
|
+
* - `member`: directly inside a class, interface, enum, struct, namespace,
|
|
42
|
+
* module, or object literal (methods, fields, properties, enum members).
|
|
43
|
+
* - `local`: inside the body of a function, method, or constructor.
|
|
44
|
+
* - `unknown`: the provider reported a flat symbol list without hierarchy.
|
|
45
|
+
*/
|
|
46
|
+
export type DeclarationLevel = "top-level" | "member" | "local" | "unknown";
|
|
39
47
|
|
|
40
48
|
/**
|
|
41
49
|
* A discovered symbol / declaration.
|
|
@@ -54,7 +62,7 @@ export interface CodeSymbol {
|
|
|
54
62
|
file: string;
|
|
55
63
|
declarationAnchor: SymbolAnchor;
|
|
56
64
|
nameAnchor?: SymbolAnchor;
|
|
57
|
-
/** Named
|
|
65
|
+
/** Named enclosing declaration when reported; absence does not prove a top-level declaration. */
|
|
58
66
|
container?: string | null;
|
|
59
67
|
}
|
|
60
68
|
|
|
@@ -63,10 +71,10 @@ export interface CodeSymbol {
|
|
|
63
71
|
*
|
|
64
72
|
* `unknown` means the provider returned a flat observation without an actual
|
|
65
73
|
* hierarchy. A reported container name remains metadata and does not promote
|
|
66
|
-
* a flat observation to known
|
|
74
|
+
* a flat observation to a known level.
|
|
67
75
|
*/
|
|
68
76
|
export interface DocumentCodeSymbol extends CodeSymbol {
|
|
69
|
-
|
|
77
|
+
level: DeclarationLevel;
|
|
70
78
|
}
|
|
71
79
|
|
|
72
80
|
// ── Result types ───────────────────────────────────────────────────────
|
|
@@ -185,31 +193,53 @@ export interface WorkspaceEdit {
|
|
|
185
193
|
}
|
|
186
194
|
|
|
187
195
|
/**
|
|
188
|
-
*
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
| "rename_file"
|
|
195
|
-
| "move_file"
|
|
196
|
-
| "update_imports"
|
|
197
|
-
| "delete_dead_code";
|
|
198
|
-
|
|
199
|
-
/**
|
|
200
|
-
* Operation-aware refactor planning request.
|
|
196
|
+
* Operation-aware refactor planning request. Each operation carries only the
|
|
197
|
+
* scope it needs:
|
|
198
|
+
*
|
|
199
|
+
* - `rename_symbol`: one symbol position and the new name.
|
|
200
|
+
* - `code_action`: one file range and a CodeActionKind prefix under `refactor`.
|
|
201
|
+
* - `source_action`: one whole file and a CodeActionKind prefix under `source`.
|
|
201
202
|
*
|
|
202
|
-
*
|
|
203
|
-
*
|
|
204
|
-
* explicitly and honestly until shared workspace-edit resource ops exist.
|
|
203
|
+
* `kind` matches the requested kind and its dotted sub-kinds. `title`, when
|
|
204
|
+
* present, selects one action by its exact title.
|
|
205
205
|
*/
|
|
206
|
-
export
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
206
|
+
export type RefactorRequest =
|
|
207
|
+
| {
|
|
208
|
+
operation: "rename_symbol";
|
|
209
|
+
file: string;
|
|
210
|
+
position: CodePosition;
|
|
211
|
+
newName: string;
|
|
212
|
+
}
|
|
213
|
+
| {
|
|
214
|
+
operation: "code_action";
|
|
215
|
+
file: string;
|
|
216
|
+
range: SourceRange;
|
|
217
|
+
kind: string;
|
|
218
|
+
title?: string;
|
|
219
|
+
}
|
|
220
|
+
| {
|
|
221
|
+
operation: "source_action";
|
|
222
|
+
file: string;
|
|
223
|
+
kind: string;
|
|
224
|
+
title?: string;
|
|
225
|
+
};
|
|
226
|
+
|
|
227
|
+
/** Supported refactor operation names. */
|
|
228
|
+
export type RefactorOperation = RefactorRequest["operation"];
|
|
229
|
+
|
|
230
|
+
/** The code action selected for a precise code- or source-action plan. */
|
|
231
|
+
export interface RefactorActionIdentity {
|
|
232
|
+
/** Server-reported CodeActionKind. */
|
|
233
|
+
kind: string;
|
|
234
|
+
/** Server-reported action title. */
|
|
235
|
+
title: string;
|
|
236
|
+
/**
|
|
237
|
+
* How the edits were obtained: `edit` from the action itself (after
|
|
238
|
+
* `codeAction/resolve` when needed), or `captured-command` from the single
|
|
239
|
+
* `workspace/applyEdit` the server pushed while running the action's command.
|
|
240
|
+
* Captured edits were refused, never applied.
|
|
241
|
+
*/
|
|
242
|
+
provenance?: "edit" | "captured-command";
|
|
213
243
|
}
|
|
214
244
|
|
|
215
245
|
/**
|
|
@@ -220,6 +250,10 @@ export interface DisambiguationCandidate {
|
|
|
220
250
|
file?: string;
|
|
221
251
|
line?: number;
|
|
222
252
|
character?: number;
|
|
253
|
+
/** Server-reported CodeActionKind, for code-action candidates. */
|
|
254
|
+
kind?: string;
|
|
255
|
+
/** Exact action title to pass back as `title`, for code-action candidates. */
|
|
256
|
+
title?: string;
|
|
223
257
|
}
|
|
224
258
|
|
|
225
259
|
/**
|
|
@@ -233,6 +267,8 @@ export type RefactorResult =
|
|
|
233
267
|
| {
|
|
234
268
|
kind: "precise";
|
|
235
269
|
edits: WorkspaceEdit;
|
|
270
|
+
/** The selected code action, for code- and source-action plans. */
|
|
271
|
+
action?: RefactorActionIdentity;
|
|
236
272
|
/** Provider roots authorized by the semantic route. Consumers canonicalize before storage. */
|
|
237
273
|
authorizedMutationRoots: string[];
|
|
238
274
|
}
|
|
@@ -119,7 +119,7 @@ class Range {
|
|
|
119
119
|
debug('hyphen replace', range)
|
|
120
120
|
|
|
121
121
|
// `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
|
|
122
|
-
range = range
|
|
122
|
+
range = trimComparatorWhitespace(range)
|
|
123
123
|
debug('comparator trim', range)
|
|
124
124
|
|
|
125
125
|
// `~ 1.2.3` => `~1.2.3`
|
|
@@ -224,11 +224,11 @@ const parseOptions = require('../internal/parse-options')
|
|
|
224
224
|
const Comparator = require('./comparator')
|
|
225
225
|
const debug = require('../internal/debug')
|
|
226
226
|
const SemVer = require('./semver')
|
|
227
|
+
const trimComparatorWhitespace = require('../internal/trim-comparator-whitespace')
|
|
227
228
|
const {
|
|
228
229
|
safeRe: re,
|
|
229
230
|
src,
|
|
230
231
|
t,
|
|
231
|
-
comparatorTrimReplace,
|
|
232
232
|
tildeTrimReplace,
|
|
233
233
|
caretTrimReplace,
|
|
234
234
|
} = require('../internal/re')
|
|
@@ -15,6 +15,35 @@ const MAX_SAFE_COMPONENT_LENGTH = 16
|
|
|
15
15
|
// the shortest version with a build 0.0.0+BUILD.
|
|
16
16
|
const MAX_SAFE_BUILD_LENGTH = MAX_LENGTH - 6
|
|
17
17
|
|
|
18
|
+
// ECMAScript whitespace and line terminators matched by \s.
|
|
19
|
+
const WHITESPACE_CHARACTERS = [
|
|
20
|
+
'\t',
|
|
21
|
+
'\n',
|
|
22
|
+
'\v',
|
|
23
|
+
'\f',
|
|
24
|
+
'\r',
|
|
25
|
+
' ',
|
|
26
|
+
'\u00a0',
|
|
27
|
+
'\u1680',
|
|
28
|
+
'\u2000',
|
|
29
|
+
'\u2001',
|
|
30
|
+
'\u2002',
|
|
31
|
+
'\u2003',
|
|
32
|
+
'\u2004',
|
|
33
|
+
'\u2005',
|
|
34
|
+
'\u2006',
|
|
35
|
+
'\u2007',
|
|
36
|
+
'\u2008',
|
|
37
|
+
'\u2009',
|
|
38
|
+
'\u200a',
|
|
39
|
+
'\u2028',
|
|
40
|
+
'\u2029',
|
|
41
|
+
'\u202f',
|
|
42
|
+
'\u205f',
|
|
43
|
+
'\u3000',
|
|
44
|
+
'\ufeff',
|
|
45
|
+
]
|
|
46
|
+
|
|
18
47
|
const RELEASE_TYPES = [
|
|
19
48
|
'major',
|
|
20
49
|
'premajor',
|
|
@@ -30,6 +59,7 @@ module.exports = {
|
|
|
30
59
|
MAX_SAFE_COMPONENT_LENGTH,
|
|
31
60
|
MAX_SAFE_BUILD_LENGTH,
|
|
32
61
|
MAX_SAFE_INTEGER,
|
|
62
|
+
WHITESPACE_CHARACTERS,
|
|
33
63
|
RELEASE_TYPES,
|
|
34
64
|
SEMVER_SPEC_VERSION,
|
|
35
65
|
FLAG_INCLUDE_PRERELEASE: 0b001,
|
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": "
|
|
3
|
+
"version": "12.0.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": "12.0.0",
|
|
42
|
+
"@mrclrchtr/supi-core": "12.0.0"
|
|
43
43
|
},
|
|
44
44
|
"bundledDependencies": [
|
|
45
45
|
"@mrclrchtr/supi-code-runtime",
|