@typescript-deploys/pr-build 5.3.0-pr-56123-2 → 5.3.0-pr-56131-2

package/lib/tsc.js

@@ -13878,9 +13878,9 @@ function ownsJSDocTag(hostNode, tag) {
 }
 function getNextJSDocCommentLocation(node) {
   const parent = node.parent;
-  if (parent.kind === 303 /* PropertyAssignment */ || parent.kind === 277 /* ExportAssignment */ || parent.kind === 172 /* PropertyDeclaration */ || parent.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent) || isBinaryExpression(node) && node.operatorToken.kind === 64 /* EqualsToken */) {
+  if (parent.kind === 303 /* PropertyAssignment */ || parent.kind === 277 /* ExportAssignment */ || parent.kind === 172 /* PropertyDeclaration */ || parent.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent) || isAssignmentExpression(node)) {
     return parent;
-  } else if (parent.parent && (getSingleVariableOfVariableStatement(parent.parent) === node || isBinaryExpression(parent) && parent.operatorToken.kind === 64 /* EqualsToken */)) {
+  } else if (parent.parent && (getSingleVariableOfVariableStatement(parent.parent) === node || isAssignmentExpression(parent))) {
     return parent.parent;
   } else if (parent.parent && parent.parent.parent && (getSingleVariableOfVariableStatement(parent.parent.parent) || getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent.parent.parent) === node || getSourceOfDefaultedAssignment(parent.parent.parent))) {
     return parent.parent.parent;
@@ -34843,7 +34843,7 @@ var commandOptionsWithoutBuild = [
     affectsBuildInfo: true,
     affectsDeclarationPath: true,
     isFilePath: false,
-    // This is intentionally broken to support compatability with existing tsconfig files
+    // This is intentionally broken to support compatibility with existing tsconfig files
     // for correct behaviour, please use outFile
     category: Diagnostics.Backwards_Compatibility,
     paramType: Diagnostics.FILE,
@@ -67350,7 +67350,7 @@ function createTypeChecker(host) {
         return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
       }
       const parent = walkUpParenthesizedExpressions(func.parent);
-      if (parent.kind === 226 /* BinaryExpression */ && parent.operatorToken.kind === 64 /* EqualsToken */) {
+      if (isAssignmentExpression(parent)) {
         const target = parent.left;
         if (isAccessExpression(target)) {
           const { expression } = target;
@@ -73543,12 +73543,7 @@ function createTypeChecker(host) {
           }
         }
         if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
-          const contextualReturnType = getContextualReturnType(
-            node,
-            /*contextFlags*/
-            void 0
-          );
-          const returnType = contextualReturnType && contextualReturnType.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */) ? contextualReturnType : getReturnTypeFromBody(node, checkMode);
+          const returnType = getReturnTypeFromBody(node, checkMode);
           if (!signature.resolvedReturnType) {
             signature.resolvedReturnType = returnType;
           }
@@ -73709,7 +73704,7 @@ function createTypeChecker(host) {
     return typeofType;
   }
   function checkVoidExpression(node) {
-    checkExpression(node.expression);
+    checkNodeDeferred(node);
     return undefinedWideningType;
   }
   function checkAwaitGrammar(node) {
@@ -80905,6 +80900,9 @@ function createTypeChecker(host) {
       case 217 /* ParenthesizedExpression */:
         checkAssertionDeferred(node);
         break;
+      case 222 /* VoidExpression */:
+        checkExpression(node.expression);
+        break;
       case 226 /* BinaryExpression */:
         if (isInstanceOfExpression(node)) {
           resolveUntypedCall(node);

package/lib/tsserver.js

@@ -17745,9 +17745,9 @@ function ownsJSDocTag(hostNode, tag) {
 }
 function getNextJSDocCommentLocation(node) {
   const parent2 = node.parent;
-  if (parent2.kind === 303 /* PropertyAssignment */ || parent2.kind === 277 /* ExportAssignment */ || parent2.kind === 172 /* PropertyDeclaration */ || parent2.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent2.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent2) || isBinaryExpression(node) && node.operatorToken.kind === 64 /* EqualsToken */) {
+  if (parent2.kind === 303 /* PropertyAssignment */ || parent2.kind === 277 /* ExportAssignment */ || parent2.kind === 172 /* PropertyDeclaration */ || parent2.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent2.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent2) || isAssignmentExpression(node)) {
     return parent2;
-  } else if (parent2.parent && (getSingleVariableOfVariableStatement(parent2.parent) === node || isBinaryExpression(parent2) && parent2.operatorToken.kind === 64 /* EqualsToken */)) {
+  } else if (parent2.parent && (getSingleVariableOfVariableStatement(parent2.parent) === node || isAssignmentExpression(parent2))) {
     return parent2.parent;
   } else if (parent2.parent && parent2.parent.parent && (getSingleVariableOfVariableStatement(parent2.parent.parent) || getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent2.parent.parent) === node || getSourceOfDefaultedAssignment(parent2.parent.parent))) {
     return parent2.parent.parent;
@@ -39247,7 +39247,7 @@ var commandOptionsWithoutBuild = [
     affectsBuildInfo: true,
     affectsDeclarationPath: true,
     isFilePath: false,
-    // This is intentionally broken to support compatability with existing tsconfig files
+    // This is intentionally broken to support compatibility with existing tsconfig files
     // for correct behaviour, please use outFile
     category: Diagnostics.Backwards_Compatibility,
     paramType: Diagnostics.FILE,
@@ -72062,7 +72062,7 @@ function createTypeChecker(host) {
         return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
       }
       const parent2 = walkUpParenthesizedExpressions(func.parent);
-      if (parent2.kind === 226 /* BinaryExpression */ && parent2.operatorToken.kind === 64 /* EqualsToken */) {
+      if (isAssignmentExpression(parent2)) {
         const target = parent2.left;
         if (isAccessExpression(target)) {
           const { expression } = target;
@@ -78255,12 +78255,7 @@ function createTypeChecker(host) {
           }
         }
         if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
-          const contextualReturnType = getContextualReturnType(
-            node,
-            /*contextFlags*/
-            void 0
-          );
-          const returnType = contextualReturnType && contextualReturnType.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */) ? contextualReturnType : getReturnTypeFromBody(node, checkMode);
+          const returnType = getReturnTypeFromBody(node, checkMode);
           if (!signature.resolvedReturnType) {
             signature.resolvedReturnType = returnType;
           }
@@ -78421,7 +78416,7 @@ function createTypeChecker(host) {
     return typeofType;
   }
   function checkVoidExpression(node) {
-    checkExpression(node.expression);
+    checkNodeDeferred(node);
     return undefinedWideningType;
   }
   function checkAwaitGrammar(node) {
@@ -85617,6 +85612,9 @@ function createTypeChecker(host) {
       case 217 /* ParenthesizedExpression */:
         checkAssertionDeferred(node);
         break;
+      case 222 /* VoidExpression */:
+        checkExpression(node.expression);
+        break;
       case 226 /* BinaryExpression */:
         if (isInstanceOfExpression(node)) {
           resolveUntypedCall(node);
@@ -138607,26 +138605,46 @@ function getRangeToExtract(context, considerEmptySpans = true) {
   const current = getTokenAtPosition(file, startPosition);
   const range = createTextRangeFromSpan(getRefactorContextSpan(context));
   const cursorRequest = range.pos === range.end && considerEmptySpans;
-  const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
-  if (!selection || !isTypeNode(selection))
+  const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
+  if (!firstType || !isTypeNode(firstType))
     return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
   const checker = context.program.getTypeChecker();
-  const enclosingNode = getEnclosingNode(selection, isJS);
+  const enclosingNode = getEnclosingNode(firstType, isJS);
   if (enclosingNode === void 0)
     return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
+  const typeList = [];
+  if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
+    addRange(
+      typeList,
+      firstType.parent.types.filter((type) => {
+        return type.getStart() >= range.pos && type.getEnd() <= range.end;
+      })
+    );
+  }
+  const selection = typeList.length > 1 ? typeList : firstType;
   const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
   if (!typeParameters)
     return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
   const typeElements = flattenTypeLiteralNodeReference(checker, selection);
   return { isJS, selection, enclosingNode, typeParameters, typeElements };
 }
-function flattenTypeLiteralNodeReference(checker, node) {
-  if (!node)
+function flattenTypeLiteralNodeReference(checker, selection) {
+  if (!selection)
     return void 0;
-  if (isIntersectionTypeNode(node)) {
+  if (isArray(selection)) {
+    const result = [];
+    for (const type of selection) {
+      const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
+      if (!flattenedTypeMembers)
+        return void 0;
+      addRange(result, flattenedTypeMembers);
+    }
+    return result;
+  }
+  if (isIntersectionTypeNode(selection)) {
     const result = [];
     const seen = /* @__PURE__ */ new Map();
-    for (const type of node.types) {
+    for (const type of selection.types) {
       const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
       if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
         return void 0;
@@ -138634,18 +138652,30 @@ function flattenTypeLiteralNodeReference(checker, node) {
       addRange(result, flattenedTypeMembers);
     }
     return result;
-  } else if (isParenthesizedTypeNode(node)) {
-    return flattenTypeLiteralNodeReference(checker, node.type);
-  } else if (isTypeLiteralNode(node)) {
-    return node.members;
+  } else if (isParenthesizedTypeNode(selection)) {
+    return flattenTypeLiteralNodeReference(checker, selection.type);
+  } else if (isTypeLiteralNode(selection)) {
+    return selection.members;
   }
   return void 0;
 }
 function rangeContainsSkipTrivia(r1, node, file) {
-  return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
+  const r1Range = arrayToNode(r1);
+  const nodeRange = arrayToNode(node);
+  return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
+  function arrayToNode(rangeOrArray) {
+    return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
+  }
 }
 function collectTypeParameters(checker, selection, enclosingNode, file) {
   const result = [];
+  if (isArray(selection)) {
+    selection.forEach((t) => {
+      if (!visitor(t))
+        return void 0;
+    });
+    return result;
+  }
   return visitor(selection) ? void 0 : result;
   function visitor(node) {
     if (isTypeReferenceNode(node)) {
@@ -138706,32 +138736,62 @@ function collectTypeParameters(checker, selection, enclosingNode, file) {
 }
 function doTypeAliasChange(changes, file, name, info) {
   const { enclosingNode, selection, typeParameters } = info;
-  const newTypeNode = factory.createTypeAliasDeclaration(
-    /*modifiers*/
-    void 0,
-    name,
-    typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-      id,
-      id.modifiers,
+  if (isArray(selection)) {
+    const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
+    const newTypeDeclaration = factory.createTypeAliasDeclaration(
+      /*modifiers*/
+      void 0,
+      name,
+      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+        id,
+        id.modifiers,
+        id.name,
+        id.constraint,
+        /*defaultType*/
+        void 0
+      )),
+      newTypeValue
+    );
+    changes.insertNodeBefore(
+      file,
+      enclosingNode,
+      ignoreSourceNewlines(newTypeDeclaration),
+      /*blankLineBetween*/
+      true
+    );
+    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
       id.name,
-      id.constraint,
-      /*defaultType*/
+      /*typeArguments*/
       void 0
-    )),
-    selection
-  );
-  changes.insertNodeBefore(
-    file,
-    enclosingNode,
-    ignoreSourceNewlines(newTypeNode),
-    /*blankLineBetween*/
-    true
-  );
-  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-    id.name,
-    /*typeArguments*/
-    void 0
-  ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+  } else {
+    const newTypeNode = factory.createTypeAliasDeclaration(
+      /*modifiers*/
+      void 0,
+      name,
+      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+        id,
+        id.modifiers,
+        id.name,
+        id.constraint,
+        /*defaultType*/
+        void 0
+      )),
+      selection
+    );
+    changes.insertNodeBefore(
+      file,
+      enclosingNode,
+      ignoreSourceNewlines(newTypeNode),
+      /*blankLineBetween*/
+      true
+    );
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+  }
 }
 function doInterfaceChange(changes, file, name, info) {
   var _a;
@@ -138753,19 +138813,36 @@ function doInterfaceChange(changes, file, name, info) {
     /*blankLineBetween*/
     true
   );
-  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-    id.name,
-    /*typeArguments*/
-    void 0
-  ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+  if (isArray(selection)) {
+    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+  } else {
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+  }
 }
 function doTypedefChange(changes, context, file, name, info) {
   var _a;
   const { enclosingNode, selection, typeParameters } = info;
-  setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+  let newTypeValue;
+  if (isArray(selection)) {
+    selection.forEach((typeNode) => {
+      setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+    });
+    newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
+  } else {
+    setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+    newTypeValue = selection;
+  }
   const node = factory.createJSDocTypedefTag(
     factory.createIdentifier("typedef"),
-    factory.createJSDocTypeExpression(selection),
+    factory.createJSDocTypeExpression(newTypeValue),
     factory.createIdentifier(name)
   );
   const templates = [];
@@ -138803,11 +138880,19 @@ function doTypedefChange(changes, context, file, name, info) {
       true
     );
   }
-  changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-    id.name,
-    /*typeArguments*/
-    void 0
-  ))));
+  if (isArray(selection)) {
+    changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))));
+  } else {
+    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+      id.name,
+      /*typeArguments*/
+      void 0
+    ))));
+  }
 }
 function getEnclosingNode(node, isJS) {
   return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);

