typescript 5.1.0-dev.20230417 → 5.1.0-dev.20230418

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230417`;
+var version = `${versionMajorMinor}.0-dev.20230418`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -37633,22 +37633,22 @@ var nodeModulesPathPart = "/node_modules/";
 function pathContainsNodeModules(path) {
   return stringContains(path, nodeModulesPathPart);
 }
-function parseNodeModuleFromPath(resolved) {
+function parseNodeModuleFromPath(resolved, isFolder) {
   const path = normalizePath(resolved);
   const idx = path.lastIndexOf(nodeModulesPathPart);
   if (idx === -1) {
     return void 0;
   }
   const indexAfterNodeModules = idx + nodeModulesPathPart.length;
-  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules);
+  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules, isFolder);
   if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
-    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
+    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName, isFolder);
   }
   return path.slice(0, indexAfterPackageName);
 }
-function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
+function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex, isFolder) {
   const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex + 1);
-  return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+  return nextSeparatorIndex === -1 ? isFolder ? path.length : prevSeparatorIndex : nextSeparatorIndex;
 }
 function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
   return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
@@ -39024,7 +39024,7 @@ function createBinder() {
         return getSymbolNameForPrivateIdentifier(containingClassSymbol, name.escapedText);
       }
       if (isJsxNamespacedName(name)) {
-        return getEscapedTextOfJsxAttributeName(name);
+        return getEscapedTextOfJsxNamespacedName(name);
       }
       return isPropertyNameLiteral(name) ? getEscapedTextOfIdentifierOrLiteral(name) : void 0;
     }
@@ -66895,7 +66895,7 @@ function createTypeChecker(host) {
     return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : void 0;
   }
   function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-    const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
+    const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
     const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
       return void 0;
@@ -118493,6 +118493,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     reusedNames,
     loader,
     getResolutionWithResolvedFileName,
+    deferWatchingNonRelativeResolution,
     shouldRetryResolution,
     logChanges
   }) {
@@ -118517,7 +118518,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
-        watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
+        watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
         if (existingResolution) {
           stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
         }
@@ -118593,7 +118594,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         typeReferenceDirectiveResolutionCache
       ),
       getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective,
-      shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0
+      shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
+      deferWatchingNonRelativeResolution: false
     });
   }
   function resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
@@ -118612,7 +118614,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       ),
       getResolutionWithResolvedFileName: getResolvedModule2,
       shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
-      logChanges: logChangesWhenResolvingModule
+      logChanges: logChangesWhenResolvingModule,
+      deferWatchingNonRelativeResolution: true
+      // Defer non relative resolution watch because we could be using ambient modules
     });
   }
   function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
@@ -118630,7 +118634,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");
   }
-  function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+  function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution) {
     var _a;
     if (resolution.refCount) {
       resolution.refCount++;
@@ -118638,7 +118642,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     } else {
       resolution.refCount = 1;
       Debug.assert(!((_a = resolution.files) == null ? void 0 : _a.size));
-      if (isExternalModuleNameRelative(name)) {
+      if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
         watchFailedLookupLocationOfResolution(resolution);
       } else {
         nonRelativeExternalModuleResolutions.add(name, resolution);
@@ -118918,7 +118922,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
-        const packagePath = parseNodeModuleFromPath(fileOrDirectoryPath);
+        const packagePath = parseNodeModuleFromPath(
+          fileOrDirectoryPath,
+          /*isFolder*/
+          true
+        );
         if (packagePath)
           (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(packagePath);
       }

package/lib/tsserver.js

@@ -2301,7 +2301,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230417`;
+var version = `${versionMajorMinor}.0-dev.20230418`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -42132,22 +42132,22 @@ var nodeModulesPathPart = "/node_modules/";
 function pathContainsNodeModules(path) {
   return stringContains(path, nodeModulesPathPart);
 }
-function parseNodeModuleFromPath(resolved) {
+function parseNodeModuleFromPath(resolved, isFolder) {
   const path = normalizePath(resolved);
   const idx = path.lastIndexOf(nodeModulesPathPart);
   if (idx === -1) {
     return void 0;
   }
   const indexAfterNodeModules = idx + nodeModulesPathPart.length;
-  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules);
+  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules, isFolder);
   if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
-    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
+    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName, isFolder);
   }
   return path.slice(0, indexAfterPackageName);
 }
-function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
+function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex, isFolder) {
   const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex + 1);
-  return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+  return nextSeparatorIndex === -1 ? isFolder ? path.length : prevSeparatorIndex : nextSeparatorIndex;
 }
 function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
   return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
@@ -43630,7 +43630,7 @@ function createBinder() {
         return getSymbolNameForPrivateIdentifier(containingClassSymbol, name.escapedText);
       }
       if (isJsxNamespacedName(name)) {
-        return getEscapedTextOfJsxAttributeName(name);
+        return getEscapedTextOfJsxNamespacedName(name);
       }
       return isPropertyNameLiteral(name) ? getEscapedTextOfIdentifierOrLiteral(name) : void 0;
     }
@@ -71549,7 +71549,7 @@ function createTypeChecker(host) {
     return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
   }
   function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-    const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
+    const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
     const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
       return void 0;
@@ -123418,6 +123418,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     reusedNames,
     loader,
     getResolutionWithResolvedFileName,
+    deferWatchingNonRelativeResolution,
     shouldRetryResolution,
     logChanges
   }) {
@@ -123442,7 +123443,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
-        watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
+        watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
         if (existingResolution) {
           stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
         }
@@ -123518,7 +123519,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         typeReferenceDirectiveResolutionCache
       ),
       getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective2,
-      shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0
+      shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
+      deferWatchingNonRelativeResolution: false
     });
   }
   function resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
@@ -123537,7 +123539,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       ),
       getResolutionWithResolvedFileName: getResolvedModule2,
       shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
-      logChanges: logChangesWhenResolvingModule
+      logChanges: logChangesWhenResolvingModule,
+      deferWatchingNonRelativeResolution: true
+      // Defer non relative resolution watch because we could be using ambient modules
     });
   }
   function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
@@ -123555,7 +123559,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");
   }
-  function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+  function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution) {
     var _a;
     if (resolution.refCount) {
       resolution.refCount++;
@@ -123563,7 +123567,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     } else {
       resolution.refCount = 1;
       Debug.assert(!((_a = resolution.files) == null ? void 0 : _a.size));
-      if (isExternalModuleNameRelative(name)) {
+      if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
         watchFailedLookupLocationOfResolution(resolution);
       } else {
         nonRelativeExternalModuleResolutions.add(name, resolution);
@@ -123843,7 +123847,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
-        const packagePath = parseNodeModuleFromPath(fileOrDirectoryPath);
+        const packagePath = parseNodeModuleFromPath(
+          fileOrDirectoryPath,
+          /*isFolder*/
+          true
+        );
         if (packagePath)
           (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(packagePath);
       }

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230417`;
+      version = `${versionMajorMinor}.0-dev.20230418`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -40003,22 +40003,22 @@ ${lanes.join("\n")}
   function pathContainsNodeModules(path) {
     return stringContains(path, nodeModulesPathPart);
   }
-  function parseNodeModuleFromPath(resolved) {
+  function parseNodeModuleFromPath(resolved, isFolder) {
     const path = normalizePath(resolved);
     const idx = path.lastIndexOf(nodeModulesPathPart);
     if (idx === -1) {
       return void 0;
     }
     const indexAfterNodeModules = idx + nodeModulesPathPart.length;
-    let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules);
+    let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules, isFolder);
     if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
-      indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
+      indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName, isFolder);
     }
     return path.slice(0, indexAfterPackageName);
   }
-  function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
+  function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex, isFolder) {
     const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex + 1);
-    return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+    return nextSeparatorIndex === -1 ? isFolder ? path.length : prevSeparatorIndex : nextSeparatorIndex;
   }
   function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
     return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
@@ -41516,7 +41516,7 @@ ${lanes.join("\n")}
           return getSymbolNameForPrivateIdentifier(containingClassSymbol, name.escapedText);
         }
         if (isJsxNamespacedName(name)) {
-          return getEscapedTextOfJsxAttributeName(name);
+          return getEscapedTextOfJsxNamespacedName(name);
         }
         return isPropertyNameLiteral(name) ? getEscapedTextOfIdentifierOrLiteral(name) : void 0;
       }
@@ -69343,7 +69343,7 @@ ${lanes.join("\n")}
       return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
     }
     function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-      const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
+      const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
       const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
         return void 0;
@@ -121575,6 +121575,7 @@ ${lanes.join("\n")}
       reusedNames,
       loader,
       getResolutionWithResolvedFileName,
+      deferWatchingNonRelativeResolution,
       shouldRetryResolution,
       logChanges
     }) {
@@ -121599,7 +121600,7 @@ ${lanes.join("\n")}
             resolutionHost.onDiscoveredSymlink();
           }
           resolutionsInFile.set(name, mode, resolution);
-          watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
+          watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
           if (existingResolution) {
             stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
           }
@@ -121675,7 +121676,8 @@ ${lanes.join("\n")}
           typeReferenceDirectiveResolutionCache
         ),
         getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective2,
-        shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0
+        shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
+        deferWatchingNonRelativeResolution: false
       });
     }
     function resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
@@ -121694,7 +121696,9 @@ ${lanes.join("\n")}
         ),
         getResolutionWithResolvedFileName: getResolvedModule2,
         shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
-        logChanges: logChangesWhenResolvingModule
+        logChanges: logChangesWhenResolvingModule,
+        deferWatchingNonRelativeResolution: true
+        // Defer non relative resolution watch because we could be using ambient modules
       });
     }
     function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
@@ -121712,7 +121716,7 @@ ${lanes.join("\n")}
     function isNodeModulesAtTypesDirectory(dirPath) {
       return endsWith(dirPath, "/node_modules/@types");
     }
-    function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+    function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution) {
       var _a;
       if (resolution.refCount) {
         resolution.refCount++;
@@ -121720,7 +121724,7 @@ ${lanes.join("\n")}
       } else {
         resolution.refCount = 1;
         Debug.assert(!((_a = resolution.files) == null ? void 0 : _a.size));
-        if (isExternalModuleNameRelative(name)) {
+        if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
           watchFailedLookupLocationOfResolution(resolution);
         } else {
           nonRelativeExternalModuleResolutions.add(name, resolution);
@@ -122000,7 +122004,11 @@ ${lanes.join("\n")}
             return false;
           }
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
-          const packagePath = parseNodeModuleFromPath(fileOrDirectoryPath);
+          const packagePath = parseNodeModuleFromPath(
+            fileOrDirectoryPath,
+            /*isFolder*/
+            true
+          );
           if (packagePath)
             (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(packagePath);
         }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230417`;
+      version = `${versionMajorMinor}.0-dev.20230418`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -40003,22 +40003,22 @@ ${lanes.join("\n")}
   function pathContainsNodeModules(path) {
     return stringContains(path, nodeModulesPathPart);
   }
-  function parseNodeModuleFromPath(resolved) {
+  function parseNodeModuleFromPath(resolved, isFolder) {
     const path = normalizePath(resolved);
     const idx = path.lastIndexOf(nodeModulesPathPart);
     if (idx === -1) {
       return void 0;
     }
     const indexAfterNodeModules = idx + nodeModulesPathPart.length;
-    let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules);
+    let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules, isFolder);
     if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
-      indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
+      indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName, isFolder);
     }
     return path.slice(0, indexAfterPackageName);
   }
-  function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
+  function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex, isFolder) {
     const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex + 1);
-    return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+    return nextSeparatorIndex === -1 ? isFolder ? path.length : prevSeparatorIndex : nextSeparatorIndex;
   }
   function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
     return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
@@ -41516,7 +41516,7 @@ ${lanes.join("\n")}
           return getSymbolNameForPrivateIdentifier(containingClassSymbol, name.escapedText);
         }
         if (isJsxNamespacedName(name)) {
-          return getEscapedTextOfJsxAttributeName(name);
+          return getEscapedTextOfJsxNamespacedName(name);
         }
         return isPropertyNameLiteral(name) ? getEscapedTextOfIdentifierOrLiteral(name) : void 0;
       }
@@ -69343,7 +69343,7 @@ ${lanes.join("\n")}
       return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType2(conditional, contextFlags) : void 0;
     }
     function getContextualTypeForChildJsxExpression(node, child, contextFlags) {
-      const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
+      const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
       const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
         return void 0;
@@ -121575,6 +121575,7 @@ ${lanes.join("\n")}
       reusedNames,
       loader,
       getResolutionWithResolvedFileName,
+      deferWatchingNonRelativeResolution,
       shouldRetryResolution,
       logChanges
     }) {
@@ -121599,7 +121600,7 @@ ${lanes.join("\n")}
             resolutionHost.onDiscoveredSymlink();
           }
           resolutionsInFile.set(name, mode, resolution);
-          watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
+          watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
           if (existingResolution) {
             stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
           }
@@ -121675,7 +121676,8 @@ ${lanes.join("\n")}
           typeReferenceDirectiveResolutionCache
         ),
         getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective2,
-        shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0
+        shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
+        deferWatchingNonRelativeResolution: false
       });
     }
     function resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
@@ -121694,7 +121696,9 @@ ${lanes.join("\n")}
         ),
         getResolutionWithResolvedFileName: getResolvedModule2,
         shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
-        logChanges: logChangesWhenResolvingModule
+        logChanges: logChangesWhenResolvingModule,
+        deferWatchingNonRelativeResolution: true
+        // Defer non relative resolution watch because we could be using ambient modules
       });
     }
     function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
@@ -121712,7 +121716,7 @@ ${lanes.join("\n")}
     function isNodeModulesAtTypesDirectory(dirPath) {
       return endsWith(dirPath, "/node_modules/@types");
     }
-    function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+    function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution) {
       var _a;
       if (resolution.refCount) {
         resolution.refCount++;
@@ -121720,7 +121724,7 @@ ${lanes.join("\n")}
       } else {
         resolution.refCount = 1;
         Debug.assert(!((_a = resolution.files) == null ? void 0 : _a.size));
-        if (isExternalModuleNameRelative(name)) {
+        if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
           watchFailedLookupLocationOfResolution(resolution);
         } else {
           nonRelativeExternalModuleResolutions.add(name, resolution);
@@ -122000,7 +122004,11 @@ ${lanes.join("\n")}
             return false;
           }
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
-          const packagePath = parseNodeModuleFromPath(fileOrDirectoryPath);
+          const packagePath = parseNodeModuleFromPath(
+            fileOrDirectoryPath,
+            /*isFolder*/
+            true
+          );
           if (packagePath)
             (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(packagePath);
         }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230417`;
+var version = `${versionMajorMinor}.0-dev.20230418`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -27734,22 +27734,22 @@ var nodeModulesPathPart = "/node_modules/";
 function pathContainsNodeModules(path2) {
   return stringContains(path2, nodeModulesPathPart);
 }
-function parseNodeModuleFromPath(resolved) {
+function parseNodeModuleFromPath(resolved, isFolder) {
   const path2 = normalizePath(resolved);
   const idx = path2.lastIndexOf(nodeModulesPathPart);
   if (idx === -1) {
     return void 0;
   }
   const indexAfterNodeModules = idx + nodeModulesPathPart.length;
-  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterNodeModules);
+  let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterNodeModules, isFolder);
   if (path2.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
-    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterPackageName);
+    indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterPackageName, isFolder);
   }
   return path2.slice(0, indexAfterPackageName);
 }
-function moveToNextDirectorySeparatorIfAvailable(path2, prevSeparatorIndex) {
+function moveToNextDirectorySeparatorIfAvailable(path2, prevSeparatorIndex, isFolder) {
   const nextSeparatorIndex = path2.indexOf(directorySeparator, prevSeparatorIndex + 1);
-  return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+  return nextSeparatorIndex === -1 ? isFolder ? path2.length : prevSeparatorIndex : nextSeparatorIndex;
 }
 function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
   return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230417",
+    "version": "5.1.0-dev.20230418",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "430c5be783928c71e1b16ef267fad26d2998d7ab"
+    "gitHead": "3d3b2c724eb7adb8afbd44d2e3ad48fa8b0e8a84"
 }