Many fields

package.json

@@ -1,6 +1,6 @@
 {
   "name": "functional-models",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A library for creating JavaScript function based models.",
   "main": "index.js",
   "scripts": {

src/fields.js

@@ -1,8 +1,28 @@
 const identity = require('lodash/identity')
-const { createFieldValidator } = require('./validation')
+const merge = require('lodash/merge')
+const {
+  createFieldValidator,
+  emptyValidator,
+  maxTextLength,
+  minTextLength,
+  minNumber,
+  maxNumber,
+  isType,
+  meetsRegex,
+} = require('./validation')
 const { createUuid } = require('./utils')
 const { lazyValue } = require('./lazy')
 
+const EMAIL_REGEX =
+  /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/u
+
+const _getValidatorFromConfigElseEmpty = (config, key, validatorGetter) => {
+  if (key in config) {
+    return validatorGetter(config[key])
+  }
+  return emptyValidator
+}
+
 const field = (config = {}) => {
   const value = config.value || undefined
   const defaultValue = config.defaultValue || undefined
@@ -105,10 +125,82 @@ const arrayField = (config = {}) =>
     isArray: true,
   })
 
+const objectField = (config = {}) =>
+  field(
+    merge(config, {
+      validators: [isType('object')],
+    })
+  )
+
+const textField = (config = {}) =>
+  field(
+    merge(config, {
+      isString: true,
+      validators: [
+        _getValidatorFromConfigElseEmpty(config, 'maxLength', value =>
+          maxTextLength(value)
+        ),
+        _getValidatorFromConfigElseEmpty(config, 'minLength', value =>
+          minTextLength(value)
+        ),
+      ],
+    })
+  )
+
+const integerField = (config = {}) =>
+  field(
+    merge(config, {
+      isInteger: true,
+      validators: [
+        _getValidatorFromConfigElseEmpty(config, 'minValue', value =>
+          minNumber(value)
+        ),
+        _getValidatorFromConfigElseEmpty(config, 'maxValue', value =>
+          maxNumber(value)
+        ),
+      ],
+    })
+  )
+
+const numberField = (config = {}) =>
+  field(
+    merge(config, {
+      isNumber: true,
+      validators: [
+        _getValidatorFromConfigElseEmpty(config, 'minValue', value =>
+          minNumber(value)
+        ),
+        _getValidatorFromConfigElseEmpty(config, 'maxValue', value =>
+          maxNumber(value)
+        ),
+      ],
+    })
+  )
+
+const constantValueField = (value, config = {}) =>
+  textField(
+    merge(config, {
+      value,
+    })
+  )
+
+const emailField = (config = {}) =>
+  textField(
+    merge(config, {
+      validators: [meetsRegex(EMAIL_REGEX)],
+    })
+  )
+
 module.exports = {
   field,
   uniqueId,
   dateField,
   arrayField,
   referenceField,
+  integerField,
+  textField,
+  constantValueField,
+  numberField,
+  objectField,
+  emailField,
 }

src/validation.js

@@ -28,13 +28,7 @@ const isType = type => value => {
   return _typeOrError(type, `Must be a ${type}`)(value)
 }
 const isNumber = isType('number')
-const isInteger = _trueOrError(v => {
-  const numberError = isNumber(v)
-  if (numberError) {
-    return false
-  }
-  return Number.isNaN(parseInt(v, 10)) === false
-}, 'Must be an integer')
+const isInteger = _trueOrError(Number.isInteger, 'Must be an integer')
 
 const isBoolean = isType('boolean')
 const isString = isType('string')