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

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.20230109`;
+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}'."),
@@ -6578,6 +6579,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."),
@@ -11421,7 +11425,7 @@ function hostGetCanonicalFileName(host) {
   return createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
 }
 function getPossibleOriginalInputExtensionForExtension(path2) {
-  return fileExtensionIsOneOf(path2, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path2, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path2, [`.json.d.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
+  return fileExtensionIsOneOf(path2, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path2, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path2, [`.d.json.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
 }
 function outFile(options) {
   return options.outFile || options.out;
@@ -22097,7 +22101,7 @@ var Parser;
     const pos = getNodePos();
     return finishNode(factory2.createVoidExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos);
   }
-  function isAwaitExpression() {
+  function isAwaitExpression2() {
     if (token() === 133 /* AwaitKeyword */) {
       if (inAwaitContext()) {
         return true;
@@ -22145,7 +22149,7 @@ var Parser;
       case 29 /* LessThanToken */:
         return parseTypeAssertion();
       case 133 /* AwaitKeyword */:
-        if (isAwaitExpression()) {
+        if (isAwaitExpression2()) {
           return parseAwaitExpression();
         }
       default:
@@ -25808,7 +25812,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) {
@@ -27066,6 +27070,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",
@@ -28473,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(", "));
@@ -28641,14 +28654,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)) {
@@ -28672,42 +28690,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 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) {
@@ -28826,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 */;
     }
@@ -28838,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;
@@ -28911,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) {
@@ -29413,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(
@@ -29447,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) {
@@ -29557,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(
@@ -29614,9 +29623,6 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     }
   }
 }
-function moduleResolutionSupportsResolvingTsExtensions(compilerOptions) {
-  return getEmitModuleResolutionKind(compilerOptions) === 100 /* Bundler */;
-}
 function toSearchResult(value) {
   return value !== void 0 ? { value } : void 0;
 }

package/package.json

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