@undefineds.co/drizzle-solid 0.2.13 → 0.3.0

package/dist/utils/webid-resolver.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webIdResolver = exports.WebIdResolver = void 0;
-const query_sparql_solid_1 = require("@comunica/query-sparql-solid");
+const n3_1 = require("n3");
+const PIM_STORAGE = 'http://www.w3.org/ns/pim/space#storage';
+const SOLID_POD = 'http://www.w3.org/ns/solid/terms#pod';
 /**
  * Resolver to find the actual storage root (SP) from a WebID (IdP).
  * Implements the IdP-SP Separation architecture.
@@ -9,7 +11,24 @@ const query_sparql_solid_1 = require("@comunica/query-sparql-solid");
 class WebIdResolver {
     constructor() {
         this.cache = new Map();
-        this.engine = new query_sparql_solid_1.QueryEngine();
+    }
+    extractStorageFromProfile(webId, profileText, contentType) {
+        const normalizedContentType = contentType?.split(';')[0]?.trim().toLowerCase();
+        const parser = new n3_1.Parser({
+            baseIRI: webId,
+            format: normalizedContentType === 'application/n-triples' ? 'N-Triples' : undefined,
+        });
+        const quads = parser.parse(profileText);
+        const preferredPredicates = [PIM_STORAGE, SOLID_POD];
+        for (const predicate of preferredPredicates) {
+            const match = quads.find((quad) => {
+                return quad.subject.value === webId && quad.predicate.value === predicate;
+            });
+            if (match?.object?.value) {
+                return match.object.value;
+            }
+        }
+        return null;
     }
     /**
      * Resolve the storage root URL from a WebID Profile.
@@ -24,35 +43,22 @@ class WebIdResolver {
             return this.cache.get(webId);
         }
         try {
-            // PIM Storage (WSIM) is the primary predicate, solid:pod is secondary
-            // We look for both
-            const query = `
-        SELECT ?storage WHERE {
-          { <${webId}> <http://www.w3.org/ns/pim/space#storage> ?storage }
-          UNION
-          { <${webId}> <http://www.w3.org/ns/solid/terms#pod> ?storage }
-        } LIMIT 1
-      `;
-            // Use authenticated fetch if available, otherwise fall back to unauthenticated
-            // Profile documents are usually public, but some might be private
-            const context = {
-                sources: [webId],
-                lenient: true
-            };
-            if (fetchFn) {
-                context.fetch = fetchFn;
-            }
-            const bindingsStream = await this.engine.queryBindings(query, context);
-            const bindings = await bindingsStream.toArray();
-            if (bindings.length > 0) {
-                const storage = bindings[0].get('storage')?.value;
-                if (storage) {
-                    // Ensure trailing slash for directory/container semantics
-                    const normalized = storage.endsWith('/') ? storage : `${storage}/`;
-                    console.log(`[WebIdResolver] Resolved storage for ${webId} -> ${normalized}`);
-                    this.cache.set(webId, normalized);
-                    return normalized;
+            const effectiveFetch = fetchFn ?? fetch;
+            const response = await effectiveFetch(webId, {
+                headers: {
+                    Accept: 'text/turtle, application/n-triples;q=0.9, text/n3;q=0.8, */*;q=0.1'
                 }
+            });
+            if (!response.ok) {
+                throw new Error(`Failed to fetch WebID profile: ${response.status} ${response.statusText}`);
+            }
+            const profileText = await response.text();
+            const storage = this.extractStorageFromProfile(webId, profileText, response.headers.get('content-type'));
+            if (storage) {
+                const normalized = storage.endsWith('/') ? storage : `${storage}/`;
+                console.log(`[WebIdResolver] Resolved storage for ${webId} -> ${normalized}`);
+                this.cache.set(webId, normalized);
+                return normalized;
             }
         }
         catch (error) {

package/dist/utils/webid-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"webid-resolver.js","sourceRoot":"","sources":["../../src/utils/webid-resolver.ts"],"names":[],"mappings":";;;AAAA,qEAA2D;AAE3D;;;GAGG;AACH,MAAa,aAAa;IAIxB;QAFQ,UAAK,GAAwB,IAAI,GAAG,EAAE,CAAC;QAG7C,IAAI,CAAC,MAAM,GAAG,IAAI,gCAAW,EAAE,CAAC;IAClC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,OAAsB;QACxD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;QAChC,CAAC;QAED,IAAI,CAAC;YACH,sEAAsE;YACtE,mBAAmB;YACnB,MAAM,KAAK,GAAG;;eAEL,KAAK;;eAEL,KAAK;;OAEb,CAAC;YAEF,+EAA+E;YAC/E,kEAAkE;YAClE,MAAM,OAAO,GAAQ;gBACnB,OAAO,EAAE,CAAC,KAAK,CAAC;gBAChB,OAAO,EAAE,IAAI;aACd,CAAC;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC;YAC1B,CAAC;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;YAEhD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;gBAClD,IAAI,OAAO,EAAE,CAAC;oBACZ,0DAA0D;oBAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,CAAC;oBAEnE,OAAO,CAAC,GAAG,CAAC,wCAAwC,KAAK,OAAO,UAAU,EAAE,CAAC,CAAC;oBAC9E,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;oBAClC,OAAO,UAAU,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,iDAAiD,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAChF,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF;AAtED,sCAsEC;AAED,qBAAqB;AACR,QAAA,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC"}
+{"version":3,"file":"webid-resolver.js","sourceRoot":"","sources":["../../src/utils/webid-resolver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@undefineds.co/drizzle-solid",
-  "version": "0.2.13",
+  "version": "0.3.0",
   "description": "Drizzle ORM adapter for Solid Pods",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -78,7 +78,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@comunica/query-sparql-solid": "^4.0.2",
     "@inrupt/solid-client": "^3.0.0",
     "@inrupt/solid-client-authn-node": "^3.1.1",
     "@inrupt/universal-fetch": "^1.0.3",
@@ -108,6 +107,15 @@
     "ts-node": "^10.9.0",
     "typescript": "^5.0.0",
     "vite": "^5.4.21",
-    "vitest": "^2.1.9"
+    "vitest": "^2.1.9",
+    "@comunica/query-sparql-solid": "^4.0.2"
+  },
+  "peerDependencies": {
+    "@comunica/query-sparql-solid": "^4.0.2"
+  },
+  "peerDependenciesMeta": {
+    "@comunica/query-sparql-solid": {
+      "optional": true
+    }
   }
 }