typescript 5.4.0-dev.20240109 → 5.4.0-dev.20240110

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240109`;
+var version = `${versionMajorMinor}.0-dev.20240110`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -12673,7 +12673,7 @@ function isPartOfTypeNode(node) {
     case 116 /* VoidKeyword */:
       return node.parent.kind !== 222 /* VoidExpression */;
     case 233 /* ExpressionWithTypeArguments */:
-      return isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+      return isPartOfTypeExpressionWithTypeArguments(node);
     case 168 /* TypeParameter */:
       return node.parent.kind === 200 /* MappedType */ || node.parent.kind === 195 /* InferType */;
     case 80 /* Identifier */:
@@ -12698,7 +12698,7 @@ function isPartOfTypeNode(node) {
       }
       switch (parent.kind) {
         case 233 /* ExpressionWithTypeArguments */:
-          return isHeritageClause(parent.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
+          return isPartOfTypeExpressionWithTypeArguments(parent);
         case 168 /* TypeParameter */:
           return node === parent.constraint;
         case 352 /* JSDocTemplateTag */:
@@ -12732,6 +12732,9 @@ function isPartOfTypeNode(node) {
   }
   return false;
 }
+function isPartOfTypeExpressionWithTypeArguments(node) {
+  return isJSDocImplementsTag(node.parent) || isJSDocAugmentsTag(node.parent) || isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+}
 function forEachReturnStatement(body, visitor) {
   return traverse(body);
   function traverse(node) {
@@ -44281,6 +44284,14 @@ function createTypeChecker(host) {
     emptyArray,
     emptyArray
   );
+  var resolvingApparentMappedType = createAnonymousType(
+    /*symbol*/
+    void 0,
+    emptySymbols,
+    emptyArray,
+    emptyArray,
+    emptyArray
+  );
   var markerSuperType = createTypeParameter();
   var markerSubType = createTypeParameter();
   markerSubType.constraint = markerSuperType;
@@ -47330,29 +47341,7 @@ function createTypeChecker(host) {
   function getContainersOfSymbol(symbol, enclosingDeclaration, meaning) {
     const container = getParentOfSymbol(symbol);
     if (container && !(symbol.flags & 262144 /* TypeParameter */)) {
-      const additionalContainers = mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
-      const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
-      const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container, meaning);
-      if (enclosingDeclaration && container.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
-        container,
-        enclosingDeclaration,
-        1920 /* Namespace */,
-        /*useOnlyExternalAliasing*/
-        false
-      )) {
-        return append(concatenate(concatenate([container], additionalContainers), reexportContainers), objectLiteralContainer);
-      }
-      const firstVariableMatch = !(container.flags & getQualifiedLeftMeaning(meaning)) && container.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
-        return forEachEntry(t, (s) => {
-          if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container)) {
-            return s;
-          }
-        });
-      }) : void 0;
-      let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container] : [...additionalContainers, container];
-      res = append(res, objectLiteralContainer);
-      res = addRange(res, reexportContainers);
-      return res;
+      return getWithAlternativeContainers(container);
     }
     const candidates = mapDefined(symbol.declarations, (d) => {
       if (!isAmbientModule(d) && d.parent) {
@@ -47374,7 +47363,40 @@ function createTypeChecker(host) {
     if (!length(candidates)) {
       return void 0;
     }
-    return mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+    const containers = mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+    let bestContainers = [];
+    let alternativeContainers = [];
+    for (const container2 of containers) {
+      const [bestMatch, ...rest] = getWithAlternativeContainers(container2);
+      bestContainers = append(bestContainers, bestMatch);
+      alternativeContainers = addRange(alternativeContainers, rest);
+    }
+    return concatenate(bestContainers, alternativeContainers);
+    function getWithAlternativeContainers(container2) {
+      const additionalContainers = mapDefined(container2.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
+      const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
+      const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container2, meaning);
+      if (enclosingDeclaration && container2.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
+        container2,
+        enclosingDeclaration,
+        1920 /* Namespace */,
+        /*useOnlyExternalAliasing*/
+        false
+      )) {
+        return append(concatenate(concatenate([container2], additionalContainers), reexportContainers), objectLiteralContainer);
+      }
+      const firstVariableMatch = !(container2.flags & getQualifiedLeftMeaning(meaning)) && container2.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container2).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
+        return forEachEntry(t, (s) => {
+          if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container2)) {
+            return s;
+          }
+        });
+      }) : void 0;
+      let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container2] : [...additionalContainers, container2];
+      res = append(res, objectLiteralContainer);
+      res = addRange(res, reexportContainers);
+      return res;
+    }
     function fileSymbolIfFileSymbolExportEqualsContainer(d) {
       return container && getFileSymbolIfFileSymbolExportEqualsContainer(d, container);
     }
@@ -47412,6 +47434,13 @@ function createTypeChecker(host) {
     });
   }
   function getSymbolIfSameReference(s1, s2) {
+    var _a, _b;
+    if (s1.flags & 524288 /* TypeAlias */ && ((_a = s2.declarations) == null ? void 0 : _a.find(isTypeAlias))) {
+      s2 = getDeclaredTypeOfTypeAlias(s2).aliasSymbol || s2;
+    }
+    if (s2.flags & 524288 /* TypeAlias */ && ((_b = s1.declarations) == null ? void 0 : _b.find(isTypeAlias))) {
+      s1 = getDeclaredTypeOfTypeAlias(s1).aliasSymbol || s1;
+    }
     if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
       return s1;
     }
@@ -55150,14 +55179,30 @@ function createTypeChecker(host) {
     return !!(typeParameter.symbol && forEach(typeParameter.symbol.declarations, (decl) => isTypeParameterDeclaration(decl) && decl.default));
   }
   function getApparentTypeOfMappedType(type) {
-    return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
+    if (type.resolvedApparentType) {
+      if (type.resolvedApparentType === resolvingApparentMappedType) {
+        return type.resolvedApparentType = type;
+      }
+      return type.resolvedApparentType;
+    }
+    type.resolvedApparentType = resolvingApparentMappedType;
+    return type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type);
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
+    const mappedType = type.target || type;
+    const typeVariable = getHomomorphicTypeVariable(mappedType);
+    if (typeVariable && !mappedType.declaration.nameType) {
+      let constraint;
+      if (!type.target) {
+        constraint = getConstraintOfTypeParameter(typeVariable);
+      } else {
+        const modifiersConstraint = getConstraintOfType(getModifiersTypeFromMappedType(type));
+        if (modifiersConstraint) {
+          constraint = getApparentType(modifiersConstraint);
+        }
+      }
       if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+        return instantiateType(mappedType, prependTypeMapping(typeVariable, constraint, mappedType.mapper));
       }
     }
     return type;
@@ -55248,6 +55293,7 @@ function createTypeChecker(host) {
         clone2.parent = (_c = (_b = singleProp.valueDeclaration) == null ? void 0 : _b.symbol) == null ? void 0 : _c.parent;
         clone2.links.containingType = containingType;
         clone2.links.mapper = links == null ? void 0 : links.mapper;
+        clone2.links.writeType = getWriteTypeOfSymbol(singleProp);
         return clone2;
       } else {
         return singleProp;
@@ -61873,6 +61919,18 @@ function createTypeChecker(host) {
       }
       return result2;
     }
+    function getApparentMappedTypeKeys(nameType, targetType) {
+      const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
+      const mappedKeys = [];
+      forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
+        modifiersType,
+        8576 /* StringOrNumberLiteralOrUnique */,
+        /*stringsOnly*/
+        false,
+        (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
+      );
+      return getUnionType(mappedKeys);
+    }
     function structuredTypeRelatedToWorker(source2, target2, reportErrors2, intersectionState, saveErrorInfo) {
       let result2;
       let originalErrorInfo;
@@ -62055,16 +62113,8 @@ function createTypeChecker(host) {
             const constraintType = getConstraintTypeFromMappedType(targetType);
             let targetKeys;
             if (nameType && isMappedTypeWithKeyofConstraintDeclaration(targetType)) {
-              const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
-              const mappedKeys = [];
-              forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
-                modifiersType,
-                8576 /* StringOrNumberLiteralOrUnique */,
-                /*stringsOnly*/
-                false,
-                (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
-              );
-              targetKeys = getUnionType([...mappedKeys, nameType]);
+              const mappedKeys = getApparentMappedTypeKeys(nameType, targetType);
+              targetKeys = getUnionType([mappedKeys, nameType]);
             } else {
               targetKeys = nameType || constraintType;
             }
@@ -62235,9 +62285,18 @@ function createTypeChecker(host) {
           }
         }
       } else if (sourceFlags & 4194304 /* Index */) {
-        if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2)) {
+        const isDeferredMappedIndex = shouldDeferIndexType(source2.type, source2.indexFlags) && getObjectFlags(source2.type) & 32 /* Mapped */;
+        if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2 && !isDeferredMappedIndex)) {
           return result2;
         }
+        if (isDeferredMappedIndex) {
+          const mappedType = source2.type;
+          const nameType = getNameTypeFromMappedType(mappedType);
+          const sourceMappedKeys = nameType && isMappedTypeWithKeyofConstraintDeclaration(mappedType) ? getApparentMappedTypeKeys(nameType, mappedType) : nameType || getConstraintTypeFromMappedType(mappedType);
+          if (result2 = isRelatedTo(sourceMappedKeys, target2, 1 /* Source */, reportErrors2)) {
+            return result2;
+          }
+        }
       } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
         if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
           const constraint = getBaseConstraintOfType(source2);
@@ -113477,7 +113536,14 @@ function createPrinter(printerOptions = {}, handlers = {}) {
   function willEmitLeadingNewLine(node) {
     if (!currentSourceFile)
       return false;
-    if (some(getLeadingCommentRanges(currentSourceFile.text, node.pos), commentWillEmitNewLine))
+    const leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+    if (leadingCommentRanges) {
+      const parseNode = getParseTreeNode(node);
+      if (parseNode && isParenthesizedExpression(parseNode.parent)) {
+        return true;
+      }
+    }
+    if (some(leadingCommentRanges, commentWillEmitNewLine))
       return true;
     if (some(getSyntheticLeadingComments(node), commentWillEmitNewLine))
       return true;

package/lib/tsserver.js

@@ -2340,7 +2340,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240109`;
+var version = `${versionMajorMinor}.0-dev.20240110`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -16546,7 +16546,7 @@ function isPartOfTypeNode(node) {
     case 116 /* VoidKeyword */:
       return node.parent.kind !== 222 /* VoidExpression */;
     case 233 /* ExpressionWithTypeArguments */:
-      return isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+      return isPartOfTypeExpressionWithTypeArguments(node);
     case 168 /* TypeParameter */:
       return node.parent.kind === 200 /* MappedType */ || node.parent.kind === 195 /* InferType */;
     case 80 /* Identifier */:
@@ -16571,7 +16571,7 @@ function isPartOfTypeNode(node) {
       }
       switch (parent2.kind) {
         case 233 /* ExpressionWithTypeArguments */:
-          return isHeritageClause(parent2.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(parent2);
+          return isPartOfTypeExpressionWithTypeArguments(parent2);
         case 168 /* TypeParameter */:
           return node === parent2.constraint;
         case 352 /* JSDocTemplateTag */:
@@ -16605,6 +16605,9 @@ function isPartOfTypeNode(node) {
   }
   return false;
 }
+function isPartOfTypeExpressionWithTypeArguments(node) {
+  return isJSDocImplementsTag(node.parent) || isJSDocAugmentsTag(node.parent) || isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+}
 function isChildOfNodeWithKind(node, kind) {
   while (node) {
     if (node.kind === kind) {
@@ -49019,6 +49022,14 @@ function createTypeChecker(host) {
     emptyArray,
     emptyArray
   );
+  var resolvingApparentMappedType = createAnonymousType(
+    /*symbol*/
+    void 0,
+    emptySymbols,
+    emptyArray,
+    emptyArray,
+    emptyArray
+  );
   var markerSuperType = createTypeParameter();
   var markerSubType = createTypeParameter();
   markerSubType.constraint = markerSuperType;
@@ -52068,29 +52079,7 @@ function createTypeChecker(host) {
   function getContainersOfSymbol(symbol, enclosingDeclaration, meaning) {
     const container = getParentOfSymbol(symbol);
     if (container && !(symbol.flags & 262144 /* TypeParameter */)) {
-      const additionalContainers = mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
-      const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
-      const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container, meaning);
-      if (enclosingDeclaration && container.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
-        container,
-        enclosingDeclaration,
-        1920 /* Namespace */,
-        /*useOnlyExternalAliasing*/
-        false
-      )) {
-        return append(concatenate(concatenate([container], additionalContainers), reexportContainers), objectLiteralContainer);
-      }
-      const firstVariableMatch = !(container.flags & getQualifiedLeftMeaning(meaning)) && container.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
-        return forEachEntry(t, (s) => {
-          if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container)) {
-            return s;
-          }
-        });
-      }) : void 0;
-      let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container] : [...additionalContainers, container];
-      res = append(res, objectLiteralContainer);
-      res = addRange(res, reexportContainers);
-      return res;
+      return getWithAlternativeContainers(container);
     }
     const candidates = mapDefined(symbol.declarations, (d) => {
       if (!isAmbientModule(d) && d.parent) {
@@ -52112,7 +52101,40 @@ function createTypeChecker(host) {
     if (!length(candidates)) {
       return void 0;
     }
-    return mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+    const containers = mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+    let bestContainers = [];
+    let alternativeContainers = [];
+    for (const container2 of containers) {
+      const [bestMatch, ...rest] = getWithAlternativeContainers(container2);
+      bestContainers = append(bestContainers, bestMatch);
+      alternativeContainers = addRange(alternativeContainers, rest);
+    }
+    return concatenate(bestContainers, alternativeContainers);
+    function getWithAlternativeContainers(container2) {
+      const additionalContainers = mapDefined(container2.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
+      const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
+      const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container2, meaning);
+      if (enclosingDeclaration && container2.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
+        container2,
+        enclosingDeclaration,
+        1920 /* Namespace */,
+        /*useOnlyExternalAliasing*/
+        false
+      )) {
+        return append(concatenate(concatenate([container2], additionalContainers), reexportContainers), objectLiteralContainer);
+      }
+      const firstVariableMatch = !(container2.flags & getQualifiedLeftMeaning(meaning)) && container2.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container2).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
+        return forEachEntry(t, (s) => {
+          if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container2)) {
+            return s;
+          }
+        });
+      }) : void 0;
+      let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container2] : [...additionalContainers, container2];
+      res = append(res, objectLiteralContainer);
+      res = addRange(res, reexportContainers);
+      return res;
+    }
     function fileSymbolIfFileSymbolExportEqualsContainer(d) {
       return container && getFileSymbolIfFileSymbolExportEqualsContainer(d, container);
     }
