@constructive-io/upload-names 2.5.0 → 2.7.0

package/esm/index.js

@@ -1,14 +1,14 @@
 import { basename, extname } from 'path';
 import slugify from './slugify';
-export default (filename, { english = true, lower = true, delimeter = '-' } = {}) => {
+export default (filename, { english = true, lower = true, delimiter = '-' } = {}) => {
     // Step 1: Normalize input
     filename = filename.trim().replace(/\.{2,}/g, '.'); // collapse double dots
     const ext = extname(filename);
     const base = basename(filename, ext);
     // Step 2: Normalize base name
     const name = base
-        .replace(/\s+/g, delimeter)
-        .replace(new RegExp(`${delimeter}{2,}`, 'g'), delimeter)
+        .replace(/\s+/g, delimiter)
+        .replace(new RegExp(`${delimiter}{2,}`, 'g'), delimiter)
         .trim();
     // Step 3: Sluggify (ASCII-only if english = true)
     let slug = name;
@@ -20,6 +20,8 @@ export default (filename, { english = true, lower = true, delimeter = '-' } = {}
             throw new Error(`BAD_FILE_NAME ${name}`);
         }
     }
-    const result = english ? `${slug}${slugify(ext)}` : `${name}${ext}`;
+    // Slugify extension separately; re-add the dot since slugify strips leading dots
+    const sanitizedExt = ext ? `.${slugify(ext)}` : '';
+    const result = english ? `${slug}${sanitizedExt}` : `${name}${ext}`;
     return lower ? result.toLowerCase() : result;
 };

package/esm/slugify.js

@@ -2,8 +2,10 @@ export default (text) => {
     text = text.toString().trim();
     text = text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
     return text
-        .replace(/\s+/g, '-') // Replace spaces with -
-        .replace(/--+/g, '-') // Replace multiple - with single -
-        .replace(/^-+/, '') // Trim - from start of text
-        .replace(/-+$/, ''); // Trim - from end of text
+        .replace(/[^a-zA-Z0-9._-]/g, '-')
+        .replace(/\.{2,}/g, '.')
+        .replace(/--+/g, '-')
+        .replace(/^[.-]+/, '')
+        .replace(/[.-]+$/, '')
+        || 'unnamed';
 };

package/index.d.ts

@@ -1,7 +1,7 @@
 interface Options {
     english?: boolean;
     lower?: boolean;
-    delimeter?: string;
+    delimiter?: string;
 }
-declare const _default: (filename: string, { english, lower, delimeter }?: Options) => string;
+declare const _default: (filename: string, { english, lower, delimiter }?: Options) => string;
 export default _default;

package/index.js

@@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const slugify_1 = __importDefault(require("./slugify"));
-exports.default = (filename, { english = true, lower = true, delimeter = '-' } = {}) => {
+exports.default = (filename, { english = true, lower = true, delimiter = '-' } = {}) => {
     // Step 1: Normalize input
     filename = filename.trim().replace(/\.{2,}/g, '.'); // collapse double dots
     const ext = (0, path_1.extname)(filename);
     const base = (0, path_1.basename)(filename, ext);
     // Step 2: Normalize base name
     const name = base
-        .replace(/\s+/g, delimeter)
-        .replace(new RegExp(`${delimeter}{2,}`, 'g'), delimeter)
+        .replace(/\s+/g, delimiter)
+        .replace(new RegExp(`${delimiter}{2,}`, 'g'), delimiter)
         .trim();
     // Step 3: Sluggify (ASCII-only if english = true)
     let slug = name;
@@ -25,6 +25,8 @@ exports.default = (filename, { english = true, lower = true, delimeter = '-' } =
             throw new Error(`BAD_FILE_NAME ${name}`);
         }
     }
-    const result = english ? `${slug}${(0, slugify_1.default)(ext)}` : `${name}${ext}`;
+    // Slugify extension separately; re-add the dot since slugify strips leading dots
+    const sanitizedExt = ext ? `.${(0, slugify_1.default)(ext)}` : '';
+    const result = english ? `${slug}${sanitizedExt}` : `${name}${ext}`;
     return lower ? result.toLowerCase() : result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/upload-names",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "upload names",
   "main": "index.js",
@@ -25,7 +25,7 @@
     "build": "makage build",
     "build:dev": "makage build --dev",
     "lint": "eslint . --fix",
-    "test": "jest --passWithNoTests",
+    "test": "jest",
     "test:watch": "jest --watch"
   },
   "keywords": [],
@@ -33,5 +33,5 @@
     "glob": "^13.0.0",
     "makage": "^0.1.12"
   },
-  "gitHead": "048188f6b43ffaa6146e7694b2b0d35d34cb2945"
+  "gitHead": "b758178b808ce0bf451e86c0bd7e92079155db7c"
 }

package/slugify.js

@@ -4,8 +4,10 @@ exports.default = (text) => {
     text = text.toString().trim();
     text = text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
     return text
-        .replace(/\s+/g, '-') // Replace spaces with -
-        .replace(/--+/g, '-') // Replace multiple - with single -
-        .replace(/^-+/, '') // Trim - from start of text
-        .replace(/-+$/, ''); // Trim - from end of text
+        .replace(/[^a-zA-Z0-9._-]/g, '-')
+        .replace(/\.{2,}/g, '.')
+        .replace(/--+/g, '-')
+        .replace(/^[.-]+/, '')
+        .replace(/[.-]+$/, '')
+        || 'unnamed';
 };