Merge pull request #118 from terminusdb/fixWQPost

fixed WOQL.post function

Author: Francesca-Bit

docs/api/woql.js.md

@@ -394,7 +394,7 @@ file("/path/to/file", {type: 'turtle'} )
 ```
 
 ### post
-#### WOQL.post(url, [formatObj]) ⇒ <code>WOQLQuery</code>
+#### WOQL.post(url, [formatObj], [source]) ⇒ <code>WOQLQuery</code>
 Identifies a resource as a local path on the client, to be sent to the server through a
 HTTP POST request, with the format defined through the options
 
@@ -404,6 +404,7 @@ HTTP POST request, with the format defined through the options
 | --- | --- | --- |
 | url | <code>string</code> | The Path on the server at which the file resource can be accessed |
 | [formatObj] | <code>typedef.DataFormatObj</code> | imput options, optional |
+| [source] | <code>string</code> | It defines the source of the file, it can be 'url','post' |
 
 **Example**  
 ```js

lib/query/woqlQuery.js

@@ -448,11 +448,11 @@ WOQLQuery.prototype.remote = function(uri, opts) {
     return this
 }
 
-WOQLQuery.prototype.post = function(fpath, opts) {
+WOQLQuery.prototype.post = function(fpath, opts, source = 'post') {
     //if (fpath && fpath == 'args') return ['file', 'format']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
-    this.cursor['@type'] = 'PostResource'
-    this.cursor['source'] = {'@type': 'Source', 'file': fpath}
+    this.cursor['@type'] = 'QueryResource'
+    this.cursor['source'] = {'@type': 'Source', [source]: fpath}
     this.cursor['format'] = "csv" // hard coded for now
     this.cursor['options'] = opts
     if (typeof opts != 'undefined')

lib/woql.js

@@ -368,12 +368,13 @@ WOQL.file = function(url, formatObj) {
  * HTTP POST request, with the format defined through the options
  * @param {string} url - The Path on the server at which the file resource can be accessed
  * @param {typedef.DataFormatObj} [formatObj] - imput options, optional
+ * @param {string} [source] - It defines the source of the file, it can be 'url','post'
  * @returns {WOQLQuery} A WOQLQuery which contains the Post resource identifier
  * @example
  * post("/.../.../", {type:'csv'})
  */
-WOQL.post = function(url, formatObj) {
-    return new WOQLQuery().post(url, formatObj)
+WOQL.post = function(url, formatObj, source) {
+    return new WOQLQuery().post(url, formatObj, source)
 }
 
 /**

lib/woqlClient.js

@@ -7,6 +7,8 @@ const ConnectionConfig = require('./connectionConfig')
 const WOQL = require('./woql')
 const WOQLQuery = require('./query/woqlBuilder')
 const { default: axios } = require('axios')
+const FormData = require('form-data');
+const fs = require('fs');
 
 /**
  * @license Apache Version 2
@@ -555,13 +557,30 @@ WOQLClient.prototype.query = function(woql, commitMsg, allWitnesses, lastDataVer
     if (woql && woql.json && (!woql.containsUpdate() || commitMsg)) {
         let doql = woql.containsUpdate() ? this.generateCommitInfo(commitMsg) : {}
         doql.query = woql.json()
+
+        let postBody;
+
+        if(doql.query.resource.source.post) {
+          const fileName = doql.query.resource.source.post.split('/').pop();
+
+          const formData = new FormData();
+          formData.append('file', fs.createReadStream(doql.query.resource.source.post));
+          doql.query.resource.source.post = fileName;
+          formData.append('payload', Buffer.from(JSON.stringify(doql)), { filename: 'body.json', contentType: 'application/json' });
+          this.customHeaders(formData.getHeaders());
+
+          postBody = formData;
+        } else {
+          postBody = doql;
+        }
+       
         if (allWitnesses) doql.all_witnesses = true
 
         if(typeof lastDataVersion === 'string' && lastDataVersion !== '') {
             this.customHeaders({'TerminusDB-Data-Version': lastDataVersion})
         }
 
-        return this.dispatch(CONST.WOQL_QUERY, this.connectionConfig.queryURL(), doql, getDataVersion)
+        return this.dispatch(CONST.WOQL_QUERY, this.connectionConfig.queryURL(), postBody, getDataVersion)
     }
     let errmsg = `WOQL query parameter error`
     if (woql && woql.json && woql.containsUpdate() && !commitMsg) {

package.json

@@ -24,6 +24,7 @@
     "ajv":">=6.12.3",
     "follow-redirects":">=1.14.8",
     "axios": ">=0.25.0",
+    "form-data": "^4.0.0",
     "babel-polyfill": "^6.26.0",
     "node-forge": ">=1.0.0",
     "underscore": ">=1.13.2"
@@ -93,6 +94,7 @@
     "net": false,
     "path": false,
     "stream": false,
-    "tls": false
+    "tls": false,
+    "fs": false
   }
 }