feat(ajv validator): Add a factory createAjvValidator

pyoner · Feb 28, 2020 · 44dcd85 · 44dcd85
1 parent 6974fd1
commit 44dcd85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/packages/app/src/App.svelte b/packages/app/src/App.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Ajv from "ajv";
-  import { Form, components } from "@pyoner/svelte-form";
+  import { Form, components, helpers } from "@pyoner/svelte-form";
   import jsonSchemaDraft4 from "ajv/lib/refs/json-schema-draft-04.json";
 
   import * as simple from "./samples/simple";
@@ -21,9 +21,7 @@
   });
   ajv.addMetaSchema(jsonSchemaDraft4);
 
-  const options = {
-    ajv
-  };
+  const validator = helpers.createAjvValidator(ajv);
 
   let schema, value;
 </script>
@@ -48,7 +46,7 @@
     {schema}
     {components}
     {value}
-    {options}
+    {validator}
     on:submit={e => {
       console.log('submit', e);
     }}

diff --git a/packages/lib/src/helpers.ts b/packages/lib/src/helpers.ts
@@ -13,7 +13,8 @@ import {
   Errors,
   FormComponents,
   Props,
-  SvelteSchema
+  SvelteSchema,
+  Validator
 } from './types'
 
 export function createProps<T extends JSONSchemaType, E extends Errors = Error[]>(
@@ -96,12 +97,14 @@ export const options = {
     return ajv
   }
 }
-export function validate(ajv: Ajv.Ajv, schema: JSONSchema, data: JSONSchemaType) {
-  const valid = ajv.validate(schema, data) as boolean
-  if (!valid) {
-    return ajv.errors as Ajv.ErrorObject[]
+export function createAjvValidator(ajv: Ajv.Ajv): Validator {
+  return (schema: JSONSchema, data: JSONSchemaType) => {
+    const valid = ajv.validate(schema, data) as boolean
+    if (!valid) {
+      return errorsToMap(ajv.errors as Ajv.ErrorObject[])
+    }
+    return null
   }
-  return null
 }
 
 export function errorsToMap(errors: ErrorObject[]): ErrorRecord {