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

Author: Francesca-Bit

lib/dispatchRequest.js

@@ -85,7 +85,6 @@ function DispatchRequest(url, action, payload, local_auth, remote_auth = null) {
         case CONST.READ_DATABASE:
         case CONST.READ_ORGANIZATION:
         case CONST.CONNECT:
-        case CONST.CLASS_FRAME:
         case CONST.GET_CSV:
             if (payload) {
                 const ext = UTILS.URIEncodePayload(payload)

lib/query/woqlCore.js

@@ -257,15 +257,26 @@ WOQLQuery.prototype.cleanPredicate = function(p) {
         return '' + p
     }
     if (p.indexOf(':') != -1) pred = p
-    else if (this.vocab && this.vocab[p]) pred = this.vocab[p]
+    else if (this.wellKnownPredicate(p) ) pred = this.vocab[p]
     else pred = 'scm:' + p
     return this.expandVariable(pred)
 }
 
+WOQLQuery.prototype.wellKnownPredicate = function(p) {
+    if (this.vocab && this.vocab[p]){
+        let full = this.vocab[p]
+        let start = full.substring(0, 3)
+        if(full == "system:abstract" || start == "xdd" || start == "xsd") return false
+        return true
+    }
+    return false
+}
+
+
 WOQLQuery.prototype.cleanPathPredicate = function(p) {
     let pred = false
     if (p.indexOf(':') != -1) pred = p
-    else if (this.vocab && this.vocab[p]) pred = this.vocab[p]
+    else if (this.wellKnownPredicate(p) ) pred = this.vocab[p]
     else pred = 'scm:' + p
     return pred
 }

lib/utils.js

@@ -75,14 +75,15 @@ Utils.empty = function(obj) {
 }
 
 /**
- * Generates a unique blank node id
+ * Generates a unique node id
  */
-Utils.genBNID = function() {
+Utils.genBNID = function(base) {
+    base = base || ""
     const r = Math.random()
         .toString(36)
         .substring(7)
     const d = new Date()
-    const bnid = `_:${r}${d.getTime()}`
+    const bnid = `doc:${base}${r}${d.getTime()}`
     return bnid
 }
 
@@ -109,18 +110,16 @@ Utils.getShorthand = function(link) {
 Utils.compareIDs = function(ida, idb) {
     if (ida === idb) return true
     if (this.unshorten(ida) === idb) return true
+    if (this.shorten(ida) === idb) return true
     if (this.unshorten(ida) === this.unshorten(idb)) return true
-    const sha = this.getShorthand(ida)
-    const shb = this.getShorthand(idb)
-    if (sha && (sha === idb || sha === shb)) return true
-    if (shb && shb === ida) return true
     return false
 }
 
 /**
  * Shortens a URL to its compressed format - returns the full URL if not possible
  */
 Utils.shorten = function(url, prefixes) {
+    if(!url) return url
     prefixes = prefixes || Utils.standard_urls
     for (const pref in prefixes) {
         if (prefixes[pref] == url.substring(0, prefixes[pref].length)) {
@@ -134,6 +133,7 @@ Utils.shorten = function(url, prefixes) {
  * Expands a URL to its full URL format - returns the passed string if not possible to expand
  */
 Utils.unshorten = function(url) {
+    if(!url) return url
     if (this.validURL(url)) return url
     if (!url) return url
     const bits = url.split(':')
@@ -150,6 +150,7 @@ Utils.unshorten = function(url) {
  * Valid URLs are those that start with http:// or https://
  */
 Utils.validURL = function(str) {
+    if(str && typeof str != "string") str = "" + str
     if (str && (str.substring(0, 7) === 'http://' || str.substring(0, 8) === 'https://'))
         return true
     return false

lib/viewer/documentFrame.js

@@ -24,24 +24,6 @@ DocumentFrame.prototype.db = function(dburl){
     return this;
 }
 
-DocumentFrame.prototype.load = function(url, cls){
-	if(url) {
-		if(url.substring(0,4) == "doc:"){
-			url = url.substring(4);
-		}
-		if(this.config.load_schema()){
-			return this.loadComplete(url, cls)
-		}
-		else {
-			return this.loadDocument(url);
-		}
-	}
-	if(cls){
-		return this.loadSchema(cls);
-	}
-	//return Promise.reject
-}
-
 /**
  *  @param {String} url - loads the document frame from the document API in frame form
  *  - loads the frame encapsulates more meta-data in the json and reduces the number of api calls we need to make
@@ -90,28 +72,36 @@ DocumentFrame.prototype.loadJSON = function(json, type){
     console.error("Either docid or clid must be set before load is called")
 }
 
-DocumentFrame.prototype.loadDataFrames = function(dataframes, cls, classframes){
+DocumentFrame.prototype.loadData = function(jsonld, cls, classframes){
 	if(!cls){
 		if(this.document) cls = this.document.cls;
 		else {
-			if(dataframes && dataframes.length && dataframes[0] && dataframes[0].domain){
-				cls = dataframes[0].domain;
+			if(jsonld && jsonld["@type"]){
+				cls = jsonld["@type"];
 			}
 		}
 	}
 	if(cls){
 		if(!this.document){
-			this.document = new ObjectFrame(cls, dataframes, classframes);
+            alert("Yo")
+            this.document = new ObjectFrame(cls, jsonld, classframes);
 		}
 		else {
-			this.document.loadDataFrames(dataframes);
-		}
+            alert("Yo2")
+			this.document.loadJSONLDDocument(jsonld);
+        }
+        alert(this.document.subjid)
 	}
 	else {
 		console.log("Missing Class" + " " + "Failed to add dataframes due to missing class");
 	}
 }
 
+DocumentFrame.prototype.load = function(classframes, doc){
+    this.document = new ObjectFrame(doc["@type"], doc, classframes)  
+}
+
+
 DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 	if(!cls){
 		if(classframes && classframes.length && classframes[0] && classframes[0].domain){
@@ -126,7 +116,7 @@ DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 			this.document.loadClassFrames(classframes);
 			if(!this.document.subjid){
 				this.document.newDoc = true;
-				this.document.fillFromSchema("_:");
+				this.document.fillFromSchema(FrameHelper.genBNID(FrameHelper.urlFragment(cls)+"_"));
 			}
 		}
 	}
@@ -135,13 +125,36 @@ DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 	}
 }
 
+DocumentFrame.prototype.filterFrame = function(loadRenderer){
+	var myfilt = function(frame, rule){
+		if(typeof rule.render() != "undefined"){
+			frame.render = rule.render();
+		}
+		else {
+			if(rule.renderer()){
+				var renderer = loadRenderer(rule.renderer(), frame, rule.args);		
+			}
+			if(renderer){
+				frame.render = function(fframe){
+					return renderer(fframe);
+				}
+			}
+		}
+		if(rule.compare()){
+			frame.compare = rule.compare();
+		}
+	}
+	this.applyRules(false, false, myfilt);
+}
+
+
 /*
  * adds render and compare functions to object frames
  */
 DocumentFrame.prototype.applyRules = function(doc, config, mymatch){
-	doc = (doc ? doc : this.document);
+    doc = doc || this.document;
+    if(!doc) return
 	config = (config ? config : this.config);
-	var self = this;
 	var onmatch = function(frame, rule){
 		config.setFrameDisplayOptions(frame, rule);
 		if(mymatch) mymatch(frame, rule);

lib/viewer/frameConfig.js

@@ -1,4 +1,3 @@
-
 const Config  = require('./viewConfig.js');
 const FrameRule  = require('./frameRule.js');
 const DocumentFrame  = require('./documentFrame.js');