typescript 5.2.0-dev.20230721 → 5.2.0-dev.20230723

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230721`;
+var version = `${versionMajorMinor}.0-dev.20230723`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -33524,7 +33524,7 @@ function getNamedArgRegEx(name) {
   return result;
 }
 var tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-var singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+var singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
 function extractPragmas(pragmas, range, text) {
   const tripleSlash = range.kind === 2 /* SingleLineCommentTrivia */ && tripleSlashXMLCommentStartRegEx.exec(text);
   if (tripleSlash) {

package/lib/tsserver.js

@@ -2329,7 +2329,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230721`;
+var version = `${versionMajorMinor}.0-dev.20230723`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37924,7 +37924,7 @@ function getNamedArgRegEx(name) {
   return result;
 }
 var tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-var singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+var singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
 function extractPragmas(pragmas, range, text) {
   const tripleSlash = range.kind === 2 /* SingleLineCommentTrivia */ && tripleSlashXMLCommentStartRegEx.exec(text);
   if (tripleSlash) {
@@ -136047,8 +136047,8 @@ function computeSuggestionDiagnostics(sourceFile, program, cancellationToken) {
           diags.push(createDiagnosticForNode(init, Diagnostics.require_call_may_be_converted_to_an_import));
         }
       }
-      const jsdocTypedefNode = ts_codefix_exports.getJSDocTypedefNode(node);
-      if (jsdocTypedefNode) {
+      const jsdocTypedefNodes = ts_codefix_exports.getJSDocTypedefNodes(node);
+      for (const jsdocTypedefNode of jsdocTypedefNodes) {
         diags.push(createDiagnosticForNode(jsdocTypedefNode, Diagnostics.JSDoc_typedef_may_be_converted_to_TypeScript_type));
       }
       if (ts_codefix_exports.parameterShouldGetTypeFromJSDoc(node)) {
@@ -146867,7 +146867,7 @@ __export(ts_codefix_exports, {
   getFixes: () => getFixes,
   getImportCompletionAction: () => getImportCompletionAction,
   getImportKind: () => getImportKind,
-  getJSDocTypedefNode: () => getJSDocTypedefNode,
+  getJSDocTypedefNodes: () => getJSDocTypedefNodes,
   getNoopSymbolTrackerWithResolver: () => getNoopSymbolTrackerWithResolver,
   getPromoteTypeOnlyCompletionAction: () => getPromoteTypeOnlyCompletionAction,
   getSupportedErrorCodes: () => getSupportedErrorCodes,
@@ -149589,13 +149589,14 @@ registerCodeFix({
   fixIds: [fixId14],
   errorCodes: errorCodes15,
   getCodeActions(context) {
+    const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
     const node = getTokenAtPosition(
       context.sourceFile,
       context.span.start
     );
     if (!node)
       return;
-    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile));
+    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile, newLineCharacter));
     if (changes.length > 0) {
       return [
         createCodeFixAction(
@@ -149608,29 +149609,72 @@ registerCodeFix({
       ];
     }
   },
-  getAllCodeActions: (context) => codeFixAll(context, errorCodes15, (changes, diag2) => {
-    const node = getTokenAtPosition(diag2.file, diag2.start);
-    if (node)
-      doChange12(changes, node, diag2.file);
-  })
+  getAllCodeActions: (context) => codeFixAll(
+    context,
+    errorCodes15,
+    (changes, diag2) => {
+      const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
+      const node = getTokenAtPosition(diag2.file, diag2.start);
+      const fixAll = true;
+      if (node)
+        doChange12(changes, node, diag2.file, newLineCharacter, fixAll);
+    }
+  )
 });
-function doChange12(changes, node, sourceFile) {
-  if (isJSDocTypedefTag(node)) {
-    fixSingleTypeDef(changes, node, sourceFile);
-  }
-}
-function fixSingleTypeDef(changes, typeDefNode, sourceFile) {
-  if (!typeDefNode)
+function doChange12(changes, node, sourceFile, newLine, fixAll = false) {
+  if (!isJSDocTypedefTag(node))
     return;
-  const declaration = createDeclaration(typeDefNode);
+  const declaration = createDeclaration(node);
   if (!declaration)
     return;
-  const comment = typeDefNode.parent;
-  changes.replaceNode(
-    sourceFile,
-    comment,
-    declaration
+  const commentNode = node.parent;
+  const { leftSibling, rightSibling } = getLeftAndRightSiblings(node);
+  let pos = commentNode.getStart();
+  let prefix = "";
+  if (!leftSibling && commentNode.comment) {
+    pos = findEndOfTextBetween(commentNode, commentNode.getStart(), node.getStart());
+    prefix = `${newLine} */${newLine}`;
+  }
+  if (leftSibling) {
+    if (fixAll && isJSDocTypedefTag(leftSibling)) {
+      pos = node.getStart();
+      prefix = "";
+    } else {
+      pos = findEndOfTextBetween(commentNode, leftSibling.getStart(), node.getStart());
+      prefix = `${newLine} */${newLine}`;
+    }
+  }
+  let end = commentNode.getEnd();
+  let suffix = "";
+  if (rightSibling) {
+    if (fixAll && isJSDocTypedefTag(rightSibling)) {
+      end = rightSibling.getStart();
+      suffix = `${newLine}${newLine}`;
+    } else {
+      end = rightSibling.getStart();
+      suffix = `${newLine}/**${newLine} * `;
+    }
+  }
+  changes.replaceRange(sourceFile, { pos, end }, declaration, { prefix, suffix });
+}
+function getLeftAndRightSiblings(typedefNode) {
+  const commentNode = typedefNode.parent;
+  const maxChildIndex = commentNode.getChildCount() - 1;
+  const currentNodeIndex = commentNode.getChildren().findIndex(
+    (n) => n.getStart() === typedefNode.getStart() && n.getEnd() === typedefNode.getEnd()
   );
+  const leftSibling = currentNodeIndex > 0 ? commentNode.getChildAt(currentNodeIndex - 1) : void 0;
+  const rightSibling = currentNodeIndex < maxChildIndex ? commentNode.getChildAt(currentNodeIndex + 1) : void 0;
+  return { leftSibling, rightSibling };
+}
+function findEndOfTextBetween(jsDocComment, from, to) {
+  const comment = jsDocComment.getText().substring(from - jsDocComment.getStart(), to - jsDocComment.getStart());
+  for (let i = comment.length; i > 0; i--) {
+    if (!/[*\/\s]/g.test(comment.substring(i - 1, i))) {
+      return from + i;
+    }
+  }
+  return to;
 }
 function createDeclaration(tag) {
   var _a;
@@ -149651,7 +149695,7 @@ function createInterfaceForTypeLiteral(typeName, typeLiteral) {
   const propertySignatures = createSignatureFromTypeLiteral(typeLiteral);
   if (!some(propertySignatures))
     return;
-  const interfaceDeclaration = factory.createInterfaceDeclaration(
+  return factory.createInterfaceDeclaration(
     /*modifiers*/
     void 0,
     typeName,
@@ -149661,13 +149705,12 @@ function createInterfaceForTypeLiteral(typeName, typeLiteral) {
     void 0,
     propertySignatures
   );
-  return interfaceDeclaration;
 }
 function createTypeAliasForTypeExpression(typeName, typeExpression) {
   const typeReference = getSynthesizedDeepClone(typeExpression.type);
   if (!typeReference)
     return;
-  const declaration = factory.createTypeAliasDeclaration(
+  return factory.createTypeAliasDeclaration(
     /*modifiers*/
     void 0,
     factory.createIdentifier(typeName),
@@ -149675,7 +149718,6 @@ function createTypeAliasForTypeExpression(typeName, typeExpression) {
     void 0,
     typeReference
   );
-  return declaration;
 }
 function createSignatureFromTypeLiteral(typeLiteral) {
   const propertyTags = typeLiteral.jsDocPropertyTags;
@@ -149695,30 +149737,28 @@ function createSignatureFromTypeLiteral(typeLiteral) {
     }
     if (typeReference && name) {
       const questionToken = isOptional ? factory.createToken(58 /* QuestionToken */) : void 0;
-      const prop = factory.createPropertySignature(
+      return factory.createPropertySignature(
         /*modifiers*/
         void 0,
         name,
         questionToken,
         typeReference
       );
-      return prop;
     }
   };
-  const props = mapDefined(propertyTags, getSignature);
-  return props;
+  return mapDefined(propertyTags, getSignature);
 }
 function getPropertyName(tag) {
   return tag.name.kind === 80 /* Identifier */ ? tag.name.text : tag.name.right.text;
 }
-function getJSDocTypedefNode(node) {
+function getJSDocTypedefNodes(node) {
   if (hasJSDocNodes(node)) {
-    return forEach(node.jsDoc, (node2) => {
+    return flatMap(node.jsDoc, (doc) => {
       var _a;
-      return (_a = node2.tags) == null ? void 0 : _a.find(isJSDocTypedefTag);
+      return (_a = doc.tags) == null ? void 0 : _a.filter((tag) => isJSDocTypedefTag(tag));
     });
   }
-  return void 0;
+  return [];
 }
 
 // src/services/codefixes/convertLiteralTypeToMappedType.ts
@@ -151968,6 +152008,8 @@ function getInfo9(checker, sourceFile, position, errorCode) {
       if (!declaration || !isCallExpression(declaration.parent) || !declaration.body)
         return void 0;
       const pos = declaration.parent.arguments.indexOf(declaration);
+      if (pos === -1)
+        return void 0;
       const type = checker.getContextualTypeForArgumentAtIndex(declaration.parent, pos);
       if (!type)
         return void 0;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230721`;
+      version = `${versionMajorMinor}.0-dev.20230723`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -35877,7 +35877,7 @@ ${lanes.join("\n")}
       })(IncrementalParser || (IncrementalParser = {}));
       namedArgRegExCache = /* @__PURE__ */ new Map();
       tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-      singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+      singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
     }
   });
 
@@ -134411,8 +134411,8 @@ ${lanes.join("\n")}
             diags.push(createDiagnosticForNode(init, Diagnostics.require_call_may_be_converted_to_an_import));
           }
         }
-        const jsdocTypedefNode = ts_codefix_exports.getJSDocTypedefNode(node);
-        if (jsdocTypedefNode) {
+        const jsdocTypedefNodes = ts_codefix_exports.getJSDocTypedefNodes(node);
+        for (const jsdocTypedefNode of jsdocTypedefNodes) {
           diags.push(createDiagnosticForNode(jsdocTypedefNode, Diagnostics.JSDoc_typedef_may_be_converted_to_TypeScript_type));
         }
         if (ts_codefix_exports.parameterShouldGetTypeFromJSDoc(node)) {
@@ -148340,23 +148340,60 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   });
 
   // src/services/codefixes/convertTypedefToType.ts
-  function doChange12(changes, node, sourceFile) {
-    if (isJSDocTypedefTag(node)) {
-      fixSingleTypeDef(changes, node, sourceFile);
-    }
-  }
-  function fixSingleTypeDef(changes, typeDefNode, sourceFile) {
-    if (!typeDefNode)
+  function doChange12(changes, node, sourceFile, newLine, fixAll = false) {
+    if (!isJSDocTypedefTag(node))
       return;
-    const declaration = createDeclaration(typeDefNode);
+    const declaration = createDeclaration(node);
     if (!declaration)
       return;
-    const comment = typeDefNode.parent;
-    changes.replaceNode(
-      sourceFile,
-      comment,
-      declaration
+    const commentNode = node.parent;
+    const { leftSibling, rightSibling } = getLeftAndRightSiblings(node);
+    let pos = commentNode.getStart();
+    let prefix = "";
+    if (!leftSibling && commentNode.comment) {
+      pos = findEndOfTextBetween(commentNode, commentNode.getStart(), node.getStart());
+      prefix = `${newLine} */${newLine}`;
+    }
+    if (leftSibling) {
+      if (fixAll && isJSDocTypedefTag(leftSibling)) {
+        pos = node.getStart();
+        prefix = "";
+      } else {
+        pos = findEndOfTextBetween(commentNode, leftSibling.getStart(), node.getStart());
+        prefix = `${newLine} */${newLine}`;
+      }
+    }
+    let end = commentNode.getEnd();
+    let suffix = "";
+    if (rightSibling) {
+      if (fixAll && isJSDocTypedefTag(rightSibling)) {
+        end = rightSibling.getStart();
+        suffix = `${newLine}${newLine}`;
+      } else {
+        end = rightSibling.getStart();
+        suffix = `${newLine}/**${newLine} * `;
+      }
+    }
+    changes.replaceRange(sourceFile, { pos, end }, declaration, { prefix, suffix });
+  }
+  function getLeftAndRightSiblings(typedefNode) {
+    const commentNode = typedefNode.parent;
+    const maxChildIndex = commentNode.getChildCount() - 1;
+    const currentNodeIndex = commentNode.getChildren().findIndex(
+      (n) => n.getStart() === typedefNode.getStart() && n.getEnd() === typedefNode.getEnd()
     );
+    const leftSibling = currentNodeIndex > 0 ? commentNode.getChildAt(currentNodeIndex - 1) : void 0;
+    const rightSibling = currentNodeIndex < maxChildIndex ? commentNode.getChildAt(currentNodeIndex + 1) : void 0;
+    return { leftSibling, rightSibling };
+  }
+  function findEndOfTextBetween(jsDocComment, from, to) {
+    const comment = jsDocComment.getText().substring(from - jsDocComment.getStart(), to - jsDocComment.getStart());
+    for (let i = comment.length; i > 0; i--) {
+      if (!/[*\/\s]/g.test(comment.substring(i - 1, i))) {
+        return from + i;
+      }
+    }
+    return to;
   }
   function createDeclaration(tag) {
     var _a;
@@ -148377,7 +148414,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const propertySignatures = createSignatureFromTypeLiteral(typeLiteral);
     if (!some(propertySignatures))
       return;
-    const interfaceDeclaration = factory.createInterfaceDeclaration(
+    return factory.createInterfaceDeclaration(
       /*modifiers*/
       void 0,
       typeName,
@@ -148387,13 +148424,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       void 0,
       propertySignatures
     );
-    return interfaceDeclaration;
   }
   function createTypeAliasForTypeExpression(typeName, typeExpression) {
     const typeReference = getSynthesizedDeepClone(typeExpression.type);
     if (!typeReference)
       return;
-    const declaration = factory.createTypeAliasDeclaration(
+    return factory.createTypeAliasDeclaration(
       /*modifiers*/
       void 0,
       factory.createIdentifier(typeName),
@@ -148401,7 +148437,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       void 0,
       typeReference
     );
-    return declaration;
   }
   function createSignatureFromTypeLiteral(typeLiteral) {
     const propertyTags = typeLiteral.jsDocPropertyTags;
@@ -148421,30 +148456,28 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       if (typeReference && name) {
         const questionToken = isOptional ? factory.createToken(58 /* QuestionToken */) : void 0;
-        const prop = factory.createPropertySignature(
+        return factory.createPropertySignature(
           /*modifiers*/
           void 0,
           name,
           questionToken,
           typeReference
         );
-        return prop;
       }
     };
-    const props = mapDefined(propertyTags, getSignature);
-    return props;
+    return mapDefined(propertyTags, getSignature);
   }
   function getPropertyName(tag) {
     return tag.name.kind === 80 /* Identifier */ ? tag.name.text : tag.name.right.text;
   }
-  function getJSDocTypedefNode(node) {
+  function getJSDocTypedefNodes(node) {
     if (hasJSDocNodes(node)) {
-      return forEach(node.jsDoc, (node2) => {
+      return flatMap(node.jsDoc, (doc) => {
         var _a;
-        return (_a = node2.tags) == null ? void 0 : _a.find(isJSDocTypedefTag);
+        return (_a = doc.tags) == null ? void 0 : _a.filter((tag) => isJSDocTypedefTag(tag));
       });
     }
-    return void 0;
+    return [];
   }
   var fixId14, errorCodes15;
   var init_convertTypedefToType = __esm({
@@ -148458,13 +148491,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         fixIds: [fixId14],
         errorCodes: errorCodes15,
         getCodeActions(context) {
+          const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
           const node = getTokenAtPosition(
             context.sourceFile,
             context.span.start
           );
           if (!node)
             return;
-          const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile));
+          const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile, newLineCharacter));
           if (changes.length > 0) {
             return [
               createCodeFixAction(
@@ -148477,11 +148511,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             ];
           }
         },
-        getAllCodeActions: (context) => codeFixAll(context, errorCodes15, (changes, diag2) => {
-          const node = getTokenAtPosition(diag2.file, diag2.start);
-          if (node)
-            doChange12(changes, node, diag2.file);
-        })
+        getAllCodeActions: (context) => codeFixAll(
+          context,
+          errorCodes15,
+          (changes, diag2) => {
+            const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
+            const node = getTokenAtPosition(diag2.file, diag2.start);
+            const fixAll = true;
+            if (node)
+              doChange12(changes, node, diag2.file, newLineCharacter, fixAll);
+          }
+        )
       });
     }
   });
@@ -150756,6 +150796,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!declaration || !isCallExpression(declaration.parent) || !declaration.body)
           return void 0;
         const pos = declaration.parent.arguments.indexOf(declaration);
+        if (pos === -1)
+          return void 0;
         const type = checker.getContextualTypeForArgumentAtIndex(declaration.parent, pos);
         if (!type)
           return void 0;
@@ -156004,7 +156046,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     getFixes: () => getFixes,
     getImportCompletionAction: () => getImportCompletionAction,
     getImportKind: () => getImportKind,
-    getJSDocTypedefNode: () => getJSDocTypedefNode,
+    getJSDocTypedefNodes: () => getJSDocTypedefNodes,
     getNoopSymbolTrackerWithResolver: () => getNoopSymbolTrackerWithResolver,
     getPromoteTypeOnlyCompletionAction: () => getPromoteTypeOnlyCompletionAction,
     getSupportedErrorCodes: () => getSupportedErrorCodes,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230721`;
+      version = `${versionMajorMinor}.0-dev.20230723`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -35877,7 +35877,7 @@ ${lanes.join("\n")}
       })(IncrementalParser || (IncrementalParser = {}));
       namedArgRegExCache = /* @__PURE__ */ new Map();
       tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-      singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+      singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
     }
   });
 
@@ -134426,8 +134426,8 @@ ${lanes.join("\n")}
             diags.push(createDiagnosticForNode(init, Diagnostics.require_call_may_be_converted_to_an_import));
           }
         }
-        const jsdocTypedefNode = ts_codefix_exports.getJSDocTypedefNode(node);
-        if (jsdocTypedefNode) {
+        const jsdocTypedefNodes = ts_codefix_exports.getJSDocTypedefNodes(node);
+        for (const jsdocTypedefNode of jsdocTypedefNodes) {
           diags.push(createDiagnosticForNode(jsdocTypedefNode, Diagnostics.JSDoc_typedef_may_be_converted_to_TypeScript_type));
         }
         if (ts_codefix_exports.parameterShouldGetTypeFromJSDoc(node)) {
@@ -148355,23 +148355,60 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   });
 
   // src/services/codefixes/convertTypedefToType.ts
-  function doChange12(changes, node, sourceFile) {
-    if (isJSDocTypedefTag(node)) {
-      fixSingleTypeDef(changes, node, sourceFile);
-    }
-  }
-  function fixSingleTypeDef(changes, typeDefNode, sourceFile) {
-    if (!typeDefNode)
+  function doChange12(changes, node, sourceFile, newLine, fixAll = false) {
+    if (!isJSDocTypedefTag(node))
       return;
-    const declaration = createDeclaration(typeDefNode);
+    const declaration = createDeclaration(node);
     if (!declaration)
       return;
-    const comment = typeDefNode.parent;
-    changes.replaceNode(
-      sourceFile,
-      comment,
-      declaration
+    const commentNode = node.parent;
+    const { leftSibling, rightSibling } = getLeftAndRightSiblings(node);
+    let pos = commentNode.getStart();
+    let prefix = "";
+    if (!leftSibling && commentNode.comment) {
+      pos = findEndOfTextBetween(commentNode, commentNode.getStart(), node.getStart());
+      prefix = `${newLine} */${newLine}`;
+    }
+    if (leftSibling) {
+      if (fixAll && isJSDocTypedefTag(leftSibling)) {
+        pos = node.getStart();
+        prefix = "";
+      } else {
+        pos = findEndOfTextBetween(commentNode, leftSibling.getStart(), node.getStart());
+        prefix = `${newLine} */${newLine}`;
+      }
+    }
+    let end = commentNode.getEnd();
+    let suffix = "";
+    if (rightSibling) {
+      if (fixAll && isJSDocTypedefTag(rightSibling)) {
+        end = rightSibling.getStart();
+        suffix = `${newLine}${newLine}`;
+      } else {
+        end = rightSibling.getStart();
+        suffix = `${newLine}/**${newLine} * `;
+      }
+    }
+    changes.replaceRange(sourceFile, { pos, end }, declaration, { prefix, suffix });
+  }
+  function getLeftAndRightSiblings(typedefNode) {
+    const commentNode = typedefNode.parent;
+    const maxChildIndex = commentNode.getChildCount() - 1;
+    const currentNodeIndex = commentNode.getChildren().findIndex(
+      (n) => n.getStart() === typedefNode.getStart() && n.getEnd() === typedefNode.getEnd()
     );
+    const leftSibling = currentNodeIndex > 0 ? commentNode.getChildAt(currentNodeIndex - 1) : void 0;
+    const rightSibling = currentNodeIndex < maxChildIndex ? commentNode.getChildAt(currentNodeIndex + 1) : void 0;
+    return { leftSibling, rightSibling };
+  }
+  function findEndOfTextBetween(jsDocComment, from, to) {
+    const comment = jsDocComment.getText().substring(from - jsDocComment.getStart(), to - jsDocComment.getStart());
+    for (let i = comment.length; i > 0; i--) {
+      if (!/[*\/\s]/g.test(comment.substring(i - 1, i))) {
+        return from + i;
+      }
+    }
+    return to;
   }
   function createDeclaration(tag) {
     var _a;
@@ -148392,7 +148429,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const propertySignatures = createSignatureFromTypeLiteral(typeLiteral);
     if (!some(propertySignatures))
       return;
-    const interfaceDeclaration = factory.createInterfaceDeclaration(
+    return factory.createInterfaceDeclaration(
       /*modifiers*/
       void 0,
       typeName,
@@ -148402,13 +148439,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       void 0,
       propertySignatures
     );
-    return interfaceDeclaration;
   }
   function createTypeAliasForTypeExpression(typeName, typeExpression) {
     const typeReference = getSynthesizedDeepClone(typeExpression.type);
     if (!typeReference)
       return;
-    const declaration = factory.createTypeAliasDeclaration(
+    return factory.createTypeAliasDeclaration(
       /*modifiers*/
       void 0,
       factory.createIdentifier(typeName),
@@ -148416,7 +148452,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       void 0,
       typeReference
     );
-    return declaration;
   }
   function createSignatureFromTypeLiteral(typeLiteral) {
     const propertyTags = typeLiteral.jsDocPropertyTags;
@@ -148436,30 +148471,28 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       if (typeReference && name) {
         const questionToken = isOptional ? factory.createToken(58 /* QuestionToken */) : void 0;
-        const prop = factory.createPropertySignature(
+        return factory.createPropertySignature(
           /*modifiers*/
           void 0,
           name,
           questionToken,
           typeReference
         );
-        return prop;
       }
     };
-    const props = mapDefined(propertyTags, getSignature);
-    return props;
+    return mapDefined(propertyTags, getSignature);
   }
   function getPropertyName(tag) {
     return tag.name.kind === 80 /* Identifier */ ? tag.name.text : tag.name.right.text;
   }
-  function getJSDocTypedefNode(node) {
+  function getJSDocTypedefNodes(node) {
     if (hasJSDocNodes(node)) {
-      return forEach(node.jsDoc, (node2) => {
+      return flatMap(node.jsDoc, (doc) => {
         var _a;
-        return (_a = node2.tags) == null ? void 0 : _a.find(isJSDocTypedefTag);
+        return (_a = doc.tags) == null ? void 0 : _a.filter((tag) => isJSDocTypedefTag(tag));
       });
     }
-    return void 0;
+    return [];
   }
   var fixId14, errorCodes15;
   var init_convertTypedefToType = __esm({
@@ -148473,13 +148506,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         fixIds: [fixId14],
         errorCodes: errorCodes15,
         getCodeActions(context) {
+          const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
           const node = getTokenAtPosition(
             context.sourceFile,
             context.span.start
           );
           if (!node)
             return;
-          const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile));
+          const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile, newLineCharacter));
           if (changes.length > 0) {
             return [
               createCodeFixAction(
@@ -148492,11 +148526,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             ];
           }
         },
-        getAllCodeActions: (context) => codeFixAll(context, errorCodes15, (changes, diag2) => {
-          const node = getTokenAtPosition(diag2.file, diag2.start);
-          if (node)
-            doChange12(changes, node, diag2.file);
-        })
+        getAllCodeActions: (context) => codeFixAll(
+          context,
+          errorCodes15,
+          (changes, diag2) => {
+            const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
+            const node = getTokenAtPosition(diag2.file, diag2.start);
+            const fixAll = true;
+            if (node)
+              doChange12(changes, node, diag2.file, newLineCharacter, fixAll);
+          }
+        )
       });
     }
   });
@@ -150771,6 +150811,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!declaration || !isCallExpression(declaration.parent) || !declaration.body)
           return void 0;
         const pos = declaration.parent.arguments.indexOf(declaration);
+        if (pos === -1)
+          return void 0;
         const type = checker.getContextualTypeForArgumentAtIndex(declaration.parent, pos);
         if (!type)
           return void 0;
@@ -156019,7 +156061,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     getFixes: () => getFixes,
     getImportCompletionAction: () => getImportCompletionAction,
     getImportKind: () => getImportKind,
-    getJSDocTypedefNode: () => getJSDocTypedefNode,
+    getJSDocTypedefNodes: () => getJSDocTypedefNodes,
     getNoopSymbolTrackerWithResolver: () => getNoopSymbolTrackerWithResolver,
     getPromoteTypeOnlyCompletionAction: () => getPromoteTypeOnlyCompletionAction,
     getSupportedErrorCodes: () => getSupportedErrorCodes,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230721`;
+var version = `${versionMajorMinor}.0-dev.20230723`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -25419,7 +25419,7 @@ function getNamedArgRegEx(name) {
   return result;
 }
 var tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-var singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+var singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
 function extractPragmas(pragmas, range, text) {
   const tripleSlash = range.kind === 2 /* SingleLineCommentTrivia */ && tripleSlashXMLCommentStartRegEx.exec(text);
   if (tripleSlash) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230721",
+    "version": "5.2.0-dev.20230723",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "61bf78f3c2c8fd4d92e9c56109519edc2e38185f"
+    "gitHead": "01b18215eccec4e3b32743ab545bf8c6b570d782"
 }