sparqlee: Switch RDF dependencies, close comunica#5, close comunica#4

jitsedesmet · Sep 27, 2018 · 80979e4 · 80979e4
1 parent 4001d1b
commit 80979e4
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 1,375 deletions.
diff --git a/packages/sparqlee/bin/Manual.ts b/packages/sparqlee/bin/Manual.ts
@@ -1,7 +1,7 @@
 #! /usr/bin/env node
 // tslint:disable:no-console
 
-import * as RDF from 'rdf-data-model';
+import * as RDF from '@rdfjs/data-model';
 import { Algebra as Alg } from 'sparqlalgebrajs';
 
 import { ArrayIterator, AsyncIterator } from 'asynciterator';
@@ -21,6 +21,7 @@ async function testEval() {
   const ex = new U.Example('langMatches(?a, "de-*-DE")', () => Bindings({
     '?a': RDF.literal('aaa'),
   }));
+  // tslint:disable-next-line:no-any
   const evaluator = new AsyncEvaluator(undefined as any, U.mockLookUp, U.mockAggregator);
   const presult = evaluator.evaluate(ex.mapping()).catch((err) => console.log(err));
   const val = await presult;

diff --git a/packages/sparqlee/lib/core/Expressions.ts b/packages/sparqlee/lib/core/Expressions.ts
@@ -1,6 +1,6 @@
+import * as RDFDM from '@rdfjs/data-model';
 import * as Promise from 'bluebird';
 import { List, Map } from 'immutable';
-import * as RDFDM from 'rdf-data-model';
 import * as RDF from 'rdf-js';
 import { Algebra } from 'sparqlalgebrajs';
 

diff --git a/packages/sparqlee/lib/util/Consts.ts b/packages/sparqlee/lib/util/Consts.ts
@@ -1,6 +1,6 @@
 // tslint:disable:variable-name
+import * as RDFDM from '@rdfjs/data-model';
 import { Map, Set } from 'immutable';
-import * as RDFDM from 'rdf-data-model';
 import * as RDF from 'rdf-js';
 
 export const TRUE_STR = '"true"^^xsd:boolean';

diff --git a/packages/sparqlee/package.json b/packages/sparqlee/package.json
@@ -44,7 +44,7 @@
     "@types/lodash": "^4.14.105",
     "@types/lodash.isequal": "^4.5.2",
     "@types/node": "^10.11.0",
-    "@types/rdf-data-model": "^1.0.1",
+    "@types/rdf-js": "^1.0.1",
     "asynciterator": "^2.0.0",
     "benchmark": "^2.1.4",
     "coveralls": "^3.0.2",
@@ -58,10 +58,9 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
+    "@rdfjs/data-model": "^1.1.0",
     "bluebird": "^3.5.1",
     "immutable": "^3.8.2",
-    "rdf-data-model": "^1.0.0",
-    "rdf-js": "^1.0.1",
     "rdf-string": "^1.1.1",
     "sparqlalgebrajs": "^1.1.0"
   },

diff --git a/packages/sparqlee/test/Errors.test.ts b/packages/sparqlee/test/Errors.test.ts
@@ -1,4 +1,4 @@
-import { literal } from 'rdf-data-model';
+import { literal } from '@rdfjs/data-model';
 
 import { AsyncEvaluator, ExpressionError } from '..';
 import { Bindings } from '../lib/core/Types';

diff --git a/packages/sparqlee/test/core/functions/functionalForms/LogicalConnectives.test.ts b/packages/sparqlee/test/core/functions/functionalForms/LogicalConnectives.test.ts
@@ -1,7 +1,7 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../../lib/util/Consts';
-import { testTable, Notation } from '../../../util/TruthTable';
+import { Notation, testTable } from '../../../util/TruthTable';
 
 const CT = C.commonTerms;
 
@@ -34,7 +34,7 @@ describe('evaluation of logical connectives', () => {
     error false = error
     error error = error
     `;
-    testTable({op: '||', ..._default, table, errorTable});
+    testTable({ op: '||', ..._default, table, errorTable });
   });
 
   describe('like "&&" receiving', () => {
@@ -52,6 +52,6 @@ describe('evaluation of logical connectives', () => {
     error true  = error
     error error = error
     `;
-    testTable({op: '&&', ..._default, table, errorTable});
+    testTable({ op: '&&', ..._default, table, errorTable });
   });
 });
diff --git a/packages/sparqlee/test/core/functions/onRdfTerms.test.ts b/packages/sparqlee/test/core/functions/onRdfTerms.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../lib/util/Consts';
 import { Notation, testTable } from '../../util/TruthTable';

diff --git a/packages/sparqlee/test/core/functions/onStrings.test.ts b/packages/sparqlee/test/core/functions/onStrings.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../lib/util/Consts';
 import { Notation, testTable } from '../../util/TruthTable';

diff --git a/packages/sparqlee/test/core/functions/operators/Arithmetic.test.ts b/packages/sparqlee/test/core/functions/operators/Arithmetic.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../../lib/util/Consts';
 import { AliasMap, Notation, testTable } from '../../../util/TruthTable';

diff --git a/packages/sparqlee/test/core/functions/operators/DateTimeOperands.test.ts b/packages/sparqlee/test/core/functions/operators/DateTimeOperands.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../../lib/util/Consts';
 import { Notation, testTable } from '../../../util/TruthTable';

diff --git a/packages/sparqlee/test/core/functions/operators/NumericOperands.test.ts b/packages/sparqlee/test/core/functions/operators/NumericOperands.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../../lib/util/Consts';
 import { AliasMap, Notation, testTable } from '../../../util/TruthTable';

diff --git a/packages/sparqlee/test/core/functions/operators/StringOperands.test.ts b/packages/sparqlee/test/core/functions/operators/StringOperands.test.ts
@@ -1,4 +1,4 @@
-import * as RDFDM from 'rdf-data-model';
+import * as RDFDM from '@rdfjs/data-model';
 
 import * as C from '../../../../lib/util/Consts';
 import { Notation, testTable } from '../../../util/TruthTable';

diff --git a/packages/sparqlee/util/Util.ts b/packages/sparqlee/util/Util.ts
@@ -1,6 +1,6 @@
+import * as RDFDM from '@rdfjs/data-model';
 import * as Promise from 'bluebird';
 import { Map } from 'immutable';
-import * as RDFDM from 'rdf-data-model';
 import * as RDF from 'rdf-js';
 
 import { Algebra as Alg, translate } from 'sparqlalgebrajs';