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

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231220`;
+      version = `${versionMajorMinor}.0-dev.20231222`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1388,9 +1388,9 @@ var ts = (() => {
     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;
@@ -1483,8 +1483,8 @@ var ts = (() => {
     }
     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;
@@ -3997,6 +3997,7 @@ ${lanes.join("\n")}
         return JsxFlags2;
       })(JsxFlags || {});
       RelationComparisonResult = /* @__PURE__ */ ((RelationComparisonResult3) => {
+        RelationComparisonResult3[RelationComparisonResult3["None"] = 0] = "None";
         RelationComparisonResult3[RelationComparisonResult3["Succeeded"] = 1] = "Succeeded";
         RelationComparisonResult3[RelationComparisonResult3["Failed"] = 2] = "Failed";
         RelationComparisonResult3[RelationComparisonResult3["Reported"] = 4] = "Reported";
@@ -8113,6 +8114,8 @@ ${lanes.join("\n")}
         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}'."),
@@ -17097,6 +17100,13 @@ ${lanes.join("\n")}
   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);
   }
@@ -39969,6 +39979,9 @@ ${lanes.join("\n")}
   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") {
@@ -45319,7 +45332,7 @@ ${lanes.join("\n")}
     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());
@@ -45327,11 +45340,12 @@ ${lanes.join("\n")}
     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;
     }
@@ -45370,8 +45384,8 @@ ${lanes.join("\n")}
     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) {
@@ -45545,8 +45559,12 @@ ${lanes.join("\n")}
       return ending !== 0 /* Minimal */ || value === processEnding(relativeToBaseUrl, [ending], compilerOptions, host);
     }
   }
-  function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode = 0 /* Exact */) {
+  function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions, mode, isImports) {
     if (typeof exports === "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, exports),
         /*currentDirectory*/
@@ -45555,12 +45573,25 @@ ${lanes.join("\n")}
       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, exports), fragment),
+              /*currentDirectory*/
+              void 0
+            ) };
+          }
+          if (containsPath(pathOrPattern, targetFilePath, ignoreCase)) {
             const fragment = getRelativePathFromDirectory(
               pathOrPattern,
               targetFilePath,
@@ -45573,48 +45604,136 @@ ${lanes.join("\n")}
               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(exports)) {
-      return forEach(exports, (e) => tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions));
+      return forEach(exports, (e) => tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, e, conditions, mode, isImports));
     } else if (typeof exports === "object" && exports !== null) {
-      if (allKeysStartWithDot(exports)) {
-        return forEach(getOwnKeys(exports), (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, exports[k], conditions, mode2);
-        });
-      } else {
-        for (const key of getOwnKeys(exports)) {
-          if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
-            const subTarget = exports[key];
-            const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
-            if (result) {
-              return result;
-            }
+      for (const key of getOwnKeys(exports)) {
+        if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
+          const subTarget = exports[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, exports, conditions) {
+    if (typeof exports === "object" && exports !== null && !Array.isArray(exports) && allKeysStartWithDot(exports)) {
+      return forEach(getOwnKeys(exports), (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,
+          exports[k],
+          conditions,
+          mode,
+          /*isImports*/
+          false
+        );
+      });
+    }
+    return tryGetModuleNameFromExportsOrImports(
+      options,
+      host,
+      targetFilePath,
+      packageDirectory,
+      packageName,
+      exports,
+      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) {
@@ -45688,22 +45807,21 @@ ${lanes.join("\n")}
       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(
@@ -45719,13 +45837,13 @@ ${lanes.join("\n")}
             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 };
           }
         }
@@ -62963,12 +63081,12 @@ ${lanes.join("\n")}
         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,
@@ -62980,6 +63098,35 @@ ${lanes.join("\n")}
             }
             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 */);
@@ -113386,28 +113533,34 @@ ${lanes.join("\n")}
   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 };
@@ -131931,7 +132084,8 @@ ${lanes.join("\n")}
       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) {
@@ -132978,13 +133132,6 @@ ${lanes.join("\n")}
       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));
   }
@@ -186012,8 +186159,10 @@ ${e.message}`;
     getOriginalNodeId: () => getOriginalNodeId,
     getOriginalSourceFile: () => getOriginalSourceFile,
     getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+    getOutputDeclarationFileNameWorker: () => getOutputDeclarationFileNameWorker,
     getOutputExtension: () => getOutputExtension,
     getOutputFileNames: () => getOutputFileNames,
