@astroapps/forms-core 1.1.1 → 1.2.1

package/lib/schemaBuilder.d.ts

@@ -61,6 +61,7 @@ export declare function defaultCompoundField(field: string, displayName: string,
     type: FieldType.Compound;
 };
 export declare function mergeField(field: SchemaField, mergeInto: SchemaField[]): SchemaField[];
+export declare function mergeOption(fields: SchemaField[], name: string, value: any, fieldName: string): SchemaField[];
 export declare function mergeFields(fields: SchemaField[], name: string, value: any, newFields: SchemaField[]): SchemaField[];
 export declare function addFieldOption(typeField: SchemaField, name: string, value: any): SchemaField;
 export declare function resolveSchemas<A extends SchemaMap>(schemaMap: A): A;

package/lib/validators.d.ts

@@ -21,4 +21,4 @@ export declare const lengthValidator: ValidatorEval<LengthValidator>;
 export declare const dateValidator: ValidatorEval<DateValidator>;
 export declare const defaultValidators: Record<string, ValidatorEval<any>>;
 export declare function createValidators(def: ControlDefinition, context: ValidationEvalContext): void;
-export declare function setupValidation(controlImpl: Control<FormContextOptions>, definition: ControlDefinition, dataNode: Control<SchemaDataNode | undefined>, schemaInterface: SchemaInterface, parent: SchemaDataNode, formNode: FormNode, runAsync: (af: () => void) => void): void;
+export declare function setupValidation(controlImpl: Control<FormContextOptions>, definition: ControlDefinition, dataNode: Control<SchemaDataNode | undefined>, schemaInterface: SchemaInterface, parent: SchemaDataNode, formNode: FormNode, hidden: Control<boolean>, runAsync: (af: () => void) => void): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroapps/forms-core",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",

package/src/formState.ts

@@ -195,7 +195,7 @@ export function createFormState(
           Control<any>
         >;
 
-        const df = displayOverrides.fields as Record<
+        const { text, html } = displayOverrides.fields as Record<
           KeysOfUnion<TextDisplay | HtmlDisplay>,
           Control<any>
         >;
@@ -376,9 +376,17 @@ export function createFormState(
 
         createSyncEffect(() => {
           if (isDisplayControl(def)) {
-            if (isTextDisplay(def.displayData)) df.text.value = display.value;
-            else if (isHtmlDisplay(def.displayData))
-              df.html.value = display.value;
+            if (display.value !== undefined) {
+              text.value = isTextDisplay(def.displayData)
+                ? display.value
+                : NoOverride;
+              html.value = isHtmlDisplay(def.displayData)
+                ? display.value
+                : NoOverride;
+            } else {
+              text.value = NoOverride;
+              html.value = NoOverride;
+            }
           }
         }, displayOverrides);
 
@@ -389,6 +397,7 @@ export function createFormState(
           schemaInterface,
           parent,
           formNode,
+          hidden,
           runAsync,
         );
 
@@ -492,7 +501,8 @@ export function createOverrideProxy<
   return new Proxy(proxyFor, {
     get(target: A, p: string | symbol, receiver: any): any {
       if (Object.hasOwn(overrides, p)) {
-        return overrides[p as keyof B]!.value;
+        const nv = overrides[p as keyof B]!.value;
+        if (nv !== NoOverride) return nv;
       }
       return Reflect.get(target, p, receiver);
     },
@@ -513,4 +523,7 @@ export function createOverrideProxy<
   });
 }
 
+class NoValue {}
+const NoOverride = new NoValue();
+
 type KeysOfUnion<T> = T extends T ? keyof T : never;

package/src/schemaBuilder.ts

@@ -266,6 +266,17 @@ export function mergeField(
   }
 }
 
+export function mergeOption(
+  fields: SchemaField[],
+  name: string,
+  value: any,
+  fieldName: string,
+): SchemaField[] {
+  return fields.map((x) =>
+    x.field === fieldName ? addFieldOption(x, name, value) : x,
+  );
+}
+
 export function mergeFields(
   fields: SchemaField[],
   name: string,

package/src/validators.ts

@@ -6,7 +6,11 @@ import {
   SchemaValidator,
   ValidatorType,
 } from "./schemaValidator";
-import { ControlDefinition, isDataControl } from "./controlDefinition";
+import {
+  ControlDefinition,
+  DataControlDefinition,
+  isDataControl,
+} from "./controlDefinition";
 import { SchemaDataNode } from "./schemaDataNode";
 import {
   Control,
@@ -171,11 +175,12 @@ export function setupValidation(
   schemaInterface: SchemaInterface,
   parent: SchemaDataNode,
   formNode: FormNode,
+  hidden: Control<boolean>,
   runAsync: (af: () => void) => void,
 ) {
   const validationEnabled = createScopedComputed(
     controlImpl,
-    () => !definition.hidden,
+    () => !hidden.value,
   );
   const validatorsScope = createCleanupScope();
   createEffect(