typescript 5.4.0-dev.20231120 → 5.4.0-dev.20231122

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231120`;
+      version = `${versionMajorMinor}.0-dev.20231122`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4437,7 +4437,7 @@ ${lanes.join("\n")}
         TypeFlags2[TypeFlags2["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive";
         TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable";
         TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable";
-        TypeFlags2[TypeFlags2["ObjectFlagsType"] = 138117121] = "ObjectFlagsType";
+        TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType";
         TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable";
         TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton";
         TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable";
@@ -7264,6 +7264,10 @@ ${lanes.join("\n")}
         ESM_syntax_is_not_allowed_in_a_CommonJS_module_when_verbatimModuleSyntax_is_enabled: diag(1286, 1 /* Error */, "ESM_syntax_is_not_allowed_in_a_CommonJS_module_when_verbatimModuleSyntax_is_enabled_1286", "ESM syntax is not allowed in a CommonJS module when 'verbatimModuleSyntax' is enabled."),
         A_top_level_export_modifier_cannot_be_used_on_value_declarations_in_a_CommonJS_module_when_verbatimModuleSyntax_is_enabled: diag(1287, 1 /* Error */, "A_top_level_export_modifier_cannot_be_used_on_value_declarations_in_a_CommonJS_module_when_verbatimM_1287", "A top-level 'export' modifier cannot be used on value declarations in a CommonJS module when 'verbatimModuleSyntax' is enabled."),
         An_import_alias_cannot_resolve_to_a_type_or_type_only_declaration_when_verbatimModuleSyntax_is_enabled: diag(1288, 1 /* Error */, "An_import_alias_cannot_resolve_to_a_type_or_type_only_declaration_when_verbatimModuleSyntax_is_enabl_1288", "An import alias cannot resolve to a type or type-only declaration when 'verbatimModuleSyntax' is enabled."),
+        _0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_import_type_where_0_is_imported: diag(1289, 1 /* Error */, "_0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_1289", "'{0}' resolves to a type-only declaration and must be marked type-only in this file before re-exporting when '{1}' is enabled. Consider using 'import type' where '{0}' is imported."),
+        _0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_export_type_0_as_default: diag(1290, 1 /* Error */, "_0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_1290", "'{0}' resolves to a type-only declaration and must be marked type-only in this file before re-exporting when '{1}' is enabled. Consider using 'export type { {0} as default }'."),
+        _0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_import_type_where_0_is_imported: diag(1291, 1 /* Error */, "_0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enable_1291", "'{0}' resolves to a type and must be marked type-only in this file before re-exporting when '{1}' is enabled. Consider using 'import type' where '{0}' is imported."),
+        _0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_export_type_0_as_default: diag(1292, 1 /* Error */, "_0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enable_1292", "'{0}' resolves to a type and must be marked type-only in this file before re-exporting when '{1}' is enabled. Consider using 'export type { {0} as default }'."),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, 1 /* Error */, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, 1 /* Error */, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
         The_current_file_is_a_CommonJS_module_and_cannot_use_await_at_the_top_level: diag(1309, 1 /* Error */, "The_current_file_is_a_CommonJS_module_and_cannot_use_await_at_the_top_level_1309", "The current file is a CommonJS module and cannot use 'await' at the top level."),
@@ -17355,7 +17359,7 @@ ${lanes.join("\n")}
     return (_a = symbol.declarations) == null ? void 0 : _a.find(isClassLike);
   }
   function getObjectFlags(type) {
-    return type.flags & 138117121 /* ObjectFlagsType */ ? type.objectFlags : 0;
+    return type.flags & 3899393 /* ObjectFlagsType */ ? type.objectFlags : 0;
   }
   function forSomeAncestorDirectory(directory, callback) {
     return !!forEachAncestorDirectory(directory, (d) => callback(d) ? true : void 0);
@@ -20156,7 +20160,7 @@ ${lanes.join("\n")}
     nodeFactoryPatchers.push(fn);
   }
   function createNodeFactory(flags, baseFactory2) {
-    const update = flags & 8 /* NoOriginalNode */ ? updateWithoutOriginal : updateWithOriginal;
+    const setOriginal = flags & 8 /* NoOriginalNode */ ? identity : setOriginalNode;
     const parenthesizerRules = memoize(() => flags & 1 /* NoParenthesizerRules */ ? nullParenthesizerRules : createParenthesizerRules(factory2));
     const converters = memoize(() => flags & 2 /* NoNodeConverters */ ? nullNodeConverters : createNodeConverters(factory2));
     const getBinaryCreateFunction = memoizeOne((operator) => (left, right) => createBinaryExpression(left, operator, right));
@@ -23654,7 +23658,7 @@ ${lanes.join("\n")}
     }
     function cloneSourceFile(source) {
       const node = source.redirectInfo ? cloneRedirectedSourceFile(source) : cloneSourceFileWorker(source);
-      setOriginalNode(node, source);
+      setOriginal(node, source);
       return node;
     }
     function cloneSourceFileWithChanges(source, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) {
@@ -23787,7 +23791,7 @@ ${lanes.join("\n")}
       const clone2 = createBaseIdentifier(node.escapedText);
       clone2.flags |= node.flags & ~16 /* Synthesized */;
       clone2.transformFlags = node.transformFlags;
-      setOriginalNode(clone2, node);
+      setOriginal(clone2, node);
       setIdentifierAutoGenerate(clone2, { ...node.emitNode.autoGenerate });
       return clone2;
     }
@@ -23798,7 +23802,7 @@ ${lanes.join("\n")}
       clone2.flowNode = node.flowNode;
       clone2.symbol = node.symbol;
       clone2.transformFlags = node.transformFlags;
-      setOriginalNode(clone2, node);
+      setOriginal(clone2, node);
       const typeArguments = getIdentifierTypeArguments(node);
       if (typeArguments)
         setIdentifierTypeArguments(clone2, typeArguments);
@@ -23808,7 +23812,7 @@ ${lanes.join("\n")}
       const clone2 = createBasePrivateIdentifier(node.escapedText);
       clone2.flags |= node.flags & ~16 /* Synthesized */;
       clone2.transformFlags = node.transformFlags;
-      setOriginalNode(clone2, node);
+      setOriginal(clone2, node);
       setIdentifierAutoGenerate(clone2, { ...node.emitNode.autoGenerate });
       return clone2;
     }
@@ -23816,7 +23820,7 @@ ${lanes.join("\n")}
       const clone2 = createBasePrivateIdentifier(node.escapedText);
       clone2.flags |= node.flags & ~16 /* Synthesized */;
       clone2.transformFlags = node.transformFlags;
-      setOriginalNode(clone2, node);
+      setOriginal(clone2, node);
       return clone2;
     }
     function cloneNode(node) {
@@ -23841,7 +23845,7 @@ ${lanes.join("\n")}
       const clone2 = !isNodeKind(node.kind) ? baseFactory2.createBaseTokenNode(node.kind) : baseFactory2.createBaseNode(node.kind);
       clone2.flags |= node.flags & ~16 /* Synthesized */;
       clone2.transformFlags = node.transformFlags;
-      setOriginalNode(clone2, node);
+      setOriginal(clone2, node);
       for (const key in node) {
         if (hasProperty(clone2, key) || !hasProperty(node, key)) {
           continue;
@@ -24366,7 +24370,7 @@ ${lanes.join("\n")}
       return typeof value === "number" ? createToken(value) : value;
     }
     function asEmbeddedStatement(statement) {
-      return statement && isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+      return statement && isNotEmittedStatement(statement) ? setTextRange(setOriginal(createEmptyStatement(), statement), statement) : statement;
     }
     function asVariableDeclaration(variableDeclaration) {
       if (typeof variableDeclaration === "string" || variableDeclaration && !isVariableDeclaration(variableDeclaration)) {
@@ -24382,19 +24386,13 @@ ${lanes.join("\n")}
       }
       return variableDeclaration;
     }
-  }
-  function updateWithoutOriginal(updated, original) {
-    if (updated !== original) {
-      setTextRange(updated, original);
-    }
-    return updated;
-  }
-  function updateWithOriginal(updated, original) {
-    if (updated !== original) {
-      setOriginalNode(updated, original);
-      setTextRange(updated, original);
+    function update(updated, original) {
+      if (updated !== original) {
+        setOriginal(updated, original);
+        setTextRange(updated, original);
+      }
+      return updated;
     }
-    return updated;
   }
   function getDefaultTagNameForKind(kind) {
     switch (kind) {
@@ -29388,8 +29386,10 @@ ${lanes.join("\n")}
           setTextRangePosWidth(sourceFile, 0, sourceText.length);
           setFields(sourceFile);
           if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 67108864 /* ContainsPossibleTopLevelAwait */) {
+            const oldSourceFile = sourceFile;
             sourceFile = reparseTopLevelAwait(sourceFile);
-            setFields(sourceFile);
+            if (oldSourceFile !== sourceFile)
+              setFields(sourceFile);
           }
           return sourceFile;
           function setFields(sourceFile2) {
@@ -56687,7 +56687,12 @@ ${lanes.join("\n")}
           const checkType = type.checkType;
           const constraint = getLowerBoundOfKeyType(checkType);
           if (constraint !== checkType) {
-            return getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
+            return getConditionalTypeInstantiation(
+              type,
+              prependTypeMapping(type.root.checkType, constraint, type.mapper),
+              /*forConstraint*/
+              false
+            );
           }
         }
         return type;
@@ -57039,7 +57044,12 @@ ${lanes.join("\n")}
         );
         const constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
         if (constraint && constraint !== type.checkType) {
-          const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
+          const instantiated = getConditionalTypeInstantiation(
+            type,
+            prependTypeMapping(type.root.checkType, constraint, type.mapper),
+            /*forConstraint*/
+            true
+          );
           if (!(instantiated.flags & 131072 /* Never */)) {
             type.resolvedConstraintOfDistributive = instantiated;
             return instantiated;
@@ -59473,7 +59483,7 @@ ${lanes.join("\n")}
       }
     }
     function removeStringLiteralsMatchedByTemplateLiterals(types) {
-      const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t) && t.types.every((t2) => !(t2.flags & 2097152 /* Intersection */) || !areIntersectedTypesAvoidingPrimitiveReduction(t2.types)));
+      const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t));
       if (templates.length) {
         let i = types.length;
         while (i > 0) {
@@ -59873,19 +59883,14 @@ ${lanes.join("\n")}
     function getConstituentCountOfTypes(types) {
       return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0);
     }
-    function areIntersectedTypesAvoidingPrimitiveReduction(types, primitiveFlags = 4 /* String */ | 8 /* Number */ | 64 /* BigInt */) {
-      if (types.length !== 2) {
-        return false;
-      }
-      const [t1, t2] = types;
-      return !!(t1.flags & primitiveFlags) && t2 === emptyTypeLiteralType || !!(t2.flags & primitiveFlags) && t1 === emptyTypeLiteralType;
-    }
     function getTypeFromIntersectionTypeNode(node) {
       const links = getNodeLinks(node);
       if (!links.resolvedType) {
         const aliasSymbol = getAliasSymbolForTypeNode(node);
         const types = map(node.types, getTypeFromTypeNode);
-        const noSupertypeReduction = areIntersectedTypesAvoidingPrimitiveReduction(types);
+        const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1;
+        const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType;
+        const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t));
         links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
       }
       return links.resolvedType;
@@ -59912,19 +59917,17 @@ ${lanes.join("\n")}
         return constraintType;
       }
       const keyTypes = [];
-      if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
-        if (!isGenericIndexType(constraintType)) {
-          const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
-          forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, 8576 /* StringOrNumberLiteralOrUnique */, !!(indexFlags & 1 /* StringsOnly */), addMemberForKeyType);
-        } else {
+      if (isGenericIndexType(constraintType)) {
+        if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
           return getIndexTypeForGenericType(type, indexFlags);
         }
+        forEachType(constraintType, addMemberForKeyType);
+      } else if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
+        const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
+        forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, 8576 /* StringOrNumberLiteralOrUnique */, !!(indexFlags & 1 /* StringsOnly */), addMemberForKeyType);
       } else {
         forEachType(getLowerBoundOfKeyType(constraintType), addMemberForKeyType);
       }
-      if (isGenericIndexType(constraintType)) {
-        forEachType(constraintType, addMemberForKeyType);
-      }
       const result = indexFlags & 2 /* NoIndexSignatures */ ? filterType(getUnionType(keyTypes), (t) => !(t.flags & (1 /* Any */ | 4 /* String */))) : getUnionType(keyTypes);
       if (result.flags & 1048576 /* Union */ && constraintType.flags & 1048576 /* Union */ && getTypeListId(result.types) === getTypeListId(constraintType.types)) {
         return constraintType;
@@ -60097,11 +60100,6 @@ ${lanes.join("\n")}
     }
     function createTemplateLiteralType(texts, types) {
       const type = createType(134217728 /* TemplateLiteral */);
-      type.objectFlags = getPropagatingFlagsOfTypes(
-        types,
-        /*excludeKinds*/
-        98304 /* Nullable */
-      );
       type.texts = texts;
       type.types = types;
       return type;
@@ -60396,7 +60394,15 @@ ${lanes.join("\n")}
     }
     function isPatternLiteralPlaceholderType(type) {
       if (type.flags & 2097152 /* Intersection */) {
-        return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t));
+        let seenPlaceholder = false;
+        for (const t of type.types) {
+          if (t.flags & (2944 /* Literal */ | 98304 /* Nullable */) || isPatternLiteralPlaceholderType(t)) {
+            seenPlaceholder = true;
+          } else if (!(t.flags & 524288 /* Object */)) {
+            return false;
+          }
+        }
+        return seenPlaceholder;
       }
       return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type);
     }
@@ -60413,7 +60419,7 @@ ${lanes.join("\n")}
       return !!(getGenericObjectFlags(type) & 8388608 /* IsGenericIndexType */);
     }
     function getGenericObjectFlags(type) {
-      if (type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */)) {
+      if (type.flags & 3145728 /* UnionOrIntersection */) {
         if (!(type.objectFlags & 2097152 /* IsGenericTypeComputed */)) {
           type.objectFlags |= 2097152 /* IsGenericTypeComputed */ | reduceLeft(type.types, (flags, t) => flags | getGenericObjectFlags(t), 0);
         }
@@ -60425,7 +60431,7 @@ ${lanes.join("\n")}
         }
         return type.objectFlags & 12582912 /* IsGenericType */;
       }
-      return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0);
+      return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0);
     }
     function getSimplifiedType(type, writing) {
       return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type;
@@ -60606,7 +60612,7 @@ ${lanes.join("\n")}
     function isDeferredType(type, checkTuples) {
       return isGenericType(type) || checkTuples && isTupleType(type) && some(getElementTypes(type), isGenericType);
     }
-    function getConditionalType(root, mapper, aliasSymbol, aliasTypeArguments) {
+    function getConditionalType(root, mapper, forConstraint, aliasSymbol, aliasTypeArguments) {
       let result;
       let extraTypes;
       let tailCount = 0;
@@ -60652,7 +60658,7 @@ ${lanes.join("\n")}
         const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
         if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
           if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
-            if (checkType.flags & 1 /* Any */) {
+            if (checkType.flags & 1 /* Any */ || forConstraint && !(inferredExtendsType.flags & 131072 /* Never */) && someType(getPermissiveInstantiation(inferredExtendsType), (t) => isTypeAssignableTo(t, getPermissiveInstantiation(checkType)))) {
               (extraTypes || (extraTypes = [])).push(instantiateType(getTypeFromTypeNode(root.node.trueType), combinedMapper || mapper));
             }
             const falseType2 = getTypeFromTypeNode(root.node.falseType);
@@ -60762,7 +60768,9 @@ ${lanes.join("\n")}
         links.resolvedType = getConditionalType(
           root,
           /*mapper*/
-          void 0
+          void 0,
+          /*forConstraint*/
+          false
         );
         if (outerTypeParameters) {
           root.instantiations = /* @__PURE__ */ new Map();
@@ -61451,7 +61459,7 @@ ${lanes.join("\n")}
           result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
           target.instantiations.set(id, result);
           const resultObjectFlags = getObjectFlags(result);
-          if (result.flags & 138117121 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+          if (result.flags & 3899393 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
             const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
             if (!(getObjectFlags(result) & 524288 /* CouldContainTypeVariablesComputed */)) {
               if (resultObjectFlags & (32 /* Mapped */ | 16 /* Anonymous */ | 4 /* Reference */)) {
@@ -61617,17 +61625,17 @@ ${lanes.join("\n")}
       result.objectFlags |= result.aliasTypeArguments ? getPropagatingFlagsOfTypes(result.aliasTypeArguments) : 0;
       return result;
     }
-    function getConditionalTypeInstantiation(type, mapper, aliasSymbol, aliasTypeArguments) {
+    function getConditionalTypeInstantiation(type, mapper, forConstraint, aliasSymbol, aliasTypeArguments) {
       const root = type.root;
       if (root.outerTypeParameters) {
         const typeArguments = map(root.outerTypeParameters, (t) => getMappedType(t, mapper));
-        const id = getTypeListId(typeArguments) + getAliasId(aliasSymbol, aliasTypeArguments);
+        const id = (forConstraint ? "C" : "") + getTypeListId(typeArguments) + getAliasId(aliasSymbol, aliasTypeArguments);
         let result = root.instantiations.get(id);
         if (!result) {
           const newMapper = createTypeMapper(root.outerTypeParameters, typeArguments);
           const checkType = root.checkType;
           const distributionType = root.isDistributive ? getMappedType(checkType, newMapper) : void 0;
-          result = distributionType && checkType !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapTypeWithAlias(getReducedType(distributionType), (t) => getConditionalType(root, prependTypeMapping(checkType, t, newMapper)), aliasSymbol, aliasTypeArguments) : getConditionalType(root, newMapper, aliasSymbol, aliasTypeArguments);
+          result = distributionType && checkType !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapTypeWithAlias(getReducedType(distributionType), (t) => getConditionalType(root, prependTypeMapping(checkType, t, newMapper), forConstraint), aliasSymbol, aliasTypeArguments) : getConditionalType(root, newMapper, forConstraint, aliasSymbol, aliasTypeArguments);
           root.instantiations.set(id, result);
         }
         return result;
@@ -61715,7 +61723,14 @@ ${lanes.join("\n")}
         );
       }
       if (flags & 16777216 /* Conditional */) {
-        return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper), aliasSymbol, aliasTypeArguments);
+        return getConditionalTypeInstantiation(
+          type,
+          combineTypeMappers(type.mapper, mapper),
+          /*forConstraint*/
+          false,
+          aliasSymbol,
+          aliasTypeArguments
+        );
       }
       if (flags & 33554432 /* Substitution */) {
         const newBaseType = instantiateType(type.baseType, mapper);
@@ -63359,7 +63374,7 @@ ${lanes.join("\n")}
           return relation === comparableRelation ? someTypeRelatedToType(source2, target2, reportErrors2 && !(source2.flags & 402784252 /* Primitive */), intersectionState) : eachTypeRelatedToType(source2, target2, reportErrors2 && !(source2.flags & 402784252 /* Primitive */), intersectionState);
         }
         if (target2.flags & 1048576 /* Union */) {
-          return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source2), target2, reportErrors2 && !(source2.flags & 402784252 /* Primitive */) && !(target2.flags & 402784252 /* Primitive */));
+          return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source2), target2, reportErrors2 && !(source2.flags & 402784252 /* Primitive */) && !(target2.flags & 402784252 /* Primitive */), intersectionState);
         }
         if (target2.flags & 2097152 /* Intersection */) {
           return typeRelatedToEachType(source2, target2, reportErrors2, 2 /* Target */);
@@ -63404,7 +63419,8 @@ ${lanes.join("\n")}
             sourceType,
             target2,
             /*reportErrors*/
-            false
+            false,
+            0 /* None */
           );
           if (!related) {
             return 0 /* False */;
@@ -63413,7 +63429,7 @@ ${lanes.join("\n")}
         }
         return result2;
       }
-      function typeRelatedToSomeType(source2, target2, reportErrors2) {
+      function typeRelatedToSomeType(source2, target2, reportErrors2, intersectionState) {
         const targetTypes = target2.types;
         if (target2.flags & 1048576 /* Union */) {
           if (containsType(targetTypes, source2)) {
@@ -63431,7 +63447,10 @@ ${lanes.join("\n")}
               match,
               2 /* Target */,
               /*reportErrors*/
-              false
+              false,
+              /*headMessage*/
+              void 0,
+              intersectionState
             );
             if (related) {
               return related;
@@ -63444,7 +63463,10 @@ ${lanes.join("\n")}
             type,
             2 /* Target */,
             /*reportErrors*/
-            false
+            false,
+            /*headMessage*/
+            void 0,
+            intersectionState
           );
           if (related) {
             return related;
@@ -63458,7 +63480,10 @@ ${lanes.join("\n")}
               bestMatchingType,
               2 /* Target */,
               /*reportErrors*/
-              true
+              true,
+              /*headMessage*/
+              void 0,
+              intersectionState
             );
           }
         }
@@ -64256,13 +64281,6 @@ ${lanes.join("\n")}
                 return result2;
               }
             }
-          } else {
-            const distributiveConstraint = hasNonCircularBaseConstraint(source2) ? getConstraintOfDistributiveConditionalType(source2) : void 0;
-            if (distributiveConstraint) {
-              if (result2 = isRelatedTo(distributiveConstraint, target2, 1 /* Source */, reportErrors2)) {
-                return result2;
-              }
-            }
           }
           const defaultConstraint = getDefaultConstraintOfConditionalType(source2);
           if (defaultConstraint) {
@@ -64270,6 +64288,13 @@ ${lanes.join("\n")}
               return result2;
             }
           }
+          const distributiveConstraint = !(targetFlags & 16777216 /* Conditional */) && hasNonCircularBaseConstraint(source2) ? getConstraintOfDistributiveConditionalType(source2) : void 0;
+          if (distributiveConstraint) {
+            resetErrorInfo(saveErrorInfo);
+            if (result2 = isRelatedTo(distributiveConstraint, target2, 1 /* Source */, reportErrors2)) {
+              return result2;
+            }
+          }
         } else {
           if (relation !== subtypeRelation && relation !== strictSubtypeRelation && isPartialMappedType(target2) && isEmptyObjectType(source2)) {
             return -1 /* True */;
@@ -66167,8 +66192,8 @@ ${lanes.join("\n")}
       if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
         return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
       }
-      const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
-      if (type.flags & 138117121 /* ObjectFlagsType */) {
+      const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
+      if (type.flags & 3899393 /* ObjectFlagsType */) {
         type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
       }
       return result;
@@ -67295,7 +67320,8 @@ ${lanes.join("\n")}
       if (hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node)) {
         const initializer = getEffectiveInitializer(declaration);
         if (initializer) {
-          return tryGetNameFromType(getTypeOfExpression(initializer));
+          const initializerType = isBindingPattern(declaration.parent) ? getTypeForBindingElement(declaration) : getTypeOfExpression(initializer);
+          return initializerType && tryGetNameFromType(initializerType);
         }
         if (isEnumMember(declaration)) {
           return getTextOfPropertyName(declaration.name);
@@ -83141,10 +83167,11 @@ ${lanes.join("\n")}
           node
         ));
         if (sym) {
+          const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(sym, 111551 /* Value */);
           markAliasReferenced(sym, id);
           if (getSymbolFlags(sym) & 111551 /* Value */) {
             checkExpressionCached(id);
-            if (!isIllegalExportDefaultInCJS && !(node.flags & 33554432 /* Ambient */) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
+            if (!isIllegalExportDefaultInCJS && !(node.flags & 33554432 /* Ambient */) && compilerOptions.verbatimModuleSyntax && typeOnlyDeclaration) {
               error2(
                 id,
                 node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration : Diagnostics.An_export_default_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration,
@@ -83158,6 +83185,33 @@ ${lanes.join("\n")}
               idText(id)
             );
           }
+          if (!isIllegalExportDefaultInCJS && getIsolatedModules(compilerOptions) && !(sym.flags & 111551 /* Value */)) {
+            if (sym.flags & 2097152 /* Alias */ && resolveAlias(sym) !== unknownSymbol && getSymbolFlags(
+              sym,
+              /*excludeTypeOnlyMeanings*/
+              false,
+              /*excludeLocalMeanings*/
+              true
+            ) & 788968 /* Type */ && (!typeOnlyDeclaration || getSourceFileOfNode(typeOnlyDeclaration) !== getSourceFileOfNode(node))) {
+              error2(
+                id,
+                node.isExportEquals ? Diagnostics._0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_import_type_where_0_is_imported : Diagnostics._0_resolves_to_a_type_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_export_type_0_as_default,
+                idText(id),
+                isolatedModulesLikeFlagName
+              );
+            } else if (typeOnlyDeclaration && getSourceFileOfNode(typeOnlyDeclaration) !== getSourceFileOfNode(node)) {
+              addTypeOnlyDeclarationRelatedInfo(
+                error2(
+                  id,
+                  node.isExportEquals ? Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_import_type_where_0_is_imported : Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_marked_type_only_in_this_file_before_re_exporting_when_1_is_enabled_Consider_using_export_type_0_as_default,
+                  idText(id),
+                  isolatedModulesLikeFlagName
+                ),
+                typeOnlyDeclaration,
+                idText(id)
+              );
+            }
+          }
         } else {
           checkExpressionCached(id);
         }
@@ -84552,7 +84606,11 @@ ${lanes.join("\n")}
           const exportClause = node.exportClause;
           return !!exportClause && (isNamespaceExport(exportClause) || some(exportClause.elements, isValueAliasDeclaration));
         case 277 /* ExportAssignment */:
-          return node.expression && node.expression.kind === 80 /* Identifier */ ? isAliasResolvedToValue(getSymbolOfDeclaration(node)) : true;
+          return node.expression && node.expression.kind === 80 /* Identifier */ ? isAliasResolvedToValue(
+            getSymbolOfDeclaration(node),
+            /*excludeTypeOnlyValues*/
+            true
+          ) : true;
       }
       return false;
     }
@@ -131437,8 +131495,11 @@ ${lanes.join("\n")}
   function textSpansEqual(a, b) {
     return !!a && !!b && a.start === b.start && a.length === b.length;
   }
-  function documentSpansEqual(a, b) {
-    return a.fileName === b.fileName && textSpansEqual(a.textSpan, b.textSpan);
+  function documentSpansEqual(a, b, useCaseSensitiveFileNames2) {
+    return (useCaseSensitiveFileNames2 ? equateStringsCaseSensitive : equateStringsCaseInsensitive)(a.fileName, b.fileName) && textSpansEqual(a.textSpan, b.textSpan);
+  }
+  function getDocumentSpansEqualityComparer(useCaseSensitiveFileNames2) {
+    return (a, b) => documentSpansEqual(a, b, useCaseSensitiveFileNames2);
   }
   function forEachUnique(array, callback) {
     if (array) {
@@ -159628,6 +159689,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       return void 0;
     }
+    function isInDifferentLineThanContextToken(contextToken2, position2) {
+      return sourceFile.getLineEndOfPosition(contextToken2.getEnd()) < position2;
+    }
     function isSolelyIdentifierDefinitionLocation(contextToken2) {
       const parent2 = contextToken2.parent;
       const containingNodeKind = parent2.kind;
@@ -159669,11 +159733,19 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         case 139 /* GetKeyword */:
         case 153 /* SetKeyword */:
           return !isFromObjectTypeDeclaration(contextToken2);
-        case 80 /* Identifier */:
+        case 80 /* Identifier */: {
           if (containingNodeKind === 276 /* ImportSpecifier */ && contextToken2 === parent2.name && contextToken2.text === "type") {
             return false;
           }
+          const ancestorVariableDeclaration = findAncestor(
+            contextToken2.parent,
+            isVariableDeclaration
+          );
+          if (ancestorVariableDeclaration && isInDifferentLineThanContextToken(contextToken2, position)) {
+            return false;
+          }
           break;
+        }
         case 86 /* ClassKeyword */:
         case 94 /* EnumKeyword */:
         case 120 /* InterfaceKeyword */:
@@ -180060,10 +180132,10 @@ ${json}${newLine}`;
     }
     return deduplicate(outputs, equateValues);
   }
