typescript 5.1.0-dev.20230309 → 5.1.0-dev.20230311

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230309`;
+      version = `${versionMajorMinor}.0-dev.20230311`;
       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({
@@ -6098,20 +6098,6 @@ ${lanes.join("\n")}
       (path2) => sys2.directoryExists(path2)
     );
   }
-  function getNodeMajorVersion() {
-    if (typeof process === "undefined") {
-      return void 0;
-    }
-    const version2 = process.version;
-    if (!version2) {
-      return void 0;
-    }
-    const dot = version2.indexOf(".");
-    if (dot === -1) {
-      return void 0;
-    }
-    return parseInt(version2.substring(1, dot));
-  }
   function setSys(s) {
     sys = s;
   }
@@ -6159,14 +6145,12 @@ ${lanes.join("\n")}
           let activeSession;
           let profilePath = "./profile.cpuprofile";
           const Buffer2 =   require("buffer").Buffer;
-          const nodeVersion = getNodeMajorVersion();
-          const isNode4OrLater = nodeVersion >= 4;
           const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
           const platform = _os.platform();
           const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
           const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
           const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-          const fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
+          const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
           const getCurrentDirectory = memoize(() => process.cwd());
           const { watchFile: watchFile2, watchDirectory } = createSystemWatchFunctions({
             pollingWatchFileWorker: fsWatchFileWorker,
@@ -6183,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
@@ -6269,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,
@@ -38889,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);
@@ -39007,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);
@@ -41117,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);
@@ -55080,10 +55070,9 @@ ${lanes.join("\n")}
       return [sig.parameters];
       function expandSignatureParametersWithTupleMembers(restType, restIndex) {
         const elementTypes = getTypeArguments(restType);
-        const associatedNames = restType.target.labeledElementDeclarations;
+        const associatedNames = getUniqAssociatedNamesFromTupleType(restType);
         const restParams = map(elementTypes, (t, i) => {
-          const tupleLabelName = !!associatedNames && getTupleElementLabel(associatedNames[i]);
-          const name = tupleLabelName || getParameterNameAtPosition(sig, restIndex + i, restType);
+          const name = associatedNames && associatedNames[i] ? associatedNames[i] : getParameterNameAtPosition(sig, restIndex + i, restType);
           const flags = restType.target.elementFlags[i];
           const checkFlags = flags & 12 /* Variable */ ? 32768 /* RestParameter */ : flags & 2 /* Optional */ ? 16384 /* OptionalParameter */ : 0;
           const symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
@@ -55092,6 +55081,20 @@ ${lanes.join("\n")}
         });
         return concatenate(sig.parameters.slice(0, restIndex), restParams);
       }
+      function getUniqAssociatedNamesFromTupleType(type) {
+        const associatedNamesMap = /* @__PURE__ */ new Map();
+        return map(type.target.labeledElementDeclarations, (labeledElement) => {
+          const name = getTupleElementLabel(labeledElement);
+          const prevCounter = associatedNamesMap.get(name);
+          if (prevCounter === void 0) {
+            associatedNamesMap.set(name, 1);
+            return name;
+          } else {
+            associatedNamesMap.set(name, prevCounter + 1);
+            return `${name}_${prevCounter}`;
+          }
+        });
+      }
     }
     function getDefaultConstructSignatures(classType) {
       const baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -61049,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 */));
@@ -64348,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) {
@@ -69101,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,
@@ -142576,9 +142574,10 @@ ${lanes.join("\n")}
     if (!isMemberName(token))
       return void 0;
     if (isIdentifier(token) && hasInitializer(parent2) && parent2.initializer && isObjectLiteralExpression(parent2.initializer)) {
+      const targetType = checker.getContextualType(token) || checker.getTypeAtLocation(token);
       const properties = arrayFrom(checker.getUnmatchedProperties(
         checker.getTypeAtLocation(parent2.initializer),
-        checker.getTypeAtLocation(token),
+        targetType,
         /* requireOptionalProperties */
         false,
         /* matchDiscriminantProperties */
@@ -179476,7 +179475,6 @@ ${e.message}`;
     getNodeForGeneratedName: () => getNodeForGeneratedName,
     getNodeId: () => getNodeId,
     getNodeKind: () => getNodeKind,
