@noeldemartin/solid-utils 0.6.0 → 0.6.1-next.0d15181b9561088547ef2d0f22a04aef565e06bb

package/src/helpers/io.ts

@@ -123,15 +123,25 @@ function preprocessSubjects(json: JsonLD): void {
     }
 
     json['@id'] = ANONYMOUS_PREFIX + json['@id'];
+
+    for (const [field, value] of Object.entries(json)) {
+        if (typeof value !== 'object' || value === null || !('@id' in value)) {
+            continue;
+        }
+
+        preprocessSubjects(json[field] as JsonLD);
+    }
 }
 
 function postprocessSubjects(quads: Quad[]): void {
     for (const quad of quads) {
-        if (!quad.subject.value.startsWith(ANONYMOUS_PREFIX)) {
-            continue;
+        if (quad.subject.value.startsWith(ANONYMOUS_PREFIX)) {
+            quad.subject.value = quad.subject.value.slice(ANONYMOUS_PREFIX_LENGTH);
         }
 
-        quad.subject.value = quad.subject.value.slice(ANONYMOUS_PREFIX_LENGTH);
+        if (quad.object.value.startsWith(ANONYMOUS_PREFIX)) {
+            quad.object.value = quad.object.value.slice(ANONYMOUS_PREFIX_LENGTH);
+        }
     }
 }
 
@@ -202,6 +212,12 @@ export async function jsonldToQuads(json: JsonLD, baseIRI?: string): Promise<Qua
     return quads;
 }
 
+export async function normalizeJsonLD(json: JsonLD, baseIRI?: string): Promise<JsonLD> {
+    const quads = await jsonldToQuads(structuredClone(json), baseIRI);
+
+    return quadsToJsonLD(quads);
+}
+
 export function normalizeSparql(sparql: string): string {
     const quads = sparqlToQuadsSync(sparql);
 

package/src/helpers/wac.test.ts

@@ -10,11 +10,13 @@ describe('WAC helpers', () => {
 
     it('resolves relative ACL urls', async () => {
         // Arrange
-        const server = new FakeServer();
         const documentUrl = 'https://example.com/alice/movies/my-favorite-movie';
 
-        server.respondOnce(documentUrl, FakeResponse.success(undefined, { Link: '<my-favorite-movie.acl>;rel="acl"' }));
-        server.respondOnce(
+        FakeServer.respondOnce(
+            documentUrl,
+            FakeResponse.success(undefined, { Link: '<my-favorite-movie.acl>;rel="acl"' }),
+        );
+        FakeServer.respondOnce(
             `${documentUrl}.acl`,
             FakeResponse.success(`
                 @prefix acl: <http://www.w3.org/ns/auth/acl#>.
@@ -29,25 +31,27 @@ describe('WAC helpers', () => {
         );
 
         // Act
-        const { url, effectiveUrl, document } = await fetchSolidDocumentACL(documentUrl, server.fetch);
+        const { url, effectiveUrl, document } = await fetchSolidDocumentACL(documentUrl, FakeServer.fetch);
 
         // Assert
         expect(url).toEqual(`${documentUrl}.acl`);
         expect(effectiveUrl).toEqual(url);
         expect(document.contains(`${documentUrl}.acl#owner`, 'rdf:type', 'acl:Authorization')).toBe(true);
 
-        expect(server.getRequests()).toHaveLength(2);
-        expect(server.getRequest(documentUrl)?.method).toEqual('HEAD');
-        expect(server.getRequest(url)).not.toBeNull();
+        expect(FakeServer.getRequests()).toHaveLength(2);
+        expect(FakeServer.getRequest(documentUrl)?.method).toEqual('HEAD');
+        expect(FakeServer.getRequest(url)).not.toBeNull();
     });
 
     it('fails with ACP resources', async () => {
         // Arrange
-        const server = new FakeServer();
         const documentUrl = 'https://example.com/alice/movies/my-favorite-movie';
 
-        server.respondOnce(documentUrl, FakeResponse.success(undefined, { Link: '<my-favorite-movie.acl>;rel="acl"' }));
-        server.respondOnce(
+        FakeServer.respondOnce(
+            documentUrl,
+            FakeResponse.success(undefined, { Link: '<my-favorite-movie.acl>;rel="acl"' }),
+        );
+        FakeServer.respondOnce(
             `${documentUrl}.acl`,
             FakeResponse.success(undefined, {
                 Link: '<http://www.w3.org/ns/solid/acp#AccessControlResource>; rel="type"',
@@ -55,7 +59,7 @@ describe('WAC helpers', () => {
         );
 
         // Act
-        const promisedDocument = fetchSolidDocumentACL(documentUrl, server.fetch);
+        const promisedDocument = fetchSolidDocumentACL(documentUrl, FakeServer.fetch);
 
         // Assert
         await expect(promisedDocument).rejects.toBeInstanceOf(UnsupportedAuthorizationProtocolError);

package/src/testing/setup.ts

@@ -0,0 +1,4 @@
+import { FakeServer } from '@noeldemartin/testing';
+import { beforeEach } from 'vitest';
+
+beforeEach(() => FakeServer.reset());