typescript 5.2.0-dev.20230615 → 5.2.0-dev.20230617
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/lib/tsc.js +9 -9
- package/lib/tsserver.js +45 -45
- package/lib/tsserverlibrary.js +41 -41
- package/lib/typescript.js +12 -12
- package/lib/typingsInstaller.js +5 -5
- package/package.json +2 -2
package/lib/tsc.js
CHANGED
|
@@ -18,7 +18,7 @@ and limitations under the License.
|
|
|
18
18
|
|
|
19
19
|
// src/compiler/corePublic.ts
|
|
20
20
|
var versionMajorMinor = "5.2";
|
|
21
|
-
var version = `${versionMajorMinor}.0-dev.
|
|
21
|
+
var version = `${versionMajorMinor}.0-dev.20230617`;
|
|
22
22
|
|
|
23
23
|
// src/compiler/core.ts
|
|
24
24
|
var emptyArray = [];
|
|
@@ -2315,7 +2315,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
|
|
|
2315
2315
|
var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
|
|
2316
2316
|
var buildPartRegExp = /^[a-z0-9-]+$/i;
|
|
2317
2317
|
var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
|
|
2318
|
-
var _Version = class {
|
|
2318
|
+
var _Version = class _Version {
|
|
2319
2319
|
constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
|
|
2320
2320
|
if (typeof major === "string") {
|
|
2321
2321
|
const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
|
|
@@ -2379,8 +2379,8 @@ var _Version = class {
|
|
|
2379
2379
|
return result;
|
|
2380
2380
|
}
|
|
2381
2381
|
};
|
|
2382
|
+
_Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
2382
2383
|
var Version = _Version;
|
|
2383
|
-
Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
2384
2384
|
function tryParseComponents(text) {
|
|
2385
2385
|
const match = versionRegExp.exec(text);
|
|
2386
2386
|
if (!match)
|
|
@@ -2427,14 +2427,14 @@ function comparePrereleaseIdentifiers(left, right) {
|
|
|
2427
2427
|
}
|
|
2428
2428
|
return compareValues(left.length, right.length);
|
|
2429
2429
|
}
|
|
2430
|
-
var VersionRange = class {
|
|
2430
|
+
var VersionRange = class _VersionRange {
|
|
2431
2431
|
constructor(spec) {
|
|
2432
2432
|
this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
|
|
2433
2433
|
}
|
|
2434
2434
|
static tryParse(text) {
|
|
2435
2435
|
const sets = parseRange(text);
|
|
2436
2436
|
if (sets) {
|
|
2437
|
-
const range = new
|
|
2437
|
+
const range = new _VersionRange("");
|
|
2438
2438
|
range._alternatives = sets;
|
|
2439
2439
|
return range;
|
|
2440
2440
|
}
|
|
@@ -53649,9 +53649,9 @@ function createTypeChecker(host) {
|
|
|
53649
53649
|
function getConstraintOfTypeParameter(typeParameter) {
|
|
53650
53650
|
return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : void 0;
|
|
53651
53651
|
}
|
|
53652
|
-
function isConstTypeVariable(type) {
|
|
53652
|
+
function isConstTypeVariable(type, depth = 0) {
|
|
53653
53653
|
var _a;
|
|
53654
|
-
return !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, isConstTypeVariable) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type)) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0));
|
|
53654
|
+
return depth < 5 && !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, (t) => isConstTypeVariable(t, depth)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType, depth + 1) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type), depth + 1) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType, depth) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t, depth)) >= 0));
|
|
53655
53655
|
}
|
|
53656
53656
|
function getConstraintOfIndexedAccess(type) {
|
|
53657
53657
|
return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
|
|
@@ -83358,13 +83358,13 @@ function createBasicNodeBuilderModuleSpecifierResolutionHost(host) {
|
|
|
83358
83358
|
readFile: host.readFile ? (fileName) => host.readFile(fileName) : void 0
|
|
83359
83359
|
};
|
|
83360
83360
|
}
|
|
83361
|
-
var SymbolTrackerImpl = class {
|
|
83361
|
+
var SymbolTrackerImpl = class _SymbolTrackerImpl {
|
|
83362
83362
|
constructor(context, tracker, moduleResolverHost) {
|
|
83363
83363
|
this.moduleResolverHost = void 0;
|
|
83364
83364
|
this.inner = void 0;
|
|
83365
83365
|
this.disableTrackSymbol = false;
|
|
83366
83366
|
var _a;
|
|
83367
|
-
while (tracker instanceof
|
|
83367
|
+
while (tracker instanceof _SymbolTrackerImpl) {
|
|
83368
83368
|
tracker = tracker.inner;
|
|
83369
83369
|
}
|
|
83370
83370
|
this.inner = tracker;
|
package/lib/tsserver.js
CHANGED
|
@@ -2305,7 +2305,7 @@ module.exports = __toCommonJS(server_exports);
|
|
|
2305
2305
|
|
|
2306
2306
|
// src/compiler/corePublic.ts
|
|
2307
2307
|
var versionMajorMinor = "5.2";
|
|
2308
|
-
var version = `${versionMajorMinor}.0-dev.
|
|
2308
|
+
var version = `${versionMajorMinor}.0-dev.20230617`;
|
|
2309
2309
|
var Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
2310
2310
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
2311
2311
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -4998,7 +4998,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
|
|
|
4998
4998
|
var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
|
|
4999
4999
|
var buildPartRegExp = /^[a-z0-9-]+$/i;
|
|
5000
5000
|
var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
|
|
5001
|
-
var _Version = class {
|
|
5001
|
+
var _Version = class _Version {
|
|
5002
5002
|
constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
|
|
5003
5003
|
if (typeof major === "string") {
|
|
5004
5004
|
const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
|
|
@@ -5062,8 +5062,8 @@ var _Version = class {
|
|
|
5062
5062
|
return result;
|
|
5063
5063
|
}
|
|
5064
5064
|
};
|
|
5065
|
+
_Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
5065
5066
|
var Version = _Version;
|
|
5066
|
-
Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
5067
5067
|
function tryParseComponents(text) {
|
|
5068
5068
|
const match = versionRegExp.exec(text);
|
|
5069
5069
|
if (!match)
|
|
@@ -5110,14 +5110,14 @@ function comparePrereleaseIdentifiers(left, right) {
|
|
|
5110
5110
|
}
|
|
5111
5111
|
return compareValues(left.length, right.length);
|
|
5112
5112
|
}
|
|
5113
|
-
var VersionRange = class {
|
|
5113
|
+
var VersionRange = class _VersionRange {
|
|
5114
5114
|
constructor(spec) {
|
|
5115
5115
|
this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
|
|
5116
5116
|
}
|
|
5117
5117
|
static tryParse(text) {
|
|
5118
5118
|
const sets = parseRange(text);
|
|
5119
5119
|
if (sets) {
|
|
5120
|
-
const range = new
|
|
5120
|
+
const range = new _VersionRange("");
|
|
5121
5121
|
range._alternatives = sets;
|
|
5122
5122
|
return range;
|
|
5123
5123
|
}
|
|
@@ -58290,9 +58290,9 @@ function createTypeChecker(host) {
|
|
|
58290
58290
|
function getConstraintOfTypeParameter(typeParameter) {
|
|
58291
58291
|
return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : void 0;
|
|
58292
58292
|
}
|
|
58293
|
-
function isConstTypeVariable(type) {
|
|
58293
|
+
function isConstTypeVariable(type, depth = 0) {
|
|
58294
58294
|
var _a;
|
|
58295
|
-
return !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, isConstTypeVariable) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type)) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0));
|
|
58295
|
+
return depth < 5 && !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, (t) => isConstTypeVariable(t, depth)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType, depth + 1) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type), depth + 1) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType, depth) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t, depth)) >= 0));
|
|
58296
58296
|
}
|
|
58297
58297
|
function getConstraintOfIndexedAccess(type) {
|
|
58298
58298
|
return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
|
|
@@ -87999,13 +87999,13 @@ function createBasicNodeBuilderModuleSpecifierResolutionHost(host) {
|
|
|
87999
87999
|
readFile: host.readFile ? (fileName) => host.readFile(fileName) : void 0
|
|
88000
88000
|
};
|
|
88001
88001
|
}
|
|
88002
|
-
var SymbolTrackerImpl = class {
|
|
88002
|
+
var SymbolTrackerImpl = class _SymbolTrackerImpl {
|
|
88003
88003
|
constructor(context, tracker, moduleResolverHost) {
|
|
88004
88004
|
this.moduleResolverHost = void 0;
|
|
88005
88005
|
this.inner = void 0;
|
|
88006
88006
|
this.disableTrackSymbol = false;
|
|
88007
88007
|
var _a;
|
|
88008
|
-
while (tracker instanceof
|
|
88008
|
+
while (tracker instanceof _SymbolTrackerImpl) {
|
|
88009
88009
|
tracker = tracker.inner;
|
|
88010
88010
|
}
|
|
88011
88011
|
this.inner = tracker;
|
|
@@ -166243,7 +166243,7 @@ function isSeparator(node, candidate) {
|
|
|
166243
166243
|
function isThisTypeAnnotatable(containingFunction) {
|
|
166244
166244
|
return isFunctionExpression(containingFunction) || isFunctionDeclaration(containingFunction);
|
|
166245
166245
|
}
|
|
166246
|
-
var ChangeTracker = class {
|
|
166246
|
+
var ChangeTracker = class _ChangeTracker {
|
|
166247
166247
|
/** Public for tests only. Other callers should use `ChangeTracker.with`. */
|
|
166248
166248
|
constructor(newLineCharacter, formatContext) {
|
|
166249
166249
|
this.newLineCharacter = newLineCharacter;
|
|
@@ -166254,10 +166254,10 @@ var ChangeTracker = class {
|
|
|
166254
166254
|
this.deletedNodes = [];
|
|
166255
166255
|
}
|
|
166256
166256
|
static fromContext(context) {
|
|
166257
|
-
return new
|
|
166257
|
+
return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
|
|
166258
166258
|
}
|
|
166259
166259
|
static with(context, cb) {
|
|
166260
|
-
const tracker =
|
|
166260
|
+
const tracker = _ChangeTracker.fromContext(context);
|
|
166261
166261
|
cb(tracker);
|
|
166262
166262
|
return tracker.getChanges();
|
|
166263
166263
|
}
|
|
@@ -173068,7 +173068,7 @@ function createSortedArray2() {
|
|
|
173068
173068
|
}
|
|
173069
173069
|
|
|
173070
173070
|
// src/server/utilities.ts
|
|
173071
|
-
var ThrottledOperations = class {
|
|
173071
|
+
var ThrottledOperations = class _ThrottledOperations {
|
|
173072
173072
|
constructor(host, logger) {
|
|
173073
173073
|
this.host = host;
|
|
173074
173074
|
this.pendingTimeouts = /* @__PURE__ */ new Map();
|
|
@@ -173085,7 +173085,7 @@ var ThrottledOperations = class {
|
|
|
173085
173085
|
if (pendingTimeout) {
|
|
173086
173086
|
this.host.clearTimeout(pendingTimeout);
|
|
173087
173087
|
}
|
|
173088
|
-
this.pendingTimeouts.set(operationId, this.host.setTimeout(
|
|
173088
|
+
this.pendingTimeouts.set(operationId, this.host.setTimeout(_ThrottledOperations.run, delay, operationId, this, cb));
|
|
173089
173089
|
if (this.logger) {
|
|
173090
173090
|
this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
|
|
173091
173091
|
}
|
|
@@ -173108,7 +173108,7 @@ var ThrottledOperations = class {
|
|
|
173108
173108
|
(_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
|
|
173109
173109
|
}
|
|
173110
173110
|
};
|
|
173111
|
-
var GcTimer = class {
|
|
173111
|
+
var GcTimer = class _GcTimer {
|
|
173112
173112
|
constructor(host, delay, logger) {
|
|
173113
173113
|
this.host = host;
|
|
173114
173114
|
this.delay = delay;
|
|
@@ -173118,7 +173118,7 @@ var GcTimer = class {
|
|
|
173118
173118
|
if (!this.host.gc || this.timerId !== void 0) {
|
|
173119
173119
|
return;
|
|
173120
173120
|
}
|
|
173121
|
-
this.timerId = this.host.setTimeout(
|
|
173121
|
+
this.timerId = this.host.setTimeout(_GcTimer.run, this.delay, this);
|
|
173122
173122
|
}
|
|
173123
173123
|
static run(self) {
|
|
173124
173124
|
var _a, _b;
|
|
@@ -174069,7 +174069,7 @@ function hasNoTypeScriptSource(fileNames) {
|
|
|
174069
174069
|
function isGeneratedFileWatcher(watch) {
|
|
174070
174070
|
return watch.generatedFilePath !== void 0;
|
|
174071
174071
|
}
|
|
174072
|
-
var Project3 = class {
|
|
174072
|
+
var Project3 = class _Project {
|
|
174073
174073
|
/** @internal */
|
|
174074
174074
|
constructor(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
|
|
174075
174075
|
this.projectKind = projectKind;
|
|
@@ -174186,7 +174186,7 @@ var Project3 = class {
|
|
|
174186
174186
|
return hasOneOrMoreJsAndNoTsFiles(this);
|
|
174187
174187
|
}
|
|
174188
174188
|
static resolveModule(moduleName, initialDir, host, log) {
|
|
174189
|
-
return
|
|
174189
|
+
return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
|
|
174190
174190
|
}
|
|
174191
174191
|
/** @internal */
|
|
174192
174192
|
static importServicePluginSync(pluginConfigEntry, searchPaths, host, log) {
|
|
@@ -175791,7 +175791,7 @@ var AuxiliaryProject = class extends Project3 {
|
|
|
175791
175791
|
return;
|
|
175792
175792
|
}
|
|
175793
175793
|
};
|
|
175794
|
-
var _AutoImportProviderProject = class extends Project3 {
|
|
175794
|
+
var _AutoImportProviderProject = class _AutoImportProviderProject extends Project3 {
|
|
175795
175795
|
/** @internal */
|
|
175796
175796
|
constructor(hostProject, initialRootNames, documentRegistry, compilerOptions) {
|
|
175797
175797
|
super(
|
|
@@ -176015,11 +176015,10 @@ var _AutoImportProviderProject = class extends Project3 {
|
|
|
176015
176015
|
return (_a = this.hostProject.getCurrentProgram()) == null ? void 0 : _a.getModuleResolutionCache();
|
|
176016
176016
|
}
|
|
176017
176017
|
};
|
|
176018
|
-
var AutoImportProviderProject = _AutoImportProviderProject;
|
|
176019
176018
|
/** @internal */
|
|
176020
|
-
|
|
176019
|
+
_AutoImportProviderProject.maxDependencies = 10;
|
|
176021
176020
|
/** @internal */
|
|
176022
|
-
|
|
176021
|
+
_AutoImportProviderProject.compilerOptionsOverrides = {
|
|
176023
176022
|
diagnostics: false,
|
|
176024
176023
|
skipLibCheck: true,
|
|
176025
176024
|
sourceMap: false,
|
|
@@ -176027,6 +176026,7 @@ AutoImportProviderProject.compilerOptionsOverrides = {
|
|
|
176027
176026
|
lib: emptyArray,
|
|
176028
176027
|
noLib: true
|
|
176029
176028
|
};
|
|
176029
|
+
var AutoImportProviderProject = _AutoImportProviderProject;
|
|
176030
176030
|
var ConfiguredProject2 = class extends Project3 {
|
|
176031
176031
|
/** @internal */
|
|
176032
176032
|
constructor(configFileName, canonicalConfigFilePath, projectService, documentRegistry, cachedDirectoryStructureHost) {
|
|
@@ -176588,7 +176588,7 @@ function createProjectNameFactoryWithCounter(nameFactory) {
|
|
|
176588
176588
|
let nextId = 1;
|
|
176589
176589
|
return () => nameFactory(nextId++);
|
|
176590
176590
|
}
|
|
176591
|
-
var _ProjectService = class {
|
|
176591
|
+
var _ProjectService = class _ProjectService {
|
|
176592
176592
|
constructor(opts) {
|
|
176593
176593
|
/**
|
|
176594
176594
|
* Container of all known scripts
|
|
@@ -179571,9 +179571,9 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
179571
179571
|
return this.incompleteCompletionsCache || (this.incompleteCompletionsCache = createIncompleteCompletionsCache());
|
|
179572
179572
|
}
|
|
179573
179573
|
};
|
|
179574
|
-
var ProjectService3 = _ProjectService;
|
|
179575
179574
|
/** Makes a filename safe to insert in a RegExp */
|
|
179576
|
-
|
|
179575
|
+
_ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
|
|
179576
|
+
var ProjectService3 = _ProjectService;
|
|
179577
179577
|
function createIncompleteCompletionsCache() {
|
|
179578
179578
|
let info;
|
|
179579
179579
|
return {
|
|
@@ -180240,7 +180240,7 @@ var invalidSyntacticModeCommands = [
|
|
|
180240
180240
|
"documentHighlights" /* DocumentHighlights */,
|
|
180241
180241
|
"documentHighlights-full" /* DocumentHighlightsFull */
|
|
180242
180242
|
];
|
|
180243
|
-
var Session3 = class {
|
|
180243
|
+
var Session3 = class _Session {
|
|
180244
180244
|
constructor(opts) {
|
|
180245
180245
|
this.changeSeq = 0;
|
|
180246
180246
|
this.handlers = new Map(Object.entries({
|
|
@@ -181343,7 +181343,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
181343
181343
|
const { file, project } = this.getFileAndProject(args);
|
|
181344
181344
|
const position = this.getPositionInFile(args, file);
|
|
181345
181345
|
const definitions = this.mapDefinitionInfoLocations(project.getLanguageService().getDefinitionAtPosition(file, position) || emptyArray2, project);
|
|
181346
|
-
return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(
|
|
181346
|
+
return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(_Session.mapToOriginalLocation);
|
|
181347
181347
|
}
|
|
181348
181348
|
mapDefinitionInfoLocations(definitions, project) {
|
|
181349
181349
|
return definitions.map((info) => {
|
|
@@ -181380,7 +181380,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
181380
181380
|
};
|
|
181381
181381
|
}
|
|
181382
181382
|
return {
|
|
181383
|
-
definitions: definitions.map(
|
|
181383
|
+
definitions: definitions.map(_Session.mapToOriginalLocation),
|
|
181384
181384
|
textSpan
|
|
181385
181385
|
};
|
|
181386
181386
|
}
|
|
@@ -181637,7 +181637,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
181637
181637
|
const { file, project } = this.getFileAndProject(args);
|
|
181638
181638
|
const position = this.getPositionInFile(args, file);
|
|
181639
181639
|
const implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || emptyArray2, project);
|
|
181640
|
-
return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(
|
|
181640
|
+
return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(_Session.mapToOriginalLocation);
|
|
181641
181641
|
}
|
|
181642
181642
|
getSyntacticDiagnosticsSync(args) {
|
|
181643
181643
|
const { configFile } = this.getConfigFileAndProject(args);
|
|
@@ -183261,7 +183261,7 @@ var TextChange9 = class {
|
|
|
183261
183261
|
);
|
|
183262
183262
|
}
|
|
183263
183263
|
};
|
|
183264
|
-
var _ScriptVersionCache = class {
|
|
183264
|
+
var _ScriptVersionCache = class _ScriptVersionCache {
|
|
183265
183265
|
constructor() {
|
|
183266
183266
|
this.changes = [];
|
|
183267
183267
|
this.versions = new Array(_ScriptVersionCache.maxVersions);
|
|
@@ -183353,11 +183353,11 @@ var _ScriptVersionCache = class {
|
|
|
183353
183353
|
return svc;
|
|
183354
183354
|
}
|
|
183355
183355
|
};
|
|
183356
|
+
_ScriptVersionCache.changeNumberThreshold = 8;
|
|
183357
|
+
_ScriptVersionCache.changeLengthThreshold = 256;
|
|
183358
|
+
_ScriptVersionCache.maxVersions = 8;
|
|
183356
183359
|
var ScriptVersionCache = _ScriptVersionCache;
|
|
183357
|
-
|
|
183358
|
-
ScriptVersionCache.changeLengthThreshold = 256;
|
|
183359
|
-
ScriptVersionCache.maxVersions = 8;
|
|
183360
|
-
var LineIndexSnapshot = class {
|
|
183360
|
+
var LineIndexSnapshot = class _LineIndexSnapshot {
|
|
183361
183361
|
constructor(version2, cache, index, changesSincePreviousVersion = emptyArray2) {
|
|
183362
183362
|
this.version = version2;
|
|
183363
183363
|
this.cache = cache;
|
|
@@ -183371,7 +183371,7 @@ var LineIndexSnapshot = class {
|
|
|
183371
183371
|
return this.index.getLength();
|
|
183372
183372
|
}
|
|
183373
183373
|
getChangeRange(oldSnapshot) {
|
|
183374
|
-
if (oldSnapshot instanceof
|
|
183374
|
+
if (oldSnapshot instanceof _LineIndexSnapshot && this.cache === oldSnapshot.cache) {
|
|
183375
183375
|
if (this.version <= oldSnapshot.version) {
|
|
183376
183376
|
return unchangedTextChangeRange;
|
|
183377
183377
|
} else {
|
|
@@ -183380,7 +183380,7 @@ var LineIndexSnapshot = class {
|
|
|
183380
183380
|
}
|
|
183381
183381
|
}
|
|
183382
183382
|
};
|
|
183383
|
-
var LineIndex = class {
|
|
183383
|
+
var LineIndex = class _LineIndex {
|
|
183384
183384
|
constructor() {
|
|
183385
183385
|
// set this to true to check each edit for accuracy
|
|
183386
183386
|
this.checkEdits = false;
|
|
@@ -183413,7 +183413,7 @@ var LineIndex = class {
|
|
|
183413
183413
|
for (let i = 0; i < lines.length; i++) {
|
|
183414
183414
|
leaves[i] = new LineLeaf(lines[i]);
|
|
183415
183415
|
}
|
|
183416
|
-
this.root =
|
|
183416
|
+
this.root = _LineIndex.buildTreeFromBottom(leaves);
|
|
183417
183417
|
} else {
|
|
183418
183418
|
this.root = new LineNode();
|
|
183419
183419
|
}
|
|
@@ -183457,7 +183457,7 @@ var LineIndex = class {
|
|
|
183457
183457
|
if (this.root.charCount() === 0) {
|
|
183458
183458
|
Debug.assert(deleteLength === 0);
|
|
183459
183459
|
if (newText !== void 0) {
|
|
183460
|
-
this.load(
|
|
183460
|
+
this.load(_LineIndex.linesFromText(newText).lines);
|
|
183461
183461
|
return this;
|
|
183462
183462
|
}
|
|
183463
183463
|
return void 0;
|
|
@@ -183528,7 +183528,7 @@ var LineIndex = class {
|
|
|
183528
183528
|
return { lines, lineMap };
|
|
183529
183529
|
}
|
|
183530
183530
|
};
|
|
183531
|
-
var LineNode = class {
|
|
183531
|
+
var LineNode = class _LineNode {
|
|
183532
183532
|
constructor(children = []) {
|
|
183533
183533
|
this.children = children;
|
|
183534
183534
|
this.totalChars = 0;
|
|
@@ -183660,7 +183660,7 @@ var LineNode = class {
|
|
|
183660
183660
|
childIndex++;
|
|
183661
183661
|
const endLength = childIndex;
|
|
183662
183662
|
if (childIndex < clen) {
|
|
183663
|
-
splitNode = new
|
|
183663
|
+
splitNode = new _LineNode();
|
|
183664
183664
|
while (childIndex < clen) {
|
|
183665
183665
|
splitNode.add(this.children[childIndex]);
|
|
183666
183666
|
childIndex++;
|
|
@@ -183709,7 +183709,7 @@ var LineNode = class {
|
|
|
183709
183709
|
splitNodes = new Array(splitNodeCount);
|
|
183710
183710
|
let splitNodeIndex = 0;
|
|
183711
183711
|
for (let i = 0; i < splitNodeCount; i++) {
|
|
183712
|
-
splitNodes[i] = new
|
|
183712
|
+
splitNodes[i] = new _LineNode();
|
|
183713
183713
|
}
|
|
183714
183714
|
let splitNode = splitNodes[0];
|
|
183715
183715
|
while (nodeIndex < nodeCount) {
|
|
@@ -184192,7 +184192,7 @@ function startNodeSession(options, logger, cancellationToken) {
|
|
|
184192
184192
|
output: process.stdout,
|
|
184193
184193
|
terminal: false
|
|
184194
184194
|
});
|
|
184195
|
-
const _NodeTypingsInstaller = class {
|
|
184195
|
+
const _NodeTypingsInstaller = class _NodeTypingsInstaller {
|
|
184196
184196
|
constructor(telemetryEnabled2, logger2, host, globalTypingsCacheLocation, typingSafeListLocation2, typesMapLocation2, npmLocation2, validateDefaultNpmLocation2, event) {
|
|
184197
184197
|
this.telemetryEnabled = telemetryEnabled2;
|
|
184198
184198
|
this.logger = logger2;
|
|
@@ -184400,14 +184400,14 @@ function startNodeSession(options, logger, cancellationToken) {
|
|
|
184400
184400
|
this.host.setTimeout(request.operation, _NodeTypingsInstaller.requestDelayMillis);
|
|
184401
184401
|
}
|
|
184402
184402
|
};
|
|
184403
|
-
let NodeTypingsInstaller = _NodeTypingsInstaller;
|
|
184404
184403
|
// This number is essentially arbitrary. Processing more than one typings request
|
|
184405
184404
|
// at a time makes sense, but having too many in the pipe results in a hang
|
|
184406
184405
|
// (see https://github.com/nodejs/node/issues/7657).
|
|
184407
184406
|
// It would be preferable to base our limit on the amount of space left in the
|
|
184408
184407
|
// buffer, but we have yet to find a way to retrieve that value.
|
|
184409
|
-
|
|
184410
|
-
|
|
184408
|
+
_NodeTypingsInstaller.maxActiveRequestCount = 10;
|
|
184409
|
+
_NodeTypingsInstaller.requestDelayMillis = 100;
|
|
184410
|
+
let NodeTypingsInstaller = _NodeTypingsInstaller;
|
|
184411
184411
|
class IOSession extends Session3 {
|
|
184412
184412
|
constructor() {
|
|
184413
184413
|
const event = (body, eventName) => {
|
package/lib/tsserverlibrary.js
CHANGED
|
@@ -35,7 +35,7 @@ var ts = (() => {
|
|
|
35
35
|
"src/compiler/corePublic.ts"() {
|
|
36
36
|
"use strict";
|
|
37
37
|
versionMajorMinor = "5.2";
|
|
38
|
-
version = `${versionMajorMinor}.0-dev.
|
|
38
|
+
version = `${versionMajorMinor}.0-dev.20230617`;
|
|
39
39
|
Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
40
40
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
41
41
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -2942,7 +2942,7 @@ ${lanes.join("\n")}
|
|
|
2942
2942
|
buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
|
|
2943
2943
|
buildPartRegExp = /^[a-z0-9-]+$/i;
|
|
2944
2944
|
numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
|
|
2945
|
-
_Version = class {
|
|
2945
|
+
_Version = class _Version {
|
|
2946
2946
|
constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
|
|
2947
2947
|
if (typeof major === "string") {
|
|
2948
2948
|
const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
|
|
@@ -3006,16 +3006,16 @@ ${lanes.join("\n")}
|
|
|
3006
3006
|
return result;
|
|
3007
3007
|
}
|
|
3008
3008
|
};
|
|
3009
|
+
_Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
3009
3010
|
Version = _Version;
|
|
3010
|
-
|
|
3011
|
-
VersionRange = class {
|
|
3011
|
+
VersionRange = class _VersionRange {
|
|
3012
3012
|
constructor(spec) {
|
|
3013
3013
|
this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
|
|
3014
3014
|
}
|
|
3015
3015
|
static tryParse(text) {
|
|
3016
3016
|
const sets = parseRange(text);
|
|
3017
3017
|
if (sets) {
|
|
3018
|
-
const range = new
|
|
3018
|
+
const range = new _VersionRange("");
|
|
3019
3019
|
range._alternatives = sets;
|
|
3020
3020
|
return range;
|
|
3021
3021
|
}
|
|
@@ -56079,9 +56079,9 @@ ${lanes.join("\n")}
|
|
|
56079
56079
|
function getConstraintOfTypeParameter(typeParameter) {
|
|
56080
56080
|
return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : void 0;
|
|
56081
56081
|
}
|
|
56082
|
-
function isConstTypeVariable(type) {
|
|
56082
|
+
function isConstTypeVariable(type, depth = 0) {
|
|
56083
56083
|
var _a;
|
|
56084
|
-
return !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, isConstTypeVariable) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type)) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0));
|
|
56084
|
+
return depth < 5 && !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, (t) => isConstTypeVariable(t, depth)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType, depth + 1) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type), depth + 1) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType, depth) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t, depth)) >= 0));
|
|
56085
56085
|
}
|
|
56086
56086
|
function getConstraintOfIndexedAccess(type) {
|
|
56087
56087
|
return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
|
|
@@ -85920,13 +85920,13 @@ ${lanes.join("\n")}
|
|
|
85920
85920
|
JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
|
|
85921
85921
|
JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
|
|
85922
85922
|
})(JsxNames || (JsxNames = {}));
|
|
85923
|
-
SymbolTrackerImpl = class {
|
|
85923
|
+
SymbolTrackerImpl = class _SymbolTrackerImpl {
|
|
85924
85924
|
constructor(context, tracker, moduleResolverHost) {
|
|
85925
85925
|
this.moduleResolverHost = void 0;
|
|
85926
85926
|
this.inner = void 0;
|
|
85927
85927
|
this.disableTrackSymbol = false;
|
|
85928
85928
|
var _a;
|
|
85929
|
-
while (tracker instanceof
|
|
85929
|
+
while (tracker instanceof _SymbolTrackerImpl) {
|
|
85930
85930
|
tracker = tracker.inner;
|
|
85931
85931
|
}
|
|
85932
85932
|
this.inner = tracker;
|
|
@@ -166121,7 +166121,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
166121
166121
|
leadingTriviaOption: 0 /* Exclude */,
|
|
166122
166122
|
trailingTriviaOption: 0 /* Exclude */
|
|
166123
166123
|
};
|
|
166124
|
-
ChangeTracker = class {
|
|
166124
|
+
ChangeTracker = class _ChangeTracker {
|
|
166125
166125
|
/** Public for tests only. Other callers should use `ChangeTracker.with`. */
|
|
166126
166126
|
constructor(newLineCharacter, formatContext) {
|
|
166127
166127
|
this.newLineCharacter = newLineCharacter;
|
|
@@ -166132,10 +166132,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
166132
166132
|
this.deletedNodes = [];
|
|
166133
166133
|
}
|
|
166134
166134
|
static fromContext(context) {
|
|
166135
|
-
return new
|
|
166135
|
+
return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
|
|
166136
166136
|
}
|
|
166137
166137
|
static with(context, cb) {
|
|
166138
|
-
const tracker =
|
|
166138
|
+
const tracker = _ChangeTracker.fromContext(context);
|
|
166139
166139
|
cb(tracker);
|
|
166140
166140
|
return tracker.getChanges();
|
|
166141
166141
|
}
|
|
@@ -170394,7 +170394,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
170394
170394
|
"use strict";
|
|
170395
170395
|
init_ts7();
|
|
170396
170396
|
init_ts_server3();
|
|
170397
|
-
ThrottledOperations = class {
|
|
170397
|
+
ThrottledOperations = class _ThrottledOperations {
|
|
170398
170398
|
constructor(host, logger) {
|
|
170399
170399
|
this.host = host;
|
|
170400
170400
|
this.pendingTimeouts = /* @__PURE__ */ new Map();
|
|
@@ -170411,7 +170411,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
170411
170411
|
if (pendingTimeout) {
|
|
170412
170412
|
this.host.clearTimeout(pendingTimeout);
|
|
170413
170413
|
}
|
|
170414
|
-
this.pendingTimeouts.set(operationId, this.host.setTimeout(
|
|
170414
|
+
this.pendingTimeouts.set(operationId, this.host.setTimeout(_ThrottledOperations.run, delay, operationId, this, cb));
|
|
170415
170415
|
if (this.logger) {
|
|
170416
170416
|
this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
|
|
170417
170417
|
}
|
|
@@ -170434,7 +170434,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
170434
170434
|
(_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
|
|
170435
170435
|
}
|
|
170436
170436
|
};
|
|
170437
|
-
GcTimer = class {
|
|
170437
|
+
GcTimer = class _GcTimer {
|
|
170438
170438
|
constructor(host, delay, logger) {
|
|
170439
170439
|
this.host = host;
|
|
170440
170440
|
this.delay = delay;
|
|
@@ -170444,7 +170444,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
170444
170444
|
if (!this.host.gc || this.timerId !== void 0) {
|
|
170445
170445
|
return;
|
|
170446
170446
|
}
|
|
170447
|
-
this.timerId = this.host.setTimeout(
|
|
170447
|
+
this.timerId = this.host.setTimeout(_GcTimer.run, this.delay, this);
|
|
170448
170448
|
}
|
|
170449
170449
|
static run(self) {
|
|
170450
170450
|
var _a, _b;
|
|
@@ -171440,7 +171440,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
171440
171440
|
ProjectKind2[ProjectKind2["Auxiliary"] = 4] = "Auxiliary";
|
|
171441
171441
|
return ProjectKind2;
|
|
171442
171442
|
})(ProjectKind || {});
|
|
171443
|
-
Project3 = class {
|
|
171443
|
+
Project3 = class _Project {
|
|
171444
171444
|
/** @internal */
|
|
171445
171445
|
constructor(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
|
|
171446
171446
|
this.projectKind = projectKind;
|
|
@@ -171557,7 +171557,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
171557
171557
|
return hasOneOrMoreJsAndNoTsFiles(this);
|
|
171558
171558
|
}
|
|
171559
171559
|
static resolveModule(moduleName, initialDir, host, log) {
|
|
171560
|
-
return
|
|
171560
|
+
return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
|
|
171561
171561
|
}
|
|
171562
171562
|
/** @internal */
|
|
171563
171563
|
static importServicePluginSync(pluginConfigEntry, searchPaths, host, log) {
|
|
@@ -173140,7 +173140,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
173140
173140
|
return;
|
|
173141
173141
|
}
|
|
173142
173142
|
};
|
|
173143
|
-
_AutoImportProviderProject = class extends Project3 {
|
|
173143
|
+
_AutoImportProviderProject = class _AutoImportProviderProject extends Project3 {
|
|
173144
173144
|
/** @internal */
|
|
173145
173145
|
constructor(hostProject, initialRootNames, documentRegistry, compilerOptions) {
|
|
173146
173146
|
super(
|
|
@@ -173364,11 +173364,10 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
173364
173364
|
return (_a = this.hostProject.getCurrentProgram()) == null ? void 0 : _a.getModuleResolutionCache();
|
|
173365
173365
|
}
|
|
173366
173366
|
};
|
|
173367
|
-
AutoImportProviderProject = _AutoImportProviderProject;
|
|
173368
173367
|
/** @internal */
|
|
173369
|
-
|
|
173368
|
+
_AutoImportProviderProject.maxDependencies = 10;
|
|
173370
173369
|
/** @internal */
|
|
173371
|
-
|
|
173370
|
+
_AutoImportProviderProject.compilerOptionsOverrides = {
|
|
173372
173371
|
diagnostics: false,
|
|
173373
173372
|
skipLibCheck: true,
|
|
173374
173373
|
sourceMap: false,
|
|
@@ -173376,6 +173375,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
173376
173375
|
lib: emptyArray,
|
|
173377
173376
|
noLib: true
|
|
173378
173377
|
};
|
|
173378
|
+
AutoImportProviderProject = _AutoImportProviderProject;
|
|
173379
173379
|
ConfiguredProject2 = class extends Project3 {
|
|
173380
173380
|
/** @internal */
|
|
173381
173381
|
constructor(configFileName, canonicalConfigFilePath, projectService, documentRegistry, cachedDirectoryStructureHost) {
|
|
@@ -173963,7 +173963,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
173963
173963
|
ProjectReferenceProjectLoadKind2[ProjectReferenceProjectLoadKind2["FindCreateLoad"] = 2] = "FindCreateLoad";
|
|
173964
173964
|
return ProjectReferenceProjectLoadKind2;
|
|
173965
173965
|
})(ProjectReferenceProjectLoadKind || {});
|
|
173966
|
-
_ProjectService = class {
|
|
173966
|
+
_ProjectService = class _ProjectService {
|
|
173967
173967
|
constructor(opts) {
|
|
173968
173968
|
/**
|
|
173969
173969
|
* Container of all known scripts
|
|
@@ -176946,9 +176946,9 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
176946
176946
|
return this.incompleteCompletionsCache || (this.incompleteCompletionsCache = createIncompleteCompletionsCache());
|
|
176947
176947
|
}
|
|
176948
176948
|
};
|
|
176949
|
-
ProjectService3 = _ProjectService;
|
|
176950
176949
|
/** Makes a filename safe to insert in a RegExp */
|
|
176951
|
-
|
|
176950
|
+
_ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
|
|
176951
|
+
ProjectService3 = _ProjectService;
|
|
176952
176952
|
}
|
|
176953
176953
|
});
|
|
176954
176954
|
|
|
@@ -177684,7 +177684,7 @@ ${json}${newLine}`;
|
|
|
177684
177684
|
"documentHighlights" /* DocumentHighlights */,
|
|
177685
177685
|
"documentHighlights-full" /* DocumentHighlightsFull */
|
|
177686
177686
|
];
|
|
177687
|
-
Session3 = class {
|
|
177687
|
+
Session3 = class _Session {
|
|
177688
177688
|
constructor(opts) {
|
|
177689
177689
|
this.changeSeq = 0;
|
|
177690
177690
|
this.handlers = new Map(Object.entries({
|
|
@@ -178787,7 +178787,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
178787
178787
|
const { file, project } = this.getFileAndProject(args);
|
|
178788
178788
|
const position = this.getPositionInFile(args, file);
|
|
178789
178789
|
const definitions = this.mapDefinitionInfoLocations(project.getLanguageService().getDefinitionAtPosition(file, position) || emptyArray2, project);
|
|
178790
|
-
return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(
|
|
178790
|
+
return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(_Session.mapToOriginalLocation);
|
|
178791
178791
|
}
|
|
178792
178792
|
mapDefinitionInfoLocations(definitions, project) {
|
|
178793
178793
|
return definitions.map((info) => {
|
|
@@ -178824,7 +178824,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
178824
178824
|
};
|
|
178825
178825
|
}
|
|
178826
178826
|
return {
|
|
178827
|
-
definitions: definitions.map(
|
|
178827
|
+
definitions: definitions.map(_Session.mapToOriginalLocation),
|
|
178828
178828
|
textSpan
|
|
178829
178829
|
};
|
|
178830
178830
|
}
|
|
@@ -179081,7 +179081,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
179081
179081
|
const { file, project } = this.getFileAndProject(args);
|
|
179082
179082
|
const position = this.getPositionInFile(args, file);
|
|
179083
179083
|
const implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || emptyArray2, project);
|
|
179084
|
-
return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(
|
|
179084
|
+
return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(_Session.mapToOriginalLocation);
|
|
179085
179085
|
}
|
|
179086
179086
|
getSyntacticDiagnosticsSync(args) {
|
|
179087
179087
|
const { configFile } = this.getConfigFileAndProject(args);
|
|
@@ -180638,7 +180638,7 @@ ${e.message}`;
|
|
|
180638
180638
|
);
|
|
180639
180639
|
}
|
|
180640
180640
|
};
|
|
180641
|
-
_ScriptVersionCache = class {
|
|
180641
|
+
_ScriptVersionCache = class _ScriptVersionCache {
|
|
180642
180642
|
constructor() {
|
|
180643
180643
|
this.changes = [];
|
|
180644
180644
|
this.versions = new Array(_ScriptVersionCache.maxVersions);
|
|
@@ -180730,11 +180730,11 @@ ${e.message}`;
|
|
|
180730
180730
|
return svc;
|
|
180731
180731
|
}
|
|
180732
180732
|
};
|
|
180733
|
+
_ScriptVersionCache.changeNumberThreshold = 8;
|
|
180734
|
+
_ScriptVersionCache.changeLengthThreshold = 256;
|
|
180735
|
+
_ScriptVersionCache.maxVersions = 8;
|
|
180733
180736
|
ScriptVersionCache = _ScriptVersionCache;
|
|
180734
|
-
|
|
180735
|
-
ScriptVersionCache.changeLengthThreshold = 256;
|
|
180736
|
-
ScriptVersionCache.maxVersions = 8;
|
|
180737
|
-
LineIndexSnapshot = class {
|
|
180737
|
+
LineIndexSnapshot = class _LineIndexSnapshot {
|
|
180738
180738
|
constructor(version2, cache, index, changesSincePreviousVersion = emptyArray2) {
|
|
180739
180739
|
this.version = version2;
|
|
180740
180740
|
this.cache = cache;
|
|
@@ -180748,7 +180748,7 @@ ${e.message}`;
|
|
|
180748
180748
|
return this.index.getLength();
|
|
180749
180749
|
}
|
|
180750
180750
|
getChangeRange(oldSnapshot) {
|
|
180751
|
-
if (oldSnapshot instanceof
|
|
180751
|
+
if (oldSnapshot instanceof _LineIndexSnapshot && this.cache === oldSnapshot.cache) {
|
|
180752
180752
|
if (this.version <= oldSnapshot.version) {
|
|
180753
180753
|
return unchangedTextChangeRange;
|
|
180754
180754
|
} else {
|
|
@@ -180757,7 +180757,7 @@ ${e.message}`;
|
|
|
180757
180757
|
}
|
|
180758
180758
|
}
|
|
180759
180759
|
};
|
|
180760
|
-
LineIndex = class {
|
|
180760
|
+
LineIndex = class _LineIndex {
|
|
180761
180761
|
constructor() {
|
|
180762
180762
|
// set this to true to check each edit for accuracy
|
|
180763
180763
|
this.checkEdits = false;
|
|
@@ -180790,7 +180790,7 @@ ${e.message}`;
|
|
|
180790
180790
|
for (let i = 0; i < lines.length; i++) {
|
|
180791
180791
|
leaves[i] = new LineLeaf(lines[i]);
|
|
180792
180792
|
}
|
|
180793
|
-
this.root =
|
|
180793
|
+
this.root = _LineIndex.buildTreeFromBottom(leaves);
|
|
180794
180794
|
} else {
|
|
180795
180795
|
this.root = new LineNode();
|
|
180796
180796
|
}
|
|
@@ -180834,7 +180834,7 @@ ${e.message}`;
|
|
|
180834
180834
|
if (this.root.charCount() === 0) {
|
|
180835
180835
|
Debug.assert(deleteLength === 0);
|
|
180836
180836
|
if (newText !== void 0) {
|
|
180837
|
-
this.load(
|
|
180837
|
+
this.load(_LineIndex.linesFromText(newText).lines);
|
|
180838
180838
|
return this;
|
|
180839
180839
|
}
|
|
180840
180840
|
return void 0;
|
|
@@ -180905,7 +180905,7 @@ ${e.message}`;
|
|
|
180905
180905
|
return { lines, lineMap };
|
|
180906
180906
|
}
|
|
180907
180907
|
};
|
|
180908
|
-
LineNode = class {
|
|
180908
|
+
LineNode = class _LineNode {
|
|
180909
180909
|
constructor(children = []) {
|
|
180910
180910
|
this.children = children;
|
|
180911
180911
|
this.totalChars = 0;
|
|
@@ -181037,7 +181037,7 @@ ${e.message}`;
|
|
|
181037
181037
|
childIndex++;
|
|
181038
181038
|
const endLength = childIndex;
|
|
181039
181039
|
if (childIndex < clen) {
|
|
181040
|
-
splitNode = new
|
|
181040
|
+
splitNode = new _LineNode();
|
|
181041
181041
|
while (childIndex < clen) {
|
|
181042
181042
|
splitNode.add(this.children[childIndex]);
|
|
181043
181043
|
childIndex++;
|
|
@@ -181086,7 +181086,7 @@ ${e.message}`;
|
|
|
181086
181086
|
splitNodes = new Array(splitNodeCount);
|
|
181087
181087
|
let splitNodeIndex = 0;
|
|
181088
181088
|
for (let i = 0; i < splitNodeCount; i++) {
|
|
181089
|
-
splitNodes[i] = new
|
|
181089
|
+
splitNodes[i] = new _LineNode();
|
|
181090
181090
|
}
|
|
181091
181091
|
let splitNode = splitNodes[0];
|
|
181092
181092
|
while (nodeIndex < nodeCount) {
|
package/lib/typescript.js
CHANGED
|
@@ -35,7 +35,7 @@ var ts = (() => {
|
|
|
35
35
|
"src/compiler/corePublic.ts"() {
|
|
36
36
|
"use strict";
|
|
37
37
|
versionMajorMinor = "5.2";
|
|
38
|
-
version = `${versionMajorMinor}.0-dev.
|
|
38
|
+
version = `${versionMajorMinor}.0-dev.20230617`;
|
|
39
39
|
Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
40
40
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
41
41
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -2942,7 +2942,7 @@ ${lanes.join("\n")}
|
|
|
2942
2942
|
buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
|
|
2943
2943
|
buildPartRegExp = /^[a-z0-9-]+$/i;
|
|
2944
2944
|
numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
|
|
2945
|
-
_Version = class {
|
|
2945
|
+
_Version = class _Version {
|
|
2946
2946
|
constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
|
|
2947
2947
|
if (typeof major === "string") {
|
|
2948
2948
|
const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
|
|
@@ -3006,16 +3006,16 @@ ${lanes.join("\n")}
|
|
|
3006
3006
|
return result;
|
|
3007
3007
|
}
|
|
3008
3008
|
};
|
|
3009
|
+
_Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
3009
3010
|
Version = _Version;
|
|
3010
|
-
|
|
3011
|
-
VersionRange = class {
|
|
3011
|
+
VersionRange = class _VersionRange {
|
|
3012
3012
|
constructor(spec) {
|
|
3013
3013
|
this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
|
|
3014
3014
|
}
|
|
3015
3015
|
static tryParse(text) {
|
|
3016
3016
|
const sets = parseRange(text);
|
|
3017
3017
|
if (sets) {
|
|
3018
|
-
const range = new
|
|
3018
|
+
const range = new _VersionRange("");
|
|
3019
3019
|
range._alternatives = sets;
|
|
3020
3020
|
return range;
|
|
3021
3021
|
}
|
|
@@ -56079,9 +56079,9 @@ ${lanes.join("\n")}
|
|
|
56079
56079
|
function getConstraintOfTypeParameter(typeParameter) {
|
|
56080
56080
|
return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : void 0;
|
|
56081
56081
|
}
|
|
56082
|
-
function isConstTypeVariable(type) {
|
|
56082
|
+
function isConstTypeVariable(type, depth = 0) {
|
|
56083
56083
|
var _a;
|
|
56084
|
-
return !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, isConstTypeVariable) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type)) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0));
|
|
56084
|
+
return depth < 5 && !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a = type.symbol) == null ? void 0 : _a.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, (t) => isConstTypeVariable(t, depth)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType, depth + 1) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type), depth + 1) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType, depth) || isGenericTupleType(type) && findIndex(getElementTypes(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t, depth)) >= 0));
|
|
56085
56085
|
}
|
|
56086
56086
|
function getConstraintOfIndexedAccess(type) {
|
|
56087
56087
|
return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
|
|
@@ -85920,13 +85920,13 @@ ${lanes.join("\n")}
|
|
|
85920
85920
|
JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
|
|
85921
85921
|
JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
|
|
85922
85922
|
})(JsxNames || (JsxNames = {}));
|
|
85923
|
-
SymbolTrackerImpl = class {
|
|
85923
|
+
SymbolTrackerImpl = class _SymbolTrackerImpl {
|
|
85924
85924
|
constructor(context, tracker, moduleResolverHost) {
|
|
85925
85925
|
this.moduleResolverHost = void 0;
|
|
85926
85926
|
this.inner = void 0;
|
|
85927
85927
|
this.disableTrackSymbol = false;
|
|
85928
85928
|
var _a;
|
|
85929
|
-
while (tracker instanceof
|
|
85929
|
+
while (tracker instanceof _SymbolTrackerImpl) {
|
|
85930
85930
|
tracker = tracker.inner;
|
|
85931
85931
|
}
|
|
85932
85932
|
this.inner = tracker;
|
|
@@ -166136,7 +166136,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
166136
166136
|
leadingTriviaOption: 0 /* Exclude */,
|
|
166137
166137
|
trailingTriviaOption: 0 /* Exclude */
|
|
166138
166138
|
};
|
|
166139
|
-
ChangeTracker = class {
|
|
166139
|
+
ChangeTracker = class _ChangeTracker {
|
|
166140
166140
|
/** Public for tests only. Other callers should use `ChangeTracker.with`. */
|
|
166141
166141
|
constructor(newLineCharacter, formatContext) {
|
|
166142
166142
|
this.newLineCharacter = newLineCharacter;
|
|
@@ -166147,10 +166147,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
166147
166147
|
this.deletedNodes = [];
|
|
166148
166148
|
}
|
|
166149
166149
|
static fromContext(context) {
|
|
166150
|
-
return new
|
|
166150
|
+
return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
|
|
166151
166151
|
}
|
|
166152
166152
|
static with(context, cb) {
|
|
166153
|
-
const tracker =
|
|
166153
|
+
const tracker = _ChangeTracker.fromContext(context);
|
|
166154
166154
|
cb(tracker);
|
|
166155
166155
|
return tracker.getChanges();
|
|
166156
166156
|
}
|
package/lib/typingsInstaller.js
CHANGED
|
@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
|
|
|
54
54
|
|
|
55
55
|
// src/compiler/corePublic.ts
|
|
56
56
|
var versionMajorMinor = "5.2";
|
|
57
|
-
var version = `${versionMajorMinor}.0-dev.
|
|
57
|
+
var version = `${versionMajorMinor}.0-dev.20230617`;
|
|
58
58
|
|
|
59
59
|
// src/compiler/core.ts
|
|
60
60
|
var emptyArray = [];
|
|
@@ -1856,7 +1856,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
|
|
|
1856
1856
|
var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
|
|
1857
1857
|
var buildPartRegExp = /^[a-z0-9-]+$/i;
|
|
1858
1858
|
var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
|
|
1859
|
-
var _Version = class {
|
|
1859
|
+
var _Version = class _Version {
|
|
1860
1860
|
constructor(major, minor = 0, patch = 0, prerelease = "", build = "") {
|
|
1861
1861
|
if (typeof major === "string") {
|
|
1862
1862
|
const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
|
|
@@ -1920,8 +1920,8 @@ var _Version = class {
|
|
|
1920
1920
|
return result;
|
|
1921
1921
|
}
|
|
1922
1922
|
};
|
|
1923
|
+
_Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
1923
1924
|
var Version = _Version;
|
|
1924
|
-
Version.zero = new _Version(0, 0, 0, ["0"]);
|
|
1925
1925
|
function tryParseComponents(text) {
|
|
1926
1926
|
const match = versionRegExp.exec(text);
|
|
1927
1927
|
if (!match)
|
|
@@ -1968,14 +1968,14 @@ function comparePrereleaseIdentifiers(left, right) {
|
|
|
1968
1968
|
}
|
|
1969
1969
|
return compareValues(left.length, right.length);
|
|
1970
1970
|
}
|
|
1971
|
-
var VersionRange = class {
|
|
1971
|
+
var VersionRange = class _VersionRange {
|
|
1972
1972
|
constructor(spec) {
|
|
1973
1973
|
this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
|
|
1974
1974
|
}
|
|
1975
1975
|
static tryParse(text) {
|
|
1976
1976
|
const sets = parseRange(text);
|
|
1977
1977
|
if (sets) {
|
|
1978
|
-
const range = new
|
|
1978
|
+
const range = new _VersionRange("");
|
|
1979
1979
|
range._alternatives = sets;
|
|
1980
1980
|
return range;
|
|
1981
1981
|
}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "typescript",
|
|
3
3
|
"author": "Microsoft Corp.",
|
|
4
4
|
"homepage": "https://www.typescriptlang.org/",
|
|
5
|
-
"version": "5.2.0-dev.
|
|
5
|
+
"version": "5.2.0-dev.20230617",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"description": "TypeScript is a language for application scale JavaScript development",
|
|
8
8
|
"keywords": [
|
|
@@ -114,5 +114,5 @@
|
|
|
114
114
|
"node": "20.1.0",
|
|
115
115
|
"npm": "8.19.4"
|
|
116
116
|
},
|
|
117
|
-
"gitHead": "
|
|
117
|
+
"gitHead": "5021dd87ef36e87bae39cbb5a30dabd295410920"
|
|
118
118
|
}
|