@muze-nl/jsfs-solid 0.3.9 → 0.4.1

package/dist/browser.js

@@ -1785,7 +1785,7 @@
       function numberIsNaN(obj) {
         return obj !== obj;
       }
-      var hexSliceLookupTable = function() {
+      var hexSliceLookupTable = (function() {
         const alphabet = "0123456789abcdef";
         const table = new Array(256);
         for (let i = 0; i < 16; ++i) {
@@ -1795,7 +1795,7 @@
           }
         }
         return table;
-      }();
+      })();
       function defineBigIntMethod(fn) {
         return typeof BigInt === "undefined" ? BufferBigIntNotDefined : fn;
       }
@@ -6465,7 +6465,7 @@
         const ac = new AbortController();
         const signal = ac.signal;
         const value = fn(
-          async function* () {
+          (async function* () {
             while (true) {
               const _promise = promise;
               promise = null;
@@ -6479,7 +6479,7 @@
               ({ promise, resolve } = createDeferredPromise());
               yield chunk;
             }
-          }(),
+          })(),
           {
             signal
           }
@@ -8408,7 +8408,7 @@
       options = Object.assign({}, this.clientOptions, options);
       let next;
       for (let middleware of middlewares) {
-        next = /* @__PURE__ */ function(next2, middleware2) {
+        next = /* @__PURE__ */ (function(next2, middleware2) {
           return async function(req2) {
             let res;
             let tracers = Object.values(_Client.tracers);
@@ -8425,7 +8425,7 @@
             }
             return res;
           };
-        }(next, middleware);
+        })(next, middleware);
       }
       return next(req);
     }
@@ -9139,6 +9139,8 @@
 
   // node_modules/@muze-nl/metro/src/api.mjs
   var API = class extends Client {
+    #methods = null;
+    #base = "";
     constructor(base, methods, bind = null) {
       if (base instanceof Client) {
         super(base.clientOptions, throwermw(), getdatamw());
@@ -9148,16 +9150,21 @@
       if (!bind) {
         bind = this;
       }
+      this.#methods = methods;
+      this.#base = base;
       for (const methodName in methods) {
         if (typeof methods[methodName] == "function") {
           this[methodName] = methods[methodName].bind(bind);
-        } else if (methods[methodName] && typeof methods[methodName] == "object") {
+        } else if (methods[methodName] && typeof methods[methodName] == "object" && (Object.getPrototypeOf(methods[methodName]) === null || Object.getPrototypeOf(methods[methodName]).constructor === Object)) {
           this[methodName] = new this.constructor(base, methods[methodName], bind);
         } else {
           this[methodName] = methods[methodName];
         }
       }
     }
+    extend(methods) {
+      return new this.constructor(this.#base, Object.assign({}, this.#methods, methods));
+    }
   };
   var JsonAPI = class extends API {
     constructor(base, methods, bind = null) {
@@ -13983,9 +13990,9 @@
     // and returns the items per list.
     extractLists({ remove = false, ignoreErrors = false } = {}) {
       const lists = {};
-      const onError = ignoreErrors ? () => true : (node, message) => {
+      const onError = ignoreErrors ? (() => true) : ((node, message) => {
         throw new Error(`${node.value} ${message}`);
-      };
+      });
       const tails = this.getQuads(null, IRIs_default.rdf.rest, IRIs_default.rdf.nil, null);
       const toRemove = remove ? [...tails] : [];
       tails.forEach((tailQuad) => {
@@ -15486,24 +15493,25 @@
     if (!profile || !profile.solid$oidcIssuer) {
       throw new Error("solidClient: " + webid + " did not return valid solid profile");
     }
-    options.issuer = profile.solid$oidcIssuer.id;
+    if (!options.issuer) {
+      options.issuer = oldm.one(profile.solid$oidcIssuer)?.id;
+    }
     const storage = oldm.many(profile.space$storage).map((s) => new jsfs.fs(new SolidAdapter(s.id, "/", options)));
-    const client2 = metro.client(metro.oidc.oidcmw(options), oldmmw(options));
-    Object.assign(client2, {
-      profile,
-      issuer: profile.solid$oidcIssuer.id,
-      inbox: profile.ldp$inbox.id,
-      id: function() {
-        return metro.oidc.idToken(this.issuer);
-      },
-      logout: async function() {
-        throw new Error("not yet implemented");
-      },
-      storage
-    });
-    client2.id.bind(client2);
-    client2.logout.bind(client2);
-    return client2;
+    return metro.api(
+      metro.client(metro.oidc.oidcmw(options), oldmmw(options)),
+      {
+        profile,
+        issuer: oldm.one(profile.solid$oidcIssuer)?.id,
+        inbox: oldm.one(profile.ldp$inbox)?.id,
+        id: function() {
+          return metro.oidc.idToken(this.issuer);
+        },
+        logout: async function() {
+          throw new Error("not yet implemented");
+        },
+        storage
+      }
+    );
   }
 
   // src/browser.js