Skip to content

Commit

Permalink
fix(deps): update dependency sparqlalgebrajs to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored and joachimvh committed Nov 5, 2021
1 parent 9f0973b commit 2e99cc9
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 32 deletions.
81 changes: 58 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"rdf-serialize": "^1.1.0",
"redis": "^3.1.2",
"redlock": "^4.2.0",
"sparqlalgebrajs": "^3.0.0",
"sparqlalgebrajs": "^4.0.1",
"sparqljs": "^3.4.2",
"url-join": "^4.0.1",
"uuid": "^8.3.2",
Expand Down
12 changes: 6 additions & 6 deletions src/authorization/permissions/SparqlPatchModesExtractor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,25 @@ export class SparqlPatchModesExtractor extends ModesExtractor {
return Boolean((data as SparqlUpdatePatch).algebra);
}

private isSupported(op: Algebra.Operation): boolean {
private isSupported(op: Algebra.Update): boolean {
if (this.isDeleteInsert(op) || this.isNop(op)) {
return true;
}
if (op.type === Algebra.types.COMPOSITE_UPDATE) {
return (op as Algebra.CompositeUpdate).updates.every((update): boolean => this.isSupported(update));
return op.updates.every((update): boolean => this.isSupported(update));
}
return false;
}

private isDeleteInsert(op: Algebra.Operation): op is Algebra.DeleteInsert {
private isDeleteInsert(op: Algebra.Update): op is Algebra.DeleteInsert {
return op.type === Algebra.types.DELETE_INSERT;
}

private isNop(op: Algebra.Operation): op is Algebra.Nop {
private isNop(op: Algebra.Update): op is Algebra.Nop {
return op.type === Algebra.types.NOP;
}

private needsAppend(update: Algebra.Operation): boolean {
private needsAppend(update: Algebra.Update): boolean {
if (this.isNop(update)) {
return false;
}
Expand All @@ -69,7 +69,7 @@ export class SparqlPatchModesExtractor extends ModesExtractor {
return (update as Algebra.CompositeUpdate).updates.some((op): boolean => this.needsAppend(op));
}

private needsWrite(update: Algebra.Operation): boolean {
private needsWrite(update: Algebra.Update): boolean {
if (this.isNop(update)) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/http/input/body/SparqlUpdateBodyParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class SparqlUpdateBodyParser extends BodyParser {
const sparql = await readableToString(request);
let algebra: Algebra.Operation;
try {
algebra = translate(sparql, { quads: true, baseIRI: metadata.identifier.value });
algebra = translate(sparql, { quads: true, baseIRI: metadata.identifier.value }) as Algebra.Update;
} catch (error: unknown) {
this.logger.warn('Could not translate SPARQL query to SPARQL algebra', { error });
throw new BadRequestHttpError(createErrorMessage(error), { cause: error });
Expand Down
3 changes: 2 additions & 1 deletion test/unit/storage/patch/SparqlUpdatePatcher.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'jest-rdf';
import { namedNode, quad } from '@rdfjs/data-model';
import arrayifyStream from 'arrayify-stream';
import type { Quad } from 'rdf-js';
import type { Algebra } from 'sparqlalgebrajs';
import { translate } from 'sparqlalgebrajs';
import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation';
import type { Representation } from '../../../../src/http/representation/Representation';
Expand All @@ -15,7 +16,7 @@ import { guardedStreamFrom } from '../../../../src/util/StreamUtil';
function getPatch(query: string): SparqlUpdatePatch {
const prefixedQuery = `prefix : <http://test.com/>\n${query}`;
return {
algebra: translate(prefixedQuery, { quads: true }),
algebra: translate(prefixedQuery, { quads: true }) as Algebra.Update,
data: guardedStreamFrom(prefixedQuery),
metadata: new RepresentationMetadata(),
binary: true,
Expand Down

0 comments on commit 2e99cc9

Please sign in to comment.