@typescript-deploys/pr-build 5.4.0-pr-57029-27 → 5.4.0-pr-57122-12

package/lib/tsc.js

@@ -7145,9 +7145,6 @@ var Diagnostics = {
   There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
   There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
-  package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
-  Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
-  Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -11582,13 +11579,13 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   return result;
 }
 function packageIdIsEqual(a, b) {
-  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version && a.peerDependencies === b.peerDependencies;
+  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
 }
 function packageIdToPackageName({ name, subModuleName }) {
   return subModuleName ? `${name}/${subModuleName}` : name;
 }
 function packageIdToString(packageId) {
-  return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
+  return `${packageIdToPackageName(packageId)}@${packageId.version}`;
 }
 function typeDirectiveIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
@@ -37166,7 +37163,7 @@ function trace(host, message, ...args) {
 function isTraceEnabled(compilerOptions, host) {
   return !!compilerOptions.traceResolution && host.trace !== void 0;
 }
-function withPackageId(packageInfo, r, state) {
+function withPackageId(packageInfo, r) {
   let packageId;
   if (r && packageInfo) {
     const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -37174,8 +37171,7 @@ function withPackageId(packageInfo, r, state) {
       packageId = {
         name: packageJsonContent.name,
         subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-        version: packageJsonContent.version,
-        peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
+        version: packageJsonContent.version
       };
     }
   }
@@ -37185,9 +37181,7 @@ function noPackageId(r) {
   return withPackageId(
     /*packageInfo*/
     void 0,
-    r,
-    /*state*/
-    void 0
+    r
   );
 }
 function removeIgnoredPackageId(r) {
@@ -37553,7 +37547,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
               false,
               moduleResolutionState
             ) : void 0;
-            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile, moduleResolutionState));
+            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
           }
         }
         return resolvedTypeScriptOnly(
@@ -38489,7 +38483,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
         false,
         state
       ) : void 0;
-      return withPackageId(packageInfo, resolvedFromFile, state);
+      return withPackageId(packageInfo, resolvedFromFile);
     }
   }
   if (!onlyRecordFailures) {
@@ -38632,7 +38626,7 @@ function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures,
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
   const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
   const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
 }
 function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options) {
   return {
@@ -38674,42 +38668,6 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   }
   return packageJsonInfo.contents.versionPaths || void 0;
 }
-function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
-  if (packageJsonInfo.contents.peerDependencies === void 0) {
-    packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
-  }
-  return packageJsonInfo.contents.peerDependencies || void 0;
-}
-function readPackageJsonPeerDependencies(packageJsonInfo, state) {
-  const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
-  if (peerDependencies === void 0)
-    return void 0;
-  if (state.traceEnabled)
-    trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
-  const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
-  const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
-  let result = "";
-  for (const key in peerDependencies) {
-    if (hasProperty(peerDependencies, key)) {
-      const peerPackageJson = getPackageJsonInfo(
-        nodeModules + key,
-        /*onlyRecordFailures*/
-        false,
-        state
-      );
-      if (peerPackageJson) {
-        const version2 = peerPackageJson.contents.packageJsonContent.version;
-        result += `+${key}@${version2}`;
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
-      } else {
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
-      }
-    }
-  }
-  return result;
-}
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
   var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
@@ -38738,7 +38696,7 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     if (traceEnabled) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
-    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
+    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
     if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
       state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
     (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -39146,7 +39104,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         /*onlyRecordFailures*/
         false,
         state
-      ), state));
+      )));
     } else if (typeof target === "object" && target !== null) {
       if (!Array.isArray(target)) {
         traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -39260,7 +39218,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                         /*onlyRecordFailures*/
                         false,
                         state
-                      ), state));
+                      )));
                     }
                   }
                 }
@@ -39391,7 +39349,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       packageInfo.contents.packageJsonContent,
       getVersionPathsOfPackageJsonInfo(packageInfo, state)
     );
