Remove old utility directory

test/misc/Exists.test.ts

@@ -1,5 +1,5 @@
 import * as RDFDM from '@rdfjs/data-model';
-import { evaluate } from '../../util/Util';
+import { evaluate } from '../util/utils';
 
 describe.skip('exists', () => {
   it('runs with mock existence hooks', () => {

test/util/TruthTable.ts

@@ -1,7 +1,7 @@
 import * as RDF from 'rdf-js';
 
-import { stringToTerm, termToString } from 'rdf-string';
-import { evaluate } from '../../util/Util';
+import { termToString } from 'rdf-string';
+import { evaluate } from '../util/utils';
 
 /*
  * Maps short strings to longer RDF term-literals for easy use in making

test/util/utils.ts

@@ -1,11 +1,12 @@
-import { literal } from '@rdfjs/data-model';
 import * as RDF from 'rdf-js';
+
+import { literal } from '@rdfjs/data-model';
 import { stringToTerm, termToString } from 'rdf-string';
+import { translate } from 'sparqlalgebrajs';
 
 import { AsyncEvaluator, AsyncEvaluatorConfig } from '../../lib/evaluators/AsyncEvaluator';
 import { Bindings } from '../../lib/Types';
 import { ExpressionError } from '../../lib/util/Errors';
-import { parse } from '../../util/Util';
 
 export function testAll(exprs: string[], config?: AsyncEvaluatorConfig) {
   exprs.forEach((_expr) => {
@@ -38,8 +39,25 @@ export function testAllErrors(exprs: string[], config?: AsyncEvaluatorConfig) {
   });
 }
 
+function template(expr: string) {
+  return `
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX fn: <https://www.w3.org/TR/xpath-functions#>
+PREFIX err: <http://www.w3.org/2005/xqt-errors#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT * WHERE { ?s ?p ?o FILTER (${expr})}
+`;
+}
+
+function parse(query: string) {
+  const sparqlQuery = translate(query);
+  // Extract filter expression from complete query
+  return sparqlQuery.input.expression;
+}
+
 export function evaluate(expr: string, config?: AsyncEvaluatorConfig): Promise<RDF.Term> {
-  const evaluator = new AsyncEvaluator(parse(expr), config);
+  const evaluator = new AsyncEvaluator(parse(template(expr)), config);
   return evaluator.evaluate(Bindings({}));
 }