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

Author: Francesca-Bit

lib/viewer/woqlGraph.js

@@ -43,7 +43,8 @@ WOQLGraph.prototype.setResult = function(result){
 }
 
 WOQLGraph.prototype.calculateVariableTypes = function(){
-	var bindings = this.result.getBindings();
+	//var bindings = this.result.getBindings();
+	var bindings = this.result
 	if(bindings && bindings.length){
 		for(var i = 0; i<bindings.length; i++){
 			this.extractFromBinding(bindings[i], i);
@@ -55,7 +56,7 @@ WOQLGraph.prototype.calculateVariableTypes = function(){
 
 WOQLGraph.prototype.extractFromBinding = function(row, rownum){
 	/*
-	* check if I have to add the row  
+	* check if I have to add the row
 	*/
 	if(this.includeRow(row, rownum)){
 		//get all the nodes (ids - non literals) //
@@ -78,13 +79,13 @@ WOQLGraph.prototype.extractFromBinding = function(row, rownum){
             ndid = (ndid['@value'] ?ndid['@value'] : ndid  )
 			this.addAdornedNode(ndid, nodes[i], row);
 		}
-    }   
+    }
 }
 
 WOQLGraph.prototype.addAdornedEdge = function(source, target, ks, kt, row){
     source = (source['@value'] ?source['@value'] : source  )
     target = (target['@value'] ? target['@value'] : target  )
-	var edge = { type: "link", target: target, source: source, text: kt};
+	var edge = { type: "link", target: target, source: source, text: target};
 	const matched_rules = new WOQLRule().matchEdge(this.config.rules, row, ks, kt);
 	var hid = false;
 	for(var i = 0; i<matched_rules.length; i++){
@@ -117,15 +118,15 @@ WOQLGraph.prototype.addAdornedEdge = function(source, target, ks, kt, row){
 			edge.weight = UTILS.getConfigValue(rule.weight, row);
 		}
 	}
-	if(!hid) this.edges.push(edge);	
+	if(!hid) this.edges.push(edge);
 }
 
 /*
 * the rules' order are important
 */
 
 WOQLGraph.prototype.addAdornedNode = function(nid, k, row){
-	var node = { type: "node", id: nid, nodetype: k };
+	var node = { type: "node", id: nid, nodetype: k};
 	const matched_rules = new WOQLRule().matchNode(this.config.rules, row, k, nid);
 	for(var i = 0; i<matched_rules.length; i++){
 		var rule = matched_rules[i].rule;
@@ -262,7 +263,7 @@ WOQLGraph.prototype.includeNode = function(v, row){
 }
 
 /*
-* check if I have to visualise literals node 
+* check if I have to visualise literals node
 */
 WOQLGraph.prototype.includeLiteralNode = function(variableName, row){
 	if(this.config.literals()===false) return false;
@@ -284,4 +285,4 @@ WOQLGraph.prototype.includeRow = function(row, num){
 
 
 
-module.exports = WOQLGraph;
+module.exports = WOQLGraph;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terminusdb/terminusdb-client",
-  "version": "4.2.1",
+  "version": "4.3.1",
   "description": "TerminusDB client library",
   "main": "index.js",
   "types": "./dist/typescript/index.d.ts",