Merge pull request #26 from treblereel/r_0_6_4

R 0 6 4
treblereel · Jun 1, 2024 · 9d98314 · 9d98314
2 parents ef827b4 + 44f1eea
commit 9d98314
Show file tree

Hide file tree

Showing 24 changed files with 81 additions and 42 deletions.
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.treblereel.j2cl.processors</groupId>
     <artifactId>parent</artifactId>
-    <version>0.6.3</version>
+    <version>0.6.4</version>
   </parent>
 
   <artifactId>annotations</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl.processors</groupId>
         <artifactId>parent</artifactId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
 
     <artifactId>common</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.treblereel.j2cl.processors</groupId>
   <artifactId>parent</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>pom</packaging>
 
   <name>GWT3 processors parent</name>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.treblereel.j2cl.processors</groupId>
         <artifactId>parent</artifactId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
 
     <artifactId>processors</artifactId>

diff --git a/processor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3ExportGenerator.java b/processor/src/main/java/org/treblereel/j2cl/processors/generator/GWT3ExportGenerator.java
@@ -29,7 +29,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Element;
@@ -112,13 +114,13 @@ public void generate(Set<Element> elements) {
         exports.put(checkClazz(parent), new HashSet<>());
         exports.get(parent).addAll(methods);
 
-        ElementFilter.methodsIn(parent.getEnclosedElements()).stream()
+        getAllMethodsIn(parent).stream()
             .filter(elm -> !elm.getModifiers().contains(Modifier.PRIVATE))
             .filter(elm -> !elm.getModifiers().contains(Modifier.NATIVE))
             .filter(elm -> !elm.getModifiers().contains(Modifier.ABSTRACT))
             .forEach(elm -> exportDTOs.get(parent).addMethod(getMethodDTO(parent, elm)));
 
-        ElementFilter.fieldsIn(parent.getEnclosedElements()).stream()
+        getAllFieldsIn(parent).stream()
             .filter(elm -> !elm.getModifiers().contains(Modifier.PRIVATE))
             .filter(elm -> !elm.getModifiers().contains(Modifier.NATIVE))
             .filter(elm -> !elm.getModifiers().contains(Modifier.ABSTRACT))
@@ -287,9 +289,8 @@ private TypeElement checkClazz(TypeElement parent) {
               + ", mustn't be annotated with @ES6Module");
     }
     Set<ExecutableElement> constructors =