package/lib/typescript.js

@@ -15128,9 +15128,9 @@ ${lanes.join("\n")}
   }
   function getNextJSDocCommentLocation(node) {
     const parent2 = node.parent;
-    if (parent2.kind === 303 /* PropertyAssignment */ || parent2.kind === 277 /* ExportAssignment */ || parent2.kind === 172 /* PropertyDeclaration */ || parent2.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent2.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent2) || isBinaryExpression(node) && node.operatorToken.kind === 64 /* EqualsToken */) {
+    if (parent2.kind === 303 /* PropertyAssignment */ || parent2.kind === 277 /* ExportAssignment */ || parent2.kind === 172 /* PropertyDeclaration */ || parent2.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent2.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent2) || isAssignmentExpression(node)) {
       return parent2;
-    } else if (parent2.parent && (getSingleVariableOfVariableStatement(parent2.parent) === node || isBinaryExpression(parent2) && parent2.operatorToken.kind === 64 /* EqualsToken */)) {
+    } else if (parent2.parent && (getSingleVariableOfVariableStatement(parent2.parent) === node || isAssignmentExpression(parent2))) {
       return parent2.parent;
     } else if (parent2.parent && parent2.parent.parent && (getSingleVariableOfVariableStatement(parent2.parent.parent) || getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent2.parent.parent) === node || getSourceOfDefaultedAssignment(parent2.parent.parent))) {
       return parent2.parent.parent;
@@ -38730,7 +38730,7 @@ ${lanes.join("\n")}
           affectsBuildInfo: true,
           affectsDeclarationPath: true,
           isFilePath: false,
-          // This is intentionally broken to support compatability with existing tsconfig files
+          // This is intentionally broken to support compatibility with existing tsconfig files
           // for correct behaviour, please use outFile
           category: Diagnostics.Backwards_Compatibility,
           paramType: Diagnostics.FILE,
@@ -69829,7 +69829,7 @@ ${lanes.join("\n")}
           return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
         }
         const parent2 = walkUpParenthesizedExpressions(func.parent);
