typescript 5.6.0-dev.20240716 → 5.6.0-dev.20240717

package/lib/lib.es2023.array.d.ts

@@ -203,7 +203,7 @@ interface Int8Array {
     /**
      * Copies the array and returns the copy with the elements in reverse order.
      */
-    toReversed(): Uint8Array;
+    toReversed(): Int8Array;
 
     /**
      * Copies and sorts the array.
@@ -211,11 +211,11 @@ interface Int8Array {
      * a negative value if the first argument is less than the second argument, zero if they're equal, and a positive
      * value otherwise. If omitted, the elements are sorted in ascending order.
      * ```ts
-     * const myNums = Uint8Array.from([11, 2, 22, 1]);
-     * myNums.toSorted((a, b) => a - b) // Uint8Array(4) [1, 2, 11, 22]
+     * const myNums = Int8Array.from([11, 2, 22, 1]);
+     * myNums.toSorted((a, b) => a - b) // Int8Array(4) [1, 2, 11, 22]
      * ```
      */
-    toSorted(compareFn?: (a: number, b: number) => number): Uint8Array;
+    toSorted(compareFn?: (a: number, b: number) => number): Int8Array;
 
     /**
      * Copies the array and inserts the given number at the provided index.
@@ -224,7 +224,7 @@ interface Int8Array {
      * @param value The value to insert into the copied array.
      * @returns A copy of the original array with the inserted value.
      */
-    with(index: number, value: number): Uint8Array;
+    with(index: number, value: number): Int8Array;
 }
 
 interface Uint8Array {

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240716`;
+var version = `${versionMajorMinor}.0-dev.20240717`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -2515,10 +2515,12 @@ function tryGetPerformance() {
   if (isNodeLikeSystem()) {
     try {
       const { performance: performance2 } = require("perf_hooks");
-      return {
-        shouldWriteNativeEvents: false,
-        performance: performance2
-      };
+      if (performance2) {
+        return {
+          shouldWriteNativeEvents: false,
+          performance: performance2
+        };
+      }
     } catch {
     }
   }
@@ -12585,6 +12587,34 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   if (result) result.repopulateInfo = () => ({ moduleReference, mode, packageName: packageName === moduleReference ? void 0 : packageName });
   return result;
 }
+function createModeMismatchDetails(currentSourceFile) {
+  const ext = tryGetExtensionFromPath2(currentSourceFile.fileName);
+  const scope = currentSourceFile.packageJsonScope;
+  const targetExt = ext === ".ts" /* Ts */ ? ".mts" /* Mts */ : ext === ".js" /* Js */ ? ".mjs" /* Mjs */ : void 0;
+  const result = scope && !scope.contents.packageJsonContent.type ? targetExt ? chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1,
+    targetExt,
+    combinePaths(scope.packageDirectory, "package.json")
+  ) : chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0,
+    combinePaths(scope.packageDirectory, "package.json")
+  ) : targetExt ? chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_package_json_file_with_type_Colon_module,
+    targetExt
+  ) : chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module
+  );
+  result.repopulateInfo = () => true;
+  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;
 }
@@ -40133,22 +40163,16 @@ function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options)
     resolvedPackageDirectory: false
   };
 }
-function getPackageScopeForPath(fileName, state) {
-  const parts = getPathComponents(fileName);
-  parts.pop();
-  while (parts.length > 0) {
-    const pkg = getPackageJsonInfo(
-      getPathFromPathComponents(parts),
+function getPackageScopeForPath(directory, state) {
+  return forEachAncestorDirectory(
+    directory,
+    (dir) => getPackageJsonInfo(
+      dir,
       /*onlyRecordFailures*/
       false,
       state
-    );
-    if (pkg) {
-      return pkg;
-    }
-    parts.pop();
-  }
-  return void 0;
+    )
+  );
 }
 function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   if (packageJsonInfo.contents.versionPaths === void 0) {
@@ -40311,7 +40335,7 @@ function noKeyStartsWithDot(obj) {
 }
 function loadModuleFromSelfNameReference(extensions, moduleName, directory, state, cache, redirectedReference) {
   var _a, _b;
-  const directoryPath = getNormalizedAbsolutePath(combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+  const directoryPath = getNormalizedAbsolutePath(directory, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
   const scope = getPackageScopeForPath(directoryPath, state);
   if (!scope || !scope.contents.packageJsonContent.exports) {
     return void 0;
@@ -40407,7 +40431,7 @@ function loadModuleFromImports(extensions, moduleName, directory, state, cache,
       void 0
     );
   }
-  const directoryPath = getNormalizedAbsolutePath(combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+  const directoryPath = getNormalizedAbsolutePath(directory, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
   const scope = getPackageScopeForPath(directoryPath, state);
   if (!scope) {
     if (state.traceEnabled) {
@@ -44518,7 +44542,7 @@ function getAllModulePathsWorker(info, importedFileName, host, compilerOptions,
   if (cache && links && host.readFile && !pathContainsNodeModules(info.importingSourceFileName)) {
     Debug.type(host);
     const state = getTemporaryModuleResolutionState(cache.getPackageJsonInfoCache(), host, {});
-    const packageJson = getPackageScopeForPath(info.importingSourceFileName, state);
+    const packageJson = getPackageScopeForPath(getDirectoryPath(info.importingSourceFileName), state);
     if (packageJson) {
       const toResolve = getAllRuntimeDependencies(packageJson.contents.packageJsonContent);
       for (const depName of toResolve || emptyArray) {
@@ -48187,41 +48211,7 @@ function createTypeChecker(host) {
               let diagnosticDetails;
               const ext = tryGetExtensionFromPath2(currentSourceFile.fileName);
               if (ext === ".ts" /* Ts */ || ext === ".js" /* Js */ || ext === ".tsx" /* Tsx */ || ext === ".jsx" /* Jsx */) {
-                const scope = currentSourceFile.packageJsonScope;
-                const targetExt = ext === ".ts" /* Ts */ ? ".mts" /* Mts */ : ext === ".js" /* Js */ ? ".mjs" /* Mjs */ : void 0;
-                if (scope && !scope.contents.packageJsonContent.type) {
-                  if (targetExt) {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1,
-                      targetExt,
-                      combinePaths(scope.packageDirectory, "package.json")
-                    );
-                  } else {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0,
-                      combinePaths(scope.packageDirectory, "package.json")
-                    );
-                  }
-                } else {
-                  if (targetExt) {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_package_json_file_with_type_Colon_module,
-                      targetExt
-                    );
-                  } else {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module
-                    );
-                  }
-                }
+                diagnosticDetails = createModeMismatchDetails(currentSourceFile);
               }
               diagnostics.add(createDiagnosticForNodeFromMessageChain(
                 getSourceFileOfNode(errorNode),
@@ -52081,7 +52071,7 @@ function createTypeChecker(host) {
           if (result) {
             if (result.pos !== -1 || result.end !== -1) {
               if (result === nodes) {
-                result = factory.createNodeArray(nodes, nodes.hasTrailingComma);
+                result = factory.createNodeArray(nodes.slice(), nodes.hasTrailingComma);
               }
               setTextRangePosEnd(result, -1, -1);
             }
@@ -72574,7 +72564,7 @@ function createTypeChecker(host) {
       checkGrammarJsxElement(node);
     }
     checkJsxPreconditions(node);
-    markLinkedReferences(node, 4 /* Jsx */);
+    markJsxAliasReferenced(node);
     if (isNodeOpeningLikeElement) {
       const jsxOpeningLikeNode = node;
       const sig = getResolvedSignature(jsxOpeningLikeNode);
@@ -85423,15 +85413,14 @@ function createTypeChecker(host) {
     function checkChildIdentifiers(node2) {
       forEachNodeRecursively(node2, checkIdentifiers);
     }
+    function isExpressionNodeOrShorthandPropertyAssignmentName(node2) {
+      return isExpressionNode(node2) || isShorthandPropertyAssignment(node2.parent) && (node2.parent.objectAssignmentInitializer ?? node2.parent.name) === node2;
+    }
     function checkSingleIdentifier(node2) {
       const nodeLinks2 = getNodeLinks(node2);
       nodeLinks2.calculatedFlags |= 536870912 /* ConstructorReference */ | 16384 /* CapturedBlockScopedBinding */ | 32768 /* BlockScopedBindingInLoop */;
-      if (isIdentifier(node2) && isExpressionNode(node2) && !(isPropertyAccessExpression(node2.parent) && node2.parent.name === node2)) {
-        const s = getSymbolAtLocation(
-          node2,
-          /*ignoreErrors*/
-          true
-        );
+      if (isIdentifier(node2) && isExpressionNodeOrShorthandPropertyAssignmentName(node2) && !(isPropertyAccessExpression(node2.parent) && node2.parent.name === node2)) {
+        const s = getResolvedSymbol(node2);
         if (s && s !== unknownSymbol) {
           checkIdentifierCalculateNodeCheckFlags(node2, s);
         }
@@ -119161,7 +119150,7 @@ function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host,
     const packageJsonLocations = [];
     state.failedLookupLocations = packageJsonLocations;
     state.affectingLocations = packageJsonLocations;
-    const packageJsonScope = getPackageScopeForPath(fileName, state);
+    const packageJsonScope = getPackageScopeForPath(getDirectoryPath(fileName), state);
     const impliedNodeFormat = (packageJsonScope == null ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? 99 /* ESNext */ : 1 /* CommonJS */;
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
@@ -123076,7 +123065,12 @@ function repopulateDiagnostics(diagnostics, newProgram) {
 }
 function convertOrRepopulateDiagnosticMessageChain(chain, sourceFile, newProgram, repopulateInfo) {
   const info = repopulateInfo(chain);
-  if (info) {
+  if (info === true) {
+    return {
+      ...createModeMismatchDetails(sourceFile),
+      next: convertOrRepopulateDiagnosticMessageChainArray(chain.next, sourceFile, newProgram, repopulateInfo)
+    };
+  } else if (info) {
     return {
       ...createModuleNotFoundChain(sourceFile, newProgram, info.moduleReference, info.mode, info.packageName || info.moduleReference),
       next: convertOrRepopulateDiagnosticMessageChainArray(chain.next, sourceFile, newProgram, repopulateInfo)
@@ -124807,7 +124801,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
         var _a;
-        const expected = isExternalOrCommonJsModule(newFile) ? ((_a = newFile.packageJsonLocations) == null ? void 0 : _a.length) ?? 0 : 0;
+        const expected = ((_a = newFile.packageJsonLocations) == null ? void 0 : _a.length) ?? 0;
         const existing = impliedFormatPackageJsons.get(newFile.resolvedPath) ?? emptyArray;
         for (let i = existing.length; i < expected; i++) {
           createFileWatcherOfAffectingLocation(

package/lib/typescript.js

@@ -410,6 +410,7 @@ __export(typescript_exports, {
   createMemberAccessForPropertyName: () => createMemberAccessForPropertyName,
   createModeAwareCache: () => createModeAwareCache,
   createModeAwareCacheKey: () => createModeAwareCacheKey,
+  createModeMismatchDetails: () => createModeMismatchDetails,
   createModuleNotFoundChain: () => createModuleNotFoundChain,
   createModuleResolutionCache: () => createModuleResolutionCache,
   createModuleResolutionLoader: () => createModuleResolutionLoader,
@@ -2251,7 +2252,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240716`;
+var version = `${versionMajorMinor}.0-dev.20240717`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -5051,10 +5052,12 @@ function tryGetPerformance() {
   if (isNodeLikeSystem()) {
     try {
       const { performance: performance2 } = require("perf_hooks");
-      return {
-        shouldWriteNativeEvents: false,
-        performance: performance2
-      };
+      if (performance2) {
+        return {
+          shouldWriteNativeEvents: false,
+          performance: performance2
+        };
+      }
     } catch {
     }
   }
@@ -16169,6 +16172,34 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   if (result) result.repopulateInfo = () => ({ moduleReference, mode, packageName: packageName === moduleReference ? void 0 : packageName });
   return result;
 }
+function createModeMismatchDetails(currentSourceFile) {
+  const ext = tryGetExtensionFromPath2(currentSourceFile.fileName);
+  const scope = currentSourceFile.packageJsonScope;
+  const targetExt = ext === ".ts" /* Ts */ ? ".mts" /* Mts */ : ext === ".js" /* Js */ ? ".mjs" /* Mjs */ : void 0;
+  const result = scope && !scope.contents.packageJsonContent.type ? targetExt ? chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1,
+    targetExt,
+    combinePaths(scope.packageDirectory, "package.json")
+  ) : chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0,
+    combinePaths(scope.packageDirectory, "package.json")
+  ) : targetExt ? chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_package_json_file_with_type_Colon_module,
+    targetExt
+  ) : chainDiagnosticMessages(
+    /*details*/
+    void 0,
+    Diagnostics.To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module
+  );
+  result.repopulateInfo = () => true;
+  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;
 }