-    return withPackageId(packageInfo, fromDirectory, state);
+    return withPackageId(packageInfo, fromDirectory);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -39405,7 +39363,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
     }
-    return withPackageId(packageInfo, pathAndExtension, state2);
+    return withPackageId(packageInfo, pathAndExtension);
   };
   if (rest !== "") {
     packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -39612,7 +39570,7 @@ function resolveFromTypeRoot(moduleName, state) {
         false,
         state
       ) : void 0;
-      return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
+      return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
     }
     const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
     if (resolved)
@@ -55351,11 +55309,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;

package/lib/tsserver.js

@@ -10712,9 +10712,6 @@ var Diagnostics = {
   There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
   There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
-  package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
-  Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
-  Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -15352,13 +15349,13 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   return result;
 }
 function packageIdIsEqual(a, b) {
-  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version && a.peerDependencies === b.peerDependencies;
+  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
 }
 function packageIdToPackageName({ name, subModuleName }) {
   return subModuleName ? `${name}/${subModuleName}` : name;
 }
 function packageIdToString(packageId) {
-  return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
+  return `${packageIdToPackageName(packageId)}@${packageId.version}`;
 }
 function typeDirectiveIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
@@ -41674,7 +41671,7 @@ function trace(host, message, ...args) {
 function isTraceEnabled(compilerOptions, host) {
   return !!compilerOptions.traceResolution && host.trace !== void 0;
 }
-function withPackageId(packageInfo, r, state) {
+function withPackageId(packageInfo, r) {
   let packageId;
   if (r && packageInfo) {
     const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -41682,8 +41679,7 @@ function withPackageId(packageInfo, r, state) {
       packageId = {
         name: packageJsonContent.name,
         subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-        version: packageJsonContent.version,
-        peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
+        version: packageJsonContent.version
       };
     }
   }
@@ -41693,9 +41689,7 @@ function noPackageId(r) {
   return withPackageId(
     /*packageInfo*/
     void 0,
-    r,
-    /*state*/
-    void 0
+    r
   );
 }
 function removeIgnoredPackageId(r) {
@@ -42073,7 +42067,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
               false,
               moduleResolutionState
             ) : void 0;
-            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile, moduleResolutionState));
+            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
           }
         }
         return resolvedTypeScriptOnly(
@@ -43047,7 +43041,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
         false,
         state
       ) : void 0;
-      return withPackageId(packageInfo, resolvedFromFile, state);
+      return withPackageId(packageInfo, resolvedFromFile);
     }
   }
   if (!onlyRecordFailures) {
@@ -43190,7 +43184,7 @@ function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures,
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
   const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
   const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
 }
 function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
   if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== void 0) {
@@ -43346,42 +43340,6 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   }
   return packageJsonInfo.contents.versionPaths || void 0;
 }
-function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
-  if (packageJsonInfo.contents.peerDependencies === void 0) {
-    packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
-  }
-  return packageJsonInfo.contents.peerDependencies || void 0;
-}
-function readPackageJsonPeerDependencies(packageJsonInfo, state) {
-  const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
-  if (peerDependencies === void 0)
-    return void 0;
-  if (state.traceEnabled)
-    trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
-  const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
-  const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
-  let result = "";
-  for (const key in peerDependencies) {
-    if (hasProperty(peerDependencies, key)) {
-      const peerPackageJson = getPackageJsonInfo(
-        nodeModules + key,
-        /*onlyRecordFailures*/
-        false,
-        state
-      );
-      if (peerPackageJson) {
-        const version2 = peerPackageJson.contents.packageJsonContent.version;
-        result += `+${key}@${version2}`;
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
-      } else {
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
-      }
-    }
-  }
-  return result;
-}
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
   var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
