cleanup style

src/error.js

@@ -7,29 +7,35 @@
 
 class StructError extends TypeError {
 
+  static format(attrs) {
+    const { type, path, value } = attrs
+    const message = `Expected a value of type \`${type}\`${path.length ? ` for \`${path.join('.')}\`` : ''} but received \`${JSON.stringify(value)}\`.`
+    return message
+  }
+
   constructor(attrs) {
-    super()
-    const errors = attrs.errors || []
-    this.message = this.constructor.format(attrs)
-    this.data = attrs.data
-    this.path = attrs.path
-    this.value = attrs.value
-    this.reason = attrs.reason
-    this.type = attrs.type
+    const message = StructError.format(attrs)
+    super(message)
+
+    const { data, path, value, reason, type, errors = [] } = attrs
+    this.data = data
+    this.path = path
+    this.value = value
+    this.reason = reason
+    this.type = type
     this.errors = errors
-    if (!errors.length) errors.push(this)
+
+    if (!errors.length) {
+      errors.push(this)
+    }
+
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, this.constructor)
     } else {
       this.stack = (new Error()).stack
     }
   }
 
-  static format(attrs) {
-    const path = attrs.path.join('.')
-    return `Expected a value of type \`${attrs.type}\`${path.length ? ` for \`${path}\`` : ''} but received \`${JSON.stringify(attrs.value)}\`.`
-  }
-
 }
 
 /**

src/kinds.js

@@ -29,8 +29,13 @@ class Kind {
  */
 
 function any(schema, defaults, options) {
-  if (isStruct(schema)) return schema[KIND]
-  if (schema instanceof Kind) return schema
+  if (isStruct(schema)) {
+    return schema[KIND]
+  }
+
+  if (schema instanceof Kind) {
+    return schema
+  }
 
   switch (kindOf(schema)) {
     case 'array': {
@@ -741,7 +746,11 @@ function union(schema, defaults, options) {
 
     for (const k of kinds) {
       const [ e, r ] = k.validate(value)
-      if (!e) return [undefined, r]
+
+      if (!e) {
+        return [undefined, r]
+      }
+
       error = e
     }
 

src/superstruct.js

@@ -57,7 +57,11 @@ function superstruct(config = {}) {
 
     Struct.assert = (value) => {
       const [ error, result ] = kind.validate(value)
-      if (error) throw new StructError(error)
+
+      if (error) {
+        throw new StructError(error)
+      }
+
       return result
     }
 
@@ -68,7 +72,11 @@ function superstruct(config = {}) {
 
     Struct.validate = (value) => {
       const [ error, result ] = kind.validate(value)
-      if (error) return [new StructError(error)]
+
+      if (error) {
+        return [new StructError(error)]
+      }
+
       return [undefined, result]
     }