@typescript-deploys/pr-build 5.5.0-pr-58440-3 → 5.5.0-pr-58326-8

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240505`;
+var version = `${versionMajorMinor}.0-insiders.20240506`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -46669,7 +46669,12 @@ function createTypeChecker(host) {
         if (resolvedTarget === unknownSymbol) {
           return source;
         }
-        target = cloneSymbol(resolvedTarget);
+        if (!(resolvedTarget.flags & getExcludedSymbolFlags(source.flags)) || (source.flags | resolvedTarget.flags) & 67108864 /* Assignment */) {
+          target = cloneSymbol(resolvedTarget);
+        } else {
+          reportMergeSymbolError(target, source);
+          return source;
+        }
       }
       if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
         target.constEnumOnlyModule = false;
@@ -46701,31 +46706,34 @@ function createTypeChecker(host) {
         );
       }
     } else {
-      const isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
-      const isEitherBlockScoped = !!(target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */);
+      reportMergeSymbolError(target, source);
+    }
+    return target;
+    function reportMergeSymbolError(target2, source2) {
+      const isEitherEnum = !!(target2.flags & 384 /* Enum */ || source2.flags & 384 /* Enum */);
+      const isEitherBlockScoped = !!(target2.flags & 2 /* BlockScopedVariable */ || source2.flags & 2 /* BlockScopedVariable */);
       const message = isEitherEnum ? Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations : isEitherBlockScoped ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
-      const sourceSymbolFile = source.declarations && getSourceFileOfNode(source.declarations[0]);
-      const targetSymbolFile = target.declarations && getSourceFileOfNode(target.declarations[0]);
+      const sourceSymbolFile = source2.declarations && getSourceFileOfNode(source2.declarations[0]);
+      const targetSymbolFile = target2.declarations && getSourceFileOfNode(target2.declarations[0]);
       const isSourcePlainJs = isPlainJsFile(sourceSymbolFile, compilerOptions.checkJs);
       const isTargetPlainJs = isPlainJsFile(targetSymbolFile, compilerOptions.checkJs);
-      const symbolName2 = symbolToString(source);
+      const symbolName2 = symbolToString(source2);
       if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
         const firstFile = comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
         const secondFile = firstFile === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
         const filesDuplicates = getOrUpdate(amalgamatedDuplicates, `${firstFile.path}|${secondFile.path}`, () => ({ firstFile, secondFile, conflictingSymbols: /* @__PURE__ */ new Map() }));
         const conflictingSymbolInfo = getOrUpdate(filesDuplicates.conflictingSymbols, symbolName2, () => ({ isBlockScoped: isEitherBlockScoped, firstFileLocations: [], secondFileLocations: [] }));
         if (!isSourcePlainJs)
-          addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source);
+          addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source2);
         if (!isTargetPlainJs)
-          addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target);
+          addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target2);
       } else {
         if (!isSourcePlainJs)
-          addDuplicateDeclarationErrorsForSymbols(source, message, symbolName2, target);
+          addDuplicateDeclarationErrorsForSymbols(source2, message, symbolName2, target2);
         if (!isTargetPlainJs)
-          addDuplicateDeclarationErrorsForSymbols(target, message, symbolName2, source);
+          addDuplicateDeclarationErrorsForSymbols(target2, message, symbolName2, source2);
       }
     }
-    return target;
     function addDuplicateLocations(locs, symbol) {
       if (symbol.declarations) {
         for (const decl of symbol.declarations) {
@@ -56192,13 +56200,8 @@ function createTypeChecker(host) {
     if (left.typeParameters && right.typeParameters) {
       paramMapper = createTypeMapper(right.typeParameters, left.typeParameters);
     }
-    let flags = (left.flags | right.flags) & (167 /* PropagatingFlags */ & ~1 /* HasRestParameter */);
     const declaration = left.declaration;
     const params = combineUnionParameters(left, right, paramMapper);
-    const lastParam = lastOrUndefined(params);
-    if (lastParam && getCheckFlags(lastParam) & 32768 /* RestParameter */) {
-      flags |= 1 /* HasRestParameter */;
-    }
     const thisParam = combineUnionThisParam(left.thisParameter, right.thisParameter, paramMapper);
     const minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
     const result = createSignature(
@@ -56211,7 +56214,7 @@ function createTypeChecker(host) {
       /*resolvedTypePredicate*/
       void 0,
       minArgCount,
-      flags
+      (left.flags | right.flags) & 167 /* PropagatingFlags */
     );
     result.compositeKind = 1048576 /* Union */;
     result.compositeSignatures = concatenate(left.compositeKind !== 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
@@ -71203,13 +71206,8 @@ function createTypeChecker(host) {
     if (left.typeParameters && right.typeParameters) {
       paramMapper = createTypeMapper(right.typeParameters, left.typeParameters);
     }
-    let flags = (left.flags | right.flags) & (167 /* PropagatingFlags */ & ~1 /* HasRestParameter */);
     const declaration = left.declaration;
     const params = combineIntersectionParameters(left, right, paramMapper);
-    const lastParam = lastOrUndefined(params);
-    if (lastParam && getCheckFlags(lastParam) & 32768 /* RestParameter */) {
-      flags |= 1 /* HasRestParameter */;
-    }
     const thisParam = combineIntersectionThisParam(left.thisParameter, right.thisParameter, paramMapper);
     const minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
     const result = createSignature(
@@ -71222,7 +71220,7 @@ function createTypeChecker(host) {
       /*resolvedTypePredicate*/
       void 0,
       minArgCount,
-      flags
+      (left.flags | right.flags) & 167 /* PropagatingFlags */
     );
     result.compositeKind = 2097152 /* Intersection */;
     result.compositeSignatures = concatenate(left.compositeKind === 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
@@ -114221,13 +114219,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function emitComputedPropertyName(node) {
-    const savedPrivateNameTempFlags = privateNameTempFlags;
-    const savedReservedMemberNames = reservedPrivateNames;
-    popPrivateNameGenerationScope();
     writePunctuation("[");
     emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfComputedPropertyName);
     writePunctuation("]");
-    pushPrivateNameGenerationScope(savedPrivateNameTempFlags, savedReservedMemberNames);
   }
   function emitTypeParameter(node) {
     emitModifierList(node, node.modifiers);
@@ -114288,15 +114282,10 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writeTrailingSemicolon();
   }
   function emitMethodSignature(node) {
-    pushNameGenerationScope(node);
     emitModifierList(node, node.modifiers);
     emit(node.name);
     emit(node.questionToken);
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitMethodDeclaration(node) {
     emitDecoratorsAndModifiers(
@@ -114308,11 +114297,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emit(node.asteriskToken);
     emit(node.name);
     emit(node.questionToken);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitClassStaticBlockDeclaration(node) {
     writeKeyword("static");
+    pushNameGenerationScope(node);
     emitBlockFunctionBody(node.body);
+    popNameGenerationScope(node);
   }
   function emitConstructor(node) {
     emitDecoratorsAndModifiers(
@@ -114322,7 +114313,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       false
     );
     writeKeyword("constructor");
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitAccessorDeclaration(node) {
     const pos = emitDecoratorsAndModifiers(
@@ -114335,25 +114326,15 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTokenWithComment(token, pos, writeKeyword, node);
     writeSpace();
     emit(node.name);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitCallSignature(node) {
-    pushNameGenerationScope(node);
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitConstructSignature(node) {
-    pushNameGenerationScope(node);
     writeKeyword("new");
     writeSpace();
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitIndexSignature(node) {
     emitDecoratorsAndModifiers(
@@ -114391,14 +114372,17 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTypeArguments(node, node.typeArguments);
   }
   function emitFunctionType(node) {
-    pushNameGenerationScope(node);
+    emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
+  }
+  function emitFunctionTypeHead(node) {
     emitTypeParameters(node, node.typeParameters);
     emitParametersForArrow(node, node.parameters);
     writeSpace();
     writePunctuation("=>");
+  }
+  function emitFunctionTypeBody(node) {
     writeSpace();
     emit(node.type);
-    popNameGenerationScope(node);
   }
   function emitJSDocFunctionType(node) {
     writeKeyword("function");
@@ -114419,17 +114403,10 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writePunctuation("=");
   }
   function emitConstructorType(node) {
-    pushNameGenerationScope(node);
     emitModifierList(node, node.modifiers);
     writeKeyword("new");
     writeSpace();
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    writeSpace();
-    writePunctuation("=>");
-    writeSpace();
-    emit(node.type);
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
   }
   function emitTypeQuery(node) {
     writeKeyword("typeof");
@@ -114438,16 +114415,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTypeArguments(node, node.typeArguments);
   }
   function emitTypeLiteral(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     writePunctuation("{");
     const flags = getEmitFlags(node) & 1 /* SingleLine */ ? 768 /* SingleLineTypeLiteralMembers */ : 32897 /* MultiLineTypeLiteralMembers */;
     emitList(node, node.members, flags | 524288 /* NoSpaceIfEmpty */);
     writePunctuation("}");
-    popPrivateNameGenerationScope();
+    popNameGenerationScope(node);
   }
   function emitArrayType(node) {
     emit(node.elementType, parenthesizer.parenthesizeNonArrayTypeOfPostfixType);
@@ -114619,11 +114593,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitExpressionList(node, elements, 8914 /* ArrayLiteralExpressionElements */ | preferNewLine, parenthesizer.parenthesizeExpressionForDisallowedComma);
   }
   function emitObjectLiteralExpression(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
+    pushNameGenerationScope(node);
     forEach(node.properties, generateMemberNames);
     const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
     if (indentedFlag) {
@@ -114635,7 +114605,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (indentedFlag) {
       decreaseIndent();
     }
-    popPrivateNameGenerationScope();
+    popNameGenerationScope(node);
   }
   function emitPropertyAccessExpression(node) {
     emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
@@ -114750,7 +114720,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
   }
   function emitArrowFunction(node) {
     emitModifierList(node, node.modifiers);
-    emitSignatureAndBody(node, emitArrowFunctionHead);
+    emitSignatureAndBody(node, emitArrowFunctionHead, emitArrowFunctionBody);
   }
   function emitArrowFunctionHead(node) {
     emitTypeParameters(node, node.typeParameters);
@@ -114759,6 +114729,14 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writeSpace();
     emit(node.equalsGreaterThanToken);
   }
+  function emitArrowFunctionBody(node) {
+    if (isBlock(node.body)) {
+      emitBlockFunctionBody(node.body);
+    } else {
+      writeSpace();
+      emitExpression(node.body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
+    }
+  }
   function emitDeleteExpression(node) {
     emitTokenWithComment(91 /* DeleteKeyword */, node.pos, writeKeyword, node);
     writeSpace();
@@ -115306,35 +115284,33 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emit(node.asteriskToken);
     writeSpace();
     emitIdentifierName(node.name);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
+  }
+  function emitSignatureAndBody(node, emitSignatureHead2, emitBody) {
+    const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
+    if (indentedFlag) {
+      increaseIndent();
+    }
+    pushNameGenerationScope(node);
+    forEach(node.parameters, generateNames);
+    emitSignatureHead2(node);
+    emitBody(node);
+    popNameGenerationScope(node);
+    if (indentedFlag) {
+      decreaseIndent();
+    }
   }
-  function emitSignatureAndBody(node, emitSignatureHead2) {
+  function emitFunctionBody(node) {
     const body = node.body;
     if (body) {
-      if (isBlock(body)) {
-        const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
-        if (indentedFlag) {
-          increaseIndent();
-        }
-        pushNameGenerationScope(node);
-        forEach(node.parameters, generateNames);
-        generateNames(node.body);
-        emitSignatureHead2(node);
-        emitBlockFunctionBody(body);
-        popNameGenerationScope(node);
-        if (indentedFlag) {
-          decreaseIndent();
-        }
-      } else {
-        emitSignatureHead2(node);
-        writeSpace();
-        emitExpression(body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
-      }
+      emitBlockFunctionBody(body);
     } else {
-      emitSignatureHead2(node);
       writeTrailingSemicolon();
     }
   }
+  function emitEmptyFunctionBody(_node) {
+    writeTrailingSemicolon();
+  }
   function emitSignatureHead(node) {
     emitTypeParameters(node, node.typeParameters);
     emitParameters(node, node.parameters);
@@ -115363,6 +115339,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return true;
   }
   function emitBlockFunctionBody(body) {
+    generateNames(body);
     onBeforeEmitNode == null ? void 0 : onBeforeEmitNode(body);
     writeSpace();
     writePunctuation("{");
@@ -115403,12 +115380,6 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitClassDeclarationOrExpression(node);
   }
   function emitClassDeclarationOrExpression(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
-    forEach(node.members, generateMemberNames);
     emitDecoratorsAndModifiers(
       node,
       node.modifiers,
@@ -115428,19 +115399,16 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitList(node, node.heritageClauses, 0 /* ClassHeritageClauses */);
     writeSpace();
     writePunctuation("{");
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     emitList(node, node.members, 129 /* ClassMembers */);
+    popNameGenerationScope(node);
     writePunctuation("}");
     if (indentedFlag) {
       decreaseIndent();
     }
-    popPrivateNameGenerationScope();
   }
   function emitInterfaceDeclaration(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
     emitDecoratorsAndModifiers(
       node,
       node.modifiers,
@@ -115454,9 +115422,11 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitList(node, node.heritageClauses, 512 /* HeritageClauses */);
     writeSpace();
     writePunctuation("{");
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     emitList(node, node.members, 129 /* InterfaceMembers */);
+    popNameGenerationScope(node);
     writePunctuation("}");
-    popPrivateNameGenerationScope();
   }
   function emitTypeAliasDeclaration(node) {
     emitDecoratorsAndModifiers(
@@ -116837,6 +116807,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return getLiteralText(node, currentSourceFile, flags);
   }
   function pushNameGenerationScope(node) {
+    privateNameTempFlagsStack.push(privateNameTempFlags);
+    privateNameTempFlags = 0 /* Auto */;
+    reservedPrivateNamesStack.push(reservedPrivateNames);
     if (node && getEmitFlags(node) & 1048576 /* ReuseTempVariableScope */) {
       return;
     }
@@ -116847,6 +116820,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     reservedNamesStack.push(reservedNames);
   }
   function popNameGenerationScope(node) {
+    privateNameTempFlags = privateNameTempFlagsStack.pop();
+    reservedPrivateNames = reservedPrivateNamesStack.pop();
     if (node && getEmitFlags(node) & 1048576 /* ReuseTempVariableScope */) {
       return;
     }
@@ -116860,16 +116835,6 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     reservedNames.add(name);
   }
-  function pushPrivateNameGenerationScope(newPrivateNameTempFlags, newReservedMemberNames) {
-    privateNameTempFlagsStack.push(privateNameTempFlags);
-    privateNameTempFlags = newPrivateNameTempFlags;
-    reservedPrivateNamesStack.push(reservedNames);
-    reservedPrivateNames = newReservedMemberNames;
-  }
-  function popPrivateNameGenerationScope() {
-    privateNameTempFlags = privateNameTempFlagsStack.pop();
-    reservedPrivateNames = reservedPrivateNamesStack.pop();
-  }
   function reservePrivateNameInNestedScopes(name) {
     if (!reservedPrivateNames || reservedPrivateNames === lastOrUndefined(reservedPrivateNamesStack)) {
       reservedPrivateNames = /* @__PURE__ */ new Set();
@@ -116969,7 +116934,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       case 303 /* PropertyAssignment */:
       case 304 /* ShorthandPropertyAssignment */:
       case 172 /* PropertyDeclaration */:
+      case 171 /* PropertySignature */:
       case 174 /* MethodDeclaration */:
+      case 173 /* MethodSignature */:
       case 177 /* GetAccessor */:
       case 178 /* SetAccessor */:
         generateNameIfNeeded(node.name);
@@ -117003,7 +116970,28 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return isFileLevelUniqueNameInCurrentFile(name, privateName) && !isReservedName(name, privateName) && !generatedNames.has(name);
   }
   function isReservedName(name, privateName) {
-    return privateName ? !!(reservedPrivateNames == null ? void 0 : reservedPrivateNames.has(name)) : !!(reservedNames == null ? void 0 : reservedNames.has(name));
+    let set;
+    let stack;
+    if (privateName) {
+      set = reservedPrivateNames;
+      stack = reservedPrivateNamesStack;
+    } else {
+      set = reservedNames;
+      stack = reservedNamesStack;
+    }
+    if (set == null ? void 0 : set.has(name)) {
+      return true;
+    }
+    for (let i = stack.length - 1; i >= 0; i--) {
+      if (set === stack[i]) {
+        continue;
+      }
+      set = stack[i];
+      if (set == null ? void 0 : set.has(name)) {
+        return true;
+      }
+    }
+    return false;
   }
   function isFileLevelUniqueNameInCurrentFile(name, _isPrivate) {
     return currentSourceFile ? isFileLevelUniqueName(currentSourceFile, name, hasGlobalName) : true;

package/lib/typescript.js

@@ -2364,7 +2364,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240505`;
+var version = `${versionMajorMinor}.0-insiders.20240506`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -51509,7 +51509,12 @@ function createTypeChecker(host) {
         if (resolvedTarget === unknownSymbol) {
           return source;
         }
-        target = cloneSymbol(resolvedTarget);
+        if (!(resolvedTarget.flags & getExcludedSymbolFlags(source.flags)) || (source.flags | resolvedTarget.flags) & 67108864 /* Assignment */) {
+          target = cloneSymbol(resolvedTarget);
+        } else {
+          reportMergeSymbolError(target, source);
+          return source;
+        }
       }
       if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
         target.constEnumOnlyModule = false;