@@ -52150,6 +52172,13 @@ function createTypeChecker(host) {
     });
   }
   function getSymbolIfSameReference(s1, s2) {
+    var _a, _b;
+    if (s1.flags & 524288 /* TypeAlias */ && ((_a = s2.declarations) == null ? void 0 : _a.find(isTypeAlias))) {
+      s2 = getDeclaredTypeOfTypeAlias(s2).aliasSymbol || s2;
+    }
+    if (s2.flags & 524288 /* TypeAlias */ && ((_b = s1.declarations) == null ? void 0 : _b.find(isTypeAlias))) {
+      s1 = getDeclaredTypeOfTypeAlias(s1).aliasSymbol || s1;
+    }
     if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
       return s1;
     }
@@ -59888,14 +59917,30 @@ function createTypeChecker(host) {
     return !!(typeParameter.symbol && forEach(typeParameter.symbol.declarations, (decl) => isTypeParameterDeclaration(decl) && decl.default));
   }
   function getApparentTypeOfMappedType(type) {
-    return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
+    if (type.resolvedApparentType) {
+      if (type.resolvedApparentType === resolvingApparentMappedType) {
+        return type.resolvedApparentType = type;
+      }
+      return type.resolvedApparentType;
+    }
+    type.resolvedApparentType = resolvingApparentMappedType;
+    return type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type);
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
+    const mappedType = type.target || type;
+    const typeVariable = getHomomorphicTypeVariable(mappedType);
+    if (typeVariable && !mappedType.declaration.nameType) {
+      let constraint;
+      if (!type.target) {
+        constraint = getConstraintOfTypeParameter(typeVariable);
+      } else {
+        const modifiersConstraint = getConstraintOfType(getModifiersTypeFromMappedType(type));
+        if (modifiersConstraint) {
+          constraint = getApparentType(modifiersConstraint);
+        }
+      }
       if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+        return instantiateType(mappedType, prependTypeMapping(typeVariable, constraint, mappedType.mapper));
       }
     }
     return type;