-    getNodeMajorVersion: () => getNodeMajorVersion,
     getNodeModifiers: () => getNodeModifiers,
     getNodeModulePathParts: () => getNodeModulePathParts,
     getNonAssignedNameOfDeclaration: () => getNonAssignedNameOfDeclaration,
@@ -181833,7 +181831,6 @@ ${e.message}`;
     getNodeForGeneratedName: () => getNodeForGeneratedName,
     getNodeId: () => getNodeId,
     getNodeKind: () => getNodeKind,
-    getNodeMajorVersion: () => getNodeMajorVersion,
     getNodeModifiers: () => getNodeModifiers,
     getNodeModulePathParts: () => getNodeModulePathParts,
     getNonAssignedNameOfDeclaration: () => getNonAssignedNameOfDeclaration,

package/lib/typescript.d.ts

@@ -4342,7 +4342,6 @@ declare namespace ts {
         negative: boolean;
         base10Value: string;
     }
-    function getNodeMajorVersion(): number | undefined;
     enum FileWatcherEventKind {
         Created = 0,
         Changed = 1,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230309`;
+      version = `${versionMajorMinor}.0-dev.20230311`;
       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({
@@ -6098,20 +6098,6 @@ ${lanes.join("\n")}
       (path2) => sys2.directoryExists(path2)
     );
   }
-  function getNodeMajorVersion() {
-    if (typeof process === "undefined") {
-      return void 0;
-    }
-    const version2 = process.version;
-    if (!version2) {
-      return void 0;
-    }
-    const dot = version2.indexOf(".");
-    if (dot === -1) {
-      return void 0;
-    }
-    return parseInt(version2.substring(1, dot));
-  }
   function setSys(s) {
     sys = s;
   }
@@ -6159,14 +6145,12 @@ ${lanes.join("\n")}
           let activeSession;
           let profilePath = "./profile.cpuprofile";
           const Buffer2 =   require("buffer").Buffer;
-          const nodeVersion = getNodeMajorVersion();
-          const isNode4OrLater = nodeVersion >= 4;
           const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
           const platform = _os.platform();
           const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
           const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
           const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-          const fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
+          const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
           const getCurrentDirectory = memoize(() => process.cwd());
           const { watchFile: watchFile2, watchDirectory } = createSystemWatchFunctions({
             pollingWatchFileWorker: fsWatchFileWorker,
@@ -6183,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
@@ -6269,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,
@@ -38889,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);
@@ -39007,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);
@@ -41117,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);
@@ -55080,10 +55070,9 @@ ${lanes.join("\n")}
       return [sig.parameters];
       function expandSignatureParametersWithTupleMembers(restType, restIndex) {
         const elementTypes = getTypeArguments(restType);
-        const associatedNames = restType.target.labeledElementDeclarations;
+        const associatedNames = getUniqAssociatedNamesFromTupleType(restType);
         const restParams = map(elementTypes, (t, i) => {
-          const tupleLabelName = !!associatedNames && getTupleElementLabel(associatedNames[i]);
-          const name = tupleLabelName || getParameterNameAtPosition(sig, restIndex + i, restType);
+          const name = associatedNames && associatedNames[i] ? associatedNames[i] : getParameterNameAtPosition(sig, restIndex + i, restType);
           const flags = restType.target.elementFlags[i];
           const checkFlags = flags & 12 /* Variable */ ? 32768 /* RestParameter */ : flags & 2 /* Optional */ ? 16384 /* OptionalParameter */ : 0;
           const symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
@@ -55092,6 +55081,20 @@ ${lanes.join("\n")}
         });
         return concatenate(sig.parameters.slice(0, restIndex), restParams);
       }
