@typescript-deploys/pr-build 5.3.0-pr-55452-7 → 5.3.0-pr-55567-2

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-insiders.20230825`;
+      version = `${versionMajorMinor}.0-insiders.20230829`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1398,9 +1398,6 @@ var ts = (() => {
   function tryRemoveSuffix(str, suffix) {
     return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : void 0;
   }
-  function stringContains(str, substring) {
-    return str.indexOf(substring) !== -1;
-  }
   function removeMinAndVersionNumbers(fileName) {
     let end = fileName.length;
     for (let pos = end - 1; pos > 0; pos--) {
@@ -1583,12 +1580,6 @@ var ts = (() => {
       }
     }
   }
-  function padLeft(s, length2, padString = " ") {
-    return length2 <= s.length ? s : padString.repeat(length2 - s.length) + s;
-  }
-  function padRight(s, length2, padString = " ") {
-    return length2 <= s.length ? s : s + padString.repeat(length2 - s.length);
-  }
   function takeWhile(array, predicate) {
     if (array) {
       const len = array.length;
@@ -1609,19 +1600,10 @@ var ts = (() => {
       return array.slice(index);
     }
   }
-  function trimEndImpl(s) {
-    let end = s.length - 1;
-    while (end >= 0) {
-      if (!isWhiteSpaceLike(s.charCodeAt(end)))
-        break;
-      end--;
-    }
-    return s.slice(0, end + 1);
-  }
   function isNodeLikeSystem() {
     return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof module === "object";
   }
-  var emptyArray, emptyMap, emptySet, SortKind, elementAt, hasOwnProperty, fileNameLowerCaseRegExp, AssertionLevel, createUIStringComparer, uiComparerCaseSensitive, uiLocale, trimString, trimStringEnd, trimStringStart;
+  var emptyArray, emptyMap, emptySet, SortKind, elementAt, hasOwnProperty, fileNameLowerCaseRegExp, AssertionLevel, createUIStringComparer, uiComparerCaseSensitive, uiLocale;
   var init_core = __esm({
     "src/compiler/core.ts"() {
       "use strict";
@@ -1655,10 +1637,7 @@ var ts = (() => {
         return AssertionLevel2;
       })(AssertionLevel || {});
       createUIStringComparer = (() => {
-        let defaultComparer;
-        let enUSComparer;
-        const stringComparerFactory = getStringComparerFactory();
-        return createStringComparer;
+        return createIntlCollatorStringComparer;
         function compareWithCallback(a, b, comparer) {
           if (a === b)
             return 0 /* EqualTo */;
@@ -1673,45 +1652,7 @@ var ts = (() => {
           const comparer = new Intl.Collator(locale, { usage: "sort", sensitivity: "variant" }).compare;
           return (a, b) => compareWithCallback(a, b, comparer);
         }
-        function createLocaleCompareStringComparer(locale) {
-          if (locale !== void 0)
-            return createFallbackStringComparer();
-          return (a, b) => compareWithCallback(a, b, compareStrings);
-          function compareStrings(a, b) {
-            return a.localeCompare(b);
-          }
-        }
-        function createFallbackStringComparer() {
-          return (a, b) => compareWithCallback(a, b, compareDictionaryOrder);
-          function compareDictionaryOrder(a, b) {
-            return compareStrings(a.toUpperCase(), b.toUpperCase()) || compareStrings(a, b);
-          }
-          function compareStrings(a, b) {
-            return a < b ? -1 /* LessThan */ : a > b ? 1 /* GreaterThan */ : 0 /* EqualTo */;
-          }
-        }
-        function getStringComparerFactory() {
-          if (typeof Intl === "object" && typeof Intl.Collator === "function") {
-            return createIntlCollatorStringComparer;
-          }
-          if (typeof String.prototype.localeCompare === "function" && typeof String.prototype.toLocaleUpperCase === "function" && "a".localeCompare("B") < 0) {
-            return createLocaleCompareStringComparer;
-          }
-          return createFallbackStringComparer;
-        }
-        function createStringComparer(locale) {
-          if (locale === void 0) {
-            return defaultComparer || (defaultComparer = stringComparerFactory(locale));
-          } else if (locale === "en-US") {
-            return enUSComparer || (enUSComparer = stringComparerFactory(locale));
-          } else {
-            return stringComparerFactory(locale);
-          }
-        }
       })();
-      trimString = !!String.prototype.trim ? (s) => s.trim() : (s) => trimStringEnd(trimStringStart(s));
-      trimStringEnd = !!String.prototype.trimEnd ? (s) => s.trimEnd() : trimEndImpl;
-      trimStringStart = !!String.prototype.trimStart ? (s) => s.trimStart() : (s) => s.replace(/^\s+/g, "");
     }
   });
 
@@ -2810,18 +2751,18 @@ ${lanes.join("\n")}
   }
   function parseRange(text) {
     const alternatives = [];
-    for (let range of trimString(text).split(logicalOrRegExp)) {
+    for (let range of text.trim().split(logicalOrRegExp)) {
       if (!range)
         continue;
       const comparators = [];
-      range = trimString(range);
+      range = range.trim();
       const match = hyphenRegExp.exec(range);
       if (match) {
         if (!parseHyphen(match[1], match[2], comparators))
           return void 0;
       } else {
         for (const simple of range.split(whitespaceRegExp)) {
-          const match2 = rangeRegExp.exec(trimString(simple));
+          const match2 = rangeRegExp.exec(simple.trim());
           if (!match2 || !parseComparator(match2[1], match2[2], comparators))
             return void 0;
         }
@@ -5765,11 +5706,11 @@ ${lanes.join("\n")}
       return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames2, getCurrentDirectory);
     }
     function isInPath(path, searchPath) {
-      if (stringContains(path, searchPath))
+      if (path.includes(searchPath))
         return true;
       if (useCaseSensitiveFileNames2)
         return false;
-      return stringContains(toCanonicalFilePath(path), searchPath);
+      return toCanonicalFilePath(path).includes(searchPath);
     }
   }
   function createFileWatcherCallback(callback) {
@@ -6174,7 +6115,7 @@ ${lanes.join("\n")}
           let activeSession;
           let profilePath = "./profile.cpuprofile";
           const Buffer2 =   require("buffer").Buffer;
-          const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
+          const isWindows = process.platform === "win32";
           const platform = _os.platform();
           const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
           const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
@@ -6198,7 +6139,7 @@ ${lanes.join("\n")}
             tscWatchFile: process.env.TSC_WATCHFILE,
             useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
             tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
-            inodeWatching: isLinuxOrMacOs,
+            inodeWatching: !isWindows,
             sysLog
           });
           const nodeSystem = {
@@ -6638,7 +6579,7 @@ ${lanes.join("\n")}
     return !pathIsAbsolute(path) && !pathIsRelative(path);
   }
   function hasExtension(fileName) {
-    return stringContains(getBaseFileName(fileName), ".");
+    return getBaseFileName(fileName).includes(".");
   }
   function fileExtensionIs(path, extension) {
     return path.length > extension.length && endsWith(path, extension);
@@ -6783,7 +6724,7 @@ ${lanes.join("\n")}
     return root + pathComponents2.slice(1, length2).join(directorySeparator);
   }
   function normalizeSlashes(path) {
-    return path.indexOf("\\") !== -1 ? path.replace(backslashRegExp, directorySeparator) : path;
+    return path.includes("\\") ? path.replace(backslashRegExp, directorySeparator) : path;
   }
   function reducePathComponents(components) {
     if (!some(components))
@@ -10025,7 +9966,7 @@ ${lanes.join("\n")}
           tokenFlags |= 2048 /* ContainsInvalidEscape */;
           if (shouldEmitInvalidEscapeError) {
             const code = parseInt(text.substring(start2 + 1, pos), 8);
-            error2(Diagnostics.Octal_escape_sequences_are_not_allowed_Use_the_syntax_0, start2, pos - start2, "\\x" + padLeft(code.toString(16), 2, "0"));
+            error2(Diagnostics.Octal_escape_sequences_are_not_allowed_Use_the_syntax_0, start2, pos - start2, "\\x" + code.toString(16).padStart(2, "0"));
             return String.fromCharCode(code);
           }
           return text.substring(start2, pos);
@@ -10828,7 +10769,7 @@ ${lanes.join("\n")}
       return token;
     }
     function appendIfCommentDirective(commentDirectives2, text2, commentDirectiveRegEx, lineStart) {
-      const type = getDirectiveFromComment(trimStringStart(text2), commentDirectiveRegEx);
+      const type = getDirectiveFromComment(text2.trimStart(), commentDirectiveRegEx);
       if (type === void 0) {
         return commentDirectives2;
       }
@@ -11162,6 +11103,9 @@ ${lanes.join("\n")}
       inJSDocType += inType ? 1 : -1;
     }
   }
+  function codePointAt(s, i) {
+    return s.codePointAt(i);
+  }
   function charSize(ch) {
     if (ch >= 65536) {
       return 2;
@@ -11180,7 +11124,7 @@ ${lanes.join("\n")}
   function utf16EncodeAsString(codePoint) {
     return utf16EncodeAsStringWorker(codePoint);
   }
-  var textToKeywordObj, textToKeyword, textToToken, unicodeES3IdentifierStart, unicodeES3IdentifierPart, unicodeES5IdentifierStart, unicodeES5IdentifierPart, unicodeESNextIdentifierStart, unicodeESNextIdentifierPart, commentDirectiveRegExSingleLine, commentDirectiveRegExMultiLine, tokenStrings, mergeConflictMarkerLength, shebangTriviaRegex, codePointAt, utf16EncodeAsStringWorker;
+  var textToKeywordObj, textToKeyword, textToToken, unicodeES3IdentifierStart, unicodeES3IdentifierPart, unicodeES5IdentifierStart, unicodeES5IdentifierPart, unicodeESNextIdentifierStart, unicodeESNextIdentifierPart, commentDirectiveRegExSingleLine, commentDirectiveRegExMultiLine, tokenStrings, mergeConflictMarkerLength, shebangTriviaRegex, utf16EncodeAsStringWorker;
   var init_scanner = __esm({
     "src/compiler/scanner.ts"() {
       "use strict";
@@ -11346,20 +11290,6 @@ ${lanes.join("\n")}
       tokenStrings = makeReverseMap(textToToken);
       mergeConflictMarkerLength = "<<<<<<<".length;
       shebangTriviaRegex = /^#!.*/;
-      codePointAt = String.prototype.codePointAt ? (s, i) => s.codePointAt(i) : function codePointAt2(str, i) {
-        const size = str.length;
-        if (i < 0 || i >= size) {
-          return void 0;
-        }
-        const first2 = str.charCodeAt(i);
-        if (first2 >= 55296 && first2 <= 56319 && size > i + 1) {
-          const second = str.charCodeAt(i + 1);
-          if (second >= 56320 && second <= 57343) {
-            return (first2 - 55296) * 1024 + second - 56320 + 65536;
-          }
-        }
-        return first2;
-      };
       utf16EncodeAsStringWorker = String.fromCodePoint ? (codePoint) => String.fromCodePoint(codePoint) : utf16EncodeAsStringFallback;
     }
   });
@@ -13032,7 +12962,7 @@ ${lanes.join("\n")}
       void 0,
       Diagnostics.There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings,
       node10Result,
-      node10Result.indexOf(nodeModulesPathPart + "@types/") > -1 ? `@types/${mangleScopedPackageName(packageName)}` : packageName
+      node10Result.includes(nodeModulesPathPart + "@types/") ? `@types/${mangleScopedPackageName(packageName)}` : packageName
     ) : host.typesPackageExists(packageName) ? chainDiagnosticMessages(
       /*details*/
       void 0,
@@ -13308,7 +13238,7 @@ ${lanes.join("\n")}
     }
     let text = sourceText.substring(includeTrivia ? node.pos : skipTrivia(sourceText, node.pos), node.end);
     if (isJSDocTypeExpressionOrChild(node)) {
-      text = text.split(/\r\n|\n|\r/).map((line) => trimStringStart(line.replace(/^\s*\*/, ""))).join("\n");
+      text = text.split(/\r\n|\n|\r/).map((line) => line.replace(/^\s*\*/, "").trimStart()).join("\n");
     }
     return text;
   }
@@ -16053,7 +15983,7 @@ ${lanes.join("\n")}
   }
   function isIntrinsicJsxName(name) {
     const ch = name.charCodeAt(0);
-    return ch >= 97 /* a */ && ch <= 122 /* z */ || stringContains(name, "-");
+    return ch >= 97 /* a */ && ch <= 122 /* z */ || name.includes("-");
   }
   function getIndentString(level) {
     const singleLevel = indentStrings[1];
@@ -16066,7 +15996,7 @@ ${lanes.join("\n")}
     return indentStrings[1].length;
   }
   function isNightly() {
-    return stringContains(version, "-dev") || stringContains(version, "-insiders");
+    return version.includes("-dev") || version.includes("-insiders");
   }
   function createTextWriter(newLine) {
     var output;
@@ -16256,7 +16186,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     const specifier = getExternalModuleName(declaration);
-    if (specifier && isStringLiteralLike(specifier) && !pathIsRelative(specifier.text) && getCanonicalAbsolutePath(host, file.path).indexOf(getCanonicalAbsolutePath(host, ensureTrailingDirectorySeparator(host.getCommonSourceDirectory()))) === -1) {
+    if (specifier && isStringLiteralLike(specifier) && !pathIsRelative(specifier.text) && !getCanonicalAbsolutePath(host, file.path).includes(getCanonicalAbsolutePath(host, ensureTrailingDirectorySeparator(host.getCommonSourceDirectory())))) {
       return void 0;
     }
     return getResolvedExternalModuleName(host, file);
@@ -16608,7 +16538,7 @@ ${lanes.join("\n")}
   }
   function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
     const end = Math.min(commentEnd, nextLineStart - 1);
-    const currentLineText = trimString(text.substring(pos, end));
+    const currentLineText = text.substring(pos, end).trim();
     if (currentLineText) {
       writer.writeComment(currentLineText);
       if (end !== commentEnd) {
@@ -18196,7 +18126,7 @@ ${lanes.join("\n")}
     const flatBuiltins = flatten(builtins);
     const extensions = [
       ...builtins,
-      ...mapDefined(extraFileExtensions, (x) => x.scriptKind === 7 /* Deferred */ || needJsExtensions && isJSLike(x.scriptKind) && flatBuiltins.indexOf(x.extension) === -1 ? [x.extension] : void 0)
+      ...mapDefined(extraFileExtensions, (x) => x.scriptKind === 7 /* Deferred */ || needJsExtensions && isJSLike(x.scriptKind) && !flatBuiltins.includes(x.extension) ? [x.extension] : void 0)
     ];
     return extensions;
   }
@@ -18646,7 +18576,7 @@ ${lanes.join("\n")}
     }
   }
   function containsIgnoredPath(path) {
-    return some(ignoredPaths, (p) => stringContains(path, p));
+    return some(ignoredPaths, (p) => path.includes(p));
   }
   function getContainingNodeArray(node) {
     if (!node.parent)
@@ -18907,9 +18837,6 @@ ${lanes.join("\n")}
     }
     return Debug.fail();
   }
-  function isNamedTupleMemberName(node) {
-    return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
-  }
   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, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, extensionsNotSupportingExtensionlessResolution, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries;
   var init_utilities = __esm({
     "src/compiler/utilities.ts"() {
@@ -28202,7 +28129,7 @@ ${lanes.join("\n")}
     return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length2);
   }
   function isDeclarationFileName(fileName) {
-    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && stringContains(getBaseFileName(fileName), ".d.");
+    return fileExtensionIsOneOf(fileName, supportedDeclarationExtensions) || fileExtensionIs(fileName, ".ts" /* Ts */) && getBaseFileName(fileName).includes(".d.");
   }
   function parseResolutionMode(mode, pos, end, reportDiagnostic) {
     if (!mode) {
@@ -28385,7 +28312,7 @@ ${lanes.join("\n")}
       return {};
     if (!pragma.args)
       return {};
-    const args = trimString(text).split(/\s+/);
+    const args = text.trim().split(/\s+/);
     const argMap = {};
     for (let i = 0; i < pragma.args.length; i++) {
       const argument = pragma.args[i];
@@ -31129,29 +31056,21 @@ ${lanes.join("\n")}
           }
           return type;
         }
-        function isTokenColonOrQuestionColon() {
-          return token() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
+        function isNextTokenColonOrQuestionColon() {
+          return nextToken() === 59 /* ColonToken */ || token() === 58 /* QuestionToken */ && nextToken() === 59 /* ColonToken */;
         }
         function isTupleElementName() {
           if (token() === 26 /* DotDotDotToken */) {
-            nextToken();
-          }
-          if (token() === 16 /* TemplateHead */) {
-            parseTemplateType();
-            return isTokenColonOrQuestionColon();
+            return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
           }
-          if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
-            nextToken();
-            return isTokenColonOrQuestionColon();
-          }
-          return false;
+          return tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon();
         }
         function parseTupleElementNameOrTupleElementType() {
           if (lookAhead(isTupleElementName)) {
             const pos = getNodePos();
             const hasJSDoc = hasPrecedingJSDocComment();
             const dotDotDotToken = parseOptionalToken(26 /* DotDotDotToken */);
-            const name = token() === 15 /* NoSubstitutionTemplateLiteral */ ? parseLiteralLikeNode(token()) : token() === 16 /* TemplateHead */ ? parseTemplateType() : parseIdentifierName();
+            const name = parseIdentifierName();
             const questionToken = parseOptionalToken(58 /* QuestionToken */);
             parseExpected(59 /* ColonToken */);
             const type = parseTupleElementType();
@@ -34230,7 +34149,7 @@ ${lanes.join("\n")}
         }
         function parseModuleOrNamespaceDeclaration(pos, hasJSDoc, modifiers, flags) {
           const namespaceFlag = flags & 32 /* Namespace */;
-          const name = parseIdentifier();
+          const name = flags & 8 /* NestedNamespace */ ? parseIdentifierName() : parseIdentifier();
           const body = parseOptional(25 /* DotToken */) ? parseModuleOrNamespaceDeclaration(
             getNodePos(),
             /*hasJSDoc*/
@@ -34700,8 +34619,6 @@ ${lanes.join("\n")}
             PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
           })(PropertyLikeParse || (PropertyLikeParse = {}));
           function parseJSDocCommentWorker(start = 0, length2) {
-            const saveParsingContext = parsingContext;
-            parsingContext |= 1 << 25 /* JSDocComment */;
             const content = sourceText;
             const end = length2 === void 0 ? content.length : start + length2;
             length2 = end - start;
@@ -34718,6 +34635,8 @@ ${lanes.join("\n")}
             let commentsPos;
             let comments = [];
             const parts = [];
+            const saveParsingContext = parsingContext;
+            parsingContext |= 1 << 25 /* JSDocComment */;
             const result = scanner2.scanRange(start + 3, length2 - 5, doJSDocScan);
             parsingContext = saveParsingContext;
             return result;
@@ -34809,7 +34728,7 @@ ${lanes.join("\n")}
                     nextTokenJSDoc();
                   }
                 }
-              const trimmedComments = trimStringEnd(comments.join(""));
+              const trimmedComments = comments.join("").trimEnd();
               if (parts.length && trimmedComments.length) {
                 parts.push(finishNode(factory2.createJSDocText(trimmedComments), linkEnd ?? start, commentsPos));
               }
@@ -34825,7 +34744,7 @@ ${lanes.join("\n")}
             }
             function removeTrailingWhitespace(comments2) {
               while (comments2.length) {
-                const trimmed = trimStringEnd(comments2[comments2.length - 1]);
+                const trimmed = comments2[comments2.length - 1].trimEnd();
                 if (trimmed === "") {
                   comments2.pop();
                 } else if (trimmed.length < comments2[comments2.length - 1].length) {
@@ -35065,7 +34984,7 @@ ${lanes.join("\n")}
                   }
                 }
               removeLeadingNewlines(comments2);
-              const trimmedComments = trimStringEnd(comments2.join(""));
+              const trimmedComments = comments2.join("").trimEnd();
               if (parts2.length) {
                 if (trimmedComments.length) {
                   parts2.push(finishNode(factory2.createJSDocText(trimmedComments), linkEnd2 ?? commentsPos2));
@@ -35991,14 +35910,14 @@ ${lanes.join("\n")}
     return createDiagnostic(Diagnostics.Argument_for_0_option_must_be_Colon_1, `--${opt.name}`, stringNames);
   }
   function parseCustomTypeOption(opt, value, errors) {
-    return convertJsonOptionOfCustomType(opt, trimString(value || ""), errors);
+    return convertJsonOptionOfCustomType(opt, (value ?? "").trim(), errors);
   }
   function parseListTypeOption(opt, value = "", errors) {
-    value = trimString(value);
+    value = value.trim();
     if (startsWith(value, "-")) {
       return void 0;
     }
-    if (opt.type === "listOrElement" && !stringContains(value, ",")) {
+    if (opt.type === "listOrElement" && !value.includes(",")) {
       return validateJsonOptionValue(opt, value, errors);
     }
     if (value === "") {
@@ -36977,7 +36896,7 @@ ${lanes.join("\n")}
     var _a;
     basePath = normalizeSlashes(basePath);
     const resolvedPath = getNormalizedAbsolutePath(configFileName || "", basePath);
-    if (resolutionStack.indexOf(resolvedPath) >= 0) {
+    if (resolutionStack.includes(resolvedPath)) {
       errors.push(createCompilerDiagnostic(Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, [...resolutionStack, resolvedPath].join(" -> ")));
       return { raw: json || convertToObject(sourceFile, errors) };
     }
@@ -40332,7 +40251,7 @@ ${lanes.join("\n")}
       result = tryResolve(extensions, state);
     }
     let legacyResult;
-    if (((_a = result == null ? void 0 : result.value) == null ? void 0 : _a.isExternalLibraryImport) && !isConfigLookup && extensions & (1 /* TypeScript */ | 4 /* Declaration */) && features & 8 /* Exports */ && !isExternalModuleNameRelative(moduleName) && !extensionIsOk(1 /* TypeScript */ | 4 /* Declaration */, result.value.resolved.extension) && conditions.indexOf("import") > -1) {
+    if (((_a = result == null ? void 0 : result.value) == null ? void 0 : _a.isExternalLibraryImport) && !isConfigLookup && extensions & (1 /* TypeScript */ | 4 /* Declaration */) && features & 8 /* Exports */ && !isExternalModuleNameRelative(moduleName) && !extensionIsOk(1 /* TypeScript */ | 4 /* Declaration */, result.value.resolved.extension) && conditions.includes("import")) {
       traceIfEnabled(state, Diagnostics.Resolution_of_non_relative_name_failed_trying_with_modern_Node_resolution_features_disabled_to_see_if_npm_library_needs_configuration_update);
       const diagnosticState = {
         ...state,
@@ -40376,7 +40295,7 @@ ${lanes.join("\n")}
           resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
         }
         if (!resolved2) {
-          if (moduleName.indexOf(":") > -1) {
+          if (moduleName.includes(":")) {
             if (traceEnabled) {
               trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
             }
@@ -40465,7 +40384,7 @@ ${lanes.join("\n")}
     return void 0;
   }
   function pathContainsNodeModules(path) {
-    return stringContains(path, nodeModulesPathPart);
+    return path.includes(nodeModulesPathPart);
   }
   function parseNodeModuleFromPath(resolved, isFolder) {
     const path = normalizePath(resolved);
@@ -40501,7 +40420,7 @@ ${lanes.join("\n")}
   }
   function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
     const filename = getBaseFileName(candidate);
-    if (filename.indexOf(".") === -1) {
+    if (!filename.includes(".")) {
       return void 0;
     }
     let extensionless = removeFileExtension(candidate);
@@ -40658,7 +40577,7 @@ ${lanes.join("\n")}
     function loadEntrypointsFromTargetExports(target) {
       var _a, _b;
       if (typeof target === "string" && startsWith(target, "./")) {
-        if (target.indexOf("*") >= 0 && state.host.readDirectory) {
+        if (target.includes("*") && state.host.readDirectory) {
           if (target.indexOf("*") !== target.lastIndexOf("*")) {
             return false;
           }
@@ -40677,7 +40596,7 @@ ${lanes.join("\n")}
           });
         } else {
           const partsAfterFirst = getPathComponents(target).slice(2);
-          if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+          if (partsAfterFirst.includes("..") || partsAfterFirst.includes(".") || partsAfterFirst.includes("node_modules")) {
             return false;
           }
           const resolvedTarget = combinePaths(scope.packageDirectory, target);
@@ -41045,7 +40964,7 @@ ${lanes.join("\n")}
   }
   function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
     const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
-    if (!endsWith(moduleName, directorySeparator) && moduleName.indexOf("*") === -1 && hasProperty(lookupTable, moduleName)) {
+    if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
       const target = lookupTable[moduleName];
       return loadModuleFromTargetImportOrExport(
         target,
@@ -41056,7 +40975,7 @@ ${lanes.join("\n")}
         moduleName
       );
     }
-    const expandingKeys = sort(filter(getOwnKeys(lookupTable), (k) => k.indexOf("*") !== -1 || endsWith(k, "/")), comparePatternKeys);
+    const expandingKeys = sort(filter(getOwnKeys(lookupTable), (k) => k.includes("*") || endsWith(k, "/")), comparePatternKeys);
     for (const potentialTarget of expandingKeys) {
       if (state.features & 16 /* ExportsPatternTrailers */ && matchesPatternWithTrailer(potentialTarget, moduleName)) {
         const target = lookupTable[potentialTarget];
@@ -41150,7 +41069,7 @@ ${lanes.join("\n")}
         }
         const parts = pathIsRelative(target) ? getPathComponents(target).slice(1) : getPathComponents(target);
         const partsAfterFirst = parts.slice(1);
-        if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+        if (partsAfterFirst.includes("..") || partsAfterFirst.includes(".") || partsAfterFirst.includes("node_modules")) {
           if (state.traceEnabled) {
             trace(state.host, Diagnostics.package_json_scope_0_has_invalid_type_for_target_of_specifier_1, scope.packageDirectory, moduleName);
           }
@@ -41161,7 +41080,7 @@ ${lanes.join("\n")}
         }
         const resolvedTarget = combinePaths(scope.packageDirectory, target);
         const subpathParts = getPathComponents(subpath);
-        if (subpathParts.indexOf("..") >= 0 || subpathParts.indexOf(".") >= 0 || subpathParts.indexOf("node_modules") >= 0) {
+        if (subpathParts.includes("..") || subpathParts.includes(".") || subpathParts.includes("node_modules")) {
           if (state.traceEnabled) {
             trace(state.host, Diagnostics.package_json_scope_0_has_invalid_type_for_target_of_specifier_1, scope.packageDirectory, moduleName);
           }
@@ -41188,7 +41107,7 @@ ${lanes.join("\n")}
         if (!Array.isArray(target)) {
           traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
           for (const condition of getOwnKeys(target)) {
-            if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
+            if (condition === "default" || state.conditions.includes(condition) || isApplicableVersionedTypesKey(state.conditions, condition)) {
               traceIfEnabled(state, Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
               const subTarget = target[condition];
               const result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
@@ -41249,7 +41168,7 @@ ${lanes.join("\n")}
       }
       function tryLoadInputFileForPath(finalPath, entry, packagePath, isImports2) {
         var _a, _b, _c, _d;
-        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
+        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && !finalPath.includes("/node_modules/") && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
           const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
           const commonSourceDirGuesses = [];
           if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
@@ -41323,7 +41242,7 @@ ${lanes.join("\n")}
     }
   }
   function isApplicableVersionedTypesKey(conditions, key) {
-    if (conditions.indexOf("types") === -1)
+    if (!conditions.includes("types"))
       return false;
     if (!startsWith(key, "types@"))
       return false;
@@ -41527,7 +41446,7 @@ ${lanes.join("\n")}
     return mangledName;
   }
   function unmangleScopedPackageName(typesPackageName) {
-    return stringContains(typesPackageName, mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
+    return typesPackageName.includes(mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
   }
   function tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, containingDirectory, redirectedReference, state) {
     const result = cache && cache.getFromNonRelativeNameCache(moduleName, mode, containingDirectory, redirectedReference);
@@ -45242,12 +45161,12 @@ ${lanes.join("\n")}
             /*currentDirectory*/
             void 0
           );
-          const mode2 = endsWith(k, "/") ? 1 /* Directory */ : stringContains(k, "*") ? 2 /* Pattern */ : 0 /* Exact */;
+          const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
           return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode2);
         });
       } else {
         for (const key of getOwnKeys(exports)) {
-          if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
+          if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
             const subTarget = exports[key];
             const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
             if (result) {
@@ -45413,7 +45332,7 @@ ${lanes.join("\n")}
       return fileName;
     } else if (fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".d.cts" /* Dcts */, ".cts" /* Cts */])) {
       return noExtension + getJSExtensionForFile(fileName, options);
-    } else if (!fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */]) && fileExtensionIsOneOf(fileName, [".ts" /* Ts */]) && stringContains(fileName, ".d.")) {
+    } else if (!fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */]) && fileExtensionIsOneOf(fileName, [".ts" /* Ts */]) && fileName.includes(".d.")) {
       return tryGetRealFileNameForNonJsDeclarationFileName(fileName);
     }
     switch (allowedEndings[0]) {
@@ -45439,7 +45358,7 @@ ${lanes.join("\n")}
   }
   function tryGetRealFileNameForNonJsDeclarationFileName(fileName) {
     const baseName = getBaseFileName(fileName);
-    if (!endsWith(fileName, ".ts" /* Ts */) || !stringContains(baseName, ".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
+    if (!endsWith(fileName, ".ts" /* Ts */) || !baseName.includes(".d.") || fileExtensionIsOneOf(baseName, [".d.ts" /* Dts */]))
       return void 0;
     const noExtension = removeExtension(fileName, ".ts" /* Ts */);
     const ext = noExtension.substring(noExtension.lastIndexOf("."));
@@ -46059,6 +45978,7 @@ ${lanes.join("\n")}
     var anyType = createIntrinsicType(1 /* Any */, "any");
     var autoType = createIntrinsicType(1 /* Any */, "any", 262144 /* NonInferrableType */);
     var wildcardType = createIntrinsicType(1 /* Any */, "any");
+    var blockedStringType = createIntrinsicType(1 /* Any */, "any");
     var errorType = createIntrinsicType(1 /* Any */, "error");
     var unresolvedType = createIntrinsicType(1 /* Any */, "unresolved");
     var nonInferrableAnyType = createIntrinsicType(1 /* Any */, "any", 65536 /* ContainsWideningType */);
@@ -47745,7 +47665,7 @@ ${lanes.join("\n")}
       }
     }
     function isSameScopeDescendentOf(initial, parent2, stopAt) {
-      return !!parent2 && !!findAncestor(initial, (n) => n === parent2 || (n === stopAt || isFunctionLike(n) && (!getImmediatelyInvokedFunctionExpression(n) || isAsyncFunction(n)) ? "quit" : false));
+      return !!parent2 && !!findAncestor(initial, (n) => n === parent2 || (n === stopAt || isFunctionLike(n) && (!getImmediatelyInvokedFunctionExpression(n) || getFunctionFlags(n) & 3 /* AsyncGenerator */) ? "quit" : false));
     }
     function getAnyImportSyntax(node) {
       switch (node.kind) {
@@ -50563,11 +50483,10 @@ ${lanes.join("\n")}
                 for (let i = 0; i < tupleConstituentNodes.length; i++) {
                   const flags = type2.target.elementFlags[i];
                   const labeledElementDeclaration = labeledElementDeclarations == null ? void 0 : labeledElementDeclarations[i];
-                  const label = labeledElementDeclaration && getTupleElementLabel(type2, labeledElementDeclaration);
-                  if (label) {
+                  if (labeledElementDeclaration) {
                     tupleConstituentNodes[i] = factory.createNamedTupleMember(
                       flags & 12 /* Variable */ ? factory.createToken(26 /* DotDotDotToken */) : void 0,
-                      factory.createIdentifier(unescapeLeadingUnderscores(label)),
+                      factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(labeledElementDeclaration))),
                       flags & 2 /* Optional */ ? factory.createToken(58 /* QuestionToken */) : void 0,
                       flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]
                     );
@@ -51402,12 +51321,12 @@ ${lanes.join("\n")}
           if (!specifier) {
             specifier = getSpecifierForModuleSymbol(chain[0], context);
           }
-          if (!(context.flags & 67108864 /* AllowNodeModulesRelativePaths */) && getEmitModuleResolutionKind(compilerOptions) !== 1 /* Classic */ && specifier.indexOf("/node_modules/") >= 0) {
+          if (!(context.flags & 67108864 /* AllowNodeModulesRelativePaths */) && getEmitModuleResolutionKind(compilerOptions) !== 1 /* Classic */ && specifier.includes("/node_modules/")) {
             const oldSpecifier = specifier;
             if (getEmitModuleResolutionKind(compilerOptions) === 3 /* Node16 */ || getEmitModuleResolutionKind(compilerOptions) === 99 /* NodeNext */) {
               const swappedMode = (contextFile == null ? void 0 : contextFile.impliedNodeFormat) === 99 /* ESNext */ ? 1 /* CommonJS */ : 99 /* ESNext */;
               specifier = getSpecifierForModuleSymbol(chain[0], context, swappedMode);
-              if (specifier.indexOf("/node_modules/") >= 0) {
+              if (specifier.includes("/node_modules/")) {
                 specifier = oldSpecifier;
               } else {
                 assertion = factory.createImportTypeAssertionContainer(factory.createAssertClause(factory.createNodeArray([
@@ -51970,6 +51889,7 @@ ${lanes.join("\n")}
         }
       }
       function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
+        var _a;
         const serializePropertySymbolForClass = makeSerializePropertySymbol(
           factory.createPropertyDeclaration,
           174 /* MethodDeclaration */,
@@ -51991,12 +51911,15 @@ ${lanes.join("\n")}
           ...oldcontext,
           usedSymbolNames: new Set(oldcontext.usedSymbolNames),
           remappedSymbolNames: /* @__PURE__ */ new Map(),
+          remappedSymbolReferences: new Map((_a = oldcontext.remappedSymbolReferences) == null ? void 0 : _a.entries()),
           tracker: void 0
         };
         const tracker = {
           ...oldcontext.tracker.inner,
           trackSymbol: (sym, decl, meaning) => {
-            var _a;
+            var _a2, _b;
+            if ((_a2 = context.remappedSymbolNames) == null ? void 0 : _a2.has(getSymbolId(sym)))
+              return false;
             const accessibleResult = isSymbolAccessible(
               sym,
               decl,
@@ -52013,7 +51936,7 @@ ${lanes.join("\n")}
                   includePrivateSymbol(root);
                 }
               }
-            } else if ((_a = oldcontext.tracker.inner) == null ? void 0 : _a.trackSymbol) {
+            } else if ((_b = oldcontext.tracker.inner) == null ? void 0 : _b.trackSymbol) {
               return oldcontext.tracker.inner.trackSymbol(sym, decl, meaning);
             }
             return false;
@@ -52113,7 +52036,7 @@ ${lanes.join("\n")}
               for (const group2 of groups) {
                 if (group2.length > 1) {
                   statements = [
-                    ...filter(statements, (s) => group2.indexOf(s) === -1),
+                    ...filter(statements, (s) => !group2.includes(s)),
                     factory.createExportDeclaration(
                       /*modifiers*/
                       void 0,
@@ -52222,10 +52145,10 @@ ${lanes.join("\n")}
             context = oldContext;
           }
         }
-        function serializeSymbolWorker(symbol, isPrivate, propertyAsAlias) {
-          var _a, _b, _c, _d;
-          const symbolName2 = unescapeLeadingUnderscores(symbol.escapedName);
-          const isDefault = symbol.escapedName === "default" /* Default */;
+        function serializeSymbolWorker(symbol, isPrivate, propertyAsAlias, escapedSymbolName = symbol.escapedName) {
+          var _a2, _b, _c, _d, _e, _f;
+          const symbolName2 = unescapeLeadingUnderscores(escapedSymbolName);
+          const isDefault = escapedSymbolName === "default" /* Default */;
           if (isPrivate && !(context.flags & 131072 /* AllowAnonymousIdentifier */) && isStringANonContextualKeyword(symbolName2) && !isDefault) {
             context.encounteredError = true;
             return;
@@ -52236,7 +52159,7 @@ ${lanes.join("\n")}
             isPrivate = true;
           }
           const modifierFlags = (!isPrivate ? 1 /* Export */ : 0) | (isDefault && !needsPostExportDefault ? 1024 /* Default */ : 0);
-          const isConstMergedWithNS = symbol.flags & 1536 /* Module */ && symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */) && symbol.escapedName !== "export=" /* ExportEquals */;
+          const isConstMergedWithNS = symbol.flags & 1536 /* Module */ && symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */) && escapedSymbolName !== "export=" /* ExportEquals */;
           const isConstMergedWithNSPrintableAsSignatureMerge = isConstMergedWithNS && isTypeRepresentableAsFunctionNamespaceMerge(getTypeOfSymbol(symbol), symbol);
           if (symbol.flags & (16 /* Function */ | 8192 /* Method */) || isConstMergedWithNSPrintableAsSignatureMerge) {
             serializeAsFunctionNamespaceMerge(getTypeOfSymbol(symbol), symbol, getInternalSymbolName(symbol, symbolName2), modifierFlags);
@@ -52244,7 +52167,7 @@ ${lanes.join("\n")}
           if (symbol.flags & 524288 /* TypeAlias */) {
             serializeTypeAlias(symbol, symbolName2, modifierFlags);
           }
-          if (symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */ | 98304 /* Accessor */) && symbol.escapedName !== "export=" /* ExportEquals */ && !(symbol.flags & 4194304 /* Prototype */) && !(symbol.flags & 32 /* Class */) && !(symbol.flags & 8192 /* Method */) && !isConstMergedWithNSPrintableAsSignatureMerge) {
+          if (symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */ | 98304 /* Accessor */) && escapedSymbolName !== "export=" /* ExportEquals */ && !(symbol.flags & 4194304 /* Prototype */) && !(symbol.flags & 32 /* Class */) && !(symbol.flags & 8192 /* Method */) && !isConstMergedWithNSPrintableAsSignatureMerge) {
             if (propertyAsAlias) {
               const createdExport = serializeMaybeAliasAssignment(symbol);
               if (createdExport) {
@@ -52254,17 +52177,24 @@ ${lanes.join("\n")}
             } else {
               const type = getTypeOfSymbol(symbol);
               const localName = getInternalSymbolName(symbol, symbolName2);
-              if (!(symbol.flags & 16 /* Function */) && isTypeRepresentableAsFunctionNamespaceMerge(type, symbol)) {
+              if (type.symbol && type.symbol !== symbol && type.symbol.flags & 16 /* Function */ && some(type.symbol.declarations, isFunctionExpressionOrArrowFunction) && (((_a2 = type.symbol.members) == null ? void 0 : _a2.size) || ((_b = type.symbol.exports) == null ? void 0 : _b.size))) {
+                if (!context.remappedSymbolReferences) {
+                  context.remappedSymbolReferences = /* @__PURE__ */ new Map();
+                }
+                context.remappedSymbolReferences.set(getSymbolId(type.symbol), symbol);
+                serializeSymbolWorker(type.symbol, isPrivate, propertyAsAlias, escapedSymbolName);
+                context.remappedSymbolReferences.delete(getSymbolId(type.symbol));
+              } else if (!(symbol.flags & 16 /* Function */) && isTypeRepresentableAsFunctionNamespaceMerge(type, symbol)) {
                 serializeAsFunctionNamespaceMerge(type, symbol, localName, modifierFlags);
               } else {
-                const flags = !(symbol.flags & 2 /* BlockScopedVariable */) ? ((_a = symbol.parent) == null ? void 0 : _a.valueDeclaration) && isSourceFile((_b = symbol.parent) == null ? void 0 : _b.valueDeclaration) ? 2 /* Const */ : void 0 : isConstantVariable(symbol) ? 2 /* Const */ : 1 /* Let */;
+                const flags = !(symbol.flags & 2 /* BlockScopedVariable */) ? ((_c = symbol.parent) == null ? void 0 : _c.valueDeclaration) && isSourceFile((_d = symbol.parent) == null ? void 0 : _d.valueDeclaration) ? 2 /* Const */ : void 0 : isConstantVariable(symbol) ? 2 /* Const */ : 1 /* Let */;
                 const name = needsPostExportDefault || !(symbol.flags & 4 /* Property */) ? localName : getUnusedName(localName, symbol);
                 let textRange = symbol.declarations && find(symbol.declarations, (d) => isVariableDeclaration(d));
                 if (textRange && isVariableDeclarationList(textRange.parent) && textRange.parent.declarations.length === 1) {
                   textRange = textRange.parent.parent;
                 }
-                const propertyAccessRequire = (_c = symbol.declarations) == null ? void 0 : _c.find(isPropertyAccessExpression);
-                if (propertyAccessRequire && isBinaryExpression(propertyAccessRequire.parent) && isIdentifier(propertyAccessRequire.parent.right) && ((_d = type.symbol) == null ? void 0 : _d.valueDeclaration) && isSourceFile(type.symbol.valueDeclaration)) {
+                const propertyAccessRequire = (_e = symbol.declarations) == null ? void 0 : _e.find(isPropertyAccessExpression);
+                if (propertyAccessRequire && isBinaryExpression(propertyAccessRequire.parent) && isIdentifier(propertyAccessRequire.parent.right) && ((_f = type.symbol) == null ? void 0 : _f.valueDeclaration) && isSourceFile(type.symbol.valueDeclaration)) {
                   const alias = localName === propertyAccessRequire.parent.right.escapedText ? void 0 : propertyAccessRequire.parent.right;
                   addResult(
                     factory.createExportDeclaration(
@@ -52419,11 +52349,11 @@ ${lanes.join("\n")}
           results.push(node);
         }
         function serializeTypeAlias(symbol, symbolName2, modifierFlags) {
-          var _a;
+          var _a2;
           const aliasType = getDeclaredTypeOfTypeAlias(symbol);
           const typeParams = getSymbolLinks(symbol).typeParameters;
           const typeParamDecls = map(typeParams, (p) => typeParameterToDeclaration(p, context));
-          const jsdocAliasDecl = (_a = symbol.declarations) == null ? void 0 : _a.find(isJSDocTypeAlias);
+          const jsdocAliasDecl = (_a2 = symbol.declarations) == null ? void 0 : _a2.find(isJSDocTypeAlias);
           const commentText = getTextOfJSDocComment(jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : void 0);
           const oldFlags = context.flags;
           context.flags |= 8388608 /* InTypeAlias */;
@@ -52494,12 +52424,12 @@ ${lanes.join("\n")}
               /*isTypeOnly*/
               false,
               factory.createNamedExports(mapDefined(filter(mergedMembers, (n) => n.escapedName !== "export=" /* ExportEquals */), (s) => {
-                var _a, _b;
+                var _a2, _b;
                 const name = unescapeLeadingUnderscores(s.escapedName);
                 const localName2 = getInternalSymbolName(s, name);
                 const aliasDecl = s.declarations && getDeclarationOfAliasSymbol(s);
                 if (containingFile && (aliasDecl ? containingFile !== getSourceFileOfNode(aliasDecl) : !some(s.declarations, (d) => getSourceFileOfNode(d) === containingFile))) {
-                  (_b = (_a = context.tracker) == null ? void 0 : _a.reportNonlocalAugmentation) == null ? void 0 : _b.call(_a, containingFile, symbol, s);
+                  (_b = (_a2 = context.tracker) == null ? void 0 : _a2.reportNonlocalAugmentation) == null ? void 0 : _b.call(_a2, containingFile, symbol, s);
                   return void 0;
                 }
                 const target = aliasDecl && getTargetOfAliasDeclaration(
@@ -52665,8 +52595,8 @@ ${lanes.join("\n")}
           return void 0;
         }
         function serializeAsClass(symbol, localName, modifierFlags) {
-          var _a, _b;
-          const originalDecl = (_a = symbol.declarations) == null ? void 0 : _a.find(isClassLike);
+          var _a2, _b;
+          const originalDecl = (_a2 = symbol.declarations) == null ? void 0 : _a2.find(isClassLike);
           const oldEnclosing = context.enclosingDeclaration;
           context.enclosingDeclaration = originalDecl || oldEnclosing;
           const localParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -52762,7 +52692,7 @@ ${lanes.join("\n")}
           });
         }
         function serializeAsAlias(symbol, localName, modifierFlags) {
-          var _a, _b, _c, _d, _e;
+          var _a2, _b, _c, _d, _e;
           const node = getDeclarationOfAliasSymbol(symbol);
           if (!node)
             return Debug.fail();
@@ -52782,7 +52712,7 @@ ${lanes.join("\n")}
           includePrivateSymbol(target);
           switch (node.kind) {
             case 208 /* BindingElement */:
-              if (((_b = (_a = node.parent) == null ? void 0 : _a.parent) == null ? void 0 : _b.kind) === 260 /* VariableDeclaration */) {
+              if (((_b = (_a2 = node.parent) == null ? void 0 : _a2.parent) == null ? void 0 : _b.kind) === 260 /* VariableDeclaration */) {
                 const specifier2 = getSpecifierForModuleSymbol(target.parent || target, context);
                 const { propertyName } = node;
                 addResult(
@@ -53001,7 +52931,7 @@ ${lanes.join("\n")}
           );
         }
         function serializeMaybeAliasAssignment(symbol) {
-          var _a;
+          var _a2;
           if (symbol.flags & 4194304 /* Prototype */) {
             return false;
           }
@@ -53084,7 +53014,7 @@ ${lanes.join("\n")}
                     void 0,
                     serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)
                   )
-                ], ((_a = context.enclosingDeclaration) == null ? void 0 : _a.kind) === 267 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
+                ], ((_a2 = context.enclosingDeclaration) == null ? void 0 : _a2.kind) === 267 /* ModuleDeclaration */ ? 1 /* Let */ : 2 /* Const */)
               );
               addResult(
                 statement,
@@ -53114,7 +53044,7 @@ ${lanes.join("\n")}
         }
         function makeSerializePropertySymbol(createProperty2, methodKind, useAccessors) {
           return function serializePropertySymbol(p, isStatic2, baseType) {
-            var _a, _b, _c, _d, _e;
+            var _a2, _b, _c, _d, _e;
             const modifierFlags = getDeclarationModifierFlagsFromSymbol(p);
             const isPrivate = !!(modifierFlags & 8 /* Private */);
             if (isStatic2 && p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) {
@@ -53125,7 +53055,7 @@ ${lanes.join("\n")}
             }
             const flag = modifierFlags & ~512 /* Async */ | (isStatic2 ? 32 /* Static */ : 0);
             const name = getPropertyNameNodeForSymbol(p, context);
-            const firstPropertyLikeDecl = (_a = p.declarations) == null ? void 0 : _a.find(or(isPropertyDeclaration, isAccessor, isVariableDeclaration, isPropertySignature, isBinaryExpression, isPropertyAccessExpression));
+            const firstPropertyLikeDecl = (_a2 = p.declarations) == null ? void 0 : _a2.find(or(isPropertyDeclaration, isAccessor, isVariableDeclaration, isPropertySignature, isBinaryExpression, isPropertyAccessExpression));
             if (p.flags & 98304 /* Accessor */ && useAccessors) {
               const result = [];
               if (p.flags & 65536 /* SetAccessor */) {
@@ -53371,7 +53301,7 @@ ${lanes.join("\n")}
           }
         }
         function getUnusedName(input, symbol) {
-          var _a, _b;
+          var _a2, _b;
           const id = symbol ? getSymbolId(symbol) : void 0;
           if (id) {
             if (context.remappedSymbolNames.has(id)) {
@@ -53383,7 +53313,7 @@ ${lanes.join("\n")}
           }
           let i = 0;
           const original = input;
-          while ((_a = context.usedSymbolNames) == null ? void 0 : _a.has(input)) {
+          while ((_a2 = context.usedSymbolNames) == null ? void 0 : _a2.has(input)) {
             i++;
             input = `${original}_${i}`;
           }
@@ -53511,6 +53441,10 @@ ${lanes.join("\n")}
       }
     }
     function getNameOfSymbolAsWritten(symbol, context) {
+      var _a;
+      if ((_a = context == null ? void 0 : context.remappedSymbolReferences) == null ? void 0 : _a.has(getSymbolId(symbol))) {
+        symbol = context.remappedSymbolReferences.get(getSymbolId(symbol));
+      }
       if (context && symbol.escapedName === "default" /* Default */ && !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */) && // If it's not the first part of an entity name, it must print as `default`
       (!(context.flags & 16777216 /* InInitialEntityName */) || // if the symbol is synthesized, it will only be referenced externally it must print as `default`
       !symbol.declarations || // if not in the same binding context (source file, module declaration), it must print as `default`
@@ -55674,7 +55608,13 @@ ${lanes.join("\n")}
       const baseTypes = getBaseTypes(source);
       if (baseTypes.length) {
         if (source.symbol && members === getMembersOfSymbol(source.symbol)) {
-          members = createSymbolTable(source.declaredProperties);
+          const symbolTable = createSymbolTable();
+          for (const symbol of members.values()) {
+            if (!(symbol.flags & 262144 /* TypeParameter */)) {
+              symbolTable.set(symbol.escapedName, symbol);
+            }
+          }
+          members = symbolTable;
         }
         setStructuredTypeMembers(type, members, callSignatures, constructSignatures, indexInfos);
         const thisArgument = lastOrUndefined(typeArguments);
@@ -55791,7 +55731,7 @@ ${lanes.join("\n")}
       function getUniqAssociatedNamesFromTupleType(type, restName) {
         const associatedNamesMap = /* @__PURE__ */ new Map();
         return map(type.target.labeledElementDeclarations, (labeledElement, i) => {
-          const name = getTupleElementLabel(type, labeledElement, i, restName);
+          const name = getTupleElementLabel(labeledElement, i, restName);
           const prevCounter = associatedNamesMap.get(name);
           if (prevCounter === void 0) {
             associatedNamesMap.set(name, 1);
@@ -65073,6 +65013,9 @@ ${lanes.join("\n")}
     function isArrayLikeType(type) {
       return isArrayType(type) || !(type.flags & 98304 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
     }
+    function isMutableArrayLikeType(type) {
+      return isMutableArrayOrTuple(type) || !(type.flags & (1 /* Any */ | 98304 /* Nullable */)) && isTypeAssignableTo(type, anyArrayType);
+    }
     function getSingleBaseForNonAugmentingSubtype(type) {
       if (!(getObjectFlags(type) & 4 /* Reference */) || !(getObjectFlags(type.target) & 3 /* ClassOrInterface */)) {
         return void 0;
@@ -65490,7 +65433,7 @@ ${lanes.join("\n")}
           const param = declaration;
           if (isIdentifier(param.name)) {
             const originalKeywordKind = identifierToKeywordKind(param.name);
-            if ((isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.indexOf(param) > -1 && (resolveName(
+            if ((isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.includes(param) && (resolveName(
               param,
               param.name.escapedText,
               788968 /* Type */,
@@ -65576,7 +65519,12 @@ ${lanes.join("\n")}
         callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
       }
       if (targetRestType) {
-        callback(getRestTypeAtPosition(source, paramCount), targetRestType);
+        callback(getRestTypeAtPosition(
+          source,
+          paramCount,
+          /*readonly*/
+          isConstTypeVariable(targetRestType) && !someType(targetRestType, isMutableArrayLikeType)
+        ), targetRestType);
       }
     }
     function applyToReturnTypes(source, target, callback) {
@@ -66617,7 +66565,7 @@ ${lanes.join("\n")}
         const constraint = getConstraintOfTypeParameter(inference.typeParameter);
         if (constraint) {
           const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-          if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+          if (!inferredType || inferredType === blockedStringType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
             inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
           }
         }
@@ -70562,7 +70510,7 @@ ${lanes.join("\n")}
           elementTypes,
           elementFlags,
           /*readonly*/
-          inConstContext
+          inConstContext && !(contextualType && someType(contextualType, isMutableArrayLikeType))
         ));
       }
       return createArrayLiteralType(createArrayType(
@@ -70878,7 +70826,7 @@ ${lanes.join("\n")}
       return getJsxElementTypeAt(node) || anyType;
     }
     function isHyphenatedJsxName(name) {
-      return stringContains(name, "-");
+      return name.includes("-");
     }
     function isJsxIntrinsicTagName(tagName) {
       return isIdentifier(tagName) && isIntrinsicJsxName(tagName.escapedText) || isJsxNamespacedName(tagName);
@@ -71800,7 +71748,7 @@ ${lanes.join("\n")}
           apparentType,
           right.escapedText,
           /*skipObjectFunctionPropertyAugment*/
-          false,
+          isConstEnumObjectType(apparentType),
           /*includeTypeOnlyMembers*/
           node.kind === 166 /* QualifiedName */
         );
@@ -72583,7 +72531,7 @@ ${lanes.join("\n")}
           names.push(arg.tupleNameSource);
         }
       }
-      return createTupleType(types, flags, inConstContext, length(names) === length(types) ? names : void 0);
+      return createTupleType(types, flags, inConstContext && !someType(restType, isMutableArrayLikeType), length(names) === length(types) ? names : void 0);
     }
     function checkTypeArguments(signature, typeArgumentNodes, reportErrors2, headMessage) {
       const isJavascript = isInJSFile(signature.declaration);
@@ -74568,18 +74516,11 @@ ${lanes.join("\n")}
         !!declaration && (hasInitializer(declaration) || isOptionalDeclaration(declaration))
       );
     }
-    function getTupleElementLabel(tupleType, d, index, restParameterName = "arg") {
+    function getTupleElementLabel(d, index, restParameterName = "arg") {
       if (!d) {
         return `${restParameterName}_${index}`;
       }
-      Debug.assert(!isBindingPattern(d.name));
-      if (d.name.kind === 203 /* TemplateLiteralType */) {
-        const label = instantiateType(getTypeFromTypeNode(d.name), tupleType.mapper);
-        return label.flags & 128 /* StringLiteral */ ? escapeLeadingUnderscores(label.value) : typeof index === "number" ? `${restParameterName}_${index}` : void 0;
-      }
-      if (d.name.kind === 15 /* NoSubstitutionTemplateLiteral */) {
-        return escapeLeadingUnderscores(d.name.text);
-      }
+      Debug.assert(isIdentifier(d.name));
       return d.name.escapedText;
     }
     function getParameterNameAtPosition(signature, pos, overrideRestType) {
@@ -74592,7 +74533,7 @@ ${lanes.join("\n")}
       if (isTupleType(restType)) {
         const associatedNames = restType.target.labeledElementDeclarations;
         const index = pos - paramCount;
-        return getTupleElementLabel(restType, associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
+        return getTupleElementLabel(associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
       }
       return restParameter.escapedName;
     }
@@ -74622,7 +74563,8 @@ ${lanes.join("\n")}
         const index = pos - paramCount;
         const associatedName = associatedNames == null ? void 0 : associatedNames[index];
         const isRestTupleElement = !!(associatedName == null ? void 0 : associatedName.dotDotDotToken);
-        if (associatedName && isIdentifier(associatedName.name)) {
+        if (associatedName) {
+          Debug.assert(isIdentifier(associatedName.name));
           return { parameter: associatedName.name, parameterName: associatedName.name.escapedText, isRestParameter: isRestTupleElement };
         }
         return void 0;
@@ -74670,7 +74612,7 @@ ${lanes.join("\n")}
       }
       return void 0;
     }
-    function getRestTypeAtPosition(source, pos) {
+    function getRestTypeAtPosition(source, pos, readonly) {
       const parameterCount = getParameterCount(source);
       const minArgumentCount = getMinArgumentCount(source);
       const restType = getEffectiveRestType(source);
@@ -74693,13 +74635,7 @@ ${lanes.join("\n")}
           names.push(name);
         }
       }
-      return createTupleType(
-        types,
-        flags,
-        /*readonly*/
-        false,
-        length(names) === length(types) ? names : void 0
-      );
+      return createTupleType(types, flags, readonly, length(names) === length(types) ? names : void 0);
     }
     function getParameterCount(signature) {
       const length2 = signature.parameters.length;
@@ -74779,18 +74715,16 @@ ${lanes.join("\n")}
       const len = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0);
       for (let i = 0; i < len; i++) {
         const declaration = signature.parameters[i].valueDeclaration;
-        if (declaration.type) {
-          const typeNode = getEffectiveTypeAnnotationNode(declaration);
-          if (typeNode) {
-            const source = addOptionality(
-              getTypeFromTypeNode(typeNode),
-              /*isProperty*/
-              false,
-              isOptionalDeclaration(declaration)
-            );
-            const target = getTypeAtPosition(context, i);
-            inferTypes(inferenceContext.inferences, source, target);
-          }
+        const typeNode = getEffectiveTypeAnnotationNode(declaration);
+        if (typeNode) {
+          const source = addOptionality(
+            getTypeFromTypeNode(typeNode),
+            /*isProperty*/
+            false,
+            isOptionalDeclaration(declaration)
+          );
+          const target = getTypeAtPosition(context, i);
+          inferTypes(inferenceContext.inferences, source, target);
         }
       }
     }
@@ -77222,7 +77156,7 @@ ${lanes.join("\n")}
           return nullWideningType;
         case 15 /* NoSubstitutionTemplateLiteral */:
         case 11 /* StringLiteral */:
-          return hasSkipDirectInferenceFlag(node) ? wildcardType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
+          return hasSkipDirectInferenceFlag(node) ? blockedStringType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
         case 9 /* NumericLiteral */: {
           checkGrammarNumericLiteral(node);
           const value = +node.text;
@@ -78127,9 +78061,6 @@ ${lanes.join("\n")}
       if (node.type.kind === 191 /* RestType */) {
         grammarErrorOnNode(node.type, Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type);
       }
-      if (node.name.kind === 203 /* TemplateLiteralType */) {
-        checkSourceElement(node.name);
-      }
       checkSourceElement(node.type);
       getTypeFromTypeNode(node);
     }
@@ -86050,7 +85981,7 @@ ${lanes.join("\n")}
       return false;
     }
     function checkGrammarNumericLiteral(node) {
-      const isFractional = getTextOfNode(node).indexOf(".") !== -1;
+      const isFractional = getTextOfNode(node).includes(".");
       const isScientific = node.numericLiteralFlags & 16 /* Scientific */;
       if (isFractional || isScientific) {
         return;
@@ -87084,7 +87015,7 @@ ${lanes.join("\n")}
           return context.factory.updateNamedTupleMember(
             node,
             tokenVisitor ? nodeVisitor(node.dotDotDotToken, tokenVisitor, isDotDotDotToken) : node.dotDotDotToken,
-            Debug.checkDefined(nodeVisitor(node.name, visitor, isNamedTupleMemberName)),
+            Debug.checkDefined(nodeVisitor(node.name, visitor, isIdentifier)),
             tokenVisitor ? nodeVisitor(node.questionToken, tokenVisitor, isQuestionToken) : node.questionToken,
             Debug.checkDefined(nodeVisitor(node.type, visitor, isTypeNode))
           );
@@ -88110,7 +88041,7 @@ ${lanes.join("\n")}
       const line = lineInfo.getLineText(index);
       const comment = sourceMapCommentRegExp.exec(line);
       if (comment) {
-        return trimStringEnd(comment[1]);
+        return comment[1].trimEnd();
       } else if (!line.match(whitespaceOrMapCommentRegExp)) {
         break;
       }
@@ -109507,7 +109438,7 @@ ${lanes.join("\n")}
   }
   function hasInternalAnnotation(range, currentSourceFile) {
     const comment = currentSourceFile.text.substring(range.pos, range.end);
-    return stringContains(comment, "@internal");
+    return comment.includes("@internal");
   }
   function isInternalDeclaration(node, currentSourceFile) {
     const parseTreeNode = getParseTreeNode(node);
@@ -109960,6 +109891,9 @@ ${lanes.join("\n")}
         if (elem.kind === 232 /* OmittedExpression */) {
           return elem;
         }
+        if (elem.propertyName && isComputedPropertyName(elem.propertyName) && isEntityNameExpression(elem.propertyName.expression)) {
+          checkEntityNameVisibility(elem.propertyName.expression, enclosingDeclaration);
+        }
         if (elem.propertyName && isIdentifier(elem.propertyName) && isIdentifier(elem.name) && !elem.symbol.isReferenced && !isIdentifierANonContextualKeyword(elem.propertyName)) {
           return factory2.updateBindingElement(
             elem,
@@ -113964,7 +113898,7 @@ ${lanes.join("\n")}
           /*jsxAttributeEscape*/
           false
         );
-        return !(expression.numericLiteralFlags & 448 /* WithSpecifier */) && !stringContains(text, tokenToString(25 /* DotToken */)) && !stringContains(text, String.fromCharCode(69 /* E */)) && !stringContains(text, String.fromCharCode(101 /* e */));
+        return !(expression.numericLiteralFlags & 448 /* WithSpecifier */) && !text.includes(tokenToString(25 /* DotToken */)) && !text.includes(String.fromCharCode(69 /* E */)) && !text.includes(String.fromCharCode(101 /* e */));
       } else if (isAccessExpression(expression)) {
         const constantValue = getConstantValue(expression);
         return typeof constantValue === "number" && isFinite(constantValue) && constantValue >= 0 && Math.floor(constantValue) === constantValue;
@@ -117953,17 +117887,17 @@ ${lanes.join("\n")}
     for (let i = firstLine; i <= lastLine; i++) {
       context += host.getNewLine();
       if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-        context += indent3 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
+        context += indent3 + formatColorAndReset(ellipsis.padStart(gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
         i = lastLine - 1;
       }
       const lineStart = getPositionOfLineAndCharacter(file, i, 0);
       const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
       let lineContent = file.text.slice(lineStart, lineEnd);
-      lineContent = trimStringEnd(lineContent);
+      lineContent = lineContent.trimEnd();
       lineContent = lineContent.replace(/\t/g, " ");
-      context += indent3 + formatColorAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+      context += indent3 + formatColorAndReset((i + 1 + "").padStart(gutterWidth), gutterStyleSequence) + gutterSeparator;
       context += lineContent + host.getNewLine();
-      context += indent3 + formatColorAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+      context += indent3 + formatColorAndReset("".padStart(gutterWidth), gutterStyleSequence) + gutterSeparator;
       context += squiggleColor;
       if (i === firstLine) {
         const lastCharForLine = i === lastLine ? lastLineChar : void 0;
@@ -118792,7 +118726,7 @@ ${lanes.join("\n")}
       const resultFromDts = getRedirectReferenceForResolutionFromSourceOfProject(file.path);
       if (resultFromDts)
         return resultFromDts;
-      if (!host.realpath || !options.preserveSymlinks || !stringContains(file.originalFileName, nodeModulesPathPart))
+      if (!host.realpath || !options.preserveSymlinks || !file.originalFileName.includes(nodeModulesPathPart))
         return void 0;
       const realDeclarationPath = toPath3(host.realpath(file.originalFileName));
       return realDeclarationPath === file.path ? void 0 : getRedirectReferenceForResolutionFromSourceOfProject(realDeclarationPath);
@@ -120050,7 +119984,7 @@ ${lanes.join("\n")}
       const path = toPath3(fileName);
       if (useSourceOfProjectReferenceRedirect) {
         let source = getSourceOfProjectReferenceRedirect(path);
-        if (!source && host.realpath && options.preserveSymlinks && isDeclarationFileName(fileName) && stringContains(fileName, nodeModulesPathPart)) {
+        if (!source && host.realpath && options.preserveSymlinks && isDeclarationFileName(fileName) && fileName.includes(nodeModulesPathPart)) {
           const realPath2 = toPath3(host.realpath(fileName));
           if (realPath2 !== path)
             source = getSourceOfProjectReferenceRedirect(realPath2);
@@ -121410,7 +121344,7 @@ ${lanes.join("\n")}
       var _a;
       if (!host.getResolvedProjectReferences() || containsIgnoredPath(directory))
         return;
-      if (!originalRealpath || !stringContains(directory, nodeModulesPathPart))
+      if (!originalRealpath || !directory.includes(nodeModulesPathPart))
         return;
       const symlinkCache = host.getSymlinkCache();
       const directoryPath = ensureTrailingDirectorySeparator(host.toPath(directory));
@@ -121438,7 +121372,7 @@ ${lanes.join("\n")}
       if (!symlinkedDirectories)
         return false;
       const fileOrDirectoryPath = host.toPath(fileOrDirectory);
-      if (!stringContains(fileOrDirectoryPath, nodeModulesPathPart))
+      if (!fileOrDirectoryPath.includes(nodeModulesPathPart))
         return false;
       if (isFile && ((_a = symlinkCache.getSymlinkedFiles()) == null ? void 0 : _a.has(fileOrDirectoryPath)))
         return true;
@@ -123486,7 +123420,7 @@ ${lanes.join("\n")}
     if (endsWith(path, "/node_modules/.staging")) {
       return removeSuffix(path, "/.staging");
     }
-    return some(ignoredPaths, (searchPath) => stringContains(path, searchPath)) ? void 0 : path;
+    return some(ignoredPaths, (searchPath) => path.includes(searchPath)) ? void 0 : path;
   }
   function perceivedOsRootLengthForWatching(pathComponents2, length2) {
     if (length2 <= 1)
@@ -128335,7 +128269,7 @@ ${lanes.join("\n")}
 
   // src/jsTyping/shared.ts
   function hasArgument(argumentName) {
-    return sys.args.indexOf(argumentName) >= 0;
+    return sys.args.includes(argumentName);
   }
   function findArgument(argumentName) {
     const index = sys.args.indexOf(argumentName);
@@ -128343,7 +128277,7 @@ ${lanes.join("\n")}
   }
   function nowString() {
     const d = /* @__PURE__ */ new Date();
-    return `${padLeft(d.getHours().toString(), 2, "0")}:${padLeft(d.getMinutes().toString(), 2, "0")}:${padLeft(d.getSeconds().toString(), 2, "0")}.${padLeft(d.getMilliseconds().toString(), 3, "0")}`;
+    return `${d.getHours().toString().padStart(2, "0")}:${d.getMinutes().toString().padStart(2, "0")}:${d.getSeconds().toString().padStart(2, "0")}.${d.getMilliseconds().toString().padStart(3, "0")}`;
   }
   var ActionSet, ActionInvalidate, ActionPackageInstalled, EventTypesRegistry, EventBeginInstallTypes, EventEndInstallTypes, EventInitializationFailed, ActionWatchTypingLocations, Arguments;
   var init_shared = __esm({
@@ -131163,7 +131097,7 @@ ${lanes.join("\n")}
       return false;
     }
     function getNodeModulesPackageNameFromFileName(importedFileName, moduleSpecifierResolutionHost) {
-      if (!stringContains(importedFileName, "node_modules")) {
+      if (!importedFileName.includes("node_modules")) {
         return void 0;
       }
       const specifier = ts_moduleSpecifiers_exports.getNodeModulesPackageName(
@@ -131780,7 +131714,7 @@ ${lanes.join("\n")}
     var _a;
     const isExcluded = excludePatterns && ((fileName) => excludePatterns.some((p) => p.test(fileName)));
     for (const ambient of checker.getAmbientModules()) {
-      if (!stringContains(ambient.name, "*") && !(excludePatterns && ((_a = ambient.declarations) == null ? void 0 : _a.every((d) => isExcluded(d.getSourceFile().fileName))))) {
+      if (!ambient.name.includes("*") && !(excludePatterns && ((_a = ambient.declarations) == null ? void 0 : _a.every((d) => isExcluded(d.getSourceFile().fileName))))) {
         cb(
           ambient,
           /*sourceFile*/
@@ -140814,7 +140748,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return symbolId;
     }
     function checkForUsedDeclarations(node) {
-      if (node === targetRange.range || isReadonlyArray(targetRange.range) && targetRange.range.indexOf(node) >= 0) {
+      if (node === targetRange.range || isReadonlyArray(targetRange.range) && targetRange.range.includes(node)) {
         return;
       }
       const sym = isIdentifier(node) ? getSymbolReferencedByIdentifier(node) : checker.getSymbolAtLocation(node);
@@ -142680,7 +142614,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return char >= 97 /* a */ && char <= 122 /* z */ || char >= 65 /* A */ && char <= 90 /* Z */ || char >= 48 /* _0 */ && char <= 57 /* _9 */;
       }
       function isNodeModulesFile(path) {
-        return stringContains(path, "/node_modules/");
+        return path.includes("/node_modules/");
       }
     }
     function getRenameInfo2(fileName, position, preferences) {
@@ -152521,7 +152455,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isCallbackLike(checker, sourceFile, name) {
-    return !!ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(name, checker, sourceFile, (reference) => isIdentifier(reference) && isCallExpression(reference.parent) && reference.parent.arguments.indexOf(reference) >= 0);
+    return !!ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(name, checker, sourceFile, (reference) => isIdentifier(reference) && isCallExpression(reference.parent) && reference.parent.arguments.includes(reference));
   }
   function isLastParameter(func, parameter, isFixAll) {
     const parameters = func.parameters;
@@ -160373,7 +160307,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function addReplacementSpans(text, textStart, names) {
     const span = getDirectoryFragmentTextSpan(text, textStart);
     const wholeSpan = text.length === 0 ? void 0 : createTextSpan(textStart, text.length);
-    return names.map(({ name, kind, extension }) => Math.max(name.indexOf(directorySeparator), name.indexOf(altDirectorySeparator)) !== -1 ? { name, kind, extension, span: wholeSpan } : { name, kind, extension, span });
+    return names.map(({ name, kind, extension }) => name.includes(directorySeparator) || name.includes(altDirectorySeparator) ? { name, kind, extension, span: wholeSpan } : { name, kind, extension, span });
   }
   function getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) {
     return addReplacementSpans(node.text, node.getStart(sourceFile) + 1, getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker, preferences));
@@ -160699,7 +160633,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     if (target && typeof target === "object" && !isArray(target)) {
       for (const condition in target) {
-        if (condition === "default" || conditions.indexOf(condition) > -1 || isApplicableVersionedTypesKey(conditions, condition)) {
+        if (condition === "default" || conditions.includes(condition) || isApplicableVersionedTypesKey(conditions, condition)) {
           const pattern = target[condition];
           return getPatternFromFirstMatchingCondition(pattern, conditions);
         }
@@ -160711,7 +160645,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionsForPathMapping(path, patterns, fragment, packageDirectory, extensionOptions, host) {
     if (!endsWith(path, "*")) {
-      return !stringContains(path, "*") ? justPathMappingName(path, "script" /* scriptElement */) : emptyArray;
+      return !path.includes("*") ? justPathMappingName(path, "script" /* scriptElement */) : emptyArray;
     }
     const pathPrefix = path.slice(0, path.length - 1);
     const remainingFragment = tryRemovePrefix(fragment, pathPrefix);
@@ -160781,7 +160715,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getAmbientModuleCompletions(fragment, fragmentDirectory, checker) {
     const ambientModules = checker.getAmbientModules().map((sym) => stripQuotes(sym.name));
-    const nonRelativeModuleNames = ambientModules.filter((moduleName) => startsWith(moduleName, fragment) && moduleName.indexOf("*") < 0);
+    const nonRelativeModuleNames = ambientModules.filter((moduleName) => startsWith(moduleName, fragment) && !moduleName.includes("*"));
     if (fragmentDirectory !== void 0) {
       const moduleNameWithSeparator = ensureTrailingDirectorySeparator(fragmentDirectory);
       return nonRelativeModuleNames.map((nonRelativeModuleName) => removePrefix(nonRelativeModuleName, moduleNameWithSeparator));
@@ -160895,7 +160829,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     return false;
   }
   function containsSlash(fragment) {
-    return stringContains(fragment, directorySeparator);
+    return fragment.includes(directorySeparator);
   }
   function isRequireCallArgument(node) {
     return isCallExpression(node.parent) && firstOrUndefined(node.parent.arguments) === node && isIdentifier(node.parent.expression) && node.parent.expression.escapedText === "require";
@@ -165474,11 +165408,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isRegionDelimiter(lineText) {
-    lineText = trimStringStart(lineText);
+    lineText = lineText.trimStart();
     if (!startsWith(lineText, "//")) {
       return null;
     }
-    lineText = trimString(lineText.slice(2));
+    lineText = lineText.slice(2).trim();
     return regionDelimiterRegExp.exec(lineText);
   }
   function addOutliningForLeadingCommentsForPos(pos, sourceFile, cancellationToken, out) {
@@ -169788,7 +169722,7 @@ ${options.prefix}` : "\n" : options.prefix
     return positionIsASICandidate(context.currentTokenSpan.end, context.currentTokenParent, context.sourceFile);
   }
   function isNotPropertyAccessOnIntegerLiteral(context) {
-    return !isPropertyAccessExpression(context.contextNode) || !isNumericLiteral(context.contextNode.expression) || context.contextNode.expression.getText().indexOf(".") !== -1;
+    return !isPropertyAccessExpression(context.contextNode) || !isNumericLiteral(context.contextNode.expression) || context.contextNode.expression.getText().includes(".");
   }
   var init_rules = __esm({
     "src/services/formatting/rules.ts"() {
@@ -170984,7 +170918,7 @@ ${options.prefix}` : "\n" : options.prefix
           }
           const containerList = getListByPosition(position, precedingToken.parent, sourceFile);
           if (containerList && !rangeContainsRange(containerList, precedingToken)) {
-            const useTheSameBaseIndentation = [218 /* FunctionExpression */, 219 /* ArrowFunction */].indexOf(currentToken.parent.kind) !== -1;
+            const useTheSameBaseIndentation = [218 /* FunctionExpression */, 219 /* ArrowFunction */].includes(currentToken.parent.kind);
             const indentSize = useTheSameBaseIndentation ? 0 : options.indentSize;
             return getActualIndentationForListStartLine(containerList, sourceFile, options) + indentSize;
           }
@@ -172575,7 +172509,7 @@ ${options.prefix}` : "\n" : options.prefix
 
   // src/server/scriptInfo.ts
   function isDynamicFileName(fileName) {
-    return fileName[0] === "^" || (stringContains(fileName, "walkThroughSnippet:/") || stringContains(fileName, "untitled:/")) && getBaseFileName(fileName)[0] === "^" || stringContains(fileName, ":^") && !stringContains(fileName, directorySeparator);
+    return fileName[0] === "^" || (fileName.includes("walkThroughSnippet:/") || fileName.includes("untitled:/")) && getBaseFileName(fileName)[0] === "^" || fileName.includes(":^") && !fileName.includes(directorySeparator);
   }
   function ensurePrimaryProjectKind(project) {
     if (!project || project.projectKind === 3 /* AutoImportProvider */ || project.projectKind === 4 /* Auxiliary */) {
@@ -174225,7 +174159,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         removeExistingTypings(include) {
           const existing = getAutomaticTypeDirectiveNames(this.getCompilerOptions(), this.directoryStructureHost);
-          return include.filter((i) => existing.indexOf(i) < 0);
+          return include.filter((i) => !existing.includes(i));
         }
         updateGraphWorker() {
           var _a, _b;
@@ -178422,7 +178356,7 @@ Dynamic files must always be opened with service's current directory or service
                 this.logger.info(`Excluding files based on rule ${name} matching file '${root}'`);
                 if (rule2.types) {
                   for (const type of rule2.types) {
-                    if (typeAcqInclude.indexOf(type) < 0) {
+                    if (!typeAcqInclude.includes(type)) {
                       typeAcqInclude.push(type);
                     }
                   }
@@ -178441,13 +178375,13 @@ Dynamic files must always be opened with service's current directory or service
                         return groupNumberOrString;
                       }).join("");
                     });
-                    if (excludeRules.indexOf(processedRule) === -1) {
+                    if (!excludeRules.includes(processedRule)) {
                       excludeRules.push(processedRule);
                     }
                   }
                 } else {
                   const escaped = _ProjectService.escapeFilenameForRegex(root);
-                  if (excludeRules.indexOf(escaped) < 0) {
+                  if (!excludeRules.includes(escaped)) {
                     excludeRules.push(escaped);
                   }
                 }
@@ -178471,7 +178405,7 @@ Dynamic files must always be opened with service's current directory or service
                     this.logger.info(`Excluded '${normalizedNames[i]}' because it matched ${cleanedTypingName} from the legacy safelist`);
                     excludedFiles.push(normalizedNames[i]);
                     exclude = true;
-                    if (typeAcqInclude.indexOf(typeName) < 0) {
+                    if (!typeAcqInclude.includes(typeName)) {
                       typeAcqInclude.push(typeName);
                     }
                   }
@@ -182011,7 +181945,7 @@ ${e.message}`;
           if (languageServiceDisabled) {
             return;
           }
-          const fileNamesInProject = fileNames.filter((value) => !stringContains(value, "lib.d.ts"));
+          const fileNamesInProject = fileNames.filter((value) => !value.includes("lib.d.ts"));
           if (fileNamesInProject.length === 0) {
             return;
           }
@@ -184703,7 +184637,6 @@ ${e.message}`;
     isNamedImports: () => isNamedImports,
     isNamedImportsOrExports: () => isNamedImportsOrExports,
     isNamedTupleMember: () => isNamedTupleMember,
-    isNamedTupleMemberName: () => isNamedTupleMemberName,
     isNamespaceBody: () => isNamespaceBody,
     isNamespaceExport: () => isNamespaceExport,
     isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -185066,8 +184999,6 @@ ${e.message}`;
     outFile: () => outFile,
     packageIdToPackageName: () => packageIdToPackageName,
     packageIdToString: () => packageIdToString,
-    padLeft: () => padLeft,
-    padRight: () => padRight,
     paramHelper: () => paramHelper,
     parameterIsThisKeyword: () => parameterIsThisKeyword,
     parameterNamePart: () => parameterNamePart,
@@ -185274,7 +185205,6 @@ ${e.message}`;
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
     startsWithUseStrict: () => startsWithUseStrict,
-    stringContains: () => stringContains,
     stringContainsAt: () => stringContainsAt,
     stringToToken: () => stringToToken,
     stripQuotes: () => stripQuotes,
@@ -185361,9 +185291,6 @@ ${e.message}`;
     transpile: () => transpile,
     transpileModule: () => transpileModule,
     transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-    trimString: () => trimString,
-    trimStringEnd: () => trimStringEnd,
-    trimStringStart: () => trimStringStart,
     tryAddToSet: () => tryAddToSet,
     tryAndIgnoreErrors: () => tryAndIgnoreErrors,
     tryCast: () => tryCast,
@@ -187113,7 +187040,6 @@ ${e.message}`;
     isNamedImports: () => isNamedImports,
     isNamedImportsOrExports: () => isNamedImportsOrExports,
     isNamedTupleMember: () => isNamedTupleMember,
-    isNamedTupleMemberName: () => isNamedTupleMemberName,
     isNamespaceBody: () => isNamespaceBody,
     isNamespaceExport: () => isNamespaceExport,
     isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -187476,8 +187402,6 @@ ${e.message}`;
     outFile: () => outFile,
     packageIdToPackageName: () => packageIdToPackageName,
     packageIdToString: () => packageIdToString,
-    padLeft: () => padLeft,
-    padRight: () => padRight,
     paramHelper: () => paramHelper,
     parameterIsThisKeyword: () => parameterIsThisKeyword,
     parameterNamePart: () => parameterNamePart,
@@ -187684,7 +187608,6 @@ ${e.message}`;
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
     startsWithUseStrict: () => startsWithUseStrict,
-    stringContains: () => stringContains,
     stringContainsAt: () => stringContainsAt,
     stringToToken: () => stringToToken,
     stripQuotes: () => stripQuotes,
@@ -187771,9 +187694,6 @@ ${e.message}`;
     transpile: () => transpile,
     transpileModule: () => transpileModule,
     transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-    trimString: () => trimString,
-    trimStringEnd: () => trimStringEnd,
-    trimStringStart: () => trimStringStart,
     tryAddToSet: () => tryAddToSet,
     tryAndIgnoreErrors: () => tryAndIgnoreErrors,
     tryCast: () => tryCast,