@typescript-deploys/pr-build 5.4.0-pr-56780-8 → 5.4.0-pr-56939-8

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240102`;
+var version = `${versionMajorMinor}.0-insiders.20240103`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -33755,7 +33755,25 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 function isDeclarationFileName(fileName) {
-  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
+  return getDeclarationFileExtension(fileName) !== void 0;
+}
+function getDeclarationFileExtension(fileName) {
+  const standardExtension = getAnyExtensionFromPath(
+    fileName,
+    supportedDeclarationExtensions,
+    /*ignoreCase*/
+    false
+  );
+  if (standardExtension) {
+    return standardExtension;
+  }
+  if (fileExtensionIs(fileName, ".ts" /* Ts */)) {
+    const index = getBaseFileName(fileName).lastIndexOf(".d.");
+    if (index >= 0) {
+      return fileName.substring(index);
+    }
+  }
+  return void 0;
 }
 function parseResolutionMode(mode, pos, end, reportDiagnostic) {
   if (!mode) {
@@ -50961,7 +50979,7 @@ function createTypeChecker(host) {
         });
       }
       function serializeAsAlias(symbol, localName, modifierFlags) {
-        var _a2, _b, _c, _d, _e;
+        var _a2, _b, _c, _d, _e, _f;
         const node = getDeclarationOfAliasSymbol(symbol);
         if (!node)
           return Debug.fail();
@@ -51159,6 +51177,9 @@ function createTypeChecker(host) {
           }
           case 281 /* ExportSpecifier */:
             const specifier = node.parent.parent.moduleSpecifier;
+            if (specifier && ((_f = node.propertyName) == null ? void 0 : _f.escapedText) === "default" /* Default */) {
+              verbatimTargetName = "default" /* Default */;
+            }
             serializeExportSpecifier(
               unescapeLeadingUnderscores(symbol.escapedName),
               specifier ? verbatimTargetName : targetName,
@@ -52162,7 +52183,7 @@ function createTypeChecker(host) {
       if (declaration.dotDotDotToken) {
         const baseConstraint = mapType(parentType, (t) => t.flags & 58982400 /* InstantiableNonPrimitive */ ? getBaseConstraintOrType(t) : t);
         type = everyType(baseConstraint, isTupleType) ? mapType(baseConstraint, (t) => sliceTupleType(t, index)) : createArrayType(elementType);
-      } else if (isArrayLikeType(parentType) && !isErrorType(elementType)) {
+      } else if (isArrayLikeType(parentType)) {
         const indexType = getNumberLiteralType(index);
         const accessFlags = 32 /* ExpressionPosition */ | (noTupleBoundsCheck || hasDefaultValue(declaration) ? 16 /* NoTupleBoundsCheck */ : 0);
         const declaredType = getIndexedAccessTypeOrUndefined(parentType, indexType, accessFlags, declaration.name) || errorType;
@@ -58209,7 +58230,7 @@ function createTypeChecker(host) {
       }
     }
     if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
-      if (objectType.flags & 1 /* Any */ || objectType.flags & 131072 /* Never */ && !(accessFlags & 32 /* ExpressionPosition */)) {
+      if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
         return objectType;
       }
       const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
@@ -64634,6 +64655,9 @@ function createTypeChecker(host) {
         inferToTemplateLiteralType(source, target);
       } else {
         source = getReducedType(source);
+        if (isGenericMappedType(source) && isGenericMappedType(target)) {
+          invokeOnce(source, target, inferFromGenericMappedTypes);
+        }
         if (!(priority & 512 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */))) {
           const apparentSource = getApparentType(source);
           if (apparentSource !== source && !(apparentSource.flags & (524288 /* Object */ | 2097152 /* Intersection */))) {
@@ -64897,6 +64921,14 @@ function createTypeChecker(host) {
         }
       }
     }
+    function inferFromGenericMappedTypes(source, target) {
+      inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
+      inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+      const sourceNameType = getNameTypeFromMappedType(source);
+      const targetNameType = getNameTypeFromMappedType(target);
+      if (sourceNameType && targetNameType)
+        inferFromTypes(sourceNameType, targetNameType);
+    }
     function inferFromObjectTypes(source, target) {
       var _a, _b;
       if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
@@ -64904,12 +64936,7 @@ function createTypeChecker(host) {
         return;
       }
       if (isGenericMappedType(source) && isGenericMappedType(target)) {
-        inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
-        inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
-        const sourceNameType = getNameTypeFromMappedType(source);
-        const targetNameType = getNameTypeFromMappedType(target);
-        if (sourceNameType && targetNameType)
-          inferFromTypes(sourceNameType, targetNameType);
+        inferFromGenericMappedTypes(source, target);
       }
       if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
         const constraintType = getConstraintTypeFromMappedType(target);
@@ -75705,7 +75732,7 @@ function createTypeChecker(host) {
             const context = getInferenceContext(node);
             const returnType = context.signature && getReturnTypeOfSignature(context.signature);
             const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
+            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
               const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
               const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -75724,8 +75751,8 @@ function createTypeChecker(host) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                   inferTypes(inferences, source, target);
                 });
-                if (!hasOverlappingInferences(context.inferences, inferences)) {
-                  mergeInferences(context.inferences, inferences);
+                const merged = tryInferencesMerge(context.inferences, inferences);
+                if (merged) {
                   context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                   return getOrCreateTypeFromSignature(instantiatedSignature);
                 }
@@ -75758,12 +75785,17 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function mergeInferences(target, source) {
+  function tryInferencesMerge(target, source) {
+    let merged = false;
+    const areOverlapping = hasOverlappingInferences(target, source);
     for (let i = 0; i < target.length; i++) {
-      if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
+      if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
         target[i] = source[i];
+        target[i].priority = 0 /* None */;
+        merged = true;
       }
     }
+    return merged;
   }
   function getUniqueTypeParameters(context, typeParameters) {
     const result = [];
@@ -78733,7 +78765,7 @@ function createTypeChecker(host) {
     const allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
     if (inputType === neverType) {
       reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables);
-      return errorType;
+      return void 0;
     }
     const uplevelIteration = languageVersion >= 2 /* ES2015 */;
     const downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;

package/lib/tsserver.js

@@ -269,6 +269,7 @@ __export(server_exports, {
   changeAnyExtension: () => changeAnyExtension,
   changeCompilerHostLikeToUseCache: () => changeCompilerHostLikeToUseCache,
   changeExtension: () => changeExtension,
+  changeFullExtension: () => changeFullExtension,
   changesAffectModuleResolution: () => changesAffectModuleResolution,
   changesAffectingProgramStructure: () => changesAffectingProgramStructure,
   childIsDecorated: () => childIsDecorated,
@@ -708,6 +709,7 @@ __export(server_exports, {
   getDeclarationEmitExtensionForPath: () => getDeclarationEmitExtensionForPath,
   getDeclarationEmitOutputFilePath: () => getDeclarationEmitOutputFilePath,
   getDeclarationEmitOutputFilePathWorker: () => getDeclarationEmitOutputFilePathWorker,
+  getDeclarationFileExtension: () => getDeclarationFileExtension,
   getDeclarationFromName: () => getDeclarationFromName,
   getDeclarationModifierFlagsFromSymbol: () => getDeclarationModifierFlagsFromSymbol,
   getDeclarationOfKind: () => getDeclarationOfKind,
@@ -2339,7 +2341,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240102`;
+var version = `${versionMajorMinor}.0-insiders.20240103`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9107,6 +9109,13 @@ function changeAnyExtension(path, ext, extensions, ignoreCase) {
   const pathext = extensions !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(path, extensions, ignoreCase) : getAnyExtensionFromPath(path);
   return pathext ? path.slice(0, path.length - pathext.length) + (startsWith(ext, ".") ? ext : "." + ext) : path;
 }
