@ikonintegration/ikapi 4.0.0-alpha10 → 4.0.0-alpha12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "4.0.0-alpha10",
+  "version": "4.0.0-alpha12",
   "description": "",
   "main": "index.js",
   "module": "main.js",
@@ -32,6 +32,6 @@
     "pg": "^8.11.1",
     "sha1": "^1.1.1",
     "stack-trace": "0.0.10",
-    "superstruct": "0.8.4"
+    "superstruct": "1.0.3"
   }
 }

package/src/Validation/IKValidation.js

@@ -2,29 +2,30 @@ import IKGlobals from './../IKGlobals.js';
 import Utils from './../API/IKUtils.js';
 import IKResponse, { IKBadRequestResponse } from './../API/IKResponse.js';
 //https://www.npmjs.com/package/superstruct
-import { struct, superstruct } from 'superstruct';
+import * as struct from 'superstruct';
 //validation libs
 import isUuid from 'is-uuid';
 import isEmail from 'is-email';
 //
 export default class IKValidation {
   constructor(config) {
+    this.customStruct = {};
     this._buildInternalTypes((config && config.additionalTypes ? config.additionalTypes : {}));
   }
   _buildInternalTypes(additionalTypes) {
-    this.structor = superstruct({
-      types: {
-        ...IKValidation.internalTypes(),
-        ...additionalTypes
-      }
-    });
+    for (const key in IKValidation.internalTypes()) {
+      this.customStruct[key] = struct.define(key, IKValidation.internalTypes()[key]);
+    }
+    for (const key in additionalTypes) {
+      this.customStruct[key] = struct.define(key, additionalTypes[key]);
+    }
   }
   async validate(spec, obj, request) {
-    let parsedObj = null;
+    let assertion = null;
     let err = null;
     try {
       let parsedRawObj = obj;
-      parsedObj = this.structor(spec)(parsedRawObj);
+      assertion = struct.assert(parsedRawObj, spec);
     } catch (e) {
       console.debug(e);
       const { path, value, type } = e;
@@ -38,17 +39,14 @@ export default class IKValidation {
       err = IKBadRequestResponse(IKGlobals.ErrorResponseValidationFail + errorMessage, IKGlobals.ErrorCode_InvalidInput);
     }
     //Catch error as response
-    if (!parsedObj && err) return err;
+    if (err) return err;
     //run normal code out of this try/catch scope
-    return await request(parsedObj);
+    return await request(obj);
   }
 }
 //
 IKValidation.internalTypes = function() {
   return {
-    optionalNumber: value => (value == undefined || !isNaN(parseInt(value))),
-    optionalValidString: value => { return (!value || Utils.isValidString(value) == true); },
-    validString: value => { return (Utils.isValidString(value) == true); },
     email: value => { return (isEmail(value) && value.length < 256); },
     fullAddress: value => {
       if (!value) return false;