@@ -51541,31 +51546,34 @@ function createTypeChecker(host) {
         );
       }
     } else {
-      const isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
-      const isEitherBlockScoped = !!(target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */);
+      reportMergeSymbolError(target, source);
+    }
+    return target;
+    function reportMergeSymbolError(target2, source2) {
+      const isEitherEnum = !!(target2.flags & 384 /* Enum */ || source2.flags & 384 /* Enum */);
+      const isEitherBlockScoped = !!(target2.flags & 2 /* BlockScopedVariable */ || source2.flags & 2 /* BlockScopedVariable */);
       const message = isEitherEnum ? Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations : isEitherBlockScoped ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
-      const sourceSymbolFile = source.declarations && getSourceFileOfNode(source.declarations[0]);
-      const targetSymbolFile = target.declarations && getSourceFileOfNode(target.declarations[0]);
+      const sourceSymbolFile = source2.declarations && getSourceFileOfNode(source2.declarations[0]);
+      const targetSymbolFile = target2.declarations && getSourceFileOfNode(target2.declarations[0]);
       const isSourcePlainJs = isPlainJsFile(sourceSymbolFile, compilerOptions.checkJs);
       const isTargetPlainJs = isPlainJsFile(targetSymbolFile, compilerOptions.checkJs);
-      const symbolName2 = symbolToString(source);
+      const symbolName2 = symbolToString(source2);
       if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
         const firstFile = comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
         const secondFile = firstFile === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
         const filesDuplicates = getOrUpdate(amalgamatedDuplicates, `${firstFile.path}|${secondFile.path}`, () => ({ firstFile, secondFile, conflictingSymbols: /* @__PURE__ */ new Map() }));
         const conflictingSymbolInfo = getOrUpdate(filesDuplicates.conflictingSymbols, symbolName2, () => ({ isBlockScoped: isEitherBlockScoped, firstFileLocations: [], secondFileLocations: [] }));
         if (!isSourcePlainJs)
-          addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source);
+          addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source2);
         if (!isTargetPlainJs)
