@noeldemartin/solid-utils 0.4.0-next.c9d36a1c12735b50a915e6ffeed60e60569706c0 → 0.5.0-next.1ea2ba307e0da5c3ce9d2db1276f930c7aa52c90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noeldemartin/solid-utils",
-  "version": "0.4.0-next.c9d36a1c12735b50a915e6ffeed60e60569706c0",
+  "version": "0.5.0-next.1ea2ba307e0da5c3ce9d2db1276f930c7aa52c90",
   "description": "My JavaScript utilities for Solid",
   "main": "dist/noeldemartin-solid-utils.cjs.js",
   "module": "dist/noeldemartin-solid-utils.esm.js",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@babel/runtime": "^7.14.0",
     "@noeldemartin/solid-utils-external": "^0.1.1",
-    "@noeldemartin/utils": "^0.5.1",
+    "@noeldemartin/utils": "^0.6.0",
     "@rdfjs/types": "^1.1.0",
     "core-js": "^3.12.1",
     "md5": "^2.3.0"

package/src/helpers/auth.ts

@@ -5,7 +5,7 @@ import UnauthorizedError from '../errors/UnauthorizedError';
 import type SolidDocument from '../models/SolidDocument';
 
 import { fetchSolidDocument } from './io';
-import type { Fetch } from './io';
+import type { Fetch, FetchSolidDocumentOptions } from './io';
 
 export interface SolidUserProfile {
     webId: string;
@@ -19,7 +19,7 @@ export interface SolidUserProfile {
     privateTypeIndexUrl?: string;
 }
 
-async function fetchExtendedUserProfile(webIdDocument: SolidDocument, fetch?: Fetch): Promise<{
+async function fetchExtendedUserProfile(webIdDocument: SolidDocument, options?: FetchSolidDocumentOptions): Promise<{
     store: SolidStore;
     cloaked: boolean;
     writableProfileUrl: string | null;
@@ -43,7 +43,7 @@ async function fetchExtendedUserProfile(webIdDocument: SolidDocument, fetch?: Fe
             }
 
             try {
-                const document = await fetchSolidDocument(url, fetch);
+                const document = await fetchSolidDocument(url, options);
 
                 documents[url] = document;
                 store.addQuads(document.getQuads());
@@ -81,21 +81,29 @@ async function fetchExtendedUserProfile(webIdDocument: SolidDocument, fetch?: Fe
 }
 
 async function fetchUserProfile(webId: string, options: FetchUserProfileOptions = {}): Promise<SolidUserProfile> {
+    const requestOptions: FetchSolidDocumentOptions = {
+        fetch: options.fetch,
+
+        // Needed for CSS v7.1.3.
+        // See https://github.com/CommunitySolidServer/CommunitySolidServer/issues/1972
+        cache: 'no-store',
+    };
+
     const documentUrl = urlRoute(webId);
-    const document = await fetchSolidDocument(documentUrl, options.fetch);
+    const document = await fetchSolidDocument(documentUrl, requestOptions);
 
     if (!document.isPersonalProfile() && !document.contains(webId, 'solid:oidcIssuer')) {
         throw new Error(`${webId} is not a valid webId.`);
     }
 
-    const { store, writableProfileUrl, cloaked } = await fetchExtendedUserProfile(document, options.fetch);
+    const { store, writableProfileUrl, cloaked } = await fetchExtendedUserProfile(document, options);
     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) {
-        const parentDocument = await silenced(fetchSolidDocument(parentUrl, options.fetch));
+        const parentDocument = await silenced(fetchSolidDocument(parentUrl, requestOptions));
 
         if (parentDocument?.isStorage()) {
             storageUrls.push(parentUrl);
@@ -110,7 +118,7 @@ async function fetchUserProfile(webId: string, options: FetchUserProfileOptions
         throw new Error(`Could not find any storage for ${webId}.`);
     }
 
-    await options.onLoaded?.(new SolidStore(store.statements(webId)));
+    await options.onLoaded?.(store);
 
     return {
         webId,

package/src/helpers/interop.ts

@@ -12,7 +12,7 @@ async function mintTypeIndexUrl(user: SolidUserProfile, type: TypeIndexType, fet
     const storageUrl = user.storageUrls[0];
     const typeIndexUrl = `${storageUrl}settings/${type}TypeIndex`;
 
-    return await solidDocumentExists(typeIndexUrl, fetch)
+    return await solidDocumentExists(typeIndexUrl, { fetch })
         ? `${storageUrl}settings/${type}TypeIndex-${uuid()}`
         : typeIndexUrl;
 }
@@ -57,7 +57,7 @@ async function findRegistrations(
     predicate: string,
     fetch?: Fetch,
 ): Promise<string[]> {
-    const typeIndex = await fetchSolidDocument(typeIndexUrl, fetch);
+    const typeIndex = await fetchSolidDocument(typeIndexUrl, { fetch });
     const types = Array.isArray(type) ? type : [type];
 
     return types.map(

package/src/helpers/io.ts

@@ -28,13 +28,21 @@ export declare type Fetch = TypedFetch | AnyFetch;
 const ANONYMOUS_PREFIX = 'anonymous://';
 const ANONYMOUS_PREFIX_LENGTH = ANONYMOUS_PREFIX.length;
 
-async function fetchRawSolidDocument(url: string, fetch: Fetch): Promise<{ body: string; headers: Headers }> {
-    const options = {
+async function fetchRawSolidDocument(
+    url: string,
+    options?: FetchSolidDocumentOptions,
+): Promise<{ body: string; headers: Headers }> {
+    const requestOptions: RequestInit = {
         headers: { Accept: 'text/turtle' },
     };
 
+    if (options?.cache) {
+        requestOptions.cache = options.cache;
+    }
+
     try {
-        const response = await fetch(url, options);
+        const fetch = options?.fetch ?? window.fetch;
+        const response = await fetch(url, requestOptions);
 
         if (response.status === 404)
             throw new NotFoundError(url);
@@ -141,6 +149,11 @@ function postprocessSubjects(quads: Quad[]): void {
     }
 }
 
+export interface FetchSolidDocumentOptions {
+    fetch?: Fetch;
+    cache?: RequestCache;
+}
+
 export interface ParsingOptions {
     baseIRI: string;
     normalizeBlankNodes: boolean;
@@ -151,7 +164,6 @@ export interface RDFGraphData {
     containsRelativeIRIs: boolean;
 }
 
-
 export async function createSolidDocument(url: string, body: string, fetch?: Fetch): Promise<SolidDocument> {
     fetch = fetch ?? window.fetch.bind(window);
 
@@ -166,16 +178,19 @@ export async function createSolidDocument(url: string, body: string, fetch?: Fet
     return new SolidDocument(url, statements, new Headers({}));
 }
 
-export async function fetchSolidDocument(url: string, fetch?: Fetch): Promise<SolidDocument> {
-    const { body: data, headers } = await fetchRawSolidDocument(url, fetch ?? window.fetch);
+export async function fetchSolidDocument(url: string, options?: FetchSolidDocumentOptions): Promise<SolidDocument> {
+    const { body: data, headers } = await fetchRawSolidDocument(url, options);
     const statements = await turtleToQuads(data, { baseIRI: url });
 
     return new SolidDocument(url, statements, headers);
 }
 
-export async function fetchSolidDocumentIfFound(url: string, fetch?: Fetch): Promise<SolidDocument | null> {
+export async function fetchSolidDocumentIfFound(
+    url: string,
+    options?: FetchSolidDocumentOptions,
+): Promise<SolidDocument | null> {
     try {
-        const document = await fetchSolidDocument(url, fetch);
+        const document = await fetchSolidDocument(url, options);
 
         return document;
     } catch (error) {
@@ -287,9 +302,9 @@ export function quadToTurtle(quad: Quad): string {
     return writer.quadsToString([quad]).slice(0, -1);
 }
 
-export async function solidDocumentExists(url: string, fetch?: Fetch): Promise<boolean> {
+export async function solidDocumentExists(url: string, options?: FetchSolidDocumentOptions): Promise<boolean> {
     try {
-        const document = await fetchSolidDocument(url, fetch);
+        const document = await fetchSolidDocument(url, options);
 
         return !document.isEmpty();
     } catch (error) {

package/src/helpers/wac.ts

@@ -26,7 +26,7 @@ async function fetchEffectiveACL(
 ): Promise<SolidDocument> {
     aclResourceUrl = aclResourceUrl ?? await fetchACLResourceUrl(resourceUrl, fetch);
 
-    const aclDocument = await fetchSolidDocumentIfFound(aclResourceUrl ?? '', fetch);
+    const aclDocument = await fetchSolidDocumentIfFound(aclResourceUrl ?? '', { fetch });
 
     if (!aclDocument) {
         return fetchEffectiveACL(requireUrlParentDirectory(resourceUrl), fetch);

package/src/models/SolidStore.ts

@@ -1,9 +1,11 @@
-import type { Quad } from 'rdf-js';
+import type { BlankNode, Literal, NamedNode, Quad, Variable } from 'rdf-js';
 
 import { expandIRI } from '@/helpers/vocabs';
 
 import SolidThing from './SolidThing';
 
+export type Term = NamedNode | Literal | BlankNode | Quad | Variable;
+
 export default class SolidStore {
 
     private quads: Quad[];
@@ -24,21 +26,21 @@ export default class SolidStore {
         this.quads.push(...quads);
     }
 
-    public statements(subject?: string, predicate?: string, object?: string): Quad[] {
+    public statements(subject?: Term | string, predicate?: Term | string, object?: Term | string): Quad[] {
         return this.quads.filter(
             statement =>
-                (!object || statement.object.value === this.expandIRI(object)) &&
-                (!subject || statement.subject.value === this.expandIRI(subject)) &&
-                (!predicate || statement.predicate.value === this.expandIRI(predicate)),
+                (!object || this.termMatches(statement.object, object)) &&
+                (!subject || this.termMatches(statement.subject, subject)) &&
+                (!predicate || this.termMatches(statement.predicate, predicate)),
         );
     }
 
-    public statement(subject?: string, predicate?: string, object?: string): Quad | null {
+    public statement(subject?: Term | string, predicate?: Term | string, object?: Term | string): Quad | null {
         const statement = this.quads.find(
             statement =>
-                (!object || statement.object.value === this.expandIRI(object)) &&
-                (!subject || statement.subject.value === this.expandIRI(subject)) &&
-                (!predicate || statement.predicate.value === this.expandIRI(predicate)),
+                (!object || this.termMatches(statement.object, object)) &&
+                (!subject || this.termMatches(statement.subject, subject)) &&
+                (!predicate || this.termMatches(statement.predicate, predicate)),
         );
 
         return statement ?? null;
@@ -58,4 +60,12 @@ export default class SolidStore {
         return expandIRI(iri);
     }
 
+    protected termMatches(term: Term, value: Term | string): boolean {
+        if (typeof value === 'string') {
+            return this.expandIRI(value) === term.value;
+        }
+
+        return term.termType === term.termType && term.value === value.value;
+    }
+
 }

package/src/models/index.ts

@@ -1,3 +1,5 @@
 export { default as SolidDocument, SolidDocumentPermission } from './SolidDocument';
 export { default as SolidStore } from './SolidStore';
 export { default as SolidThing } from './SolidThing';
+
+export * from './SolidStore';