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

package/lib/tsserver.js

@@ -1587,7 +1587,6 @@ __export(server_exports, {
   isNamedImports: () => isNamedImports,
   isNamedImportsOrExports: () => isNamedImportsOrExports,
   isNamedTupleMember: () => isNamedTupleMember,
-  isNamedTupleMemberName: () => isNamedTupleMemberName,
   isNamespaceBody: () => isNamespaceBody,
   isNamespaceExport: () => isNamespaceExport,
   isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -1950,8 +1949,6 @@ __export(server_exports, {
   outFile: () => outFile,
   packageIdToPackageName: () => packageIdToPackageName,
   packageIdToString: () => packageIdToString,
-  padLeft: () => padLeft,
-  padRight: () => padRight,
   paramHelper: () => paramHelper,
   parameterIsThisKeyword: () => parameterIsThisKeyword,
   parameterNamePart: () => parameterNamePart,
@@ -2158,7 +2155,6 @@ __export(server_exports, {
   startsWithDirectory: () => startsWithDirectory,
   startsWithUnderscore: () => startsWithUnderscore,
   startsWithUseStrict: () => startsWithUseStrict,
-  stringContains: () => stringContains,
   stringContainsAt: () => stringContainsAt,
   stringToToken: () => stringToToken,
   stripQuotes: () => stripQuotes,
@@ -2245,9 +2241,6 @@ __export(server_exports, {
   transpile: () => transpile,
   transpileModule: () => transpileModule,
   transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-  trimString: () => trimString,
-  trimStringEnd: () => trimStringEnd,
-  trimStringStart: () => trimStringStart,
   tryAddToSet: () => tryAddToSet,
   tryAndIgnoreErrors: () => tryAndIgnoreErrors,
   tryCast: () => tryCast,
@@ -2334,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230825`;
+var version = `${versionMajorMinor}.0-insiders.20230829`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3629,10 +3622,7 @@ function getStringComparer(ignoreCase) {
   return ignoreCase ? compareStringsCaseInsensitive : compareStringsCaseSensitive;
 }
 var createUIStringComparer = (() => {
-  let defaultComparer;
-  let enUSComparer;
-  const stringComparerFactory = getStringComparerFactory();
-  return createStringComparer;
+  return createIntlCollatorStringComparer;
   function compareWithCallback(a, b, comparer) {
     if (a === b)
       return 0 /* EqualTo */;
@@ -3647,41 +3637,6 @@ var createUIStringComparer = (() => {
     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);
-    }
-  }
 })();
 var uiComparerCaseSensitive;
 var uiLocale;
@@ -3780,9 +3735,6 @@ function removeSuffix(str, suffix) {
 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--) {
@@ -3965,12 +3917,6 @@ function cartesianProductWorker(arrays, result, outer, index) {
     }
   }
 }
-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;
@@ -3991,18 +3937,6 @@ function skipWhile(array, predicate) {
     return array.slice(index);
   }
 }
-var trimString = !!String.prototype.trim ? (s) => s.trim() : (s) => trimStringEnd(trimStringStart(s));
-var trimStringEnd = !!String.prototype.trimEnd ? (s) => s.trimEnd() : trimEndImpl;
-var trimStringStart = !!String.prototype.trimStart ? (s) => s.trimStart() : (s) => s.replace(/^\s+/g, "");
-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";
 }
@@ -5198,18 +5132,18 @@ var hyphenRegExp = /^\s*([a-z0-9-+.*]+)\s+-\s+([a-z0-9-+.*]+)\s*$/i;
 var rangeRegExp = /^(~|\^|<|<=|>|>=|=)?\s*([a-z0-9-+.*]+)$/i;
 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;
       }
@@ -8026,11 +7960,11 @@ function createDirectoryWatcherSupportingRecursive({
     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);
   }
 }
 var FileSystemEntryKind = /* @__PURE__ */ ((FileSystemEntryKind2) => {
@@ -8878,7 +8812,7 @@ function pathIsBareSpecifier(path) {
   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);
@@ -9023,7 +8957,7 @@ function getPathFromPathComponents(pathComponents2, length2) {
   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))
@@ -12408,7 +12342,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         tokenFlags |= 2048 /* ContainsInvalidEscape */;
         if (shouldEmitInvalidEscapeError) {
           const code = parseInt(text.substring(start3 + 1, pos), 8);
-          error2(Diagnostics.Octal_escape_sequences_are_not_allowed_Use_the_syntax_0, start3, pos - start3, "\\x" + padLeft(code.toString(16), 2, "0"));
+          error2(Diagnostics.Octal_escape_sequences_are_not_allowed_Use_the_syntax_0, start3, pos - start3, "\\x" + code.toString(16).padStart(2, "0"));
           return String.fromCharCode(code);
         }
         return text.substring(start3, pos);
@@ -13211,7 +13145,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     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;
     }
@@ -13545,20 +13479,9 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     inJSDocType += inType ? 1 : -1;
   }
 }
-var 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;
-};
+function codePointAt(s, i) {
+  return s.codePointAt(i);
+}
 function charSize(ch) {
   if (ch >= 65536) {
     return 2;
@@ -15245,7 +15168,7 @@ function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, pack
     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,
@@ -15521,7 +15444,7 @@ function getTextOfNodeFromSourceText(sourceText, node, includeTrivia = false) {
   }
   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;
 }
@@ -18754,7 +18677,7 @@ function isQuoteOrBacktick(charCode) {
 }
 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("-");
 }
 var indentStrings = ["", "    "];
 function getIndentString(level) {
@@ -18768,7 +18691,7 @@ function getIndentSize() {
   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;
@@ -18958,7 +18881,7 @@ function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
     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);
@@ -19310,7 +19233,7 @@ function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLin
 }
 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) {
@@ -20963,7 +20886,7 @@ function getSupportedExtensions(options, extraFileExtensions) {
   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;
 }
@@ -21425,7 +21348,7 @@ function expressionResultIsUnused(node) {
   }
 }
 function containsIgnoredPath(path) {
-  return some(ignoredPaths, (p) => stringContains(path, p));
+  return some(ignoredPaths, (p) => path.includes(p));
 }
 function getContainingNodeArray(node) {
   if (!node.parent)
@@ -21686,9 +21609,6 @@ function getPropertyNameFromType(type) {
   }
   return Debug.fail();
 }
-function isNamedTupleMemberName(node) {
-  return node.kind === 80 /* Identifier */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 15 /* NoSubstitutionTemplateLiteral */;
-}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -33063,29 +32983,21 @@ var Parser;
     }
     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();
@@ -36164,7 +36076,7 @@ var Parser;
   }
   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*/
@@ -36634,8 +36546,6 @@ var Parser;
       PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
     })(PropertyLikeParse || (PropertyLikeParse = {}));
     function parseJSDocCommentWorker(start2 = 0, length2) {
-      const saveParsingContext = parsingContext;
-      parsingContext |= 1 << 25 /* JSDocComment */;
       const content = sourceText;
       const end = length2 === void 0 ? content.length : start2 + length2;
       length2 = end - start2;
@@ -36652,6 +36562,8 @@ var Parser;
       let commentsPos;
       let comments = [];
       const parts = [];
+      const saveParsingContext = parsingContext;
+      parsingContext |= 1 << 25 /* JSDocComment */;
       const result = scanner2.scanRange(start2 + 3, length2 - 5, doJSDocScan);
       parsingContext = saveParsingContext;
       return result;
@@ -36743,7 +36655,7 @@ var Parser;
               nextTokenJSDoc();
             }
           }
-        const trimmedComments = trimStringEnd(comments.join(""));
+        const trimmedComments = comments.join("").trimEnd();
         if (parts.length && trimmedComments.length) {
           parts.push(finishNode(factory2.createJSDocText(trimmedComments), linkEnd ?? start2, commentsPos));
         }
@@ -36759,7 +36671,7 @@ var Parser;
       }
       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) {
@@ -36999,7 +36911,7 @@ var Parser;
             }
           }
         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));
@@ -37897,7 +37809,7 @@ var IncrementalParser;
   })(InvalidPosition || (InvalidPosition = {}));
 })(IncrementalParser || (IncrementalParser = {}));
 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) {
@@ -38083,7 +37995,7 @@ function getNamedPragmaArguments(pragma, text) {
     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];
@@ -39608,14 +39520,14 @@ function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
   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 === "") {
@@ -40661,7 +40573,7 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
   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) };
   }
@@ -42493,7 +42405,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
     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,
@@ -42537,7 +42449,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
         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));
           }
@@ -42627,7 +42539,7 @@ function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures,
 }
 var nodeModulesPathPart = "/node_modules/";
 function pathContainsNodeModules(path) {
-  return stringContains(path, nodeModulesPathPart);
+  return path.includes(nodeModulesPathPart);
 }
 function parseNodeModuleFromPath(resolved, isFolder) {
   const path = normalizePath(resolved);
@@ -42663,7 +42575,7 @@ function loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) {
 }
 function loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state) {
   const filename = getBaseFileName(candidate);
-  if (filename.indexOf(".") === -1) {
+  if (!filename.includes(".")) {
     return void 0;
   }
   let extensionless = removeFileExtension(candidate);
@@ -42820,7 +42732,7 @@ function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
   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;
         }
@@ -42839,7 +42751,7 @@ function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
         });
       } 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);
@@ -43207,7 +43119,7 @@ function comparePatternKeys(a, b) {
 }
 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,
@@ -43218,7 +43130,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
       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];
@@ -43312,7 +43224,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       }
       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);
         }
@@ -43323,7 +43235,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       }
       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);
         }
@@ -43350,7 +43262,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
       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);
@@ -43411,7 +43323,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
     }
     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) {
@@ -43485,7 +43397,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
   }
 }
 function isApplicableVersionedTypesKey(conditions, key) {
-  if (conditions.indexOf("types") === -1)
+  if (!conditions.includes("types"))
     return false;
   if (!startsWith(key, "types@"))
     return false;
@@ -43690,7 +43602,7 @@ function getPackageNameFromTypesPackageName(mangledName) {
   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);
@@ -47383,12 +47295,12 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
           /*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) {
@@ -47554,7 +47466,7 @@ function processEnding(fileName, allowedEndings, options, host) {
     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]) {
@@ -47580,7 +47492,7 @@ function processEnding(fileName, allowedEndings, options, host) {
 }
 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("."));
@@ -48299,6 +48211,7 @@ function createTypeChecker(host) {
   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 */);
@@ -49985,7 +49898,7 @@ function createTypeChecker(host) {
     }
   }
   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) {
@@ -52803,11 +52716,10 @@ function createTypeChecker(host) {
               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]
                   );
@@ -53642,12 +53554,12 @@ function createTypeChecker(host) {
         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([
@@ -54210,6 +54122,7 @@ function createTypeChecker(host) {
       }
     }
     function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
+      var _a;
       const serializePropertySymbolForClass = makeSerializePropertySymbol(
         factory.createPropertyDeclaration,
         174 /* MethodDeclaration */,
@@ -54231,12 +54144,15 @@ function createTypeChecker(host) {
         ...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,
@@ -54253,7 +54169,7 @@ function createTypeChecker(host) {
                 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;
@@ -54353,7 +54269,7 @@ function createTypeChecker(host) {
             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,
@@ -54462,10 +54378,10 @@ function createTypeChecker(host) {
           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;
@@ -54476,7 +54392,7 @@ function createTypeChecker(host) {
           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);
@@ -54484,7 +54400,7 @@ function createTypeChecker(host) {
         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) {
@@ -54494,17 +54410,24 @@ function createTypeChecker(host) {
           } 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(
@@ -54659,11 +54582,11 @@ function createTypeChecker(host) {
         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 */;
@@ -54734,12 +54657,12 @@ function createTypeChecker(host) {
             /*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(
@@ -54905,8 +54828,8 @@ function createTypeChecker(host) {
         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);
@@ -55002,7 +54925,7 @@ function createTypeChecker(host) {
         });
       }
       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();
@@ -55022,7 +54945,7 @@ function createTypeChecker(host) {
         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(
@@ -55241,7 +55164,7 @@ function createTypeChecker(host) {
         );
       }
       function serializeMaybeAliasAssignment(symbol) {
-        var _a;
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -55324,7 +55247,7 @@ function createTypeChecker(host) {
                   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,
@@ -55354,7 +55277,7 @@ function createTypeChecker(host) {
       }
       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 */)) {
@@ -55365,7 +55288,7 @@ function createTypeChecker(host) {
           }
           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 */) {
@@ -55611,7 +55534,7 @@ function createTypeChecker(host) {
         }
       }
       function getUnusedName(input, symbol) {
-        var _a, _b;
+        var _a2, _b;
         const id = symbol ? getSymbolId(symbol) : void 0;
         if (id) {
           if (context.remappedSymbolNames.has(id)) {
@@ -55623,7 +55546,7 @@ function createTypeChecker(host) {
         }
         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}`;
         }
@@ -55751,6 +55674,10 @@ function createTypeChecker(host) {
     }
   }
   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`
@@ -57803,7 +57730,7 @@ function createTypeChecker(host) {
         if (!lateSymbol)
           lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
         const earlySymbol = earlySymbols && earlySymbols.get(memberName);
-        if (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol) {
+        if (!(parent2.flags & 32 /* Class */) && (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol)) {
           const declarations = earlySymbol ? concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
           const name = !(type.flags & 8192 /* UniqueESSymbol */) && unescapeLeadingUnderscores(memberName) || declarationNameToString(declName);
           forEach(declarations, (declaration) => error2(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here, name));
@@ -57914,7 +57841,13 @@ function createTypeChecker(host) {
     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);
@@ -58031,7 +57964,7 @@ function createTypeChecker(host) {
     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);
@@ -67313,6 +67246,9 @@ function createTypeChecker(host) {
   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;
@@ -67730,7 +67666,7 @@ function createTypeChecker(host) {
         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 */,
@@ -67816,7 +67752,12 @@ function createTypeChecker(host) {
       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) {
@@ -68857,7 +68798,7 @@ function createTypeChecker(host) {
       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;
         }
       }
@@ -72802,7 +72743,7 @@ function createTypeChecker(host) {
         elementTypes,
         elementFlags,
         /*readonly*/
-        inConstContext
+        inConstContext && !(contextualType && someType(contextualType, isMutableArrayLikeType))
       ));
     }
     return createArrayLiteralType(createArrayType(
@@ -73118,7 +73059,7 @@ function createTypeChecker(host) {
     return getJsxElementTypeAt(node) || anyType;
   }
   function isHyphenatedJsxName(name) {
-    return stringContains(name, "-");
+    return name.includes("-");
   }
   function isJsxIntrinsicTagName(tagName) {
     return isIdentifier(tagName) && isIntrinsicJsxName(tagName.escapedText) || isJsxNamespacedName(tagName);
@@ -74040,7 +73981,7 @@ function createTypeChecker(host) {
         apparentType,
         right.escapedText,
         /*skipObjectFunctionPropertyAugment*/
-        false,
+        isConstEnumObjectType(apparentType),
         /*includeTypeOnlyMembers*/
         node.kind === 166 /* QualifiedName */
       );
@@ -74823,7 +74764,7 @@ function createTypeChecker(host) {
         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);
@@ -76808,18 +76749,11 @@ function createTypeChecker(host) {
       !!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) {
@@ -76832,7 +76766,7 @@ function createTypeChecker(host) {
     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;
   }
@@ -76862,7 +76796,8 @@ function createTypeChecker(host) {
       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;
@@ -76910,7 +76845,7 @@ function createTypeChecker(host) {
     }
     return void 0;
   }
-  function getRestTypeAtPosition(source, pos) {
+  function getRestTypeAtPosition(source, pos, readonly) {
     const parameterCount = getParameterCount(source);
     const minArgumentCount = getMinArgumentCount(source);
     const restType = getEffectiveRestType(source);
@@ -76933,13 +76868,7 @@ function createTypeChecker(host) {
         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;
@@ -77019,18 +76948,16 @@ function createTypeChecker(host) {
     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);
       }
     }
   }
@@ -79462,7 +79389,7 @@ function createTypeChecker(host) {
         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;
@@ -79811,7 +79738,7 @@ function createTypeChecker(host) {
         const isPrivate = isPrivateIdentifier(name);
         const privateStaticFlags = isPrivate && isStaticMember ? 16 /* PrivateStatic */ : 0;
         const names = isPrivate ? privateIdentifiers : isStaticMember ? staticNames : instanceNames;
-        const memberName = name && getPropertyNameForPropertyNameNode(name);
+        const memberName = name && getEffectivePropertyNameForPropertyNameNode(name);
         if (memberName) {
           switch (member.kind) {
             case 177 /* GetAccessor */:
@@ -79858,7 +79785,7 @@ function createTypeChecker(host) {
       const memberNameNode = member.name;
       const isStaticMember = isStatic(member);
       if (isStaticMember && memberNameNode) {
-        const memberName = getPropertyNameForPropertyNameNode(memberNameNode);
+        const memberName = getEffectivePropertyNameForPropertyNameNode(memberNameNode);
         switch (memberName) {
           case "name":
           case "length":
@@ -80367,9 +80294,6 @@ function createTypeChecker(host) {
     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);
   }
@@ -88290,7 +88214,7 @@ function createTypeChecker(host) {
     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;
@@ -89181,7 +89105,7 @@ var visitEachChildTable = {
     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))
     );
@@ -90212,7 +90136,7 @@ function tryGetSourceMappingURL(lineInfo) {
     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;
     }
@@ -111436,7 +111360,7 @@ function getDeclarationDiagnostics(host, resolver, file) {
 }
 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);
@@ -111890,6 +111814,9 @@ function transformDeclarations(context) {
       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,
@@ -115926,7 +115853,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         /*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;
@@ -119864,17 +119791,17 @@ function formatCodeSpan(file, start2, length2, indent3, squiggleColor, host) {
   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;
@@ -120813,7 +120740,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     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);
@@ -122071,7 +121998,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     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);
@@ -123431,7 +123358,7 @@ function updateHostForUseSourceOfProjectReferenceRedirect(host) {
     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));
@@ -123459,7 +123386,7 @@ function updateHostForUseSourceOfProjectReferenceRedirect(host) {
     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;
@@ -125349,7 +125276,7 @@ function removeIgnoredPath(path) {
   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)
@@ -130089,7 +130016,7 @@ var Arguments;
   Arguments2.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
 })(Arguments || (Arguments = {}));
 function hasArgument(argumentName) {
-  return sys.args.indexOf(argumentName) >= 0;
+  return sys.args.includes(argumentName);
 }
 function findArgument(argumentName) {
   const index = sys.args.indexOf(argumentName);
@@ -130097,7 +130024,7 @@ function findArgument(argumentName) {
 }
 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")}`;
 }
 
 // src/services/types.ts
@@ -132912,7 +132839,7 @@ function createPackageJsonImportFilter(fromFile, preferences, host) {
     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(
@@ -133486,7 +133413,7 @@ function forEachExternalModule(checker, allSourceFiles, excludePatterns, cb) {
   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*/
@@ -142384,7 +142311,7 @@ function collectReadsAndWrites(targetRange, scopes, enclosingTextRange, sourceFi
     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);
@@ -144742,7 +144669,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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) {
@@ -153723,7 +153650,7 @@ function mayDeleteParameter(checker, sourceFile, parameter, sourceFiles, program
   }
 }
 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;
@@ -161104,7 +161031,7 @@ function directoryResult(name) {
 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));
@@ -161430,7 +161357,7 @@ function getPatternFromFirstMatchingCondition(target, conditions) {
   }
   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);
       }
@@ -161442,7 +161369,7 @@ function getFragmentDirectory(fragment) {
 }
 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);
@@ -161512,7 +161439,7 @@ function removeLeadingDirectorySeparator(path) {
 }
 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));
@@ -161628,7 +161555,7 @@ function isPathRelativeToScript(path) {
 var tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3"]*)$/;
 var nodeModulesDependencyKeys = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
 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";
@@ -166089,11 +166016,11 @@ function addRegionOutliningSpans(sourceFile, out) {
 }
 var regionDelimiterRegExp = /^#(end)?region(?:\s+(.*))?(?:\r)?$/;
 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) {
@@ -170323,7 +170250,7 @@ function isSemicolonInsertionContext(context) {
   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(".");
 }
 
 // src/services/formatting/rulesMap.ts
@@ -171495,7 +171422,7 @@ var SmartIndenter;
     }
     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;
     }
