Merge pull request #237 from terminusdb/coveralls-next

add extra types to woql

Author: Francesca-Bit

docs/api/woql.md

@@ -1359,6 +1359,54 @@ literal(1, "nonNegativeInteger")
 //returns { "@type": "xsd:nonNegativeInteger", "@value": 1 }
 ```
 
+## date
+##### WOQL.date(date) ⇒ <code>object</code>
+Generates explicitly a JSON-LD literal date from the imput
+
+**Returns**: <code>object</code> - - A JSON-LD literal date  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| date | <code>string</code> | any date format string (YYYY-MM-DD) |
+
+**Example**  
+```javascript
+date("2022-10-02")
+//returns { "@type": "xsd:date", "@value": "2022-10-02" }
+```
+
+## datetime
+##### WOQL.datetime(datetime) ⇒ <code>object</code>
+Generates explicitly a JSON-LD literal datetime from the imput
+
+**Returns**: <code>object</code> - - A JSON-LD literal datetime  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| datetime | <code>string</code> | any datetime format string (YYYY-MM-DDThh-mm-ssZ) |
+
+**Example**  
+```javascript
+datetime("2022-10-19T14:17:12Z")
+//returns { "@type": "xsd:dateTime", "@value": "2022-10-19T14:17:12Z" }
+```
+
+## boolean
+##### WOQL.boolean(bool) ⇒ <code>object</code>
+Generates explicitly a JSON-LD literal boolean from the input
+
+**Returns**: <code>object</code> - - A JSON-LD literal boolean  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| bool | <code>boolean</code> | true | false |
+
+**Example**  
+```javascript
+boolean(true)
+//returns { "@type": "xsd:boolean", "@value": true }
+```
+
 ## iri
 ##### WOQL.iri(val) ⇒ <code>object</code>
 Explicitly sets a value to be an IRI - avoiding automatic type marshalling

lib/accessControl.js

@@ -472,7 +472,6 @@ AccessControl.prototype.ifOrganizationExists = function (orgName) {
  * })
  */
 AccessControl.prototype.createOrganizationRemote = function (orgName) {
-  // maybe we have to review this
   const payload = { organization: orgName };
   return this.dispatch(`${this.baseURL}/private/organizations`, CONST.POST, payload);
 };

lib/viewer/tableConfig.js

@@ -49,13 +49,16 @@ WOQLTableConfig.prototype.json = function () {
 
 WOQLTableConfig.prototype.loadJSON = function (config, rules) {
   const jr = [];
-  for (let i = 0; i < rules.length; i++) {
-    // eslint-disable-next-line no-use-before-define
-    const nr = new WOQLTableRule();
-    nr.json(rules[i]);
-    jr.push(nr);
+  if (Array.isArray(rules)) {
+    for (let i = 0; i < rules.length; i++) {
+      // eslint-disable-next-line no-use-before-define
+      const nr = new WOQLTableRule();
+      nr.json(rules[i]);
+      jr.push(nr);
+    }
   }
   this.rules = jr;
+  if (!config) return this;
   if (typeof config.column_order !== 'undefined') {
     this.column_order(...config.column_order);
   }

lib/woql.js

@@ -1269,6 +1269,42 @@ WOQL.literal = function (val, type) {
   return new WOQLQuery().literal(val, type);
 };
 
+/**
+ * Generates explicitly a JSON-LD literal date from the imput
+ * @param {string} date - any date format string (YYYY-MM-DD)
+ * @returns {object} - A JSON-LD literal date
+ * @example
+ * date("2022-10-02")
+ * //returns { "@type": "xsd:date", "@value": "2022-10-02" }
+ */
+WOQL.date = function (date) {
+  return new WOQLQuery().literal(date, 'xsd:date');
+};
+
+/**
+ * Generates explicitly a JSON-LD literal datetime from the imput
+ * @param {string} datetime - any datetime format string (YYYY-MM-DDThh-mm-ssZ)
+ * @returns {object} - A JSON-LD literal datetime
+ * @example
+ * datetime("2022-10-19T14:17:12Z")
+ * //returns { "@type": "xsd:dateTime", "@value": "2022-10-19T14:17:12Z" }
+ */
+WOQL.datetime = function (datetime) {
+  return new WOQLQuery().literal(datetime, 'xsd:dateTime');
+};
+
+/**
+ * Generates explicitly a JSON-LD literal boolean from the input
+ * @param {boolean} bool - true | false
+ * @returns {object} - A JSON-LD literal boolean
+ * @example
+ * boolean(true)
+ * //returns { "@type": "xsd:boolean", "@value": true }
+ */
+WOQL.boolean = function (bool) {
+  return new WOQLQuery().boolean(bool);
+};
+
 /**
  * Explicitly sets a value to be an IRI - avoiding automatic type marshalling
  * @param {string} val string which will be treated as an IRI

lib/woqlClient.js

@@ -1661,6 +1661,7 @@ WOQLClient.prototype.getVersionDiff = function (beforeVersion, afterVersion, id,
   if (id) {
     payload.document_id = id;
   }
+  // console.log(this.connectionConfig.diffURL())
   return this.dispatch(
     CONST.POST,
     this.connectionConfig.diffURL(),

package.json

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

test/woql.spec.js

@@ -383,4 +383,69 @@ describe('woql queries', () => {
     })
   });
 
+
+  it('check type_of(boolean,Var)', () => {
+    const TypeOf = WOQL.type_of(WOQL.boolean(true), 'v:Y').json()
+    expect(TypeOf).to.deep.eql({
+      "@type": "TypeOf",
+      "value": {
+        "@type": "Value",
+        "data": {
+          "@type": "xsd:boolean",
+          "@value": true
+        }
+      },
+      "type": {
+        "@type": "NodeValue",
+        "variable": "Y"
+      }
+    })
+  });
+
+ 
+  it('check datetime', () => {
+    const TypeOf = WOQL.triple("v:a", "datetime", WOQL.datetime("2022-10-19T21:14:20Z")).json()
+    expect(TypeOf).to.deep.eql({
+      "@type": "Triple",
+      "subject": {
+        "@type": "NodeValue",
+        "variable": "a"
+      },
+      "predicate": {
+        "@type": "NodeValue",
+        "node": "datetime"
+      },
+      "object": {
+        "@type": "Value",
+        "data": {
+          "@type": "xsd:dateTime",
+          "@value": "2022-10-19T21:14:20Z"
+        }
+      }
+    })
+  });
+
+
+  it('check date', () => {
+    const TypeOf = WOQL.triple("v:a", "date", WOQL.date("2022-10-19")).json()
+    expect(TypeOf).to.deep.eql({
+      "@type": "Triple",
+      "subject": {
+        "@type": "NodeValue",
+        "variable": "a"
+      },
+      "predicate": {
+        "@type": "NodeValue",
+        "node": "date"
+      },
+      "object": {
+        "@type": "Value",
+        "data": {
+          "@type": "xsd:date",
+          "@value": "2022-10-19"
+        }
+      }
+    })
+  });
+
 });