@@ -44617,22 +44648,16 @@ function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options)
     resolvedPackageDirectory: false
   };
 }
-function getPackageScopeForPath(fileName, state) {
-  const parts = getPathComponents(fileName);
-  parts.pop();
-  while (parts.length > 0) {
-    const pkg = getPackageJsonInfo(
-      getPathFromPathComponents(parts),
+function getPackageScopeForPath(directory, state) {
+  return forEachAncestorDirectory(
+    directory,
+    (dir) => getPackageJsonInfo(
+      dir,
       /*onlyRecordFailures*/
       false,
       state
-    );
-    if (pkg) {
-      return pkg;
-    }
-    parts.pop();
-  }
-  return void 0;
+    )
+  );
 }
 function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   if (packageJsonInfo.contents.versionPaths === void 0) {
@@ -44795,7 +44820,7 @@ function noKeyStartsWithDot(obj) {
 }
 function loadModuleFromSelfNameReference(extensions, moduleName, directory, state, cache, redirectedReference) {
   var _a, _b;
-  const directoryPath = getNormalizedAbsolutePath(combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+  const directoryPath = getNormalizedAbsolutePath(directory, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
   const scope = getPackageScopeForPath(directoryPath, state);
   if (!scope || !scope.contents.packageJsonContent.exports) {
     return void 0;
@@ -44891,7 +44916,7 @@ function loadModuleFromImports(extensions, moduleName, directory, state, cache,
       void 0
     );
   }
-  const directoryPath = getNormalizedAbsolutePath(combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+  const directoryPath = getNormalizedAbsolutePath(directory, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
   const scope = getPackageScopeForPath(directoryPath, state);
   if (!scope) {
     if (state.traceEnabled) {
@@ -49120,7 +49145,7 @@ function getAllModulePathsWorker(info, importedFileName, host, compilerOptions,
   if (cache && links && host.readFile && !pathContainsNodeModules(info.importingSourceFileName)) {
     Debug.type(host);
     const state = getTemporaryModuleResolutionState(cache.getPackageJsonInfoCache(), host, {});
-    const packageJson = getPackageScopeForPath(info.importingSourceFileName, state);
+    const packageJson = getPackageScopeForPath(getDirectoryPath(info.importingSourceFileName), state);
     if (packageJson) {
       const toResolve = getAllRuntimeDependencies(packageJson.contents.packageJsonContent);
       for (const depName of toResolve || emptyArray) {
@@ -52789,41 +52814,7 @@ function createTypeChecker(host) {
               let diagnosticDetails;
               const ext = tryGetExtensionFromPath2(currentSourceFile.fileName);
               if (ext === ".ts" /* Ts */ || ext === ".js" /* Js */ || ext === ".tsx" /* Tsx */ || ext === ".jsx" /* Jsx */) {
-                const scope = currentSourceFile.packageJsonScope;
-                const targetExt = ext === ".ts" /* Ts */ ? ".mts" /* Mts */ : ext === ".js" /* Js */ ? ".mjs" /* Mjs */ : void 0;
-                if (scope && !scope.contents.packageJsonContent.type) {
-                  if (targetExt) {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1,
-                      targetExt,
-                      combinePaths(scope.packageDirectory, "package.json")
-                    );
-                  } else {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0,
-                      combinePaths(scope.packageDirectory, "package.json")
-                    );
-                  }
-                } else {
-                  if (targetExt) {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_package_json_file_with_type_Colon_module,
-                      targetExt
-                    );
-                  } else {
-                    diagnosticDetails = chainDiagnosticMessages(
-                      /*details*/
-                      void 0,
-                      Diagnostics.To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module
-                    );
-                  }
-                }
+                diagnosticDetails = createModeMismatchDetails(currentSourceFile);
               }
               diagnostics.add(createDiagnosticForNodeFromMessageChain(
                 getSourceFileOfNode(errorNode),
@@ -56683,7 +56674,7 @@ function createTypeChecker(host) {
           if (result) {
             if (result.pos !== -1 || result.end !== -1) {
               if (result === nodes) {
-                result = factory.createNodeArray(nodes, nodes.hasTrailingComma);
+                result = factory.createNodeArray(nodes.slice(), nodes.hasTrailingComma);
               }
               setTextRangePosEnd(result, -1, -1);
             }
@@ -77176,7 +77167,7 @@ function createTypeChecker(host) {
       checkGrammarJsxElement(node);
     }
     checkJsxPreconditions(node);
-    markLinkedReferences(node, 4 /* Jsx */);
+    markJsxAliasReferenced(node);
     if (isNodeOpeningLikeElement) {
       const jsxOpeningLikeNode = node;
       const sig = getResolvedSignature(jsxOpeningLikeNode);
@@ -90025,15 +90016,14 @@ function createTypeChecker(host) {
     function checkChildIdentifiers(node2) {
       forEachNodeRecursively(node2, checkIdentifiers);
     }
+    function isExpressionNodeOrShorthandPropertyAssignmentName(node2) {
+      return isExpressionNode(node2) || isShorthandPropertyAssignment(node2.parent) && (node2.parent.objectAssignmentInitializer ?? node2.parent.name) === node2;
+    }
     function checkSingleIdentifier(node2) {
       const nodeLinks2 = getNodeLinks(node2);
       nodeLinks2.calculatedFlags |= 536870912 /* ConstructorReference */ | 16384 /* CapturedBlockScopedBinding */ | 32768 /* BlockScopedBindingInLoop */;
-      if (isIdentifier(node2) && isExpressionNode(node2) && !(isPropertyAccessExpression(node2.parent) && node2.parent.name === node2)) {
-        const s = getSymbolAtLocation(
-          node2,
-          /*ignoreErrors*/
-          true
-        );
+      if (isIdentifier(node2) && isExpressionNodeOrShorthandPropertyAssignmentName(node2) && !(isPropertyAccessExpression(node2.parent) && node2.parent.name === node2)) {
+        const s = getResolvedSymbol(node2);
         if (s && s !== unknownSymbol) {
           checkIdentifierCalculateNodeCheckFlags(node2, s);
         }
@@ -123999,7 +123989,7 @@ function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host,
     const packageJsonLocations = [];
     state.failedLookupLocations = packageJsonLocations;
     state.affectingLocations = packageJsonLocations;
-    const packageJsonScope = getPackageScopeForPath(fileName, state);
+    const packageJsonScope = getPackageScopeForPath(getDirectoryPath(fileName), state);
     const impliedNodeFormat = (packageJsonScope == null ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? 99 /* ESNext */ : 1 /* CommonJS */;
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
@@ -127943,7 +127933,12 @@ function repopulateDiagnostics(diagnostics, newProgram) {
 }
 function convertOrRepopulateDiagnosticMessageChain(chain, sourceFile, newProgram, repopulateInfo) {
   const info = repopulateInfo(chain);
-  if (info) {
+  if (info === true) {
+    return {
+      ...createModeMismatchDetails(sourceFile),
+      next: convertOrRepopulateDiagnosticMessageChainArray(chain.next, sourceFile, newProgram, repopulateInfo)
+    };
+  } else if (info) {
     return {
       ...createModuleNotFoundChain(sourceFile, newProgram, info.moduleReference, info.mode, info.packageName || info.moduleReference),
       next: convertOrRepopulateDiagnosticMessageChainArray(chain.next, sourceFile, newProgram, repopulateInfo)
@@ -129706,7 +129701,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
         var _a;
-        const expected = isExternalOrCommonJsModule(newFile) ? ((_a = newFile.packageJsonLocations) == null ? void 0 : _a.length) ?? 0 : 0;
+        const expected = ((_a = newFile.packageJsonLocations) == null ? void 0 : _a.length) ?? 0;
         const existing = impliedFormatPackageJsons.get(newFile.resolvedPath) ?? emptyArray;
         for (let i = existing.length; i < expected; i++) {
           createFileWatcherOfAffectingLocation(
@@ -162073,7 +162068,7 @@ var errorCodes54 = [Diagnostics.require_call_may_be_converted_to_an_import.code]
 registerCodeFix({
   errorCodes: errorCodes54,
   getCodeActions(context) {
-    const info = getInfo18(context.sourceFile, context.program, context.span.start);
+    const info = getInfo18(context.sourceFile, context.program, context.span.start, context.preferences);
     if (!info) {
       return void 0;
     }
@@ -162082,14 +162077,14 @@ registerCodeFix({
   },
   fixIds: [fixId42],
   getAllCodeActions: (context) => codeFixAll(context, errorCodes54, (changes, diag2) => {
-    const info = getInfo18(diag2.file, context.program, diag2.start);
+    const info = getInfo18(diag2.file, context.program, diag2.start, context.preferences);
     if (info) {
       doChange35(changes, context.sourceFile, info);
     }
   })
 });
 function doChange35(changes, sourceFile, info) {
-  const { allowSyntheticDefaults, defaultImportName, namedImports, statement, required } = info;
+  const { allowSyntheticDefaults, defaultImportName, namedImports, statement, moduleSpecifier } = info;
   changes.replaceNode(
     sourceFile,
     statement,
@@ -162099,7 +162094,7 @@ function doChange35(changes, sourceFile, info) {
       /*isTypeOnly*/
       false,
       defaultImportName,
-      factory.createExternalModuleReference(required)
+      factory.createExternalModuleReference(moduleSpecifier)
     ) : factory.createImportDeclaration(
       /*modifiers*/
       void 0,
@@ -162109,13 +162104,13 @@ function doChange35(changes, sourceFile, info) {
         defaultImportName,
         namedImports
       ),
-      required,
+      moduleSpecifier,
       /*attributes*/
       void 0
     )
   );
 }
-function getInfo18(sourceFile, program, pos) {
+function getInfo18(sourceFile, program, pos, preferences) {
   const { parent: parent2 } = getTokenAtPosition(sourceFile, pos);
   if (!isRequireCall(
     parent2,
@@ -162125,15 +162120,17 @@ function getInfo18(sourceFile, program, pos) {
     Debug.failBadSyntaxKind(parent2);
   }
   const decl = cast(parent2.parent, isVariableDeclaration);
+  const quotePreference = getQuotePreference(sourceFile, preferences);
   const defaultImportName = tryCast(decl.name, isIdentifier);
   const namedImports = isObjectBindingPattern(decl.name) ? tryCreateNamedImportsFromObjectBindingPattern(decl.name) : void 0;
   if (defaultImportName || namedImports) {
+    const moduleSpecifier = first(parent2.arguments);
     return {
       allowSyntheticDefaults: getAllowSyntheticDefaultImports(program.getCompilerOptions()),
       defaultImportName,
       namedImports,
       statement: cast(decl.parent.parent, isVariableStatement),
-      required: first(parent2.arguments)
+      moduleSpecifier: isNoSubstitutionTemplateLiteral(moduleSpecifier) ? factory.createStringLiteral(moduleSpecifier.text, quotePreference === 0 /* Single */) : moduleSpecifier
     };
   }
 }
@@ -178898,6 +178895,7 @@ __export(ts_exports2, {
   createMemberAccessForPropertyName: () => createMemberAccessForPropertyName,
   createModeAwareCache: () => createModeAwareCache,
   createModeAwareCacheKey: () => createModeAwareCacheKey,
+  createModeMismatchDetails: () => createModeMismatchDetails,
   createModuleNotFoundChain: () => createModuleNotFoundChain,
   createModuleResolutionCache: () => createModuleResolutionCache,
   createModuleResolutionLoader: () => createModuleResolutionLoader,
@@ -190217,7 +190215,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         const packageDirectory = fileName.substring(0, nodeModulesPathParts.packageRootIndex);
         const packageJsonCache = (_a2 = project.getModuleResolutionCache()) == null ? void 0 : _a2.getPackageJsonInfoCache();
         const compilerOptions = project.getCompilationSettings();
-        const packageJson = getPackageScopeForPath(getNormalizedAbsolutePath(packageDirectory + "/package.json", project.getCurrentDirectory()), getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
+        const packageJson = getPackageScopeForPath(getNormalizedAbsolutePath(packageDirectory, project.getCurrentDirectory()), getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
         if (!packageJson) return void 0;
         const entrypoints = getEntrypointsFromPackageJsonInfo(
           packageJson,
@@ -193256,6 +193254,7 @@ if (typeof console !== "undefined") {
   createMemberAccessForPropertyName,
   createModeAwareCache,
   createModeAwareCacheKey,
+  createModeMismatchDetails,
   createModuleNotFoundChain,
   createModuleResolutionCache,
   createModuleResolutionLoader,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240716",
+    "version": "5.6.0-dev.20240717",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "ec446b6f19b44ed3db2d787b59d9c99a5b710283"
+    "gitHead": "f37482cd16118409284e015409deaf14b416b4a0"
 }