-        if (parent2.kind === 226 /* BinaryExpression */ && parent2.operatorToken.kind === 64 /* EqualsToken */) {
+        if (isAssignmentExpression(parent2)) {
           const target = parent2.left;
           if (isAccessExpression(target)) {
             const { expression } = target;
@@ -76022,12 +76022,7 @@ ${lanes.join("\n")}
             }
           }
           if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
-            const contextualReturnType = getContextualReturnType(
-              node,
-              /*contextFlags*/
-              void 0
-            );
-            const returnType = contextualReturnType && contextualReturnType.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */) ? contextualReturnType : getReturnTypeFromBody(node, checkMode);
+            const returnType = getReturnTypeFromBody(node, checkMode);
             if (!signature.resolvedReturnType) {
               signature.resolvedReturnType = returnType;
             }
@@ -76188,7 +76183,7 @@ ${lanes.join("\n")}
       return typeofType;
     }
     function checkVoidExpression(node) {
-      checkExpression(node.expression);
+      checkNodeDeferred(node);
       return undefinedWideningType;
     }
     function checkAwaitGrammar(node) {
@@ -83384,6 +83379,9 @@ ${lanes.join("\n")}
         case 217 /* ParenthesizedExpression */:
           checkAssertionDeferred(node);
           break;
+        case 222 /* VoidExpression */:
+          checkExpression(node.expression);
+          break;
         case 226 /* BinaryExpression */:
           if (isInstanceOfExpression(node)) {
             resolveUntypedCall(node);
@@ -136918,26 +136916,46 @@ ${lanes.join("\n")}
     const current = getTokenAtPosition(file, startPosition);
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
     const cursorRequest = range.pos === range.end && considerEmptySpans;
-    const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
-    if (!selection || !isTypeNode(selection))
+    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
+    if (!firstType || !isTypeNode(firstType))
       return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
     const checker = context.program.getTypeChecker();
-    const enclosingNode = getEnclosingNode(selection, isJS);
+    const enclosingNode = getEnclosingNode(firstType, isJS);
     if (enclosingNode === void 0)
       return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
+    const typeList = [];
+    if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
+      addRange(
+        typeList,
+        firstType.parent.types.filter((type) => {
+          return type.getStart() >= range.pos && type.getEnd() <= range.end;
+        })
+      );
+    }
+    const selection = typeList.length > 1 ? typeList : firstType;
     const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
     if (!typeParameters)
       return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
     const typeElements = flattenTypeLiteralNodeReference(checker, selection);
     return { isJS, selection, enclosingNode, typeParameters, typeElements };
   }
