@wishknish/knishio-client-js 0.5.2 → 0.6.1

package/src/instance/Rules/Condition.js

@@ -46,29 +46,39 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 
-import RuleArgumentException from './exception/RuleArgumentException';
+import RuleArgumentException from './exception/RuleArgumentException'
 
 export default class Condition {
-
   /**
    *
    * @param key
    * @param value
    * @param comparison
    */
-  constructor ( {
+  constructor ({
     key,
     value,
     comparison
-  } ) {
-
-    if ( [ key, value, comparison ].some( item => !item ) ) {
-      throw new RuleArgumentException( 'Condition::constructor( { key, value, comparison } ) - not all class parameters are initialised!' );
+  }) {
+    if ([key, value, comparison].some(item => !item)) {
+      throw new RuleArgumentException('Condition::constructor( { key, value, comparison } ) - not all class parameters are initialised!')
     }
 
-    this.__key = key;
-    this.__value = value;
-    this.__comparison = comparison;
+    this.__key = key
+    this.__value = value
+    this.__comparison = comparison
+  }
+
+  /**
+   * @param object
+   * @return {Condition}
+   */
+  static toObject (object) {
+    return new this({
+      key: object.key,
+      value: object.value,
+      comparison: object.comparison
+    })
   }
 
   /**
@@ -79,18 +89,6 @@ export default class Condition {
       key: this.__key,
       value: this.__value,
       comparison: this.__comparison
-    };
-  }
-
-  /**
-   * @param object
-   * @return {Condition}
-   */
-  static toObject ( object ) {
-    return new this( {
-      key: object.key,
-      value: object.value,
-      comparison: object.comparison
-    } );
+    }
   }
 }

package/src/instance/Rules/Meta.js

@@ -47,32 +47,31 @@ License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 
 export default class Meta {
+  constructor ({}) {
+    const args = arguments[0]
 
-  constructor ( {} ) {
-    const args = arguments[ 0 ];
-
-    for ( const key in args ) {
-      this[ `__${ key }` ] = args[ key ];
+    for (const key in args) {
+      this[`__${ key }`] = args[key]
     }
   }
 
+  static toObject (object) {
+    return new this(object)
+  }
+
   /**
    *
    * @returns {{}}
    */
   toJSON () {
-    const object = {};
+    const object = {}
 
-    for ( const item of Object.keys( this ) ) {
-      if ( item.substring( 0, 2 ) === '__' ) {
-        object[ item.substring( 2, item.length ) ] = this[ item ];
+    for (const item of Object.keys(this)) {
+      if (item.substring(0, 2) === '__') {
+        object[item.substring(2, item.length)] = this[item]
       }
     }
 
-    return object;
-  }
-
-  static toObject ( object ) {
-    return new this( object );
+    return object
   }
 }

package/src/instance/Rules/Rule.js

@@ -46,63 +46,50 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 
-import Callback from './Callback';
-import Condition from './Condition';
-import RuleArgumentException from './exception/RuleArgumentException';
-import MetaMissingException from '../../exception/MetaMissingException';
-
+import Callback from './Callback'
+import Condition from './Condition'
+import RuleArgumentException from './exception/RuleArgumentException'
+import MetaMissingException from '../../exception/MetaMissingException'
 
 export default class Rule {
-
   /**
    *
    * @param {Condition[]} condition
    * @param  {Callback[]} callback
    */
-  constructor ( {
+  constructor ({
     condition = [],
     callback = []
-  } ) {
-
-    for ( const element of condition ) {
-      if ( !( element instanceof Condition ) ) {
-        throw new RuleArgumentException();
+  }) {
+    for (const element of condition) {
+      if (!(element instanceof Condition)) {
+        throw new RuleArgumentException()
       }
     }
 
-    for ( const element of callback ) {
-      if ( !( element instanceof Callback ) ) {
-        throw new RuleArgumentException();
+    for (const element of callback) {
+      if (!(element instanceof Callback)) {
+        throw new RuleArgumentException()
       }
     }
 
-    this.__condition = condition;
-    this.__callback = callback;
+    this.__condition = condition
+    this.__callback = callback
   }
 
   /**
    *
    * @param {Condition[]|{}} condition
    */
-  set comparison ( condition ) {
-    this.__condition.push( condition instanceof Condition ? condition : Condition.toObject( condition ) );
+  set comparison (condition) {
+    this.__condition.push(condition instanceof Condition ? condition : Condition.toObject(condition))
   }
 
   /**
    * @param {Callback[]|{}} callback
    */
-  set callback ( callback ) {
-    this.__callback.push( callback instanceof Callback ? callback : Callback.toObject( callback ) );
-  }
-
-  /**
-   * @returns {{condition: *, callback: Callback[]}}
-   */
-  toJSON () {
-    return {
-      condition: this.__condition,
-      callback: this.__callback
-    };
+  set callback (callback) {
+    this.__callback.push(callback instanceof Callback ? callback : Callback.toObject(callback))
   }
 
   /**
@@ -111,25 +98,34 @@ export default class Rule {
    *
    * @return {Rule}
    */
-  static toObject ( object ) {
-    if ( !object.condition ) {
-      throw new MetaMissingException( 'Rule::toObject() - Incorrect rule format! There is no condition field.' );
+  static toObject (object) {
+    if (!object.condition) {
+      throw new MetaMissingException('Rule::toObject() - Incorrect rule format! There is no condition field.')
     }
-    if ( !object.callback ) {
-      throw new MetaMissingException( 'Rule::toObject() - Incorrect rule format! There is no callback field.' );
+    if (!object.callback) {
+      throw new MetaMissingException('Rule::toObject() - Incorrect rule format! There is no callback field.')
     }
 
-    const rule = new Rule( {} );
+    const rule = new Rule({})
 
-    for ( const condition of object.condition ) {
-      rule.comparison = condition;
+    for (const condition of object.condition) {
+      rule.comparison = condition
     }
 
-    for ( const callback of object.callback ) {
-      console.log(callback);
-      rule.callback = callback;
+    for (const callback of object.callback) {
+      rule.callback = callback
     }
 
-    return rule;
+    return rule
+  }
+
+  /**
+   * @returns {{condition: *, callback: Callback[]}}
+   */
+  toJSON () {
+    return {
+      condition: this.__condition,
+      callback: this.__callback
+    }
   }
 }

package/src/instance/Rules/exception/RuleArgumentException.js

@@ -1,4 +1,4 @@
-import BaseException from '../../../exception/BaseException';
+import BaseException from '../../../exception/BaseException'
 
 export default class RuleArgumentException extends BaseException {
   /**
@@ -8,8 +8,8 @@ export default class RuleArgumentException extends BaseException {
    * @param {string|null} fileName
    * @param {number|null} lineNumber
    */
-  constructor ( message = 'An incorrect argument!', fileName = null, lineNumber = null ) {
-    super( message, fileName, lineNumber );
-    this.name = 'RuleArgumentException';
+  constructor (message = 'An incorrect argument!', fileName = null, lineNumber = null) {
+    super(message, fileName, lineNumber)
+    this.name = 'RuleArgumentException'
   }
 }