Merge branch 'release/1.0-beta-7'

Author: adrienbaron

.gitignore

@@ -31,9 +31,14 @@ buildNumber.properties
 .classpath
 .project
 .settings
+.factorypath
 
 ### Gitbook
 docs-source/book/_book
 docs-source/book/node_modules
 docs-source/book/scripts
-docs-source/book/resources/scripts
+docs-source/book/resources/scripts
+
+### Utils out
+utils/out
+utils/node_modules

core/pom.xml

@@ -7,25 +7,22 @@
 	<parent>
 		<groupId>com.axellience</groupId>
 		<artifactId>vue-gwt-parent</artifactId>
-		<version>1.0-beta-6</version>
+		<version>1.0-beta-7</version>
 	</parent>
 
-	<artifactId>vue-gwt-core</artifactId>
-	<name>Vue GWT Core</name>
-	<description>Vue GWT Core classes</description>
+	<artifactId>vue-gwt</artifactId>
+	<name>Vue GWT</name>
+	<description>Vue GWT core classes</description>
 	<packaging>gwt-lib</packaging>
+	
+	<properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
 
 	<dependencies>
 
 		<!-- GWT dependencies -->
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-user</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-dev</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.google.jsinterop</groupId>
 			<artifactId>base</artifactId>
@@ -39,28 +36,6 @@
 			<artifactId>elemental2-dom</artifactId>
 		</dependency>
 
-		<!-- Code Generation -->
-		<dependency>
-			<groupId>com.squareup</groupId>
-			<artifactId>javapoet</artifactId>
-		</dependency>
-
-		<!-- Template parsing -->
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.github.javaparser</groupId>
-			<artifactId>javaparser-core</artifactId>
-		</dependency>
-
-		<!-- Nashorn dependencies -->
-		<dependency>
-			<groupId>com.coveo</groupId>
-			<artifactId>nashorn-commonjs-modules</artifactId>
-		</dependency>
-
 		<!-- Injection -->
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -81,7 +56,7 @@
 				<artifactId>gwt-maven-plugin</artifactId>
 				<extensions>true</extensions>
 				<configuration>
-					<moduleName>com.axellience.vuegwt.Core</moduleName>
+					<moduleName>com.axellience.vuegwt.VueGWT</moduleName>
 				</configuration>
 			</plugin>
 		</plugins>

core/src/main/java/com/axellience/vuegwt/core/client/VueGWT.java

@@ -7,7 +7,7 @@
 import com.axellience.vuegwt.core.client.observer.vuegwtobservers.MapObserver;
 import com.axellience.vuegwt.core.client.vue.VueFactory;
 import com.axellience.vuegwt.core.client.vue.VueJsConstructor;
-import com.google.gwt.core.client.JavaScriptObject;
+import elemental2.core.JsObject;
 import elemental2.dom.DomGlobal;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsPackage;
