@airoom/nextmin-node 1.3.0 → 1.4.0

package/dist/api/router/setupFileRoutes.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupFileRoutes = setupFileRoutes;
 const multer_1 = __importDefault(require("multer"));
-const filename_1 = require("../../files/filename");
 function setupFileRoutes(ctx) {
     if (!ctx.fileStorage)
         return;
@@ -24,13 +23,8 @@ function setupFileRoutes(ctx) {
                     .json({ error: true, message: 'No files uploaded' });
             }
             const results = await Promise.all(files.map(async (f) => {
-                const folder = shortFolder();
-                const ext = (f.originalname.match(/\.([A-Za-z0-9]{1,8})$/)?.[1] ??
-                    (0, filename_1.extFromMime)(f.mimetype) ??
-                    'bin').toLowerCase();
-                const key = `${folder}/${shortUid()}.${ext}`;
                 const out = await ctx.fileStorage.upload({
-                    key,
+                    originalFilename: f.originalname,
                     body: f.buffer,
                     contentType: f.mimetype,
                     metadata: { originalName: f.originalname || '' },
@@ -68,13 +62,8 @@ function setupFileRoutes(ctx) {
                     .json({ error: true, message: 'No files uploaded' });
             }
             const results = await Promise.all(files.map(async (f) => {
-                const folder = shortFolder();
-                const ext = (f.originalname.match(/\.([A-Za-z0-9]{1,8})$/)?.[1] ??
-                    (0, filename_1.extFromMime)(f.mimetype) ??
-                    'bin').toLowerCase();
-                const key = `${folder}/${shortUid()}.${ext}`;
                 const out = await ctx.fileStorage.upload({
-                    key,
+                    originalFilename: f.originalname,
                     body: f.buffer,
                     contentType: f.mimetype,
                     metadata: { originalName: f.originalname || '' },
@@ -126,13 +115,3 @@ function setupFileRoutes(ctx) {
         }
     });
 }
-function shortFolder() {
-    const d = new Date();
-    const y = d.getFullYear();
-    const m = String(d.getMonth() + 1).padStart(2, '0');
-    const day = String(d.getDate()).padStart(2, '0');
-    return `uploads/${y}/${m}/${day}`;
-}
-function shortUid() {
-    return (Date.now().toString(36) + Math.random().toString(36).slice(2, 6)).toLowerCase();
-}

package/dist/files/FileStorageAdapter.d.ts

@@ -2,6 +2,8 @@ export type FileProvider = 's3' | 'gcs' | 'local' | (string & {});
 export interface UploadPayload {
     /** Path-like key inside bucket/provider, e.g. "uploads/userId/2025/08/18/file.png" */
     key?: string;
+    /** Original filename for slugification (e.g., "My Document.pdf") */
+    originalFilename?: string;
     /** Raw file content */
     body: Buffer | Uint8Array | ArrayBuffer;
     /** MIME type */

package/dist/files/S3FileStorageAdapter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3FileStorageAdapter = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
+const filename_1 = require("./filename");
 // Encode per path segment, keep slashes
 function encodeKeySegments(key) {
     return key.split('/').map(encodeURIComponent).join('/');
@@ -25,7 +26,7 @@ class S3FileStorageAdapter {
     async upload(input) {
         if (!input.body)
             throw new Error('S3 upload: "body" is required');
-        const key = input.key ?? this.randomKey();
+        const key = input.key ?? this.randomKey(input.originalFilename);
         // Build params without ACL by default
         const params = {
             Bucket: this.bucket,
@@ -71,14 +72,19 @@ class S3FileStorageAdapter {
         return `https://${this.bucket}.s3.${this.regionStr}.amazonaws.com/${encKey}`;
     }
     // ---- private helpers ----
-    randomKey() {
+    randomKey(originalFilename) {
         const ts = new Date();
         const y = ts.getUTCFullYear();
         const m = String(ts.getUTCMonth() + 1).padStart(2, '0');
         const d = String(ts.getUTCDate()).padStart(2, '0');
-        const rand = Math.random().toString(36).slice(2, 10);
-        // You wanted keys like uploads/YYYY/MM/DD/uid.ext (ext is added by router)
-        return `uploads/${y}/${m}/${d}/${rand}`;
+        const randomId = Math.random().toString(36).slice(2, 10);
+        // Generate filename: slugified-name-randomid.ext or just randomid if no original name
+        const filename = originalFilename
+            ? (0, filename_1.filenameWithRandomId)(originalFilename, randomId)
+            : randomId;
+        // Path: uploads/YYYY/MM/DD/filename
+        const fullPath = `uploads/${y}/${m}/${d}/${filename}`;
+        return fullPath;
     }
 }
 exports.S3FileStorageAdapter = S3FileStorageAdapter;

package/dist/files/filename.d.ts

@@ -1,4 +1,14 @@
 export declare function sanitizeFilename(name: string): string;
+/**
+ * Slugify a filename: lowercase, replace spaces/special chars with hyphens
+ * Example: "My Photo (2024).jpg" → "my-photo-2024.jpg"
+ */
+export declare function slugify(text: string): string;
+/**
+ * Generate a filename from original name + random ID
+ * Example: "my-document.pdf" + "abc123" → "my-document-abc123.pdf"
+ */
+export declare function filenameWithRandomId(originalName: string, randomId: string): string;
 export declare function withTimestampPrefix(name: string): string;
 export declare function joinKey(...parts: string[]): string;
 export declare function ensureExt(name: string, fallbackExt?: string): string;

package/dist/files/filename.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanitizeFilename = sanitizeFilename;
+exports.slugify = slugify;
+exports.filenameWithRandomId = filenameWithRandomId;
 exports.withTimestampPrefix = withTimestampPrefix;
 exports.joinKey = joinKey;
 exports.ensureExt = ensureExt;
@@ -9,6 +11,39 @@ function sanitizeFilename(name) {
     const base = name.replace(/[/\\?%*:|"<>]/g, '-').replace(/\s+/g, '-');
     return base.replace(/-+/g, '-').toLowerCase();
 }
+/**
+ * Slugify a filename: lowercase, replace spaces/special chars with hyphens
+ * Example: "My Photo (2024).jpg" → "my-photo-2024.jpg"
+ */
+function slugify(text) {
+    return text
+        .toLowerCase()
+        .trim()
+        // Replace spaces and underscores with hyphens
+        .replace(/[\s_]+/g, '-')
+        // Remove special characters except hyphens, dots, and alphanumeric
+        .replace(/[^\w\-\.]+/g, '')
+        // Replace multiple consecutive hyphens with single hyphen
+        .replace(/-+/g, '-')
+        // Remove leading/trailing hyphens
+        .replace(/^-+|-+$/g, '');
+}
+/**
+ * Generate a filename from original name + random ID
+ * Example: "my-document.pdf" + "abc123" → "my-document-abc123.pdf"
+ */
+function filenameWithRandomId(originalName, randomId) {
+    // Extract extension
+    const lastDot = originalName.lastIndexOf('.');
+    const hasExt = lastDot > 0 && lastDot < originalName.length - 1;
+    const nameWithoutExt = hasExt ? originalName.slice(0, lastDot) : originalName;
+    const ext = hasExt ? originalName.slice(lastDot) : '';
+    // Slugify the name part
+    const slugifiedName = slugify(nameWithoutExt);
+    // Combine: slugified-name-randomid.ext
+    const result = `${slugifiedName}-${randomId}${ext}`;
+    return result;
+}
 function withTimestampPrefix(name) {
     const ts = Date.now();
     return `${ts}-${name}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airoom/nextmin-node",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",