@@ -59986,6 +60031,7 @@ function createTypeChecker(host) {
         clone2.parent = (_c = (_b = singleProp.valueDeclaration) == null ? void 0 : _b.symbol) == null ? void 0 : _c.parent;
         clone2.links.containingType = containingType;
         clone2.links.mapper = links == null ? void 0 : links.mapper;
+        clone2.links.writeType = getWriteTypeOfSymbol(singleProp);
         return clone2;
       } else {
         return singleProp;
@@ -66611,6 +66657,18 @@ function createTypeChecker(host) {
       }
       return result2;
     }
+    function getApparentMappedTypeKeys(nameType, targetType) {
+      const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
+      const mappedKeys = [];
+      forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
+        modifiersType,
+        8576 /* StringOrNumberLiteralOrUnique */,
+        /*stringsOnly*/
+        false,
+        (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
+      );
+      return getUnionType(mappedKeys);
+    }
     function structuredTypeRelatedToWorker(source2, target2, reportErrors2, intersectionState, saveErrorInfo) {
       let result2;
       let originalErrorInfo;
@@ -66793,16 +66851,8 @@ function createTypeChecker(host) {
             const constraintType = getConstraintTypeFromMappedType(targetType);
             let targetKeys;
             if (nameType && isMappedTypeWithKeyofConstraintDeclaration(targetType)) {
-              const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
-              const mappedKeys = [];
-              forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
-                modifiersType,
-                8576 /* StringOrNumberLiteralOrUnique */,
-                /*stringsOnly*/
-                false,
-                (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
-              );
-              targetKeys = getUnionType([...mappedKeys, nameType]);
+              const mappedKeys = getApparentMappedTypeKeys(nameType, targetType);
+              targetKeys = getUnionType([mappedKeys, nameType]);
             } else {
               targetKeys = nameType || constraintType;
             }
@@ -66973,9 +67023,18 @@ function createTypeChecker(host) {
           }
         }
       } else if (sourceFlags & 4194304 /* Index */) {
-        if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2)) {
+        const isDeferredMappedIndex = shouldDeferIndexType(source2.type, source2.indexFlags) && getObjectFlags(source2.type) & 32 /* Mapped */;
+        if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2 && !isDeferredMappedIndex)) {
           return result2;
         }
