@noeldemartin/solid-utils 0.6.0-next.95fe731be0689c25d9040cc1411e27c49f69901d → 0.6.0-next.be843e6555f49819086b200a94158048e471ecdc

package/dist/vitest.d.ts

@@ -0,0 +1,50 @@
+import { MatcherState } from '@vitest/expect';
+
+declare const _default: {
+    toEqualJsonLD(this: MatcherState, received: any, expected: JsonLD): Promise<{
+        pass: boolean;
+        message: () => string;
+    }>;
+    toEqualSparql(this: MatcherState, received: any, expected: string): {
+        pass: boolean;
+        message: () => string;
+    };
+    toEqualTurtle(this: MatcherState, received: any, expected: string): {
+        pass: boolean;
+        message: () => string;
+    };
+};
+
+export declare function installVitestSolidMatchers(): void;
+
+declare type JsonLD = Partial<{
+    '@context': Record<string, unknown>;
+    '@id': string;
+    '@type': null | string | string[];
+}> & {
+    [k: string]: unknown;
+};
+
+export declare type VitestSolidMatchers<R = unknown> = {
+    [K in keyof typeof _default]: (...args: Parameters<(typeof _default)[K]> extends [any, ...infer Rest] ? Rest : never) => ReturnType<(typeof _default)[K]> extends Promise<any> ? Promise<R> : R;
+};
+
+export { }
+
+
+declare global {
+    namespace Chai {
+        interface Assertion extends ChaiSolidAssertions {
+        }
+        interface Include extends ChaiSolidAssertions {
+        }
+    }
+}
+
+
+declare module '@vitest/expect' {
+    interface Assertion<T> extends VitestSolidMatchers<T> {
+    }
+    interface AsymmetricMatchersContaining extends VitestSolidMatchers {
+    }
+}

package/dist/vitest.js

@@ -0,0 +1,55 @@
+import { expect as l } from "vitest";
+import { n as r, b as i } from "./io-CT3AW8WO.js";
+import { t as o, s as u, j as c } from "./helpers-CIIrVGVG.js";
+function a(e, t) {
+  const s = e.success, n = t.state.utils;
+  return { pass: s, message: s ? () => [e.message, n.matcherHint(t.hint)].join(`
+
+`) : () => [
+    e.message,
+    n.matcherHint(t.hint),
+    [
+      `Expected: not ${n.printExpected(t.expected)}`,
+      `Received: ${n.printReceived(t.received)}`
+    ].join(`
+`)
+  ].join(`
+
+`) };
+}
+const m = {
+  async toEqualJsonLD(e, t) {
+    const s = await c(t, e);
+    return a(s, {
+      state: this,
+      hint: "toEqualJsonLD",
+      expected: t,
+      received: e
+    });
+  },
+  toEqualSparql(e, t) {
+    const s = u(t, e);
+    return a(s, {
+      state: this,
+      hint: "toEqualSparql",
+      expected: i(t),
+      received: i(e)
+    });
+  },
+  toEqualTurtle(e, t) {
+    const s = o(t, e);
+    return a(s, {
+      state: this,
+      hint: "toEqualTurtle",
+      expected: r(t),
+      received: r(e)
+    });
+  }
+};
+function d() {
+  l.extend(m);
+}
+export {
+  d as installVitestSolidMatchers
+};
+//# sourceMappingURL=vitest.js.map

