typescript 5.7.0-dev.20240829 → 5.7.0-dev.20240830

package/lib/cs/diagnosticMessages.generated.json

@@ -179,6 +179,8 @@
   "Add_override_modifier_95160": "Přidat modifikátor override",
   "Add_parameter_name_90034": "Přidat název parametru",
   "Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037": "Přidat kvalifikátor do všech nerozpoznaných proměnných odpovídajících názvu členu",
+  "Add_resolution_mode_import_attribute_95196": "Přidat atribut importu resolution-mode",
+  "Add_resolution_mode_import_attribute_to_all_type_only_imports_that_need_it_95197": "Přidat atribut importu resolution-mode do všech importů, při kterých se importuje pouze typ, které ho potřebují",
   "Add_return_type_0_90063": "Přidejte návratový typ „{0}“",
   "Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit_9035": "Chcete-li typ nastavit jako explicitní, přidejte do tohoto výrazu operátor „satisfies“ a kontrolní výraz typu („satisfies T as T“).",
   "Add_satisfies_and_an_inline_type_assertion_with_0_90068": "Přidejte operátor „satisfies“ a kontrolní výraz vloženého typu s „{0}“.",
@@ -1748,6 +1750,7 @@
   "Type_expected_1110": "Očekával se typ.",
   "Type_import_assertions_should_have_exactly_one_key_resolution_mode_with_value_import_or_require_1456": "Kontrolní výrazy importu typů by měly mít přesně jeden klíč – resolution-mode – s hodnotou import nebo require.",
   "Type_import_attributes_should_have_exactly_one_key_resolution_mode_with_value_import_or_require_1464": "Atributy importu typů by měly mít přesně jeden klíč – „resolution-mode“ – s hodnotou „import“ nebo „require“.",
+  "Type_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribute_1542": "Import typu modulu ECMAScript z modulu CommonJS musí mít atribut resolution-mode.",
   "Type_instantiation_is_excessively_deep_and_possibly_infinite_2589": "Vytvoření instance typu je příliš hluboké a může být nekonečné.",
   "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062": "Typ se přímo nebo nepřímo odkazuje ve zpětném volání jeho vlastní metody then při splnění.",
   "Type_library_referenced_via_0_from_file_1_1402": "Knihovna typů, na kterou se odkazuje přes {0} ze souboru {1}",
@@ -1758,6 +1761,7 @@
   "Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322": "Typ iterovaných elementů yield* musí být buď platný příslib, nebo nesmí obsahovat člen then, který se dá volat.",
   "Type_of_property_0_circularly_references_itself_in_mapped_type_1_2615": "Typ vlastnosti {0} cyklicky odkazuje sám na sebe v mapovaném typu {1}.",
   "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321": "Typ operandu yield v asynchronním generátoru musí být buď platný příslib, nebo nesmí obsahovat člen then, který se dá volat.",