-        ElementFilter.constructorsIn(parent.getEnclosedElements()).stream()
-            .collect(Collectors.toSet());
-    if (!constructors.isEmpty()) {
+        new HashSet<>(ElementFilter.constructorsIn(parent.getEnclosedElements()));
+    if (parent.getAnnotation(JsType.class) == null && !constructors.isEmpty()) {
       constructors.stream()
           .filter(elm -> elm.getModifiers().contains(Modifier.PUBLIC))
           .filter(elm -> elm.getParameters().isEmpty())
@@ -305,4 +306,34 @@ private TypeElement checkClazz(TypeElement parent) {
 
     return parent;
   }
+
+  private Set<ExecutableElement> getAllMethodsIn(TypeElement parent) {
+    Set<ExecutableElement> elements = new HashSet<>();
+    Queue<TypeElement> queue = new LinkedList<>();
+    queue.add(parent);
+    while (!queue.isEmpty()) {
+      TypeElement current = queue.poll();
+      elements.addAll(ElementFilter.methodsIn(current.getEnclosedElements()));
+      if (!current.getSuperclass().toString().equals("java.lang.Object")
+          && MoreTypes.asElement(current.getSuperclass()).getKind().isClass()) {
+        queue.offer((TypeElement) MoreTypes.asElement(current.getSuperclass()));
+      }
+    }
+    return elements;
+  }
+
+  private Set<VariableElement> getAllFieldsIn(TypeElement parent) {
+    Set<VariableElement> elements = new HashSet<>();
+    Queue<TypeElement> queue = new LinkedList<>();
+    queue.add(parent);
+    while (!queue.isEmpty()) {
+      TypeElement current = queue.poll();
+      elements.addAll(ElementFilter.fieldsIn(current.getEnclosedElements()));
+      if (!current.getSuperclass().toString().equals("java.lang.Object")
+          && MoreTypes.asElement(current.getSuperclass()).getKind().isClass()) {
+        queue.offer((TypeElement) MoreTypes.asElement(current.getSuperclass()));
+      }
+    }
+    return elements;
+  }
 }
diff --git a/processor/src/main/resources/templates/resources/export.ftlh b/processor/src/main/resources/templates/resources/export.ftlh
@@ -1,25 +1,33 @@
+<#if !isNative>
+/**
+* @fileoverview
+* @suppress {missingProperties}
+*/
+</#if>
 goog.module('${module}$GWT3Export');
 
 const EXPORT = goog.require('${target}');
 
 <#if isNative>
 goog.exportSymbol('${type}', EXPORT);
-<#else>
-const j_l_Object = goog.require('java.lang.Object$impl');
-const $Util = goog.require('nativebootstrap.Util$impl');
 
-class _EXPORT extends EXPORT {
-    constructor() {
-        EXPORT.$clinit();
-        super();
-        this.${ctor}();
+<#list methods as method>
+goog.exportSymbol('${type}.<#if !method.isStatic>prototype.</#if>${method.name}', EXPORT.<#if !method.isStatic>prototype.</#if>${method.mangleName});
+</#list>
+<#else>
+const classProxy = new Proxy(EXPORT, {
+    construct(target, args) {
+        return EXPORT.$create__();
     }
-}
-
-$Util.$setClassMetadata(_EXPORT, '${module}');
-goog.exportSymbol('${type}', _EXPORT);
-</#if>
+});
 
+EXPORT.$clinit();
+goog.exportSymbol('${type}', classProxy);
 <#list methods as method>
-goog.exportSymbol('${type}.<#if !method.isStatic>prototype.</#if>${method.name}', EXPORT.<#if !method.isStatic>prototype.</#if>${method.mangleName});
+<#if method.isStatic>
+goog.exportProperty(EXPORT, '${method.name}', EXPORT.${method.mangleName});
+<#else>
+goog.exportSymbol('${type}.prototype.${method.name}', classProxy.prototype.${method.mangleName});
+</#if>
 </#list>
+</#if>
diff --git a/tests/commons/pom.xml b/tests/commons/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.treblereel.j2cl</groupId>
     <artifactId>common-tests</artifactId>
-    <version>0.6.3</version>
+    <version>0.6.4</version>
 
     <name>Common test cases</name>
     <description>Common test cases</description>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.treblereel.j2cl.processors</groupId>
             <artifactId>common</artifactId>
-            <version>0.6.3</version>
+            <version>0.6.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/tests/entrypoint/jstype/pom.xml b/tests/entrypoint/jstype/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-jstype-tests</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
 
   <name>GWT3 Entry Point Tests for @JsType class</name>
   <description>Test cases for the GWT3 Entry Point for @JsType class</description>

diff --git a/tests/entrypoint/pojo/pom.xml b/tests/entrypoint/pojo/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-pojo-tests</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
 
   <name>GWT3 Entry Point Tests for Pojo class</name>
   <description>Test cases for the GWT3 Entry Point for Pojo class</description>

diff --git a/tests/entrypoint/pom.xml b/tests/entrypoint/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>entrypoint-tests</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>pom</packaging>
 
   <name>GWT3 Entry Point Tests</name>

diff --git a/tests/es6shim/pom.xml b/tests/es6shim/pom.xml
@@ -5,7 +5,7 @@
 
   <artifactId>es6shim-tests</artifactId>
   <groupId>org.treblereel.j2cl</groupId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>jar</packaging>
 
   <name>ES6SHIM Tests</name>

diff --git a/tests/exports/javaenv/pom-advanced.xml b/tests/exports/javaenv/pom-advanced.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>javaenv-advanced</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>jar</packaging>
 
   <name>GWTExports java env Tests ADVANCED mode</name>

diff --git a/tests/exports/javaenv/pom.xml b/tests/exports/javaenv/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>javaenv</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>jar</packaging>
 
   <name>GWTExports java env Tests BUNDLE_JAR mode</name>

diff --git a/tests/exports/jsenv/bundle_jar_pom.xml b/tests/exports/jsenv/bundle_jar_pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>exports-bundle_jar</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>jar</packaging>
 
   <name>GWTExports Tests BUNDLE_JAR mode</name>

diff --git a/tests/exports/jsenv/pom.xml b/tests/exports/jsenv/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>jsenv</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>jar</packaging>
 
   <name>GWTExports Tests ADVANCED mode</name>

diff --git a/tests/exports/pom.xml b/tests/exports/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl</groupId>
         <artifactId>tests-parent</artifactId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>tests-parent</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>pom</packaging>
 
   <name>GWT3 processors Tests</name>

diff --git a/tests/resources/pom.xml b/tests/resources/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl</groupId>
         <artifactId>tests-parent</artifactId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
 
     <artifactId>resources</artifactId>

diff --git a/tests/translation/default/pom.xml b/tests/translation/default/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.treblereel.j2cl</groupId>
     <artifactId>translation-default</artifactId>
-    <version>0.6.3</version>
+    <version>0.6.4</version>
     <packaging>jar</packaging>
 
     <name>Translation Tests en</name>

diff --git a/tests/translation/fr/pom.xml b/tests/translation/fr/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.treblereel.j2cl</groupId>
     <artifactId>translation-fr</artifactId>
-    <version>0.6.3</version>
+    <version>0.6.4</version>
     <packaging>jar</packaging>
 
     <name>Translation Tests fr</name>

diff --git a/tests/translation/fr_nr/pom.xml b/tests/translation/fr_nr/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.treblereel.j2cl</groupId>
     <artifactId>translation-fr-nr</artifactId>
-    <version>0.6.3</version>
+    <version>0.6.4</version>
     <packaging>jar</packaging>
 
     <name>Translation Tests fr-nr</name>

diff --git a/tests/translation/no_bundle/pom.xml b/tests/translation/no_bundle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.treblereel.j2cl</groupId>
         <artifactId>translation-tests</artifactId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
 
     <artifactId>translation-no_bundle</artifactId>

diff --git a/tests/translation/pom.xml b/tests/translation/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.treblereel.j2cl</groupId>
   <artifactId>translation-tests</artifactId>
-  <version>0.6.3</version>
+  <version>0.6.4</version>
   <packaging>pom</packaging>
 
   <name>GWT3 Entry Point Tests</name>

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.treblereel.j2cl.processors</groupId>
-        <version>0.6.3</version>
+        <version>0.6.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>