working tests

Author: jitsedesmet

packages/algebra-transformer-1-1/lib/algebraToAst/sparql.ts

@@ -1,6 +1,5 @@
 import type * as RDF from '@rdfjs/types';
 import {
-
   Factory as AstFactory,
 } from '@traqula/rules-sparql-1-1';
 import type {
@@ -56,7 +55,6 @@ import type {
   Term,
   Sparql11Nodes,
   Quads,
-
   DatasetClauses,
   PatternFilter,
 } from '@traqula/rules-sparql-1-1';
@@ -849,7 +847,7 @@ F.gen(),
       const asCasted = <UpdateOperationDeleteWhere & { where?: unknown; delete?: unknown }> <unknown> updates[0];
       asCasted.data = updates[0].delete;
       delete asCasted.where;
-      delete op.delete;
+      delete asCasted.delete;
       asCasted.subType = 'deletewhere';
     }
 

packages/algebra-transformer-1-1/lib/sparqlAlgebra.ts

@@ -6,7 +6,6 @@ import {
   findPatternBoundedVars,
 } from '@traqula/rules-sparql-1-1';
 import type {
-
   BasicGraphPattern,
   Expression,
   GraphQuads,
@@ -29,14 +28,12 @@ import type {
   TermIri,
   PatternFilter,
   PatternValues,
-
   ExpressionAggregate,
   PatternBind,
   Update,
   UpdateOperation,
   UpdateOperationLoad,
   UpdateOperationCreate,
-
   DatasetClauses,
   GraphRef,
   GraphRefAll,
@@ -49,7 +46,6 @@ import type {
   Path,
   UpdateOperationClear,
   UpdateOperationDrop,
-
   ContextDefinition,
 } from '@traqula/rules-sparql-1-1';
 import equal from 'fast-deep-equal/es6';
@@ -117,6 +113,7 @@ class QueryTranslator {
   public constructor(private readonly factory: Factory) {}
 
   public translateQuery(sparql: SparqlQuery, quads?: boolean, blankToVariable?: boolean): Algebra.Operation {
+    const F = this.astFactory;
     this.variables = new Set();
     this.varCount = 0;
     this.useQuads = quads ?? false;
@@ -126,14 +123,14 @@ class QueryTranslator {
     // Find ALL variables here to fill `variables` array - needed to create fresh variables
     this.findAllVariables(sparql);
 
-    if (this.astFactory.isQuery(sparql)) {
+    if (F.isQuery(sparql)) {
       this.registerContextDefinitions(sparql.context);
       // Group and where are identical, having only 1 makes parsing easier, can be undefined in DESCRIBE
-      const group: PatternGroup = sparql.where ?? this.astFactory.patternGroup([], this.astFactory.sourceLocation());
+      const group: PatternGroup = sparql.where ?? F.patternGroup([], F.gen());
       result = this.translateGraphPattern(group);
       // 18.2.4 Converting Groups, Aggregates, HAVING, final VALUES clause and SELECT Expressions
       result = this.translateAggregates(sparql, result);
-    } else if (sparql.type === 'update') {
+    } else if (F.isUpdate(sparql)) {
       result = this.translateUpdate(sparql);
     }
     if (blankToVariable) {

packages/algebra-transformer-1-1/lib/util.ts

@@ -1,6 +1,5 @@
 import type * as RDF from '@rdfjs/types';
 import { someTermsNested } from 'rdf-terms';
-import type { Wildcard } from 'sparqljs';
 import type * as A from './algebra';
 import { expressionTypes, Types } from './algebra';
 import Factory from './factory';
@@ -681,10 +680,6 @@ expr.separator,
   public static hasQuadVariables(quad: RDF.Quad): boolean {
     return someTermsNested(quad, term => term.termType === 'Variable');
   }
-
-  public static isWildcard(term: any): term is Wildcard {
-    return term.termType === 'Wildcard';
-  }
 }
 
 /**

packages/algebra-transformer-1-1/package.json

@@ -29,14 +29,14 @@
     "@traqula/core": "^0.0.0",
     "@traqula/rules-sparql-1-1": "^0.0.0",
     "fast-deep-equal": "^3.1.3",
-    "minimist": "^1.2.6",
     "rdf-data-factory": "^2.0.1",
     "rdf-isomorphic": "^2.0.0",
     "rdf-string": "^2.0.0",
-    "rdf-terms": "^2.0.0",
-    "sparqljs": "^3.7.1"
+    "rdf-terms": "^2.0.0"
   },
   "devDependencies": {
+    "@rdfjs/types": "^2.0.1",
+    "@traqula/generator-sparql-1-1": "^0.0.0",
     "@traqula/parser-sparql-1-1": "^0.0.0"
   }
 }

yarn.lock

@@ -7165,7 +7165,7 @@ source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-sparqljs@^3.7.1, sparqljs@^3.7.3:
+sparqljs@^3.7.3:
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/sparqljs/-/sparqljs-3.7.3.tgz#075821d51ef4954284e36569503fe5558cfb71b0"
   integrity sha512-FQfHUhfwn5PD9WH6xPU7DhFfXMgqK/XoDrYDVxz/grhw66Il0OjRg3JBgwuEvwHnQt7oSTiKWEiCZCPNaUbqgg==