[squash] swap 'reciever, state' helper params

Signed-off-by: Ashley Claymore <[email protected]>

Author: acutmore

src/compiler/factory/emitHelpers.ts

@@ -34,7 +34,7 @@ namespace ts {
         // Class Fields Helpers
         createClassPrivateFieldGetHelper(receiver: Expression, state: Identifier, kind: PrivateIdentifierKind, f: Identifier | undefined): Expression;
         createClassPrivateFieldSetHelper(receiver: Expression, state: Identifier, value: Expression, kind: PrivateIdentifierKind, f: Identifier | undefined): Expression;
-        createClassPrivateFieldInHelper(receiver: Expression, state: Identifier): Expression;
+        createClassPrivateFieldInHelper(state: Identifier, receiver: Expression): Expression;
     }
 
     export function createEmitHelperFactory(context: TransformationContext): EmitHelperFactory {
@@ -397,9 +397,9 @@ namespace ts {
             return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, args);
         }
 
-        function createClassPrivateFieldInHelper(receiver: Expression, state: Identifier) {
+        function createClassPrivateFieldInHelper(state: Identifier, receiver: Expression) {
             context.requestEmitHelper(classPrivateFieldInHelper);
-            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldIn"), /* typeArguments*/ undefined, [receiver, state]);
+            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldIn"), /* typeArguments*/ undefined, [state, receiver]);
         }
     }
 
@@ -969,11 +969,11 @@ namespace ts {
 
     /**
      * Parameters:
-     *  @param receiver — The object being checked if it has the private member.
      *  @param state — One of the following:
      *      - A WeakMap when the member is a private instance field.
      *      - A WeakSet when the member is a private instance method or accessor.
      *      - A function value that should be the undecorated class constructor when the member is a private static field, method, or accessor.
+     *  @param receiver — The object being checked if it has the private member.
      *
      * Usage:
      * This helper is used to transform `#field in expression` to
@@ -984,7 +984,7 @@ namespace ts {
         importName: "__classPrivateFieldIn",
         scoped: false,
         text: `
-            var __classPrivateFieldIn = (this && this.__classPrivateFieldIn) || function(receiver, state) {
+            var __classPrivateFieldIn = (this && this.__classPrivateFieldIn) || function(state, receiver) {
                 if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function")) throw new TypeError("Cannot use 'in' operator on non-object");
                 return typeof state === "function" ? receiver === state : state.has(receiver);
             };`

src/compiler/transformers/classFields.ts

@@ -289,7 +289,7 @@ namespace ts {
                 const receiver = visitNode(node.right, visitor, isExpression);
 
                 return setOriginalNode(
-                    context.getEmitHelperFactory().createClassPrivateFieldInHelper(receiver, info.brandCheckIdentifier),
+                    context.getEmitHelperFactory().createClassPrivateFieldInHelper(info.brandCheckIdentifier, receiver),
                     node
                 );
             }

tests/baselines/reference/privateNameInInExpressionTransform(target=es2020).js

@@ -47,7 +47,7 @@ export { }
 
 
 //// [privateNameInInExpressionTransform.js]
-var __classPrivateFieldIn = (this && this.__classPrivateFieldIn) || function(receiver, state) {
+var __classPrivateFieldIn = (this && this.__classPrivateFieldIn) || function(state, receiver) {
     if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function")) throw new TypeError("Cannot use 'in' operator on non-object");
     return typeof state === "function" ? receiver === state : state.has(receiver);
 };
@@ -58,25 +58,25 @@ class Foo {
         _Foo_field.set(this, 1);
     }
     check(v) {
-        __classPrivateFieldIn(v, _Foo_field); // expect Foo's 'field' WeakMap
-        __classPrivateFieldIn(v, _Foo_instances); // expect Foo's 'method' WeakSet
-        __classPrivateFieldIn(v, _a); // expect Foo's constructor
-        __classPrivateFieldIn(v, _a); // expect Foo's constructor
+        __classPrivateFieldIn(_Foo_field, v); // expect Foo's 'field' WeakMap
+        __classPrivateFieldIn(_Foo_instances, v); // expect Foo's 'method' WeakSet
+        __classPrivateFieldIn(_a, v); // expect Foo's constructor
+        __classPrivateFieldIn(_a, v); // expect Foo's constructor
     }
     precedence(v) {
         // '==' has lower precedence than 'in'
         // '<'  has same precedence than 'in'
         // '<<' has higher precedence than 'in'
-        v == __classPrivateFieldIn(v, _Foo_field) == v; // Good precedence: ((v == (#field in v)) == v)
-        v << __classPrivateFieldIn(v << v, _Foo_field); // Good precedence: (v << (#field in (v << v)))
-        v << __classPrivateFieldIn(v, _Foo_field) == v; // Good precedence: ((v << (#field in v)) == v)
-        v == __classPrivateFieldIn(v, _Foo_field) < v; // Good precedence: (v == ((#field in v) < v))
-        __classPrivateFieldIn(v, _Foo_field) && __classPrivateFieldIn(v, _Foo_field); // Good precedence: ((#field in v) && (#field in v))
+        v == __classPrivateFieldIn(_Foo_field, v) == v; // Good precedence: ((v == (#field in v)) == v)
+        v << __classPrivateFieldIn(_Foo_field, v << v); // Good precedence: (v << (#field in (v << v)))
+        v << __classPrivateFieldIn(_Foo_field, v) == v; // Good precedence: ((v << (#field in v)) == v)
+        v == __classPrivateFieldIn(_Foo_field, v) < v; // Good precedence: (v == ((#field in v) < v))
+        __classPrivateFieldIn(_Foo_field, v) && __classPrivateFieldIn(_Foo_field, v); // Good precedence: ((#field in v) && (#field in v))
     }
     invalidLHS(v) {
         'prop' in v;
         10;
-        __classPrivateFieldIn(v, _Foo_field);
+        __classPrivateFieldIn(_Foo_field, v);
         10;
     }
 }
@@ -87,7 +87,7 @@ class Bar {
         _Bar_field.set(this, 1);
     }
     check(v) {
-        __classPrivateFieldIn(v, _Bar_field); // expect Bar's 'field' WeakMap
+        __classPrivateFieldIn(_Bar_field, v); // expect Bar's 'field' WeakMap
     }
 }
 _Bar_field = new WeakMap();