@pelatform/storage 1.0.5 → 1.0.7

package/dist/{chunk-KJMGBTTL.js → chunk-7IPYXDG4.js}

@@ -83,10 +83,15 @@ function parseS3Url(url) {
     return {};
   }
 }
-function buildPublicUrl(baseUrl, bucket, key) {
-  const cleanBaseUrl = baseUrl.replace(/\/$/, "");
+function buildPublicUrl(baseUrl, bucket, key, supabase) {
+  let cleanBaseUrl;
+  cleanBaseUrl = baseUrl.replace(/\/$/, "");
   const cleanKey = key.replace(/^\//, "");
-  return `${cleanBaseUrl}/${bucket}/${cleanKey}`;
+  if (supabase) {
+    cleanBaseUrl = cleanBaseUrl.replace(/\.storage/, "").replace(/\/storage\/v1\/s3$/, "");
+    cleanBaseUrl = `${cleanBaseUrl}/storage/v1/object/public`;
+  }
+  return `${cleanBaseUrl}/${bucket === "" ? "" : `${bucket}/`}${cleanKey}`;
 }
 function validateS3Key(key) {
   if (!key || key.length === 0) {

package/dist/cloudinary.d.ts

@@ -38,12 +38,12 @@ declare class CloudinaryService implements StorageInterface {
     downloadFile(key: string): Promise<DownloadResult>;
     deleteFile(key: string): Promise<DeleteResult>;
     deleteFiles(keys: string[]): Promise<BatchDeleteResult>;
+    listFiles(prefix?: string, maxKeys?: number): Promise<ListResult>;
     fileExists(key: string): Promise<boolean>;
     copyFile(sourceKey: string, destinationKey: string, metadata?: Record<string, string>): Promise<CopyResult>;
     moveFile(sourceKey: string, destinationKey: string, metadata?: Record<string, string>): Promise<MoveResult>;
     duplicateFile(sourceKey: string, destinationKey: string, metadata?: Record<string, string>): Promise<DuplicateResult>;
     renameFile(sourceKey: string, destinationKey: string, metadata?: Record<string, string>): Promise<MoveResult>;
-    listFiles(prefix?: string, maxKeys?: number): Promise<ListResult>;
     getDownloadUrl(key: string, expiresIn?: number): Promise<PresignedUrlResult>;
     getUploadUrl(key: string, contentType?: string, expiresIn?: number): Promise<PresignedUrlResult>;
     createFolderPath(path: string): Promise<CreateFolderResult>;

package/dist/cloudinary.js

@@ -32,10 +32,13 @@ var CloudinaryProvider = class {
       }
       const keyParts = options.key.split("/");
       let folder = "";
-      let publicId = options.key;
+      let publicId = keyParts[keyParts.length - 1];
       if (keyParts.length > 1) {
         folder = keyParts.slice(0, -1).join("/");
-        publicId = keyParts[keyParts.length - 1];
+      }
+      const dotIndex = publicId.lastIndexOf(".");
+      if (dotIndex > 0) {
+        publicId = publicId.slice(0, dotIndex);
       }
       const uploadOptions = {
         public_id: publicId,
@@ -47,8 +50,11 @@ var CloudinaryProvider = class {
       if (folder) {
         uploadOptions.folder = folder;
       }
+      if (this.config.folder) {
+        uploadOptions.folder = `${this.config.folder}/${folder}`;
+      }
       const result = await cloudinary.uploader.upload(fileData, uploadOptions);
-      const publicUrl = this.getPublicUrl(result.public_id);
+      const publicUrl = this.getPublicUrl(result.public_id, result.format);
       return {
         success: true,
         key: result.public_id,
@@ -102,6 +108,13 @@ var CloudinaryProvider = class {
         const filename = keyParts[keyParts.length - 1];
         publicId = `${folder}/${filename}`;
       }
+      const dotIndex = publicId.lastIndexOf(".");
+      if (dotIndex > 0) {
+        publicId = publicId.slice(0, dotIndex);
+      }
+      if (this.config.folder) {
+        publicId = `${this.config.folder}/${publicId}`;
+      }
       let resourceType = "raw";
       try {
         await cloudinary.api.resource(publicId, { resource_type: "image" });
@@ -254,11 +267,11 @@ var CloudinaryProvider = class {
       };
     }
   }
-  getPublicUrl(key) {
+  getPublicUrl(key, extension) {
     const protocol = this.config.secure !== false ? "https" : "http";
     const baseUrl = `${protocol}://res.cloudinary.com/${this.config.cloudName}`;
     const publicId = key;
-    return `${baseUrl}/image/upload/${publicId}`;
+    return `${baseUrl}/image/upload/${publicId}${extension ? `.${extension}` : ""}`;
   }
   // Folder operations
   async createFolder(options) {
@@ -433,6 +446,9 @@ var CloudinaryService = class {
   async deleteFiles(keys) {
     return this.batchDelete({ keys });
   }
+  async listFiles(prefix, maxKeys) {
+    return this.list({ prefix, maxKeys });
+  }
   async fileExists(key) {
     const result = await this.exists(key);
     return result.exists;
@@ -449,9 +465,6 @@ var CloudinaryService = class {
   async renameFile(sourceKey, destinationKey, metadata) {
     return this.moveFile(sourceKey, destinationKey, metadata);
   }
-  async listFiles(prefix, maxKeys) {
-    return this.list({ prefix, maxKeys });
-  }
   async getDownloadUrl(key, expiresIn) {
     return this.getPresignedUrl({ key, operation: "get", expiresIn });
   }

package/dist/helpers.d.ts

@@ -221,7 +221,7 @@ declare function parseS3Url(url: string): {
  * // Returns: "https://storage.example.com/assets/images/logo.png"
  * ```
  */
-declare function buildPublicUrl(baseUrl: string, bucket: string, key: string): string;
+declare function buildPublicUrl(baseUrl: string, bucket: string, key: string, supabase?: boolean): string;
 /**
  * Validate S3 key format according to AWS S3 naming rules
  * @param key S3 object key to validate

package/dist/helpers.js

@@ -31,7 +31,7 @@ import {
   validateFileType,
   validateS3Config,
   validateS3Key
-} from "./chunk-KJMGBTTL.js";
+} from "./chunk-7IPYXDG4.js";
 export {
   base64ToBuffer,
   bufferToBase64,

package/dist/s3.d.ts

@@ -1,4 +1,4 @@
-import { S as StorageInterface, v as S3Config, U as UploadOptions, a as UploadResult, D as DownloadOptions, b as DownloadResult, c as DeleteOptions, d as DeleteResult, B as BatchDeleteOptions, e as BatchDeleteResult, L as ListOptions, f as ListResult, E as ExistsResult, g as CopyOptions, h as CopyResult, M as MoveOptions, i as MoveResult, j as DuplicateOptions, k as DuplicateResult, P as PresignedUrlOptions, l as PresignedUrlResult, m as CreateFolderOptions, n as CreateFolderResult, o as DeleteFolderOptions, p as DeleteFolderResult, q as ListFoldersOptions, r as ListFoldersResult, F as FolderExistsResult, R as RenameFolderOptions, s as RenameFolderResult, t as CopyFolderOptions, u as CopyFolderResult } from './storage-interface-CoYx1E3B.js';
+import { S as StorageInterface, v as S3Config, U as UploadOptions, a as UploadResult, D as DownloadOptions, b as DownloadResult, c as DeleteOptions, d as DeleteResult, B as BatchDeleteOptions, e as BatchDeleteResult, L as ListOptions, f as ListResult, E as ExistsResult, g as CopyOptions, h as CopyResult, M as MoveOptions, i as MoveResult, j as DuplicateOptions, k as DuplicateResult, P as PresignedUrlOptions, l as PresignedUrlResult, m as CreateFolderOptions, n as CreateFolderResult, o as DeleteFolderOptions, p as DeleteFolderResult, q as ListFoldersOptions, r as ListFoldersResult, F as FolderExistsResult, R as RenameFolderOptions, s as RenameFolderResult, t as CopyFolderOptions, u as CopyFolderResult, x as S3ProviderType } from './storage-interface-CoYx1E3B.js';
 
 /**
  * S3 storage service implementation
@@ -41,6 +41,7 @@ declare class S3Service implements StorageInterface {
     downloadFile(key: string): Promise<DownloadResult>;
     deleteFile(key: string): Promise<DeleteResult>;
     deleteFiles(keys: string[]): Promise<BatchDeleteResult>;
+    listFiles(prefix?: string, maxKeys?: number): Promise<ListResult>;
     fileExists(key: string): Promise<boolean>;
     copyFile(sourceKey: string, destinationKey: string, options?: Partial<CopyOptions>): Promise<CopyResult>;
     moveFile(sourceKey: string, destinationKey: string, options?: Partial<MoveOptions>): Promise<MoveResult>;
@@ -55,6 +56,7 @@ declare class S3Service implements StorageInterface {
     copyFolderPath(sourcePath: string, destinationPath: string, recursive?: boolean): Promise<CopyFolderResult>;
 }
 
+declare const S3_PROVIDER: S3ProviderType;
 /**
  * Create S3 service using environment variables or manual configuration
  * @param config Optional S3 configuration. If not provided, loads from environment variables
@@ -105,4 +107,4 @@ declare class S3Service implements StorageInterface {
 declare function createS3(): S3Service;
 declare function createS3(config: S3Config): S3Service;
 
-export { S3Service, createS3 };
+export { S3Service, S3_PROVIDER, createS3 };

package/dist/s3.js

@@ -1,7 +1,7 @@
 import {
   buildPublicUrl,
   getMimeType
-} from "./chunk-KJMGBTTL.js";
+} from "./chunk-7IPYXDG4.js";
 import {
   loadS3Config
 } from "./chunk-ZTZZCC52.js";
@@ -291,11 +291,18 @@ var FileOperations = class {
     }
   }
   getPublicUrl(key) {
+    const isCloudflare = this.config.provider === "cloudflare-r2";
+    const isSupabase = this.config.provider === "supabase";
     if (this.config.publicUrl) {
-      return buildPublicUrl(this.config.publicUrl, this.config.bucket, key);
+      return buildPublicUrl(
+        this.config.publicUrl,
+        isCloudflare ? "" : this.config.bucket,
+        key,
+        isSupabase
+      );
     }
     if (this.config.endpoint) {
-      return buildPublicUrl(this.config.endpoint, this.config.bucket, key);
+      return buildPublicUrl(this.config.endpoint, this.config.bucket, key, isSupabase);
     }
     return `https://${this.config.bucket}.s3.${this.config.region}.amazonaws.com/${key}`;
   }
@@ -723,6 +730,9 @@ var S3Service = class {
   async deleteFiles(keys) {
     return this.batchDelete({ keys });
   }
+  async listFiles(prefix, maxKeys) {
+    return this.list({ prefix, maxKeys });
+  }
   async fileExists(key) {
     const result = await this.exists(key);
     return result.exists;
@@ -786,6 +796,7 @@ var S3Service = class {
 };
 
 // src/s3.ts
+var S3_PROVIDER = process.env.PELATFORM_S3_PROVIDER;
 function createS3(config) {
   if (config) {
     return new S3Service(config);
@@ -795,5 +806,6 @@ function createS3(config) {
 }
 export {
   S3Service,
+  S3_PROVIDER,
   createS3
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pelatform/storage",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Storage utilities for SaaS applications.",
   "author": "Pelatform",
   "license": "MIT",
@@ -28,10 +28,13 @@
   },
   "scripts": {
     "clean": "rimraf dist",
-    "clean:all": "rimraf .turbo dist node_modules",
+    "clean:all": "rimraf .turbo coverage dist node_modules",
     "dev": "tsup --watch",
     "build": "tsup",
-    "types:check": "tsc --noEmit"
+    "types:check": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   },
   "repository": "github:devpelatform/toolkits",
   "homepage": "https://github.com/devpelatform/toolkits",
@@ -54,11 +57,11 @@
     "mime-types": "^3.0.2"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.948.0",
-    "@aws-sdk/s3-request-presigner": "^3.948.0",
+    "@aws-sdk/client-s3": "^3.953.0",
+    "@aws-sdk/s3-request-presigner": "^3.953.0",
     "@pelatform/tsconfig": "0.1.3",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.0.1",
+    "@types/node": "^25.0.3",
     "cloudinary": "^2.8.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"