+    getOutputJSFileNameWorker: () => getOutputJSFileNameWorker,
     getOutputPathsFor: () => getOutputPathsFor,
     getOutputPathsForBundle: () => getOutputPathsForBundle,
     getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -186644,6 +186793,7 @@ ${e.message}`;
     isMethodSignature: () => isMethodSignature,
     isMinusToken: () => isMinusToken,
     isMissingDeclaration: () => isMissingDeclaration,
+    isMissingPackageJsonInfo: () => isMissingPackageJsonInfo,
     isModifier: () => isModifier,
     isModifierKind: () => isModifierKind,
     isModifierLike: () => isModifierLike,
@@ -187345,6 +187495,7 @@ ${e.message}`;
     tryGetSourceMappingURL: () => tryGetSourceMappingURL,
     tryGetTextOfPropertyName: () => tryGetTextOfPropertyName,
     tryIOAndConsumeErrors: () => tryIOAndConsumeErrors,
+    tryParseJson: () => tryParseJson,
     tryParsePattern: () => tryParsePattern,
     tryParsePatterns: () => tryParsePatterns,
     tryParseRawSourceMap: () => tryParseRawSourceMap,
@@ -188428,8 +188579,10 @@ ${e.message}`;
     getOriginalNodeId: () => getOriginalNodeId,
     getOriginalSourceFile: () => getOriginalSourceFile,
     getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+    getOutputDeclarationFileNameWorker: () => getOutputDeclarationFileNameWorker,
     getOutputExtension: () => getOutputExtension,
     getOutputFileNames: () => getOutputFileNames,
+    getOutputJSFileNameWorker: () => getOutputJSFileNameWorker,
     getOutputPathsFor: () => getOutputPathsFor,
     getOutputPathsForBundle: () => getOutputPathsForBundle,
     getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -189060,6 +189213,7 @@ ${e.message}`;
     isMethodSignature: () => isMethodSignature,
     isMinusToken: () => isMinusToken,
     isMissingDeclaration: () => isMissingDeclaration,
+    isMissingPackageJsonInfo: () => isMissingPackageJsonInfo,
     isModifier: () => isModifier,
     isModifierKind: () => isModifierKind,
     isModifierLike: () => isModifierLike,
@@ -189761,6 +189915,7 @@ ${e.message}`;
     tryGetSourceMappingURL: () => tryGetSourceMappingURL,
     tryGetTextOfPropertyName: () => tryGetTextOfPropertyName,
     tryIOAndConsumeErrors: () => tryIOAndConsumeErrors,
+    tryParseJson: () => tryParseJson,
     tryParsePattern: () => tryParsePattern,
     tryParsePatterns: () => tryParsePatterns,
     tryParseRawSourceMap: () => tryParseRawSourceMap,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231220`;
+var version = `${versionMajorMinor}.0-dev.20231222`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -634,9 +634,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 removeMinAndVersionNumbers(fileName) {
   let end = fileName.length;
@@ -723,8 +723,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 isPatternMatch({ prefix, suffix }, candidate) {
   return candidate.length >= prefix.length + suffix.length && startsWith(candidate, prefix) && endsWith(candidate, suffix);
@@ -2944,6 +2944,7 @@ var ModifierFlags = /* @__PURE__ */ ((ModifierFlags3) => {
   return ModifierFlags3;
 })(ModifierFlags || {});
 var RelationComparisonResult = /* @__PURE__ */ ((RelationComparisonResult3) => {
+  RelationComparisonResult3[RelationComparisonResult3["None"] = 0] = "None";
   RelationComparisonResult3[RelationComparisonResult3["Succeeded"] = 1] = "Succeeded";
   RelationComparisonResult3[RelationComparisonResult3["Failed"] = 2] = "Failed";
   RelationComparisonResult3[RelationComparisonResult3["Reported"] = 4] = "Reported";
@@ -6160,6 +6161,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}'."),

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231220",
+    "version": "5.4.0-dev.20231222",
     "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": "63babdf7dacebcca2673a9e2b8d5dd2d7dcc6017"
+    "gitHead": "fbcdb8cf4fbbbea0111a9adeb9d0d2983c088b7c"
 }