@@ -43410,7 +43368,7 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     if (traceEnabled) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
-    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
+    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
     if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
       state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
     (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -43818,7 +43776,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         /*onlyRecordFailures*/
         false,
         state
-      ), state));
+      )));
     } else if (typeof target === "object" && target !== null) {
       if (!Array.isArray(target)) {
         traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -43932,7 +43890,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                         /*onlyRecordFailures*/
                         false,
                         state
-                      ), state));
+                      )));
                     }
                   }
                 }
@@ -44063,7 +44021,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       packageInfo.contents.packageJsonContent,
       getVersionPathsOfPackageJsonInfo(packageInfo, state)
     );
-    return withPackageId(packageInfo, fromDirectory, state);
+    return withPackageId(packageInfo, fromDirectory);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -44077,7 +44035,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
     }
-    return withPackageId(packageInfo, pathAndExtension, state2);
+    return withPackageId(packageInfo, pathAndExtension);
   };
   if (rest !== "") {
     packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -44284,7 +44242,7 @@ function resolveFromTypeRoot(moduleName, state) {
         false,
         state
       ) : void 0;
-      return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
+      return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
     }
     const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
     if (resolved)
@@ -60086,11 +60044,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;

package/lib/typescript.d.ts

@@ -7818,7 +7818,6 @@ declare namespace ts {
         subModuleName: string;
         /** Version of the package, e.g. "1.2.3" */
         version: string;
-        peerDependencies?: string;
     }
     enum Extension {
         Ts = ".ts",

package/lib/typescript.js

@@ -8482,9 +8482,6 @@ ${lanes.join("\n")}
         There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
         Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
         There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
-        package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
-        Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
-        Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
         Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -13133,13 +13130,13 @@ ${lanes.join("\n")}
     return result;
   }
   function packageIdIsEqual(a, b) {
-    return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version && a.peerDependencies === b.peerDependencies;
+    return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
   }
   function packageIdToPackageName({ name, subModuleName }) {
     return subModuleName ? `${name}/${subModuleName}` : name;
   }
   function packageIdToString(packageId) {
-    return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
+    return `${packageIdToPackageName(packageId)}@${packageId.version}`;
   }
   function typeDirectiveIsEqualTo(oldResolution, newResolution) {
     return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
@@ -39522,7 +39519,7 @@ ${lanes.join("\n")}
   function isTraceEnabled(compilerOptions, host) {
     return !!compilerOptions.traceResolution && host.trace !== void 0;
   }
-  function withPackageId(packageInfo, r, state) {
+  function withPackageId(packageInfo, r) {
     let packageId;
     if (r && packageInfo) {
       const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -39530,8 +39527,7 @@ ${lanes.join("\n")}
         packageId = {
           name: packageJsonContent.name,
           subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-          version: packageJsonContent.version,
-          peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
+          version: packageJsonContent.version
         };
       }
     }
@@ -39541,9 +39537,7 @@ ${lanes.join("\n")}
     return withPackageId(
       /*packageInfo*/
       void 0,
-      r,
-      /*state*/
-      void 0
+      r
     );
   }
   function removeIgnoredPackageId(r) {
@@ -39919,7 +39913,7 @@ ${lanes.join("\n")}
                 false,
                 moduleResolutionState
               ) : void 0;
-              return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile, moduleResolutionState));
+              return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
             }
           }
           return resolvedTypeScriptOnly(
@@ -40880,7 +40874,7 @@ ${lanes.join("\n")}
           false,
           state
         ) : void 0;
-        return withPackageId(packageInfo, resolvedFromFile, state);
+        return withPackageId(packageInfo, resolvedFromFile);
       }
     }
     if (!onlyRecordFailures) {
@@ -41022,7 +41016,7 @@ ${lanes.join("\n")}
     const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
     const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
     const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-    return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+    return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
   }
   function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
     if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== void 0) {
@@ -41178,42 +41172,6 @@ ${lanes.join("\n")}
     }
     return packageJsonInfo.contents.versionPaths || void 0;
   }
