typescript 5.3.0-dev.20230828 → 5.3.0-dev.20230830

package/lib/tsserver.js

@@ -1949,8 +1949,6 @@ __export(server_exports, {
   outFile: () => outFile,
   packageIdToPackageName: () => packageIdToPackageName,
   packageIdToString: () => packageIdToString,
-  padLeft: () => padLeft,
-  padRight: () => padRight,
   paramHelper: () => paramHelper,
   parameterIsThisKeyword: () => parameterIsThisKeyword,
   parameterNamePart: () => parameterNamePart,
@@ -2243,9 +2241,6 @@ __export(server_exports, {
   transpile: () => transpile,
   transpileModule: () => transpileModule,
   transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-  trimString: () => trimString,
-  trimStringEnd: () => trimStringEnd,
-  trimStringStart: () => trimStringStart,
   tryAddToSet: () => tryAddToSet,
   tryAndIgnoreErrors: () => tryAndIgnoreErrors,
   tryCast: () => tryCast,
@@ -2332,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230828`;
+var version = `${versionMajorMinor}.0-dev.20230830`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3627,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 */;
@@ -3645,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;
@@ -3960,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;
@@ -3986,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";
 }
@@ -5193,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;
       }
@@ -12403,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);
@@ -13206,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;
     }
@@ -13540,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;
@@ -15516,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;
 }
@@ -19305,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) {
@@ -36148,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*/
@@ -36618,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;
@@ -36636,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;
@@ -36727,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));
         }
@@ -36743,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) {
@@ -36983,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));
@@ -38067,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];
@@ -39592,10 +39520,10 @@ 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;
   }
@@ -48283,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 */);
@@ -49969,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) {
@@ -54193,6 +54122,7 @@ function createTypeChecker(host) {
       }
     }
     function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
+      var _a;
       const serializePropertySymbolForClass = makeSerializePropertySymbol(
         factory.createPropertyDeclaration,
         174 /* MethodDeclaration */,
@@ -54214,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,
@@ -54236,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;
@@ -54445,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;
@@ -54459,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);
@@ -54467,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) {
@@ -54477,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(
@@ -54642,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 */;
@@ -54717,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(
@@ -54888,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);
@@ -54985,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();
@@ -55005,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(
@@ -55224,7 +55164,7 @@ function createTypeChecker(host) {
         );
       }
       function serializeMaybeAliasAssignment(symbol) {
-        var _a;
+        var _a2;
         if (symbol.flags & 4194304 /* Prototype */) {
           return false;
         }
@@ -55307,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,
@@ -55337,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 */)) {
@@ -55348,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 */) {
@@ -55594,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)) {
@@ -55606,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}`;
         }
@@ -55734,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`
@@ -57897,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);
@@ -63195,7 +63145,12 @@ function createTypeChecker(host) {
   function instantiateSymbol(symbol, mapper) {
     const links = getSymbolLinks(symbol);
     if (links.type && !couldContainTypeVariables(links.type)) {
-      return symbol;
+      if (!(symbol.flags & 65536 /* SetAccessor */)) {
+        return symbol;
+      }
+      if (links.writeType && !couldContainTypeVariables(links.writeType)) {
+        return symbol;
+      }
     }
     if (getCheckFlags(symbol) & 1 /* Instantiated */) {
       symbol = links.target;
@@ -68848,7 +68803,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;
         }
       }
@@ -74031,7 +73986,7 @@ function createTypeChecker(host) {
         apparentType,
         right.escapedText,
         /*skipObjectFunctionPropertyAugment*/
-        false,
+        isConstEnumObjectType(apparentType),
         /*includeTypeOnlyMembers*/
         node.kind === 166 /* QualifiedName */
       );
@@ -76998,18 +76953,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);
       }
     }
   }
@@ -79441,7 +79394,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;
@@ -90188,7 +90141,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;
     }
@@ -111866,6 +111819,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,
@@ -119840,17 +119796,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;
@@ -130073,7 +130029,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
@@ -166065,11 +166021,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) {
@@ -173864,8 +173820,6 @@ __export(ts_exports2, {
   outFile: () => outFile,
   packageIdToPackageName: () => packageIdToPackageName,
   packageIdToString: () => packageIdToString,
-  padLeft: () => padLeft,
-  padRight: () => padRight,
   paramHelper: () => paramHelper,
   parameterIsThisKeyword: () => parameterIsThisKeyword,
   parameterNamePart: () => parameterNamePart,
@@ -174158,9 +174112,6 @@ __export(ts_exports2, {
   transpile: () => transpile,
   transpileModule: () => transpileModule,
   transpileOptionValueCompilerOptions: () => transpileOptionValueCompilerOptions,
-  trimString: () => trimString,
-  trimStringEnd: () => trimStringEnd,
-  trimStringStart: () => trimStringStart,
   tryAddToSet: () => tryAddToSet,
   tryAndIgnoreErrors: () => tryAndIgnoreErrors,
   tryCast: () => tryCast,
@@ -188426,8 +188377,6 @@ start(initializeNodeSystem(), require("os").platform());
   outFile,
   packageIdToPackageName,
   packageIdToString,
-  padLeft,
-  padRight,
   paramHelper,
   parameterIsThisKeyword,
   parameterNamePart,
@@ -188720,9 +188669,6 @@ start(initializeNodeSystem(), require("os").platform());
   transpile,
   transpileModule,
   transpileOptionValueCompilerOptions,
-  trimString,
-  trimStringEnd,
-  trimStringStart,
   tryAddToSet,
   tryAndIgnoreErrors,
   tryCast,