typescript 5.7.0-dev.20241015 → 5.7.0-dev.20241016

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241015`;
+var version = `${versionMajorMinor}.0-dev.20241016`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -29531,10 +29531,12 @@ var Parser;
       case 90 /* DefaultKeyword */:
         return nextTokenCanFollowDefaultKeyword();
       case 126 /* StaticKeyword */:
+        nextToken();
+        return canFollowModifier();
       case 139 /* GetKeyword */:
       case 153 /* SetKeyword */:
         nextToken();
-        return canFollowModifier();
+        return canFollowGetOrSetKeyword();
       default:
         return nextTokenIsOnSameLineAndCanFollowModifier();
     }
@@ -29552,6 +29554,9 @@ var Parser;
   function canFollowModifier() {
     return token() === 23 /* OpenBracketToken */ || token() === 19 /* OpenBraceToken */ || token() === 42 /* AsteriskToken */ || token() === 26 /* DotDotDotToken */ || isLiteralPropertyName();
   }
+  function canFollowGetOrSetKeyword() {
+    return token() === 23 /* OpenBracketToken */ || isLiteralPropertyName();
+  }
   function nextTokenCanFollowDefaultKeyword() {
     nextToken();
     return token() === 86 /* ClassKeyword */ || token() === 100 /* FunctionKeyword */ || token() === 120 /* InterfaceKeyword */ || token() === 60 /* AtToken */ || token() === 128 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine) || token() === 134 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine);
@@ -40473,25 +40478,28 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
       return toSearchResult({ resolved, isExternalLibraryImport: pathContainsNodeModules(resolved.path) });
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      let resolved2;
       if (features & 2 /* Imports */ && startsWith(moduleName, "#")) {
-        resolved2 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
-      }
-      if (!resolved2 && features & 4 /* SelfName */) {
-        resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        const resolved3 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
+        }
       }
-      if (!resolved2) {
-        if (moduleName.includes(":")) {
-          if (traceEnabled) {
-            trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
-          }
-          return void 0;
+      if (features & 4 /* SelfName */) {
+        const resolved3 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
         }
+      }
+      if (moduleName.includes(":")) {
         if (traceEnabled) {
-          trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+          trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
         }
-        resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        return void 0;
       }
+      if (traceEnabled) {
+        trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+      }
+      let resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       if (extensions2 & 4 /* Declaration */) {
         resolved2 ?? (resolved2 = resolveFromTypeRoot(moduleName, state2));
       }
@@ -45075,7 +45083,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
     importMode,
     prefersTsExtension(allowedEndings)
   );
-  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) : void 0;
   if (pathsOnly) {
     return fromPaths;
   }
@@ -45289,10 +45297,11 @@ function tryGetModuleNameFromAmbientModule(moduleSymbol, checker) {
     return ambientModuleDeclare.name.text;
   }
 }
-function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) {
+function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) {
   for (const key in paths) {
     for (const patternText2 of paths[key]) {
-      const pattern = normalizePath(patternText2);
+      const normalized = normalizePath(patternText2);
+      const pattern = getRelativePathIfInSameVolume(normalized, baseDirectory, getCanonicalFileName) ?? normalized;
       const indexOfStar = pattern.indexOf("*");
       const candidates = allowedEndings.map((ending) => ({
         ending,
@@ -45621,6 +45630,8 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
           subModuleName,
           versionPaths.paths,
           allowedEndings,
+          packageRootPath,
+          getCanonicalFileName,
           host,
           options
         );
@@ -55464,7 +55475,7 @@ function createTypeChecker(host) {
       const getter = getDeclarationOfKind(symbol, 177 /* GetAccessor */);
       const setter = getDeclarationOfKind(symbol, 178 /* SetAccessor */);
       const accessor = tryCast(getDeclarationOfKind(symbol, 172 /* PropertyDeclaration */), isAutoAccessorPropertyDeclaration);
-      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && accessor.initializer && getWidenedTypeForVariableLikeDeclaration(
+      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && getWidenedTypeForVariableLikeDeclaration(
         accessor,
         /*reportErrors*/
         true

package/lib/typescript.js

@@ -2277,7 +2277,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241015`;
+var version = `${versionMajorMinor}.0-dev.20241016`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -33783,10 +33783,12 @@ var Parser;
       case 90 /* DefaultKeyword */:
         return nextTokenCanFollowDefaultKeyword();
       case 126 /* StaticKeyword */:
+        nextToken();
+        return canFollowModifier();
       case 139 /* GetKeyword */:
       case 153 /* SetKeyword */:
         nextToken();
-        return canFollowModifier();
+        return canFollowGetOrSetKeyword();
       default:
         return nextTokenIsOnSameLineAndCanFollowModifier();
     }