package/dist/vitest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.js","sources":["../src/vitest/matchers.ts","../src/vitest/index.ts"],"sourcesContent":["import type { MatcherState, MatchersObject } from '@vitest/expect';\n\nimport { normalizeSparql, normalizeTurtle } from '@noeldemartin/solid-utils/helpers/io';\nimport { jsonldEquals, sparqlEquals, turtleEquals } from '@noeldemartin/solid-utils/testing/helpers';\nimport type { EqualityResult } from '@noeldemartin/solid-utils/testing/helpers';\nimport type { JsonLD } from '@noeldemartin/solid-utils/helpers';\n\ninterface FormatResultOptions {\n    state: MatcherState;\n    hint: string;\n    expected: unknown;\n    received: unknown;\n}\n\nfunction formatResult(result: EqualityResult, options: FormatResultOptions) {\n    const pass = result.success;\n    const utils = options.state.utils;\n    const message = pass\n        ? () => [result.message, utils.matcherHint(options.hint)].join('\\n\\n')\n        : () =>\n            [\n                result.message,\n                utils.matcherHint(options.hint),\n                [\n                    `Expected: not ${utils.printExpected(options.expected)}`,\n                    `Received: ${utils.printReceived(options.received)}`,\n                ].join('\\n'),\n            ].join('\\n\\n');\n\n    return { pass, message };\n}\n\nexport function defineMatchers<T extends MatchersObject>(matchers: T): T {\n    return matchers;\n}\n\nexport default defineMatchers({\n    async toEqualJsonLD(received, expected: JsonLD) {\n        const result = await jsonldEquals(expected, received);\n\n        return formatResult(result, {\n            state: this,\n            hint: 'toEqualJsonLD',\n            expected,\n            received,\n        });\n    },\n    toEqualSparql(received, expected: string) {\n        const result = sparqlEquals(expected, received);\n\n        return formatResult(result, {\n            state: this,\n            hint: 'toEqualSparql',\n            expected: normalizeSparql(expected),\n            received: normalizeSparql(received),\n        });\n    },\n    toEqualTurtle(received, expected: string) {\n        const result = turtleEquals(expected, received);\n\n        return formatResult(result, {\n            state: this,\n            hint: 'toEqualTurtle',\n            expected: normalizeTurtle(expected),\n            received: normalizeTurtle(received),\n        });\n    },\n});\n","import { expect } from 'vitest';\n\nimport matchers from './matchers';\n\nexport type VitestSolidMatchers<R = unknown> = {\n    [K in keyof typeof matchers]: (\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        ...args: Parameters<(typeof matchers)[K]> extends [any, ...infer Rest] ? Rest : never\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    ) => ReturnType<(typeof matchers)[K]> extends Promise<any> ? Promise<R> : R;\n};\n\nexport function installVitestSolidMatchers(): void {\n    expect.extend(matchers);\n}\n\ndeclare module '@vitest/expect' {\n    interface Assertion<T> extends VitestSolidMatchers<T> {}\n    interface AsymmetricMatchersContaining extends VitestSolidMatchers {}\n}\n"],"names":["formatResult","result","options","pass","utils","matchers","received","expected","jsonldEquals","sparqlEquals","normalizeSparql","turtleEquals","normalizeTurtle","installVitestSolidMatchers","expect"],"mappings":";;;AAcA,SAASA,EAAaC,GAAwBC,GAA8B;AACxE,QAAMC,IAAOF,EAAO,SACdG,IAAQF,EAAQ,MAAM;AAarB,SAAA,EAAE,MAAAC,GAAM,SAZCA,IACV,MAAM,CAACF,EAAO,SAASG,EAAM,YAAYF,EAAQ,IAAI,CAAC,EAAE,KAAK;AAAA;AAAA,CAAM,IACnE,MACE;AAAA,IACID,EAAO;AAAA,IACPG,EAAM,YAAYF,EAAQ,IAAI;AAAA,IAC9B;AAAA,MACI,iBAAiBE,EAAM,cAAcF,EAAQ,QAAQ,CAAC;AAAA,MACtD,aAAaE,EAAM,cAAcF,EAAQ,QAAQ,CAAC;AAAA,IACtD,EAAE,KAAK;AAAA,CAAI;AAAA,EAAA,EACb,KAAK;AAAA;AAAA,CAAM,EAEE;AAC3B;AAMA,MAAAG,IAA8B;AAAA,EAC1B,MAAM,cAAcC,GAAUC,GAAkB;AAC5C,UAAMN,IAAS,MAAMO,EAAaD,GAAUD,CAAQ;AAEpD,WAAON,EAAaC,GAAQ;AAAA,MACxB,OAAO;AAAA,MACP,MAAM;AAAA,MACN,UAAAM;AAAA,MACA,UAAAD;AAAA,IAAA,CACH;AAAA,EACL;AAAA,EACA,cAAcA,GAAUC,GAAkB;AAChC,UAAAN,IAASQ,EAAaF,GAAUD,CAAQ;AAE9C,WAAON,EAAaC,GAAQ;AAAA,MACxB,OAAO;AAAA,MACP,MAAM;AAAA,MACN,UAAUS,EAAgBH,CAAQ;AAAA,MAClC,UAAUG,EAAgBJ,CAAQ;AAAA,IAAA,CACrC;AAAA,EACL;AAAA,EACA,cAAcA,GAAUC,GAAkB;AAChC,UAAAN,IAASU,EAAaJ,GAAUD,CAAQ;AAE9C,WAAON,EAAaC,GAAQ;AAAA,MACxB,OAAO;AAAA,MACP,MAAM;AAAA,MACN,UAAUW,EAAgBL,CAAQ;AAAA,MAClC,UAAUK,EAAgBN,CAAQ;AAAA,IAAA,CACrC;AAAA,EAAA;AAET;ACvDO,SAASO,IAAmC;AAC/C,EAAAC,EAAO,OAAOT,CAAQ;AAC1B;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noeldemartin/solid-utils",
-    "version": "0.6.0-next.95fe731be0689c25d9040cc1411e27c49f69901d",
+    "version": "0.6.0-next.be843e6555f49819086b200a94158048e471ecdc",
     "type": "module",
     "sideEffects": false,
     "exports": {
@@ -11,6 +11,14 @@
         "./testing": {
             "types": "./dist/testing.d.ts",
             "default": "./dist/testing.js"
+        },
+        "./vitest": {
+            "types": "./dist/vitest.d.ts",
+            "default": "./dist/vitest.js"
+        },
+        "./chai": {
+            "types": "./dist/chai.d.ts",
+            "default": "./dist/chai.js"
         }
     },
     "files": [
@@ -28,26 +36,32 @@
         "verify": "noeldemartin-verify"
     },
     "dependencies": {
-        "@noeldemartin/utils": "0.7.0-next.d98a97003e3b0af1b9fc05dbfd6e57fab3c2f181",
+        "@noeldemartin/utils": "^0.7.1",
         "@rdfjs/types": "^2.0.1",
         "jsonld": "^8.3.3",
         "md5": "^2.3.0",
         "n3": "^1.24.2"
     },
     "devDependencies": {
+        "@arethetypeswrong/cli": "^0.17.4",
         "@noeldemartin/eslint-config-typescript": "^0.1.2",
-        "@noeldemartin/scripts": "0.3.0-next.2dfd366e59e45ecf5ead1a617e4d0e870dbea507",
-        "@noeldemartin/testing": "0.0.0-next.cd489a93da5eaad3f89a4d9ae3734f7ef911b6f6",
+        "@noeldemartin/eslint-plugin": "^0.1.0",
+        "@noeldemartin/scripts": "next",
+        "@noeldemartin/testing": "next",
         "@tsconfig/node22": "^22.0.0",
         "@types/chai": "^5.2.0",
         "@types/jsonld": "^1.5.15",
         "@types/md5": "^2.3.5",
         "@types/n3": "^1.24.1",
         "@types/node": "^22.13.10",
+        "@typescript-eslint/eslint-plugin": "^5.6.0",
         "@vitest/expect": "^3.0.9",
+        "eslint": "^8.57.1",
+        "prettier-eslint-cli": "^8.0.1",
+        "publint": "^0.3.12",
         "typescript": "^5.8.2",
         "vite": "^6.2.2",
-        "vite-plugin-dts": "^4.5.3",
+        "vite-plugin-dts": "4.5.0",
         "vitest": "^3.0.9"
     },
     "eslintConfig": {

package/src/{testing/chai → chai}/assertions.ts

@@ -1,19 +1,12 @@
 import { sparqlEquals, turtleEquals } from '@noeldemartin/solid-utils/testing/helpers';
 import type { EqualityResult } from '@noeldemartin/solid-utils/testing/helpers';
 
-type CustomAssertions = {
-    [assertion in keyof typeof assertions]: (typeof assertions)[assertion];
-};
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace Chai {
-        interface Assertion extends CustomAssertions {}
-        interface Include extends CustomAssertions {}
-    }
+export function defineChaiAssertions<T extends Record<string, (this: Chai.AssertionStatic, ...args: any[]) => void>>(
+    assertions: T): T {
+    return assertions;
 }
 
-const assertions: Record<string, (this: Chai.AssertionStatic, ...args: any[]) => void> = {
+export default defineChaiAssertions({
     turtle(graph: string): void {
         const self = this as unknown as Chai.AssertionStatic;
         const actual = self._obj as string;
@@ -39,6 +32,4 @@ const assertions: Record<string, (this: Chai.AssertionStatic, ...args: any[]) =>
 
         assert(result.success, result.message, '', result.expected, result.actual);
     },
-};
-
-export default assertions;
+});

package/src/chai/index.ts

@@ -0,0 +1,19 @@
+import assertions from './assertions';
+
+export type ChaiSolidAssertions = {
+    [assertion in keyof typeof assertions]: (typeof assertions)[assertion];
+};
+
+export function installChaiSolidAssertions(): void {
+    (globalThis as { chai?: Chai.ChaiStatic }).chai?.use((_chai) => {
+        return Object.entries(assertions).forEach(([name, method]) => _chai.Assertion.addMethod(name, method));
+    });
+}
+
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    namespace Chai {
+        interface Assertion extends ChaiSolidAssertions {}
+        interface Include extends ChaiSolidAssertions {}
+    }
+}

