@directus/storage-driver-supabase 1.0.10 → 1.0.12

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import * as undici from 'undici';
 import { Driver, Range } from '@directus/storage';
 import { Readable } from 'node:stream';
 
@@ -6,6 +5,7 @@ type DriverSupabaseConfig = {
     bucket: string;
     serviceRole: string;
     projectId?: string;
+    /** Allows a custom Supabase endpoint for self-hosting */
     endpoint?: string;
     root?: string;
 };
@@ -17,12 +17,11 @@ declare class DriverSupabase implements Driver {
     private get endpoint();
     private getClient;
     private getBucket;
-    private getFullPath;
+    private fullPath;
     private getAuthenticatedUrl;
     read(filepath: string, range?: Range): Promise<Readable>;
-    head(filepath: string): Promise<undici.Headers>;
     stat(filepath: string): Promise<{
-        size: number;
+        size: any;
         modified: Date;
     }>;
     exists(filepath: string): Promise<boolean>;
@@ -30,7 +29,8 @@ declare class DriverSupabase implements Driver {
     copy(src: string, dest: string): Promise<void>;
     write(filepath: string, content: Readable, type?: string): Promise<void>;
     delete(filepath: string): Promise<void>;
-    list(prefix?: string): AsyncGenerator<string, void, unknown>;
+    list(prefix?: string): AsyncIterable<string>;
+    listGenerator(prefix: string): AsyncIterable<string>;
 }
 
 export { DriverSupabase, type DriverSupabaseConfig, DriverSupabase as default };

package/dist/index.js

@@ -9,7 +9,10 @@ var DriverSupabase = class {
   client;
   bucket;
   constructor(config) {
-    this.config = config;
+    this.config = {
+      ...config,
+      root: normalizePath(config.root ?? "", { removeLeading: true })
+    };
     this.client = this.getClient();
     this.bucket = this.getBucket();
   }
@@ -34,11 +37,14 @@ var DriverSupabase = class {
     }
     return this.client.from(this.config.bucket);
   }
-  getFullPath(filepath) {
-    return this.config.root ? normalizePath(join(this.config.root, filepath)) : filepath;
+  fullPath(filepath) {
+    const path = join(this.config.root, filepath);
+    if (path === ".")
+      return "";
+    return normalizePath(path);
   }
   getAuthenticatedUrl(filepath) {
-    return `${this.endpoint}/${join("object/authenticated", this.config.bucket, this.getFullPath(filepath))}`;
+    return `${this.endpoint}/${join("object/authenticated", this.config.bucket, this.fullPath(filepath))}`;
   }
   async read(filepath, range) {
     const requestInit = { method: "GET" };
@@ -54,23 +60,17 @@ var DriverSupabase = class {
     }
     return Readable.fromWeb(response.body);
   }
-  async head(filepath) {
-    const response = await fetch(this.getAuthenticatedUrl(filepath), {
-      method: "HEAD",
-      headers: {
-        Authorization: `Bearer ${this.config.serviceRole}`
-      }
+  async stat(filepath) {
+    const { data, error } = await this.bucket.list(this.config.root, {
+      search: filepath,
+      limit: 1
     });
-    if (response.status >= 400) {
+    if (error || data.length === 0) {
       throw new Error("File not found");
     }
-    return response.headers;
-  }
-  async stat(filepath) {
-    const headers = await this.head(filepath);
     return {
-      size: parseInt(headers.get("content-length") || ""),
-      modified: new Date(headers.get("last-modified") || "")
+      size: data[0]?.metadata["contentLength"] ?? 0,
+      modified: new Date(data[0]?.metadata["lastModified"] || null)
     };
   }
   async exists(filepath) {
@@ -82,13 +82,13 @@ var DriverSupabase = class {
     }
   }
   async move(src, dest) {
-    await this.bucket.move(this.getFullPath(src), this.getFullPath(dest));
+    await this.bucket.move(this.fullPath(src), this.fullPath(dest));
   }
   async copy(src, dest) {
-    await this.bucket.copy(this.getFullPath(src), this.getFullPath(dest));
+    await this.bucket.copy(this.fullPath(src), this.fullPath(dest));
   }
   async write(filepath, content, type) {
-    await this.bucket.upload(this.getFullPath(filepath), content, {
+    await this.bucket.upload(this.fullPath(filepath), content, {
       contentType: type ?? "",
       cacheControl: "3600",
       upsert: true,
@@ -96,26 +96,45 @@ var DriverSupabase = class {
     });
   }
   async delete(filepath) {
-    await this.bucket.remove([this.getFullPath(filepath)]);
+    await this.bucket.remove([this.fullPath(filepath)]);
+  }
+  list(prefix = "") {
+    const fullPrefix = this.fullPath(prefix);
+    return this.listGenerator(fullPrefix);
   }
-  async *list(prefix = "") {
+  async *listGenerator(prefix) {
     const limit = 1e3;
     let offset = 0;
     let itemCount = 0;
+    const isDirectory = prefix.endsWith("/");
+    const prefixDirectory = isDirectory ? prefix : dirname(prefix);
+    const search = isDirectory ? "" : prefix.split("/").pop() ?? "";
     do {
-      const { data, error } = await this.bucket.list(this.config.root, { limit, offset, search: prefix });
+      const { data, error } = await this.bucket.list(prefixDirectory, {
+        limit,
+        offset,
+        search
+      });
       if (!data || error) {
         break;
       }
       itemCount = data.length;
       offset += itemCount;
       for (const item of data) {
-        yield item.name;
+        const filePath = normalizePath(join(prefixDirectory, item.name));
+        if (item.id !== null) {
+          yield filePath.substring(this.config.root ? this.config.root.length + 1 : 0);
+        } else {
+          yield* this.listGenerator(`${filePath}/`);
+        }
       }
     } while (itemCount === limit);
   }
 };
 var src_default = DriverSupabase;
+function dirname(path) {
+  return path.split("/").slice(0, -1).join("/");
+}
 export {
   DriverSupabase,
   src_default as default

package/license

@@ -1,7 +1,7 @@
 Licensor:             Monospace, Inc.
 
 Licensed Work:        Directus
-                      The Licensed Work is Copyright © 2023 Monospace, Inc.
+                      The Licensed Work is Copyright © 2024 Monospace, Inc.
 
 Additional Use Grant: You may use the Licensed Work in production as long as
                       your Total Finances do not exceed US $5,000,000 for the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/storage-driver-supabase",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Supabase file storage abstraction for `@directus/storage`",
   "homepage": "https://directus.io",
   "repository": {
@@ -22,16 +22,16 @@
   ],
   "dependencies": {
     "@supabase/storage-js": "2.5.5",
-    "undici": "6.7.0",
-    "@directus/utils": "11.0.6",
-    "@directus/storage": "10.0.11"
+    "undici": "6.15.0",
+    "@directus/storage": "10.0.12",
+    "@directus/utils": "11.0.8"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
-    "@vitest/coverage-v8": "1.3.1",
+    "@vitest/coverage-v8": "1.5.3",
     "tsup": "8.0.2",
-    "typescript": "5.3.3",
-    "vitest": "1.3.1",
+    "typescript": "5.4.5",
+    "vitest": "1.5.3",
     "@directus/tsconfig": "1.0.1"
   },
   "scripts": {