typescript 5.0.0-dev.20230202 → 5.0.0-dev.20230204

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.20230202`;
+var version = `${versionMajorMinor}.0-dev.20230204`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5980,7 +5980,6 @@ var Diagnostics = {
   Cannot_find_type_definition_file_for_0: diag(2688, 1 /* Error */, "Cannot_find_type_definition_file_for_0_2688", "Cannot find type definition file for '{0}'."),
   Cannot_extend_an_interface_0_Did_you_mean_implements: diag(2689, 1 /* Error */, "Cannot_extend_an_interface_0_Did_you_mean_implements_2689", "Cannot extend an interface '{0}'. Did you mean 'implements'?"),
   _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0: diag(2690, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0_2690", "'{0}' only refers to a type, but is being used as a value here. Did you mean to use '{1} in {0}'?"),
-  An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead: diag(2691, 1 /* Error */, "An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead_2691", "An import path cannot end with a '{0}' extension. Consider importing '{1}' instead."),
   _0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible: diag(2692, 1 /* Error */, "_0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible_2692", "'{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible."),
   _0_only_refers_to_a_type_but_is_being_used_as_a_value_here: diag(2693, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693", "'{0}' only refers to a type, but is being used as a value here."),
   Namespace_0_has_no_exported_member_1: diag(2694, 1 /* Error */, "Namespace_0_has_no_exported_member_1_2694", "Namespace '{0}' has no exported member '{1}'."),
@@ -27922,6 +27921,22 @@ function formatExtensions(extensions) {
     result.push("JSON");
   return result.join(", ");
 }
+function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName, resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state, legacyResult) {
+  if (!state.resultFromCache && !state.compilerOptions.preserveSymlinks && resolved && isExternalLibraryImport && !resolved.originalPath && !isExternalModuleNameRelative(moduleName)) {
+    const { resolvedFileName, originalPath } = getOriginalAndResolvedFileName(resolved.path, state.host, state.traceEnabled);
+    if (originalPath)
+      resolved = { ...resolved, path: resolvedFileName, originalPath };
+  }
+  return createResolvedModuleWithFailedLookupLocations(
+    resolved,
+    isExternalLibraryImport,
+    failedLookupLocations,
+    affectingLocations,
+    diagnostics,
+    state.resultFromCache,
+    legacyResult
+  );
+}
 function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, legacyResult) {
   if (resultFromCache) {
     resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
@@ -28054,6 +28069,15 @@ function arePathsEqual(path1, path2, host) {
   const useCaseSensitiveFileNames = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
   return comparePaths(path1, path2, !useCaseSensitiveFileNames) === 0 /* EqualTo */;
 }
+function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
+  const resolvedFileName = realPath(fileName, host, traceEnabled);
+  const pathsAreEqual = arePathsEqual(fileName, resolvedFileName, host);
+  return {
+    // If the fileName and realpath are differing only in casing prefer fileName so that we can issue correct errors for casing under forceConsistentCasingInFileNames
+    resolvedFileName: pathsAreEqual ? fileName : resolvedFileName,
+    originalPath: pathsAreEqual ? void 0 : fileName
+  };
+}
 function getNodeResolutionFeatures(options) {
   let features = NodeResolutionFeatures.None;
   switch (getEmitModuleResolutionKind(options)) {
@@ -28439,13 +28463,14 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
       legacyResult = diagnosticResult.value.resolved.path;
     }
   }
-  return createResolvedModuleWithFailedLookupLocations(
+  return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+    moduleName,
     (_c = result == null ? void 0 : result.value) == null ? void 0 : _c.resolved,
     (_d = result == null ? void 0 : result.value) == null ? void 0 : _d.isExternalLibraryImport,
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache,
+    state,
     legacyResult
   );
   function tryResolve(extensions2, state2) {
@@ -28475,16 +28500,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
         }
         resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       }
-      if (!resolved2)
-        return void 0;
-      let resolvedValue = resolved2.value;
-      if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) {
-        const path2 = realPath(resolvedValue.path, host, traceEnabled);
-        const pathsAreEqual = arePathsEqual(path2, resolvedValue.path, host);
-        const originalPath = pathsAreEqual ? void 0 : resolvedValue.path;
-        resolvedValue = { ...resolvedValue, path: pathsAreEqual ? resolvedValue.path : path2, originalPath };
-      }
-      return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
+      return resolved2 && { value: resolved2.value && { resolved: resolved2.value, isExternalLibraryImport: true } };
     } else {
       const { path: candidate, parts } = normalizePathForCJSResolution(containingDirectory, moduleName);
       const resolved2 = nodeLoadModuleByRelativeName(
@@ -29510,13 +29526,14 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     candidateIsFromPackageJsonField: false
   };
   const resolved = tryResolve(1 /* TypeScript */ | 4 /* Declaration */) || tryResolve(2 /* JavaScript */ | (compilerOptions.resolveJsonModule ? 8 /* Json */ : 0));
-  return createResolvedModuleWithFailedLookupLocations(
+  return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+    moduleName,
     resolved && resolved.value,
     (resolved == null ? void 0 : resolved.value) && pathContainsNodeModules(resolved.value.path),
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache
+    state
   );
   function tryResolve(extensions) {
     const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.0.0-dev.20230202",
+    "version": "5.0.0-dev.20230204",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -66,6 +66,7 @@
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-local": "^1.0.0",
         "eslint-plugin-no-null": "^1.0.2",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
         "fast-xml-parser": "^4.0.11",
         "fs-extra": "^9.1.0",
         "glob": "latest",