@pelatform/storage 1.0.3 → 1.0.4

package/dist/{chunk-VZDXZ6EA.js → chunk-KJMGBTTL.js}

@@ -26,13 +26,13 @@ function validateFileType(fileName, allowedTypes) {
   const extension = fileName.split(".").pop()?.toLowerCase();
   const isValidMime = allowedTypes.some((type) => {
     if (type.includes("*")) {
-      const baseType = type.split("/")[0] ?? "";
+      const baseType = type.split("/")[0];
       return mimeType.startsWith(baseType);
     }
     return mimeType === type;
   });
   const isValidExtension = extension && allowedTypes.includes(`.${extension}`);
-  if (!(isValidMime || isValidExtension)) {
+  if (!isValidMime && !isValidExtension) {
     return {
       valid: false,
       error: `File type not allowed. Allowed types: ${allowedTypes.join(", ")}`
@@ -41,13 +41,11 @@ function validateFileType(fileName, allowedTypes) {
   return { valid: true };
 }
 function formatFileSize(bytes) {
-  if (bytes === 0) {
-    return "0 Bytes";
-  }
+  if (bytes === 0) return "0 Bytes";
   const k = 1024;
   const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
   const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return `${Number.parseFloat((bytes / k ** i).toFixed(2))} ${sizes[i]}`;
+  return `${parseFloat((bytes / k ** i).toFixed(2))} ${sizes[i]}`;
 }
 function sanitizeFileName(fileName) {
   return fileName.replace(/[^a-zA-Z0-9.-]/g, "_").replace(/_{2,}/g, "_").replace(/^_|_$/g, "").toLowerCase();
@@ -70,10 +68,11 @@ function parseS3Url(url) {
           bucket: pathParts2[0],
           key: pathParts2.slice(1).join("/")
         };
+      } else {
+        const bucket = urlObj.hostname.split(".")[0];
+        const key = urlObj.pathname.substring(1);
+        return { bucket, key };
       }
-      const bucket = urlObj.hostname.split(".")[0];
-      const key = urlObj.pathname.substring(1);
-      return { bucket, key };
     }
     const pathParts = urlObj.pathname.split("/").filter(Boolean);
     return {
@@ -139,18 +138,19 @@ function extractS3Info(url) {
     if (urlObj.hostname.includes("amazonaws.com")) {
       if (urlObj.hostname.startsWith("s3")) {
         const pathParts2 = urlObj.pathname.split("/").filter(Boolean);
-        const region2 = urlObj.hostname.split(".")[1];
+        const region = urlObj.hostname.split(".")[1];
         return {
           bucket: pathParts2[0],
           key: pathParts2.slice(1).join("/"),
-          region: region2
+          region
         };
+      } else {
+        const hostParts = urlObj.hostname.split(".");
+        const bucket = hostParts[0];
+        const region = hostParts[2];
+        const key = urlObj.pathname.substring(1);
+        return { bucket, key, region };
       }
-      const hostParts = urlObj.hostname.split(".");
-      const bucket = hostParts[0];
-      const region = hostParts[2];
-      const key = urlObj.pathname.substring(1);
-      return { bucket, key, region };
     }
     const pathParts = urlObj.pathname.split("/").filter(Boolean);
     return {
@@ -273,7 +273,7 @@ function getFileName(key) {
   return lastSlashIndex === -1 ? normalizedKey : normalizedKey.substring(lastSlashIndex + 1);
 }
 function base64ToBuffer(base64) {
-  const cleanBase64 = base64.includes(",") ? base64.split(",")[1] ?? "" : base64;
+  const cleanBase64 = base64.includes(",") ? base64.split(",")[1] : base64;
   return Buffer.from(cleanBase64, "base64");
 }
 function bufferToBase64(buffer, includeDataUrl = false, mimeType) {
@@ -301,9 +301,7 @@ function validateBatchFiles(files, options) {
     return files.map((file) => ({
       valid: false,
       fileName: file.name,
-      errors: [
-        `Maximum ${options.maxFiles} files allowed, but ${files.length} files provided`
-      ]
+      errors: [`Maximum ${options.maxFiles} files allowed, but ${files.length} files provided`]
     }));
   }
   for (const file of files) {
@@ -349,35 +347,25 @@ function detectFileTypeFromContent(buffer) {
     return "image/webp";
   }
   if (header[0] === 80 && header[1] === 75 && (header[2] === 3 || header[2] === 5)) {
-    const zipContent = buffer.toString(
-      "utf8",
-      0,
-      Math.min(buffer.length, 1e3)
-    );
-    if (zipContent.includes("word/")) {
+    const zipContent = buffer.toString("utf8", 0, Math.min(buffer.length, 1e3));
+    if (zipContent.includes("word/"))
       return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-    }
-    if (zipContent.includes("xl/")) {
+    if (zipContent.includes("xl/"))
       return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-    }
-    if (zipContent.includes("ppt/")) {
+    if (zipContent.includes("ppt/"))
       return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-    }
     return "application/zip";
   }
   if (header.subarray(4, 8).toString() === "ftyp") {
     return "video/mp4";
   }
-  if (header[0] !== void 0 && header[1] !== void 0 && header[0] === 255 && (header[1] & 224) === 224 || header.subarray(0, 3).toString() === "ID3") {
+  if (header[0] === 255 && (header[1] & 224) === 224 || header.subarray(0, 3).toString() === "ID3") {
     return "audio/mpeg";
   }
   let isText = true;
   const sampleSize = Math.min(buffer.length, 512);
   for (let i = 0; i < sampleSize; i++) {
     const byte = buffer[i];
-    if (byte === void 0) {
-      continue;
-    }
     if (byte === 0 || byte < 32 && byte !== 9 && byte !== 10 && byte !== 13) {
       isText = false;
       break;

package/dist/{chunk-NNFNVWIN.js → chunk-ZTZZCC52.js}

@@ -31,15 +31,11 @@ function getRequiredEnvVar(key) {
 }
 function getBooleanEnvVar(key, defaultValue = false) {
   const value = getEnvVar(key);
-  if (!value) {
-    return defaultValue;
-  }
+  if (!value) return defaultValue;
   return value.toLowerCase() === "true" || value === "1";
 }
 function loadS3Config() {
-  const provider = getRequiredEnvVar(
-    ENV_VARS.PELATFORM_S3_PROVIDER
-  );
+  const provider = getRequiredEnvVar(ENV_VARS.PELATFORM_S3_PROVIDER);
   const validProviders = [
     "aws",
     "cloudflare-r2",
@@ -79,15 +75,15 @@ function loadStorageConfig() {
   if (provider) {
     if (provider === "cloudinary") {
       return loadCloudinaryConfig();
+    } else {
+      return loadS3Config();
     }
-    return loadS3Config();
   }
   const hasCloudinaryVars = getEnvVar(ENV_VARS.PELATFORM_CLOUDINARY_CLOUD_NAME) && getEnvVar(ENV_VARS.PELATFORM_CLOUDINARY_API_KEY) && getEnvVar(ENV_VARS.PELATFORM_CLOUDINARY_API_SECRET);
   const hasS3Vars = getEnvVar(ENV_VARS.PELATFORM_S3_BUCKET) && getEnvVar(ENV_VARS.PELATFORM_S3_ACCESS_KEY_ID) && getEnvVar(ENV_VARS.PELATFORM_S3_SECRET_ACCESS_KEY);
   if (hasCloudinaryVars) {
     return loadCloudinaryConfig();
-  }
-  if (hasS3Vars) {
+  } else if (hasS3Vars) {
     const config = loadS3Config();
     if (!config.provider) {
       config.provider = "aws";
@@ -111,17 +107,11 @@ function isStorageConfigured() {
 }
 function getStorageProvider() {
   const provider = getEnvVar(ENV_VARS.PELATFORM_S3_PROVIDER);
-  if (provider) {
-    return provider;
-  }
+  if (provider) return provider;
   const hasCloudinaryVars = getEnvVar(ENV_VARS.PELATFORM_CLOUDINARY_CLOUD_NAME);
   const hasS3Vars = getEnvVar(ENV_VARS.PELATFORM_S3_BUCKET);
-  if (hasCloudinaryVars) {
-    return "cloudinary";
-  }
-  if (hasS3Vars) {
-    return "aws";
-  }
+  if (hasCloudinaryVars) return "cloudinary";
+  if (hasS3Vars) return "aws";
   return void 0;
 }
 function validateS3EnvVars() {

package/dist/cloudinary.js

@@ -1,6 +1,6 @@
 import {
   loadCloudinaryConfig
-} from "./chunk-NNFNVWIN.js";
+} from "./chunk-ZTZZCC52.js";
 
 // src/providers/cloudinary.ts
 import { v2 as cloudinary } from "cloudinary";
@@ -30,13 +30,11 @@ var CloudinaryProvider = class {
       } else if (options.contentType?.startsWith("video/")) {
         resourceType = "video";
       }
-      const keyParts = options.key.split("/").filter(Boolean);
+      const keyParts = options.key.split("/");
       let folder = "";
       let publicId = options.key;
       if (keyParts.length > 1) {
         folder = keyParts.slice(0, -1).join("/");
-      }
-      if (keyParts.length > 0) {
         publicId = keyParts[keyParts.length - 1];
       }
       const uploadOptions = {
@@ -296,12 +294,10 @@ var CloudinaryProvider = class {
   async listFolders(_options) {
     try {
       const result = await cloudinary.api.root_folders();
-      const folders = (result.folders || []).map(
-        (folder) => ({
-          name: folder.name,
-          path: folder.path
-        })
-      );
+      const folders = (result.folders || []).map((folder) => ({
+        name: folder.name,
+        path: folder.path
+      }));
       return {
         success: true,
         folders,

package/dist/helpers.js

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

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   loadStorageConfig,
   validateCloudinaryEnvVars,
   validateS3EnvVars
-} from "./chunk-NNFNVWIN.js";
+} from "./chunk-ZTZZCC52.js";
 export {
   ENV_VARS,
   getStorageEnvVars,

package/dist/s3.js

@@ -1,10 +1,10 @@
 import {
   buildPublicUrl,
   getMimeType
-} from "./chunk-VZDXZ6EA.js";
+} from "./chunk-KJMGBTTL.js";
 import {
   loadS3Config
-} from "./chunk-NNFNVWIN.js";
+} from "./chunk-ZTZZCC52.js";
 
 // src/providers/s3.ts
 import { S3Client } from "@aws-sdk/client-s3";
@@ -74,9 +74,7 @@ var FileOperations = class {
       const reader = result.Body.transformToWebStream().getReader();
       while (true) {
         const { done, value } = await reader.read();
-        if (done) {
-          break;
-        }
+        if (done) break;
         chunks.push(value);
       }
       const data = Buffer.concat(chunks);
@@ -126,9 +124,7 @@ var FileOperations = class {
         }
       });
       const result = await this.client.send(command);
-      const deleted = result.Deleted?.map((obj) => obj.Key).filter(
-        Boolean
-      );
+      const deleted = result.Deleted?.map((obj) => obj.Key).filter(Boolean);
       const errors = result.Errors?.map((err) => ({
         key: err.Key || "",
         error: err.Message || "Unknown error"
@@ -353,32 +349,33 @@ var FolderOperations = class {
             deletedFiles: []
           };
         }
-        const deleteCommand2 = new DeleteObjectsCommand2({
+        const deleteCommand = new DeleteObjectsCommand2({
           Bucket: this.config.bucket,
           Delete: {
             Objects: listResult.Contents.map((obj) => ({ Key: obj.Key })),
             Quiet: false
           }
         });
-        const deleteResult = await this.client.send(deleteCommand2);
+        const deleteResult = await this.client.send(deleteCommand);
         const deletedFiles = deleteResult.Deleted?.map((obj) => obj.Key).filter(Boolean) || [];
         return {
           success: true,
           deletedFiles
         };
+      } else {
+        const deleteCommand = new DeleteObjectsCommand2({
+          Bucket: this.config.bucket,
+          Delete: {
+            Objects: [{ Key: folderPath }],
+            Quiet: false
+          }
+        });
+        await this.client.send(deleteCommand);
+        return {
+          success: true,
+          deletedFiles: [folderPath]
+        };
       }
-      const deleteCommand = new DeleteObjectsCommand2({
-        Bucket: this.config.bucket,
-        Delete: {
-          Objects: [{ Key: folderPath }],
-          Quiet: false
-        }
-      });
-      await this.client.send(deleteCommand);
-      return {
-        success: true,
-        deletedFiles: [folderPath]
-      };
     } catch (error) {
       return {
         success: false,
@@ -562,7 +559,7 @@ var S3Provider = class {
         secretAccessKey: config.secretAccessKey
       },
       endpoint: config.endpoint,
-      forcePathStyle: config.forcePathStyle
+      forcePathStyle: config.forcePathStyle || false
     });
     this.fileOps = new FileOperations(this.client, this.config);
     this.folderOps = new FolderOperations(this.client, this.config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pelatform/storage",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Storage utilities for SaaS applications.",
   "author": "Pelatform",
   "license": "MIT",
@@ -56,7 +56,7 @@
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.943.0",
     "@aws-sdk/s3-request-presigner": "^3.943.0",
-    "@pelatform/tsconfig": "0.1.0",
+    "@pelatform/tsconfig": "0.1.1",
     "@types/mime-types": "^3.0.1",
     "@types/node": "^24.10.1",
     "cloudinary": "^2.8.0",