@@ -101,7 +101,7 @@ public static <T extends VueComponent> T createInstance(Class<T> vueComponentCla
     @JsIgnore
     public static <T extends VueComponent> VueFactory<T> getFactory(Class<T> vueComponentClass)
     {
-        if (JavaScriptObject.class.equals(vueComponentClass))
+        if (JsObject.class.equals(vueComponentClass))
         {
             throw new RuntimeException(
                 "You can't use the .class of a JsComponent to instantiate it. Please use MyComponentFactory.get() instead.");

core/src/main/java/com/axellience/vuegwt/core/client/VueLibDevInjector.java

@@ -7,7 +7,6 @@
 import com.axellience.vuegwt.core.client.component.options.data.DataFactory;
 import com.axellience.vuegwt.core.client.component.options.props.PropOptions;
 import com.axellience.vuegwt.core.client.directive.options.VueDirectiveOptions;
-import com.axellience.vuegwt.core.client.template.ComponentTemplate;
 import elemental2.core.Function;
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
@@ -23,7 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.axellience.vuegwt.core.client.template.ComponentTemplate.EXPRESSION_PREFIX;
 import static elemental2.core.Global.JSON;
 
 /**
@@ -40,65 +38,49 @@
 public class VueComponentOptions<T extends VueComponent> extends JsObject implements JsPropertyMap
 {
     private ComponentJavaPrototype<T> componentJavaPrototype;
-    private ComponentTemplate<T> componentTemplate;
     private Map<String, Provider<?>> dependenciesProvider;
     private JsPropertyMap dataFields;
 
     /**
      * Set the Java Prototype on this {@link VueComponentOptions}.
      * This prototype will be used to retrieve the java methods of our {@link VueComponent}.
-     * @param javaPrototype An instance of the {@link ComponentTemplate} class for this
-     * Component
+     * @param javaPrototype The {@link ComponentJavaPrototype} for this Component
      */
     @JsOverlay
     public final void setComponentJavaPrototype(ComponentJavaPrototype<T> javaPrototype)
     {
         this.componentJavaPrototype = javaPrototype;
         // This must be set for Components extending Native JS Components
         this.componentJavaPrototype.set("options", this);
-    }
-
-    /**
-     * Set the {@link ComponentTemplate} on this {@link VueComponentOptions}.
-     * This instance will be used to retrieve the java methods of our {@link VueComponent}.
-     * @param componentTemplate An instance of the {@link ComponentTemplate} class for this
-     * Component
-     */
-    @JsOverlay
-    public final void setComponentTemplate(ComponentTemplate<T> componentTemplate)
-    {
-        this.componentTemplate = componentTemplate;
-        this.initExpressions();
-        this.initRenderFunctions();
+        this.initTemplateExpressions();
     }
 
     /**
      * Add template expressions to this {@link VueComponentOptions}.
      */
     @JsOverlay
-    private void initExpressions()
+    private void initTemplateExpressions()
     {
-        for (int i = 0; i < componentTemplate.getTemplateMethodsCount(); i++)
+        int i = 0;
+        Function templateMethod;
+        while ((templateMethod = getJavaComponentMethod("exp$" + i)) != null)
         {
-            String methodId = EXPRESSION_PREFIX + i;
-            addMethod(methodId, componentTemplate.get(methodId));
+            addMethod("exp$" + i, templateMethod);
+            i++;
         }
     }
 
     /**
      * Initialise the render functions from our template.
+     * @param renderFunctionString The render function
+     * @param staticRenderFnsStrings The static render functions
      */
     @JsOverlay
-    private void initRenderFunctions()
+    public final void initRenderFunctions(Function renderFunctionString,
+        Function[] staticRenderFnsStrings)
     {
-        this.set("render", new Function(componentTemplate.getRenderFunction()));
-
-        JsArray<Object> staticRenderFns = new JsArray<>();
-        for (String staticRenderFunction : componentTemplate.getStaticRenderFunctions())
-        {
-            staticRenderFns.push(new Function(staticRenderFunction));
-        }
-        this.setStaticRenderFns(staticRenderFns);
+        this.setRender(renderFunctionString);
+        this.setStaticRenderFns(Js.cast(staticRenderFnsStrings));
     }
 
     /**
@@ -134,7 +116,7 @@ public final void initData(boolean useFactory, String... fieldNames)
     /**
      * Add a computed property to this ComponentOptions.
      * If the computed has both a getter and a setter, this will be called twice, once for each.
-     * @param javaMethodName Name of the method in the {@link ComponentTemplate}
+     * @param javaMethodName Name of the method in the {@link VueComponent}
      * @param computedPropertyName Name of the computed property in the Template and the
      * ComponentOptions
      * @param kind Kind of the computed method (getter or setter)
@@ -159,7 +141,7 @@ else if (kind == ComputedKind.SETTER)
 
     /**
      * Add a watch property to this Component Definition
-     * @param javaMethodName Name of the method in the {@link ComponentTemplate}
+     * @param javaMethodName Name of the method in the {@link VueComponent}
      * @param watchedPropertyName Name of the property name to watch in the data model
      * @param isDeep Is the watcher deep (will watch child properties)
      */
@@ -231,7 +213,7 @@ public final void addJavaProp(String propName, boolean required, String jsTypeNa
 
     /**
      * Add a custom prop validator to validate a property
-     * @param javaMethodName Name of the method in the {@link ComponentTemplate}
+     * @param javaMethodName Name of the method in the {@link VueComponent}
      * @param propertyName The name of the property to validate
      */
     @JsOverlay
@@ -243,7 +225,7 @@ public final void addJavaPropValidator(String javaMethodName, String propertyNam
 
     /**
      * Add a custom prop validator to validate a property
-     * @param javaMethodName Name of the method in the {@link ComponentTemplate}
+     * @param javaMethodName Name of the method in the {@link VueComponent}
      * @param propertyName The name of the property to validate
      */
     @JsOverlay
@@ -254,7 +236,7 @@ public final void addJavaPropDefaultValue(String javaMethodName, String property
     }
 
     /**
-     * Get the given java method from the {@link ComponentTemplate}.
+     * Get the given java method from the {@link VueComponent}.
      * @param javaMethodName Name of the Java method to retrieve
      * @return The JS function that represent our Java method.
      */
@@ -324,7 +306,8 @@ public final Map<String, Provider<?>> getProviders()
 
     @JsProperty private String name;
 
-    @JsProperty private JsArray<Object> staticRenderFns;
+    @JsProperty private Function render;
+    @JsProperty private JsArray<Function> staticRenderFns;
 
     @JsProperty private JsArray<Object> mixins;
 
@@ -360,7 +343,7 @@ public final VueComponentOptions addProp(String name, PropOptions propOptions)
         if (this.props == null)
             this.props = JsPropertyMap.of();
 
-        ((JsPropertyMap)this.props).set(name, propOptions);
+        ((JsPropertyMap) this.props).set(name, propOptions);
         return this;
     }
 
@@ -481,18 +464,31 @@ public final VueComponentOptions setTemplate(String template)
     }
 
     @JsOverlay
-    public final JsArray<Object> getStaticRenderFns()
+    public final JsArray<Function> getStaticRenderFns()
     {
         return staticRenderFns;
     }
 
     @JsOverlay
-    public final VueComponentOptions setStaticRenderFns(JsArray<Object> staticRenderFns)
+    public final VueComponentOptions setStaticRenderFns(JsArray<Function> staticRenderFns)
     {
         this.staticRenderFns = staticRenderFns;
         return this;
     }
 
+    @JsOverlay
+    public final Function getRender()
+    {
+        return render;
+    }
+
+    @JsOverlay
+    public final VueComponentOptions setRender(Function render)
+    {
+        this.render = render;
+        return this;
+    }
+
     @JsOverlay
     public final JsPropertyMap<VueDirectiveOptions> getDirectives()
     {
@@ -554,7 +550,8 @@ public final JsArray<Object> getMixins()
     @JsOverlay
     public final VueComponentOptions addMixin(Object mixin)
     {
-        if (this.mixins == null) {
+        if (this.mixins == null)
+        {
             this.mixins = new JsArray<>();
         }
 

core/src/main/java/com/axellience/vuegwt/core/client/VueLibInjector.java

@@ -2,7 +2,6 @@
 
 import com.axellience.vuegwt.core.client.observer.functions.VueObserveArray;
 import com.axellience.vuegwt.core.client.observer.functions.VueWalk;
-import com.google.gwt.core.client.JavaScriptObject;
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import elemental2.dom.DomGlobal;
@@ -67,8 +66,8 @@ public void registerVueGWTObserver(VueGWTObserver observer)
      */
     private boolean observeJavaObject(Object object)
     {
-        // Ignore pure JS objects
-        if (object.getClass() == JavaScriptObject.class)
+        // Ignore pure JS objects, this is to avoid impacting pure Vue.js components
+        if (object.getClass() == JsObject.class)
             return false;
 
         // Don't observe Java classes

core/src/main/java/com/axellience/vuegwt/core/client/component/options/VueComponentOptions.java

@@ -1,9 +1,11 @@
 package com.axellience.vuegwt.core.client.vue;
 
 import elemental2.core.JsArray;
+import elemental2.core.JsString;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
+import jsinterop.base.Js;
 import jsinterop.base.JsPropertyMap;
 
 /**
@@ -19,7 +21,7 @@ public class VueConfig
     @JsProperty protected boolean performance;
     @JsProperty protected VueErrorHandler errorHandler;
     @JsProperty protected VueWarnHandler warnHandler;
-    @JsProperty protected JsArray<String> ignoredElements;
+    @JsProperty protected JsArray<JsString> ignoredElements;
     @JsProperty protected JsPropertyMap keyCodes;
 
     @JsOverlay
@@ -114,13 +116,13 @@ public final VueConfig setWarnHandler(VueWarnHandler warnHandler)
     }
 
     @JsOverlay
-    public final JsArray<String> getIgnoredElements()
+    public final JsArray<JsString> getIgnoredElements()
     {
         return ignoredElements;
     }
 
     @JsOverlay
-    public final VueConfig setIgnoredElements(JsArray<String> ignoredElements)
+    public final VueConfig setIgnoredElements(JsArray<JsString> ignoredElements)
     {
         this.ignoredElements = ignoredElements;
         return this;
@@ -132,7 +134,7 @@ public final VueConfig addIgnoredElement(String ignoredElement)
         if (this.ignoredElements == null)
             this.ignoredElements = new JsArray<>();
 
-        this.ignoredElements.push(ignoredElement);
+        this.ignoredElements.push(Js.cast(ignoredElement));
         return this;
     }