Use withMutation to set up initial transforms

Author: jquense

src/array.js

@@ -20,18 +20,20 @@ function ArraySchema(){
 
   MixedSchema.call(this, { type: 'array'})
 
-  this.transforms.push(function(values) {
-    if (typeof values === 'string')
-      try {
-        values = JSON.parse(values)
-      } catch (err){ values = null }
-
-    if (Array.isArray(values))
-        return this._subType
-          ? values.map(this._subType.cast, this._subType)
-          : values
-
-    return this.isType(values) ? values : null
+  this.withMutation(() => {
+    this.transform(function(values) {
+      if (typeof values === 'string')
+        try {
+          values = JSON.parse(values)
+        } catch (err){ values = null }
+
+      if (Array.isArray(values))
+          return this._subType
+            ? values.map(this._subType.cast, this._subType)
+            : values
+
+      return this.isType(values) ? values : null
+    })
   })
 }
 

src/boolean.js

@@ -5,21 +5,22 @@ var MixedSchema = require('./mixed')
 module.exports = BooleanSchema
 
 function BooleanSchema(){
-  if (!(this instanceof BooleanSchema)) 
+  if (!(this instanceof BooleanSchema))
     return new BooleanSchema()
- 
+
   MixedSchema.call(this, { type: 'boolean'})
 
-  this.transforms.push(function(value) {
-    if ( this.isType(value) ) return value
-    return (/true|1/i).test(value)
+  this.withMutation(() => {
+    this.transform(function(value) {
+      if ( this.isType(value) ) return value
+      return (/true|1/i).test(value)
+    })
   })
 }
 
 inherits(BooleanSchema, MixedSchema, {
 
-  _typeCheck(v){ 
+  _typeCheck(v){
     return (typeof v === 'boolean') || (typeof v === 'object' && v instanceof Boolean)
   }
 })
-

src/date.js

@@ -14,12 +14,14 @@ function DateSchema(){
 
   MixedSchema.call(this, { type: 'date'})
 
-  this.transforms.push(function(value) {
-    if (this.isType(value))
-      return isDate(value) ? new Date(value) : value
+  this.withMutation(() => {
+    this.transform(function(value) {
+      if (this.isType(value))
+        return isDate(value) ? new Date(value) : value
 
-    value = isoParse(value)
-    return value ? new Date(value) : invalidDate
+      value = isoParse(value)
+      return value ? new Date(value) : invalidDate
+    })
   })
 }
 

src/number.js

@@ -14,11 +14,13 @@ function NumberSchema(){
 
   SchemaObject.call(this, { type: 'number' })
 
-  this.transforms.push(function(value) {
-    if ( this.isType(value) )  return value
-    if ( typeof value === 'boolean' )  return value ? 1 : 0
+  this.withMutation(() => {
+    this.transform(function(value) {
+      if (this.isType(value)) return value
+      if (typeof value === 'boolean') return value ? 1 : 0
 
-    return isDate(value) ? +value : parseFloat(value)
+      return isDate(value) ? +value : parseFloat(value)
+    })
   })
 }
 

src/object.js

@@ -1,8 +1,6 @@
 'use strict';
 var MixedSchema = require('./mixed')
   , Promise = require('promise/lib/es6-extensions')
-  //, Reference = require('./util/Reference')
-  , cloneDeep = require('./util/clone')
   , toposort = require('toposort')
   , locale = require('./locale.js').object
   , split = require('property-expr').split
@@ -45,18 +43,18 @@ function ObjectSchema(spec) {
     }
   })
 
-  this.transforms.push(function coerce(value) {
-    if (typeof value === 'string') {
-      try {
-        value = JSON.parse(value)
+  this.withMutation(() => {
+    this.transform(function coerce(value) {
+      if (typeof value === 'string') {
+        try {
+          value = JSON.parse(value)
+        }
+        catch (err){ value = null }
       }
-      catch (err){ value = null }
-    }
-
-    if( this.isType(value) )
-      return value
-
-    return null
+      if (this.isType(value))
+        return value
+      return null
+    })
   })
 
   this.fields = Object.create(null)

src/string.js

@@ -18,10 +18,12 @@ function StringSchema(){
 
   MixedSchema.call(this, { type: 'string'})
 
-  this.transforms.push(function(value) {
-    if (this.isType(value)) return value
-    return value == null ? ''
-      : value.toString ? value.toString() : '' + value
+  this.withMutation(() => {
+    this.transform(function(value) {
+      if (this.isType(value)) return value
+      return value == null ? ''
+        : value.toString ? value.toString() : '' + value
+    })
   })
 }