typescript 5.0.0-dev.20230109 → 5.0.0-dev.20230111

package/lib/tsserver.js

@@ -1735,6 +1735,7 @@ __export(server_exports, {
   isNonContextualKeyword: () => isNonContextualKeyword,
   isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
   isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+  isNonNullAccess: () => isNonNullAccess,
   isNonNullChain: () => isNonNullChain,
   isNonNullExpression: () => isNonNullExpression,
   isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,
@@ -2010,7 +2011,6 @@ __export(server_exports, {
   moduleResolutionNameAndModeGetter: () => moduleResolutionNameAndModeGetter,
   moduleResolutionOptionDeclarations: () => moduleResolutionOptionDeclarations,
   moduleResolutionSupportsPackageJsonExportsAndImports: () => moduleResolutionSupportsPackageJsonExportsAndImports,
-  moduleResolutionSupportsResolvingTsExtensions: () => moduleResolutionSupportsResolvingTsExtensions,
   moduleResolutionUsesNodeModules: () => moduleResolutionUsesNodeModules,
   moduleSpecifiers: () => ts_moduleSpecifiers_exports,
   moveEmitHelpers: () => moveEmitHelpers,
@@ -2662,7 +2662,7 @@ __export(ts_server_exports3, {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230109`;
+var version = `${versionMajorMinor}.0-dev.20230111`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10568,6 +10568,7 @@ var Diagnostics = {
   Default_export_of_the_module_has_or_is_using_private_name_0: diag(4082, 1 /* Error */, "Default_export_of_the_module_has_or_is_using_private_name_0_4082", "Default export of the module has or is using private name '{0}'."),
   Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, 1 /* Error */, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
   Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2: diag(4084, 1 /* Error */, "Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2_4084", "Exported type alias '{0}' has or is using private name '{1}' from module {2}."),
+  Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
   Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, 1 /* Error */, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
@@ -10939,6 +10940,9 @@ var Diagnostics = {
   Found_1_error_in_1: diag(6259, 3 /* Message */, "Found_1_error_in_1_6259", "Found 1 error in {1}"),
   Found_0_errors_in_the_same_file_starting_at_Colon_1: diag(6260, 3 /* Message */, "Found_0_errors_in_the_same_file_starting_at_Colon_1_6260", "Found {0} errors in the same file, starting at: {1}"),
   Found_0_errors_in_1_files: diag(6261, 3 /* Message */, "Found_0_errors_in_1_files_6261", "Found {0} errors in {1} files."),
+  File_name_0_has_a_1_extension_looking_up_2_instead: diag(6262, 3 /* Message */, "File_name_0_has_a_1_extension_looking_up_2_instead_6262", "File name '{0}' has a '{1}' extension - looking up '{2}' instead."),
+  Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set: diag(6263, 1 /* Error */, "Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set_6263", "Module '{0}' was resolved to '{1}', but '--allowArbitraryExtensions' is not set."),
+  Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present: diag(6264, 3 /* Message */, "Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present_6264", "Enable importing files with any extension, provided a declaration file is present."),
   Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve: diag(6270, 3 /* Message */, "Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve_6270", "Directory '{0}' has no containing package.json scope. Imports will not resolve."),
   Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6271, 3 /* Message */, "Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6271", "Import specifier '{0}' does not exist in package.json scope at path '{1}'."),
   Invalid_import_specifier_0_has_no_possible_resolutions: diag(6272, 3 /* Message */, "Invalid_import_specifier_0_has_no_possible_resolutions_6272", "Invalid import specifier '{0}' has no possible resolutions."),
@@ -18484,13 +18488,13 @@ function getDeclarationEmitOutputFilePathWorker(fileName, options, currentDirect
   return removeFileExtension(path) + declarationExtension;
 }
 function getDeclarationEmitExtensionForPath(path) {
-  return fileExtensionIsOneOf(path, [".mjs" /* Mjs */, ".mts" /* Mts */]) ? ".d.mts" /* Dmts */ : fileExtensionIsOneOf(path, [".cjs" /* Cjs */, ".cts" /* Cts */]) ? ".d.cts" /* Dcts */ : fileExtensionIsOneOf(path, [".json" /* Json */]) ? `.json.d.ts` : (
+  return fileExtensionIsOneOf(path, [".mjs" /* Mjs */, ".mts" /* Mts */]) ? ".d.mts" /* Dmts */ : fileExtensionIsOneOf(path, [".cjs" /* Cjs */, ".cts" /* Cts */]) ? ".d.cts" /* Dcts */ : fileExtensionIsOneOf(path, [".json" /* Json */]) ? `.d.json.ts` : (
     // Drive-by redefinition of json declaration file output name so if it's ever enabled, it behaves well
     ".d.ts" /* Dts */
   );
 }
 function getPossibleOriginalInputExtensionForExtension(path) {
-  return fileExtensionIsOneOf(path, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path, [`.json.d.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
+  return fileExtensionIsOneOf(path, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path, [`.d.json.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
 }
 function outFile(options) {
   return options.outFile || options.out;
@@ -20574,7 +20578,7 @@ function positionIsSynthesized(pos) {
   return !(pos >= 0);
 }
 function extensionIsTS(ext) {
-  return ext === ".ts" /* Ts */ || ext === ".tsx" /* Tsx */ || ext === ".d.ts" /* Dts */ || ext === ".cts" /* Cts */ || ext === ".mts" /* Mts */ || ext === ".d.mts" /* Dmts */ || ext === ".d.cts" /* Dcts */;
+  return ext === ".ts" /* Ts */ || ext === ".tsx" /* Tsx */ || ext === ".d.ts" /* Dts */ || ext === ".cts" /* Cts */ || ext === ".mts" /* Mts */ || ext === ".d.mts" /* Dmts */ || ext === ".d.cts" /* Dcts */ || startsWith(ext, ".d.") && endsWith(ext, ".ts");
 }
 function resolutionExtensionIsTSOrJson(ext) {
   return extensionIsTS(ext) || ext === ".json" /* Json */;
@@ -21100,6 +21104,10 @@ function isOptionalDeclaration(declaration) {
       return false;
   }
 }
+function isNonNullAccess(node) {
+  const kind = node.kind;
+  return (kind === 208 /* PropertyAccessExpression */ || kind === 209 /* ElementAccessExpression */) && isNonNullExpression(node.expression);
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -36733,7 +36741,7 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 function isDeclarationFileName(fileName) {
-  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions);
+  return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && stringContains(getBaseFileName(fileName), ".d.");
 }
 function parseResolutionMode(mode, pos, end, reportDiagnostic) {
   if (!mode) {
@@ -37991,6 +37999,14 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Enable_importing_json_files,
     defaultValueDescription: false
   },
+  {
+    name: "allowArbitraryExtensions",
+    type: "boolean",
+    affectsModuleResolution: true,
+    category: Diagnostics.Modules,
+    description: Diagnostics.Enable_importing_files_with_any_extension_provided_a_declaration_file_is_present,
+    defaultValueDescription: false
+  },
   {
     name: "out",
     type: "string",
@@ -40488,7 +40504,8 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
     conditions,
     requestContainingDirectory: containingDirectory,
     reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-    isConfigLookup: false
+    isConfigLookup: false,
+    candidateIsFromPackageJsonField: false
   };
   let resolved = primaryLookup();
   let primary = true;
@@ -41359,7 +41376,8 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
     conditions,
     requestContainingDirectory: containingDirectory,
     reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-    isConfigLookup
+    isConfigLookup,
+    candidateIsFromPackageJsonField: false
   };
   if (traceEnabled && getEmitModuleResolutionKind(compilerOptions) >= 3 /* Node16 */ && getEmitModuleResolutionKind(compilerOptions) <= 99 /* NodeNext */) {
     trace(host, Diagnostics.Resolving_in_0_mode_with_conditions_1, features & 32 /* EsmMode */ ? "ESM" : "CJS", conditions.map((c) => `'${c}'`).join(", "));
@@ -41527,14 +41545,19 @@ function loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) {
   }
 }
 function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
-  if (hasJSFileExtension(candidate) || extensions & 8 /* Json */ && fileExtensionIs(candidate, ".json" /* Json */) || extensions & (1 /* TypeScript */ | 4 /* Declaration */) && moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && fileExtensionIsOneOf(candidate, supportedTSExtensionsFlat)) {
-    const extensionless = removeFileExtension(candidate);
-    const extension = candidate.substring(extensionless.length);
-    if (state.traceEnabled) {
-      trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-    }
-    return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
+  const filename = getBaseFileName(candidate);
+  if (filename.indexOf(".") === -1) {
+    return void 0;
   }
+  let extensionless = removeFileExtension(candidate);
+  if (extensionless === candidate) {
+    extensionless = candidate.substring(0, candidate.lastIndexOf("."));
+  }
+  const extension = candidate.substring(extensionless.length);
+  if (state.traceEnabled) {
+    trace(state.host, Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
+  }
+  return tryAddingExtensions(extensionless, extensions, extension, onlyRecordFailures, state);
 }
 function loadFileNameFromPackageJsonField(extensions, candidate, onlyRecordFailures, state) {
   if (extensions & 1 /* TypeScript */ && fileExtensionIsOneOf(candidate, supportedTSImplementationExtensions) || extensions & 4 /* Declaration */ && fileExtensionIsOneOf(candidate, supportedDeclarationExtensions)) {
@@ -41558,42 +41581,27 @@ function tryAddingExtensions(candidate, extensions, originalExtension, onlyRecor
     case ".mjs" /* Mjs */:
     case ".mts" /* Mts */:
     case ".d.mts" /* Dmts */:
-      return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
+      return extensions & 1 /* TypeScript */ && tryExtension(".mts" /* Mts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 4 /* Declaration */ && tryExtension(".d.mts" /* Dmts */, originalExtension === ".mts" /* Mts */ || originalExtension === ".d.mts" /* Dmts */) || extensions & 2 /* JavaScript */ && tryExtension(".mjs" /* Mjs */) || void 0;
     case ".cjs" /* Cjs */:
     case ".cts" /* Cts */:
     case ".d.cts" /* Dcts */:
-      return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
+      return extensions & 1 /* TypeScript */ && tryExtension(".cts" /* Cts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 4 /* Declaration */ && tryExtension(".d.cts" /* Dcts */, originalExtension === ".cts" /* Cts */ || originalExtension === ".d.cts" /* Dcts */) || extensions & 2 /* JavaScript */ && tryExtension(".cjs" /* Cjs */) || void 0;
     case ".json" /* Json */:
-      const originalCandidate = candidate;
-      if (extensions & 4 /* Declaration */) {
-        candidate += ".json" /* Json */;
-        const result = tryExtension(".d.ts" /* Dts */);
-        if (result)
-          return result;
-      }
-      if (extensions & 8 /* Json */) {
-        candidate = originalCandidate;
-        const result = tryExtension(".json" /* Json */);
-        if (result)
-          return result;
-      }
-      return void 0;
-    case ".ts" /* Ts */:
+      return extensions & 4 /* Declaration */ && tryExtension(".d.json.ts") || extensions & 8 /* Json */ && tryExtension(".json" /* Json */) || void 0;
     case ".tsx" /* Tsx */:
+    case ".jsx" /* Jsx */:
+      return extensions & 1 /* TypeScript */ && (tryExtension(".tsx" /* Tsx */, originalExtension === ".tsx" /* Tsx */) || tryExtension(".ts" /* Ts */, originalExtension === ".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".tsx" /* Tsx */) || extensions & 2 /* JavaScript */ && (tryExtension(".jsx" /* Jsx */) || tryExtension(".js" /* Js */)) || void 0;
+    case ".ts" /* Ts */:
     case ".d.ts" /* Dts */:
-      if (moduleResolutionSupportsResolvingTsExtensions(state.compilerOptions) && extensionIsOk(extensions, originalExtension)) {
-        return tryExtension(
-          originalExtension,
-          /*resolvedUsingTsExtension*/
-          true
-        );
-      }
+    case ".js" /* Js */:
+    case "":
+      return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || tryExtension(".tsx" /* Tsx */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */, originalExtension === ".ts" /* Ts */ || originalExtension === ".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
     default:
-      return extensions & 1 /* TypeScript */ && (tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */)) || extensions & 4 /* Declaration */ && tryExtension(".d.ts" /* Dts */) || extensions & 2 /* JavaScript */ && (tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */)) || state.isConfigLookup && tryExtension(".json" /* Json */) || void 0;
+      return extensions & 4 /* Declaration */ && !isDeclarationFileName(candidate + originalExtension) && tryExtension(`.d${originalExtension}.ts`) || void 0;
   }
   function tryExtension(ext, resolvedUsingTsExtension) {
     const path = tryFile(candidate + ext, onlyRecordFailures, state);
-    return path === void 0 ? void 0 : { path, ext, resolvedUsingTsExtension };
+    return path === void 0 ? void 0 : { path, ext, resolvedUsingTsExtension: !state.candidateIsFromPackageJsonField && resolvedUsingTsExtension };
   }
 }
 function tryFile(fileName, onlyRecordFailures, state) {
@@ -41740,7 +41748,8 @@ function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options)
     conditions: emptyArray,
     requestContainingDirectory: void 0,
     reportDiagnostic: noop,
-    isConfigLookup: false
+    isConfigLookup: false,
+    candidateIsFromPackageJsonField: false
   };
 }
 function getPackageScopeForPath(fileName, state) {
@@ -41828,6 +41837,8 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
     }
     const expandedExtensions = extensions2 === 4 /* Declaration */ ? 1 /* TypeScript */ | 4 /* Declaration */ : extensions2;
     const features = state2.features;
+    const candidateIsFromPackageJsonField = state2.candidateIsFromPackageJsonField;
+    state2.candidateIsFromPackageJsonField = true;
     if ((jsonContent == null ? void 0 : jsonContent.type) !== "module") {
       state2.features &= ~32 /* EsmMode */;
     }
@@ -41840,6 +41851,7 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
       false
     );
     state2.features = features;
+    state2.candidateIsFromPackageJsonField = candidateIsFromPackageJsonField;
     return result;
   };
   const onlyRecordFailuresForPackageFile = packageFile ? !directoryProbablyExists(getDirectoryPath(packageFile), state.host) : void 0;
@@ -41913,7 +41925,10 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
     return void 0;
   }
   const trailingParts = parts.slice(nameParts.length);
-  return loadModuleFromExports(scope, extensions, !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`, state, cache, redirectedReference);
+  const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+  const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
+  const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
+  return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
 }
 function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
   if (!scope.contents.packageJsonContent.exports) {
@@ -42415,25 +42430,26 @@ function loadModuleFromImmediateNodeModulesDirectory(extensions, moduleName, dir
   }
 }
 function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
-  var _a2;
+  var _a2, _b, _c;
   const candidate = normalizePath(combinePaths(nodeModulesDirectory, moduleName));
+  const { packageName, rest } = parsePackageName(moduleName);
+  const packageDirectory = combinePaths(nodeModulesDirectory, packageName);
+  let rootPackageInfo;
   let packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
-  if (!(state.features & 8 /* Exports */)) {
-    if (packageInfo) {
-      const fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
-      if (fromFile) {
-        return noPackageId(fromFile);
-      }
-      const fromDirectory = loadNodeModuleFromDirectoryWorker(
-        extensions,
-        candidate,
-        !nodeModulesDirectoryExists,
-        state,
-        packageInfo.contents.packageJsonContent,
-        getVersionPathsOfPackageJsonInfo(packageInfo, state)
-      );
-      return withPackageId(packageInfo, fromDirectory);
+  if (rest !== "" && packageInfo && (!(state.features & 8 /* Exports */) || !hasProperty((_b = (_a2 = rootPackageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state)) == null ? void 0 : _a2.contents.packageJsonContent) != null ? _b : emptyArray, "exports"))) {
+    const fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
+    if (fromFile) {
+      return noPackageId(fromFile);
     }
+    const fromDirectory = loadNodeModuleFromDirectoryWorker(
+      extensions,
+      candidate,
+      !nodeModulesDirectoryExists,
+      state,
+      packageInfo.contents.packageJsonContent,
+      getVersionPathsOfPackageJsonInfo(packageInfo, state)
+    );
+    return withPackageId(packageInfo, fromDirectory);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -42449,13 +42465,11 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     }
     return withPackageId(packageInfo, pathAndExtension);
   };
-  const { packageName, rest } = parsePackageName(moduleName);
-  const packageDirectory = combinePaths(nodeModulesDirectory, packageName);
   if (rest !== "") {
-    packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+    packageInfo = rootPackageInfo != null ? rootPackageInfo : getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
   }
   if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & 8 /* Exports */) {
-    return (_a2 = loadModuleFromExports(packageInfo, extensions, combinePaths(".", rest), state, cache, redirectedReference)) == null ? void 0 : _a2.value;
+    return (_c = loadModuleFromExports(packageInfo, extensions, combinePaths(".", rest), state, cache, redirectedReference)) == null ? void 0 : _c.value;
   }
   const versionPaths = rest !== "" && packageInfo ? getVersionPathsOfPackageJsonInfo(packageInfo, state) : void 0;
   if (versionPaths) {
@@ -42572,7 +42586,8 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     conditions: [],
     requestContainingDirectory: containingDirectory,
     reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-    isConfigLookup: false
+    isConfigLookup: false,
+    candidateIsFromPackageJsonField: false
   };
   const resolved = tryResolve(1 /* TypeScript */ | 4 /* Declaration */) || tryResolve(2 /* JavaScript */ | (compilerOptions.resolveJsonModule ? 8 /* Json */ : 0));
   return createResolvedModuleWithFailedLookupLocations(
@@ -42629,11 +42644,8 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     }
   }
 }
-function moduleResolutionSupportsResolvingTsExtensions(compilerOptions) {
-  return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */;
-}
 function shouldAllowImportingTsExtension(compilerOptions, fromFileName) {
-  return moduleResolutionSupportsResolvingTsExtensions(compilerOptions) && (!!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName));
+  return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */ && (!!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName));
 }
 function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache, packageJsonInfoCache) {
   const traceEnabled = isTraceEnabled(compilerOptions, host);
@@ -42654,7 +42666,8 @@ function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, hos
     conditions: [],
     requestContainingDirectory: void 0,
     reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-    isConfigLookup: false
+    isConfigLookup: false,
+    candidateIsFromPackageJsonField: false
   };
   const resolved = loadModuleFromImmediateNodeModulesDirectory(
     4 /* Declaration */,
@@ -45719,6 +45732,7 @@ __export(ts_moduleSpecifiers_exports, {
   getNodeModulesPackageName: () => getNodeModulesPackageName,
   tryGetJSExtensionForFile: () => tryGetJSExtensionForFile,
   tryGetModuleSpecifiersFromCache: () => tryGetModuleSpecifiersFromCache,
+  tryGetRealFileNameForNonJsDeclarationFileName: () => tryGetRealFileNameForNonJsDeclarationFileName,
   updateModuleSpecifier: () => updateModuleSpecifier
 });
 
@@ -46376,6 +46390,8 @@ function processEnding(fileName, allowedEndings, options, host) {
   }
   if (fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".d.cts" /* Dcts */, ".cts" /* Cts */])) {
     return noExtension + getJSExtensionForFile(fileName, options);
+  } else if (!fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */]) && fileExtensionIsOneOf(fileName, [".ts" /* Ts */]) && stringContains(fileName, ".d.")) {
+    return tryGetRealFileNameForNonJsDeclarationFileName(fileName);
   }
   switch (allowedEndings[0]) {
     case 0 /* Minimal */:
@@ -46399,6 +46415,14 @@ function processEnding(fileName, allowedEndings, options, host) {
       return Debug.assertNever(allowedEndings[0]);
   }
 }