-  function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
-    if (packageJsonInfo.contents.peerDependencies === void 0) {
-      packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
-    }
-    return packageJsonInfo.contents.peerDependencies || void 0;
-  }
-  function readPackageJsonPeerDependencies(packageJsonInfo, state) {
-    const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
-    if (peerDependencies === void 0)
-      return void 0;
-    if (state.traceEnabled)
-      trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
-    const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
-    const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
-    let result = "";
-    for (const key in peerDependencies) {
-      if (hasProperty(peerDependencies, key)) {
-        const peerPackageJson = getPackageJsonInfo(
-          nodeModules + key,
-          /*onlyRecordFailures*/
-          false,
-          state
-        );
-        if (peerPackageJson) {
-          const version2 = peerPackageJson.contents.packageJsonContent.version;
-          result += `+${key}@${version2}`;
-          if (state.traceEnabled)
-            trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
-        } else {
-          if (state.traceEnabled)
-            trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
-        }
-      }
-    }
-    return result;
-  }
   function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     var _a, _b, _c, _d, _e, _f;
     const { host, traceEnabled } = state;
@@ -41242,7 +41200,7 @@ ${lanes.join("\n")}
       if (traceEnabled) {
         trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
       }
-      const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
+      const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
       if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
         state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
       (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -41650,7 +41608,7 @@ ${lanes.join("\n")}
           /*onlyRecordFailures*/
           false,
           state
-        ), state));
+        )));
       } else if (typeof target === "object" && target !== null) {
         if (!Array.isArray(target)) {
           traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -41764,7 +41722,7 @@ ${lanes.join("\n")}
                           /*onlyRecordFailures*/
                           false,
                           state
-                        ), state));
+                        )));
                       }
                     }
                   }
@@ -41895,7 +41853,7 @@ ${lanes.join("\n")}
         packageInfo.contents.packageJsonContent,
         getVersionPathsOfPackageJsonInfo(packageInfo, state)
       );
-      return withPackageId(packageInfo, fromDirectory, state);
+      return withPackageId(packageInfo, fromDirectory);
     }
     const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
       let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -41909,7 +41867,7 @@ ${lanes.join("\n")}
       if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
         pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
       }
-      return withPackageId(packageInfo, pathAndExtension, state2);
+      return withPackageId(packageInfo, pathAndExtension);
     };
     if (rest !== "") {
       packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -42115,7 +42073,7 @@ ${lanes.join("\n")}
           false,
           state
         ) : void 0;
-        return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
+        return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
       }
       const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
       if (resolved)
