typescript 5.5.0-dev.20240401 → 5.5.0-dev.20240404

package/lib/lib.es5.d.ts

@@ -818,7 +818,7 @@ interface Date {
     getMilliseconds(): number;
     /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */
     getUTCMilliseconds(): number;
-    /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */
+    /** Gets the difference in minutes between Universal Coordinated Time (UTC) and the time on the local computer. */
     getTimezoneOffset(): number;
     /**
      * Sets the date and time value in the Date object.

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240401`;
+var version = `${versionMajorMinor}.0-dev.20240404`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7154,6 +7154,9 @@ var Diagnostics = {
   There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
   There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
+  package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
+  Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
+  Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -11572,13 +11575,13 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   return result;
 }
 function packageIdIsEqual(a, b) {
-  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
+  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version && a.peerDependencies === b.peerDependencies;
 }
 function packageIdToPackageName({ name, subModuleName }) {
   return subModuleName ? `${name}/${subModuleName}` : name;
 }
 function packageIdToString(packageId) {
-  return `${packageIdToPackageName(packageId)}@${packageId.version}`;
+  return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
 }
 function typeDirectiveIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
@@ -36968,7 +36971,7 @@ function trace(host, message, ...args) {
 function isTraceEnabled(compilerOptions, host) {
   return !!compilerOptions.traceResolution && host.trace !== void 0;
 }
-function withPackageId(packageInfo, r) {
+function withPackageId(packageInfo, r, state) {
   let packageId;
   if (r && packageInfo) {
     const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -36976,7 +36979,8 @@ function withPackageId(packageInfo, r) {
       packageId = {
         name: packageJsonContent.name,
         subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-        version: packageJsonContent.version
+        version: packageJsonContent.version,
+        peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
       };
     }
   }
@@ -36986,7 +36990,9 @@ function noPackageId(r) {
   return withPackageId(
     /*packageInfo*/
     void 0,
-    r
+    r,
+    /*state*/
+    void 0
   );
 }
 function removeIgnoredPackageId(r) {
@@ -37352,7 +37358,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
               false,
               moduleResolutionState
             ) : void 0;
-            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
+            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile, moduleResolutionState));
           }
         }
         return resolvedTypeScriptOnly(
@@ -38288,7 +38294,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
         false,
         state
       ) : void 0;
-      return withPackageId(packageInfo, resolvedFromFile);
+      return withPackageId(packageInfo, resolvedFromFile, state);
     }
   }
   if (!onlyRecordFailures) {
@@ -38431,7 +38437,7 @@ function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures,
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
   const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
   const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
 }
 function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options) {
   return {
@@ -38473,6 +38479,42 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   }
   return packageJsonInfo.contents.versionPaths || void 0;
 }
+function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
+  if (packageJsonInfo.contents.peerDependencies === void 0) {
+    packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
+  }
+  return packageJsonInfo.contents.peerDependencies || void 0;
+}
+function readPackageJsonPeerDependencies(packageJsonInfo, state) {
+  const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
+  if (peerDependencies === void 0)
+    return void 0;
+  if (state.traceEnabled)
+    trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
+  const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
+  const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
+  let result = "";
+  for (const key in peerDependencies) {
+    if (hasProperty(peerDependencies, key)) {
+      const peerPackageJson = getPackageJsonInfo(
+        nodeModules + key,
+        /*onlyRecordFailures*/
+        false,
+        state
+      );
+      if (peerPackageJson) {
+        const version2 = peerPackageJson.contents.packageJsonContent.version;
+        result += `+${key}@${version2}`;
+        if (state.traceEnabled)
+          trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
+      } else {
+        if (state.traceEnabled)
+          trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
+      }
+    }
+  }
+  return result;
+}
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
   var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
@@ -38501,7 +38543,7 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     if (traceEnabled) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
-    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
+    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
     if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
       state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
     (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -38899,7 +38941,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         /*onlyRecordFailures*/
         false,
         state
-      )));
+      ), state));
     } else if (typeof target === "object" && target !== null) {
       if (!Array.isArray(target)) {
         traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -39013,7 +39055,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                         /*onlyRecordFailures*/
                         false,
                         state
-                      )));
+                      ), state));
                     }
                   }
                 }
@@ -39144,7 +39186,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       packageInfo.contents.packageJsonContent,
       getVersionPathsOfPackageJsonInfo(packageInfo, state)
     );
-    return withPackageId(packageInfo, fromDirectory);
+    return withPackageId(packageInfo, fromDirectory, state);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -39158,7 +39200,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
     }
-    return withPackageId(packageInfo, pathAndExtension);
+    return withPackageId(packageInfo, pathAndExtension, state2);
   };
   if (rest !== "") {
     packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -39365,7 +39407,7 @@ function resolveFromTypeRoot(moduleName, state) {
         false,
         state
       ) : void 0;
-      return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
+      return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
     }
     const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
     if (resolved)
