[WASM] JsInterop - Correct JsExternsGenerator to look at isJsConstructor to make it more consistent with AddJsExportBridgesWasm since it is no longer needed to use the synthetic factory since reordering

Also revert the change in NormalizeInstantiationThroughFactoryMethods since we no longer need to mark synthetic factories as JS members (see ebb1132)

Also make the js property check to be more specific to jsproperties.

See: 7255073
PiperOrigin-RevId: 888321679

Author: Googler

transpiler/java/com/google/j2cl/transpiler/backend/wasm/JsExternsGenerator.java

@@ -98,7 +98,7 @@ private void appendConstructor(SourceBuilder sb, Type type) {
     String jsDoc = closureEnvironment.getJsDocForType(type, /* isWasmExtern= */ true);
     Method constructor =
         type.getMethods().stream()
-            .filter(m -> isConstructor(m.getDescriptor()))
+            .filter(m -> m.getDescriptor().isJsConstructor())
             .findFirst()
             .orElse(null);
 
@@ -131,9 +131,9 @@ private void appendMethods(SourceBuilder sb, Type type) {
       MethodDescriptor methodDescriptor = method.getDescriptor();
       if (!AstUtils.needsWasmJsExport(methodDescriptor)
           // Constructors handled elsewhere.
-          || isConstructor(methodDescriptor)
+          || methodDescriptor.isJsConstructor()
           // TODO(b/458472428): Support JsProperty.
-          || !methodDescriptor.isJsMethod()) {
+          || methodDescriptor.isJsProperty()) {
         continue;
       }
 
@@ -169,11 +169,6 @@ private void appendJsDoc(SourceBuilder sb, String jsDoc) {
     }
   }
 
-  private static boolean isConstructor(MethodDescriptor methodDescriptor) {
-    return methodDescriptor.getOrigin()
-        == MethodDescriptor.MethodOrigin.SYNTHETIC_FACTORY_FOR_CONSTRUCTOR;
-  }
-
   private void generateExternsWiring(Type type) {
     SourceBuilder sb = new SourceBuilder();
     sb.appendln(String.format("goog.module('%s');", type.getDeclaration().getModuleName()));

transpiler/java/com/google/j2cl/transpiler/backend/wasm/SummaryBuilder.java

@@ -143,8 +143,7 @@ private JsInfo getJsInfo(Type type) {
     // TODO(b/458472428): Support JsProperty/Getter/Setter.
     for (var method : type.getMethods()) {
       MethodDescriptor methodDescriptor = method.getDescriptor();
-      if (!(methodDescriptor.getOrigin().isWasmJsExport()
-          || methodDescriptor.getOrigin().isWasmJsConstructorExport())) {
+      if (!methodDescriptor.getOrigin().isWasmJsExport()) {
         continue;
       }
 

transpiler/java/com/google/j2cl/transpiler/passes/NormalizeInstantiationThroughFactoryMethods.java

@@ -25,7 +25,6 @@
 import com.google.j2cl.transpiler.ast.DeclaredTypeDescriptor;
 import com.google.j2cl.transpiler.ast.Expression;
 import com.google.j2cl.transpiler.ast.JsInfo;
-import com.google.j2cl.transpiler.ast.JsMemberType;
 import com.google.j2cl.transpiler.ast.Member;
 import com.google.j2cl.transpiler.ast.Method;
 import com.google.j2cl.transpiler.ast.MethodCall;
@@ -229,14 +228,6 @@ private static MethodDescriptor getCtorMethodDescriptorForConstructor(
   /** Method descriptor for $create methods. */
   private static MethodDescriptor getFactoryDescriptorForConstructor(MethodDescriptor constructor) {
     checkArgument(constructor.isConstructor());
-    // Note: For JS constructors, we mark mark the corresponding factory method as a JS method so
-    // that the summary builder picks it up.
-    JsInfo newJsInfo =
-        constructor.isJsConstructor()
-            ? JsInfo.Builder.from(constructor.getOriginalJsInfo())
-                .setJsMemberType(JsMemberType.METHOD)
-                .build()
-            : JsInfo.NONE;
     return constructor.transform(
         builder ->
             builder
@@ -250,7 +241,7 @@ private static MethodDescriptor getFactoryDescriptorForConstructor(MethodDescrip
                         .getTypeDeclaration()
                         .getTypeParameterDescriptors())
                 .setOrigin(MethodOrigin.SYNTHETIC_FACTORY_FOR_CONSTRUCTOR)
-                .setOriginalJsInfo(newJsInfo)
+                .setOriginalJsInfo(JsInfo.NONE)
                 .setVisibility(constructor.getVisibility()));
   }