typescript 4.8.0-dev.20220712 → 4.8.0-dev.20220713

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :

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 = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -144711,7 +144711,7 @@ var ts;
     var SmartSelectionRange;
     (function (SmartSelectionRange) {
         function getSmartSelectionRange(pos, sourceFile) {
-            var _a;
+            var _a, _b;
             var selectionRange = {
                 textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
             };
@@ -144763,6 +144763,17 @@ var ts;
                         if (ts.hasJSDocNodes(node) && ((_a = node.jsDoc) === null || _a === void 0 ? void 0 : _a.length)) {
                             pushSelectionRange(ts.first(node.jsDoc).getStart(), end);
                         }
+                        // (#39618 & #49807)
+                        // When the node is a SyntaxList and its first child has a JSDoc comment, then the node's
+                        // `start` (which usually is the result of calling `node.getStart()`) points to the first
+                        // token after the JSDoc comment. So, we have to make sure we'd pushed the selection
+                        // covering the JSDoc comment before diving further.
+                        if (ts.isSyntaxList(node)) {
+                            var firstChild = node.getChildren()[0];
+                            if (firstChild && ts.hasJSDocNodes(firstChild) && ((_b = firstChild.jsDoc) === null || _b === void 0 ? void 0 : _b.length) && firstChild.getStart() !== node.pos) {
+                                start = Math.min(start, ts.first(firstChild.jsDoc).getStart());
+                            }
+                        }
                         pushSelectionRange(start, end);
                         // String literals should have a stop both inside and outside their quotes.
                         if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
@@ -144836,6 +144847,7 @@ var ts;
          * other as well as of other top-level statements and declarations.
          */
         function getSelectionChildren(node) {
+            var _a;
             // Group top-level imports
             if (ts.isSourceFile(node)) {
                 return groupChildren(node.getChildAt(0).getChildren(), isImport);
@@ -144851,7 +144863,7 @@ var ts;
             // because it allows the mapped type to become an object type with a
             // few keystrokes.
             if (ts.isMappedTypeNode(node)) {
-                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var _b = node.getChildren(), openBraceToken = _b[0], children = _b.slice(1);
                 var closeBraceToken = ts.Debug.checkDefined(children.pop());
                 ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
                 ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
@@ -144882,10 +144894,13 @@ var ts;
                 var children = groupChildren(node.getChildren(), function (child) {
                     return child === node.name || ts.contains(node.modifiers, child);
                 });
-                return splitChildren(children, function (_a) {
+                var firstJSDocChild = ((_a = children[0]) === null || _a === void 0 ? void 0 : _a.kind) === 320 /* JSDoc */ ? children[0] : undefined;
+                var withJSDocSeparated = firstJSDocChild ? children.slice(1) : children;
+                var splittedChildren = splitChildren(withJSDocSeparated, function (_a) {
                     var kind = _a.kind;
                     return kind === 58 /* ColonToken */;
                 });
+                return firstJSDocChild ? [firstJSDocChild, createSyntaxList(splittedChildren)] : splittedChildren;
             }
             // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
             if (ts.isParameter(node)) {

package/lib/tsserverlibrary.js

@@ -303,7 +303,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 = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -145324,7 +145324,7 @@ var ts;
     var SmartSelectionRange;
     (function (SmartSelectionRange) {
         function getSmartSelectionRange(pos, sourceFile) {
-            var _a;
+            var _a, _b;
             var selectionRange = {
                 textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
             };
@@ -145376,6 +145376,17 @@ var ts;
                         if (ts.hasJSDocNodes(node) && ((_a = node.jsDoc) === null || _a === void 0 ? void 0 : _a.length)) {
                             pushSelectionRange(ts.first(node.jsDoc).getStart(), end);
                         }
+                        // (#39618 & #49807)
+                        // When the node is a SyntaxList and its first child has a JSDoc comment, then the node's
+                        // `start` (which usually is the result of calling `node.getStart()`) points to the first
+                        // token after the JSDoc comment. So, we have to make sure we'd pushed the selection
+                        // covering the JSDoc comment before diving further.
+                        if (ts.isSyntaxList(node)) {
+                            var firstChild = node.getChildren()[0];
+                            if (firstChild && ts.hasJSDocNodes(firstChild) && ((_b = firstChild.jsDoc) === null || _b === void 0 ? void 0 : _b.length) && firstChild.getStart() !== node.pos) {
+                                start = Math.min(start, ts.first(firstChild.jsDoc).getStart());
+                            }
+                        }
                         pushSelectionRange(start, end);
                         // String literals should have a stop both inside and outside their quotes.
                         if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
@@ -145449,6 +145460,7 @@ var ts;
          * other as well as of other top-level statements and declarations.
          */
         function getSelectionChildren(node) {
+            var _a;
             // Group top-level imports
             if (ts.isSourceFile(node)) {
                 return groupChildren(node.getChildAt(0).getChildren(), isImport);
@@ -145464,7 +145476,7 @@ var ts;
             // because it allows the mapped type to become an object type with a
             // few keystrokes.
             if (ts.isMappedTypeNode(node)) {
-                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var _b = node.getChildren(), openBraceToken = _b[0], children = _b.slice(1);
                 var closeBraceToken = ts.Debug.checkDefined(children.pop());
                 ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
                 ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
@@ -145495,10 +145507,13 @@ var ts;
                 var children = groupChildren(node.getChildren(), function (child) {
                     return child === node.name || ts.contains(node.modifiers, child);
                 });
-                return splitChildren(children, function (_a) {
+                var firstJSDocChild = ((_a = children[0]) === null || _a === void 0 ? void 0 : _a.kind) === 320 /* JSDoc */ ? children[0] : undefined;
+                var withJSDocSeparated = firstJSDocChild ? children.slice(1) : children;
+                var splittedChildren = splitChildren(withJSDocSeparated, function (_a) {
                     var kind = _a.kind;
                     return kind === 58 /* ColonToken */;
                 });
+                return firstJSDocChild ? [firstJSDocChild, createSyntaxList(splittedChildren)] : splittedChildren;
             }
             // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
             if (ts.isParameter(node)) {

package/lib/typescript.js

@@ -294,7 +294,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 = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -145315,7 +145315,7 @@ var ts;
     var SmartSelectionRange;
     (function (SmartSelectionRange) {
         function getSmartSelectionRange(pos, sourceFile) {
-            var _a;
+            var _a, _b;
             var selectionRange = {
                 textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
             };
@@ -145367,6 +145367,17 @@ var ts;
                         if (ts.hasJSDocNodes(node) && ((_a = node.jsDoc) === null || _a === void 0 ? void 0 : _a.length)) {
                             pushSelectionRange(ts.first(node.jsDoc).getStart(), end);
                         }
+                        // (#39618 & #49807)
+                        // When the node is a SyntaxList and its first child has a JSDoc comment, then the node's
+                        // `start` (which usually is the result of calling `node.getStart()`) points to the first
+                        // token after the JSDoc comment. So, we have to make sure we'd pushed the selection
+                        // covering the JSDoc comment before diving further.
+                        if (ts.isSyntaxList(node)) {
+                            var firstChild = node.getChildren()[0];
+                            if (firstChild && ts.hasJSDocNodes(firstChild) && ((_b = firstChild.jsDoc) === null || _b === void 0 ? void 0 : _b.length) && firstChild.getStart() !== node.pos) {
+                                start = Math.min(start, ts.first(firstChild.jsDoc).getStart());
+                            }
+                        }
                         pushSelectionRange(start, end);
                         // String literals should have a stop both inside and outside their quotes.
                         if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
@@ -145440,6 +145451,7 @@ var ts;
          * other as well as of other top-level statements and declarations.
          */
         function getSelectionChildren(node) {
+            var _a;
             // Group top-level imports
             if (ts.isSourceFile(node)) {
                 return groupChildren(node.getChildAt(0).getChildren(), isImport);
@@ -145455,7 +145467,7 @@ var ts;
             // because it allows the mapped type to become an object type with a
             // few keystrokes.
             if (ts.isMappedTypeNode(node)) {
-                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var _b = node.getChildren(), openBraceToken = _b[0], children = _b.slice(1);
                 var closeBraceToken = ts.Debug.checkDefined(children.pop());
                 ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
                 ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
@@ -145486,10 +145498,13 @@ var ts;
                 var children = groupChildren(node.getChildren(), function (child) {
                     return child === node.name || ts.contains(node.modifiers, child);
                 });
-                return splitChildren(children, function (_a) {
+                var firstJSDocChild = ((_a = children[0]) === null || _a === void 0 ? void 0 : _a.kind) === 320 /* JSDoc */ ? children[0] : undefined;
+                var withJSDocSeparated = firstJSDocChild ? children.slice(1) : children;
+                var splittedChildren = splitChildren(withJSDocSeparated, function (_a) {
                     var kind = _a.kind;
                     return kind === 58 /* ColonToken */;
                 });
+                return firstJSDocChild ? [firstJSDocChild, createSyntaxList(splittedChildren)] : splittedChildren;
             }
             // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
             if (ts.isParameter(node)) {

package/lib/typescriptServices.js

@@ -294,7 +294,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 = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -145315,7 +145315,7 @@ var ts;
     var SmartSelectionRange;
     (function (SmartSelectionRange) {
         function getSmartSelectionRange(pos, sourceFile) {
-            var _a;
+            var _a, _b;
             var selectionRange = {
                 textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
             };
@@ -145367,6 +145367,17 @@ var ts;
                         if (ts.hasJSDocNodes(node) && ((_a = node.jsDoc) === null || _a === void 0 ? void 0 : _a.length)) {
                             pushSelectionRange(ts.first(node.jsDoc).getStart(), end);
                         }
+                        // (#39618 & #49807)
+                        // When the node is a SyntaxList and its first child has a JSDoc comment, then the node's
+                        // `start` (which usually is the result of calling `node.getStart()`) points to the first
+                        // token after the JSDoc comment. So, we have to make sure we'd pushed the selection
+                        // covering the JSDoc comment before diving further.
+                        if (ts.isSyntaxList(node)) {
+                            var firstChild = node.getChildren()[0];
+                            if (firstChild && ts.hasJSDocNodes(firstChild) && ((_b = firstChild.jsDoc) === null || _b === void 0 ? void 0 : _b.length) && firstChild.getStart() !== node.pos) {
+                                start = Math.min(start, ts.first(firstChild.jsDoc).getStart());
+                            }
+                        }
                         pushSelectionRange(start, end);
                         // String literals should have a stop both inside and outside their quotes.
                         if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
@@ -145440,6 +145451,7 @@ var ts;
          * other as well as of other top-level statements and declarations.
          */
         function getSelectionChildren(node) {
+            var _a;
             // Group top-level imports
             if (ts.isSourceFile(node)) {
                 return groupChildren(node.getChildAt(0).getChildren(), isImport);
@@ -145455,7 +145467,7 @@ var ts;
             // because it allows the mapped type to become an object type with a
             // few keystrokes.
             if (ts.isMappedTypeNode(node)) {
-                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var _b = node.getChildren(), openBraceToken = _b[0], children = _b.slice(1);
                 var closeBraceToken = ts.Debug.checkDefined(children.pop());
                 ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
                 ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
@@ -145486,10 +145498,13 @@ var ts;
                 var children = groupChildren(node.getChildren(), function (child) {
                     return child === node.name || ts.contains(node.modifiers, child);
                 });
-                return splitChildren(children, function (_a) {
+                var firstJSDocChild = ((_a = children[0]) === null || _a === void 0 ? void 0 : _a.kind) === 320 /* JSDoc */ ? children[0] : undefined;
+                var withJSDocSeparated = firstJSDocChild ? children.slice(1) : children;
+                var splittedChildren = splitChildren(withJSDocSeparated, function (_a) {
                     var kind = _a.kind;
                     return kind === 58 /* ColonToken */;
                 });
+                return firstJSDocChild ? [firstJSDocChild, createSyntaxList(splittedChildren)] : splittedChildren;
             }
             // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
             if (ts.isParameter(node)) {

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 = ts.versionMajorMinor + ".0-dev.20220712";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220713";
     /* @internal */
     var Comparison;
     (function (Comparison) {

package/package.json

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