+function changeFullExtension(path, newExtension) {
+  const declarationExtension = getDeclarationFileExtension(path);
+  if (declarationExtension) {
+    return path.slice(0, path.length - declarationExtension.length) + (startsWith(newExtension, ".") ? newExtension : "." + newExtension);
+  }
+  return changeAnyExtension(path, newExtension);
+}
 var relativePathSegmentRegExp = /(?:\/\/)|(?:^|\/)\.\.?(?:$|\/)/;
 function comparePathsWorker(a, b, componentComparer) {
   if (a === b)
@@ -38174,7 +38183,25 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 function isDeclarationFileName(fileName) {
-  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
+  return getDeclarationFileExtension(fileName) !== void 0;
+}
+function getDeclarationFileExtension(fileName) {
+  const standardExtension = getAnyExtensionFromPath(
+    fileName,
+    supportedDeclarationExtensions,
+    /*ignoreCase*/
+    false
+  );
+  if (standardExtension) {
+    return standardExtension;
+  }
+  if (fileExtensionIs(fileName, ".ts" /* Ts */)) {
+    const index = getBaseFileName(fileName).lastIndexOf(".d.");
+    if (index >= 0) {
+      return fileName.substring(index);
+    }
+  }
+  return void 0;
 }
 function parseResolutionMode(mode, pos, end, reportDiagnostic) {
   if (!mode) {
@@ -43173,7 +43200,7 @@ function loadEntrypointsFromExportMap(scope, exports2, state, extensions) {
           /*excludes*/
           void 0,
           [
-            isDeclarationFileName(target) ? replaceFirstStar(target, "**/*") : changeAnyExtension(replaceFirstStar(target, "**/*"), getDeclarationEmitExtensionForPath(target))
+            changeFullExtension(replaceFirstStar(target, "**/*"), ".*")
           ]
         ).forEach((entry) => {
           entrypoints = appendIfUnique(entrypoints, {
@@ -55680,7 +55707,7 @@ function createTypeChecker(host) {
         });
       }
       function serializeAsAlias(symbol, localName, modifierFlags) {
-        var _a2, _b, _c, _d, _e;
+        var _a2, _b, _c, _d, _e, _f;
         const node = getDeclarationOfAliasSymbol(symbol);
         if (!node)
           return Debug.fail();
@@ -55878,6 +55905,9 @@ function createTypeChecker(host) {
           }
           case 281 /* ExportSpecifier */:
             const specifier = node.parent.parent.moduleSpecifier;
+            if (specifier && ((_f = node.propertyName) == null ? void 0 : _f.escapedText) === "default" /* Default */) {
+              verbatimTargetName = "default" /* Default */;
+            }
             serializeExportSpecifier(
               unescapeLeadingUnderscores(symbol.escapedName),
               specifier ? verbatimTargetName : targetName,
@@ -56881,7 +56911,7 @@ function createTypeChecker(host) {
       if (declaration.dotDotDotToken) {
         const baseConstraint = mapType(parentType, (t) => t.flags & 58982400 /* InstantiableNonPrimitive */ ? getBaseConstraintOrType(t) : t);
         type = everyType(baseConstraint, isTupleType) ? mapType(baseConstraint, (t) => sliceTupleType(t, index)) : createArrayType(elementType);
-      } else if (isArrayLikeType(parentType) && !isErrorType(elementType)) {
+      } else if (isArrayLikeType(parentType)) {
         const indexType = getNumberLiteralType(index);
         const accessFlags = 32 /* ExpressionPosition */ | (noTupleBoundsCheck || hasDefaultValue(declaration) ? 16 /* NoTupleBoundsCheck */ : 0);
         const declaredType = getIndexedAccessTypeOrUndefined(parentType, indexType, accessFlags, declaration.name) || errorType;
@@ -62928,7 +62958,7 @@ function createTypeChecker(host) {
       }
     }
     if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
-      if (objectType.flags & 1 /* Any */ || objectType.flags & 131072 /* Never */ && !(accessFlags & 32 /* ExpressionPosition */)) {
+      if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
         return objectType;
       }
       const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
@@ -69353,6 +69383,9 @@ function createTypeChecker(host) {
         inferToTemplateLiteralType(source, target);
       } else {
         source = getReducedType(source);
+        if (isGenericMappedType(source) && isGenericMappedType(target)) {
+          invokeOnce(source, target, inferFromGenericMappedTypes);
+        }
         if (!(priority & 512 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */))) {
           const apparentSource = getApparentType(source);
           if (apparentSource !== source && !(apparentSource.flags & (524288 /* Object */ | 2097152 /* Intersection */))) {
@@ -69616,6 +69649,14 @@ function createTypeChecker(host) {
         }
       }
     }
+    function inferFromGenericMappedTypes(source, target) {
+      inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
+      inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+      const sourceNameType = getNameTypeFromMappedType(source);
+      const targetNameType = getNameTypeFromMappedType(target);
+      if (sourceNameType && targetNameType)
+        inferFromTypes(sourceNameType, targetNameType);
+    }
     function inferFromObjectTypes(source, target) {
       var _a, _b;
       if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
@@ -69623,12 +69664,7 @@ function createTypeChecker(host) {
         return;
       }
       if (isGenericMappedType(source) && isGenericMappedType(target)) {
-        inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
-        inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
-        const sourceNameType = getNameTypeFromMappedType(source);
-        const targetNameType = getNameTypeFromMappedType(target);
-        if (sourceNameType && targetNameType)
-          inferFromTypes(sourceNameType, targetNameType);
+        inferFromGenericMappedTypes(source, target);
       }
       if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
         const constraintType = getConstraintTypeFromMappedType(target);
@@ -80424,7 +80460,7 @@ function createTypeChecker(host) {
             const context = getInferenceContext(node);
             const returnType = context.signature && getReturnTypeOfSignature(context.signature);
             const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
+            if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
               const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
               const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -80443,8 +80479,8 @@ function createTypeChecker(host) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                   inferTypes(inferences, source, target);
                 });
-                if (!hasOverlappingInferences(context.inferences, inferences)) {
-                  mergeInferences(context.inferences, inferences);
+                const merged = tryInferencesMerge(context.inferences, inferences);
+                if (merged) {
                   context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                   return getOrCreateTypeFromSignature(instantiatedSignature);
                 }
@@ -80477,12 +80513,17 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function mergeInferences(target, source) {
+  function tryInferencesMerge(target, source) {
+    let merged = false;
+    const areOverlapping = hasOverlappingInferences(target, source);
     for (let i = 0; i < target.length; i++) {
-      if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
+      if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
         target[i] = source[i];
+        target[i].priority = 0 /* None */;
+        merged = true;
       }
     }
+    return merged;
   }
   function getUniqueTypeParameters(context, typeParameters) {
     const result = [];
@@ -83452,7 +83493,7 @@ function createTypeChecker(host) {
     const allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
     if (inputType === neverType) {
       reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables);
-      return errorType;
+      return void 0;
     }
     const uplevelIteration = languageVersion >= 2 /* ES2015 */;
     const downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
@@ -134226,10 +134267,11 @@ function buildLinkParts(link, checker) {
     }
   } else {
     const symbol = checker == null ? void 0 : checker.getSymbolAtLocation(link.name);
+    const targetSymbol = symbol && checker ? getSymbolTarget(symbol, checker) : void 0;
     const suffix = findLinkNameEnd(link.text);
     const name = getTextOfNode(link.name) + link.text.slice(0, suffix);
     const text = skipSeparatorFromLinkText(link.text.slice(suffix));
-    const decl = (symbol == null ? void 0 : symbol.valueDeclaration) || ((_a = symbol == null ? void 0 : symbol.declarations) == null ? void 0 : _a[0]);
+    const decl = (targetSymbol == null ? void 0 : targetSymbol.valueDeclaration) || ((_a = targetSymbol == null ? void 0 : targetSymbol.declarations) == null ? void 0 : _a[0]);
     if (decl) {
       parts.push(linkNamePart(name, decl));
       if (text)
@@ -153756,21 +153798,14 @@ function addEnumMemberDeclaration(changes, checker, { token, parentDeclaration }
     const type = checker.getTypeAtLocation(member);
     return !!(type && type.flags & 402653316 /* StringLike */);
   });
+  const sourceFile = parentDeclaration.getSourceFile();
   const enumMember = factory.createEnumMember(token, hasStringInitializer ? factory.createStringLiteral(token.text) : void 0);
-  changes.replaceNode(
-    parentDeclaration.getSourceFile(),
-    parentDeclaration,
-    factory.updateEnumDeclaration(
-      parentDeclaration,
-      parentDeclaration.modifiers,
-      parentDeclaration.name,
-      concatenate(parentDeclaration.members, singleElementArray(enumMember))
-    ),
-    {
-      leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.IncludeAll,
-      trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.Exclude
-    }
-  );
+  const last2 = lastOrUndefined(parentDeclaration.members);
+  if (last2) {
+    changes.insertNodeInListAfter(sourceFile, last2, enumMember, parentDeclaration.members);
+  } else {
+    changes.insertMemberAtStart(sourceFile, parentDeclaration, enumMember);
+  }
 }
 function addFunctionDeclaration(changes, context, info) {
   const quotePreference = getQuotePreference(context.sourceFile, context.preferences);
@@ -170298,7 +170333,7 @@ ${options.prefix}` : "\n" : options.prefix
         const afterMinusOneStartLinePosition = getLineStartPositionForPosition(containingList[index - 1].getStart(sourceFile), sourceFile);
         multilineList = afterMinusOneStartLinePosition !== afterStartLinePosition;
       }
-      if (hasCommentsBeforeLineBreak(sourceFile.text, after.end)) {
+      if (hasCommentsBeforeLineBreak(sourceFile.text, after.end) || !positionsAreOnSameLine(containingList.pos, containingList.end, sourceFile)) {
         multilineList = true;
       }
       if (multilineList) {
@@ -173953,6 +173988,7 @@ __export(ts_exports2, {
   changeAnyExtension: () => changeAnyExtension,
   changeCompilerHostLikeToUseCache: () => changeCompilerHostLikeToUseCache,
   changeExtension: () => changeExtension,
+  changeFullExtension: () => changeFullExtension,
   changesAffectModuleResolution: () => changesAffectModuleResolution,
   changesAffectingProgramStructure: () => changesAffectingProgramStructure,
   childIsDecorated: () => childIsDecorated,
@@ -174392,6 +174428,7 @@ __export(ts_exports2, {
   getDeclarationEmitExtensionForPath: () => getDeclarationEmitExtensionForPath,
   getDeclarationEmitOutputFilePath: () => getDeclarationEmitOutputFilePath,
   getDeclarationEmitOutputFilePathWorker: () => getDeclarationEmitOutputFilePathWorker,
+  getDeclarationFileExtension: () => getDeclarationFileExtension,
   getDeclarationFromName: () => getDeclarationFromName,
   getDeclarationModifierFlagsFromSymbol: () => getDeclarationModifierFlagsFromSymbol,
   getDeclarationOfKind: () => getDeclarationOfKind,
@@ -188752,6 +188789,7 @@ start(initializeNodeSystem(), require("os").platform());
   changeAnyExtension,
   changeCompilerHostLikeToUseCache,
   changeExtension,
+  changeFullExtension,
   changesAffectModuleResolution,
   changesAffectingProgramStructure,
   childIsDecorated,
@@ -189191,6 +189229,7 @@ start(initializeNodeSystem(), require("os").platform());
   getDeclarationEmitExtensionForPath,
   getDeclarationEmitOutputFilePath,
   getDeclarationEmitOutputFilePathWorker,
+  getDeclarationFileExtension,
   getDeclarationFromName,
   getDeclarationModifierFlagsFromSymbol,
   getDeclarationOfKind,

package/lib/typescript.d.ts

@@ -9914,13 +9914,13 @@ declare namespace ts {
      * A function for determining if a given file is esm or cjs format, assuming modern node module resolution rules, as configured by the
      * `options` parameter.
      *
-     * @param fileName The normalized absolute path to check the format of (it need not exist on disk)
+     * @param fileName The file name to check the format of (it need not exist on disk)
      * @param [packageJsonInfoCache] A cache for package file lookups - it's best to have a cache when this function is called often
      * @param host The ModuleResolutionHost which can perform the filesystem lookups for package json data
      * @param options The compiler options to perform the analysis under - relevant options are `moduleResolution` and `traceResolution`
      * @returns `undefined` if the path has no relevant implied format, `ModuleKind.ESNext` for esm format, and `ModuleKind.CommonJS` for cjs format
      */
-    function getImpliedNodeFormatForFile(fileName: Path, packageJsonInfoCache: PackageJsonInfoCache | undefined, host: ModuleResolutionHost, options: CompilerOptions): ResolutionMode;
+    function getImpliedNodeFormatForFile(fileName: string, packageJsonInfoCache: PackageJsonInfoCache | undefined, host: ModuleResolutionHost, options: CompilerOptions): ResolutionMode;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
      * that represent a compilation unit.

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-insiders.20240102`;
+      version = `${versionMajorMinor}.0-insiders.20240103`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6862,6 +6862,13 @@ ${lanes.join("\n")}
     const pathext = extensions !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(path, extensions, ignoreCase) : getAnyExtensionFromPath(path);
     return pathext ? path.slice(0, path.length - pathext.length) + (startsWith(ext, ".") ? ext : "." + ext) : path;
   }
+  function changeFullExtension(path, newExtension) {
+    const declarationExtension = getDeclarationFileExtension(path);
+    if (declarationExtension) {
+      return path.slice(0, path.length - declarationExtension.length) + (startsWith(newExtension, ".") ? newExtension : "." + newExtension);
+    }
+    return changeAnyExtension(path, newExtension);
+  }
   function comparePathsWorker(a, b, componentComparer) {
     if (a === b)
       return 0 /* EqualTo */;
@@ -28453,7 +28460,25 @@ ${lanes.join("\n")}
     return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length2);
   }
   function isDeclarationFileName(fileName) {
-    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
+    return getDeclarationFileExtension(fileName) !== void 0;
+  }
+  function getDeclarationFileExtension(fileName) {
+    const standardExtension = getAnyExtensionFromPath(
+      fileName,
+      supportedDeclarationExtensions,
+      /*ignoreCase*/
+      false
+    );
+    if (standardExtension) {
+      return standardExtension;
+    }
+    if (fileExtensionIs(fileName, ".ts" /* Ts */)) {
+      const index = getBaseFileName(fileName).lastIndexOf(".d.");
+      if (index >= 0) {
+        return fileName.substring(index);
+      }
+    }
+    return void 0;
   }
   function parseResolutionMode(mode, pos, end, reportDiagnostic) {
     if (!mode) {
@@ -41006,7 +41031,7 @@ ${lanes.join("\n")}
             /*excludes*/
             void 0,
             [
-              isDeclarationFileName(target) ? replaceFirstStar(target, "**/*") : changeAnyExtension(replaceFirstStar(target, "**/*"), getDeclarationEmitExtensionForPath(target))
+              changeFullExtension(replaceFirstStar(target, "**/*"), ".*")
             ]
           ).forEach((entry) => {
             entrypoints = appendIfUnique(entrypoints, {
@@ -53436,7 +53461,7 @@ ${lanes.join("\n")}
           });
         }
         function serializeAsAlias(symbol, localName, modifierFlags) {
-          var _a2, _b, _c, _d, _e;
+          var _a2, _b, _c, _d, _e, _f;
           const node = getDeclarationOfAliasSymbol(symbol);
           if (!node)
             return Debug.fail();
@@ -53634,6 +53659,9 @@ ${lanes.join("\n")}
             }
             case 281 /* ExportSpecifier */:
               const specifier = node.parent.parent.moduleSpecifier;
+              if (specifier && ((_f = node.propertyName) == null ? void 0 : _f.escapedText) === "default" /* Default */) {
+                verbatimTargetName = "default" /* Default */;
+              }
               serializeExportSpecifier(
                 unescapeLeadingUnderscores(symbol.escapedName),
                 specifier ? verbatimTargetName : targetName,
@@ -54637,7 +54665,7 @@ ${lanes.join("\n")}
         if (declaration.dotDotDotToken) {
           const baseConstraint = mapType(parentType, (t) => t.flags & 58982400 /* InstantiableNonPrimitive */ ? getBaseConstraintOrType(t) : t);
           type = everyType(baseConstraint, isTupleType) ? mapType(baseConstraint, (t) => sliceTupleType(t, index)) : createArrayType(elementType);
-        } else if (isArrayLikeType(parentType) && !isErrorType(elementType)) {
+        } else if (isArrayLikeType(parentType)) {
           const indexType = getNumberLiteralType(index);
           const accessFlags = 32 /* ExpressionPosition */ | (noTupleBoundsCheck || hasDefaultValue(declaration) ? 16 /* NoTupleBoundsCheck */ : 0);
           const declaredType = getIndexedAccessTypeOrUndefined(parentType, indexType, accessFlags, declaration.name) || errorType;
@@ -60684,7 +60712,7 @@ ${lanes.join("\n")}
         }
       }
       if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
-        if (objectType.flags & 1 /* Any */ || objectType.flags & 131072 /* Never */ && !(accessFlags & 32 /* ExpressionPosition */)) {
+        if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
           return objectType;
         }
         const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
@@ -67109,6 +67137,9 @@ ${lanes.join("\n")}
           inferToTemplateLiteralType(source, target);
         } else {
           source = getReducedType(source);
+          if (isGenericMappedType(source) && isGenericMappedType(target)) {
+            invokeOnce(source, target, inferFromGenericMappedTypes);
+          }
           if (!(priority & 512 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */))) {
             const apparentSource = getApparentType(source);
             if (apparentSource !== source && !(apparentSource.flags & (524288 /* Object */ | 2097152 /* Intersection */))) {
@@ -67372,6 +67403,14 @@ ${lanes.join("\n")}
           }
         }
       }
+      function inferFromGenericMappedTypes(source, target) {
+        inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
+        inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+        const sourceNameType = getNameTypeFromMappedType(source);
+        const targetNameType = getNameTypeFromMappedType(target);
+        if (sourceNameType && targetNameType)
+          inferFromTypes(sourceNameType, targetNameType);
+      }
       function inferFromObjectTypes(source, target) {
         var _a, _b;
         if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
@@ -67379,12 +67418,7 @@ ${lanes.join("\n")}
           return;
         }
         if (isGenericMappedType(source) && isGenericMappedType(target)) {
-          inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
-          inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
-          const sourceNameType = getNameTypeFromMappedType(source);
-          const targetNameType = getNameTypeFromMappedType(target);
-          if (sourceNameType && targetNameType)
-            inferFromTypes(sourceNameType, targetNameType);
+          inferFromGenericMappedTypes(source, target);
         }
         if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
           const constraintType = getConstraintTypeFromMappedType(target);
@@ -78180,7 +78214,7 @@ ${lanes.join("\n")}
               const context = getInferenceContext(node);
               const returnType = context.signature && getReturnTypeOfSignature(context.signature);
               const returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
-              if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, hasInferenceCandidates)) {
+              if (returnSignature && !returnSignature.typeParameters && !every(context.inferences, (info) => hasInferenceCandidates(info) && info.priority === 0 /* None */)) {
                 const uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
                 const instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
                 const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
@@ -78199,8 +78233,8 @@ ${lanes.join("\n")}
                   applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
                     inferTypes(inferences, source, target);
                   });
-                  if (!hasOverlappingInferences(context.inferences, inferences)) {
-                    mergeInferences(context.inferences, inferences);
+                  const merged = tryInferencesMerge(context.inferences, inferences);
+                  if (merged) {
                     context.inferredTypeParameters = concatenate(context.inferredTypeParameters, uniqueTypeParameters);
                     return getOrCreateTypeFromSignature(instantiatedSignature);
                   }
@@ -78233,12 +78267,17 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function mergeInferences(target, source) {
+    function tryInferencesMerge(target, source) {
+      let merged = false;
+      const areOverlapping = hasOverlappingInferences(target, source);
       for (let i = 0; i < target.length; i++) {
-        if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
+        if (areOverlapping ? hasInferenceCandidates(source[i]) && hasInferenceCandidates(target[i]) && source[i].priority < (target[i].priority & ~128 /* ReturnType */) : hasInferenceCandidates(source[i])) {
           target[i] = source[i];
+          target[i].priority = 0 /* None */;
+          merged = true;
         }
       }
+      return merged;
     }
     function getUniqueTypeParameters(context, typeParameters) {
       const result = [];
@@ -81208,7 +81247,7 @@ ${lanes.join("\n")}
       const allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
       if (inputType === neverType) {
         reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables);
-        return errorType;
+        return void 0;
       }
       const uplevelIteration = languageVersion >= 2 /* ES2015 */;
       const downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
@@ -132481,10 +132520,11 @@ ${lanes.join("\n")}
       }
     } else {
       const symbol = checker == null ? void 0 : checker.getSymbolAtLocation(link.name);
+      const targetSymbol = symbol && checker ? getSymbolTarget(symbol, checker) : void 0;
       const suffix = findLinkNameEnd(link.text);
       const name = getTextOfNode(link.name) + link.text.slice(0, suffix);
       const text = skipSeparatorFromLinkText(link.text.slice(suffix));
-      const decl = (symbol == null ? void 0 : symbol.valueDeclaration) || ((_a = symbol == null ? void 0 : symbol.declarations) == null ? void 0 : _a[0]);
+      const decl = (targetSymbol == null ? void 0 : targetSymbol.valueDeclaration) || ((_a = targetSymbol == null ? void 0 : targetSymbol.declarations) == null ? void 0 : _a[0]);
       if (decl) {
         parts.push(linkNamePart(name, decl));
         if (text)
@@ -152499,21 +152539,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const type = checker.getTypeAtLocation(member);
       return !!(type && type.flags & 402653316 /* StringLike */);
     });
+    const sourceFile = parentDeclaration.getSourceFile();
     const enumMember = factory.createEnumMember(token, hasStringInitializer ? factory.createStringLiteral(token.text) : void 0);
-    changes.replaceNode(
-      parentDeclaration.getSourceFile(),
-      parentDeclaration,
-      factory.updateEnumDeclaration(
-        parentDeclaration,
-        parentDeclaration.modifiers,
-        parentDeclaration.name,
-        concatenate(parentDeclaration.members, singleElementArray(enumMember))
-      ),
-      {
-        leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.IncludeAll,
-        trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.Exclude
-      }
-    );
+    const last2 = lastOrUndefined(parentDeclaration.members);
+    if (last2) {
+      changes.insertNodeInListAfter(sourceFile, last2, enumMember, parentDeclaration.members);
+    } else {
+      changes.insertMemberAtStart(sourceFile, parentDeclaration, enumMember);
+    }
   }
   function addFunctionDeclaration(changes, context, info) {
     const quotePreference = getQuotePreference(context.sourceFile, context.preferences);
@@ -170151,7 +170184,7 @@ ${options.prefix}` : "\n" : options.prefix
               const afterMinusOneStartLinePosition = getLineStartPositionForPosition(containingList[index - 1].getStart(sourceFile), sourceFile);
               multilineList = afterMinusOneStartLinePosition !== afterStartLinePosition;
             }
-            if (hasCommentsBeforeLineBreak(sourceFile.text, after.end)) {
+            if (hasCommentsBeforeLineBreak(sourceFile.text, after.end) || !positionsAreOnSameLine(containingList.pos, containingList.end, sourceFile)) {
               multilineList = true;
             }
             if (multilineList) {
@@ -185504,6 +185537,7 @@ ${e.message}`;
     changeAnyExtension: () => changeAnyExtension,
     changeCompilerHostLikeToUseCache: () => changeCompilerHostLikeToUseCache,
     changeExtension: () => changeExtension,
+    changeFullExtension: () => changeFullExtension,
     changesAffectModuleResolution: () => changesAffectModuleResolution,
     changesAffectingProgramStructure: () => changesAffectingProgramStructure,
     childIsDecorated: () => childIsDecorated,
@@ -185943,6 +185977,7 @@ ${e.message}`;
     getDeclarationEmitExtensionForPath: () => getDeclarationEmitExtensionForPath,
     getDeclarationEmitOutputFilePath: () => getDeclarationEmitOutputFilePath,
     getDeclarationEmitOutputFilePathWorker: () => getDeclarationEmitOutputFilePathWorker,
+    getDeclarationFileExtension: () => getDeclarationFileExtension,
     getDeclarationFromName: () => getDeclarationFromName,
     getDeclarationModifierFlagsFromSymbol: () => getDeclarationModifierFlagsFromSymbol,
     getDeclarationOfKind: () => getDeclarationOfKind,
@@ -187924,6 +187959,7 @@ ${e.message}`;
     changeAnyExtension: () => changeAnyExtension,
     changeCompilerHostLikeToUseCache: () => changeCompilerHostLikeToUseCache,
     changeExtension: () => changeExtension,
+    changeFullExtension: () => changeFullExtension,
     changesAffectModuleResolution: () => changesAffectModuleResolution,
     changesAffectingProgramStructure: () => changesAffectingProgramStructure,
     childIsDecorated: () => childIsDecorated,
@@ -188363,6 +188399,7 @@ ${e.message}`;
     getDeclarationEmitExtensionForPath: () => getDeclarationEmitExtensionForPath,
     getDeclarationEmitOutputFilePath: () => getDeclarationEmitOutputFilePath,
     getDeclarationEmitOutputFilePathWorker: () => getDeclarationEmitOutputFilePathWorker,
+    getDeclarationFileExtension: () => getDeclarationFileExtension,
     getDeclarationFromName: () => getDeclarationFromName,
     getDeclarationModifierFlagsFromSymbol: () => getDeclarationModifierFlagsFromSymbol,
     getDeclarationOfKind: () => getDeclarationOfKind,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240102`;
+var version = `${versionMajorMinor}.0-insiders.20240103`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -25616,7 +25616,25 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 function isDeclarationFileName(fileName) {
-  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
+  return getDeclarationFileExtension(fileName) !== void 0;
+}
+function getDeclarationFileExtension(fileName) {
+  const standardExtension = getAnyExtensionFromPath(
+    fileName,
+    supportedDeclarationExtensions,
+    /*ignoreCase*/
+    false
+  );
+  if (standardExtension) {
+    return standardExtension;
+  }
+  if (fileExtensionIs(fileName, ".ts" /* Ts */)) {
+    const index = getBaseFileName(fileName).lastIndexOf(".d.");
+    if (index >= 0) {
+      return fileName.substring(index);
+    }
+  }
+  return void 0;
 }
 function parseResolutionMode(mode, pos, end, reportDiagnostic) {
   if (!mode) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.4.0-pr-56780-8",
+  "version": "5.4.0-pr-56939-8",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "a3e8fb1ca240be269ee36cd7368120195972a734"
+  "gitHead": "04c80422db846a111808f99b29888f1ee1f5a6f7"
 }