typescript 5.0.0-dev.20230110 → 5.0.0-dev.20230112

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.20230112`;
 
 // 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}'."),
@@ -7790,7 +7791,8 @@ function isIdentifierStart(ch, languageVersion) {
   return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch === 36 /* $ */ || ch === 95 /* _ */ || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierStart(ch, languageVersion);
 }
 function isIdentifierPart(ch, languageVersion, identifierVariant) {
-  return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ || (identifierVariant === 1 /* JSX */ ? ch === 45 /* minus */ || ch === 58 /* colon */ : false) || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
+  return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ || // "-" and ":" are valid in JSX Identifiers
+  (identifierVariant === 1 /* JSX */ ? ch === 45 /* minus */ || ch === 58 /* colon */ : false) || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
 }
 function isIdentifierText(name, languageVersion, identifierVariant) {
   let ch = codePointAt(name, 0);
@@ -27759,7 +27761,8 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
         if (returnValue) {
           result[keyText] = value;
         }
-        if (jsonConversionNotifier && (parentOption || isRootOptionMap(knownOptions))) {
+        if (jsonConversionNotifier && // Current callbacks are only on known parent option or if we are setting values in the root
+        (parentOption || isRootOptionMap(knownOptions))) {
           const isValidOptionValue = isCompilerOptionsValue(option, value);
           if (parentOption) {
             if (isValidOptionValue) {
@@ -28484,7 +28487,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 +28712,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 +28831,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 +28845,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 +28919,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 +29424,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 +29459,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 +29567,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(
@@ -32344,8 +32354,12 @@ function createBinder() {
       return false;
     }
     if (currentFlow === unreachableFlow) {
-      const reportError = isStatementButNotDeclaration(node) && node.kind !== 239 /* EmptyStatement */ || // report error on class declarations
-      node.kind === 260 /* ClassDeclaration */ || node.kind === 264 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node);
+      const reportError = (
+        // report error on all statements except empty ones
+        isStatementButNotDeclaration(node) && node.kind !== 239 /* EmptyStatement */ || // report error on class declarations
+        node.kind === 260 /* ClassDeclaration */ || // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+        node.kind === 264 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)
+      );
       if (reportError) {
         currentFlow = reportedUnreachableFlow;
         if (!options.allowUnreachableCode) {

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.20230112",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [