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

Author: KittyJose

.ci/publish_bintray.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+BRANCH=$1
+curl -u "rrooij:$BINTRAY_API_TOKEN" "https://api.bintray.com/npm/terminusdb/npm-$BRANCH/auth" > .npmrc
+curl -XDELETE "https://api.bintray.com/packages/terminusdb/npm-$BRANCH/terminusdb:terminusdb-client" -u "rrooij:$BINTRAY_API_TOKEN"
+npm publish
+curl -T "dist/terminusdb-client.min.js" -u"rrooij:$BINTRAY_API_TOKEN" "https://api.bintray.com/content/terminusdb/terminusdb/terminusdb-client/$BRANCH/$BRANCH/terminusdb-client.min.js?publish=1&override=1"
+curl -T "dist/terminusdb-client.min.js.map" -u"rrooij:$BINTRAY_API_TOKEN" "https://api.bintray.com/content/terminusdb/terminusdb/terminusdb-client/$BRANCH/$BRANCH/terminusdb-client.min.js.map?publish=1&override=1"

.ci/publish_canary.sh

@@ -0,0 +1,24 @@
+name: Build and release on production
+on:
+  push:
+    branches:
+      - dev
+      - canary
+      - rc
+
+jobs:
+  setup-build-publish-deploy:
+    name: Setup, Build, Publish, and Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14
+    - run: npm install
+    - run: npm run build
+    - run: bash ".ci/publish_bintray.sh" "${GITHUB_REF##*/}"
+      env:
+        BINTRAY_API_TOKEN: ${{ secrets.BINTRAY_API_TOKEN }}

.ci/publish_dev.sh

@@ -5,35 +5,13 @@ node_js:
 
 stages:
   - build
-  - name: deploy_dev
-    if: branch = dev
-  - name: deploy_rc
-    if: branch = rc
-  - name: deploy_canary
-    if: branch = canary
 
 jobs:
   include:
     - stage: build
       after_script:
         - npm run coveralls-after
 
-    - stage: deploy_dev
-      script:
-        - npm run build
-        - bash .ci/publish_dev.sh
-
-    - stage: deploy_rc
-      script:
-        - npm run build
-        - bash .ci/publish_rc.sh
-
-    - stage: deploy_canary
-      script:
-        - npm run build
-        - bash .ci/publish_canary.sh
-
-
 before_deploy:
   - npm run doc
   - npm run build

.ci/publish_rc.sh

@@ -97,6 +97,46 @@ function WOQLLibrary(mode) {
     this.empty = ""
 }
 
+
+WOQLLibrary.prototype.classesAndChoices = function(values, variables, schema_resource){
+    let g = schema_resource || this.default_schema_resource
+    this.default_variables = [
+        'Class ID',
+        'Class Name',
+        'Description',
+        'Parents',
+        'Children',
+        'Abstract',
+        'Parent',
+        'Child',
+        'Choices'
+    ]
+
+    if (variables) this._set_user_variables(variables)
+    let select_vars = this._get_varlist().slice(0, 6)
+
+
+    let qpattern = new WOQLQuery().and(
+                    this.classes(values, variables, schema_resource),
+                   new WOQLQuery().opt().select("v:Choices").from("schema/main")
+                   .group_by("v:Class ID", ["v:choice id", "v:choice label", "v:choice description"], "v:Choices")
+                    .and(
+                  new WOQLQuery().select("v:choice id").distinct("v:choice id")
+                  .triple("v:Class ID", "owl:oneOf", "v:Choice")
+                  .path("v:Choice", "rdf:rest+", "v:Entry", "v:Path")
+                  .or(
+                    new WOQLQuery().triple("v:Choice", "rdf:first", "v:choice id"),
+                    new WOQLQuery().triple("v:Entry", "rdf:first", "v:choice id")
+                  ),
+                  new WOQLQuery().triple("v:choice id", "label", "v:choice label")
+                  .triple("v:choice id", "comment", "v:choice description")
+                    )   
+            )
+
+    return this._add_constraints(qpattern, values)
+}
+
+
 /**
  * Patterns to help getting the most useful information from schema graphs
  *
@@ -127,6 +167,7 @@ WOQLLibrary.prototype.classes = function(values, variables, schema_resource) {
                 new WOQLQuery().quad(this._varn('Class ID'), 'label', this._varn('Class Name'), g),
                 new WOQLQuery().eq(this._varn('Class Name'), "")
             ),
+
             new WOQLQuery().limit(1).or(
                 new WOQLQuery().quad(this._varn('Class ID'), 'system:tag', "system:abstract", g).eq(this._varn("Abstract"), "Yes"),
                 new WOQLQuery().eq(this._varn("Abstract"), "No")

.github/workflows/workflow.yml

@@ -51,6 +51,9 @@ WOQLQuery.prototype.insert_class_data = function(data, graph) {
         if (data.description) {
             this.description(data.description)
         }
+        if(data.abstract===true){
+            this.abstract()
+        }
         if (data.parent) {
             if (!Array.isArray(data.parent)) data.parent = [data.parent]
             this.parent(...data.parent)
@@ -199,8 +202,9 @@ WOQLQuery.prototype.generateChoiceList = function(cls, clslabel, clsdesc, choice
     graph = this._sg(graph)
     var clist = []
     var listid = '_:' + (cls.indexOf(':') == -1 ? cls : cls.split(':')[1])
+    const className=this.cleanClass(cls, true)
     var lastid = listid
-    let wq = new WOQLQuery().add_class(cls, graph).label(clslabel)
+    let wq = new WOQLQuery().add_class(className, graph).label(clslabel)
     if (clsdesc) wq.description(clsdesc)
     if (parent) wq.parent(parent)
     var confs = [wq]
@@ -215,7 +219,7 @@ WOQLQuery.prototype.generateChoiceList = function(cls, clslabel, clsdesc, choice
             var clab = UTILS.labelFromURL(chid)
             var desc = false
         }
-        let cq = new WOQLQuery().insert(chid, cls, graph).label(clab)
+        let cq = new WOQLQuery().insert(chid, className, graph).label(clab)
         if (desc) cq.description(desc)
         confs.push(cq)
         var nextid = i < choices.length - 1 ? listid + '_' + i : 'rdf:nil'
@@ -225,18 +229,18 @@ WOQLQuery.prototype.generateChoiceList = function(cls, clslabel, clsdesc, choice
     }
     //do the owl oneof
     let oneof = new WOQLQuery().and(
-        new WOQLQuery().add_quad(cls, 'owl:oneOf', new WOQLQuery().iri(listid), graph),
+        new WOQLQuery().add_quad(className, 'owl:oneOf', new WOQLQuery().iri(listid), graph),
         ...clist,
     )
     return this.and(...confs, oneof)
 }
 
-WOQLQuery.prototype.deleteChoiceList = function(cls, graph) {
+WOQLQuery.prototype.deleteChoiceList = function(classId, graph) {
     graph = this._sg(graph)
     return new WOQLQuery().and(
         new WOQLQuery().from(graph).and(
             new WOQLQuery().select("v:Rest")
-            .distinct("v:Rest").triple(cls, "owl:oneOf", "v:Clist")
+            .distinct("v:Rest").triple(classId, "owl:oneOf", "v:Clist")
             .path("v:Clist", "rdf:rest+", "v:Entry", "v:Path")
             .or(
                 new WOQLQuery().triple("v:Entry", "rdf:first", "v:Rest"),
@@ -245,12 +249,12 @@ WOQLQuery.prototype.deleteChoiceList = function(cls, graph) {
             new WOQLQuery().triple("v:Rest", "v:valprop", "v:valval")
             .triple("v:X", "rdf:first", "v:Rest")
             .triple("v:Y", "rdf:rest", "v:valRest")
-            .triple("scm:Confidence", "v:classProp", "v:classPropVal")
+            .triple(classId, "v:classProp", "v:classPropVal")
         ),
         new WOQLQuery().delete_quad("v:Rest", "v:valprop", "v:valval", graph)
         .delete_quad("v:X", "rdf:first", "v:Rest", graph)
         .delete_quad("v:Y", "rdf:rest", "v:valRest", graph)
-        .delete_quad(cls, "v:classProp", "v:classPropVal", graph)
+        .delete_quad(classId, "v:classProp", "v:classPropVal", graph)
     )
 }