@astroapps/forms-core 1.1.0 → 1.2.0

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/package.json

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

package/src/formState.ts

@@ -48,6 +48,7 @@ export interface ControlState {
   definition: ControlDefinition;
   schemaInterface: SchemaInterface;
   dataNode?: SchemaDataNode | undefined;
+  display?: string;
   stateId?: string;
   style?: object;
   layoutStyle?: object;
@@ -194,39 +195,11 @@ export function createFormState(
           Control<any>
         >;
 
-        const df = displayOverrides.fields as Record<
+        const { text, html } = displayOverrides.fields as Record<
           KeysOfUnion<TextDisplay | HtmlDisplay>,
           Control<any>
         >;
 
-        createScopedEffect((c) => {
-          const textDisplay =
-            isDisplayControl(def) && isTextDisplay(def.displayData)
-              ? def.displayData
-              : undefined;
-          evalExpr(
-            c,
-            textDisplay?.text,
-            df.text,
-            textDisplay && firstExpr(formNode, DynamicPropertyType.Display),
-            coerceString,
-          );
-        }, displayOverrides);
-
-        createScopedEffect((c) => {
-          const htmlDisplay =
-            isDisplayControl(def) && isHtmlDisplay(def.displayData)
-              ? def.displayData
-              : undefined;
-          evalExpr(
-            c,
-            htmlDisplay?.html,
-            df.html,
-            htmlDisplay && firstExpr(formNode, DynamicPropertyType.Display),
-            coerceString,
-          );
-        }, displayOverrides);
-
         updateComputedValue(of.displayData, () =>
           isDisplayControl(def)
             ? createOverrideProxy(def.displayData, displayOverrides)
@@ -319,6 +292,7 @@ export function createFormState(
           allowedOptions,
           disabled,
           variables,
+          display,
         } = control.fields;
 
         createScopedEffect(
@@ -357,6 +331,18 @@ export function createFormState(
           scope,
         );
 
+        createScopedEffect(
+          (c) =>
+            evalExpr(
+              c,
+              undefined,
+              display,
+              firstExpr(formNode, DynamicPropertyType.Display),
+              coerceString,
+            ),
+          scope,
+        );
+
         updateComputedValue(dataNode, () => lookupDataNode(definition, parent));
         updateComputedValue(
           hidden,
@@ -388,6 +374,22 @@ export function createFormState(
           }
         }, scope);
 
+        createSyncEffect(() => {
+          if (isDisplayControl(def)) {
+            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);
+
         setupValidation(
           controlImpl,
           definition,
@@ -498,7 +500,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);
     },
@@ -519,4 +522,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,