new strip spaces + fix filterAlphaNumericPlus

chrisweb · Aug 31, 2020 · 1e28fb5 · 1e28fb5
1 parent e2ae560
commit 1e28fb5
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 11 deletions.
diff --git a/dist/@types/chrisweb-utilities/index.d.ts b/dist/@types/chrisweb-utilities/index.d.ts
@@ -3,11 +3,11 @@ import { isServer, isClient } from './utilities/platform';
 import { getUrlParameters, getUrlParameterByName, replaceUrlParameter } from './utilities/url';
 import { decodeUri, encodeUri } from './utilities/uri';
 import { removeString, isArray, includes, find, flat } from './utilities/array';
-import { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders } from './utilities/string';
+import { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, removeAllSpaces } from './utilities/string';
 import { generateUUID } from './utilities/uuid';
 import { removeElements } from './utilities/html';
 import { log } from './utilities/log';
 import { sleep } from './utilities/helper';
 import { randomInteger, choice } from './utilities/random';
 declare const version = "1.0.0";
-export { version, getTimestamp, isServer, isClient, getUrlParameters, getUrlParameterByName, replaceUrlParameter, decodeUri, encodeUri, removeString, isArray, includes, find, flat, filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, generateUUID, removeElements, log, sleep, randomInteger, choice };
+export { version, getTimestamp, isServer, isClient, getUrlParameters, getUrlParameterByName, replaceUrlParameter, decodeUri, encodeUri, removeString, isArray, includes, find, flat, filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, generateUUID, removeElements, log, sleep, randomInteger, choice, removeAllSpaces };
diff --git a/dist/@types/chrisweb-utilities/utilities/string.d.ts b/dist/@types/chrisweb-utilities/utilities/string.d.ts
@@ -5,7 +5,7 @@
  * @param inputString
  * @param specialCharacters
  */
-declare const filterAlphaNumericPlus: (inputString: string, specialCharacters: string) => string | boolean;
+declare const filterAlphaNumericPlus: (inputString: string, specialCharacters?: string) => string | boolean;
 /**
  * capitalise first letter of a string
  * @param inputString
@@ -30,4 +30,9 @@ declare const getSubstringIndex: (inputString: string, substring: string, nthTim
  * @param replacements
  */
 declare const replacePlaceholders: (input: string, replacements: string) => string;
-export { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders };
+/**
+ * remove all spaces from a string
+ * @param input
+ */
+declare const removeAllSpaces: (input: string) => string;
+export { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, removeAllSpaces };
diff --git a/dist/index.esm.js b/dist/index.esm.js
diff --git a/dist/index.esm.js.map b/dist/index.esm.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,7 @@ import { isServer, isClient } from './utilities/platform';
 import { getUrlParameters, getUrlParameterByName, replaceUrlParameter } from './utilities/url';
 import { decodeUri, encodeUri } from './utilities/uri';
 import { removeString, isArray, includes, find, flat } from './utilities/array';
-import { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders } from './utilities/string';
+import { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, removeAllSpaces } from './utilities/string';
 import { generateUUID } from './utilities/uuid';
 import { removeElements } from './utilities/html';
 import { log } from './utilities/log';
@@ -37,5 +37,6 @@ export {
     log,
     sleep,
     randomInteger,
-    choice
+    choice,
+    removeAllSpaces
 };
diff --git a/src/utilities/string.ts b/src/utilities/string.ts
@@ -5,7 +5,7 @@
  * @param inputString 
  * @param specialCharacters 
  */
-const filterAlphaNumericPlus = (inputString: string, specialCharacters: string): string|boolean => {
+const filterAlphaNumericPlus = (inputString: string, specialCharacters?: string): string|boolean => {
 
     if (typeof (inputString) === 'string' && inputString.length > 0) {
 
@@ -105,4 +105,12 @@ const replacePlaceholders = (input: string, replacements: string): string => {
 
 };
 
-export { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders };
+/**
+ * remove all spaces from a string
+ * @param input
+ */
+const removeAllSpaces = (input: string): string => {
+    return input.replace(/\s/g,'');
+};
+
+export { filterAlphaNumericPlus, capitaliseFirstLetter, stringContains, getSubstringIndex, replacePlaceholders, removeAllSpaces };
diff --git a/tests/string.test.ts b/tests/string.test.ts
@@ -0,0 +1,21 @@
+import { filterAlphaNumericPlus, removeAllSpaces } from '../src/utilities/string';
+
+test('test to check alpha + numeric filter works', () => {
+    const filtered = filterAlphaNumericPlus(' foo   123  bar   #!$%&/()?       baz ');
+    expect(filtered).toBe('foo123barbaz')
+});
+
+test('test to check alpha + numeric plus filter works', () => {
+    const filtered = filterAlphaNumericPlus(' foo  bar   !$%    baz ', '!$%');
+    expect(filtered).toBe('foobar!$%baz')
+});
+
+test('test to check alpha + numeric filter works accepts space as specialcharacter that shouldnt get filtered', () => {
+    const filtered = filterAlphaNumericPlus(' foo  bar   #!$%&/()?  baz ', ' ');
+    expect(filtered).toBe(' foo  bar     baz ')
+});
+
+test('test to check if removing spaces works', () => {
+    const noSpacesString = removeAllSpaces(' foo  bar       baz ');
+    expect(noSpacesString).toBe('foobarbaz')
+});