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

refactor: Make createNamespace return regular objects.

Browse Source
This commit is contained in:
Ruben Verborgh 2021-01-06 11:54:12 +01:00
parent 87752ddf20
commit 8343dad7f1
3 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/Vocabularies.ts
View File

@ -2,11 +2,10 @@
import { namedNode } from '@rdfjs/data-model'; import { namedNode } from '@rdfjs/data-model';
import type { NamedNode } from 'rdf-js'; import type { NamedNode } from 'rdf-js';
type PrefixResolver<T> = (localName?: string) => T;
type RecordOf<TKey extends any[], TValue> = Record<TKey[number], TValue>; type RecordOf<TKey extends any[], TValue> = Record<TKey[number], TValue>;
export type Namespace<TKey extends any[], TValue> = export type Namespace<TKey extends any[], TValue> =
PrefixResolver<TValue> & RecordOf<TKey, TValue>; { namespace: TValue } & RecordOf<TKey, TValue>;
/** /**
* Creates a function that expands local names from the given base URI, * Creates a function that expands local names from the given base URI,
@ -17,20 +16,14 @@ export function createNamespace<TKey extends string, TValue>(
toValue: (expanded: string) => TValue, toValue: (expanded: string) => TValue,
...localNames: TKey[]): ...localNames: TKey[]):
Namespace<typeof localNames, TValue> { Namespace<typeof localNames, TValue> {
// Create a function that expands local names const expanded: Namespace<typeof localNames, TValue> = {} as any;
const expanded = {} as Record<string, TValue>; // Expose the main namespace
const namespace = ((localName = ''): TValue => { expanded.namespace = toValue(baseUri);
if (!(localName in expanded)) {
expanded[localName] = toValue(`${baseUri}${localName}`);
}
return expanded[localName];
}) as Namespace<typeof localNames, TValue>;
// Expose the listed local names as properties // Expose the listed local names as properties
for (const localName of localNames) { for (const localName of localNames) {
(namespace as RecordOf<typeof localNames, TValue>)[localName] = namespace(localName); (expanded as RecordOf<TKey[], TValue>)[localName] = toValue(`${baseUri}${localName}`);
} }
return namespace; return expanded;
} }
/** /**

2
test/unit/storage/conversion/QuadToRdfConverter.test.ts
View File

@ -76,7 +76,7 @@ describe('A QuadToRdfConverter', (): void => {
}); });
it('converts quads with prefixes to turtle.', async(): Promise<void> => { it('converts quads with prefixes to turtle.', async(): Promise<void> => {
metadata.addQuad(DC.terms(), PREFERRED_PREFIX_TERM, 'dc'); metadata.addQuad(DC.terms.namespace, PREFERRED_PREFIX_TERM, 'dc');
metadata.addQuad('http://test.com/', PREFERRED_PREFIX_TERM, 'test'); metadata.addQuad('http://test.com/', PREFERRED_PREFIX_TERM, 'test');
const representation = { const representation = {
data: streamifyArray([ triple( data: streamifyArray([ triple(

20
test/unit/util/Vocabularies.test.ts
View File

@ -3,20 +3,12 @@ import { LDP } from '../../../src/util/Vocabularies';
describe('Vocabularies', (): void => { describe('Vocabularies', (): void => {
describe('LDP', (): void => { describe('LDP', (): void => {
it('can return its own URI.', (): void => { it('contains its own URI.', (): void => {
expect(LDP()).toBe('http://www.w3.org/ns/ldp#'); expect(LDP.namespace).toBe('http://www.w3.org/ns/ldp#');
}); });
it('can create new properties.', (): void => { it('contains its own URI as a term.', (): void => {
expect(LDP('new')).toBe('http://www.w3.org/ns/ldp#new'); expect(LDP.terms.namespace).toEqual(namedNode('http://www.w3.org/ns/ldp#'));
});
it('can create new properties as terms.', (): void => {
expect(LDP.terms('new')).toEqual(namedNode('http://www.w3.org/ns/ldp#new'));
});
it('caches new properties as terms.', (): void => {
expect(LDP.terms('new')).toBe(LDP.terms('new'));
}); });
it('exposes ldp:contains.', (): void => { it('exposes ldp:contains.', (): void => {
@ -26,9 +18,5 @@ describe('Vocabularies', (): void => {
it('exposes ldp:contains as a term.', (): void => { it('exposes ldp:contains as a term.', (): void => {
expect(LDP.terms.contains).toEqual(namedNode('http://www.w3.org/ns/ldp#contains')); expect(LDP.terms.contains).toEqual(namedNode('http://www.w3.org/ns/ldp#contains'));
}); });
it('caches ldp:contains as a term.', (): void => {
expect(LDP.terms.contains).toBe(LDP.terms.contains);
});
}); });
}); });