Add test and fix issue with WOQL from (fixes #318)

Author: hoijnet

integration_tests/woql_regression.test.ts

@@ -0,0 +1,45 @@
+//@ts-check
+import { describe, expect, test, beforeAll } from '@jest/globals';
+import { WOQLClient, WOQL, Vars } from '../index.js';
+import { DbDetails } from '../dist/typescript/lib/typedef.js';
+
+let client: WOQLClient
+const db01 = 'db__test_woql_regression';
+
+beforeAll(async () => {
+  client = new WOQLClient("http://localhost:6363", { user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
+  client.db(db01);
+  const dbObj: DbDetails = { label: db01, comment: 'add db', schema: true }
+  await client.createDatabase(db01, dbObj);
+});
+
+afterAll(async () => {
+  await client.deleteDatabase(db01);
+});
+
+describe('Tests for woql graph addressing', () => {
+  it('should construct correct query for: from instance', async () => {
+    const query = WOQL.from('instance').limit(10).eval(WOQL.plus(1, 1), 'v:result');
+
+    const expectedJson = [{ "result": { "@type": "xsd:decimal", "@value": 2 } }];
+    
+    const result = await client.query(query);
+    expect(result?.bindings).toStrictEqual(expectedJson);
+  });
+
+  it('should construct correct query for: from schema', async () => {
+    // This tests corresponds to issue #2077, with incorrect AST, now fixed
+    // https://github.com/terminusdb/terminusdb/issues/2077
+    let v = Vars("cls");
+    const query = WOQL.from("schema")
+      .triple(v.cls, "rdf:type", "sys:Class")
+    const expectedJson = [];
+    const result = await client.query(query);
+    expect(result?.bindings).toStrictEqual(expectedJson);
+  });
+
+  test('should construct correct query for: info', async () => {
+    const result = await client.info();
+    expect(result["@type"]).toStrictEqual("api:InfoResponse");
+  });
+});

lib/query/woqlQuery.js

@@ -421,16 +421,14 @@ WOQLQuery.prototype.or = function (...subqueries) {
  */
 
 WOQLQuery.prototype.from = function (graphRef, query) {
-  // if (graph && graph === 'args')
-  // return ['graph', 'query']
   if (this.cursor['@type']) this.wrapCursorWithAnd();
   this.cursor['@type'] = 'From';
-  if (!graphRef || typeof graph !== 'string') {
+  if (!graphRef || typeof graphRef !== 'string') {
     return this.parameterError(
       'The first parameter to from must be a Graph Filter Expression (string)',
     );
   }
-  this.cursor.graph = graphRef;
+  this.cursor.graph = this.jlt(graphRef);
   return this.addSubQuery(query);
 };
 

test/woql.spec.js

@@ -123,22 +123,20 @@ describe('woql queries', () => {
   });
 
   it('check the from method', () => {
-    const WOQLQuery = WOQL.limit(10);
-
-    const woqlObjectChain = WOQL.from('http://dburl').limit(10);
-    const woqlObject = WOQL.from('http://dburl', WOQLQuery);
+    const woqlObjectChain = WOQL.from('instance/main').limit(10).and();
     const jsonObj = {
       '@type': 'From',
-      graph: 'http://dburl',
+      graph: {
+        "@type": "xsd:string",
+        "@value": "instance/main",
+      },
       query: {
         '@type': 'Limit',
         limit: 10,
-        query: {},
       },
     };
 
-    // expect(woqlObject.json()).to.eql(jsonObj);
-    // expect(woqlObjectChain.json()).to.eql(jsonObj);
+    expect(woqlObjectChain.json()).to.eql(jsonObj);
   });
 
   it('check the star method', () => {
@@ -496,4 +494,11 @@ describe('woql queries', () => {
     expect(wq).to.deep.eql(
       {"@type":"And","and":[{"@type":"Eval","expression":{"@type":"Times","left":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":3}},"right":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":4}}},"result":{"@type":"ArithmeticValue","variable":"a"}},{"@type":"Eval","expression":{"@type":"Times","left":{"@type":"ArithmeticValue","variable":"a"},"right":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":3}}},"result":{"@type":"ArithmeticValue","variable":"res"}}]})
   });
+
+  it('check limit().eval()', () => {
+    let v = Vars("result");
+    const woqlObject = WOQL.limit(100).eval(WOQL.times(2, 3), v.result);
+    const expectedJson = {"@type":"Limit","limit":100,"query":{"@type":"Eval","expression":{"@type":"Times","left":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":2}},"right":{"@type":"ArithmeticValue","data":{"@type":"xsd:decimal","@value":3}}},"result":{"@type":"ArithmeticValue","variable":"result"}}};
+    expect(woqlObject.json()).to.deep.eql(expectedJson);
+  });
 });