typescript 5.4.0-dev.20240109 → 5.4.0-dev.20240111

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.20240111`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4352,6 +4352,7 @@ ${lanes.join("\n")}
         InternalSymbolName2["Default"] = "default";
         InternalSymbolName2["This"] = "this";
         InternalSymbolName2["InstantiationExpression"] = "__instantiationExpression";
+        InternalSymbolName2["ImportAttributes"] = "__importAttributes";
         return InternalSymbolName2;
       })(InternalSymbolName || {});
       NodeCheckFlags = /* @__PURE__ */ ((NodeCheckFlags2) => {
@@ -13917,7 +13918,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 +13943,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 +13977,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) {
@@ -18894,6 +18898,9 @@ ${lanes.join("\n")}
   function replaceFirstStar(s, replacement) {
     return stringReplace.call(s, "*", replacement);
   }
+  function getNameFromImportAttribute(node) {
+    return isIdentifier(node.name) ? node.name.escapedText : escapeLeadingUnderscores(node.name.text);
+  }
   var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, getScriptTargetFeatures, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashLibReferenceRegEx, fullTripleSlashAMDReferencePathRegEx, fullTripleSlashAMDModuleRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, objectAllocator, objectAllocatorPatchers, localizedDiagnosticMessages, computedOptions, getEmitScriptTarget, getEmitModuleKind, getEmitModuleResolutionKind, getEmitModuleDetectionKind, getIsolatedModules, getESModuleInterop, getAllowSyntheticDefaultImports, getResolvePackageJsonExports, getResolvePackageJsonImports, getResolveJsonModule, getEmitDeclarations, shouldPreserveConstEnums, isIncrementalCompilation, getAreDeclarationMapsEnabled, getAllowJSCompilerOption, getUseDefineForClassFields, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, extensionsNotSupportingExtensionlessResolution, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries, stringReplace;
   var init_utilities = __esm({
     "src/compiler/utilities.ts"() {
@@ -46774,6 +46781,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;
@@ -46928,6 +46943,7 @@ ${lanes.join("\n")}
     var deferredGlobalImportMetaType;
     var deferredGlobalImportMetaExpressionType;
     var deferredGlobalImportCallOptionsType;
+    var deferredGlobalImportAttributesType;
     var deferredGlobalDisposableType;
     var deferredGlobalAsyncDisposableType;
     var deferredGlobalExtractSymbol;
@@ -49823,29 +49839,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 +49861,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 +49932,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;
       }
@@ -55147,7 +55181,7 @@ ${lanes.join("\n")}
           /*reportErrors*/
           false
         ) : unknownType;
-        return addOptionality(widenTypeInferredFromInitializer(element, checkDeclarationInitializer(element, 0 /* Normal */, contextualType)));
+        return addOptionality(widenTypeInferredFromInitializer(element, checkDeclarationInitializer(element, reportErrors2 ? 0 /* Normal */ : 1 /* Contextual */, contextualType)));
       }
       if (isBindingPattern(element.name)) {
         return getTypeFromBindingPattern(element.name, includePatternInType, reportErrors2);
@@ -55228,6 +55262,24 @@ ${lanes.join("\n")}
         0 /* Normal */
       ), declaration, reportErrors2);
     }
+    function getTypeFromImportAttributes(node) {
+      const links = getNodeLinks(node);
+      if (!links.resolvedType) {
+        const symbol = createSymbol(4096 /* ObjectLiteral */, "__importAttributes" /* ImportAttributes */);
+        const members = createSymbolTable();
+        forEach(node.elements, (attr) => {
+          const member = createSymbol(4 /* Property */, getNameFromImportAttribute(attr));
+          member.parent = symbol;
+          member.links.type = checkImportAttribute(attr);
+          member.links.target = member;
+          members.set(member.escapedName, member);
+        });
+        const type = createAnonymousType(symbol, members, emptyArray, emptyArray, emptyArray);
+        type.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* NonInferrableType */;
+        links.resolvedType = type;
+      }
+      return links.resolvedType;
+    }
     function isGlobalSymbolConstructor(node) {
       const symbol = getSymbolOfNode(node);
       const globalSymbol = getGlobalESSymbolConstructorTypeSymbol(
@@ -55281,18 +55333,18 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function getTypeOfVariableOrParameterOrProperty(symbol) {
+    function getTypeOfVariableOrParameterOrProperty(symbol, checkMode) {
       const links = getSymbolLinks(symbol);
       if (!links.type) {
-        const type = getTypeOfVariableOrParameterOrPropertyWorker(symbol);
-        if (!links.type && !isParameterOfContextSensitiveSignature(symbol)) {
+        const type = getTypeOfVariableOrParameterOrPropertyWorker(symbol, checkMode);
+        if (!links.type && !isParameterOfContextSensitiveSignature(symbol) && !checkMode) {
           links.type = type;
         }
         return type;
       }
       return links.type;
     }
-    function getTypeOfVariableOrParameterOrPropertyWorker(symbol) {
+    function getTypeOfVariableOrParameterOrPropertyWorker(symbol, checkMode) {
       if (symbol.flags & 4194304 /* Prototype */) {
         return getTypeOfPrototypeProperty(symbol);
       }
@@ -55330,6 +55382,9 @@ ${lanes.join("\n")}
         if (symbol.flags & 512 /* ValueModule */ && !(symbol.flags & 67108864 /* Assignment */)) {
           return getTypeOfFuncClassEnumModule(symbol);
         }
+        if (isBindingElement(declaration) && checkMode === 1 /* Contextual */) {
+          return errorType;
+        }
         return reportCircularityError(symbol);
       }
       let type;
@@ -55367,6 +55422,9 @@ ${lanes.join("\n")}
         if (symbol.flags & 512 /* ValueModule */ && !(symbol.flags & 67108864 /* Assignment */)) {
           return getTypeOfFuncClassEnumModule(symbol);
         }
+        if (isBindingElement(declaration) && checkMode === 1 /* Contextual */) {
+          return type;
+        }
         return reportCircularityError(symbol);
       }
       return type;
@@ -55595,7 +55653,7 @@ ${lanes.join("\n")}
       }
       return getTypeOfSymbol(symbol);
     }
-    function getTypeOfSymbol(symbol) {
+    function getTypeOfSymbol(symbol, checkMode) {
       const checkFlags = getCheckFlags(symbol);
       if (checkFlags & 65536 /* DeferredType */) {
         return getTypeOfSymbolWithDeferredType(symbol);
@@ -55610,7 +55668,7 @@ ${lanes.join("\n")}
         return getTypeOfReverseMappedSymbol(symbol);
       }
       if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-        return getTypeOfVariableOrParameterOrProperty(symbol);
+        return getTypeOfVariableOrParameterOrProperty(symbol, checkMode);
       }
       if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 384 /* Enum */ | 512 /* ValueModule */)) {
         return getTypeOfFuncClassEnumModule(symbol);
@@ -57643,14 +57701,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 +57815,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;
@@ -59209,6 +59284,14 @@ ${lanes.join("\n")}
         reportErrors2
       )) || emptyObjectType;
     }
+    function getGlobalImportAttributesType(reportErrors2) {
+      return deferredGlobalImportAttributesType || (deferredGlobalImportAttributesType = getGlobalType(
+        "ImportAttributes",
+        /*arity*/
+        0,
+        reportErrors2
+      )) || emptyObjectType;
+    }
     function getGlobalESSymbolConstructorSymbol(reportErrors2) {
       return deferredGlobalESSymbolConstructorSymbol || (deferredGlobalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol", reportErrors2));
     }
@@ -64366,6 +64449,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 +64643,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 +64815,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);
@@ -69943,9 +70039,9 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getNarrowedTypeOfSymbol(symbol, location) {
+    function getNarrowedTypeOfSymbol(symbol, location, checkMode) {
       var _a;
-      const type = getTypeOfSymbol(symbol);
+      const type = getTypeOfSymbol(symbol, checkMode);
       const declaration = symbol.valueDeclaration;
       if (declaration) {
         if (isBindingElement(declaration) && !declaration.initializer && !declaration.dotDotDotToken && declaration.parent.elements.length >= 2) {
@@ -70072,7 +70168,7 @@ ${lanes.join("\n")}
         }
       }
       checkNestedBlockScopedBinding(node, symbol);
-      let type = getNarrowedTypeOfSymbol(localOrExportSymbol, node);
+      let type = getNarrowedTypeOfSymbol(localOrExportSymbol, node, checkMode);
       const assignmentKind = getAssignmentTargetKind(node);
       if (assignmentKind) {
         if (!(localOrExportSymbol.flags & 3 /* Variable */) && !(isInJSFile(node) && localOrExportSymbol.flags & 512 /* ValueModule */)) {
@@ -71382,6 +71478,8 @@ ${lanes.join("\n")}
         case 286 /* JsxOpeningElement */:
         case 285 /* JsxSelfClosingElement */:
           return getContextualJsxElementAttributesType(parent2, contextFlags);
+        case 301 /* ImportAttribute */:
+          return getContextualImportAttributeType(parent2);
       }
       return void 0;
     }
@@ -71429,6 +71527,12 @@ ${lanes.join("\n")}
         }
       }
     }
+    function getContextualImportAttributeType(node) {
+      return getTypeOfPropertyOfContextualType(getGlobalImportAttributesType(
+        /*reportErrors*/
+        false
+      ), getNameFromImportAttribute(node));
+    }
     function getContextualJsxElementAttributesType(node, contextFlags) {
       if (isJsxOpeningElement(node) && contextFlags !== 4 /* Completions */) {
         const index = findContextualNode(
@@ -83514,6 +83618,13 @@ ${lanes.join("\n")}
       var _a;
       const node = declaration.attributes;
       if (node) {
+        const importAttributesType = getGlobalImportAttributesType(
+          /*reportErrors*/
+          true
+        );
+        if (importAttributesType !== emptyObjectType) {
+          checkTypeAssignableTo(getTypeFromImportAttributes(node), getNullableType(importAttributesType, 32768 /* Undefined */), node);
+        }
         const validForTypeAttributes = isExclusivelyTypeOnlyImportOrExport(declaration);
         const override = getResolutionModeOverride(node, validForTypeAttributes ? grammarErrorOnNode : void 0);
         const isImportAttributes2 = declaration.attributes.token === 118 /* WithKeyword */;
@@ -83533,6 +83644,9 @@ ${lanes.join("\n")}
         }
       }
     }
+    function checkImportAttribute(node) {
+      return getRegularTypeOfLiteralType(checkExpressionCached(node.value));
+    }
     function checkImportDeclaration(node) {
       if (checkGrammarModuleElementContext(node, isInJSFile(node) ? Diagnostics.An_import_declaration_can_only_be_used_at_the_top_level_of_a_module : Diagnostics.An_import_declaration_can_only_be_used_at_the_top_level_of_a_namespace_or_module)) {
         return;
@@ -84948,6 +85062,12 @@ ${lanes.join("\n")}
       if (isMetaProperty(node.parent) && node.parent.keywordToken === node.kind) {
         return checkMetaPropertyKeyword(node.parent);
       }
+      if (isImportAttributes(node)) {
+        return getGlobalImportAttributesType(
+          /*reportErrors*/
+          false
+        );
+      }
       return errorType;
     }
     function getTypeOfAssignmentPattern(expr) {
@@ -116428,7 +116548,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;
@@ -122471,7 +122598,7 @@ ${lanes.join("\n")}
           }
           const isFromNodeModulesSearch = resolution.isExternalLibraryImport;
           const isJsFile = !resolutionExtensionIsTSOrJson(resolution.extension);
-          const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile;
+          const isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile && (!resolution.originalPath || pathContainsNodeModules(resolution.resolvedFileName));
           const resolvedFileName = resolution.resolvedFileName;
           if (isFromNodeModulesSearch) {
             currentNodeModulesDepth++;
@@ -151054,14 +151181,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 +151284,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) {
@@ -160017,7 +160144,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return isIdentifier(e) ? e : isPropertyAccessExpression(e) ? getLeftMostName(e.expression) : void 0;
     }
     function tryGetGlobalSymbols() {
-      const result = tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols() || tryGetObjectLikeCompletionSymbols() || tryGetImportCompletionSymbols() || tryGetImportOrExportClauseCompletionSymbols() || tryGetLocalNamedExportCompletionSymbols() || tryGetConstructorCompletion() || tryGetClassLikeCompletionSymbols() || tryGetJsxCompletionSymbols() || (getGlobalCompletions(), 1 /* Success */);
+      const result = tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols() || tryGetObjectLikeCompletionSymbols() || tryGetImportCompletionSymbols() || tryGetImportOrExportClauseCompletionSymbols() || tryGetImportAttributesCompletionSymbols() || tryGetLocalNamedExportCompletionSymbols() || tryGetConstructorCompletion() || tryGetClassLikeCompletionSymbols() || tryGetJsxCompletionSymbols() || (getGlobalCompletions(), 1 /* Success */);
       return result === 1 /* Success */;
     }
     function tryGetConstructorCompletion() {
@@ -160485,6 +160612,16 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       return 1 /* Success */;
     }
+    function tryGetImportAttributesCompletionSymbols() {
+      if (contextToken === void 0)
+        return 0 /* Continue */;
+      const importAttributes = contextToken.kind === 19 /* OpenBraceToken */ || contextToken.kind === 28 /* CommaToken */ ? tryCast(contextToken.parent, isImportAttributes) : contextToken.kind === 59 /* ColonToken */ ? tryCast(contextToken.parent.parent, isImportAttributes) : void 0;
+      if (importAttributes === void 0)
+        return 0 /* Continue */;
+      const existing = new Set(importAttributes.elements.map(getNameFromImportAttribute));
+      symbols = filter(typeChecker.getTypeAtLocation(importAttributes).getApparentProperties(), (attr) => !existing.has(attr.escapedName));
+      return 1 /* Success */;
+    }
     function tryGetLocalNamedExportCompletionSymbols() {
       var _a;
       const namedExports = contextToken && (contextToken.kind === 19 /* OpenBraceToken */ || contextToken.kind === 28 /* CommaToken */) ? tryCast(contextToken.parent, isNamedExports) : void 0;
@@ -166673,14 +166810,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 +166826,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 +166958,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 +167016,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 +167076,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 +167095,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 +167139,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 +167255,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 +167385,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 +167416,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());
     }
@@ -186337,6 +186514,7 @@ ${e.message}`;
     getModuleSpecifierEndingPreference: () => getModuleSpecifierEndingPreference,
     getModuleSpecifierResolverHost: () => getModuleSpecifierResolverHost,
     getNameForExportedSymbol: () => getNameForExportedSymbol,
+    getNameFromImportAttribute: () => getNameFromImportAttribute,
     getNameFromIndexInfo: () => getNameFromIndexInfo,
     getNameFromPropertyName: () => getNameFromPropertyName,
     getNameOfAccessExpression: () => getNameOfAccessExpression,
@@ -188758,6 +188936,7 @@ ${e.message}`;
     getModuleSpecifierEndingPreference: () => getModuleSpecifierEndingPreference,
     getModuleSpecifierResolverHost: () => getModuleSpecifierResolverHost,
     getNameForExportedSymbol: () => getNameForExportedSymbol,
+    getNameFromImportAttribute: () => getNameFromImportAttribute,
     getNameFromIndexInfo: () => getNameFromIndexInfo,
     getNameFromPropertyName: () => getNameFromPropertyName,
     getNameOfAccessExpression: () => getNameOfAccessExpression,