-  function flattenTypeLiteralNodeReference(checker, node) {
-    if (!node)
+  function flattenTypeLiteralNodeReference(checker, selection) {
+    if (!selection)
       return void 0;
-    if (isIntersectionTypeNode(node)) {
+    if (isArray(selection)) {
+      const result = [];
+      for (const type of selection) {
+        const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
+        if (!flattenedTypeMembers)
+          return void 0;
+        addRange(result, flattenedTypeMembers);
+      }
+      return result;
+    }
+    if (isIntersectionTypeNode(selection)) {
       const result = [];
       const seen = /* @__PURE__ */ new Map();
-      for (const type of node.types) {
+      for (const type of selection.types) {
         const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
         if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
           return void 0;
@@ -136945,18 +136963,30 @@ ${lanes.join("\n")}
         addRange(result, flattenedTypeMembers);
       }
       return result;
-    } else if (isParenthesizedTypeNode(node)) {
-      return flattenTypeLiteralNodeReference(checker, node.type);
-    } else if (isTypeLiteralNode(node)) {
-      return node.members;
+    } else if (isParenthesizedTypeNode(selection)) {
+      return flattenTypeLiteralNodeReference(checker, selection.type);
+    } else if (isTypeLiteralNode(selection)) {
+      return selection.members;
     }
     return void 0;
   }
   function rangeContainsSkipTrivia(r1, node, file) {
-    return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
+    const r1Range = arrayToNode(r1);
+    const nodeRange = arrayToNode(node);
+    return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
+    function arrayToNode(rangeOrArray) {
+      return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
+    }
   }
   function collectTypeParameters(checker, selection, enclosingNode, file) {
     const result = [];
+    if (isArray(selection)) {
+      selection.forEach((t) => {
+        if (!visitor(t))
+          return void 0;
+      });
+      return result;
+    }
     return visitor(selection) ? void 0 : result;
     function visitor(node) {
       if (isTypeReferenceNode(node)) {
@@ -137017,32 +137047,62 @@ ${lanes.join("\n")}
   }
   function doTypeAliasChange(changes, file, name, info) {
     const { enclosingNode, selection, typeParameters } = info;
-    const newTypeNode = factory.createTypeAliasDeclaration(
-      /*modifiers*/
-      void 0,
-      name,
-      typeParameters.map((id) => factory.updateTypeParameterDeclaration(
-        id,
-        id.modifiers,
+    if (isArray(selection)) {
+      const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
+      const newTypeDeclaration = factory.createTypeAliasDeclaration(
+        /*modifiers*/
+        void 0,
+        name,
+        typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+          id,
+          id.modifiers,
+          id.name,
+          id.constraint,
+          /*defaultType*/
+          void 0
+        )),
+        newTypeValue
+      );
+      changes.insertNodeBefore(
+        file,
+        enclosingNode,
+        ignoreSourceNewlines(newTypeDeclaration),
+        /*blankLineBetween*/
+        true
+      );
+      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
         id.name,
-        id.constraint,
-        /*defaultType*/
+        /*typeArguments*/
         void 0
-      )),
-      selection
-    );
-    changes.insertNodeBefore(
-      file,
-      enclosingNode,
-      ignoreSourceNewlines(newTypeNode),
-      /*blankLineBetween*/
-      true
-    );
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    } else {
+      const newTypeNode = factory.createTypeAliasDeclaration(
+        /*modifiers*/
+        void 0,
+        name,
+        typeParameters.map((id) => factory.updateTypeParameterDeclaration(
+          id,
+          id.modifiers,
+          id.name,
+          id.constraint,
+          /*defaultType*/
+          void 0
+        )),
+        selection
+      );
+      changes.insertNodeBefore(
+        file,
+        enclosingNode,
+        ignoreSourceNewlines(newTypeNode),
+        /*blankLineBetween*/
+        true
+      );
+      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+        id.name,
+        /*typeArguments*/
+        void 0
+      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    }
   }
   function doInterfaceChange(changes, file, name, info) {
     var _a;
@@ -137064,19 +137124,36 @@ ${lanes.join("\n")}
       /*blankLineBetween*/
       true
     );
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    if (isArray(selection)) {
+      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+        id.name,
+        /*typeArguments*/
+        void 0
+      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    } else {
+      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+        id.name,
+        /*typeArguments*/
+        void 0
+      ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
+    }
   }
   function doTypedefChange(changes, context, file, name, info) {
     var _a;
     const { enclosingNode, selection, typeParameters } = info;
-    setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+    let newTypeValue;
+    if (isArray(selection)) {
+      selection.forEach((typeNode) => {
+        setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+      });
+      newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
+    } else {
+      setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
+      newTypeValue = selection;
+    }
     const node = factory.createJSDocTypedefTag(
       factory.createIdentifier("typedef"),
-      factory.createJSDocTypeExpression(selection),
+      factory.createJSDocTypeExpression(newTypeValue),
       factory.createIdentifier(name)
     );
     const templates = [];
@@ -137114,11 +137191,19 @@ ${lanes.join("\n")}
         true
       );
     }
-    changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
-      id.name,
-      /*typeArguments*/
-      void 0
-    ))));
+    if (isArray(selection)) {
+      changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+        id.name,
+        /*typeArguments*/
+        void 0
+      ))));
+    } else {
+      changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
+        id.name,
+        /*typeArguments*/
+        void 0
+      ))));
+    }
   }
   function getEnclosingNode(node, isJS) {
     return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);

