Merge pull request #24 from rudashi/str-21

Resolves #21
rudashi · Mar 6, 2023 · 0709c9d · 0709c9d
2 parents e5ddf06 + c3316c7
commit 0709c9d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/dist/Stringable.js b/dist/Stringable.js
diff --git a/dist/Stringable.js.map b/dist/Stringable.js.map
diff --git a/src/Stringable.ts b/src/Stringable.ts
@@ -669,15 +669,22 @@ export class Stringable {
         return match;
     }
 
-    public slug = (separator: string = '-', language: string | null = 'en'): this => {
+    public slug = (separator: string = '-', language: string | null = 'en', dictionary: Record<string, string> = {'@': 'at'}): this => {
 
         if (language) {
             this.ascii();
         }
 
-        this.replace(['-', '_'], separator)
-            .replace('@', separator + 'at' + separator)
-            .snake(separator).trim();
+        this.replace(['-', '_'], separator);
+
+        Object.keys(dictionary).map((key: string) => {
+            dictionary[key] = separator + dictionary[key] + separator;
+        });
+
+        this.replace(Object.keys(dictionary), Object.values(dictionary))
+            .lower()
+            .replaceMatches(/\s/, separator)
+            .replaceMatches('('+separator+')(?=\\1)', '');
 
         return this;
     }

diff --git a/tests/slug.test.js b/tests/slug.test.js
@@ -34,4 +34,19 @@ it('returns the string as a URL friendly', () => {
     expect(Stringable.of('').slug().toString())
         .toBe('');
 
+    expect(Stringable.of('500$ bill').slug('-', 'en', {'$': 'dollar'}).toString())
+        .toBe('500-dollar-bill');
+
+    expect(Stringable.of('500--$----bill').slug('-', 'en', {'$': 'dollar'}).toString())
+        .toBe('500-dollar-bill');
+
+    expect(Stringable.of('500-$-bill').slug('-', 'en', {'$': 'dollar'}).toString())
+        .toBe('500-dollar-bill');
+
+    expect(Stringable.of('500$--bill').slug('-', 'en', {'$': 'dollar'}).toString())
+        .toBe('500-dollar-bill');
+
+    expect(Stringable.of('500-$--bill').slug('-', 'en', {'$': 'dollar'}).toString())
+        .toBe('500-dollar-bill');
+
 });