@noeldemartin/solid-utils 0.1.1-next.f279ff39536b39493ea8febae8d8052a9a3b1365 → 0.2.0

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@noeldemartin/solid-utils",
-  "version": "0.1.1-next.f279ff39536b39493ea8febae8d8052a9a3b1365",
+  "version": "0.2.0",
   "description": "My JavaScript utilities for Solid",
   "main": "dist/noeldemartin-solid-utils.cjs.js",
   "module": "dist/noeldemartin-solid-utils.esm.js",
+  "browser": "dist/noeldemartin-solid-utils.umd.js",
   "types": "dist/noeldemartin-solid-utils.d.ts",
   "scripts": {
     "build": "rm dist -rf && npm run build:js && npm run build:types",
@@ -29,13 +30,12 @@
   "homepage": "https://github.com/noeldemartin/solid-utils",
   "dependencies": {
     "@babel/runtime": "^7.14.0",
-    "@noeldemartin/utils": "0.2.1-next.23f6799530aeebef7d8efca4078fdcd960f8e441",
+    "@noeldemartin/solid-utils-external": "^0.1.0",
+    "@noeldemartin/utils": "^0.3.0",
     "@types/rdf-js": "^4.0.1",
     "core-js": "^3.12.1",
     "jest-diff": "^26.6.2",
-    "jsonld": "^5.2.0",
-    "md5": "^2.3.0",
-    "n3": "^1.10.0"
+    "md5": "^2.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.14.3",
@@ -44,8 +44,8 @@
     "@babel/preset-env": "^7.14.2",
     "@babel/preset-typescript": "^7.13.0",
     "@microsoft/api-extractor": "^7.15.2",
-    "@noeldemartin/eslint-config-typescript": "^0.1.0-next.e83e5d37837b9845675534ab9d3745820b1326b4",
-    "@noeldemartin/scripts": "^0.1.1-next.40031a27875d800f17a8b8e7899e8304a16256c3",
+    "@noeldemartin/eslint-config-typescript": "^0.1.1",
+    "@noeldemartin/scripts": "^0.1.2",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^19.0.0",
@@ -54,9 +54,7 @@
     "@types/chai": "^4.2.18",
     "@types/jest": "^26.0.23",
     "@types/jest-diff": "^24.3.0",
-    "@types/jsonld": "^1.5.6",
     "@types/md5": "^2.3.0",
-    "@types/n3": "^1.8.0",
     "babel-plugin-transform-remove-imports": "^1.5.4",
     "eslint": "^7.26.0",
     "jest": "^26.6.3",

package/src/errors/MalformedSolidDocumentError.ts

@@ -1,4 +1,4 @@
-import { Error } from '@noeldemartin/utils';
+import { JSError } from '@noeldemartin/utils';
 
 function errorMessage(
     documentUrl: string | null,
@@ -14,7 +14,7 @@ export enum SolidDocumentFormat {
     Turtle = 'Turtle',
 }
 
-export default class MalformedSolidDocumentError extends Error {
+export default class MalformedSolidDocumentError extends JSError {
 
     public readonly documentUrl: string | null;
     public readonly documentFormat: SolidDocumentFormat;

package/src/errors/NetworkRequestError.ts

@@ -1,11 +1,11 @@
-import { Error } from '@noeldemartin/utils';
-import type { ErrorOptions } from '@noeldemartin/utils';
+import { JSError } from '@noeldemartin/utils';
+import type { JSErrorOptions } from '@noeldemartin/utils';
 
-export default class NetworkRequestError extends Error {
+export default class NetworkRequestError extends JSError {
 
     public readonly url: string;
 
-    constructor(url: string, options?: ErrorOptions) {
+    constructor(url: string, options?: JSErrorOptions) {
         super(`Request failed trying to fetch ${url}`, options);
 
         this.url = url;

package/src/errors/NotFoundError.ts

@@ -1,6 +1,6 @@
-import { Error } from '@noeldemartin/utils';
+import { JSError } from '@noeldemartin/utils';
 
-export default class NotFoundError extends Error {
+export default class NotFoundError extends JSError {
 
     public readonly url: string;
 

package/src/errors/UnauthorizedError.ts

@@ -1,4 +1,4 @@
-import { Error } from '@noeldemartin/utils';
+import { JSError } from '@noeldemartin/utils';
 
 function errorMessage(url: string, responseStatus?: number): string {
     const typeInfo = responseStatus === 403 ? ' (Forbidden)' : '';
@@ -6,7 +6,7 @@ function errorMessage(url: string, responseStatus?: number): string {
     return `Unauthorized${typeInfo}: ${url}`;
 }
 
-export default class UnauthorizedError extends Error {
+export default class UnauthorizedError extends JSError {
 
     public readonly url: string;
     public readonly responseStatus?: number;

package/src/errors/UnsuccessfulNetworkRequestError.ts

@@ -0,0 +1,23 @@
+import { JSError } from '@noeldemartin/utils';
+
+function getErrorMessage(messageOrResponse: string | Response, response?: Response): string {
+    response = response ?? messageOrResponse as Response;
+
+    return typeof messageOrResponse === 'string'
+        ? `${messageOrResponse} (returned ${response.status} status code)`
+        : `Request to ${response.url} returned ${response.status} status code`;
+}
+
+export default class UnsuccessfulRequestError extends JSError {
+
+    public response: Response;
+
+    constructor(response: Response);
+    constructor(message: string, response: Response);
+    constructor(messageOrResponse: string | Response, response?: Response) {
+        super(getErrorMessage(messageOrResponse, response));
+
+        this.response = response ?? messageOrResponse as Response;
+    }
+
+}

package/src/errors/UnsupportedAuthorizationProtocolError.ts

@@ -0,0 +1,16 @@
+import { JSError } from '@noeldemartin/utils';
+import type { JSErrorOptions } from '@noeldemartin/utils';
+
+export default class UnsupportedAuthorizationProtocolError extends JSError {
+
+    public readonly url: string;
+    public readonly protocol: string;
+
+    constructor(url: string, protocol: string, options?: JSErrorOptions) {
+        super(`The resource at ${url} is using an unsupported authorization protocol (${protocol})`, options);
+
+        this.url = url;
+        this.protocol = protocol;
+    }
+
+}

package/src/errors/index.ts

@@ -2,3 +2,5 @@ export { default as MalformedSolidDocumentError, SolidDocumentFormat } from './M
 export { default as NetworkRequestError } from './NetworkRequestError';
 export { default as NotFoundError } from './NotFoundError';
 export { default as UnauthorizedError } from './UnauthorizedError';
+export { default as UnsuccessfulNetworkRequestError } from './UnsuccessfulNetworkRequestError';
+export { default as UnsupportedAuthorizationProtocolError } from './UnsupportedAuthorizationProtocolError';

package/src/helpers/auth.ts

@@ -1,4 +1,8 @@
-import { objectWithoutEmpty, silenced, urlParentDirectory, urlRoot, urlRoute } from '@noeldemartin/utils';
+import { arrayUnique, objectWithoutEmpty, silenced, urlParentDirectory, urlRoot, urlRoute } from '@noeldemartin/utils';
+
+import SolidStore from '../models/SolidStore';
+import UnauthorizedError from '../errors/UnauthorizedError';
+import type SolidDocument from '../models/SolidDocument';
 
 import { fetchSolidDocument } from './io';
 import type { Fetch } from './io';
@@ -6,6 +10,8 @@ import type { Fetch } from './io';
 export interface SolidUserProfile {
     webId: string;
     storageUrls: string[];
+    cloaked: boolean;
+    writableProfileUrl: string | null;
     name?: string;
     avatarUrl?: string;
     oidcIssuerUrl?: string;
@@ -13,16 +19,79 @@ export interface SolidUserProfile {
     privateTypeIndexUrl?: string;
 }
 
+async function fetchExtendedUserProfile(webIdDocument: SolidDocument, fetch?: Fetch): Promise<{
+    store: SolidStore;
+    cloaked: boolean;
+    writableProfileUrl: string | null;
+}> {
+    const store = new SolidStore(webIdDocument.getQuads());
+    const documents: Record<string, SolidDocument | false | null> = { [webIdDocument.url]: webIdDocument };
+    const addReferencedDocumentUrls = (document: SolidDocument) => {
+        document
+            .statements(undefined, 'foaf:isPrimaryTopicOf')
+            .map(quad => quad.object.value)
+            .forEach(profileDocumentUrl => documents[profileDocumentUrl] = documents[profileDocumentUrl] ?? null);
+        document
+            .statements(undefined, 'foaf:primaryTopic')
+            .map(quad => quad.subject.value)
+            .forEach(profileDocumentUrl => documents[profileDocumentUrl] = documents[profileDocumentUrl] ?? null);
+    };
+    const loadProfileDocuments = async (): Promise<void> => {
+        for (const [url, document] of Object.entries(documents)) {
+            if (document !== null) {
+                continue;
+            }
+
+            try {
+                const document = await fetchSolidDocument(url, fetch);
+
+                documents[url] = document;
+                store.addQuads(document.getQuads());
+
+                addReferencedDocumentUrls(document);
+            } catch (error) {
+                if (error instanceof UnauthorizedError) {
+                    documents[url] = false;
+
+                    continue;
+                }
+
+                throw error;
+            }
+        }
+    };
+
+    addReferencedDocumentUrls(webIdDocument);
+
+    do {
+        await loadProfileDocuments();
+    } while (Object.values(documents).some(document => document === null));
+
+    return {
+        store,
+        cloaked: Object.values(documents).some(document => document === false),
+        writableProfileUrl:
+            webIdDocument.isUserWritable()
+                ? webIdDocument.url
+                : Object
+                    .values(documents)
+                    .find((document): document is SolidDocument => !!document && document.isUserWritable())
+                    ?.url ?? null,
+    };
+}
+
 async function fetchUserProfile(webId: string, fetch?: Fetch): Promise<SolidUserProfile> {
     const documentUrl = urlRoute(webId);
     const document = await fetchSolidDocument(documentUrl, fetch);
 
-    if (!document.isPersonalProfile() && !document.contains(webId, 'solid:oidcIssuer'))
+    if (!document.isPersonalProfile() && !document.contains(webId, 'solid:oidcIssuer')) {
         throw new Error(`${webId} is not a valid webId.`);
+    }
 
-    const storageUrls = document.statements(webId, 'pim:storage').map(storage => storage.object.value);
-    const publicTypeIndex = document.statement(webId, 'solid:publicTypeIndex');
-    const privateTypeIndex = document.statement(webId, 'solid:privateTypeIndex');
+    const { store, writableProfileUrl, cloaked } = await fetchExtendedUserProfile(document, fetch);
+    const storageUrls = store.statements(webId, 'pim:storage').map(storage => storage.object.value);
+    const publicTypeIndex = store.statement(webId, 'solid:publicTypeIndex');
+    const privateTypeIndex = store.statement(webId, 'solid:privateTypeIndex');
 
     let parentUrl = urlParentDirectory(documentUrl);
     while (parentUrl && storageUrls.length === 0) {
@@ -37,19 +106,23 @@ async function fetchUserProfile(webId: string, fetch?: Fetch): Promise<SolidUser
         parentUrl = urlParentDirectory(parentUrl);
     }
 
-    return objectWithoutEmpty({
+    return {
         webId,
-        storageUrls,
-        name:
-            document.statement(webId, 'vcard:fn')?.object.value ??
-            document.statement(webId, 'foaf:name')?.object.value,
-        avatarUrl:
-            document.statement(webId, 'vcard:hasPhoto')?.object.value ??
-            document.statement(webId, 'foaf:img')?.object.value,
-        oidcIssuerUrl: document.statement(webId, 'solid:oidcIssuer')?.object.value,
-        publicTypeIndexUrl: publicTypeIndex?.object.value,
-        privateTypeIndexUrl: privateTypeIndex?.object.value,
-    });
+        cloaked,
+        writableProfileUrl,
+        storageUrls: arrayUnique(storageUrls),
+        ...objectWithoutEmpty({
+            name:
+                store.statement(webId, 'vcard:fn')?.object.value ??
+                store.statement(webId, 'foaf:name')?.object.value,
+            avatarUrl:
+                store.statement(webId, 'vcard:hasPhoto')?.object.value ??
+                store.statement(webId, 'foaf:img')?.object.value,
+            oidcIssuerUrl: store.statement(webId, 'solid:oidcIssuer')?.object.value,
+            publicTypeIndexUrl: publicTypeIndex?.object.value,
+            privateTypeIndexUrl: privateTypeIndex?.object.value,
+        }),
+    };
 }
 
 export async function fetchLoginUserProfile(loginUrl: string, fetch?: Fetch): Promise<SolidUserProfile | null> {

package/src/helpers/interop.ts

@@ -1,59 +1,95 @@
 import { uuid } from '@noeldemartin/utils';
 
 import { createSolidDocument, fetchSolidDocument, solidDocumentExists, updateSolidDocument } from '@/helpers/io';
-import type SolidThing from '@/models/SolidThing';
 import type { Fetch } from '@/helpers/io';
 import type { SolidUserProfile } from '@/helpers/auth';
 
-async function mintPrivateTypeIndexUrl(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
+type TypeIndexType = 'public' | 'private';
+
+async function mintTypeIndexUrl(user: SolidUserProfile, type: TypeIndexType, fetch?: Fetch): Promise<string> {
     fetch = fetch ?? window.fetch.bind(fetch);
 
     const storageUrl = user.storageUrls[0];
-    const typeIndexUrl = `${storageUrl}settings/privateTypeIndex`;
+    const typeIndexUrl = `${storageUrl}settings/${type}TypeIndex`;
 
     return await solidDocumentExists(typeIndexUrl, fetch)
-        ? `${storageUrl}settings/privateTypeIndex-${uuid()}`
+        ? `${storageUrl}settings/${type}TypeIndex-${uuid()}`
         : typeIndexUrl;
 }
 
-export async function createPrivateTypeIndex(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
+async function createTypeIndex(user: SolidUserProfile, type: TypeIndexType, fetch?: Fetch) {
+    if (user.writableProfileUrl === null) {
+        throw new Error('Can\'t create type index without a writable profile document');
+    }
+
     fetch = fetch ?? window.fetch.bind(fetch);
 
-    const typeIndexUrl = await mintPrivateTypeIndexUrl(user, fetch);
-    const typeIndexBody = `
-        <> a
-            <http://www.w3.org/ns/solid/terms#TypeIndex>,
-            <http://www.w3.org/ns/solid/terms#UnlistedDocument> .
-    `;
+    const typeIndexUrl = await mintTypeIndexUrl(user, type, fetch);
+    const typeIndexBody = type === 'public'
+        ? '<> a <http://www.w3.org/ns/solid/terms#TypeIndex> .'
+        : `
+            <> a
+                <http://www.w3.org/ns/solid/terms#TypeIndex>,
+                <http://www.w3.org/ns/solid/terms#UnlistedDocument> .
+        `;
     const profileUpdateBody = `
         INSERT DATA {
-            <${user.webId}> <http://www.w3.org/ns/solid/terms#privateTypeIndex> <${typeIndexUrl}> .
+            <${user.webId}> <http://www.w3.org/ns/solid/terms#${type}TypeIndex> <${typeIndexUrl}> .
         }
     `;
 
     await Promise.all([
         createSolidDocument(typeIndexUrl, typeIndexBody, fetch),
-        updateSolidDocument(user.webId, profileUpdateBody, fetch),
+        updateSolidDocument(user.writableProfileUrl, profileUpdateBody, fetch),
     ]);
 
+    if (type === 'public') {
+        // TODO Implement updating ACLs for the listing itself to public
+    }
+
     return typeIndexUrl;
 }
 
-export async function findContainerRegistration(
+async function findRegistrations(
     typeIndexUrl: string,
-    childrenType: string,
+    type: string | string[],
+    predicate: string,
     fetch?: Fetch,
-): Promise<SolidThing | null> {
+): Promise<string[]> {
     const typeIndex = await fetchSolidDocument(typeIndexUrl, fetch);
-    const containerQuad = typeIndex
-        .statements(undefined, 'rdfs:type', 'solid:TypeRegistration')
-        .find(
-            statement =>
-                typeIndex.contains(statement.subject.value, 'solid:forClass', childrenType) &&
-                typeIndex.contains(statement.subject.value, 'solid:instanceContainer'),
-        );
-
-    return containerQuad
-        ? typeIndex.getThing(containerQuad.subject.value) ?? null
-        : null;
+    const types = Array.isArray(type) ? type : [type];
+
+    return types.map(
+        type => typeIndex
+            .statements(undefined, 'rdf:type', 'solid:TypeRegistration')
+            .filter(statement => typeIndex.contains(statement.subject.value, 'solid:forClass', type))
+            .map(statement => typeIndex.statements(statement.subject.value, predicate))
+            .flat()
+            .map(statement => statement.object.value)
+            .filter(url => !!url),
+    ).flat();
+}
+
+export async function createPublicTypeIndex(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
+    return createTypeIndex(user, 'public', fetch);
+}
+
+export async function createPrivateTypeIndex(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
+    return createTypeIndex(user, 'private', fetch);
+}
+
+export async function findContainerRegistrations(
+    typeIndexUrl: string,
+    type: string | string[],
+    fetch?: Fetch,
+): Promise<string[]> {
+    return findRegistrations(typeIndexUrl, type, 'solid:instanceContainer', fetch);
+}
+
+export async function findInstanceRegistrations(
+    typeIndexUrl: string,
+    type: string | string[],
+    fetch?: Fetch,
+): Promise<string[]> {
+    return findRegistrations(typeIndexUrl, type, 'solid:instance', fetch);
 }

package/src/helpers/io.ts

@@ -1,10 +1,15 @@
 import md5 from 'md5';
+import {
+    TurtleParser,
+    TurtleWriter,
+    createBlankNode,
+    createQuad,
+    jsonLDFromRDF,
+    jsonLDToRDF,
+} from '@noeldemartin/solid-utils-external';
 import { arr, arrayFilter, arrayReplace, objectWithoutEmpty, stringMatchAll, tap } from '@noeldemartin/utils';
-import { BlankNode as N3BlankNode, Quad as N3Quad, Parser as TurtleParser, Writer as TurtleWriter } from 'n3';
-import { fromRDF, toRDF } from 'jsonld';
-import type { JsonLdDocument } from 'jsonld';
 import type { Quad } from 'rdf-js';
-import type { Term as N3Term } from 'n3';
+import type { JsonLdDocument, Term } from '@noeldemartin/solid-utils-external';
 
 import SolidDocument from '@/models/SolidDocument';
 
@@ -84,25 +89,25 @@ function normalizeBlankNodes(quads: Quad[]): Quad[] {
 
         for (const index of quadIndexes) {
             const quad = normalizedQuads[index] as Quad;
-            const terms: Record<string, N3Term> = {
-                subject: quad.subject as N3Term,
-                object: quad.object as N3Term,
+            const terms: Record<string, Term> = {
+                subject: quad.subject as Term,
+                object: quad.object as Term,
             };
 
             for (const [termName, termValue] of Object.entries(terms)) {
                 if (termValue.termType !== 'BlankNode' || termValue.value !== originalId)
                     continue;
 
-                terms[termName] = new N3BlankNode(normalizedId);
+                terms[termName] = createBlankNode(normalizedId) as Term;
             }
 
             arrayReplace(
                 normalizedQuads,
                 quad,
-                new N3Quad(
-                    terms.subject as N3Term,
-                    quad.predicate as N3Term,
-                    terms.object as N3Term,
+                createQuad(
+                    terms.subject as Term,
+                    quad.predicate as Term,
+                    terms.object as Term,
                 ),
             );
         }
@@ -112,10 +117,15 @@ function normalizeBlankNodes(quads: Quad[]): Quad[] {
 }
 
 export interface ParsingOptions {
-    documentUrl: string;
+    baseIRI: string;
     normalizeBlankNodes: boolean;
 }
 
+export interface RDFGraphData {
+    quads: Quad[];
+    containsRelativeIRIs: boolean;
+}
+
 export async function createSolidDocument(url: string, body: string, fetch?: Fetch): Promise<SolidDocument> {
     fetch = fetch ?? window.fetch.bind(window);
 
@@ -132,7 +142,7 @@ export async function createSolidDocument(url: string, body: string, fetch?: Fet
 
 export async function fetchSolidDocument(url: string, fetch?: Fetch): Promise<SolidDocument> {
     const { body: data, headers } = await fetchRawSolidDocument(url, fetch ?? window.fetch);
-    const statements = await turtleToQuads(data, { documentUrl: url });
+    const statements = await turtleToQuads(data, { baseIRI: url });
 
     return new SolidDocument(url, statements, headers);
 }
@@ -150,14 +160,14 @@ export async function fetchSolidDocumentIfFound(url: string, fetch?: Fetch): Pro
     }
 }
 
-export async function jsonldToQuads(jsonld: JsonLD): Promise<Quad[]> {
+export async function jsonldToQuads(jsonld: JsonLD, baseIRI?: string): Promise<Quad[]> {
     if (isJsonLDGraph(jsonld)) {
-        const graphQuads = await Promise.all(jsonld['@graph'].map(jsonldToQuads));
+        const graphQuads = await Promise.all(jsonld['@graph'].map(resource => jsonldToQuads(resource, baseIRI)));
 
         return graphQuads.flat();
     }
 
-    return toRDF(jsonld as JsonLdDocument) as Promise<Quad[]>;
+    return jsonLDToRDF(jsonld as JsonLdDocument, { base: baseIRI }) as Promise<Quad[]>;
 }
 
 export function normalizeSparql(sparql: string): string {
@@ -173,8 +183,54 @@ export function normalizeSparql(sparql: string): string {
         .join(' ;\n');
 }
 
+export function parseTurtle(turtle: string, options: Partial<ParsingOptions> = {}): Promise<RDFGraphData> {
+    const parserOptions = objectWithoutEmpty({ baseIRI: options.baseIRI });
+    const parser = new TurtleParser(parserOptions);
+    const data: RDFGraphData = {
+        quads: [],
+        containsRelativeIRIs: false,
+    };
+
+    return new Promise((resolve, reject) => {
+        const resolveRelativeIRI = parser._resolveRelativeIRI;
+
+        parser._resolveRelativeIRI = (...args) => {
+            data.containsRelativeIRIs = true;
+            parser._resolveRelativeIRI = resolveRelativeIRI;
+
+            return parser._resolveRelativeIRI(...args);
+        };
+
+        parser.parse(turtle, (error, quad) => {
+            if (error) {
+                reject(
+                    new MalformedSolidDocumentError(
+                        options.baseIRI ?? null,
+                        SolidDocumentFormat.Turtle,
+                        error.message,
+                    ),
+                );
+
+                return;
+            }
+
+            if (!quad) {
+                // data.quads = options.normalizeBlankNodes
+                //     ? normalizeBlankNodes(data.quads)
+                //     : data.quads;
+
+                resolve(data);
+
+                return;
+            }
+
+            data.quads.push(quad);
+        });
+    });
+}
+
 export async function quadsToJsonLD(quads: Quad[]): Promise<JsonLDGraph> {
-    const graph = await fromRDF(quads);
+    const graph = await jsonLDFromRDF(quads);
 
     return {
         '@graph': graph as JsonLDResource[],
@@ -235,38 +291,13 @@ export function sparqlToQuadsSync(sparql: string, options: Partial<ParsingOption
 }
 
 export async function turtleToQuads(turtle: string, options: Partial<ParsingOptions> = {}): Promise<Quad[]> {
-    const parserOptions = objectWithoutEmpty({ baseIRI: options.documentUrl });
-    const parser = new TurtleParser(parserOptions);
-    const quads: Quad[] = [];
-
-    return new Promise((resolve, reject) => {
-        parser.parse(turtle, (error, quad) => {
-            if (error) {
-                reject(
-                    new MalformedSolidDocumentError(
-                        options.documentUrl ?? null,
-                        SolidDocumentFormat.Turtle,
-                        error.message,
-                    ),
-                );
-                return;
-            }
-
-            if (!quad) {
-                options.normalizeBlankNodes
-                    ? resolve(normalizeBlankNodes(quads))
-                    : resolve(quads);
+    const { quads } = await parseTurtle(turtle, options);
 
-                return;
-            }
-
-            quads.push(quad);
-        });
-    });
+    return quads;
 }
 
 export function turtleToQuadsSync(turtle: string, options: Partial<ParsingOptions> = {}): Quad[] {
-    const parserOptions = objectWithoutEmpty({ baseIRI: options.documentUrl });
+    const parserOptions = objectWithoutEmpty({ baseIRI: options.baseIRI });
     const parser = new TurtleParser(parserOptions);
 
     try {
@@ -277,7 +308,7 @@ export function turtleToQuadsSync(turtle: string, options: Partial<ParsingOption
             : quads;
     } catch (error) {
         throw new MalformedSolidDocumentError(
-            options.documentUrl ?? null,
+            options.baseIRI ?? null,
             SolidDocumentFormat.Turtle,
             (error as Error).message ?? '',
         );

package/src/helpers/jsonld.ts

@@ -1,3 +1,6 @@
+import { compactJsonLD } from '@noeldemartin/solid-utils-external';
+import type { JsonLdDocument } from '@noeldemartin/solid-utils-external';
+
 export type JsonLD = Partial<{
     '@context': Record<string, unknown>;
     '@id': string;
@@ -5,7 +8,24 @@ export type JsonLD = Partial<{
 }> & { [k: string]: unknown };
 
 export type JsonLDResource = Omit<JsonLD, '@id'> & { '@id': string };
-export type JsonLDGraph = { '@graph': JsonLDResource[] };
+export type JsonLDGraph = {
+    '@context'?: Record<string, unknown>;
+    '@graph': JsonLDResource[];
+};
+
+export async function compactJsonLDGraph(jsonld: JsonLDGraph): Promise<JsonLDGraph> {
+    const compactedJsonLD = await compactJsonLD(jsonld as JsonLdDocument, {});
+
+    if ('@graph' in compactedJsonLD) {
+        return compactedJsonLD as JsonLDGraph;
+    }
+
+    if ('@id' in compactedJsonLD) {
+        return { '@graph': [compactedJsonLD] } as JsonLDGraph;
+    }
+
+    return { '@graph': [] };
+}
 
 export function isJsonLDGraph(jsonld: JsonLD): jsonld is JsonLDGraph {
     return '@graph' in jsonld;

package/src/helpers/testing.ts

@@ -1,4 +1,4 @@
-import { Error, arrayRemove, pull, stringMatchAll } from '@noeldemartin/utils';
+import { JSError, arrayRemove, pull, stringMatchAll } from '@noeldemartin/utils';
 import type { JsonLD } from '@/helpers/jsonld';
 import type { Quad, Quad_Object } from 'rdf-js';
 
@@ -9,7 +9,7 @@ const builtInPatterns: Record<string, string> = {
     '%uuid%': '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',
 };
 
-class ExpectedQuadAssertionError extends Error {
+class ExpectedQuadAssertionError extends JSError {
 
     constructor(public readonly expectedQuad: Quad) {
         super(`Couldn't find the following triple: ${quadToTurtle(expectedQuad)}`);