package/src/helpers/auth.test.ts

@@ -10,10 +10,9 @@ describe('Auth helpers', () => {
 
     it('reads NSS profiles', async () => {
         // Arrange
-        const server = new FakeServer();
         const webId = 'https://alice.solidcommunity.net/profile/card#me';
 
-        server.respondOnce(
+        FakeServer.respondOnce(
             'https://alice.solidcommunity.net/profile/card',
             FakeResponse.success(
                 `
@@ -41,10 +40,10 @@ describe('Auth helpers', () => {
         );
 
         // Act
-        const profile = await fetchLoginUserProfile(webId, { fetch: server.fetch });
+        const profile = await fetchLoginUserProfile(webId, { fetch: FakeServer.fetch });
 
         // Assert
-        expect(server.getRequests()).toHaveLength(1);
+        expect(FakeServer.getRequests()).toHaveLength(1);
 
         expect(profile).toEqual({
             webId,
@@ -60,12 +59,11 @@ describe('Auth helpers', () => {
 
     it('reads ESS profiles (public)', async () => {
         // Arrange
-        const server = new FakeServer();
         const webId = 'https://id.inrupt.com/alice';
 
         // The first request returns a 303 to `${webId}?lookup`,
         // but in order to simplify mocking requests we're assuming it doesn't.
-        server.respondOnce(
+        FakeServer.respondOnce(
             'https://id.inrupt.com/alice',
             FakeResponse.success(`
                 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
@@ -81,16 +79,16 @@ describe('Auth helpers', () => {
                     foaf:isPrimaryTopicOf <https://storage.inrupt.com/storage-hash/extendedProfile> .
             `),
         );
-        server.respondOnce(
+        FakeServer.respondOnce(
             'https://storage.inrupt.com/storage-hash/extendedProfile',
             new FakeResponse(undefined, undefined, 401),
         );
 
         // Act
-        const profile = await fetchLoginUserProfile(webId, { fetch: server.fetch });
+        const profile = await fetchLoginUserProfile(webId, { fetch: FakeServer.fetch });
 
         // Assert
-        expect(server.getRequests()).toHaveLength(2);
+        expect(FakeServer.getRequests()).toHaveLength(2);
 
         expect(profile).toEqual({
             webId,
@@ -103,12 +101,11 @@ describe('Auth helpers', () => {
 
     it('reads ESS profiles (authenticated)', async () => {
         // Arrange
-        const server = new FakeServer();
         const webId = 'https://id.inrupt.com/alice';
 
         // The first request returns a 303 to `${webId}?lookup`,
         // but in order to simplify mocking requests we're assuming it doesn't.
-        server.respondOnce(
+        FakeServer.respondOnce(
             'https://id.inrupt.com/alice',
             FakeResponse.success(`
                 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
@@ -124,7 +121,7 @@ describe('Auth helpers', () => {
                     foaf:isPrimaryTopicOf <https://storage.inrupt.com/storage-hash/extendedProfile> .
             `),
         );
-        server.respondOnce(
+        FakeServer.respondOnce(
             'https://storage.inrupt.com/storage-hash/extendedProfile',
             FakeResponse.success(
                 `
@@ -145,10 +142,10 @@ describe('Auth helpers', () => {
         );
 
         // Act
-        const profile = await fetchLoginUserProfile(webId, { fetch: server.fetch });
+        const profile = await fetchLoginUserProfile(webId, { fetch: FakeServer.fetch });
 
         // Assert
-        expect(server.getRequests()).toHaveLength(2);
+        expect(FakeServer.getRequests()).toHaveLength(2);
 
         expect(profile).toEqual({
             webId,
@@ -162,7 +159,6 @@ describe('Auth helpers', () => {
 
     it('reads use.id profiles', async () => {
         // Arrange
-        const server = new FakeServer();
         const webId = 'https://use.id/alice';
         const profileTurtle = `
             @prefix foaf: <http://xmlns.com/foaf/0.1/>.
@@ -181,17 +177,20 @@ describe('Auth helpers', () => {
 
         // The first request returns a 303 to `${webId}/profile`,
         // but in order to simplify mocking requests we're assuming it doesn't.
-        server.respondOnce('https://use.id/alice', FakeResponse.success(profileTurtle, { 'WAC-Allow': 'user="read"' }));
-        server.respondOnce(
+        FakeServer.respondOnce(
+            'https://use.id/alice',
+            FakeResponse.success(profileTurtle, { 'WAC-Allow': 'user="read"' }),
+        );
+        FakeServer.respondOnce(
             'https://use.id/alice/profile',
             FakeResponse.success(profileTurtle, { 'WAC-Allow': 'user="read"' }),
         );
 
         // Act
-        const profile = await fetchLoginUserProfile(webId, { fetch: server.fetch });
+        const profile = await fetchLoginUserProfile(webId, { fetch: FakeServer.fetch });
 
         // Assert
-        expect(server.getRequests()).toHaveLength(2);
+        expect(FakeServer.getRequests()).toHaveLength(2);
 
         expect(profile).toEqual({
             webId,
@@ -204,18 +203,17 @@ describe('Auth helpers', () => {
 
     it('throws errors reading required profiles', async () => {
         // Arrange
-        const server = new FakeServer();
         const webId = 'https://pod.example.com/profile/card#me';
 
-        server.respondOnce('https://pod.example.com/profile/card', FakeResponse.success('invalid turtle'));
+        FakeServer.respondOnce('https://pod.example.com/profile/card', FakeResponse.success('invalid turtle'));
 
         // Act
-        const fetchProfile = fetchLoginUserProfile(webId, { fetch: server.fetch, required: true });
+        const fetchProfile = fetchLoginUserProfile(webId, { fetch: FakeServer.fetch, required: true });
 
         // Assert
         await expect(fetchProfile).rejects.toBeInstanceOf(MalformedSolidDocumentError);
 
-        expect(server.getRequests()).toHaveLength(1);
+        expect(FakeServer.getRequests()).toHaveLength(1);
     });
 
 });

package/src/helpers/io.test.ts

@@ -1,6 +1,13 @@
 import { describe, expect, it } from 'vitest';
 
-import { jsonldToQuads, normalizeSparql, quadsToJsonLD, sparqlToQuadsSync, turtleToQuadsSync } from './io';
+import {
+    jsonldToQuads,
+    normalizeJsonLD,
+    normalizeSparql,
+    quadsToJsonLD,
+    sparqlToQuadsSync,
+    turtleToQuadsSync,
+} from './io';
 import type { Quad } from '@rdfjs/types';
 
 describe('IO', () => {
@@ -200,6 +207,48 @@ describe('IO', () => {
         expect(quads[1].object.value).toEqual('John Doe');
     });
 
+    it('normalizes jsonld', async () => {
+        // Arrange
+        const json = {
+            '@graph': [
+                {
+                    '@context': { '@vocab': 'https://schema.org/' },
+                    '@id': '#it',
+                    '@type': 'Movie',
+                    'name': 'Spirited Away',
+                },
+                {
+                    '@context': { '@vocab': 'https://vocab.noeldemartin.com/crdt/' },
+                    '@id': '#it-metadata',
+                    '@type': 'Metadata',
+                    'resource': { '@id': '#it' },
+                },
+            ],
+        };
+
+        const clone = structuredClone(json);
+
+        // Act
+        const normalized = await normalizeJsonLD(json);
+
+        // Assert
+        expect(json).toEqual(clone);
+        expect(normalized).toEqual({
+            '@graph': [
+                {
+                    '@id': '#it',
+                    '@type': ['https://schema.org/Movie'],
+                    'https://schema.org/name': [{ '@value': 'Spirited Away' }],
+                },
+                {
+                    '@id': '#it-metadata',
+                    '@type': ['https://vocab.noeldemartin.com/crdt/Metadata'],
+                    'https://vocab.noeldemartin.com/crdt/resource': [{ '@id': '#it' }],
+                },
+            ],
+        });
+    });
+
     it('converts quads to jsonld', async () => {
         // Arrange
         const quads = turtleToQuadsSync(`

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/index.ts

@@ -1,3 +1,4 @@
 export * from './errors';
 export * from './helpers';
 export * from './models';
+export * from './types';

package/src/testing/index.ts

@@ -1,3 +1 @@
-export * from './vitest';
 export * from './helpers';
-export * from './chai';

package/src/testing/setup.ts

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

package/src/types/index.ts

@@ -0,0 +1,2 @@
+export type { ChaiSolidAssertions } from '@noeldemartin/solid-utils/chai';
+export type { VitestSolidMatchers } from '@noeldemartin/solid-utils/vitest';

package/src/{testing/vitest → vitest}/index.ts

@@ -13,3 +13,8 @@ export type VitestSolidMatchers<R = unknown> = {
 export function installVitestSolidMatchers(): void {
     expect.extend(matchers);
 }
+
+declare module '@vitest/expect' {
+    interface Assertion<T> extends VitestSolidMatchers<T> {}
+    interface AsymmetricMatchersContaining extends VitestSolidMatchers {}
+}

package/src/testing/chai/index.ts

@@ -1,7 +0,0 @@
-import assertions from './assertions';
-
-export function installChaiPlugin(): void {
-    (globalThis as { chai?: Chai.ChaiStatic }).chai?.use((_chai) => {
-        return Object.entries(assertions).forEach(([name, method]) => _chai.Assertion.addMethod(name, method));
-    });
-}