@awesomeness-js/utils 1.1.4 → 1.1.6

package/index.js

@@ -40,6 +40,7 @@ import _utils_generateNamespaceCode from './src/utils/generateNamespaceCode.js';
 import _utils_generateNamespaceExportLines from './src/utils/generateNamespaceExportLines.js';
 import _uuid from './src/uuid.js';
 import _validateSchema from './src/validateSchema.js';
+import _wait from './src/wait.js';
 
 export { _build as build };
 export { _collectImports as collectImports };
@@ -58,6 +59,7 @@ export { _thingType as thingType };
 export { _toPennies as toPennies };
 export { _uuid as uuid };
 export { _validateSchema as validateSchema };
+export { _wait as wait };
 
 export const clean = {
 	array: _clean_array,
@@ -135,6 +137,7 @@ export default {
 	toPennies: _toPennies,
 	uuid: _uuid,
 	validateSchema: _validateSchema,
+	wait: _wait,
 	clean: {
 		array: _clean_array,
 		boolean: _clean_boolean,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@awesomeness-js/utils",
-	"version": "1.1.4",
+	"version": "1.1.6",
 	"description": "Awesomeness - Utils",
 	"repository": {
 		"type": "git",

package/src/clean/string.js

@@ -4,7 +4,9 @@ export default function cleanString(x, {
 	maxLength = false,
 	allowHtml = false,
 	allowScripts = false,
-	validValues = false
+	validValues = false,
+	format = false,
+	pattern = false
 } = {}){
 
 	if(allowScripts && !allowHtml){
@@ -77,6 +79,53 @@ export default function cleanString(x, {
 		
 		}
 
+		if(format === 'email') {
+
+			const emailRegex = /^(?!@)(?!.*@.*@)(?!.*\.\.)(?!\.\.)(?!.*-$)(?!.*-$)(?!.*\.-)[A-Za-z0-9._%+-]+(?:@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,})$/;
+			
+			if(!emailRegex.test(x)) {
+
+				throw {
+					message: 'Invalid email format',
+					value: x
+				};
+
+			}
+
+		}
+
+		if(pattern) {
+
+			// make sure pattern is itself a regex
+			if(!(pattern instanceof RegExp)) {
+
+				try {
+
+					pattern = new RegExp(pattern);
+
+				} catch (e) {
+
+					throw {
+						message: 'Pattern is not a valid regular expression',
+						pattern,
+						value: x
+					};
+
+				}
+
+			}
+
+			if(!pattern.test(x)) {
+
+				throw {
+					message: 'Invalid format',
+					value: x
+				};
+
+			}
+
+		}
+
 		return x;
 
 	} catch (e) {

package/src/wait.js

@@ -0,0 +1,3 @@
+export default async function wait(ms) {
+	return new Promise(resolve => setTimeout(resolve, ms));
+}

package/types/clean/string.d.ts

@@ -1,8 +1,10 @@
-export default function cleanString(x: any, { required, minLength, maxLength, allowHtml, allowScripts, validValues }?: {
+export default function cleanString(x: any, { required, minLength, maxLength, allowHtml, allowScripts, validValues, format, pattern }?: {
     required?: boolean;
     minLength?: boolean;
     maxLength?: boolean;
     allowHtml?: boolean;
     allowScripts?: boolean;
     validValues?: boolean;
+    format?: boolean;
+    pattern?: boolean;
 }): string;

package/types/index.d.ts

@@ -40,6 +40,7 @@ import type _utils_generateNamespaceCode from './utils/generateNamespaceCode';
 import type _utils_generateNamespaceExportLines from './utils/generateNamespaceExportLines';
 import type _uuid from './uuid';
 import type _validateSchema from './validateSchema';
+import type _wait from './wait';
 
 export declare const build: typeof _build;
 export declare const collectImports: typeof _collectImports;
@@ -58,6 +59,7 @@ export declare const thingType: typeof _thingType;
 export declare const toPennies: typeof _toPennies;
 export declare const uuid: typeof _uuid;
 export declare const validateSchema: typeof _validateSchema;
+export declare const wait: typeof _wait;
 
 export declare const clean: {
 	array: typeof _clean_array;
@@ -135,6 +137,7 @@ declare const _default: {
 	toPennies: typeof _toPennies;
 	uuid: typeof _uuid;
 	validateSchema: typeof _validateSchema;
+	wait: typeof _wait;
 	clean: {
 		array: typeof _clean_array,
 		boolean: typeof _clean_boolean,

package/types/wait.d.ts

@@ -0,0 +1 @@
+export default function wait(ms: any): Promise<any>;