+      function getUniqAssociatedNamesFromTupleType(type) {
+        const associatedNamesMap = /* @__PURE__ */ new Map();
+        return map(type.target.labeledElementDeclarations, (labeledElement) => {
+          const name = getTupleElementLabel(labeledElement);
+          const prevCounter = associatedNamesMap.get(name);
+          if (prevCounter === void 0) {
+            associatedNamesMap.set(name, 1);
+            return name;
+          } else {
+            associatedNamesMap.set(name, prevCounter + 1);
+            return `${name}_${prevCounter}`;
+          }
+        });
+      }
     }
     function getDefaultConstructSignatures(classType) {
       const baseConstructorType = getBaseConstructorTypeOfClass(classType);
@@ -61049,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 */));
@@ -64348,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) {
@@ -69101,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,
@@ -142590,9 +142588,10 @@ ${lanes.join("\n")}
     if (!isMemberName(token))
       return void 0;
     if (isIdentifier(token) && hasInitializer(parent2) && parent2.initializer && isObjectLiteralExpression(parent2.initializer)) {
+      const targetType = checker.getContextualType(token) || checker.getTypeAtLocation(token);
       const properties = arrayFrom(checker.getUnmatchedProperties(
         checker.getTypeAtLocation(parent2.initializer),
-        checker.getTypeAtLocation(token),
+        targetType,
         /* requireOptionalProperties */
         false,
         /* matchDiscriminantProperties */
@@ -168644,7 +168643,6 @@ ${options.prefix}` : "\n" : options.prefix
     getNodeForGeneratedName: () => getNodeForGeneratedName,
     getNodeId: () => getNodeId,
     getNodeKind: () => getNodeKind,
-    getNodeMajorVersion: () => getNodeMajorVersion,
     getNodeModifiers: () => getNodeModifiers,
     getNodeModulePathParts: () => getNodeModulePathParts,
     getNonAssignedNameOfDeclaration: () => getNonAssignedNameOfDeclaration,

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.20230309`;
+var version = `${versionMajorMinor}.0-dev.20230311`;
 
 // 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
@@ -4264,20 +4264,6 @@ function patchWriteFileEnsuringDirectory(sys2) {
     (path3) => sys2.directoryExists(path3)
   );
 }
-function getNodeMajorVersion() {
-  if (typeof process === "undefined") {
-    return void 0;
-  }
-  const version2 = process.version;
-  if (!version2) {
-    return void 0;
-  }
-  const dot = version2.indexOf(".");
-  if (dot === -1) {
-    return void 0;
-  }
-  return parseInt(version2.substring(1, dot));
-}
 var sys = (() => {
   const byteOrderMarkIndicator = "\uFEFF";
   function getNodeSystem() {
@@ -4294,14 +4280,12 @@ var sys = (() => {
     let activeSession;
     let profilePath = "./profile.cpuprofile";
     const Buffer2 = require("buffer").Buffer;
-    const nodeVersion = getNodeMajorVersion();
-    const isNode4OrLater = nodeVersion >= 4;
     const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
     const platform = _os.platform();
     const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
     const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
     const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-    const fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
+    const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
     const getCurrentDirectory = memoize(() => process.cwd());
     const { watchFile, watchDirectory } = createSystemWatchFunctions({
       pollingWatchFileWorker: fsWatchFileWorker,
@@ -4318,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
@@ -4404,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,
@@ -27334,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)) {
@@ -28843,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.20230309",
+    "version": "5.1.0-dev.20230311",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -26,7 +26,7 @@
         "tsserver": "./bin/tsserver"
     },
     "engines": {
-        "node": ">=4.2.0"
+        "node": ">=12.20"
     },
     "files": [
         "bin",
@@ -112,5 +112,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "d681520a14edf78560de2b098d6d68783e2fdd8d"
+    "gitHead": "041b0db8f4dd69a20a08ca5ec9cfb166dff46adb"
 }