Merge pull request #84 from manolo/elemental2

Elemental2

Author: manolo

bin/gwt-api-generator.js

@@ -3,6 +3,9 @@
 var gulp = require('gulp')
 require('../gulpfile');
 
+var gutil = require('gulp-util');
+gutil.log('Running gwt-api-generator version: ' + require('../package.json').version);
+
 require('coa').Cmd()
   .name(process.argv[1])
   .title('gwt-api-generator')
@@ -32,6 +35,11 @@ require('coa').Cmd()
     .title('Artifact id of the project. (Default: gwt-polymer-elements)')
     .long('artifactId')
     .end()
+  .opt()
+    .name('Module Name')
+    .title('Module name of your components. (Default: Elements.gwt.xml)')
+    .long('moduleName')
+    .end()
   .opt()
     .name('Version')
     .title('Version of the generated maven project. (Defaults to package.json.pom.version || pakage.json.version)')

gulpfile.js

@@ -230,20 +230,16 @@ gulp.task('generate:widget-events', ['parse'], function() {
    });
 });
 
-gulp.task('generate:gwt-module', function() {
-  if (!args.excludeLib) {
+gulp.task('generate:gwt-module', function () {
+  if (args.moduleName != 'Elements' || args.groupId != 'com.vaadin.polymer') {
+    var dest = globalVar.publicDir.replace(/[^\/]+\/?$/, '');
+    gutil.log("Generating Module: " + dest + args.moduleName + ".gwt.xml");
     return gulp.src(tplDir + "GwtModule.template")
-      .pipe(rename("Elements.gwt.xml"))
-      .pipe(gulp.dest(globalVar.publicDir + "../"));
+      .pipe(rename(args.moduleName + ".gwt.xml"))
+      .pipe(gulp.dest(dest));
   }
 });
 
-gulp.task('copy:static-gwt-module', function() {
-  return gulp.src(tplDir + "Elements.gwt.xml")
-    .pipe(gulp.dest(globalVar.publicDirBase + '/com/vaadin/polymer/'));
-});
-
-
 gulp.task('generate:elements-all', ['generate:elements', 'generate:events']);
 
 gulp.task('generate:widgets-all', ['generate:widgets', 'generate:widget-events']);
@@ -281,8 +277,8 @@ gulp.task('copy:pom', function() {
 
 gulp.task('default', function(){
   if(args.pom) {
-    runSequence('clean', 'bower:install', 'generate', 'copy:lib', 'copy:static-gwt-module', 'copy:pom');
+    runSequence('clean', 'bower:install', 'generate', 'copy:lib', 'copy:pom');
   } else {
-    runSequence('clean', 'bower:install', 'generate', 'copy:lib', 'copy:static-gwt-module');
+    runSequence('clean', 'bower:install', 'generate', 'copy:lib');
   }
 });

template/Elements.gwt.xml lib/com/vaadin/polymer/Elements.gwt.xmltemplate/Elements.gwt.xml renamed to lib/com/vaadin/polymer/Elements.gwt.xml

@@ -2,4 +2,6 @@
 <module>
     <source path="" />
     <inherits name='com.google.gwt.user.User'/>
+    <inherits name='elemental2.core.Core'/>
+    <inherits name='elemental2.dom.Dom'/>
 </module>

lib/com/vaadin/polymer/Polymer.java

@@ -2,14 +2,13 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsArray;
+import elemental2.core.Array;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Timer;
 
-import com.vaadin.polymer.elemental.Function;
-import com.vaadin.polymer.elemental.HTMLElement;
+import com.vaadin.polymer.PolymerFunction;
+import elemental2.dom.HTMLElement;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,6 +21,7 @@
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
+import jsinterop.base.Js;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public abstract class Polymer {
@@ -61,11 +61,11 @@ public interface DomApi {
 
         <T extends HTMLElement> T querySelector(String selector);
 
-        JsArray querySelectorAll(String selector);
+        Array querySelectorAll(String selector);
 
         void appendChild(Object el);
 
-        JsArray children();
+        Array children();
     }
 
     @JsType(isNative=true, namespace=GLOBAL)
@@ -120,7 +120,7 @@ public interface Base {
          * timing (after the current method finishes, but before the next event from the event
          * queue is processed). Returns a handle that can be used to cancel the task.
          */
-        Object async(Function method, int wait);
+        Object async(PolymerFunction method, int wait);
 
         /**
          * Cancels the identified async task.
@@ -143,7 +143,7 @@ public interface Base {
         /**
          *  Dynamically imports an HTML document.
          */
-        void importHref(String href, Function onload, Function onerror);
+        void importHref(String href, PolymerFunction onload, PolymerFunction onerror);
 
         /**
          * Takes a URL relative to the <dom-module> of an imported Polymer element, and returns
@@ -154,7 +154,7 @@ public interface Base {
     }
 
     private static Set<String> urlImported = new HashSet<>();
-    private static HashMap<String, List<Function>> whenImported = new HashMap<>();
+    private static HashMap<String, List<PolymerFunction>> whenImported = new HashMap<>();
 
     /**
      * Inserts the appropriate &lt;import&gt; of a component given by url.
@@ -171,7 +171,7 @@ public static void importHref(String href) {
      * @param href either an absolute url or a path relative to bower_components folder.
      * @param ok callback to run in case of success
      */
-    public static void importHref(String href, Function ok) {
+    public static void importHref(String href, PolymerFunction ok) {
         importHref(href, ok, null);
     }
 
@@ -191,7 +191,7 @@ private static String absoluteHref(String hrefOrTag) {
     }
 
     // Loads Polymer once if not done yet, and queue all callbaks until ready
-    private static native void whenPolymerLoaded(Function ok)
+    private static native void whenPolymerLoaded(PolymerFunction ok)
     /*-{
         function resolve() {
           // Set our static reference to Base
@@ -236,19 +236,19 @@ function resolve() {
      * @param ok callback to run in case of success
      * @param err callback to run in case of failure
      */
-    public static void importHref(String hrefOrTag, final Function ok, final Function err) {
+    public static void importHref(String hrefOrTag, final PolymerFunction ok, final PolymerFunction err) {
         final String href = absoluteHref(hrefOrTag);
 
-        Function done = arg -> {
-                urlImported.add(href);
-                List<Function> pending = whenImported.get(href);
-                if (pending != null) {
-                    for (Function f : pending) {
-                        f.call(null);
-                    }
+        PolymerFunction done = arg -> {
+            urlImported.add(href);
+            List<PolymerFunction> pending = whenImported.get(href);
+            if (pending != null) {
+                for (PolymerFunction f : pending) {
+                    f.call(null);
                 }
-                whenImported.remove(href);
-                return null;
+            }
+            whenImported.remove(href);
+            return null;
         };
         if (Base == null) {
             whenPolymerLoaded(arg -> {
@@ -259,9 +259,9 @@ public static void importHref(String hrefOrTag, final Function ok, final Functio
         }
         if (!urlImported.contains(href)) {
             if (!isRegistered(href)) {
-                List<Function> pending = whenImported.get(href);
+                List<PolymerFunction> pending = whenImported.get(href);
                 if (pending == null) {
-                    pending = new ArrayList<Function>();
+                    pending = new ArrayList<PolymerFunction>();
                     whenImported.put(href, pending);
                     Base.importHref(href, done, err);
                 }
@@ -291,9 +291,8 @@ public static void importHref(final List<String> hrefs) {
      *
      * @param hrefs a list of absolute urls or relative paths to load.
      * @param ok callback to run in case of all import success
-     * @param err callback to run in case of failure
      */
-    public static void importHref(final List<String> hrefs, final Function ok) {
+    public static void importHref(final List<String> hrefs, final PolymerFunction ok) {
         importHref(hrefs, ok, null);
     }
 
@@ -304,8 +303,8 @@ public static void importHref(final List<String> hrefs, final Function ok) {
      * @param ok callback to run in case of all import success
      * @param err callback to run in case of failure
      */
-    public static void importHref(final List<String> hrefs, final Function ok, Function err) {
-        Function allOk = ok == null ? ok : new Function() {
+    public static void importHref(final List<String> hrefs, final PolymerFunction ok, PolymerFunction err) {
+        PolymerFunction allOk = ok == null ? ok : new PolymerFunction() {
             int count = hrefs.size();
             public Object call(Object arg) {
                 if (--count == 0) {
@@ -355,8 +354,8 @@ public static <T> T createElement(String tagName) {
     /**
      * Returns the JsInterop instance of Document
      */
-    public static com.vaadin.polymer.elemental.Document getDocument() {
-        return (com.vaadin.polymer.elemental.Document)Document.get();
+    public static elemental2.dom.Document getDocument() {
+        return Js.cast(Document.get());
     }
 
     /**
@@ -376,11 +375,11 @@ private native static boolean isRegisteredElement(Object e)
         return !!e && e.constructor !== $wnd.HTMLElement && e.constructor != $wnd.HTMLUnknownElement;
     }-*/;
 
-    public static void ready(HTMLElement e, Function f) {
-        whenReady(f, (Element)e);
+    public static void ready(HTMLElement e, PolymerFunction f) {
+        whenReady(f, Js.cast(e));
     }
 
-    public static void ready(Element e, Function f) {
+    public static void ready(Element e, PolymerFunction f) {
         whenReady(f, e);
     }
 
@@ -394,7 +393,7 @@ public static void updateStyles() {
     /**
      * Executes a function after all imports have been loaded.
      */
-    public static void whenReady(Function f) {
+    public static void whenReady(PolymerFunction f) {
         whenReady(f, null);
     }
 
@@ -408,7 +407,7 @@ private native static boolean htmlImportsSupported()
      * passed element is ready to use.
      * For browsers not supporting html imports, it loads the webcomponentsjs polyfill.
      */
-    public static native void whenReady(Function f, Element e)
+    public static native void whenReady(PolymerFunction f, Element e)
     /*-{
         function registered() {
           if (e) {
@@ -445,12 +444,12 @@ function loadPolyfill() {
 
     /**
      * If an element is not ready, loops until it gets ready, then
-     * run a Function (JsFunction or JavaFunction)
+     * run a PolymerFunction (JsFunction or JavaFunction)
      * @deprecated use {@link #whenReady(Function, Element)} instead.
      */
     @Deprecated
     private static void onReady(Element e, Object f) {
-        whenReady((Function)f, e);
+        whenReady((PolymerFunction)f, e);
     }
 
     /**
@@ -478,12 +477,12 @@ public static void endLoading(final Element container, Element webcomponent) {
      *
      * @param container : The container to show when the component is available
      * @param webcomponent : Web component to monitor
-     * @param callback : Calback function
+     * @param func : Calback function
      */
-    public static void endLoading(final Element container, Element webcomponent, final Function func) {
+    public static void endLoading(final Element container, Element webcomponent, final PolymerFunction func) {
         container.getStyle().setOpacity(0);
         container.getStyle().setProperty("transition", "opacity 1.1s");
-        ready(webcomponent, new Function() {
+        ready(webcomponent, new PolymerFunction() {
             public Object call(Object arg) {
                 reFlow();
                 container.getStyle().setOpacity(1);
@@ -531,7 +530,7 @@ public static native <T> List<T> asList(JavaScriptObject o)
      * penalty because we directly take the native array of the super ArrayList
      * implementation.
      */
-    public static native <T extends JavaScriptObject> JsArray<T> asJsArray(List<?> l)
+    public static native <T extends JavaScriptObject> Array<T> asJsArray(List<?> l)
     /*-{
         return l.@java.util.ArrayList::array;
     }-*/;
@@ -570,7 +569,7 @@ public native static void property(Object jso, String name, Object value)
      * Utility method for setting a function to a JS object.
      * Useful for binding functions to templates.
      */
-    public static void function(Object jso, String name, Function fnc) {
+    public static void function(Object jso, String name, PolymerFunction fnc) {
         property(jso, name, fnc);
     }
 
@@ -582,16 +581,10 @@ public native static <T> T apply(Object jso, String methodName, Object... args)
        return jso[methodName].apply(jso, args);
     }-*/;
 
-    public static native <T> T cast(Object o)
-    /*-{
-      return o;
-    }-*/;
-
     /**
      * Return the dom API of one element.
      */
     public static DomApi dom(Object element) {
         return Polymer.dom(element);
     }
 }
-

lib/com/vaadin/polymer/PolymerElement.java

@@ -0,0 +1,28 @@
+package com.vaadin.polymer;
+
+import static jsinterop.annotations.JsPackage.GLOBAL;
+
+import elemental2.dom.HTMLElement;
+import jsinterop.annotations.JsType;
+
+/**
+ * PolymerElement is a class over the HTMLElement of elemental2 adding
+ * some utility methods present in Polymer Elements, or missing in the
+ * elemental2 API.
+ */
+@JsType(isNative=true, namespace = GLOBAL, name = "HTMLElement")
+public class PolymerElement extends HTMLElement {
+
+    /** Properties and methods added by Polymer API **/
+    public HTMLElement root;
+    public native void debounce(String name, PolymerFunction<?, ?> f, int timeout);
+    /**
+     * Polymer’s custom property shim evaluates and applies custom property values once at element creation time.
+     * In order to have an element (and its subtree) re- evaluate custom property values due to dynamic changes
+     * such as application of CSS classes, etc., call updateStyles().
+     */
+    public native void updateStyles();
+
+    /** Missing properties in elemental2.dom.Element **/
+    public String textContent;
+}

lib/com/vaadin/polymer/PolymerEvent.java

@@ -0,0 +1,39 @@
+package com.vaadin.polymer;
+
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+import elemental2.dom.EventInit;
+import elemental2.dom.EventTarget;
+
+import static jsinterop.annotations.JsPackage.GLOBAL;
+
+
+/**
+ * PolymerEvent is a class over the Element implementation of elemental2 adding
+ * some properties present in Polymer Events, or missing in the elemental2 API.
+ */
+@JsType(isNative=true, namespace=GLOBAL, name="Event")
+public class PolymerEvent extends elemental2.dom.Event {
+
+    public PolymerEvent(String type, EventInit eventInitDict) {
+        super(type, eventInitDict);
+    }
+
+    public PolymerEvent(String type) {
+        super(type);
+    }
+
+    @JsProperty
+    public native String getType();
+
+    @JsProperty
+    public native Detail getDetail();
+
+    @JsProperty
+    public native EventTarget getTarget();
+
+    @JsType(isNative=true)
+    public interface Detail {
+    }
+}
+