@@ -57840,11 +57798,15 @@ ${lanes.join("\n")}
       return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
     }
     function getResolvedApparentTypeOfMappedType(type) {
-      const typeVariable = getHomomorphicTypeVariable(type);
-      if (typeVariable && !type.declaration.nameType) {
-        const constraint = getConstraintOfTypeParameter(typeVariable);
-        if (constraint && everyType(constraint, isArrayOrTupleType)) {
-          return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+      const target = type.target ?? type;
+      const typeVariable = getHomomorphicTypeVariable(target);
+      if (typeVariable && !target.declaration.nameType) {
+        const constraint = getConstraintTypeFromMappedType(type);
+        if (constraint.flags & 4194304 /* Index */) {
+          const baseConstraint = getBaseConstraintOfType(constraint.type);
+          if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+            return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+          }
         }
       }
       return type;

package/lib/typingsInstaller.js

@@ -6521,9 +6521,6 @@ var Diagnostics = {
   There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
   There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
-  package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
-  Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
-  Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -10104,7 +10101,7 @@ function packageIdToPackageName({ name, subModuleName }) {
   return subModuleName ? `${name}/${subModuleName}` : name;
 }
 function packageIdToString(packageId) {
-  return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
+  return `${packageIdToPackageName(packageId)}@${packageId.version}`;
 }
 function containsParseError(node) {
   aggregateChildData(node);
@@ -27632,7 +27629,7 @@ function trace(host, message, ...args) {
 function isTraceEnabled(compilerOptions, host) {
   return !!compilerOptions.traceResolution && host.trace !== void 0;
 }
-function withPackageId(packageInfo, r, state) {
+function withPackageId(packageInfo, r) {
   let packageId;
   if (r && packageInfo) {
     const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -27640,8 +27637,7 @@ function withPackageId(packageInfo, r, state) {
       packageId = {
         name: packageJsonContent.name,
         subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-        version: packageJsonContent.version,
-        peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
+        version: packageJsonContent.version
       };
     }
   }
@@ -27651,9 +27647,7 @@ function noPackageId(r) {
   return withPackageId(
     /*packageInfo*/
     void 0,
-    r,
-    /*state*/
-    void 0
+    r
   );
 }
 function removeIgnoredPackageId(r) {
@@ -28352,7 +28346,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
         false,
         state
       ) : void 0;
-      return withPackageId(packageInfo, resolvedFromFile, state);
+      return withPackageId(packageInfo, resolvedFromFile);
     }
   }
   if (!onlyRecordFailures) {
@@ -28495,7 +28489,7 @@ function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures,
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
   const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
   const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
 }
 function getPackageScopeForPath(fileName, state) {
   const parts = getPathComponents(fileName);
@@ -28520,42 +28514,6 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   }
   return packageJsonInfo.contents.versionPaths || void 0;
 }
-function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
-  if (packageJsonInfo.contents.peerDependencies === void 0) {
-    packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
-  }
-  return packageJsonInfo.contents.peerDependencies || void 0;
-}
-function readPackageJsonPeerDependencies(packageJsonInfo, state) {
-  const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
-  if (peerDependencies === void 0)
-    return void 0;
-  if (state.traceEnabled)
-    trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
-  const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
-  const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
-  let result = "";
-  for (const key in peerDependencies) {
-    if (hasProperty(peerDependencies, key)) {
-      const peerPackageJson = getPackageJsonInfo(
-        nodeModules + key,
-        /*onlyRecordFailures*/
-        false,
-        state
-      );
-      if (peerPackageJson) {
-        const version2 = peerPackageJson.contents.packageJsonContent.version;
-        result += `+${key}@${version2}`;
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
-      } else {
-        if (state.traceEnabled)
-          trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
-      }
-    }
-  }
-  return result;
-}
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
   var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
@@ -28584,7 +28542,7 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     if (traceEnabled) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
-    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
+    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
     if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
       state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
     (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -28992,7 +28950,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         /*onlyRecordFailures*/
         false,
         state
-      ), state));
+      )));
     } else if (typeof target === "object" && target !== null) {
       if (!Array.isArray(target)) {
         traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -29106,7 +29064,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                         /*onlyRecordFailures*/
                         false,
                         state
-                      ), state));
+                      )));
                     }
                   }
                 }
@@ -29237,7 +29195,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       packageInfo.contents.packageJsonContent,
       getVersionPathsOfPackageJsonInfo(packageInfo, state)
     );
-    return withPackageId(packageInfo, fromDirectory, state);
+    return withPackageId(packageInfo, fromDirectory);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -29251,7 +29209,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
     }
-    return withPackageId(packageInfo, pathAndExtension, state2);
+    return withPackageId(packageInfo, pathAndExtension);
   };
   if (rest !== "") {
     packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -29445,7 +29403,7 @@ function resolveFromTypeRoot(moduleName, state) {
         false,
         state
       ) : void 0;
-      return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
+      return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
     }
     const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
     if (resolved)

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-57029-27",
+  "version": "5.4.0-pr-57122-12",
   "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": "d0460957e0e295c121385410699b539cba29e155"
+  "gitHead": "ecb1a62f5afa6d60894c8662f03341cf81c26d6d"
 }