Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into versions/3.0.0

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/storage/patch/SparqlUpdatePatcher.ts
#	test/unit/init/AppRunner.test.ts
#	test/unit/util/QuadUtil.test.ts
This commit is contained in:
Joachim Van Herwegen
2022-02-11 15:30:45 +01:00
parent 693f441a1b d2870e5c8b
commit c5052625d1
28 changed files with 5464 additions and 6395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/auxiliary/LinkMetadataGenerator.ts
View File

@@ -1,4 +1,4 @@
import { namedNode } from '@rdfjs/data-model';
import { DataFactory } from 'n3';
import { SOLID_META } from '../../util/Vocabularies';
import type { RepresentationMetadata } from '../representation/RepresentationMetadata';
import type { AuxiliaryIdentifierStrategy } from './AuxiliaryIdentifierStrategy';
@@ -24,7 +24,7 @@ export class LinkMetadataGenerator extends MetadataGenerator {
const identifier = { path: metadata.identifier.value };
if (!this.identifierStrategy.isAuxiliaryIdentifier(identifier)) {
metadata.add(this.link,
namedNode(this.identifierStrategy.getAuxiliaryIdentifier(identifier).path),
DataFactory.namedNode(this.identifierStrategy.getAuxiliaryIdentifier(identifier).path),
SOLID_META.terms.ResponseMetadata);
}
}

2
src/storage/conversion/MarkdownToHtmlConverter.ts
View File

@@ -1,4 +1,4 @@
import marked from 'marked';
import { marked } from 'marked';
import { BasicRepresentation } from '../../http/representation/BasicRepresentation';
import type { Representation } from '../../http/representation/Representation';
import { TEXT_HTML, TEXT_MARKDOWN } from '../../util/ContentTypes';

5
src/storage/patch/SparqlUpdatePatcher.ts
View File

@@ -2,8 +2,7 @@ import type { Readable } from 'stream';
import type { ActorInitSparql } from '@comunica/actor-init-sparql';
import { newEngine } from '@comunica/actor-init-sparql';
import type { IQueryResultUpdate } from '@comunica/actor-init-sparql/lib/ActorInitSparql-browser';
import { defaultGraph } from '@rdfjs/data-model';
import { Store } from 'n3';
import { DataFactory, Store } from 'n3';
import { Algebra } from 'sparqlalgebrajs';
import { BasicRepresentation } from '../../http/representation/BasicRepresentation';
import type { Patch } from '../../http/representation/Patch';
@@ -89,7 +88,7 @@ export class SparqlUpdatePatcher extends RepresentationPatcher {
* This means: no GRAPH statements, no DELETE WHERE containing terms of type Variable.
*/
private validateDeleteInsert(op: Algebra.DeleteInsert): void {
const def = defaultGraph();
const def = DataFactory.defaultGraph();
const deletes = op.delete ?? [];
const inserts = op.insert ?? [];
if (!deletes.every((pattern): boolean => pattern.graph.equals(def))) {

4
src/util/Vocabularies.ts
View File

@@ -1,5 +1,5 @@
/* eslint-disable function-paren-newline */
import { namedNode } from '@rdfjs/data-model';
import { DataFactory } from 'n3';
import type { NamedNode } from 'rdf-js';
type RecordOf<TKey extends any[], TValue> = Record<TKey[number], TValue>;
@@ -41,7 +41,7 @@ Namespace<typeof localNames, string> {
*/
export function createTermNamespace<T extends string>(baseUri: string, ...localNames: T[]):
Namespace<typeof localNames, NamedNode> {
return createNamespace(baseUri, namedNode, ...localNames);
return createNamespace(baseUri, DataFactory.namedNode, ...localNames);
}
/**