Merge pull request #319 from hoijnet/issue/318-fix-woql-from

Issue/318 fix woql from (fixes #318)

Author: dfrnt-SigmundFuchs

.github/workflows/ci.yml

@@ -28,12 +28,15 @@ jobs:
     if: needs.skip_if_running.outputs.skip != 'true'
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: 14
+        node-version: 18
     - name: Run terminusdb server
-      run: docker run --detach --publish 127.0.0.1:6363:6363 terminusdb/terminusdb-server:dev && sleep 3
+      run: |
+        docker run --detach --publish 127.0.0.1:6363:6363 terminusdb/terminusdb-server:dev && sleep 10
+        docker ps
+        netstat -an |grep 6363
     - name: Install, build and test
       run: |
         npm ci

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Clone JSDoc template
       run: git clone https://github.com/terminusdb-labs/jsdoc-terminusdb-template.git
     - name: Run NPM Install

.github/workflows/production.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
-        node-version: 14
+        node-version: 18
         registry-url: 'https://registry.npmjs.org'
     - run: npm install
     - run: npm run build

integration_tests/create_database.test.ts

@@ -7,10 +7,10 @@ import { DbDetails, DocParamsGet } from '../dist/typescript/lib/typedef';
 import schemaJson from './persons_schema'
 //console.log(typeof schemaJson)
 
-let client : WOQLClient //= new WOQLClient('http://localhost:6363');
+let client : WOQLClient //= new WOQLClient('http://127.0.0.1:6363');
 
 beforeAll(() => {
-  client  = new WOQLClient("http://localhost:6363",{ user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
+  client  = new WOQLClient("http://127.0.0.1:6363",{ user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
 });
 
 const db01 = 'db__test';

integration_tests/woql_arithmetic.test.ts

@@ -4,11 +4,11 @@ import { WOQLClient, WOQL } from '../index.js';
 import { DbDetails } from '../dist/typescript/lib/typedef.js';
 import { Vars } from '../lib/woql.js';
 
-let client: WOQLClient //= new WOQLClient('http://localhost:6363');
+let client: WOQLClient //= new WOQLClient('http://127.0.0.1:6363');
 const db01 = 'db__test_woql_arithmetic';
 
 beforeAll(() => {
-  client = new WOQLClient("http://localhost:6363", { user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
+  client = new WOQLClient("http://127.0.0.1:6363", { user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
   client.db(db01);
 });
 

integration_tests/woql_client.test.ts

@@ -6,10 +6,10 @@ import schemaJson from './persons_schema'
 import { mock_employees_limit_1 } from './data/employees_limit1';
 import fs from 'fs';
 
-let client: WOQLClient //= new WOQLClient('http://localhost:6363');
+let client: WOQLClient //= new WOQLClient('http://127.0.0.1:6363');
 
 beforeAll(() => {
-  client = new WOQLClient("http://localhost:6363", { user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
+  client = new WOQLClient("http://127.0.0.1:6363", { user: 'admin', organization: 'admin', key: process.env.TDB_ADMIN_PASS ?? 'root' })
 });
 
 const db01 = 'db__test_woql';

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://127.0.0.1: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/accessControl.js

@@ -38,7 +38,7 @@ const typedef = require('./typedef');
  * eTFORUd.......")
  *
  * //connect with the base authentication this type of connection is only for the local installation
- * const accessContol = new AccessControl("http://localhost:6363",
+ * const accessContol = new AccessControl("http://127.0.0.1:6363",
  * {organization:"my_team_name", user:"admin"
  * key:"mykey"})
  * accessControl.getOrgUsers().then(result=>{

lib/query/woqlQuery.js

@@ -29,14 +29,14 @@ const typedef = require('../typedef');
 
 // I HAVE TO REVIEW THE Inheritance and the prototype chain
 class WOQLQuery extends WOQLCore {
-/**
- * defines the internal functions of the woql query object - the
- * language API is defined in WOQLQuery
- * @module WOQLQuery
- * @constructor
- * @param {object} [query] json-ld query for initialisation
- * @returns {WOQLQuery}
- */
+  /**
+   * defines the internal functions of the woql query object - the
+   * language API is defined in WOQLQuery
+   * @module WOQLQuery
+   * @constructor
+   * @param {object} [query] json-ld query for initialisation
+   * @returns {WOQLQuery}
+   */
 
   /**
  * Update a pattern matching rule for the triple (Subject, Predicate, oldObjValue) with the
@@ -373,7 +373,7 @@ WOQLQuery.prototype.and = function (...subqueries) {
     const onevar = this.jobj(subqueries[i]);
     if (
       onevar['@type'] === 'And'
-            && onevar.and
+      && onevar.and
     ) {
       for (let j = 0; j < onevar.and.length; j++) {
         const qjson = onevar.and[j];
@@ -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);
 };
 
@@ -1487,7 +1485,7 @@ WOQLQuery.prototype.order_by = function (...orderedVarlist) {
     );
   }
   const embedquery = typeof orderedVarlist[orderedVarlist.length - 1] === 'object'
-        && orderedVarlist[orderedVarlist.length - 1].json
+    && orderedVarlist[orderedVarlist.length - 1].json
     ? orderedVarlist.pop()
     : false;
 

test/accessControl.spec.js

@@ -2,7 +2,7 @@ const { expect } = require('chai');
 const AccessControl = require('../lib/accessControl');
 
 describe('AccessControl tests', () => {
-    const startServerUrl = 'http://localhost:6363/';
+    const startServerUrl = 'http://127.0.0.1:6363/';
     const organization = 'admin';
     const user = 'admin';
     const key ='mykey'