typescript 5.4.0-dev.20231103 → 5.4.0-dev.20231105

package/lib/tsserver.js

@@ -1721,6 +1721,8 @@ __export(server_exports, {
   isSignedNumericLiteral: () => isSignedNumericLiteral,
   isSimpleCopiableExpression: () => isSimpleCopiableExpression,
   isSimpleInlineableExpression: () => isSimpleInlineableExpression,
+  isSimpleParameter: () => isSimpleParameter,
+  isSimpleParameterList: () => isSimpleParameterList,
   isSingleOrDoubleQuote: () => isSingleOrDoubleQuote,
   isSourceFile: () => isSourceFile,
   isSourceFileFromLibrary: () => isSourceFileFromLibrary,
@@ -2328,7 +2330,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231103`;
+var version = `${versionMajorMinor}.0-dev.20231105`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -27668,7 +27670,7 @@ function createEmitHelperFactory(context) {
       ]
     );
   }
-  function createAwaiterHelper(hasLexicalThis, hasLexicalArguments, promiseConstructor, body) {
+  function createAwaiterHelper(hasLexicalThis, argumentsExpression, promiseConstructor, parameters, body) {
     context.requestEmitHelper(awaiterHelper);
     const generatorFunc = factory2.createFunctionExpression(
       /*modifiers*/
@@ -27678,8 +27680,7 @@ function createEmitHelperFactory(context) {
       void 0,
       /*typeParameters*/
       void 0,
-      /*parameters*/
-      [],
+      parameters ?? [],
       /*type*/
       void 0,
       body
@@ -27691,7 +27692,7 @@ function createEmitHelperFactory(context) {
       void 0,
       [
         hasLexicalThis ? factory2.createThis() : factory2.createVoidZero(),
-        hasLexicalArguments ? factory2.createIdentifier("arguments") : factory2.createVoidZero(),
+        argumentsExpression ?? factory2.createVoidZero(),
         promiseConstructor ? createExpressionFromEntityName(factory2, promiseConstructor) : factory2.createVoidZero(),
         generatorFunc
       ]
@@ -38246,6 +38247,7 @@ var libEntries = [
   ["es2015.symbol", "lib.es2015.symbol.d.ts"],
   ["es2015.symbol.wellknown", "lib.es2015.symbol.wellknown.d.ts"],
   ["es2016.array.include", "lib.es2016.array.include.d.ts"],
+  ["es2016.intl", "lib.es2016.intl.d.ts"],
   ["es2017.date", "lib.es2017.date.d.ts"],
   ["es2017.object", "lib.es2017.object.d.ts"],
   ["es2017.sharedmemory", "lib.es2017.sharedmemory.d.ts"],
@@ -38577,6 +38579,7 @@ var targetOptionDeclaration = {
   affectsModuleResolution: true,
   affectsEmit: true,
   affectsBuildInfo: true,
+  deprecatedKeys: /* @__PURE__ */ new Set(["es3"]),
   paramType: Diagnostics.VERSION,
   showInSimplifiedHelpView: true,
   category: Diagnostics.Language_and_Environment,
@@ -44693,6 +44696,9 @@ function createBinder() {
       case 213 /* CallExpression */:
         return hasNarrowableArgument(expr);
       case 217 /* ParenthesizedExpression */:
+        if (isJSDocTypeAssertion(expr)) {
+          return false;
+        }
       case 235 /* NonNullExpression */:
         return isNarrowingExpression(expr.expression);
       case 226 /* BinaryExpression */:
@@ -71570,15 +71576,23 @@ function createTypeChecker(host) {
         error2(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers);
         return errorType;
       }
-      const container = getContainingFunction(node);
-      if (languageVersion < 2 /* ES2015 */) {
-        if (container.kind === 219 /* ArrowFunction */) {
-          error2(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
-        } else if (hasSyntacticModifier(container, 1024 /* Async */)) {
-          error2(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
+      let container = getContainingFunction(node);
+      if (container) {
+        if (languageVersion < 2 /* ES2015 */) {
+          if (container.kind === 219 /* ArrowFunction */) {
+            error2(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
+          } else if (hasSyntacticModifier(container, 1024 /* Async */)) {
+            error2(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
+          }
+        }
+        getNodeLinks(container).flags |= 512 /* CaptureArguments */;
+        while (container && isArrowFunction(container)) {
+          container = getContainingFunction(container);
+          if (container) {
+            getNodeLinks(container).flags |= 512 /* CaptureArguments */;
+          }
         }
       }
-      getNodeLinks(container).flags |= 512 /* CaptureArguments */;
       return getTypeOfSymbol(symbol);
     }
     if (shouldMarkIdentifierAliasReferenced(node)) {
@@ -91606,6 +91620,12 @@ function setPrivateIdentifier(privateEnv, name, entry) {
 function accessPrivateIdentifier(env, name) {
   return walkUpLexicalEnvironments(env, (env2) => getPrivateIdentifier(env2.privateEnv, name));
 }
+function isSimpleParameter(node) {
+  return !node.initializer && isIdentifier(node.name);
+}
+function isSimpleParameterList(nodes) {
+  return every(nodes, isSimpleParameter);
+}
 
 // src/compiler/transformers/destructuring.ts
 var FlattenLevel = /* @__PURE__ */ ((FlattenLevel2) => {
@@ -99092,6 +99112,7 @@ function transformES2017(context) {
   let enclosingFunctionParameterNames;
   let capturedSuperProperties;
   let hasSuperElementAccess;
+  let lexicalArgumentsBinding;
   const substitutedSuperAccessors = [];
   let contextFlags = 0 /* None */;
   const previousOnEmitNode = context.onEmitNode;
@@ -99142,9 +99163,30 @@ function transformES2017(context) {
   function visitDefault(node) {
     return visitEachChild(node, visitor, context);
   }
+  function argumentsVisitor(node) {
+    switch (node.kind) {
+      case 218 /* FunctionExpression */:
+      case 262 /* FunctionDeclaration */:
+      case 174 /* MethodDeclaration */:
+      case 177 /* GetAccessor */:
+      case 178 /* SetAccessor */:
+      case 176 /* Constructor */:
+        return node;
+      case 169 /* Parameter */:
+      case 208 /* BindingElement */:
+      case 260 /* VariableDeclaration */:
+        break;
+      case 80 /* Identifier */:
+        if (lexicalArgumentsBinding && resolver.isArgumentsLocalBinding(node)) {
+          return lexicalArgumentsBinding;
+        }
+        break;
+    }
+    return visitEachChild(node, argumentsVisitor, context);
+  }
   function visitor(node) {
     if ((node.transformFlags & 256 /* ContainsES2017 */) === 0) {
-      return node;
+      return lexicalArgumentsBinding ? argumentsVisitor(node) : node;
     }
     switch (node.kind) {
       case 134 /* AsyncKeyword */:
@@ -99302,15 +99344,23 @@ function transformES2017(context) {
     );
   }
   function visitConstructorDeclaration(node) {
-    return factory2.updateConstructorDeclaration(
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const updated = factory2.updateConstructorDeclaration(
       node,
       visitNodes2(node.modifiers, visitor, isModifier),
       visitParameterList(node.parameters, visitor, context),
       transformMethodBody(node)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitMethodDeclaration(node) {
-    return factory2.updateMethodDeclaration(
+    let parameters;
+    const functionFlags = getFunctionFlags(node);
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const updated = factory2.updateMethodDeclaration(
       node,
       visitNodes2(node.modifiers, visitor, isModifierLike),
       node.asteriskToken,
@@ -99319,14 +99369,18 @@ function transformES2017(context) {
       void 0,
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, visitor, context),
+      parameters = functionFlags & 2 /* Async */ ? transformAsyncFunctionParameterList(node) : visitParameterList(node.parameters, visitor, context),
       /*type*/
       void 0,
-      getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) : transformMethodBody(node)
+      functionFlags & 2 /* Async */ ? transformAsyncFunctionBody(node, parameters) : transformMethodBody(node)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitGetAccessorDeclaration(node) {
-    return factory2.updateGetAccessorDeclaration(
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const updated = factory2.updateGetAccessorDeclaration(
       node,
       visitNodes2(node.modifiers, visitor, isModifierLike),
       node.name,
@@ -99335,55 +99389,75 @@ function transformES2017(context) {
       void 0,
       transformMethodBody(node)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitSetAccessorDeclaration(node) {
-    return factory2.updateSetAccessorDeclaration(
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const updated = factory2.updateSetAccessorDeclaration(
       node,
       visitNodes2(node.modifiers, visitor, isModifierLike),
       node.name,
       visitParameterList(node.parameters, visitor, context),
       transformMethodBody(node)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitFunctionDeclaration(node) {
-    return factory2.updateFunctionDeclaration(
+    let parameters;
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const functionFlags = getFunctionFlags(node);
+    const updated = factory2.updateFunctionDeclaration(
       node,
       visitNodes2(node.modifiers, visitor, isModifierLike),
       node.asteriskToken,
       node.name,
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, visitor, context),
+      parameters = functionFlags & 2 /* Async */ ? transformAsyncFunctionParameterList(node) : visitParameterList(node.parameters, visitor, context),
       /*type*/
       void 0,
-      getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) : visitFunctionBody(node.body, visitor, context)
+      functionFlags & 2 /* Async */ ? transformAsyncFunctionBody(node, parameters) : visitFunctionBody(node.body, visitor, context)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitFunctionExpression(node) {
-    return factory2.updateFunctionExpression(
+    let parameters;
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
+    lexicalArgumentsBinding = void 0;
+    const functionFlags = getFunctionFlags(node);
+    const updated = factory2.updateFunctionExpression(
       node,
       visitNodes2(node.modifiers, visitor, isModifier),
       node.asteriskToken,
       node.name,
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, visitor, context),
+      parameters = functionFlags & 2 /* Async */ ? transformAsyncFunctionParameterList(node) : visitParameterList(node.parameters, visitor, context),
       /*type*/
       void 0,
-      getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) : visitFunctionBody(node.body, visitor, context)
+      functionFlags & 2 /* Async */ ? transformAsyncFunctionBody(node, parameters) : visitFunctionBody(node.body, visitor, context)
     );
+    lexicalArgumentsBinding = savedLexicalArgumentsBinding;
+    return updated;
   }
   function visitArrowFunction(node) {
+    let parameters;
+    const functionFlags = getFunctionFlags(node);
     return factory2.updateArrowFunction(
       node,
       visitNodes2(node.modifiers, visitor, isModifier),
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, visitor, context),
+      parameters = functionFlags & 2 /* Async */ ? transformAsyncFunctionParameterList(node) : visitParameterList(node.parameters, visitor, context),
       /*type*/
       void 0,
       node.equalsGreaterThanToken,
-      getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) : visitFunctionBody(node.body, visitor, context)
+      functionFlags & 2 /* Async */ ? transformAsyncFunctionBody(node, parameters) : visitFunctionBody(node.body, visitor, context)
     );
   }
   function recordDeclarationName({ name }, names) {
@@ -99477,13 +99551,91 @@ function transformES2017(context) {
     hasSuperElementAccess = savedHasSuperElementAccess;
     return updated;
   }
-  function transformAsyncFunctionBody(node) {
+  function createCaptureArgumentsStatement() {
+    Debug.assert(lexicalArgumentsBinding);
+    const variable = factory2.createVariableDeclaration(
+      lexicalArgumentsBinding,
+      /*exclamationToken*/
+      void 0,
+      /*type*/
+      void 0,
+      factory2.createIdentifier("arguments")
+    );
+    const statement = factory2.createVariableStatement(
+      /*modifiers*/
+      void 0,
+      [variable]
+    );
+    startOnNewLine(statement);
+    addEmitFlags(statement, 2097152 /* CustomPrologue */);
+    return statement;
+  }
+  function transformAsyncFunctionParameterList(node) {
+    if (isSimpleParameterList(node.parameters)) {
+      return visitParameterList(node.parameters, visitor, context);
+    }
+    const newParameters = [];
+    for (const parameter of node.parameters) {
+      if (parameter.initializer || parameter.dotDotDotToken) {
+        if (node.kind === 219 /* ArrowFunction */) {
+          const restParameter = factory2.createParameterDeclaration(
+            /*modifiers*/
+            void 0,
+            factory2.createToken(26 /* DotDotDotToken */),
+            factory2.createUniqueName("args", 8 /* ReservedInNestedScopes */)
+          );
+          newParameters.push(restParameter);
+        }
+        break;
+      }
+      const newParameter = factory2.createParameterDeclaration(
+        /*modifiers*/
+        void 0,
+        /*dotDotDotToken*/
+        void 0,
+        factory2.getGeneratedNameForNode(parameter.name, 8 /* ReservedInNestedScopes */)
+      );
+      newParameters.push(newParameter);
+    }
+    const newParametersArray = factory2.createNodeArray(newParameters);
+    setTextRange(newParametersArray, node.parameters);
+    return newParametersArray;
+  }
+  function transformAsyncFunctionBody(node, outerParameters) {
+    const innerParameters = !isSimpleParameterList(node.parameters) ? visitParameterList(node.parameters, visitor, context) : void 0;
     resumeLexicalEnvironment();
     const original = getOriginalNode(node, isFunctionLike);
     const nodeType = original.type;
     const promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : void 0;
     const isArrowFunction2 = node.kind === 219 /* ArrowFunction */;
+    const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
     const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 512 /* CaptureArguments */) !== 0;
+    const captureLexicalArguments = hasLexicalArguments && !lexicalArgumentsBinding;
+    if (captureLexicalArguments) {
+      lexicalArgumentsBinding = factory2.createUniqueName("arguments");
+    }
+    let argumentsExpression;
+    if (innerParameters) {
+      if (isArrowFunction2) {
+        const parameterBindings = [];
+        Debug.assert(outerParameters.length <= node.parameters.length);
+        for (let i = 0; i < node.parameters.length; i++) {
+          Debug.assert(i < outerParameters.length);
+          const originalParameter = node.parameters[i];
+          const outerParameter = outerParameters[i];
+          Debug.assertNode(outerParameter.name, isIdentifier);
+          if (originalParameter.initializer || originalParameter.dotDotDotToken) {
+            Debug.assert(i === outerParameters.length - 1);
+            parameterBindings.push(factory2.createSpreadElement(outerParameter.name));
+            break;
+          }
+          parameterBindings.push(outerParameter.name);
+        }
+        argumentsExpression = factory2.createArrayLiteralExpression(parameterBindings);
+      } else {
+        argumentsExpression = factory2.createIdentifier("arguments");
+      }
+    }
     const savedEnclosingFunctionParameterNames = enclosingFunctionParameterNames;
     enclosingFunctionParameterNames = /* @__PURE__ */ new Set();
     for (const parameter of node.parameters) {
@@ -99495,27 +99647,23 @@ function transformES2017(context) {
       capturedSuperProperties = /* @__PURE__ */ new Set();
       hasSuperElementAccess = false;
     }
+    const hasLexicalThis = inHasLexicalThisContext();
+    let asyncBody = transformAsyncFunctionBodyWorker(node.body);
+    asyncBody = factory2.updateBlock(asyncBody, factory2.mergeLexicalEnvironment(asyncBody.statements, endLexicalEnvironment()));
     let result;
     if (!isArrowFunction2) {
       const statements = [];
-      const statementOffset = factory2.copyPrologue(
-        node.body.statements,
-        statements,
-        /*ensureUseStrict*/
-        false,
-        visitor
-      );
       statements.push(
         factory2.createReturnStatement(
           emitHelpers().createAwaiterHelper(
-            inHasLexicalThisContext(),
-            hasLexicalArguments,
+            hasLexicalThis,
+            argumentsExpression,
             promiseConstructor,
-            transformAsyncFunctionBodyWorker(node.body, statementOffset)
+            innerParameters,
+            asyncBody
           )
         )
       );
-      insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
       const emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (256 /* MethodWithSuperPropertyAssignmentInAsync */ | 128 /* MethodWithSuperPropertyAccessInAsync */);
       if (emitSuperHelpers) {
         enableSubstitutionForAsyncMethodsWithSuper();
@@ -99525,6 +99673,9 @@ function transformES2017(context) {
           insertStatementsAfterStandardPrologue(statements, [variableStatement]);
         }
       }
+      if (captureLexicalArguments) {
+        insertStatementsAfterStandardPrologue(statements, [createCaptureArgumentsStatement()]);
+      }
       const block = factory2.createBlock(
         statements,
         /*multiLine*/
@@ -99540,24 +99691,23 @@ function transformES2017(context) {
       }
       result = block;
     } else {
-      const expression = emitHelpers().createAwaiterHelper(
-        inHasLexicalThisContext(),
-        hasLexicalArguments,
+      result = emitHelpers().createAwaiterHelper(
+        hasLexicalThis,
+        argumentsExpression,
         promiseConstructor,
-        transformAsyncFunctionBodyWorker(node.body)
+        innerParameters,
+        asyncBody
       );
-      const declarations = endLexicalEnvironment();
-      if (some(declarations)) {
-        const block = factory2.converters.convertToFunctionBlock(expression);
-        result = factory2.updateBlock(block, setTextRange(factory2.createNodeArray(concatenate(declarations, block.statements)), block.statements));
-      } else {
-        result = expression;
+      if (captureLexicalArguments) {
+        const block = factory2.converters.convertToFunctionBlock(result);
+        result = factory2.updateBlock(block, factory2.mergeLexicalEnvironment(block.statements, [createCaptureArgumentsStatement()]));
       }
     }
     enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
     if (!isArrowFunction2) {
       capturedSuperProperties = savedCapturedSuperProperties;
       hasSuperElementAccess = savedHasSuperElementAccess;
+      lexicalArgumentsBinding = savedLexicalArgumentsBinding;
     }
     return result;
   }
@@ -100673,7 +100823,7 @@ function transformES2018(context) {
       ),
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, parameterVisitor, context),
+      enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionParameterList(node) : visitParameterList(node.parameters, parameterVisitor, context),
       /*type*/
       void 0,
       enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionBody(node) : transformFunctionBody2(node)
@@ -100694,7 +100844,7 @@ function transformES2018(context) {
       node.name,
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, parameterVisitor, context),
+      enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionParameterList(node) : visitParameterList(node.parameters, parameterVisitor, context),
       /*type*/
       void 0,
       enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionBody(node) : transformFunctionBody2(node)
@@ -100735,7 +100885,7 @@ function transformES2018(context) {
       node.name,
       /*typeParameters*/
       void 0,
-      visitParameterList(node.parameters, parameterVisitor, context),
+      enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionParameterList(node) : visitParameterList(node.parameters, parameterVisitor, context),
       /*type*/
       void 0,
       enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */ ? transformAsyncGeneratorFunctionBody(node) : transformFunctionBody2(node)
@@ -100744,21 +100894,38 @@ function transformES2018(context) {
     parametersWithPrecedingObjectRestOrSpread = savedParametersWithPrecedingObjectRestOrSpread;
     return updated;
   }
+  function transformAsyncGeneratorFunctionParameterList(node) {
+    if (isSimpleParameterList(node.parameters)) {
+      return visitParameterList(node.parameters, visitor, context);
+    }
+    const newParameters = [];
+    for (const parameter of node.parameters) {
+      if (parameter.initializer || parameter.dotDotDotToken) {
+        break;
+      }
+      const newParameter = factory2.createParameterDeclaration(
+        /*modifiers*/
+        void 0,
+        /*dotDotDotToken*/
+        void 0,
+        factory2.getGeneratedNameForNode(parameter.name, 8 /* ReservedInNestedScopes */)
+      );
+      newParameters.push(newParameter);
+    }
+    const newParametersArray = factory2.createNodeArray(newParameters);
+    setTextRange(newParametersArray, node.parameters);
+    return newParametersArray;
+  }
   function transformAsyncGeneratorFunctionBody(node) {
+    const innerParameters = !isSimpleParameterList(node.parameters) ? visitParameterList(node.parameters, visitor, context) : void 0;
     resumeLexicalEnvironment();
-    const statements = [];
-    const statementOffset = factory2.copyPrologue(
-      node.body.statements,
-      statements,
-      /*ensureUseStrict*/
-      false,
-      visitor
-    );
-    appendObjectRestAssignmentsIfNeeded(statements, node);
     const savedCapturedSuperProperties = capturedSuperProperties;
     const savedHasSuperElementAccess = hasSuperElementAccess;
     capturedSuperProperties = /* @__PURE__ */ new Set();
     hasSuperElementAccess = false;
+    const outerStatements = [];
+    let asyncBody = factory2.updateBlock(node.body, visitNodes2(node.body.statements, visitor, isStatement));
+    asyncBody = factory2.updateBlock(asyncBody, factory2.mergeLexicalEnvironment(asyncBody.statements, appendObjectRestAssignmentsIfNeeded(endLexicalEnvironment(), node)));
     const returnStatement = factory2.createReturnStatement(
       emitHelpers().createAsyncGeneratorHelper(
         factory2.createFunctionExpression(
@@ -100768,14 +100935,10 @@ function transformES2018(context) {
           node.name && factory2.getGeneratedNameForNode(node.name),
           /*typeParameters*/
           void 0,
-          /*parameters*/
-          [],
+          innerParameters ?? [],
           /*type*/
           void 0,
-          factory2.updateBlock(
-            node.body,
-            visitLexicalEnvironment(node.body.statements, visitor, context, statementOffset)
-          )
+          asyncBody
         ),
         !!(hierarchyFacts & 1 /* HasLexicalThis */)
       )
@@ -100785,11 +100948,10 @@ function transformES2018(context) {
       enableSubstitutionForAsyncMethodsWithSuper();
       const variableStatement = createSuperAccessVariableStatement(factory2, resolver, node, capturedSuperProperties);
       substitutedSuperAccessors[getNodeId(variableStatement)] = true;
-      insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+      insertStatementsAfterStandardPrologue(outerStatements, [variableStatement]);
     }
-    statements.push(returnStatement);
-    insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
-    const block = factory2.updateBlock(node.body, statements);
+    outerStatements.push(returnStatement);
+    const block = factory2.updateBlock(node.body, outerStatements);
     if (emitSuperHelpers && hasSuperElementAccess) {
       if (resolver.getNodeCheckFlags(node) & 256 /* MethodWithSuperPropertyAssignmentInAsync */) {
         addEmitHelper(block, advancedAsyncSuperHelper);
@@ -146060,7 +146222,7 @@ function getPropertySymbolsFromContextualType(node, checker, contextualType, uni
   if (discriminatedPropertySymbols.length === 0) {
     return mapDefined(contextualType.types, (t) => t.getProperty(name));
   }
-  return discriminatedPropertySymbols;
+  return deduplicate(discriminatedPropertySymbols, equateValues);
 }
 function isArgumentOfElementAccessExpression(node) {
   return node && node.parent && node.parent.kind === 212 /* ElementAccessExpression */ && node.parent.argumentExpression === node;
@@ -170248,7 +170410,7 @@ function getAllRules() {
   const typeNames = [80 /* Identifier */, ...typeKeywords];
   const functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
   const typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([80 /* Identifier */, 3 /* MultiLineCommentTrivia */, 86 /* ClassKeyword */, 95 /* ExportKeyword */, 102 /* ImportKeyword */]);
-  const controlOpenBraceLeftTokenRange = tokenRangeFrom([22 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 92 /* DoKeyword */, 113 /* TryKeyword */, 98 /* FinallyKeyword */, 93 /* ElseKeyword */]);
+  const controlOpenBraceLeftTokenRange = tokenRangeFrom([22 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 92 /* DoKeyword */, 113 /* TryKeyword */, 98 /* FinallyKeyword */, 93 /* ElseKeyword */, 85 /* CatchKeyword */]);
   const highPriorityCommonRules = [
     // Leave comments alone
     rule("IgnoreBeforeComment", anyToken, comments, anyContext, 1 /* StopProcessingSpaceActions */),
@@ -174236,6 +174398,8 @@ __export(ts_exports2, {
   isSignedNumericLiteral: () => isSignedNumericLiteral,
   isSimpleCopiableExpression: () => isSimpleCopiableExpression,
   isSimpleInlineableExpression: () => isSimpleInlineableExpression,
+  isSimpleParameter: () => isSimpleParameter,
+  isSimpleParameterList: () => isSimpleParameterList,
   isSingleOrDoubleQuote: () => isSingleOrDoubleQuote,
   isSourceFile: () => isSourceFile,
   isSourceFileFromLibrary: () => isSourceFileFromLibrary,
@@ -174950,9 +175114,9 @@ function buildOverload(name) {
 
 // src/deprecatedCompat/5.0/identifierProperties.ts
 addObjectAllocatorPatcher((objectAllocator2) => {
-  const Identifier78 = objectAllocator2.getIdentifierConstructor();
-  if (!hasProperty(Identifier78.prototype, "originalKeywordKind")) {
-    Object.defineProperty(Identifier78.prototype, "originalKeywordKind", {
+  const Identifier79 = objectAllocator2.getIdentifierConstructor();
+  if (!hasProperty(Identifier79.prototype, "originalKeywordKind")) {
+    Object.defineProperty(Identifier79.prototype, "originalKeywordKind", {
       get: deprecate(function() {
         return identifierToKeywordKind(this);
       }, {
@@ -174964,8 +175128,8 @@ addObjectAllocatorPatcher((objectAllocator2) => {
       })
     });
   }
-  if (!hasProperty(Identifier78.prototype, "isInJSDocNamespace")) {
-    Object.defineProperty(Identifier78.prototype, "isInJSDocNamespace", {
+  if (!hasProperty(Identifier79.prototype, "isInJSDocNamespace")) {
+    Object.defineProperty(Identifier79.prototype, "isInJSDocNamespace", {
       get: deprecate(function() {
         return this.flags & 4096 /* IdentifierIsInJSDocNamespace */ ? true : void 0;
       }, {
@@ -188896,6 +189060,8 @@ start(initializeNodeSystem(), require("os").platform());
   isSignedNumericLiteral,
   isSimpleCopiableExpression,
   isSimpleInlineableExpression,
+  isSimpleParameter,
+  isSimpleParameterList,
   isSingleOrDoubleQuote,
   isSourceFile,
   isSourceFileFromLibrary,