package/lib/typingsInstaller.js

@@ -10593,9 +10593,9 @@ function ownsJSDocTag(hostNode, tag) {
 }
 function getNextJSDocCommentLocation(node) {
   const parent = node.parent;
-  if (parent.kind === 303 /* PropertyAssignment */ || parent.kind === 277 /* ExportAssignment */ || parent.kind === 172 /* PropertyDeclaration */ || parent.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent) || isBinaryExpression(node) && node.operatorToken.kind === 64 /* EqualsToken */) {
+  if (parent.kind === 303 /* PropertyAssignment */ || parent.kind === 277 /* ExportAssignment */ || parent.kind === 172 /* PropertyDeclaration */ || parent.kind === 244 /* ExpressionStatement */ && node.kind === 211 /* PropertyAccessExpression */ || parent.kind === 253 /* ReturnStatement */ || getNestedModuleDeclaration(parent) || isAssignmentExpression(node)) {
     return parent;
-  } else if (parent.parent && (getSingleVariableOfVariableStatement(parent.parent) === node || isBinaryExpression(parent) && parent.operatorToken.kind === 64 /* EqualsToken */)) {
+  } else if (parent.parent && (getSingleVariableOfVariableStatement(parent.parent) === node || isAssignmentExpression(parent))) {
     return parent.parent;
   } else if (parent.parent && parent.parent.parent && (getSingleVariableOfVariableStatement(parent.parent.parent) || getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent.parent.parent) === node || getSourceOfDefaultedAssignment(parent.parent.parent))) {
     return parent.parent.parent;
@@ -26652,7 +26652,7 @@ var commandOptionsWithoutBuild = [
     affectsBuildInfo: true,
     affectsDeclarationPath: true,
     isFilePath: false,
-    // This is intentionally broken to support compatability with existing tsconfig files
+    // This is intentionally broken to support compatibility with existing tsconfig files
     // for correct behaviour, please use outFile
     category: Diagnostics.Backwards_Compatibility,
     paramType: Diagnostics.FILE,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.3.0-pr-56123-2",
+  "version": "5.3.0-pr-56131-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "411465b5e0903fba0028e3d82720f4e76ee725c1"
+  "gitHead": "e200ac3a5a2ed19564bf2d945bff492fa5a9576f"
 }