functional-models 1.0.21 → 1.0.23

package/package.json

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

package/src/models.js

@@ -5,7 +5,6 @@ const { createModelValidator } = require('./validation')
 const { UniqueId } = require('./properties')
 
 const MODEL_DEF_KEYS = ['meta', 'functions']
-const PROTECTED_KEYS = ['model']
 
 const Model = (
   modelName,
@@ -33,11 +32,6 @@ const Model = (
     [primaryKey]: getPrimaryKeyProperty(),
     ...keyToProperty,
   }
-  PROTECTED_KEYS.forEach(key => {
-    if (key in keyToProperty) {
-      throw new Error(`Cannot use ${key}. This is a protected value.`)
-    }
-  })
   const instanceProperties = Object.entries(keyToProperty).filter(
     ([key, _]) => MODEL_DEF_KEYS.includes(key) === false
   )

package/src/properties.js

@@ -58,8 +58,8 @@ const Property = (config = {}, additionalMetadata = {}) => {
     },
     getValidator: valueGetter => {
       const validator = createPropertyValidator(config)
-      const _propertyValidatorWrapper = async () => {
-        return validator(await valueGetter())
+      const _propertyValidatorWrapper = async (instance, instanceData) => {
+        return validator(await valueGetter(), instance, instanceData)
       }
       return _propertyValidatorWrapper
     },

package/src/validation.js

@@ -208,11 +208,11 @@ const createPropertyValidator = config => {
     : validators.includes(isRequired)
   const validator =
     validators.length > 0 ? aggregateValidator(validators) : emptyValidator
-  const _propertyValidator = async value => {
+  const _propertyValidator = async (value, instance, instanceData) => {
     if (!value && !isRequiredValue) {
       return []
     }
-    const errors = await validator(value)
+    const errors = await validator(value, instance, instanceData)
     return [...new Set(flatMap(errors))]
   }
   return _propertyValidator
@@ -223,17 +223,17 @@ const createModelValidator = (properties, modelValidators = []) => {
     const keysAndFunctions = Object.entries(
       get(properties, 'functions.validate', {})
     )
+    const instanceData = await (modelValidators.length > 0
+      ? instance.functions.toObj()
+      : {})
     const data = await Promise.all(
       keysAndFunctions.map(async ([key, validator]) => {
         if (key === 'model') {
           return [key, []]
         }
-        return [key, await validator()]
+        return [key, await validator(instance, instanceData)]
       })
     )
-    const instanceData = await (modelValidators.length > 0
-      ? instance.functions.toObj()
-      : {})
     const modelValidationErrors = (
       await Promise.all(
         modelValidators.map(validator => validator(instance, instanceData))