+  "Type_only_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribut_1541": "Import, při kterém se importuje pouze typ modulu ECMAScript z modulu CommonJS, musí mít atribut resolution-mode.",
   "Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038": "Typ pochází z tohoto importu. Import stylu oboru názvů není možné zavolat ani vytvořit a při běhu způsobí chybu. Zvažte možnost použít tady místo toho výchozí import nebo importovat require.",
   "Type_parameter_0_has_a_circular_constraint_2313": "Parametr typu {0} má cyklické omezení.",
   "Type_parameter_0_has_a_circular_default_2716": "Parametr typu {0} má cyklickou výchozí hodnotu.",

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20240829`;
+var version = `${versionMajorMinor}.0-dev.20240830`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1079,7 +1079,7 @@ function findBestPatternMatch(values, getPattern, candidate) {
   for (let i = 0; i < values.length; i++) {
     const v = values[i];
     const pattern = getPattern(v);
-    if (isPatternMatch(pattern, candidate) && pattern.prefix.length > longestMatchPrefixLength) {
+    if (pattern.prefix.length > longestMatchPrefixLength && isPatternMatch(pattern, candidate)) {
       longestMatchPrefixLength = pattern.prefix.length;
       matchedValue = v;
     }
@@ -18398,8 +18398,33 @@ function tryParsePattern(pattern) {
     suffix: pattern.substr(indexOfStar + 1)
   };
 }
+var parsedPatternsCache = /* @__PURE__ */ new WeakMap();
 function tryParsePatterns(paths) {
-  return mapDefined(getOwnKeys(paths), (path) => tryParsePattern(path));
+  let result = parsedPatternsCache.get(paths);
+  if (result !== void 0) {
+    return result;
+  }
+  let matchableStringSet;
+  let patterns;
+  const pathList = getOwnKeys(paths);
+  for (const path of pathList) {
+    const patternOrStr = tryParsePattern(path);
+    if (patternOrStr === void 0) {
+      continue;
+    } else if (typeof patternOrStr === "string") {
+      (matchableStringSet ?? (matchableStringSet = /* @__PURE__ */ new Set())).add(patternOrStr);
+    } else {
+      (patterns ?? (patterns = [])).push(patternOrStr);
+    }
+  }
+  parsedPatternsCache.set(
+    paths,
+    result = {
+      matchableStringSet,
+      patterns
+    }
+  );
+  return result;
 }
 function positionIsSynthesized(pos) {
   return !(pos >= 0);
@@ -18424,15 +18449,13 @@ var emptyFileSystemEntries = {
   files: emptyArray,
   directories: emptyArray
 };
-function matchPatternOrExact(patternOrStrings, candidate) {
-  const patterns = [];
-  for (const patternOrString of patternOrStrings) {
-    if (patternOrString === candidate) {
-      return candidate;
-    }
-    if (!isString(patternOrString)) {
-      patterns.push(patternOrString);
-    }
+function matchPatternOrExact(parsedPatterns, candidate) {
+  const { matchableStringSet, patterns } = parsedPatterns;
+  if (matchableStringSet == null ? void 0 : matchableStringSet.has(candidate)) {
+    return candidate;
+  }
+  if (patterns === void 0 || patterns.length === 0) {
+    return void 0;
   }
   return findBestPatternMatch(patterns, (_) => _, candidate);
 }
@@ -38180,8 +38203,6 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
       validatedFilesSpecBeforeSubstitution,
       validatedIncludeSpecsBeforeSubstitution,
       validatedExcludeSpecsBeforeSubstitution,
-      pathPatterns: void 0,
-      // Initialized on first use
       isDefaultIncludeSpec
     };
   }
@@ -39806,8 +39827,7 @@ function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, co
   }
 }
 function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state) {
-  var _a;
-  const { baseUrl, paths, configFile } = state.compilerOptions;
+  const { baseUrl, paths } = state.compilerOptions;
   if (paths && !pathIsRelative(moduleName)) {
     if (state.traceEnabled) {
       if (baseUrl) {
@@ -39816,7 +39836,7 @@ function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state
       trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
     }
     const baseDirectory = getPathsBasePath(state.compilerOptions, state.host);
-    const pathPatterns = (configFile == null ? void 0 : configFile.configFileSpecs) ? (_a = configFile.configFileSpecs).pathPatterns || (_a.pathPatterns = tryParsePatterns(paths)) : void 0;
+    const pathPatterns = tryParsePatterns(paths);
     return tryLoadModuleUsingPaths(
       extensions,
       moduleName,
@@ -40488,17 +40508,8 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
     if (state.traceEnabled) {
       trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, version, moduleName);
     }
-    const result = tryLoadModuleUsingPaths(
-      extensions,
-      moduleName,
-      candidate,
-      versionPaths.paths,
-      /*pathPatterns*/
-      void 0,
-      loader,
-      onlyRecordFailuresForPackageFile || onlyRecordFailuresForIndex,
-      state
-    );
+    const pathPatterns = tryParsePatterns(versionPaths.paths);
+    const result = tryLoadModuleUsingPaths(extensions, moduleName, candidate, versionPaths.paths, pathPatterns, loader, onlyRecordFailuresForPackageFile || onlyRecordFailuresForIndex, state);
     if (result) {
       return removeIgnoredPackageId(result.value);
     }
@@ -41090,17 +41101,8 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, version, rest);
     }
     const packageDirectoryExists = nodeModulesDirectoryExists && directoryProbablyExists(packageDirectory, state.host);
-    const fromPaths = tryLoadModuleUsingPaths(
-      extensions,
-      rest,
-      packageDirectory,
-      versionPaths.paths,
-      /*pathPatterns*/
-      void 0,
-      loader,
-      !packageDirectoryExists,
-      state
-    );
+    const pathPatterns = tryParsePatterns(versionPaths.paths);
+    const fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, pathPatterns, loader, !packageDirectoryExists, state);
     if (fromPaths) {
       return fromPaths.value;
     }
@@ -41108,7 +41110,6 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
   return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
 }
 function tryLoadModuleUsingPaths(extensions, moduleName, baseDirectory, paths, pathPatterns, loader, onlyRecordFailures, state) {
-  pathPatterns || (pathPatterns = tryParsePatterns(paths));
   const matchedPattern = matchPatternOrExact(pathPatterns, moduleName);
   if (matchedPattern) {
     const matchedStar = isString(matchedPattern) ? void 0 : matchedText(matchedPattern, moduleName);
@@ -63534,7 +63535,7 @@ function createTypeChecker(host) {
       const [sourceType, targetType] = getTypeNamesForErrorDisplay(source2, target2);
       let generalizedSource = source2;
       let generalizedSourceType = sourceType;
-      if (isLiteralType(source2) && !typeCouldHaveTopLevelSingletonTypes(target2)) {
+      if (!(target2.flags & 131072 /* Never */) && isLiteralType(source2) && !typeCouldHaveTopLevelSingletonTypes(target2)) {
         generalizedSource = getBaseTypeOfLiteralType(source2);
         Debug.assert(!isTypeAssignableTo(generalizedSource, target2), "generalized source shouldn't be assignable");
         generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource);

package/lib/typescript.js

@@ -2265,7 +2265,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20240829`;
+var version = `${versionMajorMinor}.0-dev.20240830`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3618,7 +3618,7 @@ function findBestPatternMatch(values, getPattern, candidate) {
   for (let i = 0; i < values.length; i++) {
     const v = values[i];
     const pattern = getPattern(v);
-    if (isPatternMatch(pattern, candidate) && pattern.prefix.length > longestMatchPrefixLength) {
+    if (pattern.prefix.length > longestMatchPrefixLength && isPatternMatch(pattern, candidate)) {
       longestMatchPrefixLength = pattern.prefix.length;
       matchedValue = v;
     }
@@ -22385,8 +22385,33 @@ function tryParsePattern(pattern) {
     suffix: pattern.substr(indexOfStar + 1)
   };
 }
+var parsedPatternsCache = /* @__PURE__ */ new WeakMap();
 function tryParsePatterns(paths) {
-  return mapDefined(getOwnKeys(paths), (path) => tryParsePattern(path));
+  let result = parsedPatternsCache.get(paths);
+  if (result !== void 0) {
+    return result;
+  }
+  let matchableStringSet;
+  let patterns;
+  const pathList = getOwnKeys(paths);
+  for (const path of pathList) {
+    const patternOrStr = tryParsePattern(path);
+    if (patternOrStr === void 0) {
+      continue;
+    } else if (typeof patternOrStr === "string") {
+      (matchableStringSet ?? (matchableStringSet = /* @__PURE__ */ new Set())).add(patternOrStr);
+    } else {
+      (patterns ?? (patterns = [])).push(patternOrStr);
+    }
+  }
+  parsedPatternsCache.set(
+    paths,
+    result = {
+      matchableStringSet,
+      patterns
+    }
+  );
+  return result;
 }
 function positionIsSynthesized(pos) {
   return !(pos >= 0);
@@ -22414,15 +22439,13 @@ var emptyFileSystemEntries = {
   files: emptyArray,
   directories: emptyArray
 };
-function matchPatternOrExact(patternOrStrings, candidate) {
-  const patterns = [];
-  for (const patternOrString of patternOrStrings) {
-    if (patternOrString === candidate) {
-      return candidate;
-    }
-    if (!isString(patternOrString)) {
-      patterns.push(patternOrString);
-    }
+function matchPatternOrExact(parsedPatterns, candidate) {
+  const { matchableStringSet, patterns } = parsedPatterns;
+  if (matchableStringSet == null ? void 0 : matchableStringSet.has(candidate)) {
+    return candidate;
+  }
+  if (patterns === void 0 || patterns.length === 0) {
+    return void 0;
   }
   return findBestPatternMatch(patterns, (_) => _, candidate);
 }
@@ -42478,8 +42501,6 @@ function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, exis
       validatedFilesSpecBeforeSubstitution,
       validatedIncludeSpecsBeforeSubstitution,
       validatedExcludeSpecsBeforeSubstitution,
-      pathPatterns: void 0,
-      // Initialized on first use
       isDefaultIncludeSpec
     };
   }
@@ -44183,8 +44204,7 @@ function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, co
   }
 }
 function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state) {
-  var _a;
-  const { baseUrl, paths, configFile } = state.compilerOptions;
+  const { baseUrl, paths } = state.compilerOptions;
   if (paths && !pathIsRelative(moduleName)) {
     if (state.traceEnabled) {
       if (baseUrl) {
@@ -44193,7 +44213,7 @@ function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state
       trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
     }
     const baseDirectory = getPathsBasePath(state.compilerOptions, state.host);
-    const pathPatterns = (configFile == null ? void 0 : configFile.configFileSpecs) ? (_a = configFile.configFileSpecs).pathPatterns || (_a.pathPatterns = tryParsePatterns(paths)) : void 0;
+    const pathPatterns = tryParsePatterns(paths);
     return tryLoadModuleUsingPaths(
       extensions,
       moduleName,
@@ -44992,17 +45012,8 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
     if (state.traceEnabled) {
       trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, version, moduleName);
     }
-    const result = tryLoadModuleUsingPaths(
-      extensions,
-      moduleName,
-      candidate,
-      versionPaths.paths,
-      /*pathPatterns*/
-      void 0,
-      loader,
-      onlyRecordFailuresForPackageFile || onlyRecordFailuresForIndex,
-      state
-    );
+    const pathPatterns = tryParsePatterns(versionPaths.paths);
+    const result = tryLoadModuleUsingPaths(extensions, moduleName, candidate, versionPaths.paths, pathPatterns, loader, onlyRecordFailuresForPackageFile || onlyRecordFailuresForIndex, state);
     if (result) {
       return removeIgnoredPackageId(result.value);
     }
@@ -45594,17 +45605,8 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, version, rest);
     }
     const packageDirectoryExists = nodeModulesDirectoryExists && directoryProbablyExists(packageDirectory, state.host);
-    const fromPaths = tryLoadModuleUsingPaths(
-      extensions,
-      rest,
-      packageDirectory,
-      versionPaths.paths,
-      /*pathPatterns*/
-      void 0,
-      loader,
-      !packageDirectoryExists,
-      state
-    );
+    const pathPatterns = tryParsePatterns(versionPaths.paths);
+    const fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, pathPatterns, loader, !packageDirectoryExists, state);
     if (fromPaths) {
       return fromPaths.value;
     }
