directives and filters added

Author: jcheron

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.jeemv.springboot.vuejs</groupId>
   <artifactId>springboot-vuejs</artifactId>
-  <version>1.0.5</version>
+  <version>1.0.6</version>
 
   <name>springboot-vuejs</name>
   <url>https://github.com/jeeMv/SpringBoot-VueJS</url>

src/main/java/io/github/jeemv/springboot/vuejs/AbstractVueJS.java

@@ -6,6 +6,10 @@
 import io.github.jeemv.springboot.vuejs.beans.RawObject;
 import io.github.jeemv.springboot.vuejs.parts.VueComputeds;
 import io.github.jeemv.springboot.vuejs.parts.VueData;
+import io.github.jeemv.springboot.vuejs.parts.VueDirective;
+import io.github.jeemv.springboot.vuejs.parts.VueDirectives;
+import io.github.jeemv.springboot.vuejs.parts.VueFilter;
+import io.github.jeemv.springboot.vuejs.parts.VueFilters;
 import io.github.jeemv.springboot.vuejs.parts.VueHook;
 import io.github.jeemv.springboot.vuejs.parts.VueMethods;
 import io.github.jeemv.springboot.vuejs.parts.VueWatcher;
@@ -16,26 +20,20 @@ public abstract class AbstractVueJS {
 	protected VueMethods methods;
 	protected VueComputeds computed;
 	protected VueWatchers watchers;
+	protected VueDirectives directives;
+	protected VueFilters filters;
 	protected Map<String, VueHook> hooks;
 
 	public AbstractVueJS() {
 		data=new VueData();
 		methods=new VueMethods();
 		computed=new VueComputeds();
 		watchers=new VueWatchers();
+		directives=new VueDirectives();
+		filters=new VueFilters();
 		hooks=new HashMap<>();
 	}
 
-	protected String wrapScript(String script) {
-		if(script==null || "".equals(script)) {
-			return "";
-		}
-		if(!script.startsWith("<script>")) {
-			script="<script>"+script+"</script>";
-		}
-		return script;
-	}
-	
 	/**
 	 * Adds a data
 	 * @param key the name of the data
@@ -212,6 +210,26 @@ protected void addHook(String name,String body) {
 		hooks.put(name, new VueHook(body));
 	}
 
+	/**
+	 * Adds a new directive in the vue instance
+	 * @param name The directive name
+	 * @return The created directive
+	 */
+	public VueDirective addDirective(String name) {
+		return directives.add(name);
+	}
+	
+	/**
+	 * Adds a new filter in the vue instance
+	 * @param name The filter name
+	 * @param body The method body
+	 * @param args The filter arguments
+	 * @return The created filter
+	 */
+	public VueFilter addFilter(String name,String body,String...args) {
+		return filters.add(name,body,args);
+	}
+	
 	/**
 	 * Adds code (body) for the beforeCreate hook
 	 * @param body the code to execute
@@ -298,6 +316,10 @@ public VueComputeds getComputed() {
 		return computed;
 	}
 
+	public VueDirectives getDirectives() {
+		return directives;
+	}
+
 	@Override
 	public String toString() {
 		return getScript();
@@ -306,4 +328,10 @@ public String toString() {
 	public VueWatchers getWatchers() {
 		return watchers;
 	}
+	
+	
+	public VueFilters getFilters() {
+		return filters;
+	}
+	
 }

src/main/java/io/github/jeemv/springboot/vuejs/VueJS.java

@@ -6,17 +6,21 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import io.github.jeemv.springboot.vuejs.components.VueComponent;
+import io.github.jeemv.springboot.vuejs.parts.AbstractVueComposition;
+import io.github.jeemv.springboot.vuejs.parts.VueDirective;
+import io.github.jeemv.springboot.vuejs.parts.VueFilter;
 import io.github.jeemv.springboot.vuejs.utilities.JsUtils;
 
 /**
  * VueJS instance
  * @author jcheron
- * @version 1.0.0.2
+ * @version 1.0.0.3
  */
 public class VueJS extends AbstractVueJS{
 	protected String el;
 	protected String[] delimiters;
 	protected Map<String,VueComponent> globalComponents;
+	protected Map<String,AbstractVueComposition> globalElements;
 
 	/**
 	 * @param element the DOM selector for the VueJS application
@@ -26,6 +30,7 @@ public VueJS(String element) {
 		this.el=element;
 		this.setDelimiters("<%", "%>");
 		globalComponents=new HashMap<>();
+		globalElements=new HashMap<>();
 	}
 
 	/**
@@ -48,6 +53,9 @@ public String getScript() {
 			for(Entry<String, VueComponent> entry:globalComponents.entrySet()) {
 				script+=entry.getValue();
 			}
+			for(Entry<String, AbstractVueComposition> entry:globalElements.entrySet()) {
+				script+=entry.getValue().getScript();
+			}
 			script+="new Vue("+JsUtils.objectToJSON(this)+");";
 			return "<script>"+script+"</script>";
 		} catch (JsonProcessingException e) {
@@ -56,12 +64,41 @@ public String getScript() {
 		return script;
 	}
 
+	/**
+	 * Adds a new global component
+	 * @param name The component name
+	 * @return The created component
+	 */
 	public VueComponent addGlobalComponent(String name) {
 		VueComponent component= new VueComponent(name);
 		globalComponents.put(name,component);
 		return component;
 	}
 
+	/**
+	 * Adds a new global directive
+	 * @param name The directive name
+	 * @return The created directive
+	 */
+	public VueDirective addGlobalDirective(String name) {
+		VueDirective directive=new VueDirective(name);
+		globalElements.put(name, directive);
+		return directive;
+	}
+	
+	/**
+	 * Adds a new global filter
+	 * @param name The filter name
+	 * @param body The filter body
+	 * @param args The filter arguments
+	 * @return The created filter
+	 */
+	public VueFilter addGlobalFilter(String name,String body,String...args) {
+		VueFilter filter=new VueFilter(name,body,args);
+		globalElements.put(name, filter);
+		return filter;
+	}
+	
 	public String getEl() {
 		return el;
 	}

src/main/java/io/github/jeemv/springboot/vuejs/components/VueComponent.java

@@ -54,7 +54,7 @@ public String getScript() {
 			if(name!=null && !"".equals(name)) {
 				script="Vue.component('"+name+"',"+JsUtils.objectToJSON(this)+");";
 				if(!internal)
-					script= wrapScript(script);
+					script= JsUtils.wrapScript(script);
 			}else {
 				script=JsUtils.objectToJSON(this);
 			}

src/main/java/io/github/jeemv/springboot/vuejs/parts/AbstractVueComposition.java

@@ -0,0 +1,36 @@
+package io.github.jeemv.springboot.vuejs.parts;
+
+import io.github.jeemv.springboot.vuejs.utilities.JsUtils;
+
+public abstract class AbstractVueComposition {
+	protected String name;
+	protected boolean internal;
+	
+	public AbstractVueComposition() {
+		this(null,true);
+	}
+	
+	public AbstractVueComposition(String name) {
+		this(name,true);
+	}
+	
+	public AbstractVueComposition(String name,boolean internal) {
+		this.name=name;
+		this.internal=internal;
+	}
+	
+	public String getScript() {
+		String script="";
+		if(name!=null && !"".equals(name)) {
+			script="Vue."+getType()+"('"+name+"',"+this.toString()+");";
+			if(!internal)
+				script= JsUtils.wrapScript(script);
+		}else {
+			script=this.toString();
+		}
+		return script;
+	}
+	
+	public abstract String getType();
+
+}

src/main/java/io/github/jeemv/springboot/vuejs/parts/VueDirective.java

@@ -0,0 +1,83 @@
+package io.github.jeemv.springboot.vuejs.parts;
+
+public class VueDirective extends AbstractVueComposition{
+	protected VueMethods methods;
+	
+	public VueDirective() {
+		super();
+		methods=new VueMethods();
+	}
+
+	public VueDirective(String name) {
+		super(name);
+		methods=new VueMethods();
+	}
+
+	/**
+	 * called only once, when the directive is first bound to the element. This is where you can do one-time setup work.
+	 * arguments of the method are el, binding and vnode
+	 * @param body The javascript code associated
+	 * @return the directive
+	 */
+	public VueDirective onBind(String body) {
+		return on("bind", body);
+	}
+	
+	/**
+	 * called after the containing component’s VNode has updated, but possibly before its children have updated.
+	 * arguments of the method are el, binding, vnode and oldVnode
+	 * @param body The javascript code associated
+	 * @return The directive
+	 */
+	public VueDirective onUpdate(String body) {
+		methods.add("update", body, "el", "binding", "vnode","oldVnode");
+		return this;
+	}
+	
+	/**
+	 * called after the containing component’s VNode and the VNodes of its children have updated.
+	 * arguments of the method are el, binding, vnode and oldVnode
+	 * @param body The javascript code associated
+	 * @return The directive
+	 */
+	public VueDirective onComponentUpdated(String body) {
+		methods.add("componentUpdated", body, "el", "binding", "vnode","oldVnode");
+		return this;
+	}
+	
+	/**
+	 * called when the bound element has been inserted into its parent node (this only guarantees parent node presence, not necessarily in-document).
+	 * arguments of the method are el, binding and vnode
+	 * @param body The javascript code associated
+	 * @return The directive
+	 */
+	public VueDirective onInserted(String body) {
+		return on("inserted", body);
+	}
+
+	
+	/**
+	 * called only once, when the directive is unbound from the element.
+	 * arguments of the method are el, binding and vnode
+	 * @param body The javascript code associated
+	 * @return The directive
+	 */
+	public VueDirective onUnbind(String body) {
+		return on("unbind", body);
+	}
+	
+	protected VueDirective on(String event,String body) {
+		methods.add(event, body, "el", "binding", "vnode");
+		return this;
+	}
+
+	@Override
+	public String toString() {
+		return methods.toString();
+	}
+
+	@Override
+	public String getType() {
+		return "directive";
+	}
+}

src/main/java/io/github/jeemv/springboot/vuejs/parts/VueDirectives.java

@@ -0,0 +1,18 @@
+package io.github.jeemv.springboot.vuejs.parts;
+
+
+public class VueDirectives extends VuePart {
+	public VueDirective add(String name) {
+		VueDirective directive=new VueDirective();
+		elements.put(name,directive);
+		return directive;
+	}
+	@Override
+	public String toString() {
+		String datas=super.toString();
+		if(datas!=null) {
+			return datas;
+		}
+		return "";
+	}
+}

src/main/java/io/github/jeemv/springboot/vuejs/parts/VueFilter.java

@@ -0,0 +1,33 @@
+package io.github.jeemv.springboot.vuejs.parts;
+
+public class VueFilter extends AbstractVueComposition{
+	protected VueMethod method;
+	
+	public VueFilter(String body,String...args) {
+		super();
+		method=new VueMethod(body,getArgs(args));
+	}
+	
+	public VueFilter(String name,String body,String...args) {
+		super(name);
+		method=new VueMethod(body,getArgs(args));
+	}
+
+	
+	private String[] getArgs(String...args) {
+		String[] dest = new String[args.length + 1];
+	    dest[0] = "value";
+	    System.arraycopy(args, 0, dest, 1, args.length);
+	    return dest;
+	}
+	
+	@Override
+	public String toString() {
+		return method.toString();
+	}
+
+	@Override
+	public String getType() {
+		return "filter";
+	}
+}

src/main/java/io/github/jeemv/springboot/vuejs/parts/VueFilters.java

@@ -0,0 +1,19 @@
+package io.github.jeemv.springboot.vuejs.parts;
+
+
+public class VueFilters extends VuePart {
+	
+	public VueFilter add(String name,String body,String...args) {
+		VueFilter filter=new VueFilter(name,body,args);
+		elements.put(name,filter);
+		return filter;
+	}
+	@Override
+	public String toString() {
+		String datas=super.toString();
+		if(datas!=null) {
+			return datas;
+		}
+		return "";
+	}
+}