-          addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target);
+          addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target2);
       } else {
         if (!isSourcePlainJs)
-          addDuplicateDeclarationErrorsForSymbols(source, message, symbolName2, target);
+          addDuplicateDeclarationErrorsForSymbols(source2, message, symbolName2, target2);
         if (!isTargetPlainJs)
-          addDuplicateDeclarationErrorsForSymbols(target, message, symbolName2, source);
+          addDuplicateDeclarationErrorsForSymbols(target2, message, symbolName2, source2);
       }
     }
-    return target;
     function addDuplicateLocations(locs, symbol) {
       if (symbol.declarations) {
         for (const decl of symbol.declarations) {
@@ -61032,13 +61040,8 @@ function createTypeChecker(host) {
     if (left.typeParameters && right.typeParameters) {
       paramMapper = createTypeMapper(right.typeParameters, left.typeParameters);
     }
-    let flags = (left.flags | right.flags) & (167 /* PropagatingFlags */ & ~1 /* HasRestParameter */);
     const declaration = left.declaration;
     const params = combineUnionParameters(left, right, paramMapper);
-    const lastParam = lastOrUndefined(params);
-    if (lastParam && getCheckFlags(lastParam) & 32768 /* RestParameter */) {
-      flags |= 1 /* HasRestParameter */;
-    }
     const thisParam = combineUnionThisParam(left.thisParameter, right.thisParameter, paramMapper);
     const minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
     const result = createSignature(
@@ -61051,7 +61054,7 @@ function createTypeChecker(host) {
       /*resolvedTypePredicate*/
       void 0,
       minArgCount,
-      flags
+      (left.flags | right.flags) & 167 /* PropagatingFlags */
     );
     result.compositeKind = 1048576 /* Union */;
     result.compositeSignatures = concatenate(left.compositeKind !== 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
@@ -76043,13 +76046,8 @@ function createTypeChecker(host) {
     if (left.typeParameters && right.typeParameters) {
       paramMapper = createTypeMapper(right.typeParameters, left.typeParameters);
     }
-    let flags = (left.flags | right.flags) & (167 /* PropagatingFlags */ & ~1 /* HasRestParameter */);
     const declaration = left.declaration;
     const params = combineIntersectionParameters(left, right, paramMapper);
-    const lastParam = lastOrUndefined(params);
-    if (lastParam && getCheckFlags(lastParam) & 32768 /* RestParameter */) {
-      flags |= 1 /* HasRestParameter */;
-    }
     const thisParam = combineIntersectionThisParam(left.thisParameter, right.thisParameter, paramMapper);
     const minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
     const result = createSignature(
@@ -76062,7 +76060,7 @@ function createTypeChecker(host) {
       /*resolvedTypePredicate*/
       void 0,
       minArgCount,
-      flags
+      (left.flags | right.flags) & 167 /* PropagatingFlags */
     );
     result.compositeKind = 2097152 /* Intersection */;
     result.compositeSignatures = concatenate(left.compositeKind === 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
@@ -119259,13 +119257,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function emitComputedPropertyName(node) {
-    const savedPrivateNameTempFlags = privateNameTempFlags;
-    const savedReservedMemberNames = reservedPrivateNames;
-    popPrivateNameGenerationScope();
     writePunctuation("[");
     emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfComputedPropertyName);
     writePunctuation("]");
-    pushPrivateNameGenerationScope(savedPrivateNameTempFlags, savedReservedMemberNames);
   }
   function emitTypeParameter(node) {
     emitModifierList(node, node.modifiers);
@@ -119326,15 +119320,10 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writeTrailingSemicolon();
   }
   function emitMethodSignature(node) {
-    pushNameGenerationScope(node);
     emitModifierList(node, node.modifiers);
     emit(node.name);
     emit(node.questionToken);
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitMethodDeclaration(node) {
     emitDecoratorsAndModifiers(
@@ -119346,11 +119335,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emit(node.asteriskToken);
     emit(node.name);
     emit(node.questionToken);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitClassStaticBlockDeclaration(node) {
     writeKeyword("static");
+    pushNameGenerationScope(node);
     emitBlockFunctionBody(node.body);
+    popNameGenerationScope(node);
   }
   function emitConstructor(node) {
     emitDecoratorsAndModifiers(
@@ -119360,7 +119351,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       false
     );
     writeKeyword("constructor");
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitAccessorDeclaration(node) {
     const pos = emitDecoratorsAndModifiers(
@@ -119373,25 +119364,15 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTokenWithComment(token, pos, writeKeyword, node);
     writeSpace();
     emit(node.name);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
   }
   function emitCallSignature(node) {
-    pushNameGenerationScope(node);
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitConstructSignature(node) {
-    pushNameGenerationScope(node);
     writeKeyword("new");
     writeSpace();
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    emitTypeAnnotation(node.type);
-    writeTrailingSemicolon();
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
   }
   function emitIndexSignature(node) {
     emitDecoratorsAndModifiers(
@@ -119429,14 +119410,17 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTypeArguments(node, node.typeArguments);
   }
   function emitFunctionType(node) {
-    pushNameGenerationScope(node);
+    emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
+  }
+  function emitFunctionTypeHead(node) {
     emitTypeParameters(node, node.typeParameters);
     emitParametersForArrow(node, node.parameters);
     writeSpace();
     writePunctuation("=>");
+  }
+  function emitFunctionTypeBody(node) {
     writeSpace();
     emit(node.type);
-    popNameGenerationScope(node);
   }
   function emitJSDocFunctionType(node) {
     writeKeyword("function");
@@ -119457,17 +119441,10 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writePunctuation("=");
   }
   function emitConstructorType(node) {
-    pushNameGenerationScope(node);
     emitModifierList(node, node.modifiers);
     writeKeyword("new");
     writeSpace();
-    emitTypeParameters(node, node.typeParameters);
-    emitParameters(node, node.parameters);
-    writeSpace();
-    writePunctuation("=>");
-    writeSpace();
-    emit(node.type);
-    popNameGenerationScope(node);
+    emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
   }
   function emitTypeQuery(node) {
     writeKeyword("typeof");
@@ -119476,16 +119453,13 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitTypeArguments(node, node.typeArguments);
   }
   function emitTypeLiteral(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     writePunctuation("{");
     const flags = getEmitFlags(node) & 1 /* SingleLine */ ? 768 /* SingleLineTypeLiteralMembers */ : 32897 /* MultiLineTypeLiteralMembers */;
     emitList(node, node.members, flags | 524288 /* NoSpaceIfEmpty */);
     writePunctuation("}");
-    popPrivateNameGenerationScope();
+    popNameGenerationScope(node);
   }
   function emitArrayType(node) {
     emit(node.elementType, parenthesizer.parenthesizeNonArrayTypeOfPostfixType);
@@ -119657,11 +119631,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitExpressionList(node, elements, 8914 /* ArrayLiteralExpressionElements */ | preferNewLine, parenthesizer.parenthesizeExpressionForDisallowedComma);
   }
   function emitObjectLiteralExpression(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
+    pushNameGenerationScope(node);
     forEach(node.properties, generateMemberNames);
     const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
     if (indentedFlag) {
@@ -119673,7 +119643,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (indentedFlag) {
       decreaseIndent();
     }
-    popPrivateNameGenerationScope();
+    popNameGenerationScope(node);
   }
   function emitPropertyAccessExpression(node) {
     emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
@@ -119788,7 +119758,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
   }
   function emitArrowFunction(node) {
     emitModifierList(node, node.modifiers);
-    emitSignatureAndBody(node, emitArrowFunctionHead);
+    emitSignatureAndBody(node, emitArrowFunctionHead, emitArrowFunctionBody);
   }
   function emitArrowFunctionHead(node) {
     emitTypeParameters(node, node.typeParameters);
@@ -119797,6 +119767,14 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     writeSpace();
     emit(node.equalsGreaterThanToken);
   }
+  function emitArrowFunctionBody(node) {
+    if (isBlock(node.body)) {
+      emitBlockFunctionBody(node.body);
+    } else {
+      writeSpace();
+      emitExpression(node.body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
+    }
+  }
   function emitDeleteExpression(node) {
     emitTokenWithComment(91 /* DeleteKeyword */, node.pos, writeKeyword, node);
     writeSpace();
@@ -120344,35 +120322,33 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emit(node.asteriskToken);
     writeSpace();
     emitIdentifierName(node.name);
-    emitSignatureAndBody(node, emitSignatureHead);
+    emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
+  }
+  function emitSignatureAndBody(node, emitSignatureHead2, emitBody) {
+    const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
+    if (indentedFlag) {
+      increaseIndent();
+    }
+    pushNameGenerationScope(node);
+    forEach(node.parameters, generateNames);
+    emitSignatureHead2(node);
+    emitBody(node);
+    popNameGenerationScope(node);
+    if (indentedFlag) {
+      decreaseIndent();
+    }
   }
-  function emitSignatureAndBody(node, emitSignatureHead2) {
+  function emitFunctionBody(node) {
     const body = node.body;
     if (body) {
-      if (isBlock(body)) {
-        const indentedFlag = getEmitFlags(node) & 131072 /* Indented */;
-        if (indentedFlag) {
-          increaseIndent();
-        }
-        pushNameGenerationScope(node);
-        forEach(node.parameters, generateNames);
-        generateNames(node.body);
-        emitSignatureHead2(node);
-        emitBlockFunctionBody(body);
-        popNameGenerationScope(node);
-        if (indentedFlag) {
-          decreaseIndent();
-        }
-      } else {
-        emitSignatureHead2(node);
-        writeSpace();
-        emitExpression(body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
-      }
+      emitBlockFunctionBody(body);
     } else {
-      emitSignatureHead2(node);
       writeTrailingSemicolon();
     }
   }
+  function emitEmptyFunctionBody(_node) {
+    writeTrailingSemicolon();
+  }
   function emitSignatureHead(node) {
     emitTypeParameters(node, node.typeParameters);
     emitParameters(node, node.parameters);
@@ -120401,6 +120377,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return true;
   }
   function emitBlockFunctionBody(body) {
+    generateNames(body);
     onBeforeEmitNode == null ? void 0 : onBeforeEmitNode(body);
     writeSpace();
     writePunctuation("{");
@@ -120441,12 +120418,6 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitClassDeclarationOrExpression(node);
   }
   function emitClassDeclarationOrExpression(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
-    forEach(node.members, generateMemberNames);
     emitDecoratorsAndModifiers(
       node,
       node.modifiers,
@@ -120466,19 +120437,16 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitList(node, node.heritageClauses, 0 /* ClassHeritageClauses */);
     writeSpace();
     writePunctuation("{");
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     emitList(node, node.members, 129 /* ClassMembers */);
+    popNameGenerationScope(node);
     writePunctuation("}");
     if (indentedFlag) {
       decreaseIndent();
     }
-    popPrivateNameGenerationScope();
   }
   function emitInterfaceDeclaration(node) {
-    pushPrivateNameGenerationScope(
-      0 /* Auto */,
-      /*newReservedMemberNames*/
-      void 0
-    );
     emitDecoratorsAndModifiers(
       node,
       node.modifiers,
@@ -120492,9 +120460,11 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emitList(node, node.heritageClauses, 512 /* HeritageClauses */);
     writeSpace();
     writePunctuation("{");
+    pushNameGenerationScope(node);
+    forEach(node.members, generateMemberNames);
     emitList(node, node.members, 129 /* InterfaceMembers */);
+    popNameGenerationScope(node);
     writePunctuation("}");
-    popPrivateNameGenerationScope();
   }
   function emitTypeAliasDeclaration(node) {
     emitDecoratorsAndModifiers(
@@ -121875,6 +121845,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return getLiteralText(node, currentSourceFile, flags);
   }
   function pushNameGenerationScope(node) {
+    privateNameTempFlagsStack.push(privateNameTempFlags);
+    privateNameTempFlags = 0 /* Auto */;
+    reservedPrivateNamesStack.push(reservedPrivateNames);
     if (node && getEmitFlags(node) & 1048576 /* ReuseTempVariableScope */) {
       return;
     }
@@ -121885,6 +121858,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     reservedNamesStack.push(reservedNames);
   }
   function popNameGenerationScope(node) {
+    privateNameTempFlags = privateNameTempFlagsStack.pop();
+    reservedPrivateNames = reservedPrivateNamesStack.pop();
     if (node && getEmitFlags(node) & 1048576 /* ReuseTempVariableScope */) {
       return;
     }
@@ -121898,16 +121873,6 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     reservedNames.add(name);
   }
-  function pushPrivateNameGenerationScope(newPrivateNameTempFlags, newReservedMemberNames) {
-    privateNameTempFlagsStack.push(privateNameTempFlags);
-    privateNameTempFlags = newPrivateNameTempFlags;
-    reservedPrivateNamesStack.push(reservedNames);
-    reservedPrivateNames = newReservedMemberNames;
-  }
-  function popPrivateNameGenerationScope() {
-    privateNameTempFlags = privateNameTempFlagsStack.pop();
-    reservedPrivateNames = reservedPrivateNamesStack.pop();
-  }
   function reservePrivateNameInNestedScopes(name) {
     if (!reservedPrivateNames || reservedPrivateNames === lastOrUndefined(reservedPrivateNamesStack)) {
       reservedPrivateNames = /* @__PURE__ */ new Set();
@@ -122007,7 +121972,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       case 303 /* PropertyAssignment */:
       case 304 /* ShorthandPropertyAssignment */:
       case 172 /* PropertyDeclaration */:
+      case 171 /* PropertySignature */:
       case 174 /* MethodDeclaration */:
+      case 173 /* MethodSignature */:
       case 177 /* GetAccessor */:
       case 178 /* SetAccessor */:
         generateNameIfNeeded(node.name);
@@ -122041,7 +122008,28 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return isFileLevelUniqueNameInCurrentFile(name, privateName) && !isReservedName(name, privateName) && !generatedNames.has(name);
   }
   function isReservedName(name, privateName) {
-    return privateName ? !!(reservedPrivateNames == null ? void 0 : reservedPrivateNames.has(name)) : !!(reservedNames == null ? void 0 : reservedNames.has(name));
+    let set;
+    let stack;
+    if (privateName) {
+      set = reservedPrivateNames;
+      stack = reservedPrivateNamesStack;
+    } else {
+      set = reservedNames;
+      stack = reservedNamesStack;
+    }
+    if (set == null ? void 0 : set.has(name)) {
+      return true;
+    }
+    for (let i = stack.length - 1; i >= 0; i--) {
+      if (set === stack[i]) {
+        continue;
+      }
+      set = stack[i];
+      if (set == null ? void 0 : set.has(name)) {
+        return true;
+      }
+    }
+    return false;
   }
   function isFileLevelUniqueNameInCurrentFile(name, _isPrivate) {
     return currentSourceFile ? isFileLevelUniqueName(currentSourceFile, name, hasGlobalName) : true;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.5.0-pr-58440-3",
+  "version": "5.5.0-pr-58326-8",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [