typescript 5.0.0-dev.20230110 → 5.0.0-dev.20230111

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230110`;
+var version = `${versionMajorMinor}.0-dev.20230111`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6763,6 +6763,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}'."),
@@ -16637,6 +16638,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() {
@@ -35772,7 +35777,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;
@@ -36618,7 +36624,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(", "));
@@ -36842,7 +36849,7 @@ function tryAddingExtensions(candidate, extensions, originalExtension, onlyRecor
   }
   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) {
@@ -36888,7 +36895,8 @@ function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options)
     conditions: emptyArray,
     requestContainingDirectory: void 0,
     reportDiagnostic: noop,
-    isConfigLookup: false
+    isConfigLookup: false,
+    candidateIsFromPackageJsonField: false
   };
 }
 function getPackageScopeForPath(fileName, state) {
@@ -36976,6 +36984,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 */;
     }
@@ -36988,6 +36998,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;
@@ -37061,7 +37072,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) {
@@ -37563,25 +37577,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(
@@ -37597,13 +37612,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) {
@@ -37720,7 +37733,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(
@@ -37799,7 +37813,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 */,
@@ -50715,7 +50730,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);
   }
@@ -62060,7 +62085,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;
@@ -63536,12 +63561,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);
@@ -99965,6 +99991,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;

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,
@@ -2661,7 +2662,7 @@ __export(ts_server_exports3, {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230110`;
+var version = `${versionMajorMinor}.0-dev.20230111`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10567,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}'."),
@@ -21102,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() {
@@ -40498,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;
@@ -41369,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(", "));
@@ -41593,7 +41601,7 @@ function tryAddingExtensions(candidate, extensions, originalExtension, onlyRecor
   }
   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(
@@ -42651,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 */,
@@ -55621,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);
   }
@@ -66966,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;
@@ -68442,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);
@@ -105048,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;
@@ -124875,6 +124905,7 @@ __export(ts_exports3, {
   isNonContextualKeyword: () => isNonContextualKeyword,
   isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
   isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+  isNonNullAccess: () => isNonNullAccess,
   isNonNullChain: () => isNonNullChain,
   isNonNullExpression: () => isNonNullExpression,
   isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,
@@ -180453,6 +180484,7 @@ start(initializeNodeSystem(), require("os").platform());
   isNonContextualKeyword,
   isNonGlobalAmbientModule,
   isNonGlobalDeclaration,
+  isNonNullAccess,
   isNonNullChain,
   isNonNullExpression,
   isNonStaticMethodOrAccessorWithPrivateName,

package/lib/tsserverlibrary.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20230110`;
+      version = `${versionMajorMinor}.0-dev.20230111`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8023,6 +8023,7 @@ ${lanes.join("\n")}
         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}'."),
@@ -18397,6 +18398,10 @@ ${lanes.join("\n")}
         return false;
     }
   }
+  function isNonNullAccess(node) {
+    const kind = node.kind;
+    return (kind === 208 /* PropertyAccessExpression */ || kind === 209 /* ElementAccessExpression */) && isNonNullExpression(node.expression);
+  }
   var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashAMDReferencePathRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, AccessKind, objectAllocator, localizedDiagnosticMessages, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries;
   var init_utilities = __esm({
     "src/compiler/utilities.ts"() {
@@ -38031,7 +38036,8 @@ ${lanes.join("\n")}
       conditions,
       requestContainingDirectory: containingDirectory,
       reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
     let resolved = primaryLookup();
     let primary = true;
@@ -38889,7 +38895,8 @@ ${lanes.join("\n")}
       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(", "));
@@ -39112,7 +39119,7 @@ ${lanes.join("\n")}
     }
     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) {
@@ -39259,7 +39266,8 @@ ${lanes.join("\n")}
       conditions: emptyArray,
       requestContainingDirectory: void 0,
       reportDiagnostic: noop,
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
   }
   function getPackageScopeForPath(fileName, state) {
@@ -39347,6 +39355,8 @@ ${lanes.join("\n")}
       }
       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 */;
       }
@@ -39359,6 +39369,7 @@ ${lanes.join("\n")}
         false
       );
       state2.features = features;
+      state2.candidateIsFromPackageJsonField = candidateIsFromPackageJsonField;
       return result;
     };
     const onlyRecordFailuresForPackageFile = packageFile ? !directoryProbablyExists(getDirectoryPath(packageFile), state.host) : void 0;
@@ -39432,7 +39443,10 @@ ${lanes.join("\n")}
       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) {
@@ -39934,25 +39948,26 @@ ${lanes.join("\n")}
     }
   }
   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(
@@ -39968,13 +39983,11 @@ ${lanes.join("\n")}
       }
       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) {
@@ -40090,7 +40103,8 @@ ${lanes.join("\n")}
       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(
@@ -40169,7 +40183,8 @@ ${lanes.join("\n")}
       conditions: [],
       requestContainingDirectory: void 0,
       reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
     const resolved = loadModuleFromImmediateNodeModulesDirectory(
       4 /* Declaration */,
@@ -53064,7 +53079,17 @@ ${lanes.join("\n")}
       }
     }
     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);
     }
@@ -64409,7 +64434,7 @@ ${lanes.join("\n")}
         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;
@@ -65885,12 +65910,13 @@ ${lanes.join("\n")}
         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);
@@ -102777,6 +102803,9 @@ ${lanes.join("\n")}
         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;
@@ -176584,6 +176613,7 @@ ${e.message}`;
     isNonContextualKeyword: () => isNonContextualKeyword,
     isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
     isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+    isNonNullAccess: () => isNonNullAccess,
     isNonNullChain: () => isNonNullChain,
     isNonNullExpression: () => isNonNullExpression,
     isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,
@@ -179224,6 +179254,7 @@ ${e.message}`;
     isNonContextualKeyword: () => isNonContextualKeyword,
     isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
     isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+    isNonNullAccess: () => isNonNullAccess,
     isNonNullChain: () => isNonNullChain,
     isNonNullExpression: () => isNonNullExpression,
     isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,

package/lib/typescript.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20230110`;
+      version = `${versionMajorMinor}.0-dev.20230111`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8023,6 +8023,7 @@ ${lanes.join("\n")}
         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}'."),
@@ -18397,6 +18398,10 @@ ${lanes.join("\n")}
         return false;
     }
   }
