upgrade humanify to also skip formatting strings with punctuation

ServiceStack · Oct 6, 2024 · a7b633c · a7b633c
1 parent 5b313f1
commit a7b633c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1278,7 +1278,11 @@ function splitTitleCase(s) {
     return to.filter(x => !!x);
 }
 exports.splitTitleCase = splitTitleCase;
-function humanify(s) { return !s || s.indexOf(' ') >= 0 ? s : (0, exports.ucFirst)(splitTitleCase(s).join(' ')); }
+function humanify(s) {
+    return !s || indexOfAny(s, [' ', ',', '.', ':', '-']) >= 0
+        ? s
+        : (0, exports.ucFirst)(splitTitleCase(s).join(' '));
+}
 exports.humanify = humanify;
 function queryString(url) {
     if (!url || url.indexOf('?') === -1)

diff --git a/dist/servicestack-client.min.js b/dist/servicestack-client.min.js
diff --git a/dist/servicestack-client.min.mjs b/dist/servicestack-client.min.mjs
diff --git a/dist/servicestack-client.mjs b/dist/servicestack-client.mjs
@@ -1361,7 +1361,11 @@ export function splitTitleCase(s) {
     to.push(s.substring(lastSplit, s.length));
     return to.filter(x => !!x);
 }
-export function humanify(s) { return !s || s.indexOf(' ') >= 0 ? s : ucFirst(splitTitleCase(s).join(' ')); }
+export function humanify(s) {
+    return !s || indexOfAny(s, [' ', ',', '.', ':', '-']) >= 0
+        ? s
+        : ucFirst(splitTitleCase(s).join(' '));
+}
 export function queryString(url) {
     if (!url || url.indexOf('?') === -1)
         return {};

diff --git a/dist/servicestack-client.umd.js b/dist/servicestack-client.umd.js
@@ -1532,7 +1532,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         return to.filter(function (x) { return !!x; });
     }
     exports.splitTitleCase = splitTitleCase;
-    function humanify(s) { return !s || s.indexOf(' ') >= 0 ? s : (0, exports.ucFirst)(splitTitleCase(s).join(' ')); }
+    function humanify(s) {
+        return !s || indexOfAny(s, [' ', ',', '.', ':', '-']) >= 0
+            ? s
+            : (0, exports.ucFirst)(splitTitleCase(s).join(' '));
+    }
     exports.humanify = humanify;
     function queryString(url) {
         if (!url || url.indexOf('?') === -1)

diff --git a/src/index.ts b/src/index.ts
@@ -1713,7 +1713,9 @@ export function splitTitleCase(s:string) {
     return to.filter(x => !!x)
 }
 
-export function humanify(s?:string|null) { return !s || s.indexOf(' ') >= 0 ? s : ucFirst(splitTitleCase(s).join(' ')) }
+export function humanify(s?:string|null) { return !s || indexOfAny(s,[' ',',','.',':','-']) >= 0 
+    ? s 
+    : ucFirst(splitTitleCase(s).join(' ')) }
 
 export function queryString(url: string): any {
     if (!url || url.indexOf('?') === -1) return {}