@noeldemartin/solid-utils 0.1.0 → 0.1.1-next.2c9924cd927c0b708aef3ff4426982469f3b86fd

package/src/helpers/interop.ts

@@ -1,57 +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> {
-    fetch = fetch ?? window.fetch;
+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> {
-    fetch = fetch ?? window.fetch;
+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');
+    }
 
-    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> .
-    `;
+    fetch = fetch ?? window.fetch.bind(fetch);
+
+    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}> .
         }
     `;
 
-    createSolidDocument(typeIndexUrl, typeIndexBody, fetch);
-    updateSolidDocument(user.webId, profileUpdateBody, fetch);
+    await Promise.all([
+        createSolidDocument(typeIndexUrl, typeIndexBody, 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,6 +1,8 @@
-import { arr, arrayFilter, arrayReplace,objectWithoutEmpty } from '@noeldemartin/utils';
-import { BlankNode as N3BlankNode, Quad as N3Quad, Parser as TurtleParser, Writer as TurtleWriter } from 'n3';
 import md5 from 'md5';
+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';
 
@@ -10,9 +12,11 @@ import MalformedSolidDocumentError, { SolidDocumentFormat } from '@/errors/Malfo
 import NetworkRequestError from '@/errors/NetworkRequestError';
 import NotFoundError from '@/errors/NotFoundError';
 import UnauthorizedError from '@/errors/UnauthorizedError';
+import { isJsonLDGraph } from '@/helpers/jsonld';
+import type { JsonLD, JsonLDGraph, JsonLDResource } from '@/helpers/jsonld';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export declare type AnyFetch = (input: any, options?: any) => Promise<any>;
+export declare type AnyFetch = (input: any, options?: any) => Promise<Response>;
 export declare type TypedFetch = (input: RequestInfo, options?: RequestInit) => Promise<Response>;
 export declare type Fetch = TypedFetch | AnyFetch;
 
@@ -40,7 +44,10 @@ async function fetchRawSolidDocument(url: string, fetch: Fetch): Promise<{ body:
         if (error instanceof UnauthorizedError)
             throw error;
 
-        throw new NetworkRequestError(url);
+        if (error instanceof NotFoundError)
+            throw error;
+
+        throw new NetworkRequestError(url, { cause: error });
     }
 }
 
@@ -48,26 +55,23 @@ function normalizeBlankNodes(quads: Quad[]): Quad[] {
     const normalizedQuads = quads.slice(0);
     const quadsIndexes: Record<string, Set<number>> = {};
     const blankNodeIds = arr(quads)
-        .flatMap((quad, index) => {
-            const ids = arrayFilter([
-                quad.object.termType === 'BlankNode' ? quad.object.value : null,
-                quad.subject.termType === 'BlankNode' ? quad.subject.value : null,
-            ]);
-
-            for (const id of ids) {
-                quadsIndexes[id] = quadsIndexes[id] ?? new Set();
-                quadsIndexes[id].add(index);
-            }
-
-            return ids;
-        })
+        .flatMap(
+            (quad, index) => tap(
+                arrayFilter([
+                    quad.object.termType === 'BlankNode' ? quad.object.value : null,
+                    quad.subject.termType === 'BlankNode' ? quad.subject.value : null,
+                ]),
+                ids => ids.forEach(id => (quadsIndexes[id] ??= new Set()).add(index)),
+            ),
+        )
         .filter()
         .unique();
 
     for (const originalId of blankNodeIds) {
+        const quadIndexes = quadsIndexes[originalId] as Set<number>;
         const normalizedId = md5(
-            arr(quadsIndexes[originalId])
-                .map(index => quads[index])
+            arr(quadIndexes)
+                .map(index => quads[index] as Quad)
                 .filter(({ subject: { termType, value } }) => termType === 'BlankNode' && value === originalId)
                 .map(
                     ({ predicate, object }) => object.termType === 'BlankNode'
@@ -78,9 +82,12 @@ function normalizeBlankNodes(quads: Quad[]): Quad[] {
                 .join(),
         );
 
-        for (const index of quadsIndexes[originalId]) {
-            const quad = normalizedQuads[index];
-            const terms: Record<string, N3Term> = { subject: quad.subject as N3Term, object: quad.object as N3Term };
+        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,
+            };
 
             for (const [termName, termValue] of Object.entries(terms)) {
                 if (termValue.termType !== 'BlankNode' || termValue.value !== originalId)
@@ -89,7 +96,15 @@ function normalizeBlankNodes(quads: Quad[]): Quad[] {
                 terms[termName] = new N3BlankNode(normalizedId);
             }
 
-            arrayReplace(normalizedQuads, quad, new N3Quad(terms.subject, quad.predicate as N3Term, terms.object));
+            arrayReplace(
+                normalizedQuads,
+                quad,
+                new N3Quad(
+                    terms.subject as N3Term,
+                    quad.predicate as N3Term,
+                    terms.object as N3Term,
+                ),
+            );
         }
     }
 
@@ -102,7 +117,7 @@ export interface ParsingOptions {
 }
 
 export async function createSolidDocument(url: string, body: string, fetch?: Fetch): Promise<SolidDocument> {
-    fetch = fetch ?? window.fetch;
+    fetch = fetch ?? window.fetch.bind(window);
 
     const statements = await turtleToQuads(body);
 
@@ -122,6 +137,29 @@ export async function fetchSolidDocument(url: string, fetch?: Fetch): Promise<So
     return new SolidDocument(url, statements, headers);
 }
 
+export async function fetchSolidDocumentIfFound(url: string, fetch?: Fetch): Promise<SolidDocument | null> {
+    try {
+        const document = await fetchSolidDocument(url, fetch);
+
+        return document;
+    } catch (error) {
+        if (!(error instanceof NotFoundError))
+            throw error;
+
+        return null;
+    }
+}
+
+export async function jsonldToQuads(jsonld: JsonLD): Promise<Quad[]> {
+    if (isJsonLDGraph(jsonld)) {
+        const graphQuads = await Promise.all(jsonld['@graph'].map(jsonldToQuads));
+
+        return graphQuads.flat();
+    }
+
+    return toRDF(jsonld as JsonLdDocument) as Promise<Quad[]>;
+}
+
 export function normalizeSparql(sparql: string): string {
     const quads = sparqlToQuadsSync(sparql);
 
@@ -135,6 +173,20 @@ export function normalizeSparql(sparql: string): string {
         .join(' ;\n');
 }
 
+export async function quadsToJsonLD(quads: Quad[]): Promise<JsonLDGraph> {
+    const graph = await fromRDF(quads);
+
+    return {
+        '@graph': graph as JsonLDResource[],
+    };
+}
+
+export function quadsToTurtle(quads: Quad[]): string {
+    const writer = new TurtleWriter;
+
+    return writer.quadsToString(quads);
+}
+
 export function quadToTurtle(quad: Quad): string {
     const writer = new TurtleWriter;
 
@@ -155,7 +207,7 @@ export async function sparqlToQuads(
     sparql: string,
     options: Partial<ParsingOptions> = {},
 ): Promise<Record<string, Quad[]>> {
-    const operations = sparql.matchAll(/(\w+) DATA {([^}]+)}/g);
+    const operations = stringMatchAll<3>(sparql, /(\w+) DATA {([^}]+)}/g);
     const quads: Record<string, Quad[]> = {};
 
     await Promise.all([...operations].map(async operation => {
@@ -169,7 +221,7 @@ export async function sparqlToQuads(
 }
 
 export function sparqlToQuadsSync(sparql: string, options: Partial<ParsingOptions> = {}): Record<string, Quad[]> {
-    const operations = sparql.matchAll(/(\w+) DATA {([^}]+)}/g);
+    const operations = stringMatchAll<3>(sparql, /(\w+) DATA {([^}]+)}/g);
     const quads: Record<string, Quad[]> = {};
 
     for (const operation of operations) {
@@ -224,12 +276,16 @@ export function turtleToQuadsSync(turtle: string, options: Partial<ParsingOption
             ? normalizeBlankNodes(quads)
             : quads;
     } catch (error) {
-        throw new MalformedSolidDocumentError(options.documentUrl ?? null, SolidDocumentFormat.Turtle, error.message);
+        throw new MalformedSolidDocumentError(
+            options.documentUrl ?? null,
+            SolidDocumentFormat.Turtle,
+            (error as Error).message ?? '',
+        );
     }
 }
 
 export async function updateSolidDocument(url: string, body: string, fetch?: Fetch): Promise<void> {
-    fetch = fetch ?? window.fetch;
+    fetch = fetch ?? window.fetch.bind(window);
 
     await fetch(url, {
         method: 'PATCH',

package/src/helpers/jsonld.ts

@@ -6,3 +6,7 @@ export type JsonLD = Partial<{
 
 export type JsonLDResource = Omit<JsonLD, '@id'> & { '@id': string };
 export type JsonLDGraph = { '@graph': JsonLDResource[] };
+
+export function isJsonLDGraph(jsonld: JsonLD): jsonld is JsonLDGraph {
+    return '@graph' in jsonld;
+}

package/src/helpers/testing.ts

@@ -1,39 +1,67 @@
-import { pull } 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';
 
-import { quadToTurtle, sparqlToQuadsSync, turtleToQuadsSync } from './io';
+import { jsonldToQuads, quadToTurtle, quadsToTurtle, sparqlToQuadsSync, turtleToQuadsSync } from './io';
 
-const patternRegExps: Record<string, RegExp> = {};
+let patternsRegExpsIndex: Record<string, RegExp> = {};
+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 JSError {
+
+    constructor(public readonly expectedQuad: Quad) {
+        super(`Couldn't find the following triple: ${quadToTurtle(expectedQuad)}`);
+    }
 
-function containsPatterns(value: string): boolean {
-    return /\[\[([^\]]+)\]\]/.test(value);
 }
 
-function quadValueEquals(expected: string, actual: string): boolean {
-    if (!containsPatterns(expected))
-        return expected === actual;
+function assertExpectedQuadsExist(expectedQuads: Quad[], actualQuads: Quad[]): void {
+    for (const expectedQuad of expectedQuads) {
+        const matchingQuad = actualQuads.find(actualQuad => quadEquals(expectedQuad, actualQuad));
 
-    if (!(expected in patternRegExps)) {
-        const patternMatches = expected.matchAll(/\[\[([^\]]+)\]\]/g);
-        const patterns: string[] = [];
-        let expectedRegExp = expected;
+        if (!matchingQuad)
+            throw new ExpectedQuadAssertionError(expectedQuad);
 
-        for (const patternMatch of patternMatches) {
-            patterns.push(patternMatch[1]);
+        arrayRemove(actualQuads, matchingQuad);
+    }
+}
 
-            expectedRegExp = expectedRegExp.replace(patternMatch[0], `%PATTERN${patterns.length - 1}%`);
-        }
+function containsPatterns(value: string): boolean {
+    return /\[\[(.*\]\[)?([^\]]+)\]\]/.test(value);
+}
 
-        expectedRegExp = expectedRegExp.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+function createPatternRegexp(expected: string): RegExp {
+    const patternAliases = [];
+    const patternMatches = stringMatchAll<4, 1 | 2>(
+        expected,
+        /\[\[((.*?)\]\[)?([^\]]+)\]\]/g,
+    );
+    const patterns: string[] = [];
+    let expectedRegExp = expected;
 
-        for (const [patternIndex, pattern] of Object.entries(patterns)) {
-            expectedRegExp = expectedRegExp.replace(`%PATTERN${patternIndex}%`, pattern);
-        }
+    for (const patternMatch of patternMatches) {
+        patternMatch[2] && patternAliases.push(patternMatch[2]);
+
+        patterns.push(patternMatch[3]);
 
-        patternRegExps[expected] = new RegExp(expectedRegExp);
+        expectedRegExp = expectedRegExp.replace(patternMatch[0], `%PATTERN${patterns.length - 1}%`);
     }
 
-    return patternRegExps[expected].test(actual);
+    expectedRegExp = expectedRegExp.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+
+    for (const [patternIndex, pattern] of Object.entries(patterns)) {
+        expectedRegExp = expectedRegExp.replace(`%PATTERN${patternIndex}%`, builtInPatterns[pattern] ?? pattern);
+    }
+
+    return new RegExp(expectedRegExp);
+}
+
+function quadValueEquals(expected: string, actual: string): boolean {
+    return containsPatterns(expected)
+        ? (patternsRegExpsIndex[expected] ??= createPatternRegexp(expected)).test(actual)
+        : expected === actual;
 }
 
 function quadObjectEquals(expected: Quad_Object, actual: Quad_Object): boolean {
@@ -59,6 +87,10 @@ function quadEquals(expected: Quad, actual: Quad): boolean {
         && quadValueEquals(expected.predicate.value, actual.predicate.value);
 }
 
+function resetPatterns(): void {
+    patternsRegExpsIndex = {};
+}
+
 export interface EqualityResult {
     success: boolean;
     message: string;
@@ -66,8 +98,39 @@ export interface EqualityResult {
     actual: string;
 }
 
+export async function jsonldEquals(expected: JsonLD, actual: JsonLD): Promise<EqualityResult> {
+    // TODO catch parsing errors and improve message.
+    resetPatterns();
+
+    const expectedQuads = await jsonldToQuads(expected);
+    const actualQuads = await jsonldToQuads(actual);
+    const expectedTurtle = quadsToTurtle(expectedQuads);
+    const actualTurtle = quadsToTurtle(actualQuads);
+    const result = (success: boolean, message: string) => ({
+        success,
+        message,
+        expected: expectedTurtle,
+        actual: actualTurtle,
+    });
+
+    if (expectedQuads.length !== actualQuads.length)
+        return result(false, `Expected ${expectedQuads.length} triples, found ${actualQuads.length}.`);
+
+    try {
+        assertExpectedQuadsExist(expectedQuads, actualQuads);
+    } catch (error) {
+        if (!(error instanceof ExpectedQuadAssertionError))
+            throw error;
+
+        return result(false, error.message);
+    }
+
+    return result(true, 'jsonld matches');
+}
+
 export function sparqlEquals(expected: string, actual: string): EqualityResult {
     // TODO catch parsing errors and improve message.
+    resetPatterns();
 
     const expectedOperations = sparqlToQuadsSync(expected, { normalizeBlankNodes: true });
     const actualOperations = sparqlToQuadsSync(actual, { normalizeBlankNodes: true });
@@ -83,9 +146,16 @@ export function sparqlEquals(expected: string, actual: string): EqualityResult {
         if (expectedQuads.length !== actualQuads.length)
             return result(false, `Expected ${expectedQuads.length} ${operation} triples, found ${actualQuads.length}.`);
 
-        for (const expectedQuad of expectedQuads) {
-            if (!actualQuads.some(actualQuad => quadEquals(expectedQuad, actualQuad)))
-                return result(false, `Couldn't find the following ${operation} triple: ${quadToTurtle(expectedQuad)}`);
+        try {
+            assertExpectedQuadsExist(expectedQuads, actualQuads);
+        } catch (error) {
+            if (!(error instanceof ExpectedQuadAssertionError))
+                throw error;
+
+            return result(
+                false,
+                `Couldn't find the following ${operation} triple: ${quadToTurtle(error.expectedQuad)}`,
+            );
         }
     }
 
@@ -98,6 +168,7 @@ export function sparqlEquals(expected: string, actual: string): EqualityResult {
 
 export function turtleEquals(expected: string, actual: string): EqualityResult {
     // TODO catch parsing errors and improve message.
+    resetPatterns();
 
     const expectedQuads = turtleToQuadsSync(expected, { normalizeBlankNodes: true });
     const actualQuads = turtleToQuadsSync(actual, { normalizeBlankNodes: true });
@@ -106,9 +177,13 @@ export function turtleEquals(expected: string, actual: string): EqualityResult {
     if (expectedQuads.length !== actualQuads.length)
         return result(false, `Expected ${expectedQuads.length} triples, found ${actualQuads.length}.`);
 
-    for (const expectedQuad of expectedQuads) {
-        if (!actualQuads.some(actualQuad => quadEquals(expectedQuad, actualQuad)))
-            return result(false, `Couldn't find the following triple: ${quadToTurtle(expectedQuad)}`);
+    try {
+        assertExpectedQuadsExist(expectedQuads, actualQuads);
+    } catch (error) {
+        if (!(error instanceof ExpectedQuadAssertionError))
+            throw error;
+
+        return result(false, error.message);
     }
 
     return result(true, 'turtle matches');

package/src/helpers/vocabs.ts

@@ -6,10 +6,12 @@ export interface ExpandIRIOptions {
 }
 
 const knownPrefixes: RDFContext = {
+    acl: 'http://www.w3.org/ns/auth/acl#',
     foaf: 'http://xmlns.com/foaf/0.1/',
     pim: 'http://www.w3.org/ns/pim/space#',
     purl: 'http://purl.org/dc/terms/',
-    rdfs: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+    rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+    rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
     schema: 'https://schema.org/',
     solid: 'http://www.w3.org/ns/solid/terms#',
     vcard: 'http://www.w3.org/2006/vcard/ns#',
@@ -25,7 +27,7 @@ export function expandIRI(iri: string, options: Partial<ExpandIRIOptions> = {}):
 
     const [prefix, name] = iri.split(':');
 
-    if (name) {
+    if (prefix && name) {
         const expandedPrefix = knownPrefixes[prefix] ?? options.extraContext?.[prefix] ?? null;
 
         if (!expandedPrefix)

package/src/helpers/wac.ts

@@ -0,0 +1,45 @@
+import { objectWithoutEmpty, requireUrlParentDirectory, urlResolve } from '@noeldemartin/utils';
+
+import { fetchSolidDocumentIfFound } from '@/helpers/io';
+import type SolidDocument from '@/models/SolidDocument';
+import type { Fetch } from '@/helpers/io';
+
+async function fetchACLResourceUrl(resourceUrl: string, fetch: Fetch): Promise<string> {
+    fetch = fetch ?? window.fetch.bind(window);
+
+    const resourceHead = await fetch(resourceUrl, { method: 'HEAD' });
+    const linkHeader = resourceHead.headers.get('Link') ?? '';
+    const url = linkHeader.match(/<([^>]+)>;\s*rel="acl"/)?.[1] ?? null;
+
+    if (!url) {
+        throw new Error(`Could not find ACL Resource for '${resourceUrl}'`);
+    }
+
+    return urlResolve(requireUrlParentDirectory(resourceUrl), url);
+}
+
+async function fetchEffectiveACL(
+    resourceUrl: string,
+    fetch: Fetch,
+    aclResourceUrl?: string | null,
+): Promise<SolidDocument> {
+    aclResourceUrl = aclResourceUrl ?? await fetchACLResourceUrl(resourceUrl, fetch);
+
+    return await fetchSolidDocumentIfFound(aclResourceUrl ?? '', fetch)
+        ?? await fetchEffectiveACL(requireUrlParentDirectory(resourceUrl), fetch);
+}
+
+export async function fetchSolidDocumentACL(documentUrl: string, fetch: Fetch): Promise<{
+    url: string;
+    effectiveUrl: string;
+    document: SolidDocument;
+}> {
+    const url = await fetchACLResourceUrl(documentUrl, fetch);
+    const document = await fetchEffectiveACL(documentUrl, fetch, url);
+
+    return objectWithoutEmpty({
+        url,
+        effectiveUrl: document.url,
+        document,
+    });
+}