typescript 4.8.0-dev.20220721 → 4.8.0-dev.20220722

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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -141759,8 +141759,12 @@ var ts;
                 return undefined;
             }
             var commentOwner = commentOwnerInfo.commentOwner, parameters = commentOwnerInfo.parameters, hasReturn = commentOwnerInfo.hasReturn;
-            var commentOwnerJSDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? ts.lastOrUndefined(commentOwner.jsDoc) : undefined;
-            if (commentOwner.getStart(sourceFile) < position || commentOwnerJSDoc && commentOwnerJSDoc !== existingDocComment) {
+            var commentOwnerJsDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? commentOwner.jsDoc : undefined;
+            var lastJsDoc = ts.lastOrUndefined(commentOwnerJsDoc);
+            if (commentOwner.getStart(sourceFile) < position
+                || lastJsDoc
+                    && existingDocComment
+                    && lastJsDoc !== existingDocComment) {
                 return undefined;
             }
             var indentationStr = getIndentationStringAtPosition(sourceFile, position);
@@ -141777,7 +141781,9 @@ var ts;
             // * if the caret was directly in front of the object, then we add an extra line and indentation.
             var openComment = "/**";
             var closeComment = " */";
-            if (tags) {
+            // If any of the existing jsDoc has tags, ignore adding new ones.
+            var hasTag = (commentOwnerJsDoc || []).some(function (jsDoc) { return !!jsDoc.tags; });
+            if (tags && !hasTag) {
                 var preamble = openComment + newLine + indentationStr + " * ";
                 var endLine = tokenStart === position ? newLine + indentationStr : "";
                 var result = preamble + newLine + tags + indentationStr + closeComment + endLine;

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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -142372,8 +142372,12 @@ var ts;
                 return undefined;
             }
             var commentOwner = commentOwnerInfo.commentOwner, parameters = commentOwnerInfo.parameters, hasReturn = commentOwnerInfo.hasReturn;
-            var commentOwnerJSDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? ts.lastOrUndefined(commentOwner.jsDoc) : undefined;
-            if (commentOwner.getStart(sourceFile) < position || commentOwnerJSDoc && commentOwnerJSDoc !== existingDocComment) {
+            var commentOwnerJsDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? commentOwner.jsDoc : undefined;
+            var lastJsDoc = ts.lastOrUndefined(commentOwnerJsDoc);
+            if (commentOwner.getStart(sourceFile) < position
+                || lastJsDoc
+                    && existingDocComment
+                    && lastJsDoc !== existingDocComment) {
                 return undefined;
             }
             var indentationStr = getIndentationStringAtPosition(sourceFile, position);
@@ -142390,7 +142394,9 @@ var ts;
             // * if the caret was directly in front of the object, then we add an extra line and indentation.
             var openComment = "/**";
             var closeComment = " */";
-            if (tags) {
+            // If any of the existing jsDoc has tags, ignore adding new ones.
+            var hasTag = (commentOwnerJsDoc || []).some(function (jsDoc) { return !!jsDoc.tags; });
+            if (tags && !hasTag) {
                 var preamble = openComment + newLine + indentationStr + " * ";
                 var endLine = tokenStart === position ? newLine + indentationStr : "";
                 var result = preamble + newLine + tags + indentationStr + closeComment + endLine;

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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -142363,8 +142363,12 @@ var ts;
                 return undefined;
             }
             var commentOwner = commentOwnerInfo.commentOwner, parameters = commentOwnerInfo.parameters, hasReturn = commentOwnerInfo.hasReturn;
-            var commentOwnerJSDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? ts.lastOrUndefined(commentOwner.jsDoc) : undefined;
-            if (commentOwner.getStart(sourceFile) < position || commentOwnerJSDoc && commentOwnerJSDoc !== existingDocComment) {
+            var commentOwnerJsDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? commentOwner.jsDoc : undefined;
+            var lastJsDoc = ts.lastOrUndefined(commentOwnerJsDoc);
+            if (commentOwner.getStart(sourceFile) < position
+                || lastJsDoc
+                    && existingDocComment
+                    && lastJsDoc !== existingDocComment) {
                 return undefined;
             }
             var indentationStr = getIndentationStringAtPosition(sourceFile, position);
@@ -142381,7 +142385,9 @@ var ts;
             // * if the caret was directly in front of the object, then we add an extra line and indentation.
             var openComment = "/**";
             var closeComment = " */";
-            if (tags) {
+            // If any of the existing jsDoc has tags, ignore adding new ones.
+            var hasTag = (commentOwnerJsDoc || []).some(function (jsDoc) { return !!jsDoc.tags; });
+            if (tags && !hasTag) {
                 var preamble = openComment + newLine + indentationStr + " * ";
                 var endLine = tokenStart === position ? newLine + indentationStr : "";
                 var result = preamble + newLine + tags + indentationStr + closeComment + endLine;

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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -142363,8 +142363,12 @@ var ts;
                 return undefined;
             }
             var commentOwner = commentOwnerInfo.commentOwner, parameters = commentOwnerInfo.parameters, hasReturn = commentOwnerInfo.hasReturn;
-            var commentOwnerJSDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? ts.lastOrUndefined(commentOwner.jsDoc) : undefined;
-            if (commentOwner.getStart(sourceFile) < position || commentOwnerJSDoc && commentOwnerJSDoc !== existingDocComment) {
+            var commentOwnerJsDoc = ts.hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? commentOwner.jsDoc : undefined;
+            var lastJsDoc = ts.lastOrUndefined(commentOwnerJsDoc);
+            if (commentOwner.getStart(sourceFile) < position
+                || lastJsDoc
+                    && existingDocComment
+                    && lastJsDoc !== existingDocComment) {
                 return undefined;
             }
             var indentationStr = getIndentationStringAtPosition(sourceFile, position);
@@ -142381,7 +142385,9 @@ var ts;
             // * if the caret was directly in front of the object, then we add an extra line and indentation.
             var openComment = "/**";
             var closeComment = " */";
-            if (tags) {
+            // If any of the existing jsDoc has tags, ignore adding new ones.
+            var hasTag = (commentOwnerJsDoc || []).some(function (jsDoc) { return !!jsDoc.tags; });
+            if (tags && !hasTag) {
                 var preamble = openComment + newLine + indentationStr + " * ";
                 var endLine = tokenStart === position ? newLine + indentationStr : "";
                 var result = preamble + newLine + tags + indentationStr + closeComment + endLine;

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.20220721";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220722";
     /* @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.20220721",
+    "version": "4.8.0-dev.20220722",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [