topkat-utils 1.0.48 → 1.0.49

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v1.0.49
+* Add/fix email type in validator
+* imrove typings on forI function
+
 ### v1.0.47
 * deep clone type improvement
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topkat-utils",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "type": "commonjs",
   "private": false,
   "description": "UTILS BIG TIME",

package/utils.ts

@@ -841,10 +841,7 @@ function getId(obj: any = {}): string {
     else if (isType(obj, 'objectId')) return obj.toString();
 }
 
-/**
- * @returns {array} return values of all callbacks
- */
-function forI(nbIterations: number, callback: (number: number, previousValue, arrayOfPreviousValues: any[]) => void | any) {
+function forI<T extends any[] | any>(nbIterations: number, callback: (number: number, previousValue, arrayOfPreviousValues: any[]) => T): T[] {
     const results = []
     for (let i = 0; i < nbIterations; i++) {
         const prevValue = results[results.length - 1]
@@ -853,7 +850,7 @@ function forI(nbIterations: number, callback: (number: number, previousValue, ar
     return results
 }
 
-async function forIasync(nbIterations: number, callback: (number) => void | any) {
+async function forIasync<T extends any[] | any>(nbIterations: number, callback: (number) => T): Promise<T[]> {
     const results = []
     for (let i = 0; i < nbIterations; i++) {
         results.push(await callback(i))
@@ -1328,6 +1325,7 @@ function validatorReturnErrArray(...paramsToValidate: ValidatorObject[]): [strin
                     'bigint',
                     'year',
                     'any',
+                    'email',
                     //...Object.keys(configFn().customTypes)
                 ];
 
@@ -1347,6 +1345,7 @@ function validatorReturnErrArray(...paramsToValidate: ValidatorObject[]): [strin
                     object: val => !Array.isArray(val) && val !== null && typeof val === type,
                     buffer: val => Buffer.isBuffer(val),
                     year: val => /^\d\d\d\d$/.test(val),
+                    email: val => /^[^\s@]+@([^\s@.,]+\.)+[^\s@.,]{2,}$/.test(val),
                     any: () => true,
                 };