Port "Fix getEffectiveCheckNode" (#1083)

Co-authored-by: Gabriela Araujo Britto <[email protected]>

Author: Andarist

internal/ast/utilities.go

@@ -802,8 +802,9 @@ const (
 	OEKNonNullAssertions            OuterExpressionKinds = 1 << 2
 	OEKPartiallyEmittedExpressions  OuterExpressionKinds = 1 << 3
 	OEKExpressionsWithTypeArguments OuterExpressionKinds = 1 << 4
-	OEKExcludeJSDocTypeAssertion                         = 1 << 5
-	OEKAssertions                                        = OEKTypeAssertions | OEKNonNullAssertions
+	OEKSatisfies                    OuterExpressionKinds = 1 << 5
+	OEKExcludeJSDocTypeAssertion                         = 1 << 6
+	OEKAssertions                                        = OEKTypeAssertions | OEKNonNullAssertions | OEKSatisfies
 	OEKAll                                               = OEKParentheses | OEKAssertions | OEKPartiallyEmittedExpressions | OEKExpressionsWithTypeArguments
 )
 
@@ -812,8 +813,10 @@ func IsOuterExpression(node *Expression, kinds OuterExpressionKinds) bool {
 	switch node.Kind {
 	case KindParenthesizedExpression:
 		return kinds&OEKParentheses != 0 && !(kinds&OEKExcludeJSDocTypeAssertion != 0 && isJSDocTypeAssertion(node))
-	case KindTypeAssertionExpression, KindAsExpression, KindSatisfiesExpression:
+	case KindTypeAssertionExpression, KindAsExpression:
 		return kinds&OEKTypeAssertions != 0
+	case KindSatisfiesExpression:
+		return kinds&(OEKExpressionsWithTypeArguments|OEKSatisfies) != 0
 	case KindExpressionWithTypeArguments:
 		return kinds&OEKExpressionsWithTypeArguments != 0
 	case KindNonNullExpression:

internal/checker/checker.go

@@ -9064,11 +9064,12 @@ func (c *Checker) getThisArgumentType(node *ast.Node) *Type {
 }
 
 func (c *Checker) getEffectiveCheckNode(argument *ast.Node) *ast.Node {
-	argument = ast.SkipParentheses(argument)
-	if ast.IsSatisfiesExpression(argument) {
-		return ast.SkipParentheses(argument.Expression())
-	}
-	return argument
+	flags := core.IfElse(
+		ast.IsInJSFile(argument),
+		ast.OEKParentheses|ast.OEKSatisfies|ast.OEKExcludeJSDocTypeAssertion,
+		ast.OEKParentheses|ast.OEKSatisfies,
+	)
+	return ast.SkipOuterExpressions(argument, flags)
 }
 
 func (c *Checker) inferTypeArguments(node *ast.Node, signature *Signature, args []*ast.Node, checkMode CheckMode, context *InferenceContext) []*Type {

internal/transformers/typeeraser.go

@@ -230,7 +230,7 @@ func (tx *TypeEraserTransformer) visit(node *ast.Node) *ast.Node {
 
 	case ast.KindParenthesizedExpression:
 		n := node.AsParenthesizedExpression()
-		expression := ast.SkipOuterExpressions(n.Expression, ^(ast.OEKTypeAssertions | ast.OEKExpressionsWithTypeArguments))
+		expression := ast.SkipOuterExpressions(n.Expression, ^(ast.OEKAssertions | ast.OEKExpressionsWithTypeArguments))
 		if ast.IsAssertionExpression(expression) || ast.IsSatisfiesExpression(expression) {
 			partial := tx.factory.NewPartiallyEmittedExpression(tx.visitor.VisitNode(n.Expression))
 			tx.emitContext.SetOriginal(partial, node)

testdata/baselines/reference/submodule/conformance/typeSatisfaction_errorLocations1.errors.txt

@@ -28,8 +28,8 @@ typeSatisfaction_errorLocations1.ts(47,24): error TS2322: Type 'number' is not a
 typeSatisfaction_errorLocations1.ts(48,21): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: true; }'.
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'true'.
-typeSatisfaction_errorLocations1.ts(50,27): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
-typeSatisfaction_errorLocations1.ts(51,28): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
+typeSatisfaction_errorLocations1.ts(50,23): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
+typeSatisfaction_errorLocations1.ts(51,24): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
 
 
 ==== typeSatisfaction_errorLocations1.ts (24 errors) ====
@@ -141,11 +141,11 @@ typeSatisfaction_errorLocations1.ts(51,28): error TS2741: Property 'a' is missin
 !!! error TS2322:     Type 'number' is not assignable to type 'true'.
 
     ((): { a: true } => (({}) satisfies unknown) satisfies unknown)();
-                              ~~~~~~~~~
+                          ~~
 !!! error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
 !!! related TS2728 typeSatisfaction_errorLocations1.ts:50:8: 'a' is declared here.
     ((): { a: true } => ((({}) satisfies unknown)) satisfies unknown)();
-                               ~~~~~~~~~
+                           ~~
 !!! error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
 !!! related TS2728 typeSatisfaction_errorLocations1.ts:51:8: 'a' is declared here.
 

testdata/baselines/reference/submodule/conformance/typeSatisfaction_errorLocations1.errors.txt.diff

@@ -24,18 +24,7 @@
  typeSatisfaction_errorLocations1.ts(34,9): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
  typeSatisfaction_errorLocations1.ts(36,9): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
  typeSatisfaction_errorLocations1.ts(39,3): error TS2322: Type 'string' is not assignable to type 'number'.
-@@= skipped -12, +11 lines =@@
- typeSatisfaction_errorLocations1.ts(48,21): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: true; }'.
-   Types of property 'a' are incompatible.
-     Type 'number' is not assignable to type 'true'.
--typeSatisfaction_errorLocations1.ts(50,23): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
--typeSatisfaction_errorLocations1.ts(51,24): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
-+typeSatisfaction_errorLocations1.ts(50,27): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
-+typeSatisfaction_errorLocations1.ts(51,28): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
-
-
- ==== typeSatisfaction_errorLocations1.ts (24 errors) ====
-@@= skipped -10, +10 lines =@@
+@@= skipped -22, +21 lines =@@
      const fn1 = (s: { a: true }) => {};
      fn1({} satisfies unknown);
          ~~
@@ -64,18 +53,4 @@
 +!!! error TS4104: The type 'readonly [10, "20"]' is 'readonly' and cannot be assigned to the mutable type 'number[]'.
 
      declare function fn4(...args: number[]): void;
-     fn4(10, ...(["10", "20"] satisfies readonly string[]));
-@@= skipped -41, +40 lines =@@
- !!! error TS2322:     Type 'number' is not assignable to type 'true'.
-     
-     ((): { a: true } => (({}) satisfies unknown) satisfies unknown)();
--                          ~~
-+                              ~~~~~~~~~
- !!! error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
- !!! related TS2728 typeSatisfaction_errorLocations1.ts:50:8: 'a' is declared here.
-     ((): { a: true } => ((({}) satisfies unknown)) satisfies unknown)();
--                           ~~
-+                               ~~~~~~~~~
- !!! error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: true; }'.
- !!! related TS2728 typeSatisfaction_errorLocations1.ts:51:8: 'a' is declared here.
-     
+     fn4(10, ...(["10", "20"] satisfies readonly string[]));