@@ -45612,7 +45614,6 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
   return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
 }
 function tryLoadModuleUsingPaths(extensions, moduleName, baseDirectory, paths, pathPatterns, loader, onlyRecordFailures, state) {
-  pathPatterns || (pathPatterns = tryParsePatterns(paths));
   const matchedPattern = matchPatternOrExact(pathPatterns, moduleName);
   if (matchedPattern) {
     const matchedStar = isString(matchedPattern) ? void 0 : matchedText(matchedPattern, moduleName);
@@ -68156,7 +68157,7 @@ function createTypeChecker(host) {
       const [sourceType, targetType] = getTypeNamesForErrorDisplay(source2, target2);
       let generalizedSource = source2;
       let generalizedSourceType = sourceType;
-      if (isLiteralType(source2) && !typeCouldHaveTopLevelSingletonTypes(target2)) {
+      if (!(target2.flags & 131072 /* Never */) && isLiteralType(source2) && !typeCouldHaveTopLevelSingletonTypes(target2)) {
         generalizedSource = getBaseTypeOfLiteralType(source2);
         Debug.assert(!isTypeAssignableTo(generalizedSource, target2), "generalized source shouldn't be assignable");
         generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource);

package/lib/zh-cn/diagnosticMessages.generated.json

@@ -179,6 +179,8 @@
   "Add_override_modifier_95160": "添加 \"override\" 修饰符",
   "Add_parameter_name_90034": "添加参数名称",
   "Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037": "将限定符添加到匹配成员名称的所有未解析变量",
+  "Add_resolution_mode_import_attribute_95196": "添加 \"resolution-mode\" 导入属性",
+  "Add_resolution_mode_import_attribute_to_all_type_only_imports_that_need_it_95197": "向所有需要 \"resolution-mode\" 导入属性的仅类型导入添加该属性",
   "Add_return_type_0_90063": "添加返回类型“{0}”",
   "Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit_9035": "将 satisfies 和类型断言添加到此表达式 (satisfies T as T) 以使类型显式。",
   "Add_satisfies_and_an_inline_type_assertion_with_0_90068": "使用“{0}”添加 satisfies 和内联类型断言",
@@ -1748,6 +1750,7 @@
   "Type_expected_1110": "应为类型。",
   "Type_import_assertions_should_have_exactly_one_key_resolution_mode_with_value_import_or_require_1456": "类型导入断言应恰好有一个键 - \"resolution-mode\" - 值为 \"import\" 或 \"require\"。",
   "Type_import_attributes_should_have_exactly_one_key_resolution_mode_with_value_import_or_require_1464": "类型导入属性应只有一个键 \"resolution-mode\"，值为 \"import\" 或 \"require\"。",
+  "Type_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribute_1542": "从 CommonJS 模块导入 ECMAScript 模块的类型导入必须具有 \"resolution-mode\" 属性。",
   "Type_instantiation_is_excessively_deep_and_possibly_infinite_2589": "类型实例化过深，且可能无限。",
   "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062": "类型在其自身的 \"then\" 方法的 fulfillment 回调中被直接或间接引用。",
   "Type_library_referenced_via_0_from_file_1_1402": "通过 \"{0}\" 从文件 \"{1}\" 引用了库类型",
@@ -1758,6 +1761,7 @@
   "Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322": "\"yield*\" 操作数的迭代元素的类型必须是有效承诺，或不得包含可调用的 \"then\" 成员。",
   "Type_of_property_0_circularly_references_itself_in_mapped_type_1_2615": "属性“{0}”的类型在已映射的类型“{1}”中循环引用其自身。",
   "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321": "异步生成器中 \"yield\" 操作数的类型必须是有效承诺，或不得包含可调用的 \"then\" 成员。",
+  "Type_only_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribut_1541": "从 CommonJS 模块导入 ECMAScript 模块的仅类型导入必须具有 \"resolution-mode\" 属性。",
   "Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038": "此导入产生的类型。无法调用或构造命名空间样式的导入，这类导入将在运行时导致失败。请考虑改为使用默认导入或此处需要的导入。",
   "Type_parameter_0_has_a_circular_constraint_2313": "类型参数“{0}”具有循环约束。",
   "Type_parameter_0_has_a_circular_default_2716": "类型参数“{0}”具有循环默认值。",

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.7.0-dev.20240829",
+    "version": "5.7.0-dev.20240830",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -117,5 +117,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "497316f7e847bc22a009244ba80a45c3bc6fe6b6"
+    "gitHead": "0e292c441a0e5f27e18803128b7dfb1155ac0f5a"
 }