@@ -173526,7 +173453,6 @@ __export(ts_exports2, {
   isNamedImports: () => isNamedImports,
   isNamedImportsOrExports: () => isNamedImportsOrExports,
   isNamedTupleMember: () => isNamedTupleMember,
-  isNamedTupleMemberName: () => isNamedTupleMemberName,
   isNamespaceBody: () => isNamespaceBody,
   isNamespaceExport: () => isNamespaceExport,
   isNamespaceExportDeclaration: () => isNamespaceExportDeclaration,
@@ -173889,8 +173815,6 @@ __export(ts_exports2, {
   outFile: () => outFile,
   packageIdToPackageName: () => packageIdToPackageName,
   packageIdToString: () => packageIdToString,
-  padLeft: () => padLeft,
-  padRight: () => padRight,
   paramHelper: () => paramHelper,
   parameterIsThisKeyword: () => parameterIsThisKeyword,
   parameterNamePart: () => parameterNamePart,
@@ -174097,7 +174021,6 @@ __export(ts_exports2, {
   startsWithDirectory: () => startsWithDirectory,
   startsWithUnderscore: () => startsWithUnderscore,
   startsWithUseStrict: () => startsWithUseStrict,
-  stringContains: () => stringContains,
   stringContainsAt: () => stringContainsAt,
   stringToToken: () => stringToToken,
   stripQuotes: () => stripQuotes,
@@ -174184,9 +174107,6 @@ __export(ts_exports2, {
   transpile: () => transpile,
   transpileModule: () => transpileModule,
   transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-  trimString: () => trimString,
-  trimStringEnd: () => trimStringEnd,
-  trimStringStart: () => trimStringStart,
   tryAddToSet: () => tryAddToSet,
   tryAndIgnoreErrors: () => tryAndIgnoreErrors,
   tryCast: () => tryCast,
@@ -175505,7 +175425,7 @@ var TextStorage = class {
   }
 };
 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);
 }
 var ScriptInfo = class {
   constructor(host, fileName, scriptKind, hasMixedContent, path, initialVersion) {
@@ -176897,7 +176817,7 @@ var Project3 = class _Project {
   }
   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;
@@ -181090,7 +181010,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);
               }
             }
@@ -181109,13 +181029,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);
             }
           }
@@ -181139,7 +181059,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);
               }
             }
@@ -184610,7 +184530,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;
     }
@@ -188090,7 +188010,6 @@ start(initializeNodeSystem(), require("os").platform());
   isNamedImports,
   isNamedImportsOrExports,
   isNamedTupleMember,
-  isNamedTupleMemberName,
   isNamespaceBody,
   isNamespaceExport,
   isNamespaceExportDeclaration,
@@ -188453,8 +188372,6 @@ start(initializeNodeSystem(), require("os").platform());
   outFile,
   packageIdToPackageName,
   packageIdToString,
-  padLeft,
-  padRight,
   paramHelper,
   parameterIsThisKeyword,
   parameterNamePart,
@@ -188661,7 +188578,6 @@ start(initializeNodeSystem(), require("os").platform());
   startsWithDirectory,
   startsWithUnderscore,
   startsWithUseStrict,
-  stringContains,
   stringContainsAt,
   stringToToken,
   stripQuotes,
@@ -188748,9 +188664,6 @@ start(initializeNodeSystem(), require("os").platform());
   transpile,
   transpileModule,
   transpileOptionValueCompilerOptions,
-  trimString,
-  trimStringEnd,
-  trimStringStart,
   tryAddToSet,
   tryAndIgnoreErrors,
   tryCast,