+function tryGetRealFileNameForNonJsDeclarationFileName(fileName) {
+  const baseName = getBaseFileName(fileName);
+  if (!endsWith(fileName, ".ts" /* Ts */) || !stringContains(baseName, ".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
+    return void 0;
+  const noExtension = removeExtension(fileName, ".ts" /* Ts */);
+  const ext = noExtension.substring(noExtension.lastIndexOf("."));
+  return noExtension.substring(0, noExtension.indexOf(".d.")) + ext;
+}
 function getJSExtensionForFile(fileName, options) {
   var _a2;
   return (_a2 = tryGetJSExtensionForFile(fileName, options)) != null ? _a2 : Debug.fail(`Extension ${extensionFromPath(fileName)} is unsupported:: FileName:: ${fileName}`);
@@ -48824,7 +48848,7 @@ function createTypeChecker(host) {
     const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
     const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
     if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-      if (hasExportAssignmentSymbol(moduleSymbol)) {
+      if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
         const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
         const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
         const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -49619,7 +49643,7 @@ function createTypeChecker(host) {
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
     const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
-    const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule);
+    const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
     if (sourceFile) {
       if (resolutionDiagnostic) {
@@ -53573,7 +53597,9 @@ function createTypeChecker(host) {
           case 267 /* NamespaceExportDeclaration */:
             addResult(factory.createNamespaceExportDeclaration(idText(node.name)), 0 /* None */);
             break;
-          case 270 /* ImportClause */:
+          case 270 /* ImportClause */: {
+            const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+            const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.moduleSpecifier;
             addResult(factory.createImportDeclaration(
               /*modifiers*/
               void 0,
@@ -53584,15 +53610,14 @@ function createTypeChecker(host) {
                 /*namedBindings*/
                 void 0
               ),
-              // We use `target.parent || target` below as `target.parent` is unset when the target is a module which has been export assigned
-              // And then made into a default by the `esModuleInterop` or `allowSyntheticDefaultImports` flag
-              // In such cases, the `target` refers to the module itself already
-              factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context)),
-              /*assertClause*/
-              void 0
+              specifier2,
+              node.parent.assertClause
             ), 0 /* None */);
             break;
-          case 271 /* NamespaceImport */:
+          }
+          case 271 /* NamespaceImport */: {
+            const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+            const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.moduleSpecifier;
             addResult(factory.createImportDeclaration(
               /*modifiers*/
               void 0,
@@ -53603,11 +53628,11 @@ function createTypeChecker(host) {
                 void 0,
                 factory.createNamespaceImport(factory.createIdentifier(localName))
               ),
-              factory.createStringLiteral(getSpecifierForModuleSymbol(target, context)),
-              /*assertClause*/
-              void 0
+              specifier2,
+              node.parent.parent.assertClause
             ), 0 /* None */);
             break;
+          }
           case 277 /* NamespaceExport */:
             addResult(factory.createExportDeclaration(
               /*modifiers*/
@@ -53618,7 +53643,9 @@ function createTypeChecker(host) {
               factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))
             ), 0 /* None */);
             break;
-          case 273 /* ImportSpecifier */:
+          case 273 /* ImportSpecifier */: {
+            const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
+            const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.parent.moduleSpecifier;
             addResult(factory.createImportDeclaration(
               /*modifiers*/
               void 0,
@@ -53636,11 +53663,11 @@ function createTypeChecker(host) {
                   )
                 ])
               ),
-              factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context)),
-              /*assertClause*/
-              void 0
+              specifier2,
+              node.parent.parent.parent.assertClause
             ), 0 /* None */);
             break;
+          }
           case 278 /* ExportSpecifier */:
             const specifier = node.parent.parent.moduleSpecifier;
             serializeExportSpecifier(
@@ -55610,7 +55637,17 @@ function createTypeChecker(host) {
     }
   }
   function getOuterTypeParametersOfClassOrInterface(symbol) {
-    const declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : getDeclarationOfKind(symbol, 261 /* InterfaceDeclaration */);
+    var _a2;
+    const declaration = symbol.flags & 32 /* Class */ || symbol.flags & 16 /* Function */ ? symbol.valueDeclaration : (_a2 = symbol.declarations) == null ? void 0 : _a2.find((decl) => {
+      if (decl.kind === 261 /* InterfaceDeclaration */) {
+        return true;
+      }
+      if (decl.kind !== 257 /* VariableDeclaration */) {
+        return false;
+      }
+      const initializer = decl.initializer;
+      return !!initializer && (initializer.kind === 215 /* FunctionExpression */ || initializer.kind === 216 /* ArrowFunction */);
+    });
     Debug.assert(!!declaration, "Class was missing valueDeclaration -OR- non-class had no interface declarations");
     return getOuterTypeParameters(declaration);
   }
