Bump version to 4.1.3 and LKG

microsoft · Dec 10, 2020 · b512d91 · b512d91
1 parent 3c73625
commit b512d91
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 49 deletions.
diff --git a/lib/lib.es5.d.ts b/lib/lib.es5.d.ts
@@ -1396,7 +1396,7 @@ interface ArrayConstructor {
     (arrayLength?: number): any[];
     <T>(arrayLength: number): T[];
     <T>(...items: T[]): T[];
-    isArray<T>(arg: T | {}): arg is T extends readonly any[] ? (unknown extends T ? never : readonly any[]) : any[];
+    isArray(arg: any): arg is any[];
     readonly prototype: any[];
 }
 

diff --git a/lib/protocol.d.ts b/lib/protocol.d.ts
@@ -2569,7 +2569,9 @@ declare namespace ts.server.protocol {
         None = "None",
         Preserve = "Preserve",
         ReactNative = "ReactNative",
-        React = "React"
+        React = "React",
+        ReactJSX = "ReactJSX",
+        ReactJSXDev = "ReactJSXDev"
     }
     const enum ModuleKind {
         None = "None",
@@ -2579,6 +2581,7 @@ declare namespace ts.server.protocol {
         System = "System",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
     const enum ModuleResolutionKind {
@@ -2599,6 +2602,7 @@ declare namespace ts.server.protocol {
         ES2018 = "ES2018",
         ES2019 = "ES2019",
         ES2020 = "ES2020",
+        JSON = "JSON",
         ESNext = "ESNext"
     }
 }

diff --git a/lib/tsc.js b/lib/tsc.js
@@ -67,7 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.1";
-    ts.version = "4.1.2";
+    ts.version = "4.1.3";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -37353,7 +37353,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, undefined, resolved, false);
             return resolved;
@@ -52612,6 +52612,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096) {
@@ -52621,6 +52622,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16) {
@@ -52680,8 +52682,8 @@ var ts;
                     else {
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096) {
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                    if (sharedFlow) {
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -57019,9 +57021,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;

diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -94,7 +94,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
-    ts.version = "4.1.2";
+    ts.version = "4.1.3";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45694,7 +45694,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
             return resolved;
@@ -63123,6 +63123,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096 /* Shared */) {
@@ -63135,6 +63136,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16 /* Assignment */) {
@@ -63198,9 +63200,9 @@ var ts;
                         // simply return the non-auto declared type to reduce follow-on errors.
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096 /* Shared */) {
+                    if (sharedFlow) {
                         // Record visited node and the associated type in the cache.
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -68367,9 +68369,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;
@@ -149981,6 +149983,8 @@ var ts;
                 JsxEmit["Preserve"] = "Preserve";
                 JsxEmit["ReactNative"] = "ReactNative";
                 JsxEmit["React"] = "React";
+                JsxEmit["ReactJSX"] = "ReactJSX";
+                JsxEmit["ReactJSXDev"] = "ReactJSXDev";
             })(JsxEmit = protocol.JsxEmit || (protocol.JsxEmit = {}));
             var ModuleKind;
             (function (ModuleKind) {
@@ -149991,6 +149995,7 @@ var ts;
                 ModuleKind["System"] = "System";
                 ModuleKind["ES6"] = "ES6";
                 ModuleKind["ES2015"] = "ES2015";
+                ModuleKind["ES2020"] = "ES2020";
                 ModuleKind["ESNext"] = "ESNext";
             })(ModuleKind = protocol.ModuleKind || (protocol.ModuleKind = {}));
             var ModuleResolutionKind;
@@ -150014,6 +150019,7 @@ var ts;
                 ScriptTarget["ES2018"] = "ES2018";
                 ScriptTarget["ES2019"] = "ES2019";
                 ScriptTarget["ES2020"] = "ES2020";
+                ScriptTarget["JSON"] = "JSON";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
         })(protocol = server.protocol || (server.protocol = {}));
