@kaspernj/api-maker 1.0.341 → 1.0.343

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.341",
+  "version": "1.0.343",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/base-model.mjs

@@ -460,7 +460,7 @@ export default class BaseModel {
     BaseModel.sendValidationErrorsEvent(validationErrors, options)
 
     if (!options || options.throwValidationError != false) {
-      throw new ValidationError(validationErrors, digg(error, "args"))
+      throw error
     }
   }
 

package/src/use-input.mjs

@@ -1,16 +1,15 @@
-import {dig, digg, digs} from "diggerize"
+import {dig, digg} from "diggerize"
 import {useCallback, useEffect, useMemo} from "react"
 import idForComponent from "./inputs/id-for-component.mjs"
 import nameForComponent from "./inputs/name-for-component.mjs"
 import strftime from "strftime"
-import useEventListener from "./use-event-listener.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
+import useValidationErrors from "./use-validation-errors.mjs"
 
 const useInput = ({props, wrapperOptions}) => {
   const s = useShape(props)
 
   s.useStates({
-    errors: [],
     form: undefined
   })
 
@@ -18,12 +17,7 @@ const useInput = ({props, wrapperOptions}) => {
     setForm()
   }, [s.props.inputRef?.current])
 
-  const fakeComponent = useMemo(
-    () => ({
-      props
-    }),
-    []
-  )
+  s.meta.fakeComponent = {props}
 
   const formatValue = useCallback((value) => {
     const {formatValue} = s.props
@@ -78,12 +72,6 @@ const useInput = ({props, wrapperOptions}) => {
     }
   }, [])
 
-  const inputName = useCallback(() => {
-    if (s.state.blankInputName) return ""
-
-    return getName()
-  }, [])
-
   const inputRefBackup = useCallback(() => {
     if (!s.meta._inputRefBackup) s.meta._inputRefBackup = React.createRef()
 
@@ -110,16 +98,6 @@ const useInput = ({props, wrapperOptions}) => {
     }
   }, [])
 
-  const onValidationErrors = useCallback((event) => {
-    const errors = event.detail.getValidationErrorsForInput({
-      attribute: s.props.attribute,
-      inputName: inputName(),
-      onMatchValidationError: s.props.onMatchValidationError
-    })
-
-    s.set({errors})
-  }, [])
-
   const setForm = useCallback(() => {
     const inputElement = inputRef().current
 
@@ -129,8 +107,8 @@ const useInput = ({props, wrapperOptions}) => {
     if (form && form != s.s.form) s.set({form})
   }, [])
 
-  const getId = useCallback(() => idForComponent(fakeComponent), [])
-  const getName = useCallback(() => nameForComponent(fakeComponent), [])
+  const getId = useCallback(() => idForComponent(s.m.fakeComponent), [])
+  const getName = useCallback(() => nameForComponent(s.m.fakeComponent), [])
 
   const getInputProps = useCallback(() => {
     const givenInputProps = s.props.inputProps || {}
@@ -160,21 +138,25 @@ const useInput = ({props, wrapperOptions}) => {
 
   const {inputProps: oldInputProps, ...restProps} = props
   const type = inputType()
-  const inputProps = getInputProps()
 
-  if (!inputProps.ref) throw new Error("No input ref?")
-  if (!handleAsSelect()) inputProps.type = type
+  s.meta.inputProps = getInputProps()
+  s.meta.inputNameWithoutId = useMemo(() => s.m.inputProps.name?.replace(/\[(.+)_id\]$/, "[$1]"), [s.m.inputProps.name])
+
+  if (!s.m.inputProps.ref) throw new Error("No input ref?")
+  if (!handleAsSelect()) s.m.inputProps.type = type
+
+  const {validationErrors} = useValidationErrors((validationError) =>
+    validationError.inputName == s.m.inputProps.name || validationError.inputName == s.m.inputNameWithoutId
+  )
 
   const wrapperOpts = {
-    errors: s.s.errors,
+    errors: validationErrors,
     form: s.s.form,
     label: label()
   }
 
-  useEventListener(s.s.form, "validation-errors", onValidationErrors)
-
   return {
-    inputProps,
+    inputProps: s.m.inputProps,
     wrapperOpts,
     restProps
   }

package/src/use-validation-errors.mjs

@@ -1,4 +1,5 @@
 import events from "./events.mjs"
+import {useCallback} from "react"
 import useEventEmitter from "./use-event-emitter.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
 

package/src/validation-error.mjs

@@ -11,6 +11,9 @@ class ValidationError extends BaseError {
     this.validationErrors = validationErrors
   }
 
+  getUnhandledErrors = () => this.validationErrors.getValidationErrors().filter((validationError) => !validationError.getHandled())
+  getValidationErrors = () => digg(this, "validationErrors")
+
   hasUnhandledErrors() {
     const unhandledError = this.validationErrors.getValidationErrors().find((validationError) => !validationError.getHandled())
 

package/src/validation-errors.mjs

@@ -89,7 +89,7 @@ class ValidationErrors {
       if (onMatchValidationError) {
         return onMatchValidationError(validationError)
       } else {
-        return validationError.matchesAttributeAndInputName(attribute, inputName, onMatchValidationError)
+        return validationError.matchesAttributeAndInputName(attribute, inputName)
       }
     })