+        if (isDeferredMappedIndex) {
+          const mappedType = source2.type;
+          const nameType = getNameTypeFromMappedType(mappedType);
+          const sourceMappedKeys = nameType && isMappedTypeWithKeyofConstraintDeclaration(mappedType) ? getApparentMappedTypeKeys(nameType, mappedType) : nameType || getConstraintTypeFromMappedType(mappedType);
+          if (result2 = isRelatedTo(sourceMappedKeys, target2, 1 /* Source */, reportErrors2)) {
+            return result2;
+          }
+        }
       } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
         if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
           const constraint = getBaseConstraintOfType(source2);
@@ -118397,7 +118456,14 @@ function createPrinter(printerOptions = {}, handlers = {}) {
   function willEmitLeadingNewLine(node) {
     if (!currentSourceFile)
       return false;
-    if (some(getLeadingCommentRanges(currentSourceFile.text, node.pos), commentWillEmitNewLine))
+    const leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+    if (leadingCommentRanges) {
+      const parseNode = getParseTreeNode(node);
+      if (parseNode && isParenthesizedExpression(parseNode.parent)) {
+        return true;
+      }
+    }
+    if (some(leadingCommentRanges, commentWillEmitNewLine))
       return true;
     if (some(getSyntheticLeadingComments(node), commentWillEmitNewLine))
       return true;
@@ -152355,14 +152421,14 @@ function promoteFromTypeOnly(changes, aliasDeclaration, program, sourceFile, pre
             aliasDeclaration.name
           );
           const comparer = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, sortKind === 2 /* CaseInsensitive */);
-          const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, comparer);
-          if (aliasDeclaration.parent.elements.indexOf(aliasDeclaration) !== insertionIndex) {
+          const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, comparer, preferences);
+          if (insertionIndex !== aliasDeclaration.parent.elements.indexOf(aliasDeclaration)) {
             changes.delete(sourceFile, aliasDeclaration);
             changes.insertImportSpecifierAtIndex(sourceFile, newSpecifier, aliasDeclaration.parent, insertionIndex);
             return aliasDeclaration;
           }
         }
-        changes.deleteRange(sourceFile, aliasDeclaration.getFirstToken());
+        changes.deleteRange(sourceFile, { pos: getTokenPosOfNode(aliasDeclaration.getFirstToken()), end: getTokenPosOfNode(aliasDeclaration.propertyName ?? aliasDeclaration.name) });
         return aliasDeclaration;
       } else {
         Debug.assert(aliasDeclaration.parent.parent.isTypeOnly);
@@ -152458,7 +152524,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
     if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
       for (const spec of newSpecifiers) {
-        const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+        const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer, preferences);
         changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
       }
     } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -167323,14 +167389,14 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
     if (shouldRemove)
       importGroup = removeUnusedImports(importGroup, sourceFile, program);
     if (shouldCombine)
-      importGroup = coalesceImportsWorker(importGroup, comparer, sourceFile);
+      importGroup = coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
     if (shouldSort)
       importGroup = stableSort(importGroup, (s1, s2) => compareImportsOrRequireStatements(s1, s2, comparer));
     return importGroup;
   };
   topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
   if (mode !== "RemoveUnused" /* RemoveUnused */) {
-    getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer)));
+    getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer, preferences)));
   }
   for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
     if (!ambientModule.body)
@@ -167339,7 +167405,7 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
     ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
       const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
-      organizeImportsWorker(ambientModuleExportDecls, (group2) => coalesceExportsWorker(group2, comparer));
+      organizeImportsWorker(ambientModuleExportDecls, (group2) => coalesceExportsWorker(group2, comparer, preferences));
     }
   }
   return changeTracker.getChanges();
@@ -167471,11 +167537,11 @@ function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
 function getExternalModuleName2(specifier) {
   return specifier !== void 0 && isStringLiteralLike(specifier) ? specifier.text : void 0;
 }
