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

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230825`;
+var version = `${versionMajorMinor}.0-insiders.20230829`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -973,10 +973,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 */;
@@ -991,41 +988,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;
@@ -1111,9 +1073,6 @@ function endsWith(str, suffix) {
 function removeSuffix(str, suffix) {
   return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : str;
 }
-function stringContains(str, substring) {
-  return str.indexOf(substring) !== -1;
-}
 function orderedRemoveItem(array, item) {
   for (let i = 0; i < array.length; i++) {
     if (array[i] === item) {
@@ -1261,12 +1220,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;
@@ -1287,18 +1240,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";
 }
@@ -2486,18 +2427,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;
       }
@@ -4517,11 +4458,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);
   }
 }
 function createFileWatcherCallback(callback) {
@@ -5358,7 +5299,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);
@@ -5503,7 +5444,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))
@@ -8861,7 +8802,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         tokenFlags |= 2048 /* ContainsInvalidEscape */;
         if (shouldEmitInvalidEscapeError) {
           const code = parseInt(text.substring(start2 + 1, pos), 8);
-          error(Diagnostics.Octal_escape_sequences_are_not_allowed_Use_the_syntax_0, start2, pos - start2, "\\x" + padLeft(code.toString(16), 2, "0"));
+          error(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);
@@ -9664,7 +9605,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;
     }
@@ -9998,20 +9939,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;
@@ -11523,7 +11453,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,
@@ -11750,7 +11680,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;
 }
@@ -14780,7 +14710,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) {
@@ -14794,7 +14724,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;
@@ -14984,7 +14914,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);
@@ -15329,7 +15259,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) {
@@ -16792,7 +16722,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;
 }
@@ -17234,7 +17164,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)
@@ -17484,9 +17414,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() {
@@ -28660,29 +28587,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();
-    }
-    if (tokenIsIdentifierOrKeyword(token()) || token() === 15 /* NoSubstitutionTemplateLiteral */) {
-      nextToken();
-      return isTokenColonOrQuestionColon();
+      return tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon();
     }
-    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();
@@ -31761,7 +31680,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*/
@@ -32231,8 +32150,6 @@ var Parser;
       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;
@@ -32249,6 +32166,8 @@ var Parser;
       let commentsPos;
       let comments = [];
       const parts = [];
+      const saveParsingContext = parsingContext;
+      parsingContext |= 1 << 25 /* JSDocComment */;
       const result = scanner.scanRange(start + 3, length2 - 5, doJSDocScan);
       parsingContext = saveParsingContext;
       return result;
@@ -32340,7 +32259,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 ?? start, commentsPos));
         }
@@ -32356,7 +32275,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) {
@@ -32596,7 +32515,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));
@@ -33494,7 +33413,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) {
@@ -33680,7 +33599,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];
@@ -35202,14 +35121,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 === "") {
@@ -36233,7 +36152,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) };
   }
@@ -37967,7 +37886,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,
@@ -38011,7 +37930,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));
           }
@@ -38101,7 +38020,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);
@@ -38137,7 +38056,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);
@@ -38561,7 +38480,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,
@@ -38572,7 +38491,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];
@@ -38666,7 +38585,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);
         }
@@ -38677,7 +38596,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);
         }
@@ -38704,7 +38623,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);
@@ -38765,7 +38684,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) {
@@ -38839,7 +38758,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;
@@ -39044,7 +38963,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);
@@ -42674,12 +42593,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) {
@@ -42845,7 +42764,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]) {
@@ -42871,7 +42790,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("."));
@@ -43590,6 +43509,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 */);
@@ -45276,7 +45196,7 @@ function createTypeChecker(host) {
     }
   }
   function isSameScopeDescendentOf(initial, parent, stopAt) {
-    return !!parent && !!findAncestor(initial, (n) => n === parent || (n === stopAt || isFunctionLike(n) && (!getImmediatelyInvokedFunctionExpression(n) || isAsyncFunction(n)) ? "quit" : false));
+    return !!parent && !!findAncestor(initial, (n) => n === parent || (n === stopAt || isFunctionLike(n) && (!getImmediatelyInvokedFunctionExpression(n) || getFunctionFlags(n) & 3 /* AsyncGenerator */) ? "quit" : false));
   }
   function getAnyImportSyntax(node) {
     switch (node.kind) {
@@ -48094,11 +48014,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]
                   );
@@ -48933,12 +48852,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([
@@ -49501,6 +49420,7 @@ function createTypeChecker(host) {
       }
     }
     function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
+      var _a;
       const serializePropertySymbolForClass = makeSerializePropertySymbol(
         factory.createPropertyDeclaration,
         174 /* MethodDeclaration */,
@@ -49522,12 +49442,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,
@@ -49544,7 +49467,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;
@@ -49644,7 +49567,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,
@@ -49753,10 +49676,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;
@@ -49767,7 +49690,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);
@@ -49775,7 +49698,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) {
@@ -49785,17 +49708,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(
@@ -49950,11 +49880,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 */;
@@ -50025,12 +49955,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(
@@ -50196,8 +50126,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);
@@ -50293,7 +50223,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();
@@ -50313,7 +50243,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(
@@ -50532,7 +50462,7 @@ function createTypeChecker(host) {
         );
       }
       function serializeMaybeAliasAssignment(symbol) {
-        var _a;
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -50615,7 +50545,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,
@@ -50645,7 +50575,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 */)) {
@@ -50656,7 +50586,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 */) {
@@ -50902,7 +50832,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)) {
@@ -50914,7 +50844,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}`;
         }