@@ -157078,7 +157084,7 @@ var ts;
             };
             Session.prototype.getEncodedSemanticClassifications = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                return project.getLanguageService().getEncodedSemanticClassifications(file, args);
+                return project.getLanguageService().getEncodedSemanticClassifications(file, args, args.format);
             };
             Session.prototype.getProject = function (projectFileName) {
                 return projectFileName === undefined ? undefined : this.projectService.findProject(projectFileName);

diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
@@ -9084,7 +9084,9 @@ declare namespace ts.server.protocol {
         None = "None",
         Preserve = "Preserve",
         ReactNative = "ReactNative",
-        React = "React"
+        React = "React",
+        ReactJSX = "ReactJSX",
+        ReactJSXDev = "ReactJSXDev"
     }
     enum ModuleKind {
         None = "None",
@@ -9094,6 +9096,7 @@ declare namespace ts.server.protocol {
         System = "System",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
     enum ModuleResolutionKind {
@@ -9114,6 +9117,7 @@ declare namespace ts.server.protocol {
         ES2018 = "ES2018",
         ES2019 = "ES2019",
         ES2020 = "ES2020",
+        JSON = "JSON",
         ESNext = "ESNext"
     }
 }

diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -288,7 +288,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
-    ts.version = "4.1.2";
+    ts.version = "4.1.3";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45888,7 +45888,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
             return resolved;
@@ -63317,6 +63317,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096 /* Shared */) {
@@ -63329,6 +63330,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16 /* Assignment */) {
@@ -63392,9 +63394,9 @@ var ts;
                         // simply return the non-auto declared type to reduce follow-on errors.
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096 /* Shared */) {
+                    if (sharedFlow) {
                         // Record visited node and the associated type in the cache.
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -68561,9 +68563,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;
@@ -150175,6 +150177,8 @@ var ts;
                 JsxEmit["Preserve"] = "Preserve";
                 JsxEmit["ReactNative"] = "ReactNative";
                 JsxEmit["React"] = "React";
+                JsxEmit["ReactJSX"] = "ReactJSX";
+                JsxEmit["ReactJSXDev"] = "ReactJSXDev";
             })(JsxEmit = protocol.JsxEmit || (protocol.JsxEmit = {}));
             var ModuleKind;
             (function (ModuleKind) {
@@ -150185,6 +150189,7 @@ var ts;
                 ModuleKind["System"] = "System";
                 ModuleKind["ES6"] = "ES6";
                 ModuleKind["ES2015"] = "ES2015";
+                ModuleKind["ES2020"] = "ES2020";
                 ModuleKind["ESNext"] = "ESNext";
             })(ModuleKind = protocol.ModuleKind || (protocol.ModuleKind = {}));
             var ModuleResolutionKind;
@@ -150208,6 +150213,7 @@ var ts;
                 ScriptTarget["ES2018"] = "ES2018";
                 ScriptTarget["ES2019"] = "ES2019";
                 ScriptTarget["ES2020"] = "ES2020";
+                ScriptTarget["JSON"] = "JSON";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
         })(protocol = server.protocol || (server.protocol = {}));
@@ -157272,7 +157278,7 @@ var ts;
             };
             Session.prototype.getEncodedSemanticClassifications = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                return project.getLanguageService().getEncodedSemanticClassifications(file, args);
+                return project.getLanguageService().getEncodedSemanticClassifications(file, args, args.format);
             };
             Session.prototype.getProject = function (projectFileName) {
                 return projectFileName === undefined ? undefined : this.projectService.findProject(projectFileName);

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -288,7 +288,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
-    ts.version = "4.1.2";
+    ts.version = "4.1.3";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45888,7 +45888,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
             return resolved;
@@ -63317,6 +63317,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096 /* Shared */) {
@@ -63329,6 +63330,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16 /* Assignment */) {
@@ -63392,9 +63394,9 @@ var ts;
                         // simply return the non-auto declared type to reduce follow-on errors.
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096 /* Shared */) {
+                    if (sharedFlow) {
                         // Record visited node and the associated type in the cache.
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -68561,9 +68563,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;