-function coalesceImports(importGroup, ignoreCase, sourceFile) {
+function coalesceImports(importGroup, ignoreCase, sourceFile, preferences) {
   const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
-  return coalesceImportsWorker(importGroup, comparer, sourceFile);
+  return coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
 }
-function coalesceImportsWorker(importGroup, comparer, sourceFile) {
+function coalesceImportsWorker(importGroup, comparer, sourceFile, preferences) {
   if (importGroup.length === 0) {
     return importGroup;
   }
@@ -167529,7 +167595,7 @@ function coalesceImportsWorker(importGroup, comparer, sourceFile) {
     }
     newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
     const sortedImportSpecifiers = factory.createNodeArray(
-      sortSpecifiers(newImportSpecifiers, comparer),
+      sortSpecifiers(newImportSpecifiers, comparer, preferences),
       firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
     );
     const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
@@ -167589,11 +167655,11 @@ function getCategorizedImports(importGroup) {
     regularImports
   };
 }
-function coalesceExports(exportGroup, ignoreCase) {
+function coalesceExports(exportGroup, ignoreCase, preferences) {
   const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
-  return coalesceExportsWorker(exportGroup, comparer);
+  return coalesceExportsWorker(exportGroup, comparer, preferences);
 }
-function coalesceExportsWorker(exportGroup, comparer) {
+function coalesceExportsWorker(exportGroup, comparer, preferences) {
   if (exportGroup.length === 0) {
     return exportGroup;
   }
@@ -167608,7 +167674,7 @@ function coalesceExportsWorker(exportGroup, comparer) {
     }
     const newExportSpecifiers = [];
     newExportSpecifiers.push(...flatMap(exportGroup2, (i) => i.exportClause && isNamedExports(i.exportClause) ? i.exportClause.elements : emptyArray));
-    const sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers, comparer);
+    const sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers, comparer, preferences);
     const exportDecl = exportGroup2[0];
     coalescedExports.push(
       factory.updateExportDeclaration(
@@ -167652,11 +167718,18 @@ function updateImportDeclarationAndClause(importDeclaration, name, namedBindings
     importDeclaration.attributes
   );
 }
-function sortSpecifiers(specifiers, comparer) {
-  return stableSort(specifiers, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer));
+function sortSpecifiers(specifiers, comparer, preferences) {
+  return stableSort(specifiers, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
 }
-function compareImportOrExportSpecifiers(s1, s2, comparer) {
-  return compareBooleans(s1.isTypeOnly, s2.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+function compareImportOrExportSpecifiers(s1, s2, comparer, preferences) {
+  switch (preferences == null ? void 0 : preferences.organizeImportsTypeOrder) {
+    case "first":
+      return compareBooleans(s2.isTypeOnly, s1.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+    case "inline":
+      return comparer(s1.name.text, s2.name.text);
+    default:
+      return compareBooleans(s1.isTypeOnly, s2.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+  }
 }
 function compareModuleSpecifiers2(m1, m2, ignoreCase) {
   const comparer = getOrganizeImportsOrdinalStringComparer(!!ignoreCase);
@@ -167778,8 +167851,26 @@ var ImportSpecifierSortingCache = class {
   }
 };
 var detectImportSpecifierSorting = memoizeCached((specifiers, preferences) => {
-  if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s1.isTypeOnly, s2.isTypeOnly))) {
-    return 0 /* None */;
+  switch (preferences.organizeImportsTypeOrder) {
+    case "first":
+      if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s2.isTypeOnly, s1.isTypeOnly)))
+        return 0 /* None */;
+      break;
+    case "inline":
+      if (!arrayIsSorted(specifiers, (s1, s2) => {
+        const comparer = getStringComparer(
+          /*ignoreCase*/
+          true
+        );
+        return comparer(s1.name.text, s2.name.text);
+      })) {
+        return 0 /* None */;
+      }
+      break;
+    default:
+      if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s1.isTypeOnly, s2.isTypeOnly)))
+        return 0 /* None */;
+      break;
   }
   const collateCaseSensitive = getOrganizeImportsComparer(
     preferences,
@@ -167791,14 +167882,29 @@ var detectImportSpecifierSorting = memoizeCached((specifiers, preferences) => {
     /*ignoreCase*/
     true
   );
+  if (preferences.organizeImportsTypeOrder !== "inline") {
+    const { type: regularImports, regular: typeImports } = groupBy(specifiers, (s) => s.isTypeOnly ? "type" : "regular");
+    const regularCaseSensitivity = (regularImports == null ? void 0 : regularImports.length) ? detectSortCaseSensitivity(regularImports, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive) : void 0;
+    const typeCaseSensitivity = (typeImports == null ? void 0 : typeImports.length) ? detectSortCaseSensitivity(typeImports, (specifier) => specifier.name.text ?? "", collateCaseSensitive, collateCaseInsensitive) : void 0;
+    if (regularCaseSensitivity === void 0) {
+      return typeCaseSensitivity ?? 0 /* None */;
+    }
+    if (typeCaseSensitivity === void 0) {
+      return regularCaseSensitivity;
+    }
+    if (regularCaseSensitivity === 0 /* None */ || typeCaseSensitivity === 0 /* None */) {
+      return 0 /* None */;
+    }
+    return typeCaseSensitivity & regularCaseSensitivity;
+  }
   return detectSortCaseSensitivity(specifiers, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive);
 }, new ImportSpecifierSortingCache());
 function getImportDeclarationInsertionIndex(sortedImports, newImport, comparer) {
   const index = binarySearch(sortedImports, newImport, identity, (a, b) => compareImportsOrRequireStatements(a, b, comparer));
   return index < 0 ? ~index : index;
 }
-function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer) {
-  const index = binarySearch(sortedImports, newImport, identity, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer));
+function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer, preferences) {
+  const index = binarySearch(sortedImports, newImport, identity, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
   return index < 0 ? ~index : index;
 }
 function compareImportsOrRequireStatements(s1, s2, comparer) {

package/lib/typescript.d.ts

@@ -2933,6 +2933,13 @@ declare namespace ts {
                  * Default: `false`
                  */
                 readonly organizeImportsCaseFirst?: "upper" | "lower" | false;
+                /**
+                 * Indicates where named type-only imports should sort. "inline" sorts named imports without regard to if the import is
+                 * type-only.
+                 *
+                 * Default: `last`
+                 */
+                readonly organizeImportsTypeOrder?: "last" | "first" | "inline";
                 /**
                  * Indicates whether {@link ReferencesResponseItem.lineText} is supported.
                  */
@@ -8784,6 +8791,7 @@ declare namespace ts {
         readonly organizeImportsNumericCollation?: boolean;
         readonly organizeImportsAccentCollation?: boolean;
         readonly organizeImportsCaseFirst?: "upper" | "lower" | false;
+        readonly organizeImportsTypeOrder?: "first" | "last" | "inline";
         readonly excludeLibrarySymbolsInNavTo?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20240109`;
+      version = `${versionMajorMinor}.0-dev.20240110`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -13917,7 +13917,7 @@ ${lanes.join("\n")}
       case 116 /* VoidKeyword */:
         return node.parent.kind !== 222 /* VoidExpression */;
       case 233 /* ExpressionWithTypeArguments */:
-        return isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+        return isPartOfTypeExpressionWithTypeArguments(node);
       case 168 /* TypeParameter */:
         return node.parent.kind === 200 /* MappedType */ || node.parent.kind === 195 /* InferType */;
       case 80 /* Identifier */:
@@ -13942,7 +13942,7 @@ ${lanes.join("\n")}
         }
         switch (parent2.kind) {
           case 233 /* ExpressionWithTypeArguments */:
-            return isHeritageClause(parent2.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(parent2);
+            return isPartOfTypeExpressionWithTypeArguments(parent2);
           case 168 /* TypeParameter */:
             return node === parent2.constraint;
           case 352 /* JSDocTemplateTag */:
@@ -13976,6 +13976,9 @@ ${lanes.join("\n")}
     }
     return false;
   }
+  function isPartOfTypeExpressionWithTypeArguments(node) {
+    return isJSDocImplementsTag(node.parent) || isJSDocAugmentsTag(node.parent) || isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+  }
   function isChildOfNodeWithKind(node, kind) {
     while (node) {
       if (node.kind === kind) {
@@ -46774,6 +46777,14 @@ ${lanes.join("\n")}
       emptyArray,
       emptyArray
     );
+    var resolvingApparentMappedType = createAnonymousType(
+      /*symbol*/
+      void 0,
+      emptySymbols,
+      emptyArray,
+      emptyArray,
+      emptyArray
+    );
     var markerSuperType = createTypeParameter();
     var markerSubType = createTypeParameter();
     markerSubType.constraint = markerSuperType;
@@ -49823,29 +49834,7 @@ ${lanes.join("\n")}
     function getContainersOfSymbol(symbol, enclosingDeclaration, meaning) {
       const container = getParentOfSymbol(symbol);
       if (container && !(symbol.flags & 262144 /* TypeParameter */)) {
-        const additionalContainers = mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
-        const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
-        const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container, meaning);
-        if (enclosingDeclaration && container.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
-          container,
-          enclosingDeclaration,
-          1920 /* Namespace */,
-          /*useOnlyExternalAliasing*/
-          false
-        )) {
-          return append(concatenate(concatenate([container], additionalContainers), reexportContainers), objectLiteralContainer);
-        }
-        const firstVariableMatch = !(container.flags & getQualifiedLeftMeaning(meaning)) && container.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
-          return forEachEntry(t, (s) => {
-            if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container)) {
-              return s;
-            }
-          });
-        }) : void 0;
-        let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container] : [...additionalContainers, container];
-        res = append(res, objectLiteralContainer);
-        res = addRange(res, reexportContainers);
-        return res;
+        return getWithAlternativeContainers(container);
       }
       const candidates = mapDefined(symbol.declarations, (d) => {
         if (!isAmbientModule(d) && d.parent) {
@@ -49867,7 +49856,40 @@ ${lanes.join("\n")}
       if (!length(candidates)) {
         return void 0;
       }
-      return mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+      const containers = mapDefined(candidates, (candidate) => getAliasForSymbolInContainer(candidate, symbol) ? candidate : void 0);
+      let bestContainers = [];
+      let alternativeContainers = [];
+      for (const container2 of containers) {
+        const [bestMatch, ...rest] = getWithAlternativeContainers(container2);
+        bestContainers = append(bestContainers, bestMatch);
+        alternativeContainers = addRange(alternativeContainers, rest);
+      }
+      return concatenate(bestContainers, alternativeContainers);
+      function getWithAlternativeContainers(container2) {
+        const additionalContainers = mapDefined(container2.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
+        const reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
+        const objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container2, meaning);
+        if (enclosingDeclaration && container2.flags & getQualifiedLeftMeaning(meaning) && getAccessibleSymbolChain(
+          container2,
+          enclosingDeclaration,
+          1920 /* Namespace */,
+          /*useOnlyExternalAliasing*/
+          false
+        )) {
+          return append(concatenate(concatenate([container2], additionalContainers), reexportContainers), objectLiteralContainer);
+        }
+        const firstVariableMatch = !(container2.flags & getQualifiedLeftMeaning(meaning)) && container2.flags & 788968 /* Type */ && getDeclaredTypeOfSymbol(container2).flags & 524288 /* Object */ && meaning === 111551 /* Value */ ? forEachSymbolTableInScope(enclosingDeclaration, (t) => {
+          return forEachEntry(t, (s) => {
+            if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container2)) {
+              return s;
+            }
+          });
+        }) : void 0;
+        let res = firstVariableMatch ? [firstVariableMatch, ...additionalContainers, container2] : [...additionalContainers, container2];
+        res = append(res, objectLiteralContainer);
+        res = addRange(res, reexportContainers);
+        return res;
+      }
       function fileSymbolIfFileSymbolExportEqualsContainer(d) {
         return container && getFileSymbolIfFileSymbolExportEqualsContainer(d, container);
       }
@@ -49905,6 +49927,13 @@ ${lanes.join("\n")}
       });
     }
     function getSymbolIfSameReference(s1, s2) {
+      var _a, _b;
+      if (s1.flags & 524288 /* TypeAlias */ && ((_a = s2.declarations) == null ? void 0 : _a.find(isTypeAlias))) {
+        s2 = getDeclaredTypeOfTypeAlias(s2).aliasSymbol || s2;
+      }
+      if (s2.flags & 524288 /* TypeAlias */ && ((_b = s1.declarations) == null ? void 0 : _b.find(isTypeAlias))) {
+        s1 = getDeclaredTypeOfTypeAlias(s1).aliasSymbol || s1;
+      }
       if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
         return s1;
       }
@@ -57643,14 +57672,30 @@ ${lanes.join("\n")}
       return !!(typeParameter.symbol && forEach(typeParameter.symbol.declarations, (decl) => isTypeParameterDeclaration(decl) && decl.default));
     }
     function getApparentTypeOfMappedType(type) {
-      return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
+      if (type.resolvedApparentType) {
+        if (type.resolvedApparentType === resolvingApparentMappedType) {
+          return type.resolvedApparentType = type;
+        }
+        return type.resolvedApparentType;
+      }
+      type.resolvedApparentType = resolvingApparentMappedType;
+      return type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type);
     }
     function getResolvedApparentTypeOfMappedType(type) {
-      const typeVariable = getHomomorphicTypeVariable(type);
-      if (typeVariable && !type.declaration.nameType) {
-        const constraint = getConstraintOfTypeParameter(typeVariable);
+      const mappedType = type.target || type;
+      const typeVariable = getHomomorphicTypeVariable(mappedType);
+      if (typeVariable && !mappedType.declaration.nameType) {
+        let constraint;
+        if (!type.target) {
+          constraint = getConstraintOfTypeParameter(typeVariable);
+        } else {
+          const modifiersConstraint = getConstraintOfType(getModifiersTypeFromMappedType(type));
+          if (modifiersConstraint) {
+            constraint = getApparentType(modifiersConstraint);
+          }
+        }
         if (constraint && everyType(constraint, isArrayOrTupleType)) {
-          return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+          return instantiateType(mappedType, prependTypeMapping(typeVariable, constraint, mappedType.mapper));
         }
       }
       return type;
@@ -57741,6 +57786,7 @@ ${lanes.join("\n")}
           clone2.parent = (_c = (_b = singleProp.valueDeclaration) == null ? void 0 : _b.symbol) == null ? void 0 : _c.parent;
           clone2.links.containingType = containingType;
           clone2.links.mapper = links == null ? void 0 : links.mapper;
+          clone2.links.writeType = getWriteTypeOfSymbol(singleProp);
           return clone2;
         } else {
           return singleProp;
@@ -64366,6 +64412,18 @@ ${lanes.join("\n")}
         }
         return result2;
       }
+      function getApparentMappedTypeKeys(nameType, targetType) {
+        const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
+        const mappedKeys = [];
+        forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
+          modifiersType,
+          8576 /* StringOrNumberLiteralOrUnique */,
+          /*stringsOnly*/
+          false,
+          (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
+        );
+        return getUnionType(mappedKeys);
+      }
       function structuredTypeRelatedToWorker(source2, target2, reportErrors2, intersectionState, saveErrorInfo) {
         let result2;
         let originalErrorInfo;
@@ -64548,16 +64606,8 @@ ${lanes.join("\n")}
               const constraintType = getConstraintTypeFromMappedType(targetType);
               let targetKeys;
               if (nameType && isMappedTypeWithKeyofConstraintDeclaration(targetType)) {
-                const modifiersType = getApparentType(getModifiersTypeFromMappedType(targetType));
-                const mappedKeys = [];
-                forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(
-                  modifiersType,
-                  8576 /* StringOrNumberLiteralOrUnique */,
-                  /*stringsOnly*/
-                  false,
-                  (t) => void mappedKeys.push(instantiateType(nameType, appendTypeMapping(targetType.mapper, getTypeParameterFromMappedType(targetType), t)))
-                );
-                targetKeys = getUnionType([...mappedKeys, nameType]);
+                const mappedKeys = getApparentMappedTypeKeys(nameType, targetType);
+                targetKeys = getUnionType([mappedKeys, nameType]);
               } else {
                 targetKeys = nameType || constraintType;
               }
@@ -64728,9 +64778,18 @@ ${lanes.join("\n")}
             }
           }
         } else if (sourceFlags & 4194304 /* Index */) {
-          if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2)) {
+          const isDeferredMappedIndex = shouldDeferIndexType(source2.type, source2.indexFlags) && getObjectFlags(source2.type) & 32 /* Mapped */;
+          if (result2 = isRelatedTo(keyofConstraintType, target2, 1 /* Source */, reportErrors2 && !isDeferredMappedIndex)) {
             return result2;
           }
+          if (isDeferredMappedIndex) {
+            const mappedType = source2.type;
+            const nameType = getNameTypeFromMappedType(mappedType);
+            const sourceMappedKeys = nameType && isMappedTypeWithKeyofConstraintDeclaration(mappedType) ? getApparentMappedTypeKeys(nameType, mappedType) : nameType || getConstraintTypeFromMappedType(mappedType);
+            if (result2 = isRelatedTo(sourceMappedKeys, target2, 1 /* Source */, reportErrors2)) {
+              return result2;
+            }
+          }
         } else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
           if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
             const constraint = getBaseConstraintOfType(source2);
@@ -116428,7 +116487,14 @@ ${lanes.join("\n")}
     function willEmitLeadingNewLine(node) {
       if (!currentSourceFile)
         return false;
-      if (some(getLeadingCommentRanges(currentSourceFile.text, node.pos), commentWillEmitNewLine))
+      const leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos);
+      if (leadingCommentRanges) {
+        const parseNode = getParseTreeNode(node);
+        if (parseNode && isParenthesizedExpression(parseNode.parent)) {
+          return true;
+        }
+      }
+      if (some(leadingCommentRanges, commentWillEmitNewLine))
         return true;
       if (some(getSyntheticLeadingComments(node), commentWillEmitNewLine))
         return true;
@@ -151054,14 +151120,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
               aliasDeclaration.name
             );
             const comparer = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, sortKind === 2 /* CaseInsensitive */);
-            const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, comparer);
-            if (aliasDeclaration.parent.elements.indexOf(aliasDeclaration) !== insertionIndex) {
+            const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, comparer, preferences);
+            if (insertionIndex !== aliasDeclaration.parent.elements.indexOf(aliasDeclaration)) {
               changes.delete(sourceFile, aliasDeclaration);
               changes.insertImportSpecifierAtIndex(sourceFile, newSpecifier, aliasDeclaration.parent, insertionIndex);
               return aliasDeclaration;
             }
           }
-          changes.deleteRange(sourceFile, aliasDeclaration.getFirstToken());
+          changes.deleteRange(sourceFile, { pos: getTokenPosOfNode(aliasDeclaration.getFirstToken()), end: getTokenPosOfNode(aliasDeclaration.propertyName ?? aliasDeclaration.name) });
           return aliasDeclaration;
         } else {
           Debug.assert(aliasDeclaration.parent.parent.isTypeOnly);
@@ -151157,7 +151223,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
       if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
         for (const spec of newSpecifiers) {
-          const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+          const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer, preferences);
           changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
         }
       } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -166673,14 +166739,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       if (shouldRemove)
         importGroup = removeUnusedImports(importGroup, sourceFile, program);
       if (shouldCombine)
-        importGroup = coalesceImportsWorker(importGroup, comparer, sourceFile);
+        importGroup = coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
       if (shouldSort)
         importGroup = stableSort(importGroup, (s1, s2) => compareImportsOrRequireStatements(s1, s2, comparer));
       return importGroup;
     };
     topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
-      getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer)));
+      getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer, preferences)));
     }
     for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
       if (!ambientModule.body)
@@ -166689,7 +166755,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
       if (mode !== "RemoveUnused" /* RemoveUnused */) {
         const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
-        organizeImportsWorker(ambientModuleExportDecls, (group2) => coalesceExportsWorker(group2, comparer));
+        organizeImportsWorker(ambientModuleExportDecls, (group2) => coalesceExportsWorker(group2, comparer, preferences));
       }
     }
     return changeTracker.getChanges();
@@ -166821,11 +166887,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function getExternalModuleName2(specifier) {
     return specifier !== void 0 && isStringLiteralLike(specifier) ? specifier.text : void 0;
   }
-  function coalesceImports(importGroup, ignoreCase, sourceFile) {
+  function coalesceImports(importGroup, ignoreCase, sourceFile, preferences) {
     const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
-    return coalesceImportsWorker(importGroup, comparer, sourceFile);
+    return coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
   }
-  function coalesceImportsWorker(importGroup, comparer, sourceFile) {
+  function coalesceImportsWorker(importGroup, comparer, sourceFile, preferences) {
     if (importGroup.length === 0) {
       return importGroup;
     }
@@ -166879,7 +166945,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
       const sortedImportSpecifiers = factory.createNodeArray(
-        sortSpecifiers(newImportSpecifiers, comparer),
+        sortSpecifiers(newImportSpecifiers, comparer, preferences),
         firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
       );
       const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
@@ -166939,11 +167005,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       regularImports
     };
   }
-  function coalesceExports(exportGroup, ignoreCase) {
+  function coalesceExports(exportGroup, ignoreCase, preferences) {
     const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
-    return coalesceExportsWorker(exportGroup, comparer);
+    return coalesceExportsWorker(exportGroup, comparer, preferences);
   }
-  function coalesceExportsWorker(exportGroup, comparer) {
+  function coalesceExportsWorker(exportGroup, comparer, preferences) {
     if (exportGroup.length === 0) {
       return exportGroup;
     }
@@ -166958,7 +167024,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       const newExportSpecifiers = [];
       newExportSpecifiers.push(...flatMap(exportGroup2, (i) => i.exportClause && isNamedExports(i.exportClause) ? i.exportClause.elements : emptyArray));
-      const sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers, comparer);
+      const sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers, comparer, preferences);
       const exportDecl = exportGroup2[0];
       coalescedExports.push(
         factory.updateExportDeclaration(
@@ -167002,11 +167068,18 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       importDeclaration.attributes
     );
   }
-  function sortSpecifiers(specifiers, comparer) {
-    return stableSort(specifiers, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer));
+  function sortSpecifiers(specifiers, comparer, preferences) {
+    return stableSort(specifiers, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
   }
-  function compareImportOrExportSpecifiers(s1, s2, comparer) {
-    return compareBooleans(s1.isTypeOnly, s2.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+  function compareImportOrExportSpecifiers(s1, s2, comparer, preferences) {
+    switch (preferences == null ? void 0 : preferences.organizeImportsTypeOrder) {
+      case "first":
+        return compareBooleans(s2.isTypeOnly, s1.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+      case "inline":
+        return comparer(s1.name.text, s2.name.text);
+      default:
+        return compareBooleans(s1.isTypeOnly, s2.isTypeOnly) || comparer(s1.name.text, s2.name.text);
+    }
   }
   function compareModuleSpecifiers2(m1, m2, ignoreCase) {
     const comparer = getOrganizeImportsOrdinalStringComparer(!!ignoreCase);
@@ -167111,8 +167184,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const index = binarySearch(sortedImports, newImport, identity, (a, b) => compareImportsOrRequireStatements(a, b, comparer));
     return index < 0 ? ~index : index;
   }
-  function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer) {
-    const index = binarySearch(sortedImports, newImport, identity, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer));
+  function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer, preferences) {
+    const index = binarySearch(sortedImports, newImport, identity, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
     return index < 0 ? ~index : index;
   }
   function compareImportsOrRequireStatements(s1, s2, comparer) {
@@ -167241,8 +167314,26 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         }
       };
       detectImportSpecifierSorting = memoizeCached((specifiers, preferences) => {
-        if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s1.isTypeOnly, s2.isTypeOnly))) {
-          return 0 /* None */;
+        switch (preferences.organizeImportsTypeOrder) {
+          case "first":
+            if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s2.isTypeOnly, s1.isTypeOnly)))
+              return 0 /* None */;
+            break;
+          case "inline":
+            if (!arrayIsSorted(specifiers, (s1, s2) => {
+              const comparer = getStringComparer(
+                /*ignoreCase*/
+                true
+              );
+              return comparer(s1.name.text, s2.name.text);
+            })) {
+              return 0 /* None */;
+            }
+            break;
+          default:
+            if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s1.isTypeOnly, s2.isTypeOnly)))
+              return 0 /* None */;
+            break;
         }
         const collateCaseSensitive = getOrganizeImportsComparer(
           preferences,
@@ -167254,6 +167345,21 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           /*ignoreCase*/
           true
         );
+        if (preferences.organizeImportsTypeOrder !== "inline") {
+          const { type: regularImports, regular: typeImports } = groupBy(specifiers, (s) => s.isTypeOnly ? "type" : "regular");
+          const regularCaseSensitivity = (regularImports == null ? void 0 : regularImports.length) ? detectSortCaseSensitivity(regularImports, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive) : void 0;
+          const typeCaseSensitivity = (typeImports == null ? void 0 : typeImports.length) ? detectSortCaseSensitivity(typeImports, (specifier) => specifier.name.text ?? "", collateCaseSensitive, collateCaseInsensitive) : void 0;
+          if (regularCaseSensitivity === void 0) {
+            return typeCaseSensitivity ?? 0 /* None */;
+          }
+          if (typeCaseSensitivity === void 0) {
+            return regularCaseSensitivity;
+          }
+          if (regularCaseSensitivity === 0 /* None */ || typeCaseSensitivity === 0 /* None */) {
+            return 0 /* None */;
+          }
+          return typeCaseSensitivity & regularCaseSensitivity;
+        }
         return detectSortCaseSensitivity(specifiers, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive);
       }, new ImportSpecifierSortingCache());
     }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240109`;
+var version = `${versionMajorMinor}.0-dev.20240110`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20240109",
+    "version": "5.4.0-dev.20240110",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "f57e5104a3e21e82cafb818b531c8ec54ec0baa0"
+    "gitHead": "81793210e6337ad8d20f2b7e44e9489687c2d29c"
 }