typescript 4.9.0-dev.20221026 → 4.9.0-dev.20221028

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.9";
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -59898,6 +59898,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 | 8192 | 32 | 512)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -59932,7 +59933,7 @@ var ts;
                 switch (node.kind) {
                     case 79:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108:
                         return getExplicitThisType(node);
                     case 106:

package/lib/tsserver.js

@@ -109,7 +109,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71611,6 +71611,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 /* SymbolFlags.Function */ | 8192 /* SymbolFlags.Method */ | 32 /* SymbolFlags.Class */ | 512 /* SymbolFlags.ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -71649,7 +71650,7 @@ var ts;
                 switch (node.kind) {
                     case 79 /* SyntaxKind.Identifier */:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* SymbolFlags.Alias */ ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108 /* SyntaxKind.ThisKeyword */:
                         return getExplicitThisType(node);
                     case 106 /* SyntaxKind.SuperKeyword */:
@@ -149951,10 +149952,10 @@ var ts;
                 !nodeIsInDecoratorContext(context.nextTokenParent);
         }
         function nodeIsInDecoratorContext(node) {
-            while (ts.isExpressionNode(node)) {
+            while (node && ts.isExpression(node)) {
                 node = node.parent;
             }
-            return node.kind === 167 /* SyntaxKind.Decorator */;
+            return node && node.kind === 167 /* SyntaxKind.Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
             return context.currentTokenParent.kind === 258 /* SyntaxKind.VariableDeclarationList */ &&
@@ -152872,6 +152873,26 @@ var ts;
         function startPositionToDeleteNodeInList(sourceFile, node) {
             return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
+        function endPositionToDeleteNodeInList(sourceFile, node, prevNode, nextNode) {
+            var end = startPositionToDeleteNodeInList(sourceFile, nextNode);
+            if (prevNode === undefined || ts.positionsAreOnSameLine(getAdjustedEndPosition(sourceFile, node, {}), end, sourceFile)) {
+                return end;
+            }
+            var token = ts.findPrecedingToken(nextNode.getStart(sourceFile), sourceFile);
+            if (isSeparator(node, token)) {
+                var prevToken = ts.findPrecedingToken(node.getStart(sourceFile), sourceFile);
+                if (isSeparator(prevNode, prevToken)) {
+                    var pos = ts.skipTrivia(sourceFile.text, token.getEnd(), /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                    if (ts.positionsAreOnSameLine(prevToken.getStart(sourceFile), token.getStart(sourceFile), sourceFile)) {
+                        return ts.isLineBreak(sourceFile.text.charCodeAt(pos - 1)) ? pos - 1 : pos;
+                    }
+                    if (ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
+                        return pos;
+                    }
+                }
+            }
+            return end;
+        }
         function getClassOrObjectBraceEnds(cls, sourceFile) {
             var open = ts.findChildOfKind(cls, 18 /* SyntaxKind.OpenBraceToken */, sourceFile);
             var close = ts.findChildOfKind(cls, 19 /* SyntaxKind.CloseBraceToken */, sourceFile);
@@ -153429,7 +153450,7 @@ var ts;
             deletedNodesInLists.add(node);
             changes.deleteRange(sourceFile, {
                 pos: startPositionToDeleteNodeInList(sourceFile, node),
-                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : startPositionToDeleteNodeInList(sourceFile, containingList[index + 1]),
+                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : endPositionToDeleteNodeInList(sourceFile, node, containingList[index - 1], containingList[index + 1]),
             });
         }
     })(textChanges = ts.textChanges || (ts.textChanges = {}));

package/lib/tsserverlibrary.js

@@ -108,7 +108,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71610,6 +71610,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 /* SymbolFlags.Function */ | 8192 /* SymbolFlags.Method */ | 32 /* SymbolFlags.Class */ | 512 /* SymbolFlags.ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -71648,7 +71649,7 @@ var ts;
                 switch (node.kind) {
                     case 79 /* SyntaxKind.Identifier */:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* SymbolFlags.Alias */ ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108 /* SyntaxKind.ThisKeyword */:
                         return getExplicitThisType(node);
                     case 106 /* SyntaxKind.SuperKeyword */:
@@ -150369,10 +150370,10 @@ var ts;
                 !nodeIsInDecoratorContext(context.nextTokenParent);
         }
         function nodeIsInDecoratorContext(node) {
-            while (ts.isExpressionNode(node)) {
+            while (node && ts.isExpression(node)) {
                 node = node.parent;
             }
-            return node.kind === 167 /* SyntaxKind.Decorator */;
+            return node && node.kind === 167 /* SyntaxKind.Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
             return context.currentTokenParent.kind === 258 /* SyntaxKind.VariableDeclarationList */ &&
@@ -153290,6 +153291,26 @@ var ts;
         function startPositionToDeleteNodeInList(sourceFile, node) {
             return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
+        function endPositionToDeleteNodeInList(sourceFile, node, prevNode, nextNode) {
+            var end = startPositionToDeleteNodeInList(sourceFile, nextNode);
+            if (prevNode === undefined || ts.positionsAreOnSameLine(getAdjustedEndPosition(sourceFile, node, {}), end, sourceFile)) {
+                return end;
+            }
+            var token = ts.findPrecedingToken(nextNode.getStart(sourceFile), sourceFile);
+            if (isSeparator(node, token)) {
+                var prevToken = ts.findPrecedingToken(node.getStart(sourceFile), sourceFile);
+                if (isSeparator(prevNode, prevToken)) {
+                    var pos = ts.skipTrivia(sourceFile.text, token.getEnd(), /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                    if (ts.positionsAreOnSameLine(prevToken.getStart(sourceFile), token.getStart(sourceFile), sourceFile)) {
+                        return ts.isLineBreak(sourceFile.text.charCodeAt(pos - 1)) ? pos - 1 : pos;
+                    }
+                    if (ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
+                        return pos;
+                    }
+                }
+            }
+            return end;
+        }
         function getClassOrObjectBraceEnds(cls, sourceFile) {
             var open = ts.findChildOfKind(cls, 18 /* SyntaxKind.OpenBraceToken */, sourceFile);
             var close = ts.findChildOfKind(cls, 19 /* SyntaxKind.CloseBraceToken */, sourceFile);
@@ -153847,7 +153868,7 @@ var ts;
             deletedNodesInLists.add(node);
             changes.deleteRange(sourceFile, {
                 pos: startPositionToDeleteNodeInList(sourceFile, node),
-                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : startPositionToDeleteNodeInList(sourceFile, containingList[index + 1]),
+                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : endPositionToDeleteNodeInList(sourceFile, node, containingList[index - 1], containingList[index + 1]),
             });
         }
     })(textChanges = ts.textChanges || (ts.textChanges = {}));

package/lib/typescript.js

@@ -99,7 +99,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71601,6 +71601,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 /* SymbolFlags.Function */ | 8192 /* SymbolFlags.Method */ | 32 /* SymbolFlags.Class */ | 512 /* SymbolFlags.ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -71639,7 +71640,7 @@ var ts;
                 switch (node.kind) {
                     case 79 /* SyntaxKind.Identifier */:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* SymbolFlags.Alias */ ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108 /* SyntaxKind.ThisKeyword */:
                         return getExplicitThisType(node);
                     case 106 /* SyntaxKind.SuperKeyword */:
@@ -150360,10 +150361,10 @@ var ts;
                 !nodeIsInDecoratorContext(context.nextTokenParent);
         }
         function nodeIsInDecoratorContext(node) {
-            while (ts.isExpressionNode(node)) {
+            while (node && ts.isExpression(node)) {
                 node = node.parent;
             }
-            return node.kind === 167 /* SyntaxKind.Decorator */;
+            return node && node.kind === 167 /* SyntaxKind.Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
             return context.currentTokenParent.kind === 258 /* SyntaxKind.VariableDeclarationList */ &&
@@ -153281,6 +153282,26 @@ var ts;
         function startPositionToDeleteNodeInList(sourceFile, node) {
             return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
+        function endPositionToDeleteNodeInList(sourceFile, node, prevNode, nextNode) {
+            var end = startPositionToDeleteNodeInList(sourceFile, nextNode);
+            if (prevNode === undefined || ts.positionsAreOnSameLine(getAdjustedEndPosition(sourceFile, node, {}), end, sourceFile)) {
+                return end;
+            }
+            var token = ts.findPrecedingToken(nextNode.getStart(sourceFile), sourceFile);
+            if (isSeparator(node, token)) {
+                var prevToken = ts.findPrecedingToken(node.getStart(sourceFile), sourceFile);
+                if (isSeparator(prevNode, prevToken)) {
+                    var pos = ts.skipTrivia(sourceFile.text, token.getEnd(), /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                    if (ts.positionsAreOnSameLine(prevToken.getStart(sourceFile), token.getStart(sourceFile), sourceFile)) {
+                        return ts.isLineBreak(sourceFile.text.charCodeAt(pos - 1)) ? pos - 1 : pos;
+                    }
+                    if (ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
+                        return pos;
+                    }
+                }
+            }
+            return end;
+        }
         function getClassOrObjectBraceEnds(cls, sourceFile) {
             var open = ts.findChildOfKind(cls, 18 /* SyntaxKind.OpenBraceToken */, sourceFile);
             var close = ts.findChildOfKind(cls, 19 /* SyntaxKind.CloseBraceToken */, sourceFile);
@@ -153838,7 +153859,7 @@ var ts;
             deletedNodesInLists.add(node);
             changes.deleteRange(sourceFile, {
                 pos: startPositionToDeleteNodeInList(sourceFile, node),
-                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : startPositionToDeleteNodeInList(sourceFile, containingList[index + 1]),
+                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : endPositionToDeleteNodeInList(sourceFile, node, containingList[index - 1], containingList[index + 1]),
             });
         }
     })(textChanges = ts.textChanges || (ts.textChanges = {}));

package/lib/typescriptServices.js

@@ -99,7 +99,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71601,6 +71601,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 /* SymbolFlags.Function */ | 8192 /* SymbolFlags.Method */ | 32 /* SymbolFlags.Class */ | 512 /* SymbolFlags.ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -71639,7 +71640,7 @@ var ts;
                 switch (node.kind) {
                     case 79 /* SyntaxKind.Identifier */:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* SymbolFlags.Alias */ ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108 /* SyntaxKind.ThisKeyword */:
                         return getExplicitThisType(node);
                     case 106 /* SyntaxKind.SuperKeyword */:
@@ -150360,10 +150361,10 @@ var ts;
                 !nodeIsInDecoratorContext(context.nextTokenParent);
         }
         function nodeIsInDecoratorContext(node) {
-            while (ts.isExpressionNode(node)) {
+            while (node && ts.isExpression(node)) {
                 node = node.parent;
             }
-            return node.kind === 167 /* SyntaxKind.Decorator */;
+            return node && node.kind === 167 /* SyntaxKind.Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
             return context.currentTokenParent.kind === 258 /* SyntaxKind.VariableDeclarationList */ &&
@@ -153281,6 +153282,26 @@ var ts;
         function startPositionToDeleteNodeInList(sourceFile, node) {
             return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
+        function endPositionToDeleteNodeInList(sourceFile, node, prevNode, nextNode) {
+            var end = startPositionToDeleteNodeInList(sourceFile, nextNode);
+            if (prevNode === undefined || ts.positionsAreOnSameLine(getAdjustedEndPosition(sourceFile, node, {}), end, sourceFile)) {
+                return end;
+            }
+            var token = ts.findPrecedingToken(nextNode.getStart(sourceFile), sourceFile);
+            if (isSeparator(node, token)) {
+                var prevToken = ts.findPrecedingToken(node.getStart(sourceFile), sourceFile);
+                if (isSeparator(prevNode, prevToken)) {
+                    var pos = ts.skipTrivia(sourceFile.text, token.getEnd(), /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                    if (ts.positionsAreOnSameLine(prevToken.getStart(sourceFile), token.getStart(sourceFile), sourceFile)) {
+                        return ts.isLineBreak(sourceFile.text.charCodeAt(pos - 1)) ? pos - 1 : pos;
+                    }
+                    if (ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
+                        return pos;
+                    }
+                }
+            }
+            return end;
+        }
         function getClassOrObjectBraceEnds(cls, sourceFile) {
             var open = ts.findChildOfKind(cls, 18 /* SyntaxKind.OpenBraceToken */, sourceFile);
             var close = ts.findChildOfKind(cls, 19 /* SyntaxKind.CloseBraceToken */, sourceFile);
@@ -153838,7 +153859,7 @@ var ts;
             deletedNodesInLists.add(node);
             changes.deleteRange(sourceFile, {
                 pos: startPositionToDeleteNodeInList(sourceFile, node),
-                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : startPositionToDeleteNodeInList(sourceFile, containingList[index + 1]),
+                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : endPositionToDeleteNodeInList(sourceFile, node, containingList[index - 1], containingList[index + 1]),
             });
         }
     })(textChanges = ts.textChanges || (ts.textChanges = {}));

package/lib/typingsInstaller.js

@@ -89,7 +89,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221026");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221028");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -71591,6 +71591,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 /* SymbolFlags.Function */ | 8192 /* SymbolFlags.Method */ | 32 /* SymbolFlags.Class */ | 512 /* SymbolFlags.ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -71629,7 +71630,7 @@ var ts;
                 switch (node.kind) {
                     case 79 /* SyntaxKind.Identifier */:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* SymbolFlags.Alias */ ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108 /* SyntaxKind.ThisKeyword */:
                         return getExplicitThisType(node);
                     case 106 /* SyntaxKind.SuperKeyword */:

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.9.0-dev.20221026",
+    "version": "4.9.0-dev.20221028",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [