typescript 5.1.0-dev.20230310 → 5.1.0-dev.20230312

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230310`;
+var version = `${versionMajorMinor}.0-dev.20230312`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1306,7 +1306,7 @@ function trimEndImpl(s) {
   return s.slice(0, end + 1);
 }
 function isNodeLikeSystem() {
-  return typeof process !== "undefined" && process.nextTick && !process.browser && typeof module === "object";
+  return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
 }
 
 // src/compiler/debug.ts
@@ -4914,7 +4914,7 @@ var sys = (() => {
       getAccessibleSortedChildDirectories: (path) => getAccessibleFileSystemEntries(path).directories,
       realpath,
       tscWatchFile: process.env.TSC_WATCHFILE,
-      useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
+      useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
       sysLog
@@ -5000,8 +5000,10 @@ var sys = (() => {
         process.stdout.write("\x1Bc");
       },
       setBlocking: () => {
-        if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-          process.stdout._handle.setBlocking(true);
+        var _a2;
+        const handle = (_a2 = process.stdout) == null ? void 0 : _a2._handle;
+        if (handle && handle.setBlocking) {
+          handle.setBlocking(true);
         }
       },
       bufferFrom,
@@ -36574,6 +36576,10 @@ function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
     originalPath: pathsAreEqual ? void 0 : fileName
   };
 }
+function getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState) {
+  const nameForLookup = endsWith(typeRoot, "/node_modules/@types") || endsWith(typeRoot, "/node_modules/@types/") ? mangleScopedPackageNameWithTrace(typeReferenceDirectiveName, moduleResolutionState) : typeReferenceDirectiveName;
+  return combinePaths(typeRoot, nameForLookup);
+}
 function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
   Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
   const traceEnabled = isTraceEnabled(options, host);
@@ -36692,7 +36698,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
         trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
       }
       return firstDefined(typeRoots, (typeRoot) => {
-        const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
+        const candidate = getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState);
         const directoryExists = directoryProbablyExists(typeRoot, host);
         if (!directoryExists && traceEnabled) {
           trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -38678,7 +38684,7 @@ function resolveFromTypeRoot(moduleName, state) {
   if (!state.compilerOptions.typeRoots)
     return;
   for (const typeRoot of state.compilerOptions.typeRoots) {
-    const candidate = combinePaths(typeRoot, moduleName);
+    const candidate = getCandidateFromTypeRoot(typeRoot, moduleName, state);
     const directoryExists = directoryProbablyExists(typeRoot, state.host);
     if (!directoryExists && state.traceEnabled) {
       trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -58645,20 +58651,8 @@ function createTypeChecker(host) {
         return result;
       }
       const moreThanOneRealChildren = length(validChildren) > 1;
-      let arrayLikeTargetParts;
-      let nonArrayLikeTargetParts;
-      const iterableType = getGlobalIterableType(
-        /*reportErrors*/
-        false
-      );
-      if (iterableType !== emptyGenericType) {
-        const anyIterable = createIterableType(anyType);
-        arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
-        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
-      } else {
-        arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
-        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
-      }
+      const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
+      const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
       if (moreThanOneRealChildren) {
         if (arrayLikeTargetParts !== neverType) {
           const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -61944,6 +61938,13 @@ function createTypeChecker(host) {
   function isArrayOrTupleLikeType(type) {
     return isArrayLikeType(type) || isTupleLikeType(type);
   }
+  function isAssignableToAvailableAnyIterable(type) {
+    const anyIterable = getGlobalIterableType(
+      /*reportErrors*/
+      false
+    ) !== emptyGenericType && createIterableType(anyType);
+    return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
+  }
   function getTupleElementType(type, index) {
     const propType = getTypeOfPropertyOfType(type, "" + index);
     if (propType) {
@@ -66697,7 +66698,7 @@ function createTypeChecker(host) {
     return void 0;
   }
   function getContextualTypeForElementExpression(arrayContextualType, index) {
-    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
+    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
       arrayContextualType,
       (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
         t,

package/lib/tsserver.js

@@ -2284,7 +2284,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230310`;
+var version = `${versionMajorMinor}.0-dev.20230312`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3955,7 +3955,7 @@ function trimEndImpl(s) {
   return s.slice(0, end + 1);
 }
 function isNodeLikeSystem() {
-  return typeof process !== "undefined" && process.nextTick && !process.browser && typeof module === "object";
+  return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
 }
 
 // src/compiler/debug.ts
@@ -8352,7 +8352,7 @@ var sys = (() => {
       getAccessibleSortedChildDirectories: (path) => getAccessibleFileSystemEntries(path).directories,
       realpath,
       tscWatchFile: process.env.TSC_WATCHFILE,
-      useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
+      useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
       sysLog
@@ -8438,8 +8438,10 @@ var sys = (() => {
         process.stdout.write("\x1Bc");
       },
       setBlocking: () => {
-        if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-          process.stdout._handle.setBlocking(true);
+        var _a2;
+        const handle = (_a2 = process.stdout) == null ? void 0 : _a2._handle;
+        if (handle && handle.setBlocking) {
+          handle.setBlocking(true);
         }
       },
       bufferFrom,
@@ -40970,6 +40972,10 @@ function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
     originalPath: pathsAreEqual ? void 0 : fileName
   };
 }
+function getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState) {
+  const nameForLookup = endsWith(typeRoot, "/node_modules/@types") || endsWith(typeRoot, "/node_modules/@types/") ? mangleScopedPackageNameWithTrace(typeReferenceDirectiveName, moduleResolutionState) : typeReferenceDirectiveName;
+  return combinePaths(typeRoot, nameForLookup);
+}
 function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
   Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
   const traceEnabled = isTraceEnabled(options, host);
@@ -41088,7 +41094,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
         trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
       }
       return firstDefined(typeRoots, (typeRoot) => {
-        const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
+        const candidate = getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState);
         const directoryExists = directoryProbablyExists(typeRoot, host);
         if (!directoryExists && traceEnabled) {
           trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -43213,7 +43219,7 @@ function resolveFromTypeRoot(moduleName, state) {
   if (!state.compilerOptions.typeRoots)
     return;
   for (const typeRoot of state.compilerOptions.typeRoots) {
-    const candidate = combinePaths(typeRoot, moduleName);
+    const candidate = getCandidateFromTypeRoot(typeRoot, moduleName, state);
     const directoryExists = directoryProbablyExists(typeRoot, state.host);
     if (!directoryExists && state.traceEnabled) {
       trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -63234,20 +63240,8 @@ function createTypeChecker(host) {
         return result;
       }
       const moreThanOneRealChildren = length(validChildren) > 1;
-      let arrayLikeTargetParts;
-      let nonArrayLikeTargetParts;
-      const iterableType = getGlobalIterableType(
-        /*reportErrors*/
-        false
-      );
-      if (iterableType !== emptyGenericType) {
-        const anyIterable = createIterableType(anyType);
-        arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
-        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
-      } else {
-        arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
-        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
-      }
+      const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
+      const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
       if (moreThanOneRealChildren) {
         if (arrayLikeTargetParts !== neverType) {
           const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -66533,6 +66527,13 @@ function createTypeChecker(host) {
   function isArrayOrTupleLikeType(type) {
     return isArrayLikeType(type) || isTupleLikeType(type);
   }
+  function isAssignableToAvailableAnyIterable(type) {
+    const anyIterable = getGlobalIterableType(
+      /*reportErrors*/
+      false
+    ) !== emptyGenericType && createIterableType(anyType);
+    return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
+  }
   function getTupleElementType(type, index) {
     const propType = getTypeOfPropertyOfType(type, "" + index);
     if (propType) {
@@ -71286,7 +71287,7 @@ function createTypeChecker(host) {
     return void 0;
   }
   function getContextualTypeForElementExpression(arrayContextualType, index) {
-    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
+    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
       arrayContextualType,
       (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
         t,

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230310`;
+      version = `${versionMajorMinor}.0-dev.20230312`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1620,7 +1620,7 @@ var ts = (() => {
     return s.slice(0, end + 1);
   }
   function isNodeLikeSystem() {
-    return typeof process !== "undefined" && process.nextTick && !process.browser && typeof module === "object";
+    return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
   }
   var emptyArray, emptyMap, emptySet, SortKind, elementAt, hasOwnProperty, fileNameLowerCaseRegExp, AssertionLevel, createUIStringComparer, uiComparerCaseSensitive, uiLocale, trimString, trimStringEnd, trimStringStart;
   var init_core = __esm({
@@ -6167,7 +6167,7 @@ ${lanes.join("\n")}
             getAccessibleSortedChildDirectories: (path) => getAccessibleFileSystemEntries(path).directories,
             realpath,
             tscWatchFile: process.env.TSC_WATCHFILE,
-            useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
+            useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
             tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
             inodeWatching: isLinuxOrMacOs,
             sysLog
@@ -6253,8 +6253,10 @@ ${lanes.join("\n")}
               process.stdout.write("\x1Bc");
             },
             setBlocking: () => {
-              if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-                process.stdout._handle.setBlocking(true);
+              var _a2;
+              const handle = (_a2 = process.stdout) == null ? void 0 : _a2._handle;
+              if (handle && handle.setBlocking) {
+                handle.setBlocking(true);
               }
             },
             bufferFrom,
@@ -38873,6 +38875,10 @@ ${lanes.join("\n")}
       originalPath: pathsAreEqual ? void 0 : fileName
     };
   }
+  function getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState) {
+    const nameForLookup = endsWith(typeRoot, "/node_modules/@types") || endsWith(typeRoot, "/node_modules/@types/") ? mangleScopedPackageNameWithTrace(typeReferenceDirectiveName, moduleResolutionState) : typeReferenceDirectiveName;
+    return combinePaths(typeRoot, nameForLookup);
+  }
   function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
     Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
     const traceEnabled = isTraceEnabled(options, host);
@@ -38991,7 +38997,7 @@ ${lanes.join("\n")}
           trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
         }
         return firstDefined(typeRoots, (typeRoot) => {
-          const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
+          const candidate = getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState);
           const directoryExists = directoryProbablyExists(typeRoot, host);
           if (!directoryExists && traceEnabled) {
             trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -41101,7 +41107,7 @@ ${lanes.join("\n")}
     if (!state.compilerOptions.typeRoots)
       return;
     for (const typeRoot of state.compilerOptions.typeRoots) {
-      const candidate = combinePaths(typeRoot, moduleName);
+      const candidate = getCandidateFromTypeRoot(typeRoot, moduleName, state);
       const directoryExists = directoryProbablyExists(typeRoot, state.host);
       if (!directoryExists && state.traceEnabled) {
         trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -61046,20 +61052,8 @@ ${lanes.join("\n")}
           return result;
         }
         const moreThanOneRealChildren = length(validChildren) > 1;
-        let arrayLikeTargetParts;
-        let nonArrayLikeTargetParts;
-        const iterableType = getGlobalIterableType(
-          /*reportErrors*/
-          false
-        );
-        if (iterableType !== emptyGenericType) {
-          const anyIterable = createIterableType(anyType);
-          arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
-          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
-        } else {
-          arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
-          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
-        }
+        const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
+        const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
         if (moreThanOneRealChildren) {
           if (arrayLikeTargetParts !== neverType) {
             const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -64345,6 +64339,13 @@ ${lanes.join("\n")}
     function isArrayOrTupleLikeType(type) {
       return isArrayLikeType(type) || isTupleLikeType(type);
     }
+    function isAssignableToAvailableAnyIterable(type) {
+      const anyIterable = getGlobalIterableType(
+        /*reportErrors*/
+        false
+      ) !== emptyGenericType && createIterableType(anyType);
+      return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
+    }
     function getTupleElementType(type, index) {
       const propType = getTypeOfPropertyOfType(type, "" + index);
       if (propType) {
@@ -69098,7 +69099,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     function getContextualTypeForElementExpression(arrayContextualType, index) {
-      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
+      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
         arrayContextualType,
         (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
           t,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230310`;
+      version = `${versionMajorMinor}.0-dev.20230312`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1620,7 +1620,7 @@ var ts = (() => {
     return s.slice(0, end + 1);
   }
   function isNodeLikeSystem() {
-    return typeof process !== "undefined" && process.nextTick && !process.browser && typeof module === "object";
+    return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
   }
   var emptyArray, emptyMap, emptySet, SortKind, elementAt, hasOwnProperty, fileNameLowerCaseRegExp, AssertionLevel, createUIStringComparer, uiComparerCaseSensitive, uiLocale, trimString, trimStringEnd, trimStringStart;
   var init_core = __esm({
@@ -6167,7 +6167,7 @@ ${lanes.join("\n")}
             getAccessibleSortedChildDirectories: (path) => getAccessibleFileSystemEntries(path).directories,
             realpath,
             tscWatchFile: process.env.TSC_WATCHFILE,
-            useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
+            useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
             tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
             inodeWatching: isLinuxOrMacOs,
             sysLog
@@ -6253,8 +6253,10 @@ ${lanes.join("\n")}
               process.stdout.write("\x1Bc");
             },
             setBlocking: () => {
-              if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-                process.stdout._handle.setBlocking(true);
+              var _a2;
+              const handle = (_a2 = process.stdout) == null ? void 0 : _a2._handle;
+              if (handle && handle.setBlocking) {
+                handle.setBlocking(true);
               }
             },
             bufferFrom,
@@ -38873,6 +38875,10 @@ ${lanes.join("\n")}
       originalPath: pathsAreEqual ? void 0 : fileName
     };
   }
+  function getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState) {
+    const nameForLookup = endsWith(typeRoot, "/node_modules/@types") || endsWith(typeRoot, "/node_modules/@types/") ? mangleScopedPackageNameWithTrace(typeReferenceDirectiveName, moduleResolutionState) : typeReferenceDirectiveName;
+    return combinePaths(typeRoot, nameForLookup);
+  }
   function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
     Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
     const traceEnabled = isTraceEnabled(options, host);
@@ -38991,7 +38997,7 @@ ${lanes.join("\n")}
           trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
         }
         return firstDefined(typeRoots, (typeRoot) => {
-          const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
+          const candidate = getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState);
           const directoryExists = directoryProbablyExists(typeRoot, host);
           if (!directoryExists && traceEnabled) {
             trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -41101,7 +41107,7 @@ ${lanes.join("\n")}
     if (!state.compilerOptions.typeRoots)
       return;
     for (const typeRoot of state.compilerOptions.typeRoots) {
-      const candidate = combinePaths(typeRoot, moduleName);
+      const candidate = getCandidateFromTypeRoot(typeRoot, moduleName, state);
       const directoryExists = directoryProbablyExists(typeRoot, state.host);
       if (!directoryExists && state.traceEnabled) {
         trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
@@ -61046,20 +61052,8 @@ ${lanes.join("\n")}
           return result;
         }
         const moreThanOneRealChildren = length(validChildren) > 1;
-        let arrayLikeTargetParts;
-        let nonArrayLikeTargetParts;
-        const iterableType = getGlobalIterableType(
-          /*reportErrors*/
-          false
-        );
-        if (iterableType !== emptyGenericType) {
-          const anyIterable = createIterableType(anyType);
-          arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
-          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
-        } else {
-          arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
-          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
-        }
+        const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
+        const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
         if (moreThanOneRealChildren) {
           if (arrayLikeTargetParts !== neverType) {
             const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -64345,6 +64339,13 @@ ${lanes.join("\n")}
     function isArrayOrTupleLikeType(type) {
       return isArrayLikeType(type) || isTupleLikeType(type);
     }
+    function isAssignableToAvailableAnyIterable(type) {
+      const anyIterable = getGlobalIterableType(
+        /*reportErrors*/
+        false
+      ) !== emptyGenericType && createIterableType(anyType);
+      return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
+    }
     function getTupleElementType(type, index) {
       const propType = getTypeOfPropertyOfType(type, "" + index);
       if (propType) {
@@ -69098,7 +69099,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     function getContextualTypeForElementExpression(arrayContextualType, index) {
-      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
+      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
         arrayContextualType,
         (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
           t,

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.20230310`;
+var version = `${versionMajorMinor}.0-dev.20230312`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -841,7 +841,7 @@ function trimEndImpl(s) {
   return s.slice(0, end + 1);
 }
 function isNodeLikeSystem() {
-  return typeof process !== "undefined" && process.nextTick && !process.browser && typeof module === "object";
+  return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
 }
 
 // src/compiler/debug.ts
@@ -4302,7 +4302,7 @@ var sys = (() => {
       getAccessibleSortedChildDirectories: (path2) => getAccessibleFileSystemEntries(path2).directories,
       realpath,
       tscWatchFile: process.env.TSC_WATCHFILE,
-      useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
+      useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
       sysLog
@@ -4388,8 +4388,10 @@ var sys = (() => {
         process.stdout.write("\x1Bc");
       },
       setBlocking: () => {
-        if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-          process.stdout._handle.setBlocking(true);
+        var _a2;
+        const handle = (_a2 = process.stdout) == null ? void 0 : _a2._handle;
+        if (handle && handle.setBlocking) {
+          handle.setBlocking(true);
         }
       },
       bufferFrom,
@@ -27318,6 +27320,10 @@ function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
     originalPath: pathsAreEqual ? void 0 : fileName
   };
 }
+function getCandidateFromTypeRoot(typeRoot, typeReferenceDirectiveName, moduleResolutionState) {
+  const nameForLookup = endsWith(typeRoot, "/node_modules/@types") || endsWith(typeRoot, "/node_modules/@types/") ? mangleScopedPackageNameWithTrace(typeReferenceDirectiveName, moduleResolutionState) : typeReferenceDirectiveName;
+  return combinePaths(typeRoot, nameForLookup);
+}
 function getNodeResolutionFeatures(options) {
   let features = 0 /* None */;
   switch (getEmitModuleResolutionKind(options)) {
@@ -28827,7 +28833,7 @@ function resolveFromTypeRoot(moduleName, state) {
   if (!state.compilerOptions.typeRoots)
     return;
   for (const typeRoot of state.compilerOptions.typeRoots) {
-    const candidate = combinePaths(typeRoot, moduleName);
+    const candidate = getCandidateFromTypeRoot(typeRoot, moduleName, state);
     const directoryExists = directoryProbablyExists(typeRoot, state.host);
     if (!directoryExists && state.traceEnabled) {
       trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230310",
+    "version": "5.1.0-dev.20230312",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "a8ffab2f30074b8135c978851e8bf8146dfd3239"
+    "gitHead": "32d2253e37e8a02a385a859c2d0b721c7674a045"
 }