@@ -43500,6 +43542,7 @@ function createTypeChecker(host) {
     isArgumentsSymbol: (symbol) => symbol === argumentsSymbol,
     isUnknownSymbol: (symbol) => symbol === unknownSymbol,
     getMergedSymbol,
+    symbolIsValue,
     getDiagnostics,
     getGlobalDiagnostics,
     getRecursionIdentity,
@@ -49068,68 +49111,7 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
-      let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && (some(expandedParams) || some(signature.typeParameters))) {
-        let pushFakeScope2 = function(kind2, addAll) {
-          Debug.assert(context.enclosingDeclaration);
-          let existingFakeScope;
-          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration;
-          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration.parent;
-          }
-          Debug.assertOptionalNode(existingFakeScope, isBlock);
-          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-          let newLocals;
-          addAll((name, symbol) => {
-            if (!locals.has(name)) {
-              newLocals = append(newLocals, name);
-              locals.set(name, symbol);
-            }
-          });
-          if (!newLocals)
-            return;
-          const oldCleanup = cleanup;
-          function undo() {
-            forEach(newLocals, (s) => locals.delete(s));
-            oldCleanup == null ? void 0 : oldCleanup();
-          }
-          if (existingFakeScope) {
-            cleanup = undo;
-          } else {
-            const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
-            fakeScope.locals = locals;
-            const saveEnclosingDeclaration = context.enclosingDeclaration;
-            setParent(fakeScope, saveEnclosingDeclaration);
-            context.enclosingDeclaration = fakeScope;
-            cleanup = () => {
-              context.enclosingDeclaration = saveEnclosingDeclaration;
-              undo();
-            };
-          }
-        };
-        var pushFakeScope = pushFakeScope2;
-        pushFakeScope2(
-          "params",
-          (add) => {
-            for (const param of expandedParams) {
-              add(param.escapedName, param);
-            }
-          }
-        );
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
-          pushFakeScope2(
-            "typeParams",
-            (add) => {
-              for (const typeParam of signature.typeParameters ?? emptyArray) {
-                const typeParamName = typeParameterToName(typeParam, context).escapedText;
-                add(typeParamName, typeParam.symbol);
-              }
-            }
-          );
-        }
-      }
+      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters);
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */));
       const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
       if (thisParameter) {
@@ -49220,6 +49202,111 @@ function createTypeChecker(host) {
       cleanup == null ? void 0 : cleanup();
       return node;
     }
+    function isNewScopeNode(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) || isMappedTypeNode(node);
+    }
+    function getTypeParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getSignatureFromDeclaration(node).typeParameters : isConditionalTypeNode(node) ? getInferTypeParameters(node) : [getDeclaredTypeOfTypeParameter(getSymbolOfDeclaration(node.typeParameter))];
+    }
+    function getParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getExpandedParameters(
+        getSignatureFromDeclaration(node),
+        /*skipUnionExpanding*/
+        true
+      )[0] : void 0;
+    }
+    function enterNewScope(context, declaration, expandedParams, typeParameters) {
+      let cleanup;
+      if (context.enclosingDeclaration && declaration && declaration !== context.enclosingDeclaration && !isInJSFile(declaration) && (some(expandedParams) || some(typeParameters))) {
+        let pushFakeScope2 = function(kind, addAll) {
+          Debug.assert(context.enclosingDeclaration);
+          let existingFakeScope;
+          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration;
+          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration.parent;
+          }
+          Debug.assertOptionalNode(existingFakeScope, isBlock);
+          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
+          let newLocals;
+          addAll((name, symbol) => {
+            if (!locals.has(name)) {
+              newLocals = append(newLocals, name);
+              locals.set(name, symbol);
+            }
+          });
+          if (!newLocals)
+            return;
+          const oldCleanup = cleanup;
+          function undo() {
+            forEach(newLocals, (s) => locals.delete(s));
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
+          if (existingFakeScope) {
+            cleanup = undo;
+          } else {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            cleanup = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              undo();
+            };
+          }
+        };
+        var pushFakeScope = pushFakeScope2;
+        pushFakeScope2(
+          "params",
+          (add) => {
+            for (const param of expandedParams ?? emptyArray) {
+              if (!forEach(param.declarations, (d) => {
+                if (isParameter(d) && isBindingPattern(d.name)) {
+                  bindPattern(d.name);
+                  return true;
+                }
+                return void 0;
+                function bindPattern(p) {
+                  forEach(p.elements, (e) => {
+                    switch (e.kind) {
+                      case 232 /* OmittedExpression */:
+                        return;
+                      case 208 /* BindingElement */:
+                        return bindElement(e);
+                      default:
+                        return Debug.assertNever(e);
+                    }
+                  });
+                }
+                function bindElement(e) {
+                  if (isBindingPattern(e.name)) {
+                    return bindPattern(e.name);
+                  }
+                  const symbol = getSymbolOfDeclaration(e);
+                  add(symbol.escapedName, symbol);
+                }
+              })) {
+                add(param.escapedName, param);
+              }
+            }
+          }
+        );
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+          pushFakeScope2(
+            "typeParams",
+            (add) => {
+              for (const typeParam of typeParameters ?? emptyArray) {
+                const typeParamName = typeParameterToName(typeParam, context).escapedText;
+                add(typeParamName, typeParam.symbol);
+              }
+            }
+          );
+        }
+        return cleanup;
+      }
+    }
     function tryGetThisParameterDeclaration(signature, context) {
       if (signature.thisParameter) {
         return symbolToParameterDeclaration(signature.thisParameter, context);
@@ -49838,6 +49925,9 @@ function createTypeChecker(host) {
       if (initial.typeParameterSymbolList) {
         initial.typeParameterSymbolList = new Set(initial.typeParameterSymbolList);
       }
+      if (initial.typeParameterNamesByTextNextNameCount) {
+        initial.typeParameterNamesByTextNextNameCount = new Map(initial.typeParameterNamesByTextNextNameCount);
+      }
       initial.tracker = new SymbolTrackerImpl(initial, initial.tracker.inner, initial.tracker.moduleResolverHost);
       return initial;
     }
@@ -49845,7 +49935,16 @@ function createTypeChecker(host) {
       return symbol.declarations && find(symbol.declarations, (s) => !!getNonlocalEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, (n) => n === enclosingDeclaration)));
     }
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
-      return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
+      if (!(getObjectFlags(type) & 4 /* Reference */))
+        return true;
+      if (!isTypeReferenceNode(existing))
+        return true;
+      void getTypeFromTypeReference(existing);
+      const symbol = getNodeLinks(existing).resolvedSymbol;
+      const existingTarget = symbol && getDeclaredTypeOfSymbol(symbol);
+      if (!existingTarget || existingTarget !== type.target)
+        return true;
+      return length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
       while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
