Merge pull request #205 from terminusdb/fix_type_of

Fix type_of

Author: Francesca-Bit

lib/query/woqlQuery.js

@@ -1070,8 +1070,8 @@ WOQLQuery.prototype.type_of = function (a, b) {
   if (!a || !b) return this.parameterError('type_of takes two parameters, both values');
   if (this.cursor['@type']) this.wrapCursorWithAnd();
   this.cursor['@type'] = 'TypeOf';
-  this.cursor.value = this.cleanClass(a);
-  this.cursor.type = this.cleanClass(b);
+  this.cursor.value = this.cleanObject(a);
+  this.cursor.type = this.cleanSubject(b);
   return this;
 };
 

test/woql.spec.js

@@ -364,4 +364,23 @@ describe('woql queries', () => {
 
     expect(varsArr[0]).to.be.instanceof(Var);
   });
+
+  it('check type_of(Var,Var)', () => {
+    const TypeOf = WOQL.type_of('v:X', 'v:Y').json()
+    expect(TypeOf).to.deep.eql({
+      '@type': 'TypeOf',
+      value: { '@type': 'Value', variable: 'X' },
+      type: { '@type': 'NodeValue', variable: 'Y' }
+    })
+  });
+
+  it('check type_of(OBJ,Var)', () => {
+    const TypeOf = WOQL.type_of(WOQL.string("X"), 'v:Y').json()
+    expect(TypeOf).to.deep.eql({
+      '@type': 'TypeOf',
+      value: { '@type': 'Value', data: { '@type': 'xsd:string', '@value': 'X' } },
+      type: { '@type': 'NodeValue', variable: 'Y' }
+    })
+  });
+
 });