@pelatform/storage 1.0.6 → 1.0.7

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

@@ -1,11 +1,5 @@
 // src/helpers.ts
 import { lookup } from "mime-types";
-function getSupabasePublicUrl(key) {
-  const bucket = process.env.PELATFORM_S3_BUCKET || "";
-  const endpoint = process.env.PELATFORM_S3_ENDPOINT || "";
-  const publicUrl = endpoint.replace(/\.storage/, "").replace(/\/storage\/v1\/s3$/, "");
-  return `${publicUrl}/storage/v1/object/public/${bucket}/${key}?v=${Date.now()}`;
-}
 function generateFileKey(originalName, prefix) {
   const timestamp = Date.now();
   const random = Math.random().toString(36).substring(2, 8);
@@ -89,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) {
@@ -384,7 +383,6 @@ function detectFileTypeFromContent(buffer) {
 }
 
 export {
-  getSupabasePublicUrl,
   generateFileKey,
   getMimeType,
   validateFileSize,

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

@@ -2,19 +2,6 @@
  * Storage helper utilities
  * Provides utility functions for file operations, MIME type detection, and path manipulation
  */
-/**
- * Generate public URL for a storage key using environment variables
- * @param key The storage key/path
- * @returns Constructed public URL with timestamp versioning
- * @public
- *
- * @example
- * ```typescript
- * // Requires env vars: PELATFORM_S3_BUCKET, PELATFORM_S3_ENDPOINT
- * const url = getSupabasePublicUrl('folder/image.png');
- * ```
- */
-declare function getSupabasePublicUrl(key: string): string;
 /**
  * Generate a unique file key with timestamp and random string
  * @param originalName Original file name
@@ -234,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
@@ -772,4 +759,4 @@ declare function validateBatchFiles(files: File[], options: {
  */
 declare function detectFileTypeFromContent(buffer: Buffer): string;
 
-export { base64ToBuffer, bufferToBase64, buildPublicUrl, detectFileTypeFromContent, extractS3Info, fileToBuffer, formatFileSize, generateBatchKeys, generateCacheControl, generateFileHash, generateFileKey, generateUniqueKey, getContentDisposition, getFileExtension, getFileInfo, getFileName, getMimeType, getParentPath, getSupabasePublicUrl, isAudioFile, isDocumentFile, isImageFile, isVideoFile, joinPath, normalizePath, parseS3Url, sanitizeFileName, validateBatchFiles, validateBucketName, validateFileSize, validateFileType, validateS3Config, validateS3Key };
+export { base64ToBuffer, bufferToBase64, buildPublicUrl, detectFileTypeFromContent, extractS3Info, fileToBuffer, formatFileSize, generateBatchKeys, generateCacheControl, generateFileHash, generateFileKey, generateUniqueKey, getContentDisposition, getFileExtension, getFileInfo, getFileName, getMimeType, getParentPath, isAudioFile, isDocumentFile, isImageFile, isVideoFile, joinPath, normalizePath, parseS3Url, sanitizeFileName, validateBatchFiles, validateBucketName, validateFileSize, validateFileType, validateS3Config, validateS3Key };

package/dist/helpers.js

@@ -17,7 +17,6 @@ import {
   getFileName,
   getMimeType,
   getParentPath,
-  getSupabasePublicUrl,
   isAudioFile,
   isDocumentFile,
   isImageFile,
@@ -32,7 +31,7 @@ import {
   validateFileType,
   validateS3Config,
   validateS3Key
-} from "./chunk-CT5YOIGU.js";
+} from "./chunk-7IPYXDG4.js";
 export {
   base64ToBuffer,
   bufferToBase64,
@@ -52,7 +51,6 @@ export {
   getFileName,
   getMimeType,
   getParentPath,
-  getSupabasePublicUrl,
   isAudioFile,
   isDocumentFile,
   isImageFile,

package/dist/s3.d.ts

@@ -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>;

package/dist/s3.js

@@ -1,7 +1,7 @@
 import {
   buildPublicUrl,
   getMimeType
-} from "./chunk-CT5YOIGU.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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pelatform/storage",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Storage utilities for SaaS applications.",
   "author": "Pelatform",
   "license": "MIT",