Bump version to 4.2.4 and LKG

microsoft · Apr 5, 2021 · fb6c839 · fb6c839
1 parent 6b33949
commit fb6c839
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 60 deletions.
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -65,7 +65,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.2";
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -4399,13 +4399,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -38474,7 +38474,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {

diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -96,7 +96,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7005,13 +7005,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -46983,7 +46983,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -148419,7 +148421,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -148433,15 +148435,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }

diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -290,7 +290,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7199,13 +7199,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -47177,7 +47177,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -148988,7 +148990,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -149002,15 +149004,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -290,7 +290,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7199,13 +7199,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -47177,7 +47177,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -148988,7 +148990,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -149002,15 +149004,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }

diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -290,7 +290,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7199,13 +7199,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -47177,7 +47177,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -148988,7 +148990,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -149002,15 +149004,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }

diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -85,7 +85,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -6994,13 +6994,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -46972,7 +46972,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.2.3",
+    "version": "4.2.4",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [

diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts
@@ -5,7 +5,7 @@ namespace ts {
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    export const version = "4.2.3" as string;
+    export const version = "4.2.4" as string;
 
     /**
      * Type of objects whose values are all of the same type.