Merge branch 'rc'

Author: dmytri

.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

@@ -1,5 +1,4 @@
-terminusdb-client
-===============
+# terminusdb-client
 
 [![build status](https://api.travis-ci.com/terminusdb/terminusdb-client.svg?branch=master)](https://travis-ci.com/terminusdb/terminusdb-client)
 [![Coverage Status](https://coveralls.io/repos/github/terminusdb/terminusdb-client/badge.svg?branch=master)](https://coveralls.io/repos/github/terminusdb/terminusdb-client/badge.svg?branch=master)
@@ -16,6 +15,7 @@ Promise based terminus client for the browser and node.js
 TerminusDB Client can be used as either a Node.js module available through the npm registry, or directly included in web-sites by including the script tag below.
 
 ### NPM Module
+
 Before installing, download and install Node.js. Node.js 0.10 or higher is required.
 
 Installation is done using the npm install command:
@@ -43,66 +43,87 @@ Download the terminusdb-client.min.js file from the /dist directory and save it
 ```
 
 ## Usage
-For the [full Documentation](https://terminusdb.com/docs/client_api)
+
+This example creates a simple Express.js server that will post an account to
+a database with the id "banker" and the default "admin" user with password "root"
+For the [full Documentation](https://terminusdb.com/docs/reference/js-client)
 
 ```javascript
-//
-const TerminusClient = require('@terminusdb/terminusdb-client');
-
-//Create a new instance of terminusDB client
-const client = new TerminusClient.WOQLClient("https://127.0.0.1:6363/",{
-    dbid:"test_db",
-    user:"admin",
-    key:"my_secret_key"
+const express = require("express");
+const app = express();
+const port = 3000;
+
+const TerminusClient = require("@terminusdb/terminusdb-client");
+
+// Connect and configure the TerminusClient
+const client = new TerminusClient.WOQLClient("https://127.0.0.1:6363/", {
+  dbid: "banker",
+  user: "admin",
+  key: "root",
 });
+client.db("banker");
+client.organization("admin");
 
-//Connect to a TerminusDB server at the given URI with an API key
-client.connect().
- .then(function (response) {
-    // handle success
-    console.log(response);
-  })
-  .catch(function (error) {
-    // handle error
-    console.log(error);
-  })
-  .finally(function () {
-    // always executed
-  });
-
-
-//use async/await.
-async function getCapabilities() {
+async function postAccount() {
   try {
-    const response = await client.connect();
-    console.log(response);
+    const WOQL = TerminusClient.WOQL;
+    const query = WOQL.using("admin/banker").and(
+      WOQL.add_triple("doc:smog", "type", "scm:BankAccount"),
+      WOQL.add_triple("doc:smog", "owner", "smog"),
+      WOQL.add_triple("doc:smog", "balance", 999)
+    );
+    await client.connect();
+    client
+      .query(query, "adding smog's bank account")
+      .then((response) => {
+        return response;
+      })
+      .catch((err) => {
+        console.log("error", err);
+      });
   } catch (err) {
     console.error(err);
   }
 }
 
-```
-
+app.post("/account", (req, res) => {
+  postAccount().then((dbres) => res.send(JSON.stringify(dbres)));
+});
 
+app.listen(port, () => {
+  console.log(`Backend Server listening at http://localhost:${port}`);
+  client
+    .connect()
+    .then(function (response) {
+      // handle success
+      console.log(response);
+    })
+    .catch(function (error) {
+      // handle error
+      console.log(error);
+    });
+});
+```
 
 ## Options
+
 connections options.
 
 To initialize `TerminusDB client` with custom options use
 
 ```js
-const TerminusClient = require('@terminusdb/terminusdb-client')
+const TerminusClient = require("@terminusdb/terminusdb-client");
 
 const client = new TerminusClient.WOQLClient("https://127.0.0.1:6363/", {
-    dbid:"test_db",
-    user:"admin",
-    key:"my_secret_key"
+  dbid: "test_db",
+  user: "admin",
+  key: "my_secret_key",
 });
-
 ```
+
 ## API
 
-The API is documented at: https://terminusdb.github.io/terminusdb-client/
+The API is documented at: https://terminusdb.com/docs/reference/js-client/core/#terminusdb-client-api
 
 ## Report Issues
 

.github/workflows/workflow.yml

@@ -1,3 +1,19 @@
+# TerminusDB Client v4.0.0
+
+## new
+
+* add update_quad
+* add update_triple
+* add woql word once
+* add context to using
+* add type_of
+* better error reporting
+* add csv uploading
+
+## fixes
+
+* Fix group_by
+
 # TerminusDB Client v3.0.3
 
 The liberation release 

.travis.yml

@@ -148,7 +148,6 @@ ConnectionCapabilities.prototype.updateDatabasePrefixes = function(dbrec, newps)
     dbrec.jsonld_context = _jsonld_context_from_prefixes(newps)
 }
 
-
 function _jsonld_context_from_prefixes(pps){
     let basic = {}
     for(var key in UTILS.standard_urls){
@@ -164,7 +163,7 @@ function _jsonld_context_from_prefixes(pps){
 
 ConnectionCapabilities.prototype.getContextForOutboundQuery = function(woql, dbid, orgid) {
     let ob = {}
-    if (woql.getContext()) {
+    if (woql && woql.getContext()) {
         ob = woql.getContext()
     }
     else {

README.md

@@ -60,6 +60,7 @@ ConnectionConfig.prototype.update = function(params) {
     const newParams = params || {}
     //if (typeof newParams.server != "undefined") this.setServer(newParams.server);
     if (typeof newParams.organization != 'undefined') this.setOrganization(newParams.organization)
+    else if(newParams.user) this.setOrganization(newParams.user)
     if (typeof newParams.db != 'undefined') this.setDB(newParams.db)
     if (typeof newParams.remote_auth != 'undefined') this.setRemoteAuth(newParams.remote_auth)
     if (typeof newParams.local_auth != 'undefined') this.setLocalAuth(newParams.local_auth)
@@ -274,6 +275,7 @@ ConnectionConfig.prototype.graphURL = function(type, gid) {
     return this.branchBase('graph') + `/${type}/${gid}`
 }
 
+
 /**
  * Generate URL for get / set schema api endpoint
  */
@@ -292,7 +294,7 @@ ConnectionConfig.prototype.csvURL = function(type, gid) {
     var s = this.branchBase('csv')
     const graphId = gid || 'main'
     const gType = type || 'instance'
-    s += `/${gType}/${graphId}`
+    //s += `/${gType}/${graphId}`
     return s
 }