@@ -51042,6 +50972,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`
@@ -53094,7 +53028,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 (!(parent.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) => error(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here, name));
@@ -53205,7 +53139,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);
@@ -53322,7 +53262,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);
@@ -62604,6 +62544,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;
@@ -63021,7 +62964,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 */,
@@ -63107,7 +63050,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) {
@@ -64148,7 +64096,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;
         }
       }
@@ -68093,7 +68041,7 @@ function createTypeChecker(host) {
         elementTypes,
         elementFlags,
         /*readonly*/
-        inConstContext
+        inConstContext && !(contextualType && someType(contextualType, isMutableArrayLikeType))
       ));
     }
     return createArrayLiteralType(createArrayType(
@@ -68409,7 +68357,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);
@@ -69331,7 +69279,7 @@ function createTypeChecker(host) {
         apparentType,
         right.escapedText,
         /*skipObjectFunctionPropertyAugment*/
-        false,
+        isConstEnumObjectType(apparentType),
         /*includeTypeOnlyMembers*/
         node.kind === 166 /* QualifiedName */
       );
@@ -70114,7 +70062,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);
@@ -72099,18 +72047,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) {
@@ -72123,7 +72064,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;
   }
@@ -72153,7 +72094,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;
@@ -72201,7 +72143,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);
@@ -72224,13 +72166,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;
@@ -72310,18 +72246,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);
       }
     }
   }
@@ -74753,7 +74687,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;
@@ -75102,7 +75036,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 */:
@@ -75149,7 +75083,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":
@@ -75658,9 +75592,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);
   }
@@ -83581,7 +83512,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;
@@ -84472,7 +84403,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))
     );
@@ -106556,7 +106487,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);
@@ -107010,6 +106941,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,
@@ -111035,7 +110969,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;
@@ -114923,17 +114857,17 @@ function formatCodeSpan(file, start, length2, indent2, squiggleColor, host) {
   for (let i = firstLine; i <= lastLine; i++) {
     context += host.getNewLine();
     if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-      context += indent2 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
+      context += indent2 + 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 += indent2 + formatColorAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+    context += indent2 + formatColorAndReset((i + 1 + "").padStart(gutterWidth), gutterStyleSequence) + gutterSeparator;
     context += lineContent + host.getNewLine();
-    context += indent2 + formatColorAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+    context += indent2 + formatColorAndReset("".padStart(gutterWidth), gutterStyleSequence) + gutterSeparator;
     context += squiggleColor;
     if (i === firstLine) {
       const lastCharForLine = i === lastLine ? lastLineChar : void 0;
@@ -115868,7 +115802,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);
@@ -117126,7 +117060,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);
@@ -118486,7 +118420,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));
@@ -118514,7 +118448,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;
@@ -120372,7 +120306,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)
@@ -124788,7 +124722,7 @@ function createColors(sys2) {
   function bold(str) {
     return `\x1B[1m${str}\x1B[22m`;
   }
-  const isWindows = sys2.getEnvironmentVariable("OS") && stringContains(sys2.getEnvironmentVariable("OS").toLowerCase(), "windows");
+  const isWindows = sys2.getEnvironmentVariable("OS") && sys2.getEnvironmentVariable("OS").toLowerCase().includes("windows");
   const isWindowsTerminal = sys2.getEnvironmentVariable("WT_SESSION");
   const isVSCode = sys2.getEnvironmentVariable("TERM_PROGRAM") && sys2.getEnvironmentVariable("TERM_PROGRAM") === "vscode";
   function blue(str) {
@@ -124912,11 +124846,11 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
     while (remainRight.length > 0) {
       let curLeft = "";
       if (isFirstLine) {
-        curLeft = padLeft(left, rightAlignOfLeft2);
-        curLeft = padRight(curLeft, leftAlignOfRight2);
+        curLeft = left.padStart(rightAlignOfLeft2);
+        curLeft = curLeft.padEnd(leftAlignOfRight2);
         curLeft = colorLeft ? colors.blue(curLeft) : curLeft;
       } else {
-        curLeft = padLeft("", leftAlignOfRight2);
+        curLeft = "".padStart(leftAlignOfRight2);
       }
       const curRight = remainRight.substr(0, rightCharacterNumber);
       remainRight = remainRight.slice(rightCharacterNumber);
@@ -125122,13 +125056,13 @@ function getHeader(sys2, message) {
   const header = [];
   const terminalWidth = ((_a = sys2.getWidthOfTerminal) == null ? void 0 : _a.call(sys2)) ?? 0;
   const tsIconLength = 5;
-  const tsIconFirstLine = colors.blueBackground(padLeft("", tsIconLength));
-  const tsIconSecondLine = colors.blueBackground(colors.brightWhite(padLeft("TS ", tsIconLength)));
+  const tsIconFirstLine = colors.blueBackground("".padStart(tsIconLength));
+  const tsIconSecondLine = colors.blueBackground(colors.brightWhite("TS ".padStart(tsIconLength)));
   if (terminalWidth >= message.length + tsIconLength) {
     const rightAlign = terminalWidth > 120 ? 120 : terminalWidth;
     const leftAlign = rightAlign - tsIconLength;
-    header.push(padRight(message, leftAlign) + tsIconFirstLine + sys2.newLine);
-    header.push(padLeft("", leftAlign) + tsIconSecondLine + sys2.newLine);
+    header.push(message.padEnd(leftAlign) + tsIconFirstLine + sys2.newLine);
+    header.push("".padStart(leftAlign) + tsIconSecondLine + sys2.newLine);
   } else {
     header.push(message + sys2.newLine);
     header.push(sys2.newLine);
@@ -125805,7 +125739,7 @@ function reportAllStatistics(sys2, statistics) {
     }
   }
   for (const s of statistics) {
-    sys2.write(padRight(s.name + ":", nameSize + 2) + padLeft(statisticValue(s).toString(), valueSize) + sys2.newLine);
+    sys2.write(`${s.name}:`.padEnd(nameSize + 2) + statisticValue(s).toString().padStart(valueSize) + sys2.newLine);
   }
 }
 function statisticValue(s) {