typescript 5.4.0-dev.20231220 → 5.4.0-dev.20231222

package/lib/tsserver.js

@@ -938,8 +938,10 @@ __export(server_exports, {
   getOriginalNodeId: () => getOriginalNodeId,
   getOriginalSourceFile: () => getOriginalSourceFile,
   getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWorker: () => getOutputDeclarationFileNameWorker,
   getOutputExtension: () => getOutputExtension,
   getOutputFileNames: () => getOutputFileNames,
+  getOutputJSFileNameWorker: () => getOutputJSFileNameWorker,
   getOutputPathsFor: () => getOutputPathsFor,
   getOutputPathsForBundle: () => getOutputPathsForBundle,
   getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -1570,6 +1572,7 @@ __export(server_exports, {
   isMethodSignature: () => isMethodSignature,
   isMinusToken: () => isMinusToken,
   isMissingDeclaration: () => isMissingDeclaration,
+  isMissingPackageJsonInfo: () => isMissingPackageJsonInfo,
   isModifier: () => isModifier,
   isModifierKind: () => isModifierKind,
   isModifierLike: () => isModifierLike,
@@ -2271,6 +2274,7 @@ __export(server_exports, {
   tryGetSourceMappingURL: () => tryGetSourceMappingURL,
   tryGetTextOfPropertyName: () => tryGetTextOfPropertyName,
   tryIOAndConsumeErrors: () => tryIOAndConsumeErrors,
+  tryParseJson: () => tryParseJson,
   tryParsePattern: () => tryParsePattern,
   tryParsePatterns: () => tryParsePatterns,
   tryParseRawSourceMap: () => tryParseRawSourceMap,
@@ -2335,7 +2339,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231220`;
+var version = `${versionMajorMinor}.0-dev.20231222`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3733,9 +3737,9 @@ function levenshteinWithMax(s1, s2, max) {
   const res = previous[s2.length];
   return res > max ? void 0 : res;
 }
-function endsWith(str, suffix) {
+function endsWith(str, suffix, ignoreCase) {
   const expectedPos = str.length - suffix.length;
-  return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
+  return expectedPos >= 0 && (ignoreCase ? equateStringsCaseInsensitive(str.slice(expectedPos), suffix) : str.indexOf(suffix, expectedPos) === expectedPos);
 }
 function removeSuffix(str, suffix) {
   return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : str;
@@ -3828,8 +3832,8 @@ function findBestPatternMatch(values, getPattern, candidate) {
   }
   return matchedValue;
 }
-function startsWith(str, prefix) {
-  return str.lastIndexOf(prefix, 0) === 0;
+function startsWith(str, prefix, ignoreCase) {
+  return ignoreCase ? equateStringsCaseInsensitive(str.slice(0, prefix.length), prefix) : str.lastIndexOf(prefix, 0) === 0;
 }
 function removePrefix(str, prefix) {
   return startsWith(str, prefix) ? str.substr(prefix.length) : str;
@@ -6239,6 +6243,7 @@ var JsxFlags = /* @__PURE__ */ ((JsxFlags2) => {
   return JsxFlags2;
 })(JsxFlags || {});
 var RelationComparisonResult = /* @__PURE__ */ ((RelationComparisonResult3) => {
+  RelationComparisonResult3[RelationComparisonResult3["None"] = 0] = "None";
   RelationComparisonResult3[RelationComparisonResult3["Succeeded"] = 1] = "Succeeded";
   RelationComparisonResult3[RelationComparisonResult3["Failed"] = 2] = "Failed";
   RelationComparisonResult3[RelationComparisonResult3["Reported"] = 4] = "Reported";
@@ -10338,6 +10343,8 @@ var Diagnostics = {
   This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0: diag(4122, 1 /* Error */, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4122", "This member cannot have a JSDoc comment with an '@override' tag because it is not declared in the base class '{0}'."),
   This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1: diag(4123, 1 /* Error */, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4123", "This member cannot have a JSDoc comment with an 'override' tag because it is not declared in the base class '{0}'. Did you mean '{1}'?"),
   Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4124, 1 /* Error */, "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124", "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
+  Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given: diag(4125, 1 /* Error */, "Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given_4125", "Each declaration of '{0}.{1}' differs in its value, where '{2}' was expected but '{3}' was given."),
+  One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value: diag(4126, 1 /* Error */, "One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value_4126", "One value of '{0}.{1}' is the string '{2}', and the other is assumed to be an unknown numeric value."),
   The_current_host_does_not_support_the_0_option: diag(5001, 1 /* Error */, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
   Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, 1 /* Error */, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
   File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, 1 /* Error */, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -19801,6 +19808,13 @@ function readJsonOrUndefined(path, hostOrText) {
 function readJson(path, host) {
   return readJsonOrUndefined(path, host) || {};
 }
+function tryParseJson(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return void 0;
+  }
+}
 function directoryProbablyExists(directoryName, host) {
   return !host.directoryExists || host.directoryExists(directoryName);
 }
@@ -42118,6 +42132,9 @@ function getAutomaticTypeDirectiveNames(options, host) {
 function isPackageJsonInfo(entry) {
   return !!(entry == null ? void 0 : entry.contents);
 }
+function isMissingPackageJsonInfo(entry) {
+  return !!entry && !entry.contents;
+}
 function compilerOptionValueToString(value) {
   var _a;
   if (value === null || typeof value !== "object") {
@@ -47461,7 +47478,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   const { sourceDirectory, canonicalSourceDirectory, getCanonicalFileName } = info;
   const allowedEndings = getAllowedEndingsInPrefererredOrder(importMode);
   const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) || processEnding(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), allowedEndings, compilerOptions);
-  if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
+  if (!baseUrl && !paths && !getResolvePackageJsonImports(compilerOptions) || relativePreference === 0 /* Relative */) {
     return pathsOnly ? void 0 : relativePath;
   }
   const baseDirectory = getNormalizedAbsolutePath(getPathsBasePath(compilerOptions, host) || baseUrl, host.getCurrentDirectory());
@@ -47469,11 +47486,12 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   if (!relativeToBaseUrl) {
     return pathsOnly ? void 0 : relativePath;
   }
-  const fromPaths = paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions);
+  const fromPackageJsonImports = pathsOnly ? void 0 : tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, compilerOptions, host, importMode);
+  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
   if (pathsOnly) {
     return fromPaths;
   }
-  const maybeNonRelative = fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths;
+  const maybeNonRelative = fromPackageJsonImports ?? (fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths);
   if (!maybeNonRelative) {
     return relativePath;
   }
@@ -47512,8 +47530,8 @@ function getNearestAncestorDirectoryWithPackageJson(host, fileName) {
   if (host.getNearestAncestorDirectoryWithPackageJson) {
     return host.getNearestAncestorDirectoryWithPackageJson(fileName);
   }
-  return !!forEachAncestorDirectory(fileName, (directory) => {
-    return host.fileExists(combinePaths(directory, "package.json")) ? true : void 0;
+  return forEachAncestorDirectory(fileName, (directory) => {
+    return host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
   });
 }
 function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
@@ -47687,8 +47705,12 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
     return ending !== 0 /* Minimal */ || value === processEnding(relativeToBaseUrl, [ending], compilerOptions, host);
   }
 }
-function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports2, conditions, mode = 0 /* Exact */) {
+function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, exports2, conditions, mode, isImports) {
   if (typeof exports2 === "string") {
+    const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+    const getCommonSourceDirectory2 = () => host.getCommonSourceDirectory();
+    const outputFile = isImports && getOutputJSFileNameWorker(targetFilePath, options, ignoreCase, getCommonSourceDirectory2);
+    const declarationFile = isImports && getOutputDeclarationFileNameWorker(targetFilePath, options, ignoreCase, getCommonSourceDirectory2);
     const pathOrPattern = getNormalizedAbsolutePath(
       combinePaths(packageDirectory, exports2),
       /*currentDirectory*/
@@ -47697,12 +47719,25 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
     const extensionSwappedTarget = hasTSFileExtension(targetFilePath) ? removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : void 0;
     switch (mode) {
       case 0 /* Exact */:
-        if (comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */) {
+        if (extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern, ignoreCase) === 0 /* EqualTo */ || comparePaths(targetFilePath, pathOrPattern, ignoreCase) === 0 /* EqualTo */ || outputFile && comparePaths(outputFile, pathOrPattern, ignoreCase) === 0 /* EqualTo */ || declarationFile && comparePaths(declarationFile, pathOrPattern, ignoreCase) === 0 /* EqualTo */) {
           return { moduleFileToTry: packageName };
         }
         break;
       case 1 /* Directory */:
-        if (containsPath(pathOrPattern, targetFilePath)) {
+        if (extensionSwappedTarget && containsPath(pathOrPattern, extensionSwappedTarget, ignoreCase)) {
+          const fragment = getRelativePathFromDirectory(
+            pathOrPattern,
+            extensionSwappedTarget,
+            /*ignoreCase*/
+            false
+          );
+          return { moduleFileToTry: getNormalizedAbsolutePath(
+            combinePaths(combinePaths(packageName, exports2), fragment),
+            /*currentDirectory*/
+            void 0
+          ) };
+        }
+        if (containsPath(pathOrPattern, targetFilePath, ignoreCase)) {
           const fragment = getRelativePathFromDirectory(
             pathOrPattern,
             targetFilePath,
@@ -47715,48 +47750,136 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
             void 0
           ) };
         }
+        if (outputFile && containsPath(pathOrPattern, outputFile, ignoreCase)) {
+          const fragment = getRelativePathFromDirectory(
+            pathOrPattern,
+            outputFile,
+            /*ignoreCase*/
+            false
+          );
+          return { moduleFileToTry: combinePaths(packageName, fragment) };
+        }
+        if (declarationFile && containsPath(pathOrPattern, declarationFile, ignoreCase)) {
+          const fragment = getRelativePathFromDirectory(
+            pathOrPattern,
+            declarationFile,
+            /*ignoreCase*/
+            false
+          );
+          return { moduleFileToTry: combinePaths(packageName, fragment) };
+        }
         break;
       case 2 /* Pattern */:
         const starPos = pathOrPattern.indexOf("*");
         const leadingSlice = pathOrPattern.slice(0, starPos);
         const trailingSlice = pathOrPattern.slice(starPos + 1);
-        if (startsWith(targetFilePath, leadingSlice) && endsWith(targetFilePath, trailingSlice)) {
+        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice, ignoreCase) && endsWith(extensionSwappedTarget, trailingSlice, ignoreCase)) {
+          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
+          return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
+        }
+        if (startsWith(targetFilePath, leadingSlice, ignoreCase) && endsWith(targetFilePath, trailingSlice, ignoreCase)) {
           const starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
           return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
         }
-        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
-          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
+        if (outputFile && startsWith(outputFile, leadingSlice, ignoreCase) && endsWith(outputFile, trailingSlice, ignoreCase)) {
+          const starReplacement = outputFile.slice(leadingSlice.length, outputFile.length - trailingSlice.length);
+          return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
+        }
+        if (declarationFile && startsWith(declarationFile, leadingSlice, ignoreCase) && endsWith(declarationFile, trailingSlice, ignoreCase)) {
+          const starReplacement = declarationFile.slice(leadingSlice.length, declarationFile.length - trailingSlice.length);
           return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
         }
         break;
     }
   } else if (Array.isArray(exports2)) {
-    return forEach(exports2, (e) => tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions));
+    return forEach(exports2, (e) => tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, e, conditions, mode, isImports));
   } else if (typeof exports2 === "object" && exports2 !== null) {
-    if (allKeysStartWithDot(exports2)) {
-      return forEach(getOwnKeys(exports2), (k) => {
-        const subPackageName = getNormalizedAbsolutePath(
-          combinePaths(packageName, k),
-          /*currentDirectory*/
-          void 0
-        );
-        const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports2[k], conditions, mode2);
-      });
-    } else {
-      for (const key of getOwnKeys(exports2)) {
-        if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
-          const subTarget = exports2[key];
-          const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
-          if (result) {
-            return result;
-          }
+    for (const key of getOwnKeys(exports2)) {
+      if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
+        const subTarget = exports2[key];
+        const result = tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode, isImports);
+        if (result) {
+          return result;
         }
       }
     }
   }
   return void 0;
 }
+function tryGetModuleNameFromExports(options, host, targetFilePath, packageDirectory, packageName, exports2, conditions) {
+  if (typeof exports2 === "object" && exports2 !== null && !Array.isArray(exports2) && allKeysStartWithDot(exports2)) {
+    return forEach(getOwnKeys(exports2), (k) => {
+      const subPackageName = getNormalizedAbsolutePath(
+        combinePaths(packageName, k),
+        /*currentDirectory*/
+        void 0
+      );
+      const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
+      return tryGetModuleNameFromExportsOrImports(
+        options,
+        host,
+        targetFilePath,
+        packageDirectory,
+        subPackageName,
+        exports2[k],
+        conditions,
+        mode,
+        /*isImports*/
+        false
+      );
+    });
+  }
+  return tryGetModuleNameFromExportsOrImports(
+    options,
+    host,
+    targetFilePath,
+    packageDirectory,
+    packageName,
+    exports2,
+    conditions,
+    0 /* Exact */,
+    /*isImports*/
+    false
+  );
+}
+function tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, options, host, importMode) {
+  var _a, _b, _c;
+  if (!host.readFile || !getResolvePackageJsonImports(options)) {
+    return void 0;
+  }
+  const ancestorDirectoryWithPackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
+  if (!ancestorDirectoryWithPackageJson) {
+    return void 0;
+  }
+  const packageJsonPath = combinePaths(ancestorDirectoryWithPackageJson, "package.json");
+  const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
+  if (isMissingPackageJsonInfo(cachedPackageJson) || !host.fileExists(packageJsonPath)) {
+    return void 0;
+  }
+  const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || tryParseJson(host.readFile(packageJsonPath));
+  const imports = packageJsonContent == null ? void 0 : packageJsonContent.imports;
+  if (!imports) {
+    return void 0;
+  }
+  const conditions = getConditions(options, importMode);
+  return (_c = forEach(getOwnKeys(imports), (k) => {
+    if (!startsWith(k, "#") || k === "#" || startsWith(k, "#/"))
+      return void 0;
+    const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
+    return tryGetModuleNameFromExportsOrImports(
+      options,
+      host,
+      moduleFileName,
+      ancestorDirectoryWithPackageJson,
+      k,
+      imports[k],
+      conditions,
+      mode,
+      /*isImports*/
+      true
+    );
+  })) == null ? void 0 : _c.moduleFileToTry;
+}
 function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) {
   const normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
   if (normalizedTargetPaths === void 0) {
@@ -47830,22 +47953,21 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
     let maybeBlockedByTypesVersions = false;
     const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
     if (isPackageJsonInfo(cachedPackageJson) || cachedPackageJson === void 0 && host.fileExists(packageJsonPath)) {
-      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
+      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || tryParseJson(host.readFile(packageJsonPath));
       const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
       if (getResolvePackageJsonExports(options)) {
         const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
         const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
         const conditions = getConditions(options, importMode);
-        const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
+        const fromExports = (packageJsonContent == null ? void 0 : packageJsonContent.exports) ? tryGetModuleNameFromExports(options, host, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
         if (fromExports) {
-          const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
-          return { ...withJsExtension, verbatimFromExports: true };
+          return { ...fromExports, verbatimFromExports: true };
         }
-        if (packageJsonContent.exports) {
+        if (packageJsonContent == null ? void 0 : packageJsonContent.exports) {
           return { moduleFileToTry: path, blockedByExports: true };
         }
       }
-      const versionPaths = packageJsonContent.typesVersions ? getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions) : void 0;
+      const versionPaths = (packageJsonContent == null ? void 0 : packageJsonContent.typesVersions) ? getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions) : void 0;
       if (versionPaths) {
         const subModuleName = path.slice(packageRootPath.length + 1);
         const fromPaths = tryGetModuleNameFromPaths(
@@ -47861,13 +47983,13 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
           moduleFileToTry = combinePaths(packageRootPath, fromPaths);
         }
       }
-      const mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
+      const mainFileRelative = (packageJsonContent == null ? void 0 : packageJsonContent.typings) || (packageJsonContent == null ? void 0 : packageJsonContent.types) || (packageJsonContent == null ? void 0 : packageJsonContent.main) || "index.js";
       if (isString(mainFileRelative) && !(maybeBlockedByTypesVersions && matchPatternOrExact(tryParsePatterns(versionPaths.paths), mainFileRelative))) {
         const mainExportFile = toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
         const canonicalModuleFileToTry = getCanonicalFileName(moduleFileToTry);
         if (removeFileExtension(mainExportFile) === removeFileExtension(canonicalModuleFileToTry)) {
           return { packageRootPath, moduleFileToTry };
-        } else if (packageJsonContent.type !== "module" && !fileExtensionIsOneOf(canonicalModuleFileToTry, extensionsNotSupportingExtensionlessResolution) && startsWith(canonicalModuleFileToTry, mainExportFile) && getDirectoryPath(canonicalModuleFileToTry) === removeTrailingDirectorySeparator(mainExportFile) && removeFileExtension(getBaseFileName(canonicalModuleFileToTry)) === "index") {
+        } else if ((packageJsonContent == null ? void 0 : packageJsonContent.type) !== "module" && !fileExtensionIsOneOf(canonicalModuleFileToTry, extensionsNotSupportingExtensionlessResolution) && startsWith(canonicalModuleFileToTry, mainExportFile) && getDirectoryPath(canonicalModuleFileToTry) === removeTrailingDirectorySeparator(mainExportFile) && removeFileExtension(getBaseFileName(canonicalModuleFileToTry)) === "index") {
           return { packageRootPath, moduleFileToTry };
         }
       }
@@ -65203,12 +65325,12 @@ function createTypeChecker(host) {
       return !!(entry & 1 /* Succeeded */);
     }
     const targetEnumType = getTypeOfSymbol(targetSymbol);
-    for (const property of getPropertiesOfType(getTypeOfSymbol(sourceSymbol))) {
-      if (property.flags & 8 /* EnumMember */) {
-        const targetProperty = getPropertyOfType(targetEnumType, property.escapedName);
+    for (const sourceProperty of getPropertiesOfType(getTypeOfSymbol(sourceSymbol))) {
+      if (sourceProperty.flags & 8 /* EnumMember */) {
+        const targetProperty = getPropertyOfType(targetEnumType, sourceProperty.escapedName);
         if (!targetProperty || !(targetProperty.flags & 8 /* EnumMember */)) {
           if (errorReporter) {
-            errorReporter(Diagnostics.Property_0_is_missing_in_type_1, symbolName(property), typeToString(
+            errorReporter(Diagnostics.Property_0_is_missing_in_type_1, symbolName(sourceProperty), typeToString(
               getDeclaredTypeOfSymbol(targetSymbol),
               /*enclosingDeclaration*/
               void 0,
@@ -65220,6 +65342,35 @@ function createTypeChecker(host) {
           }
           return false;
         }
+        const sourceValue = getEnumMemberValue(getDeclarationOfKind(sourceProperty, 306 /* EnumMember */));
+        const targetValue = getEnumMemberValue(getDeclarationOfKind(targetProperty, 306 /* EnumMember */));
+        if (sourceValue !== targetValue) {
+          const sourceIsString = typeof sourceValue === "string";
+          const targetIsString = typeof targetValue === "string";
+          if (sourceValue !== void 0 && targetValue !== void 0) {
+            if (!errorReporter) {
+              enumRelation.set(id, 2 /* Failed */);
+            } else {
+              const escapedSource = sourceIsString ? `"${escapeString(sourceValue)}"` : sourceValue;
+              const escapedTarget = targetIsString ? `"${escapeString(targetValue)}"` : targetValue;
+              errorReporter(Diagnostics.Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given, symbolName(targetSymbol), symbolName(targetProperty), escapedTarget, escapedSource);
+              enumRelation.set(id, 2 /* Failed */ | 4 /* Reported */);
+            }
+            return false;
+          }
+          if (sourceIsString || targetIsString) {
+            if (!errorReporter) {
+              enumRelation.set(id, 2 /* Failed */);
+            } else {
+              const knownStringValue = sourceValue ?? targetValue;
+              Debug.assert(typeof knownStringValue === "string");
+              const escapedValue = `"${escapeString(knownStringValue)}"`;
+              errorReporter(Diagnostics.One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value, symbolName(targetSymbol), symbolName(targetProperty), escapedValue);
+              enumRelation.set(id, 2 /* Failed */ | 4 /* Reported */);
+            }
+            return false;
+          }
+        }
       }
     }
     enumRelation.set(id, 1 /* Succeeded */);
@@ -115301,28 +115452,34 @@ function getSourceMapFilePath(jsFilePath, options) {
 function getOutputExtension(fileName, options) {
   return fileExtensionIs(fileName, ".json" /* Json */) ? ".json" /* Json */ : options.jsx === 1 /* Preserve */ && fileExtensionIsOneOf(fileName, [".jsx" /* Jsx */, ".tsx" /* Tsx */]) ? ".jsx" /* Jsx */ : fileExtensionIsOneOf(fileName, [".mts" /* Mts */, ".mjs" /* Mjs */]) ? ".mjs" /* Mjs */ : fileExtensionIsOneOf(fileName, [".cts" /* Cts */, ".cjs" /* Cjs */]) ? ".cjs" /* Cjs */ : ".js" /* Js */;
 }
-function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir, getCommonSourceDirectory2) {
+function getOutputPathWithoutChangingExt(inputFileName, ignoreCase, outputDir, getCommonSourceDirectory2) {
   return outputDir ? resolvePath(
     outputDir,
-    getRelativePathFromDirectory(getCommonSourceDirectory2 ? getCommonSourceDirectory2() : getCommonSourceDirectoryOfConfig(configFile, ignoreCase), inputFileName, ignoreCase)
+    getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)
   ) : inputFileName;
 }
-function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
+function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2 = () => getCommonSourceDirectoryOfConfig(configFile, ignoreCase)) {
+  return getOutputDeclarationFileNameWorker(inputFileName, configFile.options, ignoreCase, getCommonSourceDirectory2);
+}
+function getOutputDeclarationFileNameWorker(inputFileName, options, ignoreCase, getCommonSourceDirectory2) {
   return changeExtension(
-    getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir, getCommonSourceDirectory2),
+    getOutputPathWithoutChangingExt(inputFileName, ignoreCase, options.declarationDir || options.outDir, getCommonSourceDirectory2),
     getDeclarationEmitExtensionForPath(inputFileName)
   );
 }
-function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
+function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2 = () => getCommonSourceDirectoryOfConfig(configFile, ignoreCase)) {
   if (configFile.options.emitDeclarationOnly)
     return void 0;
   const isJsonFile = fileExtensionIs(inputFileName, ".json" /* Json */);
-  const outputFileName = changeExtension(
-    getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir, getCommonSourceDirectory2),
-    getOutputExtension(inputFileName, configFile.options)
-  );
+  const outputFileName = getOutputJSFileNameWorker(inputFileName, configFile.options, ignoreCase, getCommonSourceDirectory2);
   return !isJsonFile || comparePaths(inputFileName, outputFileName, Debug.checkDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
 }
+function getOutputJSFileNameWorker(inputFileName, options, ignoreCase, getCommonSourceDirectory2) {
+  return changeExtension(
+    getOutputPathWithoutChangingExt(inputFileName, ignoreCase, options.outDir, getCommonSourceDirectory2),
+    getOutputExtension(inputFileName, options)
+  );
+}
 function createAddOutput() {
   let outputs;
   return { addOutput, getOutputs };
@@ -133666,7 +133823,8 @@ function createModuleSpecifierResolutionHost(program, host) {
     getProjectReferenceRedirect: (fileName) => program.getProjectReferenceRedirect(fileName),
     isSourceOfProjectReferenceRedirect: (fileName) => program.isSourceOfProjectReferenceRedirect(fileName),
     getNearestAncestorDirectoryWithPackageJson: maybeBind(host, host.getNearestAncestorDirectoryWithPackageJson),
-    getFileIncludeReasons: () => program.getFileIncludeReasons()
+    getFileIncludeReasons: () => program.getFileIncludeReasons(),
+    getCommonSourceDirectory: () => program.getCommonSourceDirectory()
   };
 }
 function getModuleSpecifierResolverHost(program, host) {
@@ -134727,13 +134885,6 @@ function createPackageJsonImportFilter(fromFile, preferences, host) {
     return components[0];
   }
 }
-function tryParseJson(text) {
-  try {
-    return JSON.parse(text);
-  } catch {
-    return void 0;
-  }
-}
 function consumesNodeCoreModules(sourceFile) {
   return some(sourceFile.imports, ({ text }) => ts_JsTyping_exports.nodeCoreModules.has(text));
 }
@@ -174457,8 +174608,10 @@ __export(ts_exports2, {
   getOriginalNodeId: () => getOriginalNodeId,
   getOriginalSourceFile: () => getOriginalSourceFile,
   getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWorker: () => getOutputDeclarationFileNameWorker,
   getOutputExtension: () => getOutputExtension,
   getOutputFileNames: () => getOutputFileNames,
+  getOutputJSFileNameWorker: () => getOutputJSFileNameWorker,
   getOutputPathsFor: () => getOutputPathsFor,
   getOutputPathsForBundle: () => getOutputPathsForBundle,
   getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -175089,6 +175242,7 @@ __export(ts_exports2, {
   isMethodSignature: () => isMethodSignature,
   isMinusToken: () => isMinusToken,
   isMissingDeclaration: () => isMissingDeclaration,
+  isMissingPackageJsonInfo: () => isMissingPackageJsonInfo,
   isModifier: () => isModifier,
   isModifierKind: () => isModifierKind,
   isModifierLike: () => isModifierLike,
@@ -175790,6 +175944,7 @@ __export(ts_exports2, {
   tryGetSourceMappingURL: () => tryGetSourceMappingURL,
   tryGetTextOfPropertyName: () => tryGetTextOfPropertyName,
   tryIOAndConsumeErrors: () => tryIOAndConsumeErrors,
+  tryParseJson: () => tryParseJson,
   tryParsePattern: () => tryParsePattern,
   tryParsePatterns: () => tryParsePatterns,
   tryParseRawSourceMap: () => tryParseRawSourceMap,
@@ -189252,8 +189407,10 @@ start(initializeNodeSystem(), require("os").platform());
   getOriginalNodeId,
   getOriginalSourceFile,
   getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWorker,
   getOutputExtension,
   getOutputFileNames,
+  getOutputJSFileNameWorker,
   getOutputPathsFor,
   getOutputPathsForBundle,
   getOwnEmitOutputFilePath,
@@ -189884,6 +190041,7 @@ start(initializeNodeSystem(), require("os").platform());
   isMethodSignature,
   isMinusToken,
   isMissingDeclaration,
+  isMissingPackageJsonInfo,
   isModifier,
   isModifierKind,
   isModifierLike,
@@ -190585,6 +190743,7 @@ start(initializeNodeSystem(), require("os").platform());
   tryGetSourceMappingURL,
   tryGetTextOfPropertyName,
   tryIOAndConsumeErrors,
+  tryParseJson,
   tryParsePattern,
   tryParsePatterns,
   tryParseRawSourceMap,