+  function isNonNullAccess(node) {
+    const kind = node.kind;
+    return (kind === 208 /* PropertyAccessExpression */ || kind === 209 /* ElementAccessExpression */) && isNonNullExpression(node.expression);
+  }
   var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashAMDReferencePathRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, AccessKind, objectAllocator, localizedDiagnosticMessages, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries;
   var init_utilities = __esm({
     "src/compiler/utilities.ts"() {
@@ -38031,7 +38036,8 @@ ${lanes.join("\n")}
       conditions,
       requestContainingDirectory: containingDirectory,
       reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
     let resolved = primaryLookup();
     let primary = true;
@@ -38889,7 +38895,8 @@ ${lanes.join("\n")}
       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(", "));
@@ -39112,7 +39119,7 @@ ${lanes.join("\n")}
     }
     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) {
@@ -39259,7 +39266,8 @@ ${lanes.join("\n")}
       conditions: emptyArray,
       requestContainingDirectory: void 0,
       reportDiagnostic: noop,
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
   }
   function getPackageScopeForPath(fileName, state) {
@@ -39347,6 +39355,8 @@ ${lanes.join("\n")}
       }
       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 */;
       }
@@ -39359,6 +39369,7 @@ ${lanes.join("\n")}
         false
       );
       state2.features = features;
+      state2.candidateIsFromPackageJsonField = candidateIsFromPackageJsonField;
       return result;
     };
     const onlyRecordFailuresForPackageFile = packageFile ? !directoryProbablyExists(getDirectoryPath(packageFile), state.host) : void 0;
@@ -39432,7 +39443,10 @@ ${lanes.join("\n")}
       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) {
@@ -39934,25 +39948,26 @@ ${lanes.join("\n")}
     }
   }
   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(
@@ -39968,13 +39983,11 @@ ${lanes.join("\n")}
       }
       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) {
@@ -40090,7 +40103,8 @@ ${lanes.join("\n")}
       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(
@@ -40169,7 +40183,8 @@ ${lanes.join("\n")}
       conditions: [],
       requestContainingDirectory: void 0,
       reportDiagnostic: (diag2) => void diagnostics.push(diag2),
-      isConfigLookup: false
+      isConfigLookup: false,
+      candidateIsFromPackageJsonField: false
     };
     const resolved = loadModuleFromImmediateNodeModulesDirectory(
       4 /* Declaration */,
@@ -53064,7 +53079,17 @@ ${lanes.join("\n")}
       }
     }
     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);
     }
@@ -64409,7 +64434,7 @@ ${lanes.join("\n")}
         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;
@@ -65885,12 +65910,13 @@ ${lanes.join("\n")}
         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);
@@ -102777,6 +102803,9 @@ ${lanes.join("\n")}
         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;
@@ -165751,6 +165780,7 @@ ${options.prefix}` : "\n" : options.prefix
     isNonContextualKeyword: () => isNonContextualKeyword,
     isNonGlobalAmbientModule: () => isNonGlobalAmbientModule,
     isNonGlobalDeclaration: () => isNonGlobalDeclaration,
+    isNonNullAccess: () => isNonNullAccess,
     isNonNullChain: () => isNonNullChain,
     isNonNullExpression: () => isNonNullExpression,
     isNonStaticMethodOrAccessorWithPrivateName: () => isNonStaticMethodOrAccessorWithPrivateName,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230110`;
+var version = `${versionMajorMinor}.0-dev.20230111`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6207,6 +6207,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}'."),
@@ -28484,7 +28485,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(", "));
@@ -28708,7 +28710,7 @@ function tryAddingExtensions(candidate, extensions, originalExtension, onlyRecor
   }
   function tryExtension(ext, resolvedUsingTsExtension) {
     const path2 = tryFile(candidate + ext, onlyRecordFailures, state);
-    return path2 === void 0 ? void 0 : { path: path2, ext, resolvedUsingTsExtension };
+    return path2 === void 0 ? void 0 : { path: path2, ext, resolvedUsingTsExtension: !state.candidateIsFromPackageJsonField && resolvedUsingTsExtension };
   }
 }
 function tryFile(fileName, onlyRecordFailures, state) {
@@ -28827,6 +28829,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 */;
     }
@@ -28839,6 +28843,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;
@@ -28912,7 +28917,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) {
@@ -29414,25 +29422,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(
@@ -29448,13 +29457,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) {
@@ -29558,7 +29565,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(

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.0.0-dev.20230110",
+    "version": "5.0.0-dev.20230111",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [