Validations

packages/form/src/BlitzField.vue

@@ -142,6 +142,7 @@ export default defineComponent({
         edit: 'Edit',
         save: 'Save',
         requiredField: 'Field is required',
+        fieldValidationError: 'Field has validation error',
         formValidationError: 'There are remaining errors.',
       }),
     },
@@ -725,7 +726,15 @@ export default defineComponent({
 
       if (isFullString(requiredErrorResult)) return requiredErrorResult
 
-      return evalPropOrAttr('error') || null
+      const errorStatus = evalPropOrAttr('error')
+      if (isBoolean(errorStatus)) {
+        if (errorStatus) {
+          const errorMessage = evalPropOrAttr('errorMessage')
+          return errorMessage ? errorMessage : langCalculated['fieldValidationError']
+        }
+        return null
+      }
+      return errorStatus || null
     },
     // validate() IS CALLED FROM REFERENCE!!
     /**

packages/form/src/BlitzForm.vue

@@ -129,6 +129,7 @@ export default defineComponent({
         edit: 'Edit',
         save: 'Save',
         requiredField: 'Field is required',
+        fieldValidationError: 'Field has validation error',
         formValidationError: 'There are remaining errors.',
       }),
     },

packages/form/src/lang.ts

@@ -10,5 +10,6 @@ export const defaultLang: () => Lang = () => ({
   edit: 'Edit',
   save: 'Save',
   requiredField: 'Field is required',
+  fieldValidationError: 'Field has validation error',
   formValidationError: 'There are remaining errors.',
 })

packages/form/src/validation.ts

@@ -1,12 +1,12 @@
 import { flattenPerSchema } from '@blitzar/utils'
-import { isFullString, isFunction } from 'is-what'
+import { isBoolean, isFullString, isFunction } from 'is-what'
 import type { BlitzFieldProps, FormContext, Lang, Schema } from '@blitzar/types'
 import { defaultLang } from './lang'
 
 export function createRequiredErrorFn(
   requiredFieldErrorMsg: string
 ): (payload: any) => null | string {
-  return (val) => (val === 0 || !!val ? null : requiredFieldErrorMsg)
+  return (val) => (isBoolean(val) || val === 0 || !!val ? null : requiredFieldErrorMsg)
 }
 
 /**
@@ -22,17 +22,41 @@ export function validateFieldPerSchema(
   blueprint: BlitzFieldProps,
   context: FormContext
 ): null | string {
-  const lang = context.lang || defaultLang()
-  const requiredErrorFn = createRequiredErrorFn(lang.requiredField)
+  // check whether the field is shown
+  let isVisible = true
+  if (isFunction(blueprint.showCondition)) {
+    isVisible = blueprint.showCondition(payload, context)
+  }
+  if (!isVisible) return null
+
+  // check whether the field is required
+  let isRequired = false
+  if (isFunction(blueprint.required)) {
+    isRequired = blueprint.required(payload, context)
+  } else if (isBoolean(blueprint.required)) {
+    isRequired = blueprint.required
+  }
 
-  const requiredResult = requiredErrorFn(payload)
-  if (isFullString(requiredResult)) return requiredResult
+  const lang = context.lang || defaultLang()
+  if (isRequired) {
+    const requiredErrorFn = createRequiredErrorFn(lang.requiredField)
+    const requiredResult = requiredErrorFn(payload)
+    if (isFullString(requiredResult)) return requiredResult
+  }
 
   if (!blueprint.error) return null
 
   const errorResult = !isFunction(blueprint.error)
     ? blueprint.error
     : blueprint.error(payload, context)
+  // report provided error message if error result is true
+  if (isBoolean(errorResult)) {
+    if (errorResult) {
+      return blueprint.errorMessage ? blueprint.errorMessage : lang.fieldValidationError
+    }
+    return null
+  }
+
   return errorResult
 }
 

packages/types/src/core.ts

@@ -33,6 +33,7 @@ export type Lang = {
   edit: string
   save: string
   requiredField: string
+  fieldValidationError: string
   formValidationError: string
 }