Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: Francesca-Bit

.eslintrc

@@ -12,12 +12,14 @@ const FramePatternMatcher = {}
  */
 FramePatternMatcher.testRules = function(rules, frame, onmatch){
 	var matched_rules = [];
-	for(var i = 0; i<rules.length; i++){
-		var match = (!rules[i].pattern || this.patternMatchesFrame(rules[i].pattern, frame));
-		if(match){
-			matched_rules.push(rules[i]);
-			if(onmatch && typeof onmatch == "function"){
-				onmatch(frame, rules[i]);
+	if(rules && rules.length){
+		for(var i = 0; i<rules.length; i++){
+			var match = (!rules[i].rule.pattern || FramePatternMatcher.patternMatchesFrame(rules[i].rule.pattern, frame));
+			if(match){
+				matched_rules.push(rules[i]);
+				if(onmatch && typeof onmatch == "function"){
+					onmatch(frame, rules[i]);
+				}
 			}
 		}
 	}
@@ -66,7 +68,7 @@ FramePattern = function(pattern){
 }
 
 FramePattern.prototype.setPattern = function(pattern){
-	this.renderer = (pattern.renderer ? pattern.renderer : false);
+	this.scope = (pattern.scope ? pattern.scope: false);
 	this.label = (pattern.label ? pattern.label : false);
 	this.frame_type = (pattern.frame_type ? pattern.frame_type : false);
 	this.subject = (pattern.subject ? pattern.subject : false);
@@ -89,7 +91,7 @@ FramePattern.prototype.setPattern = function(pattern){
 FramePattern.prototype.checkFrame = function(frame){
 	var rtype = this.getRendererType(frame);
 	if(!rtype) return false;
-	if(this.renderer && (this.renderer != rtype) && (this.renderer != "*" )) return false;
+	if(this.scope && (this.scope != rtype) && (this.scope != "*" )) return false;
 	if(this.illegalRuleType(rtype)) return false;
 	if(this.frame_type && !this.checkFrameType(rtype, frame)) return false;
 	if(this.label && !this.checkLabel(rtype, frame)) return false;
@@ -300,71 +302,169 @@ FramePattern.prototype.getRendererType = function(frame){
 }
 
 function FrameRule(){
-	this.rule = { pattern: {}};
+	this.rule = { pattern: {} };
 	return this;
 }
 
-FrameRule.prototype.renderer = function(...rend){
-	this.rule.pattern.renderer = rend;
-	return this;
-}
 
-FrameRule.prototype.setRenderer = function(rend){
-	this.rule.renderer = rend;
-	return this;
+FrameRule.prototype.unpack = function(arr, nonstring){
+	if(nonstring) var str = arr.join(",");
+	var str = "'" + arr.join("','") + "'";
+	return str;
 }
 
-FrameRule.prototype.render = function(func){
-	this.rule.render = func;
-	return this;
-}
-
-FrameRule.prototype.args = function(json){
-	this.rule.args = json;
-	return this;
+FrameRule.prototype.prettyPrint = function(type){
+	//starts with obj. ...
+	if(this.scope() == "*"){
+		var str = "all()";
+	}
+	else {
+		var str = this.scope() + "()";
+	}
+	if(typeof this.frameType() != "undefined"){
+		str += ".frame_type(" + this.unpack(this.frameType()) + ")";
+	}
+	if(typeof this.label() != "undefined"){
+		str += ".label(" + this.unpack(this.label()) + ")";
+	}
+	if(typeof this.subject() != "undefined"){
+		str += ".subject(" + this.unpack(this.subject()) + ")";
+	}
+	if(typeof this.subjectClass() != "undefined"){
+		str += ".subjectClass(" + this.unpack(this.subjectClass()) + ")";
+	}
+	if(typeof this.property() != "undefined"){
+		str += ".property(" + this.unpack(this.property()) + ")";
+	}
+	if(typeof this.range() != "undefined"){
+		str += ".range(" + this.unpack(this.range()) + ")";
+	}
+	if(typeof this.value() != "undefined"){
+		str += ".value(" + this.unpack(this.value()) + ")";
+	}
+	if(typeof this.children() != "undefined" && this.children.length > 0){
+		str += ".children(\n";
+		var kids = this.children();
+		for(var i = 0; i< kids.length; i++){
+			str += kids.prettyPrint() + "\n";
+		}
+		str += ")";
+	}
+	if(typeof this.parent() != "undefined"){
+		str += ".parent(" + this.parent.prettyPrint() + ")";
+	}
+	if(typeof this.depth() != "undefined"){
+		str += ".depth('" + this.depth() + "')";
+	}
+	if(typeof this.index() != "undefined"){
+		str += ".index(" + this.unpack(this.index(), true) + ")";
+	}
+	if(typeof this.status() != "undefined"){
+		str += ".status(" + this.unpack(this.status()) + ")";
+	}
+	if(typeof this.renderer() != "undefined"){
+		str += ".renderer('" + this.renderer() + "')";
+	}
+	if(typeof this.render() != "undefined"){
+		str += ".render(" + this.render() + ")";
+	}
+	if(typeof this.compare() != "undefined"){
+		str += ".compare(" + this.compare() + ")";
+	}
+	if(typeof this.mode() != "undefined"){
+		str += ".mode('" + this.mode() + "')";
+	}
+	if(typeof this.collapse() != "undefined"){
+		str += ".collapse(" + this.collapse() + ")";
+	}
+	if(typeof this.hidden() != "undefined"){
+		str += ".hidden(" + this.hidden() + ")";
+	}
+	if(typeof this.view() != "undefined"){
+		str += ".view('" + this.view() + "')";
+	}
+	if(typeof this.showDisabledButtons() != "undefined"){
+		str += ".showDisabledButtons(" + this.showDisabledButtons() + ")";
+	}
+	if(typeof this.header() != "undefined"){
+		str += ".header(" + this.header() + ")";
+	}
+	if(typeof this.features() != "undefined"){
+		str += ".features(" + this.unpack(this.features()) + ")";
+	}
+	if(typeof this.headerFeatures() != "undefined"){
+		str += ".headerFeatures(" + this.unpack(this.headerFeatures()) + ")";
+	}
+	if(typeof this.showEmpty() != "undefined"){
+		str += ".showEmpty(" + this.show_empty() + ")";
+	}
+	if(typeof this.dataviewer() != "undefined"){
+		str += ".dataviewer('" + this.dataviewer() + "')";
+	}
+	if(typeof this.args() != "undefined"){
+		str += ".args(" + JSON.stringify(this.args()) + ")";
+	}
+	if(typeof this.featureRenderers() != "undefined"){
+		str += ".featureRenderers({";
+		for(var f in this.featureRenderers()){
+			str += JSON.stringify(f) + ":" + this.rule.feature_renderers[f] + ",";
+		}
+		str = str.substring(0, str.length-1);
+		str += "})";
+	}
+	return str;
 }
 
-FrameRule.prototype.compare = function(func){
-	this.rule.compare = func;
+FrameRule.prototype.scope = function(scope){
+	if(typeof scope == "undefined") return this.rule.pattern.scope;
+	this.rule.pattern.scope = scope;
 	return this;
 }
 
-FrameRule.prototype.frame_type = function(...frametype){
+FrameRule.prototype.frameType = function(...frametype){
+	if(typeof frametype == "undefined" || frametype.length == 0) return this.rule.pattern.frametype;
 	this.rule.pattern.frametype = frame_type;
 	return this;
 }
 
 FrameRule.prototype.label = function(...label){
+	if(typeof label == "undefined" || label.length == 0) return this.rule.pattern.label;
 	this.rule.pattern.label = label;
 	return this;
 }
 
 FrameRule.prototype.subject = function(...subject){
+	if(typeof subject == "undefined" || subject.length == 0) return this.rule.pattern.subject;
 	this.rule.pattern.subject = subject;
 	return this;
 }
 
 FrameRule.prototype.subjectClass = function(...subjectClass){
+	if(typeof subjectClass == "undefined" || subjectClass.length == 0) return this.rule.pattern.subjectClass;
 	this.rule.pattern.subjectClass = subjectClass;
 	return this;
 }
 
 FrameRule.prototype.property = function(...property){
+	if(typeof property == "undefined" || property.length == 0) return this.rule.pattern.property;
 	this.rule.pattern.property = property;
 	return this;
 }
 
 FrameRule.prototype.depth = function(depth){
+	if(typeof depth == "undefined") return this.rule.pattern.depth;
 	this.rule.pattern.depth = depth;
 	return this;
 }
 
 FrameRule.prototype.range = function(...range){
+	if(typeof range == "undefined" || range.length == 0) return this.rule.pattern.range;	
 	this.rule.pattern.range = range;
 	return this;
 }
 
 FrameRule.prototype.value = function(...value){
+	if(typeof value == "undefined" || value.length == 0) return this.rule.pattern.value;	
 	this.rule.pattern.value = value;
 	return this;
 }
@@ -378,11 +478,13 @@ FrameRule.prototype.json = function(){
 }
 
 FrameRule.prototype.parent = function(parent){
+	if(typeof parent == "undefined") return this.rule.pattern.parent;	
 	this.rule.pattern.parent = parent.pattern();
 	return this;
 }
 
 FrameRule.prototype.children = function(...children){
+	if(typeof children == "undefined") return this.rule.pattern.children;	
 	if(typeof this.rule.pattern.children == "undefined"){
 		this.rule.pattern.children = [];
 	}
@@ -393,14 +495,108 @@ FrameRule.prototype.children = function(...children){
 }
 
 FrameRule.prototype.index = function(...index){
+	if(typeof index == "undefined" || index.length == 0) return this.rule.pattern.index;	
 	this.rule.pattern.index = index;
 	return this;	
 }
 
 FrameRule.prototype.status = function(...status){
+	if(typeof status == "undefined" || status.length == 0) return this.rule.pattern.status;	
 	this.rule.pattern.status = status;
 	return this;	
 }
 
+FrameRule.prototype.renderer = function(rend){
+	if(!rend) return this.rule.renderer;
+	this.rule.renderer = rend;
+	return this;
+}
+
+FrameRule.prototype.render = function(func){
+	if(func){
+		this.rule.render = func;
+		return this;
+	}
+	return func;
+}
+
+FrameRule.prototype.args = function(json){
+	if(!json) return this.rule.args;
+	this.rule.args = json;
+	return this;
+}
+
+FrameRule.prototype.compare = function(func){
+	if(!func) return this.rule.compare;
+	this.rule.compare = func;
+	return this;
+}
+
+FrameRule.prototype.mode = function(m){
+	if(!m) return this.rule.mode;
+	this.rule.mode = m;
+	return this;
+}
+
+FrameRule.prototype.collapse = function(m){
+	if(!m) return this.rule.collapse;
+	this.rule.collapse = m;
+	return this;
+}
+
+
+FrameRule.prototype.hidden = function(m){
+	if(!m) return this.rule.hidden;
+	this.rule.hidden = m;
+	return this;
+}
+
+FrameRule.prototype.view = function(m){
+	if(!m) return this.rule.view;
+	this.rule.view = m;
+	return this;
+}
+
+FrameRule.prototype.showDisabledButtons = function(m){
+	if(!m) return this.rule.show_disabled_buttons;
+	this.rule.show_disabled_buttons = m;
+	return this;
+}
+
+FrameRule.prototype.features = function(...m){
+	if(typeof m == "undefined" || m.length == 0) return this.rule.features;
+	this.rule.features = m;
+	return this;
+}
+
+FrameRule.prototype.headerFeatures = function(...m){
+	if(typeof m == "undefined" || m.length == 0) return this.rule.header_features;
+	this.rule.header_features = m;
+	return this;
+}
+
+FrameRule.prototype.header = function(m){
+	if(!m) return this.rule.header;
+	this.rule.header = m;
+	return this;
+}
+
+FrameRule.prototype.featureRenderers = function(m){
+	if(!m) return this.rule.feature_renderers;
+	this.rule.feature_renderers = m;
+	return this;
+}
+
+FrameRule.prototype.showEmpty = function(m){
+	if(!m) return this.rule.show_empty;
+	this.rule.show_empty = m;
+	return this;
+}
+
+FrameRule.prototype.dataviewer = function(m){
+	if(!m) return this.rule.dataviewer;
+	this.rule.dataviewer = m;
+	return this;
+}
 
-module.exports = {FramePatternMatcher, FrameRule} ;
+module.exports = {FramePatternMatcher, FramePattern, FrameRule } ;