@@ -33804,6 +33806,9 @@ var Parser;
   function canFollowModifier() {
     return token() === 23 /* OpenBracketToken */ || token() === 19 /* OpenBraceToken */ || token() === 42 /* AsteriskToken */ || token() === 26 /* DotDotDotToken */ || isLiteralPropertyName();
   }
+  function canFollowGetOrSetKeyword() {
+    return token() === 23 /* OpenBracketToken */ || isLiteralPropertyName();
+  }
   function nextTokenCanFollowDefaultKeyword() {
     nextToken();
     return token() === 86 /* ClassKeyword */ || token() === 100 /* FunctionKeyword */ || token() === 120 /* InterfaceKeyword */ || token() === 60 /* AtToken */ || token() === 128 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine) || token() === 134 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine);
@@ -44843,25 +44848,28 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
       return toSearchResult({ resolved, isExternalLibraryImport: pathContainsNodeModules(resolved.path) });
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      let resolved2;
       if (features & 2 /* Imports */ && startsWith(moduleName, "#")) {
-        resolved2 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
-      }
-      if (!resolved2 && features & 4 /* SelfName */) {
-        resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        const resolved3 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
+        }
       }
-      if (!resolved2) {
-        if (moduleName.includes(":")) {
-          if (traceEnabled) {
-            trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
-          }
-          return void 0;
+      if (features & 4 /* SelfName */) {
+        const resolved3 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
         }
+      }
+      if (moduleName.includes(":")) {
         if (traceEnabled) {
-          trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+          trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
         }
-        resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        return void 0;
       }
+      if (traceEnabled) {
+        trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+      }
+      let resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       if (extensions2 & 4 /* Declaration */) {
         resolved2 ?? (resolved2 = resolveFromTypeRoot(moduleName, state2));
       }
@@ -49663,7 +49671,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
     importMode,
     prefersTsExtension(allowedEndings)
   );
-  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) : void 0;
   if (pathsOnly) {
     return fromPaths;
   }
@@ -49892,10 +49900,11 @@ function tryGetModuleNameFromAmbientModule(moduleSymbol, checker) {
     return ambientModuleDeclare.name.text;
   }
 }
-function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) {
+function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) {
   for (const key in paths) {
     for (const patternText2 of paths[key]) {
-      const pattern = normalizePath(patternText2);
+      const normalized = normalizePath(patternText2);
+      const pattern = getRelativePathIfInSameVolume(normalized, baseDirectory, getCanonicalFileName) ?? normalized;
       const indexOfStar = pattern.indexOf("*");
       const candidates = allowedEndings.map((ending) => ({
         ending,
@@ -50224,6 +50233,8 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
           subModuleName,
           versionPaths.paths,
           allowedEndings,
+          packageRootPath,
+          getCanonicalFileName,
           host,
           options
         );
@@ -60067,7 +60078,7 @@ function createTypeChecker(host) {
       const getter = getDeclarationOfKind(symbol, 177 /* GetAccessor */);
       const setter = getDeclarationOfKind(symbol, 178 /* SetAccessor */);
       const accessor = tryCast(getDeclarationOfKind(symbol, 172 /* PropertyDeclaration */), isAutoAccessorPropertyDeclaration);
-      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && accessor.initializer && getWidenedTypeForVariableLikeDeclaration(
+      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && getWidenedTypeForVariableLikeDeclaration(
         accessor,
         /*reportErrors*/
         true
@@ -141000,7 +141011,11 @@ function getExportInfoMap(importingFile, host, program, preferences, cancellatio
 }
 function getDefaultLikeExportInfo(moduleSymbol, checker) {
   const exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
-  if (exportEquals !== moduleSymbol) return { symbol: exportEquals, exportKind: 2 /* ExportEquals */ };
+  if (exportEquals !== moduleSymbol) {
+    const defaultExport2 = checker.tryGetMemberInModuleExports("default" /* Default */, exportEquals);
+    if (defaultExport2) return { symbol: defaultExport2, exportKind: 1 /* Default */ };
+    return { symbol: exportEquals, exportKind: 2 /* ExportEquals */ };
+  }
   const defaultExport = checker.tryGetMemberInModuleExports("default" /* Default */, moduleSymbol);
   if (defaultExport) return { symbol: defaultExport, exportKind: 1 /* Default */ };
 }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.7.0-dev.20241015",
+    "version": "5.7.0-dev.20241016",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -116,5 +116,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "40caf3431986884b3da7a607de22ced5d364d9fc"
+    "gitHead": "bd1641f7691909450147cc38cc6f5e55b79e0545"
 }