@@ -49970,6 +50069,22 @@ function createTypeChecker(host) {
       }
       return transformed === existing ? setTextRange(factory.cloneNode(existing), existing) : transformed;
       function visitExistingNodeTreeSymbols(node) {
+        const onExitNewScope = isNewScopeNode(node) ? onEnterNewScope(node) : void 0;
+        const result = visitExistingNodeTreeSymbolsWorker(node);
+        onExitNewScope == null ? void 0 : onExitNewScope();
+        return result;
+      }
+      function onEnterNewScope(node) {
+        const oldContex = context;
+        context = cloneNodeBuilderContext(context);
+        const cleanup = enterNewScope(context, node, getParametersInScope(node), getTypeParametersInScope(node));
+        return onExitNewScope;
+        function onExitNewScope() {
+          cleanup == null ? void 0 : cleanup();
+          context = oldContex;
+        }
+      }
+      function visitExistingNodeTreeSymbolsWorker(node) {
         if (isJSDocAllType(node) || node.kind === 319 /* JSDocNamepathType */) {
           return factory.createKeywordTypeNode(133 /* AnyKeyword */);
         }
@@ -50120,6 +50235,21 @@ function createTypeChecker(host) {
           setEmitFlags(clone, flags | (context.flags & 1024 /* MultilineObjectLiterals */ && isTypeLiteralNode(node) ? 0 : 1 /* SingleLine */));
           return clone;
         }
+        if (isConditionalTypeNode(node)) {
+          const checkType = visitNode(node.checkType, visitExistingNodeTreeSymbols, isTypeNode);
+          const disposeScope = onEnterNewScope(node);
+          const extendType = visitNode(node.extendsType, visitExistingNodeTreeSymbols, isTypeNode);
+          const trueType2 = visitNode(node.trueType, visitExistingNodeTreeSymbols, isTypeNode);
+          disposeScope();
+          const falseType2 = visitNode(node.falseType, visitExistingNodeTreeSymbols, isTypeNode);
+          return factory.updateConditionalTypeNode(
+            node,
+            checkType,
+            extendType,
+            trueType2,
+            falseType2
+          );
+        }
         return visitEachChild(
           node,
           visitExistingNodeTreeSymbols,
@@ -63335,6 +63465,9 @@ function createTypeChecker(host) {
       const resolved = resolveStructuredTypeMembers(type);
       return resolved.callSignatures.length === 0 && resolved.constructSignatures.length === 0 && resolved.indexInfos.length === 0 && resolved.properties.length > 0 && every(resolved.properties, (p) => !!(p.flags & 16777216 /* Optional */));
     }
+    if (type.flags & 33554432 /* Substitution */) {
+      return isWeakType(type.baseType);
+    }
     if (type.flags & 2097152 /* Intersection */) {
       return every(type.types, isWeakType);
     }
@@ -70303,7 +70436,11 @@ function createTypeChecker(host) {
       if (getPropertyOfObjectType(targetType, name) || getApplicableIndexInfoForName(targetType, name) || isLateBoundName(name) && getIndexInfoOfType(targetType, stringType) || isComparingJsxAttributes && isHyphenatedJsxName(name)) {
         return true;
       }
-    } else if (targetType.flags & 3145728 /* UnionOrIntersection */ && isExcessPropertyCheckTarget(targetType)) {
+    }
+    if (targetType.flags & 33554432 /* Substitution */) {
+      return isKnownProperty(targetType.baseType, name, isComparingJsxAttributes);
+    }
+    if (targetType.flags & 3145728 /* UnionOrIntersection */ && isExcessPropertyCheckTarget(targetType)) {
       for (const t of targetType.types) {
         if (isKnownProperty(t, name, isComparingJsxAttributes)) {
           return true;
@@ -70313,7 +70450,7 @@ function createTypeChecker(host) {
     return false;
   }
   function isExcessPropertyCheckTarget(type) {
-    return !!(type.flags & 524288 /* Object */ && !(getObjectFlags(type) & 512 /* ObjectLiteralPatternWithComputedProperties */) || type.flags & 67108864 /* NonPrimitive */ || type.flags & 1048576 /* Union */ && some(type.types, isExcessPropertyCheckTarget) || type.flags & 2097152 /* Intersection */ && every(type.types, isExcessPropertyCheckTarget));
+    return !!(type.flags & 524288 /* Object */ && !(getObjectFlags(type) & 512 /* ObjectLiteralPatternWithComputedProperties */) || type.flags & 67108864 /* NonPrimitive */ || type.flags & 33554432 /* Substitution */ && isExcessPropertyCheckTarget(type.baseType) || type.flags & 1048576 /* Union */ && some(type.types, isExcessPropertyCheckTarget) || type.flags & 2097152 /* Intersection */ && every(type.types, isExcessPropertyCheckTarget));
   }
   function checkJsxExpression(node, checkMode) {
     checkGrammarJsxExpression(node);
@@ -74454,17 +74591,18 @@ function createTypeChecker(host) {
     const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || { flags: 2 /* Start */ };
     const trueCondition = {
       flags: 32 /* TrueCondition */,
-      node: expr,
-      antecedent
+      antecedent,
+      node: expr
     };
     const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
     if (trueType2 === initType)
       return void 0;
     const falseCondition = {
-      ...trueCondition,
-      flags: 64 /* FalseCondition */
+      flags: 64 /* FalseCondition */,
+      antecedent,
+      node: expr
     };
-    const falseSubtype = getFlowTypeOfReference(param.name, trueType2, trueType2, func, falseCondition);
+    const falseSubtype = getFlowTypeOfReference(param.name, initType, trueType2, func, falseCondition);
     return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
   }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {

package/lib/typescript.d.ts

@@ -5793,61 +5793,6 @@ declare namespace ts {
         readonly moduleSpecifier: Expression;
         readonly attributes?: ImportAttributes;
     }
-    enum FlowFlags {
-        Unreachable = 1,
-        Start = 2,
-        BranchLabel = 4,
-        LoopLabel = 8,
-        Assignment = 16,
-        TrueCondition = 32,
-        FalseCondition = 64,
-        SwitchClause = 128,
-        ArrayMutation = 256,
-        Call = 512,
-        ReduceLabel = 1024,
-        Referenced = 2048,
-        Shared = 4096,
-        Label = 12,
-        Condition = 96,
-    }
-    type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel;
-    interface FlowNodeBase {
-        flags: FlowFlags;
-        id?: number;
-    }
-    interface FlowStart extends FlowNodeBase {
-        node?: FunctionExpression | ArrowFunction | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration;
-    }
-    interface FlowLabel extends FlowNodeBase {
-        antecedents: FlowNode[] | undefined;
-    }
-    interface FlowAssignment extends FlowNodeBase {
-        node: Expression | VariableDeclaration | BindingElement;
-        antecedent: FlowNode;
-    }
-    interface FlowCall extends FlowNodeBase {
-        node: CallExpression;
-        antecedent: FlowNode;
-    }
-    interface FlowCondition extends FlowNodeBase {
-        node: Expression;
-        antecedent: FlowNode;
-    }
-    interface FlowSwitchClause extends FlowNodeBase {
-        switchStatement: SwitchStatement;
-        clauseStart: number;
-        clauseEnd: number;
-        antecedent: FlowNode;
-    }
-    interface FlowArrayMutation extends FlowNodeBase {
-        node: CallExpression | BinaryExpression;
-        antecedent: FlowNode;
-    }
-    interface FlowReduceLabel extends FlowNodeBase {
-        target: FlowLabel;
-        antecedents: FlowNode[];
-        antecedent: FlowNode;
-    }
     type FlowType = Type | IncompleteType;
     interface IncompleteType {
         flags: TypeFlags | 0;

package/lib/typescript.js

@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240401`;
+var version = `${versionMajorMinor}.0-dev.20240404`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10711,6 +10711,9 @@ var Diagnostics = {
   There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_need_configuration_update: diag(6279, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_moduleResolution_bundler_to_see_if_project_may_ne_6279", "Resolution of non-relative name failed; trying with '--moduleResolution bundler' to see if project may need configuration update."),
   There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setting_Consider_updating_to_node16_nodenext_or_bundler: diag(6280, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_under_your_current_moduleResolution_setti_6280", "There are types at '{0}', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'."),
+  package_json_has_a_peerDependencies_field: diag(6281, 3 /* Message */, "package_json_has_a_peerDependencies_field_6281", "'package.json' has a 'peerDependencies' field."),
+  Found_peerDependency_0_with_1_version: diag(6282, 3 /* Message */, "Found_peerDependency_0_with_1_version_6282", "Found peerDependency '{0}' with '{1}' version."),
+  Failed_to_find_peerDependency_0: diag(6283, 3 /* Message */, "Failed_to_find_peerDependency_0_6283", "Failed to find peerDependency '{0}'."),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -15332,13 +15335,13 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
   return result;
 }
 function packageIdIsEqual(a, b) {
-  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
+  return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version && a.peerDependencies === b.peerDependencies;
 }
 function packageIdToPackageName({ name, subModuleName }) {
   return subModuleName ? `${name}/${subModuleName}` : name;
 }
 function packageIdToString(packageId) {
-  return `${packageIdToPackageName(packageId)}@${packageId.version}`;
+  return `${packageIdToPackageName(packageId)}@${packageId.version}${packageId.peerDependencies ?? ""}`;
 }
 function typeDirectiveIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
@@ -41463,7 +41466,7 @@ function trace(host, message, ...args) {
 function isTraceEnabled(compilerOptions, host) {
   return !!compilerOptions.traceResolution && host.trace !== void 0;
 }
-function withPackageId(packageInfo, r) {
+function withPackageId(packageInfo, r, state) {
   let packageId;
   if (r && packageInfo) {
     const packageJsonContent = packageInfo.contents.packageJsonContent;
@@ -41471,7 +41474,8 @@ function withPackageId(packageInfo, r) {
       packageId = {
         name: packageJsonContent.name,
         subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
-        version: packageJsonContent.version
+        version: packageJsonContent.version,
+        peerDependencies: getPeerDependenciesOfPackageJsonInfo(packageInfo, state)
       };
     }
   }
@@ -41481,7 +41485,9 @@ function noPackageId(r) {
   return withPackageId(
     /*packageInfo*/
     void 0,
-    r
+    r,
+    /*state*/
+    void 0
   );
 }
 function removeIgnoredPackageId(r) {
@@ -41859,7 +41865,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
               false,
               moduleResolutionState
             ) : void 0;
-            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
+            return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile, moduleResolutionState));
           }
         }
         return resolvedTypeScriptOnly(
@@ -42833,7 +42839,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
         false,
         state
       ) : void 0;
-      return withPackageId(packageInfo, resolvedFromFile);
+      return withPackageId(packageInfo, resolvedFromFile, state);
     }
   }
   if (!onlyRecordFailures) {
@@ -42976,7 +42982,7 @@ function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures,
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
   const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
   const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
 }
 function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
   if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== void 0) {
@@ -43132,6 +43138,42 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   }
   return packageJsonInfo.contents.versionPaths || void 0;
 }
+function getPeerDependenciesOfPackageJsonInfo(packageJsonInfo, state) {
+  if (packageJsonInfo.contents.peerDependencies === void 0) {
+    packageJsonInfo.contents.peerDependencies = readPackageJsonPeerDependencies(packageJsonInfo, state) || false;
+  }
+  return packageJsonInfo.contents.peerDependencies || void 0;
+}
+function readPackageJsonPeerDependencies(packageJsonInfo, state) {
+  const peerDependencies = readPackageJsonField(packageJsonInfo.contents.packageJsonContent, "peerDependencies", "object", state);
+  if (peerDependencies === void 0)
+    return void 0;
+  if (state.traceEnabled)
+    trace(state.host, Diagnostics.package_json_has_a_peerDependencies_field);
+  const packageDirectory = realPath(packageJsonInfo.packageDirectory, state.host, state.traceEnabled);
+  const nodeModules = packageDirectory.substring(0, packageDirectory.lastIndexOf("node_modules") + "node_modules".length) + directorySeparator;
+  let result = "";
+  for (const key in peerDependencies) {
+    if (hasProperty(peerDependencies, key)) {
+      const peerPackageJson = getPackageJsonInfo(
+        nodeModules + key,
+        /*onlyRecordFailures*/
+        false,
+        state
+      );
+      if (peerPackageJson) {
+        const version2 = peerPackageJson.contents.packageJsonContent.version;
+        result += `+${key}@${version2}`;
+        if (state.traceEnabled)
+          trace(state.host, Diagnostics.Found_peerDependency_0_with_1_version, key, version2);
+      } else {
+        if (state.traceEnabled)
+          trace(state.host, Diagnostics.Failed_to_find_peerDependency_0, key);
+      }
+    }
+  }
+  return result;
+}
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
   var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
@@ -43160,7 +43202,7 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     if (traceEnabled) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
-    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
+    const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0, peerDependencies: void 0 } };
     if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
       state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
     (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
@@ -43558,7 +43600,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         /*onlyRecordFailures*/
         false,
         state
-      )));
+      ), state));
     } else if (typeof target === "object" && target !== null) {
       if (!Array.isArray(target)) {
         traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
@@ -43672,7 +43714,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                         /*onlyRecordFailures*/
                         false,
                         state
-                      )));
+                      ), state));
                     }
                   }
                 }
@@ -43803,7 +43845,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       packageInfo.contents.packageJsonContent,
       getVersionPathsOfPackageJsonInfo(packageInfo, state)
     );
-    return withPackageId(packageInfo, fromDirectory);
+    return withPackageId(packageInfo, fromDirectory, state);
   }
   const loader = (extensions2, candidate2, onlyRecordFailures, state2) => {
     let pathAndExtension = (rest || !(state2.features & 32 /* EsmMode */)) && loadModuleFromFile(extensions2, candidate2, onlyRecordFailures, state2) || loadNodeModuleFromDirectoryWorker(
@@ -43817,7 +43859,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
     }
-    return withPackageId(packageInfo, pathAndExtension);
+    return withPackageId(packageInfo, pathAndExtension, state2);
   };
   if (rest !== "") {
     packageInfo = rootPackageInfo ?? getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
@@ -44024,7 +44066,7 @@ function resolveFromTypeRoot(moduleName, state) {
         false,
         state
       ) : void 0;
-      return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
+      return toSearchResult(withPackageId(packageInfo, resolvedFromFile, state));
     }
     const resolved = loadNodeModuleFromDirectory(4 /* Declaration */, candidate, !directoryExists, state);
     if (resolved)
@@ -48265,6 +48307,7 @@ function createTypeChecker(host) {
     isArgumentsSymbol: (symbol) => symbol === argumentsSymbol,
     isUnknownSymbol: (symbol) => symbol === unknownSymbol,
     getMergedSymbol,
+    symbolIsValue,
     getDiagnostics: getDiagnostics2,
     getGlobalDiagnostics,
     getRecursionIdentity,
@@ -53833,68 +53876,7 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
-      let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && (some(expandedParams) || some(signature.typeParameters))) {
-        let pushFakeScope2 = function(kind2, addAll) {
-          Debug.assert(context.enclosingDeclaration);
-          let existingFakeScope;
-          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration;
-          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration.parent;
-          }
-          Debug.assertOptionalNode(existingFakeScope, isBlock);
-          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-          let newLocals;
-          addAll((name, symbol) => {
-            if (!locals.has(name)) {
-              newLocals = append(newLocals, name);
-              locals.set(name, symbol);
-            }
-          });
-          if (!newLocals)
-            return;
-          const oldCleanup = cleanup;
-          function undo() {
-            forEach(newLocals, (s) => locals.delete(s));
-            oldCleanup == null ? void 0 : oldCleanup();
-          }
-          if (existingFakeScope) {
-            cleanup = undo;
-          } else {
-            const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
-            fakeScope.locals = locals;
-            const saveEnclosingDeclaration = context.enclosingDeclaration;
-            setParent(fakeScope, saveEnclosingDeclaration);
-            context.enclosingDeclaration = fakeScope;
-            cleanup = () => {
-              context.enclosingDeclaration = saveEnclosingDeclaration;
-              undo();
-            };
-          }
-        };
-        var pushFakeScope = pushFakeScope2;
-        pushFakeScope2(
-          "params",
-          (add) => {
-            for (const param of expandedParams) {
-              add(param.escapedName, param);
-            }
-          }
-        );
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
-          pushFakeScope2(
-            "typeParams",
-            (add) => {
-              for (const typeParam of signature.typeParameters ?? emptyArray) {
-                const typeParamName = typeParameterToName(typeParam, context).escapedText;
-                add(typeParamName, typeParam.symbol);
-              }
-            }
-          );
-        }
-      }
+      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters);
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */));
       const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
       if (thisParameter) {
@@ -53985,6 +53967,111 @@ function createTypeChecker(host) {
       cleanup == null ? void 0 : cleanup();
       return node;
     }
+    function isNewScopeNode(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) || isMappedTypeNode(node);
+    }
+    function getTypeParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getSignatureFromDeclaration(node).typeParameters : isConditionalTypeNode(node) ? getInferTypeParameters(node) : [getDeclaredTypeOfTypeParameter(getSymbolOfDeclaration(node.typeParameter))];
+    }
+    function getParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getExpandedParameters(
+        getSignatureFromDeclaration(node),
+        /*skipUnionExpanding*/
+        true
+      )[0] : void 0;
+    }
+    function enterNewScope(context, declaration, expandedParams, typeParameters) {
+      let cleanup;
+      if (context.enclosingDeclaration && declaration && declaration !== context.enclosingDeclaration && !isInJSFile(declaration) && (some(expandedParams) || some(typeParameters))) {
+        let pushFakeScope2 = function(kind, addAll) {
+          Debug.assert(context.enclosingDeclaration);
+          let existingFakeScope;
+          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration;
+          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration.parent;
+          }
+          Debug.assertOptionalNode(existingFakeScope, isBlock);
+          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
+          let newLocals;
+          addAll((name, symbol) => {
+            if (!locals.has(name)) {
+              newLocals = append(newLocals, name);
+              locals.set(name, symbol);
+            }
+          });
+          if (!newLocals)
+            return;
+          const oldCleanup = cleanup;
+          function undo() {
+            forEach(newLocals, (s) => locals.delete(s));
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
+          if (existingFakeScope) {
+            cleanup = undo;
+          } else {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            cleanup = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              undo();
+            };
+          }
+        };
+        var pushFakeScope = pushFakeScope2;
+        pushFakeScope2(
+          "params",
+          (add) => {
+            for (const param of expandedParams ?? emptyArray) {
+              if (!forEach(param.declarations, (d) => {
+                if (isParameter(d) && isBindingPattern(d.name)) {
+                  bindPattern(d.name);
+                  return true;
+                }
+                return void 0;
+                function bindPattern(p) {
+                  forEach(p.elements, (e) => {
+                    switch (e.kind) {
+                      case 232 /* OmittedExpression */:
+                        return;
+                      case 208 /* BindingElement */:
+                        return bindElement(e);
+                      default:
+                        return Debug.assertNever(e);
+                    }
+                  });
+                }
+                function bindElement(e) {
+                  if (isBindingPattern(e.name)) {
+                    return bindPattern(e.name);
+                  }
+                  const symbol = getSymbolOfDeclaration(e);
+                  add(symbol.escapedName, symbol);
+                }
+              })) {
+                add(param.escapedName, param);
+              }
+            }
+          }
+        );
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+          pushFakeScope2(
+            "typeParams",
+            (add) => {
+              for (const typeParam of typeParameters ?? emptyArray) {
+                const typeParamName = typeParameterToName(typeParam, context).escapedText;
+                add(typeParamName, typeParam.symbol);
+              }
+            }
+          );
+        }
+        return cleanup;
+      }
+    }
     function tryGetThisParameterDeclaration(signature, context) {
       if (signature.thisParameter) {
         return symbolToParameterDeclaration(signature.thisParameter, context);
@@ -54603,6 +54690,9 @@ function createTypeChecker(host) {
       if (initial.typeParameterSymbolList) {
         initial.typeParameterSymbolList = new Set(initial.typeParameterSymbolList);
       }
+      if (initial.typeParameterNamesByTextNextNameCount) {
+        initial.typeParameterNamesByTextNextNameCount = new Map(initial.typeParameterNamesByTextNextNameCount);
+      }
       initial.tracker = new SymbolTrackerImpl(initial, initial.tracker.inner, initial.tracker.moduleResolverHost);
       return initial;
     }
@@ -54610,7 +54700,16 @@ function createTypeChecker(host) {
       return symbol.declarations && find(symbol.declarations, (s) => !!getNonlocalEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, (n) => n === enclosingDeclaration)));
     }
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
-      return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
+      if (!(getObjectFlags(type) & 4 /* Reference */))
+        return true;
+      if (!isTypeReferenceNode(existing))
+        return true;
+      void getTypeFromTypeReference(existing);
+      const symbol = getNodeLinks(existing).resolvedSymbol;
+      const existingTarget = symbol && getDeclaredTypeOfSymbol(symbol);
+      if (!existingTarget || existingTarget !== type.target)
+        return true;
+      return length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
       while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
@@ -54735,6 +54834,22 @@ function createTypeChecker(host) {
       }
       return transformed === existing ? setTextRange(factory.cloneNode(existing), existing) : transformed;
       function visitExistingNodeTreeSymbols(node) {
+        const onExitNewScope = isNewScopeNode(node) ? onEnterNewScope(node) : void 0;
+        const result = visitExistingNodeTreeSymbolsWorker(node);
+        onExitNewScope == null ? void 0 : onExitNewScope();
+        return result;
+      }
+      function onEnterNewScope(node) {
+        const oldContex = context;
+        context = cloneNodeBuilderContext(context);
+        const cleanup = enterNewScope(context, node, getParametersInScope(node), getTypeParametersInScope(node));
+        return onExitNewScope;
+        function onExitNewScope() {
+          cleanup == null ? void 0 : cleanup();
+          context = oldContex;
+        }
+      }
+      function visitExistingNodeTreeSymbolsWorker(node) {
         if (isJSDocAllType(node) || node.kind === 319 /* JSDocNamepathType */) {
           return factory.createKeywordTypeNode(133 /* AnyKeyword */);
         }
@@ -54885,6 +55000,21 @@ function createTypeChecker(host) {
           setEmitFlags(clone2, flags | (context.flags & 1024 /* MultilineObjectLiterals */ && isTypeLiteralNode(node) ? 0 : 1 /* SingleLine */));
           return clone2;
         }
+        if (isConditionalTypeNode(node)) {
+          const checkType = visitNode(node.checkType, visitExistingNodeTreeSymbols, isTypeNode);
+          const disposeScope = onEnterNewScope(node);
+          const extendType = visitNode(node.extendsType, visitExistingNodeTreeSymbols, isTypeNode);
+          const trueType2 = visitNode(node.trueType, visitExistingNodeTreeSymbols, isTypeNode);
+          disposeScope();
+          const falseType2 = visitNode(node.falseType, visitExistingNodeTreeSymbols, isTypeNode);
+          return factory.updateConditionalTypeNode(
+            node,
+            checkType,
+            extendType,
+            trueType2,
+            falseType2
+          );
+        }
         return visitEachChild(
           node,
           visitExistingNodeTreeSymbols,
@@ -68100,6 +68230,9 @@ function createTypeChecker(host) {
       const resolved = resolveStructuredTypeMembers(type);
       return resolved.callSignatures.length === 0 && resolved.constructSignatures.length === 0 && resolved.indexInfos.length === 0 && resolved.properties.length > 0 && every(resolved.properties, (p) => !!(p.flags & 16777216 /* Optional */));
     }
+    if (type.flags & 33554432 /* Substitution */) {
+      return isWeakType(type.baseType);
+    }
     if (type.flags & 2097152 /* Intersection */) {
       return every(type.types, isWeakType);
     }
@@ -75068,7 +75201,11 @@ function createTypeChecker(host) {
       if (getPropertyOfObjectType(targetType, name) || getApplicableIndexInfoForName(targetType, name) || isLateBoundName(name) && getIndexInfoOfType(targetType, stringType) || isComparingJsxAttributes && isHyphenatedJsxName(name)) {
         return true;
       }
-    } else if (targetType.flags & 3145728 /* UnionOrIntersection */ && isExcessPropertyCheckTarget(targetType)) {
+    }
+    if (targetType.flags & 33554432 /* Substitution */) {
+      return isKnownProperty(targetType.baseType, name, isComparingJsxAttributes);
+    }
+    if (targetType.flags & 3145728 /* UnionOrIntersection */ && isExcessPropertyCheckTarget(targetType)) {
       for (const t of targetType.types) {
         if (isKnownProperty(t, name, isComparingJsxAttributes)) {
           return true;
@@ -75078,7 +75215,7 @@ function createTypeChecker(host) {
     return false;
   }
   function isExcessPropertyCheckTarget(type) {
-    return !!(type.flags & 524288 /* Object */ && !(getObjectFlags(type) & 512 /* ObjectLiteralPatternWithComputedProperties */) || type.flags & 67108864 /* NonPrimitive */ || type.flags & 1048576 /* Union */ && some(type.types, isExcessPropertyCheckTarget) || type.flags & 2097152 /* Intersection */ && every(type.types, isExcessPropertyCheckTarget));
+    return !!(type.flags & 524288 /* Object */ && !(getObjectFlags(type) & 512 /* ObjectLiteralPatternWithComputedProperties */) || type.flags & 67108864 /* NonPrimitive */ || type.flags & 33554432 /* Substitution */ && isExcessPropertyCheckTarget(type.baseType) || type.flags & 1048576 /* Union */ && some(type.types, isExcessPropertyCheckTarget) || type.flags & 2097152 /* Intersection */ && every(type.types, isExcessPropertyCheckTarget));
   }
   function checkJsxExpression(node, checkMode) {
     checkGrammarJsxExpression(node);
@@ -79219,17 +79356,18 @@ function createTypeChecker(host) {
     const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || { flags: 2 /* Start */ };
     const trueCondition = {
       flags: 32 /* TrueCondition */,
-      node: expr,
-      antecedent
+      antecedent,
+      node: expr
     };
     const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
     if (trueType2 === initType)
       return void 0;
     const falseCondition = {
-      ...trueCondition,
-      flags: 64 /* FalseCondition */
+      flags: 64 /* FalseCondition */,
+      antecedent,
+      node: expr
     };
-    const falseSubtype = getFlowTypeOfReference(param.name, trueType2, trueType2, func, falseCondition);
+    const falseSubtype = getFlowTypeOfReference(param.name, initType, trueType2, func, falseCondition);
     return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
   }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
@@ -150133,7 +150271,8 @@ function canConvertImportDeclarationForSpecifier(specifier, sourceFile, program)
   const checker = program.getTypeChecker();
   for (const specifier2 of nonTypeOnlySpecifiers) {
     const isUsedAsValue = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(specifier2.name, checker, sourceFile, (usage) => {
-      return !isValidTypeOnlyAliasUseSite(usage);
+      const symbol = checker.getSymbolAtLocation(usage);
+      return !!symbol && checker.symbolIsValue(symbol) || !isValidTypeOnlyAliasUseSite(usage);
     });
     if (isUsedAsValue) {
       return false;
@@ -173518,7 +173657,8 @@ var SmartIndenter;
         return childKind !== 290 /* JsxClosingFragment */;
       case 193 /* IntersectionType */:
       case 192 /* UnionType */:
-        if (childKind === 187 /* TypeLiteral */ || childKind === 189 /* TupleType */) {
+      case 238 /* SatisfiesExpression */:
+        if (childKind === 187 /* TypeLiteral */ || childKind === 189 /* TupleType */ || childKind === 200 /* MappedType */) {
           return false;
         }
         break;

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240401",
+    "version": "5.5.0-dev.20240404",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -64,7 +64,6 @@
         "eslint-formatter-autolinkable-stylish": "^1.3.0",
         "eslint-plugin-local": "^4.2.1",
         "eslint-plugin-no-null": "^1.0.2",
-        "eslint-plugin-simple-import-sort": "^12.0.0",
         "fast-xml-parser": "^4.3.6",
         "glob": "^10.3.10",
         "hereby": "^1.8.9",
@@ -112,5 +111,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "32dfb3752f4645a627b4293f99a91fcf7da66c88"
+    "gitHead": "4a5f0f2b78d36afee184ec52419559a390cf17bd"
 }