-  function createDocumentSpanSet() {
-    return createSet(({ textSpan }) => textSpan.start + 100003 * textSpan.length, documentSpansEqual);
+  function createDocumentSpanSet(useCaseSensitiveFileNames2) {
+    return createSet(({ textSpan }) => textSpan.start + 100003 * textSpan.length, getDocumentSpansEqualityComparer(useCaseSensitiveFileNames2));
   }
-  function getRenameLocationsWorker(projects, defaultProject, initialLocation, findInStrings, findInComments, preferences) {
+  function getRenameLocationsWorker(projects, defaultProject, initialLocation, findInStrings, findInComments, preferences, useCaseSensitiveFileNames2) {
     const perProjectResults = getPerProjectReferences(
       projects,
       defaultProject,
@@ -180077,7 +180149,7 @@ ${json}${newLine}`;
       return perProjectResults;
     }
     const results = [];
-    const seen = createDocumentSpanSet();
+    const seen = createDocumentSpanSet(useCaseSensitiveFileNames2);
     perProjectResults.forEach((projectResults, project) => {
       for (const result of projectResults) {
         if (!seen.has(result) && !getMappedLocationForProject(documentSpanLocation(result), project)) {
@@ -180100,7 +180172,7 @@ ${json}${newLine}`;
     const info = infos && firstOrUndefined(infos);
     return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : void 0;
   }
-  function getReferencesWorker(projects, defaultProject, initialLocation, logger) {
+  function getReferencesWorker(projects, defaultProject, initialLocation, useCaseSensitiveFileNames2, logger) {
     var _a, _b;
     const perProjectResults = getPerProjectReferences(
       projects,
@@ -180132,7 +180204,7 @@ ${json}${newLine}`;
         }
       });
     } else {
-      const knownSymbolSpans = createDocumentSpanSet();
+      const knownSymbolSpans = createDocumentSpanSet(useCaseSensitiveFileNames2);
       for (const referencedSymbol of defaultProjectResults) {
         for (const ref of referencedSymbol.references) {
           if (ref.isDefinition) {
@@ -180167,7 +180239,7 @@ ${json}${newLine}`;
       });
     }
     const results = [];
-    const seenRefs = createDocumentSpanSet();
+    const seenRefs = createDocumentSpanSet(useCaseSensitiveFileNames2);
     perProjectResults.forEach((projectResults, project) => {
       for (const referencedSymbol of projectResults) {
         const mappedDefinitionFile = getMappedLocationForProject(documentSpanLocation(referencedSymbol.definition), project);
@@ -180178,7 +180250,7 @@ ${json}${newLine}`;
           fileName: mappedDefinitionFile.fileName,
           contextSpan: getMappedContextSpanForProject(referencedSymbol.definition, project)
         };
-        let symbolToAddTo = find(results, (o) => documentSpansEqual(o.definition, definition));
+        let symbolToAddTo = find(results, (o) => documentSpansEqual(o.definition, definition, useCaseSensitiveFileNames2));
         if (!symbolToAddTo) {
           symbolToAddTo = { definition, references: [] };
           results.push(symbolToAddTo);
@@ -181709,7 +181781,10 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           let definitions = this.mapDefinitionInfoLocations(unmappedDefinitions || emptyArray2, project).slice();
           const needsJsResolution = this.projectService.serverMode === 0 /* Semantic */ && (!some(definitions, (d) => toNormalizedPath(d.fileName) !== file && !d.isAmbient) || some(definitions, (d) => !!d.failedAliasResolution));
           if (needsJsResolution) {
-            const definitionSet = createSet((d) => d.textSpan.start, documentSpansEqual);
+            const definitionSet = createSet(
+              (d) => d.textSpan.start,
+              getDocumentSpansEqualityComparer(this.host.useCaseSensitiveFileNames)
+            );
             definitions == null ? void 0 : definitions.forEach((d) => definitionSet.add(d));
             const noDtsProject = project.getNoDtsResolutionProject(file);
             const ls = noDtsProject.getLanguageService();
@@ -182150,7 +182225,8 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             { fileName: args.file, pos: position },
             !!args.findInStrings,
             !!args.findInComments,
-            preferences
+            preferences,
+            this.host.useCaseSensitiveFileNames
           );
           if (!simplifiedResult)
             return locations;
@@ -182185,6 +182261,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             projects,
             this.getDefaultProject(args),
             { fileName: args.file, pos: position },
+            this.host.useCaseSensitiveFileNames,
             this.logger
           );
           if (!simplifiedResult)
@@ -182207,7 +182284,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           const fileName = args.file;
           const preferences = this.getPreferences(toNormalizedPath(fileName));
           const references = [];
-          const seen = createDocumentSpanSet();
+          const seen = createDocumentSpanSet(this.host.useCaseSensitiveFileNames);
           forEachProjectInProjects(
             projects,
             /*path*/
@@ -185036,6 +185113,7 @@ ${e.message}`;
     getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
     getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
     getDocumentPositionMapper: () => getDocumentPositionMapper,
+    getDocumentSpansEqualityComparer: () => getDocumentSpansEqualityComparer,
     getESModuleInterop: () => getESModuleInterop,
     getEditsForFileRename: () => getEditsForFileRename,
     getEffectiveBaseTypeNode: () => getEffectiveBaseTypeNode,
@@ -187447,6 +187525,7 @@ ${e.message}`;
     getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
     getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
     getDocumentPositionMapper: () => getDocumentPositionMapper,
+    getDocumentSpansEqualityComparer: () => getDocumentSpansEqualityComparer,
     getESModuleInterop: () => getESModuleInterop,
     getEditsForFileRename: () => getEditsForFileRename,
     getEffectiveBaseTypeNode: () => getEffectiveBaseTypeNode,