@stubber/form-fields 1.5.2 → 1.6.1

package/dist/fields2/Form.svelte

@@ -1,24 +1,30 @@
-<script>import { get as getStoreValue } from "svelte/store";
+<script>import { get as getStoreValue, writable } from "svelte/store";
 import FormField from "./form-field.svelte";
 import { build_fields } from "./utils";
 import { validate_field } from "./validations/validate_field";
 export let initial_form;
 export let form;
-export let attachments;
+export let attachments = writable([]);
 export let dependencies = void 0;
+export let form_valid = false;
 if (initial_form.data) {
   form.update((data) => {
     return { ...data, ...initial_form.data };
   });
 }
 const fields = build_fields(form, attachments, dependencies, initial_form.spec.fields);
-$: {
-  validate_form($form);
-}
+let form_errors = {};
+$: validate_form($form);
 const validate_form = async (_) => {
+  form_errors = {};
   for (const fieldStore of fields) {
-    await validate_field(form, fieldStore);
+    const { key, errors } = await validate_field(form, fieldStore);
+    if (errors.length > 0) {
+      form_errors[key] = errors;
+    }
   }
+  form_errors = { ...form_errors };
+  form_valid = Object.keys(form_errors).length === 0;
 };
 </script>
 

package/dist/fields2/Form.svelte.d.ts

@@ -1,12 +1,14 @@
 import { SvelteComponent } from "svelte";
 import { type Writable } from "svelte/store";
 import type { IFormDependencies, IInitialForm } from "./interfaces";
+import type { UploadedFile } from "./fileserver";
 declare const __propDef: {
     props: {
         initial_form: IInitialForm;
         form: Writable<any>;
-        attachments: Writable<any>;
+        attachments?: Writable<UploadedFile[]>;
         dependencies?: IFormDependencies | undefined;
+        form_valid?: boolean;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/fields2/interfaces.d.ts

@@ -154,6 +154,7 @@ export interface IInitialForm {
 export type IFieldType = keyof typeof fields;
 export interface IBuiltField<T = {}> {
     id: string;
+    key: string;
     formStore: Writable<any>;
     attachmentsStore: Writable<UploadedFile[]>;
     formDependencies?: IFormDependencies;
@@ -202,6 +203,3 @@ export interface IValidationResult {
     type: "error" | "info";
     message: string;
 }
-export type ValidationTree = {
-    [key: string]: ValidationTree | IValidationResult[] | undefined;
-};

package/dist/fields2/sub/field-builder-field.svelte

@@ -311,6 +311,7 @@ function select_field_type(newValue, trigger) {
     </Collapsible.Trigger>
 
     <Collapsible.Content class="flex flex-col gap-y-2 pl-2 pt-2">
+      <!-- todo this doesnt update when fieldtype changes -->
       {@const field_param_spec = field_params_spec_lookup[value.fieldtype ?? "unknown"]}
       {#if field_param_spec}
         <Form

package/dist/fields2/utils.js

@@ -10,6 +10,7 @@ export const build_field = (formStore, attachmentsStore, formDependencies, field
     let final_path = generate_field_data_path(field_key, field, base_path);
     const built_field = {
         id: `${field_key}-${final_path}`,
+        key: field_key,
         formStore,
         attachmentsStore,
         formDependencies,

package/dist/fields2/validations/validate_field.d.ts

@@ -1,6 +1,9 @@
-import type { IJsonataValidation, IRequiredValidation, IRexegValidation, IValidationResult, IBuiltField } from "../interfaces";
 import type { Writable } from "svelte/store";
-export declare const validate_field: (formStore: Writable<any>, fieldStore: Writable<IBuiltField>) => Promise<void>;
+import type { IBuiltField, IJsonataValidation, IRequiredValidation, IRexegValidation, IValidationResult } from "../interfaces";
+export declare const validate_field: (formStore: Writable<any>, fieldStore: Writable<IBuiltField>) => Promise<{
+    key: string;
+    errors: IValidationResult[];
+}>;
 export declare const required_validation: (results: IValidationResult[], value: any, validation: IRequiredValidation) => void;
 export declare const regex_validation: (results: IValidationResult[], value: any, validation: IRexegValidation) => void;
 export declare const jsonata_validation: (results: IValidationResult[], _value: any, validation: IJsonataValidation, context?: any) => Promise<void>;

package/dist/fields2/validations/validate_field.js

@@ -1,5 +1,5 @@
 import jsonata from "jsonata";
-import { get, set, unset } from "lodash-es";
+import { unset } from "lodash-es";
 import { get as getStoreValue } from "svelte/store";
 export const validate_field = async (formStore, fieldStore) => {
     const results = [];
@@ -20,7 +20,7 @@ export const validate_field = async (formStore, fieldStore) => {
                 f.hidden = true;
                 return f;
             });
-            return; // Skip validation if conditions are not met
+            return { key: field.key, errors: [] }; // Skip validation if conditions are not met
         }
         else {
             fieldStore.update((f) => {
@@ -31,10 +31,11 @@ export const validate_field = async (formStore, fieldStore) => {
     }
     // validate sub_fields if they exist (arraybuilder and section fields)
     if (field.sub_fields && field.sub_fields.length > 0) {
-        // console.log("sub_fields", field.sub_fields);
         for (const sub_field of field.sub_fields || []) {
-            // console.log(`Validating sub_field: ${sub_field.__key}`);
-            await validate_field(formStore, sub_field);
+            const { key, errors } = await validate_field(formStore, sub_field);
+            if (errors.length > 0) {
+                results.push({ message: `${field.fieldtype} has errors in child fields`, type: "error" });
+            }
         }
     }
     const validations = field.validations || [];
@@ -56,14 +57,15 @@ export const validate_field = async (formStore, fieldStore) => {
             unset(f, "errors");
             return f;
         });
-        return;
     }
-    // console.log(`setting errors for field: ${field.data_path}`, results);
-    // fieldStore.errors = results;
-    fieldStore.update((f) => {
-        f.errors = results;
-        return f;
-    });
+    else {
+        // fieldStore.errors = results;
+        fieldStore.update((f) => {
+            f.errors = results;
+            return f;
+        });
+    }
+    return { key: field.key, errors: results };
 };
 export const required_validation = (results, value, validation) => {
     if (!value || value.length === 0 || (typeof value === "string" && value.trim() === "")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stubber/form-fields",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "An automatic form builder based on field specifications",
   "keywords": [
     "components",