@@ -66955,7 +66992,7 @@ function createTypeChecker(host) {
       if (signature) {
         const inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : void 0;
         if (inference.contraCandidates) {
-          const useCovariantType = inferredCovariantType && !(inferredCovariantType.flags & 131072 /* Never */) && some(inference.contraCandidates, (t) => isTypeSubtypeOf(inferredCovariantType, t)) && every(context.inferences, (other) => other === inference || getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeSubtypeOf(t, inferredCovariantType)));
+          const useCovariantType = inferredCovariantType && !(inferredCovariantType.flags & 131072 /* Never */) && some(inference.contraCandidates, (t) => isTypeSubtypeOf(inferredCovariantType, t)) && every(context.inferences, (other) => other !== inference && getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeSubtypeOf(t, inferredCovariantType)));
           inferredType = useCovariantType ? inferredCovariantType : getContravariantInference(inference);
         } else if (inferredCovariantType) {
           inferredType = inferredCovariantType;
@@ -68431,12 +68468,13 @@ function createTypeChecker(host) {
       if (propName === void 0) {
         return type;
       }
-      const removeNullable = strictNullChecks && isOptionalChain(access) && maybeTypeOfKind(type, 98304 /* Nullable */);
+      const optionalChain = isOptionalChain(access);
+      const removeNullable = strictNullChecks && (optionalChain || isNonNullAccess(access)) && maybeTypeOfKind(type, 98304 /* Nullable */);
       let propType = getTypeOfPropertyOfType(removeNullable ? getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */) : type, propName);
       if (!propType) {
         return type;
       }
-      propType = removeNullable ? getOptionalType(propType) : propType;
+      propType = removeNullable && optionalChain ? getOptionalType(propType) : propType;
       const narrowedPropType = narrowType2(propType);
       return filterType(type, (t) => {
         const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
@@ -76294,7 +76332,7 @@ function createTypeChecker(host) {
           return getRegularTypeOfObjectLiteral(rightType);
         }
       case 27 /* CommaToken */:
-        if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isEvalNode(right)) {
+        if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isIndirectCall(left.parent)) {
           const sf = getSourceFileOfNode(left);
           const sourceText = sf.text;
           const start2 = skipTrivia(sourceText, left.pos);
@@ -76336,8 +76374,8 @@ function createTypeChecker(host) {
         }
       }
     }
-    function isEvalNode(node) {
-      return node.kind === 79 /* Identifier */ && node.escapedText === "eval";
+    function isIndirectCall(node) {
+      return node.parent.kind === 214 /* ParenthesizedExpression */ && isNumericLiteral(node.left) && node.left.text === "0" && (isCallExpression(node.parent.parent) && node.parent.parent.expression === node.parent || node.parent.parent.kind === 212 /* TaggedTemplateExpression */) && (isAccessExpression(node.right) || isIdentifier(node.right) && node.right.escapedText === "eval");
     }
     function checkForDisallowedESSymbolOperand(operator2) {
       const offendingSymbolOperand = maybeTypeOfKindConsideringBaseConstraint(leftType, 12288 /* ESSymbolLike */) ? left : maybeTypeOfKindConsideringBaseConstraint(rightType, 12288 /* ESSymbolLike */) ? right : void 0;
@@ -76901,15 +76939,16 @@ function createTypeChecker(host) {
       }
     }
     expr = skipParentheses(node);
+    if (isAwaitExpression(expr)) {
+      const type = getQuickTypeOfExpression(expr.expression);
+      return type ? getAwaitedType(type) : void 0;
+    }
     if (isCallExpression(expr) && expr.expression.kind !== 106 /* SuperKeyword */ && !isRequireCall(
       expr,
       /*checkArgumentIsStringLiteralLike*/
       true
     ) && !isSymbolOrSymbolForCall(expr)) {
-      const type = isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
-      if (type) {
-        return type;
-      }
+      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
     } else if (node.kind === 8 /* NumericLiteral */ || node.kind === 10 /* StringLiteral */ || node.kind === 110 /* TrueKeyword */ || node.kind === 95 /* FalseKeyword */) {
@@ -82076,12 +82115,12 @@ function createTypeChecker(host) {
     if (node.flags & 16777216 /* Ambient */ && !isEntityNameExpression(node.expression)) {
       grammarErrorOnNode(node.expression, Diagnostics.The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context);
     }
-    if (node.isExportEquals && !(node.flags & 16777216 /* Ambient */)) {
-      if (moduleKind >= 5 /* ES2015 */ && getSourceFileOfNode(node).impliedNodeFormat !== 1 /* CommonJS */) {
+    if (node.isExportEquals) {
+      if (moduleKind >= 5 /* ES2015 */ && (node.flags & 16777216 /* Ambient */ && getSourceFileOfNode(node).impliedNodeFormat === 99 /* ESNext */ || !(node.flags & 16777216 /* Ambient */) && getSourceFileOfNode(node).impliedNodeFormat !== 1 /* CommonJS */)) {
         grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or_another_module_format_instead);
-      } else if (moduleKind === 4 /* System */) {
+      } else if (moduleKind === 4 /* System */ && !(node.flags & 16777216 /* Ambient */)) {
         grammarErrorOnNode(node, Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
-      } else if (getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */) {
+      } else if (getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */ && !(node.flags & 16777216 /* Ambient */)) {
         grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_moduleResolution_is_set_to_bundler_Consider_using_export_default_or_another_module_format_instead);
       }
     }
@@ -105036,6 +105075,9 @@ function createGetSymbolAccessibilityDiagnosticForNode(node) {
       case 259 /* FunctionDeclaration */:
         diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
         break;
+      case 192 /* InferType */:
+        diagnosticMessage = Diagnostics.Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1;
+        break;
       case 262 /* TypeAliasDeclaration */:
         diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
         break;
@@ -115841,7 +115883,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           currentNodeModulesDepth++;
         }
         const elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
-        const shouldAddFile = resolvedFileName && !getResolutionDiagnostic(optionsForFile, resolution) && !optionsForFile.noResolve && index < file.imports.length && !elideImport && !(isJsFile && !getAllowJSCompilerOption(optionsForFile)) && (isInJSFile(file.imports[index]) || !(file.imports[index].flags & 8388608 /* JSDoc */));
+        const shouldAddFile = resolvedFileName && !getResolutionDiagnostic(optionsForFile, resolution, file) && !optionsForFile.noResolve && index < file.imports.length && !elideImport && !(isJsFile && !getAllowJSCompilerOption(optionsForFile)) && (isInJSFile(file.imports[index]) || !(file.imports[index].flags & 8388608 /* JSDoc */));
         if (elideImport) {
           modulesWithElidedImports.set(file.path, true);
         } else if (shouldAddFile) {
@@ -116184,7 +116226,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     if (options.preserveValueImports && getEmitModuleKind(options) < 5 /* ES2015 */) {
       createOptionValueDiagnostic("importsNotUsedAsValues", Diagnostics.Option_preserveValueImports_can_only_be_used_when_module_is_set_to_es2015_or_later);
     }
-    if (options.allowImportingTsExtensions && !(moduleResolutionSupportsResolvingTsExtensions(options) && (options.noEmit || options.emitDeclarationOnly))) {
+    if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly)) {
       createOptionValueDiagnostic("allowImportingTsExtensions", Diagnostics.Option_allowImportingTsExtensions_can_only_be_used_when_moduleResolution_is_set_to_bundler_and_either_noEmit_or_emitDeclarationOnly_is_set);
     }
     const moduleResolution = getEmitModuleResolutionKind(options);
@@ -116836,19 +116878,27 @@ function resolveProjectReferencePath(hostOrRef, ref) {
   const passedInRef = ref ? ref : hostOrRef;
   return resolveConfigFileProjectName(passedInRef.path);
 }
-function getResolutionDiagnostic(options, { extension }) {
+function getResolutionDiagnostic(options, { extension }, { isDeclarationFile }) {
   switch (extension) {
     case ".ts" /* Ts */:
     case ".d.ts" /* Dts */:
+    case ".mts" /* Mts */:
+    case ".d.mts" /* Dmts */:
+    case ".cts" /* Cts */:
+    case ".d.cts" /* Dcts */:
       return void 0;
     case ".tsx" /* Tsx */:
       return needJsx();
     case ".jsx" /* Jsx */:
       return needJsx() || needAllowJs();
     case ".js" /* Js */:
+    case ".mjs" /* Mjs */:
+    case ".cjs" /* Cjs */:
       return needAllowJs();
     case ".json" /* Json */:
       return needResolveJsonModule();
+    default:
+      return needAllowArbitraryExtensions();
   }
   function needJsx() {
     return options.jsx ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
@@ -116859,6 +116909,9 @@ function getResolutionDiagnostic(options, { extension }) {
   function needResolveJsonModule() {
     return getResolveJsonModule(options) ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used;
   }
+  function needAllowArbitraryExtensions() {
+    return isDeclarationFile || options.allowArbitraryExtensions ? void 0 : Diagnostics.Module_0_was_resolved_to_1_but_allowArbitraryExtensions_is_not_set;
+  }
 }
 function getModuleNames({ imports, moduleAugmentations }) {
   const res = imports.map((i) => i);
@@ -124852,6 +124905,7 @@ __export(ts_exports3, {
   isNonContextualKeyword: () => isNonContextualKeyword,
   isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
   isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+  isNonNullAccess: () => isNonNullAccess,
   isNonNullChain: () => isNonNullChain,
   isNonNullExpression: () => isNonNullExpression,
   isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,
@@ -125127,7 +125181,6 @@ __export(ts_exports3, {
   moduleResolutionNameAndModeGetter: () => moduleResolutionNameAndModeGetter,
   moduleResolutionOptionDeclarations: () => moduleResolutionOptionDeclarations,
   moduleResolutionSupportsPackageJsonExportsAndImports: () => moduleResolutionSupportsPackageJsonExportsAndImports,
-  moduleResolutionSupportsResolvingTsExtensions: () => moduleResolutionSupportsResolvingTsExtensions,
   moduleResolutionUsesNodeModules: () => moduleResolutionUsesNodeModules,
   moduleSpecifiers: () => ts_moduleSpecifiers_exports,
   moveEmitHelpers: () => moveEmitHelpers,
@@ -148479,7 +148532,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
           break;
         case 291 /* JsxExpression */:
         case 290 /* JsxSpreadAttribute */:
-          if (previousToken.kind === 19 /* CloseBraceToken */ && currentToken.kind === 31 /* GreaterThanToken */) {
+          if (previousToken.kind === 19 /* CloseBraceToken */ || (previousToken.kind === 79 /* Identifier */ || previousToken.parent.kind === 288 /* JsxAttribute */)) {
             isJsxIdentifierExpected = true;
           }
           break;
@@ -150577,6 +150630,10 @@ function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, ext
   return result;
 }
 function getFilenameWithExtensionOption(name, compilerOptions, extensionOptions) {
+  const nonJsResult = ts_moduleSpecifiers_exports.tryGetRealFileNameForNonJsDeclarationFileName(name);
+  if (nonJsResult) {
+    return { name: nonJsResult, extension: tryGetExtensionFromPath2(nonJsResult) };
+  }
   if (extensionOptions.referenceKind === 0 /* Filename */) {
     return { name, extension: tryGetExtensionFromPath2(name) };
   }
@@ -151498,7 +151555,7 @@ function skipExportSpecifierSymbol(symbol, checker) {
   if (symbol.declarations) {
     for (const declaration of symbol.declarations) {
       if (isExportSpecifier(declaration) && !declaration.propertyName && !declaration.parent.parent.moduleSpecifier) {
-        return checker.getExportSpecifierLocalTargetSymbol(declaration);
+        return checker.getExportSpecifierLocalTargetSymbol(declaration) || symbol;
       } else if (isPropertyAccessExpression(declaration) && isModuleExportsAccessExpression(declaration.expression) && !isPrivateIdentifier(declaration.name)) {
         return checker.getSymbolAtLocation(declaration);
       } else if (isShorthandPropertyAssignment(declaration) && isBinaryExpression(declaration.parent.parent) && getAssignmentDeclarationKind(declaration.parent.parent) === 2 /* ModuleExports */) {
@@ -180427,6 +180484,7 @@ start(initializeNodeSystem(), require("os").platform());
   isNonContextualKeyword,
   isNonGlobalAmbientModule,
   isNonGlobalDeclaration,
+  isNonNullAccess,
   isNonNullChain,
   isNonNullExpression,
   isNonStaticMethodOrAccessorWithPrivateName,
@@ -180702,7 +180760,6 @@ start(initializeNodeSystem(), require("os").platform());
   moduleResolutionNameAndModeGetter,
   moduleResolutionOptionDeclarations,
   moduleResolutionSupportsPackageJsonExportsAndImports,
-  moduleResolutionSupportsResolvingTsExtensions,
   moduleResolutionUsesNodeModules,
   moduleSpecifiers,
   moveEmitHelpers,