ballerina-core 1.0.89 → 1.0.91

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.89",
+  "version": "1.0.91",
   "main": "main.ts",
   "scripts": {
     "prettier": "prettier --write ."

package/src/forms/domains/parser/domains/built-ins/state.ts

@@ -573,10 +573,12 @@ export const fromAPIRawValue =
           return ValueOrErrors.Default.throwOne(
             `Array expected but got ${JSON.stringify(raw)}`,
           );
-        if (raw.length != t.args.length)
+        if (raw.length != t.args.length) {
+          console.debug("tuple", t, raw);
           return ValueOrErrors.Default.throwOne(
             `Array length mismatch expected tuple length: ${t.args.length} expected but got ${raw.length}`,
           );
+        }
 
         const result = converters[t.value].fromAPIRawValue(raw);
         return ValueOrErrors.Operations.All(
@@ -690,6 +692,9 @@ export const toAPIRawValue =
   ) =>
   (raw: PredicateValue, formState: any): ValueOrErrors<any, string> => {
     if (t.kind == "primitive") {
+      if (t.value == "unit") {
+        return ValueOrErrors.Default.return(unit);
+      }
       return ValueOrErrors.Operations.Return(
         converters[t.value as string | keyof T].toAPIRawValue([
           raw,

package/src/forms/domains/parser/domains/predicates/state.ts

@@ -11,6 +11,12 @@ import {
   ListRepo,
 } from "../../../../../../main";
 
+export type TuplePredicateExpression = {
+  kind: "tuple";
+  value: Expr;
+  elementExpressions: FieldPredicateExpression[];
+};
+
 export type FieldPredicateExpression =
   | { kind: "unit"; value: Expr }
   | { kind: "primitive"; value: Expr }
@@ -22,11 +28,7 @@ export type FieldPredicateExpression =
       keyExpression: FieldPredicateExpression;
       valueExpression: FieldPredicateExpression;
     }
-  | {
-      kind: "tuple";
-      value: Expr;
-      elementExpressions: FieldPredicateExpression[];
-    }
+  | TuplePredicateExpression
   | {
       kind: "sum";
       value: Expr;
@@ -102,33 +104,47 @@ export type FieldPredicateExpressions = Map<
   FieldPredicateExpression
 >;
 
+export type TupleFieldPredicateEvaluation = {
+  kind: "tuple";
+  value: boolean;
+  elementValues: FormFieldPredicateEvaluation[];
+};
+
+export type ListFieldPredicateEvaluation = {
+  kind: "list";
+  value: boolean;
+  elementValues: FormFieldPredicateEvaluation[];
+};
+
+export type MapFieldPredicateEvaluation = {
+  kind: "map";
+  value: boolean;
+  elementValues: {
+    key: FormFieldPredicateEvaluation;
+    value: FormFieldPredicateEvaluation;
+  }[];
+};
+
+export type SumFieldPredicateEvaluation = {
+  kind: "sum";
+  value: boolean;
+  innerValue: FormFieldPredicateEvaluation;
+};
+
+export type FormsFieldPredicateEvaluation = {
+  kind: "form";
+  value: boolean;
+  fields: FormFieldPredicateEvaluations;
+};
+
 export type FormFieldPredicateEvaluation =
   | { kind: "primitive"; value: boolean }
   | { kind: "unit"; value: boolean }
-  | { kind: "form"; value: boolean; fields: FormFieldPredicateEvaluations }
-  | {
-      kind: "list";
-      value: boolean;
-      elementValues: FormFieldPredicateEvaluation[];
-    }
-  | {
-      kind: "map";
-      value: boolean;
-      elementValues: {
-        key: FormFieldPredicateEvaluation;
-        value: FormFieldPredicateEvaluation;
-      }[];
-    }
-  | {
-      kind: "tuple";
-      value: boolean;
-      elementValues: FormFieldPredicateEvaluation[];
-    }
-  | {
-      kind: "sum";
-      value: boolean;
-      innerValue: FormFieldPredicateEvaluation;
-    };
+  | FormsFieldPredicateEvaluation
+  | ListFieldPredicateEvaluation
+  | MapFieldPredicateEvaluation
+  | TupleFieldPredicateEvaluation
+  | SumFieldPredicateEvaluation;
 
 export const FormFieldPredicateEvaluation = {
   Default: {
@@ -147,7 +163,11 @@ export const FormFieldPredicateEvaluation = {
     list: (
       value: boolean,
       elementValues: FormFieldPredicateEvaluation[],
-    ): FormFieldPredicateEvaluation => ({ kind: "list", value, elementValues }),
+    ): FormFieldPredicateEvaluation => ({
+      kind: "list",
+      value,
+      elementValues,
+    }),
     map: (
       value: boolean,
       elementValues: {

package/src/forms/domains/parser/state.tsx

@@ -206,6 +206,8 @@ export const ParseForms =
           })
           .mapContext<Unit>((_) => {
             return {
+              visible: (_ as any).visible ?? true,
+              disabled: (_ as any).disabled ?? false,
               label: (_ as any).label,
               value: (_ as any).value,
               commonFormState: (_ as any).commonFormState,

package/src/forms/domains/primitives/domains/base-64-file/state.ts

@@ -11,6 +11,7 @@ export type Base64FileView<
   Context &
     Value<string> & { commonFormState: CommonFormState } & {
       disabled: boolean;
+      visible: boolean;
     },
   { commonFormState: CommonFormState },
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/base-64-file/template.tsx

@@ -18,7 +18,7 @@ export const Base64FileForm = <
   validation?: BasicFun<string, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<string> & { disabled: boolean },
+    Context & Value<string> & { disabled: boolean; visible: boolean },
     { commonFormState: CommonFormState },
     ForeignMutationsExpected & { onChange: OnChange<string> },
     Base64FileView<Context, ForeignMutationsExpected>
@@ -35,7 +35,7 @@ export const Base64FileForm = <
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       { commonFormState: CommonFormState },
       ForeignMutationsExpected,
       string

package/src/forms/domains/primitives/domains/boolean/state.ts

@@ -11,6 +11,7 @@ export type BooleanView<
   Context &
     Value<boolean> & { commonFormState: CommonFormState } & {
       disabled: boolean;
+      visible: boolean;
     },
   { commonFormState: CommonFormState },
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/boolean/template.tsx

@@ -22,7 +22,7 @@ export const BooleanForm = <
   validation?: BasicFun<boolean, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<boolean> & { disabled: boolean },
+    Context & Value<boolean> & { disabled: boolean; visible: boolean },
     { commonFormState: CommonFormState },
     ForeignMutationsExpected & { onChange: OnChange<boolean> },
     BooleanView<Context, ForeignMutationsExpected>
@@ -39,7 +39,7 @@ export const BooleanForm = <
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       { commonFormState: CommonFormState },
       ForeignMutationsExpected,
       boolean

package/src/forms/domains/primitives/domains/date/state.ts

@@ -32,7 +32,9 @@ export type DateView<
   Context extends FormLabel,
   ForeignMutationsExpected,
 > = View<
-  Context & Value<Maybe<Date>> & DateFormState & { disabled: boolean },
+  Context &
+    Value<Maybe<Date>> &
+    DateFormState & { disabled: boolean; visible: boolean },
   DateFormState,
   ForeignMutationsExpected & {
     onChange: OnChange<Date>;

package/src/forms/domains/primitives/domains/date/template.tsx

@@ -21,7 +21,7 @@ export const DateForm = <Context extends FormLabel, ForeignMutationsExpected>(
   validation?: BasicFun<Date, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<Date> & { disabled: boolean },
+    Context & Value<Date> & { disabled: boolean; visible: boolean },
     DateFormState,
     ForeignMutationsExpected & { onChange: OnChange<Date> },
     DateView<Context, ForeignMutationsExpected>
@@ -52,7 +52,7 @@ export const DateForm = <Context extends FormLabel, ForeignMutationsExpected>(
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       DateFormState,
       ForeignMutationsExpected,
       Date

package/src/forms/domains/primitives/domains/enum/state.ts

@@ -37,6 +37,7 @@ export type EnumView<
     Value<ValueOption> &
     EnumFormState & {
       activeOptions: "loading" | Array<ValueRecord>;
+      visible: boolean;
     } & { disabled: boolean },
   EnumFormState,
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/enum/template.tsx

@@ -29,11 +29,11 @@ export const EnumForm = <
   validation?: BasicFun<ValueOption, Promise<FieldValidation>>,
 ) => {
   const Co = CoTypedFactory<
-    Context & Value<ValueOption> & { disabled: boolean },
+    Context & Value<ValueOption> & { disabled: boolean; visible: boolean },
     EnumFormState
   >();
   return Template.Default<
-    Context & Value<ValueOption> & { disabled: boolean },
+    Context & Value<ValueOption> & { disabled: boolean; visible: boolean },
     EnumFormState,
     ForeignMutationsExpected & {
       onChange: OnChange<ValueOption>;
@@ -89,7 +89,7 @@ export const EnumForm = <
     );
   }).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       EnumFormState,
       ForeignMutationsExpected,
       ValueOption

package/src/forms/domains/primitives/domains/enum-multiselect/state.ts

@@ -15,6 +15,7 @@ export type EnumMultiselectView<
       selectedIds: Array<Guid>;
       activeOptions: "loading" | Array<ValueRecord>;
       disabled: boolean;
+      visible: boolean;
     },
   EnumFormState,
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/enum-multiselect/template.tsx

@@ -29,11 +29,13 @@ export const EnumMultiselectForm = <
   validation?: BasicFun<ValueRecord, Promise<FieldValidation>>,
 ) => {
   const Co = CoTypedFactory<
-    Context & Value<ValueRecord> & EnumFormState & { disabled: boolean },
+    Context &
+      Value<ValueRecord> &
+      EnumFormState & { disabled: boolean; visible: boolean },
     EnumFormState
   >();
   return Template.Default<
-    Context & Value<ValueRecord> & { disabled: boolean },
+    Context & Value<ValueRecord> & { disabled: boolean; visible: boolean },
     EnumFormState,
     ForeignMutationsExpected & {
       onChange: OnChange<ValueRecord>;
@@ -84,7 +86,7 @@ export const EnumMultiselectForm = <
     );
   }).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       EnumFormState,
       ForeignMutationsExpected,
       ValueRecord

package/src/forms/domains/primitives/domains/list/template.tsx

@@ -8,9 +8,9 @@ import {
   BasicUpdater,
   MapRepo,
   ListRepo,
-  FormFieldPredicateEvaluation,
   ValueTuple,
   PredicateValue,
+  ListFieldPredicateEvaluation,
 } from "../../../../../../main";
 import { Template } from "../../../../../template/state";
 import { Value } from "../../../../../value/state";
@@ -25,8 +25,8 @@ import { ListFieldState, ListFieldView } from "./state";
 export const ListForm = <
   ElementFormState extends { commonFormState: { modifiedByUser: boolean } },
   Context extends FormLabel & {
-    visibilities: FormFieldPredicateEvaluation;
-    disabledFields: FormFieldPredicateEvaluation;
+    visibilities: ListFieldPredicateEvaluation;
+    disabledFields: ListFieldPredicateEvaluation;
   },
   ForeignMutationsExpected,
 >(
@@ -76,7 +76,10 @@ export const ListForm = <
             );
             props.setState((_) => ({
               ..._,
-              commonFormState: { ..._.commonFormState, modifiedByUser: true },
+              commonFormState: {
+                ..._.commonFormState,
+                modifiedByUser: true,
+              },
             }));
           },
           add: () => {},
@@ -91,8 +94,14 @@ export const ListForm = <
           _: Context & Value<ValueTuple> & ListFieldState<ElementFormState>,
         ): (Context & Value<ValueTuple> & ElementFormState) | undefined => {
           if (!_.value.values.has(elementIndex)) return undefined;
-          if (_.visibilities.kind != "list") return undefined;
-          if (_.disabledFields.kind != "list") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "list")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "list")
+            return undefined;
+          const disabled =
+            _.disabledFields.elementValues[elementIndex]?.value ?? true;
+          const visible =
+            _.visibilities.elementValues[elementIndex]?.value ?? false;
           const element = _.value.values.get(elementIndex);
           const elementFormState =
             _.elementFormStates.get(elementIndex) || ElementFormState.Default();
@@ -105,6 +114,8 @@ export const ListForm = <
               value: element,
               visibilities: elementVisibility,
               disabledFields: elementDisabled,
+              disabled: disabled,
+              visible: visible,
             };
           return elementContext;
         },

package/src/forms/domains/primitives/domains/map/template.tsx

@@ -11,6 +11,7 @@ import {
   FormFieldPredicateEvaluation,
   PredicateValue,
   ValueTuple,
+  MapFieldPredicateEvaluation,
 } from "../../../../../../main";
 import { Template } from "../../../../../template/state";
 import { Value } from "../../../../../value/state";
@@ -27,8 +28,8 @@ export const MapForm = <
   KeyFormState extends { commonFormState: CommonFormState },
   ValueFormState extends { commonFormState: CommonFormState },
   Context extends FormLabel & {
-    visibilities: FormFieldPredicateEvaluation;
-    disabledFields: FormFieldPredicateEvaluation;
+    visibilities: MapFieldPredicateEvaluation;
+    disabledFields: MapFieldPredicateEvaluation;
   },
   ForeignMutationsExpected,
 >(
@@ -92,7 +93,10 @@ export const MapForm = <
             );
             props.setState((_) => ({
               ..._,
-              commonFormState: { ..._.commonFormState, modifiedByUser: true },
+              commonFormState: {
+                ..._.commonFormState,
+                modifiedByUser: true,
+              },
             }));
           },
           add: (newElement: ValueTuple) => {},
@@ -107,8 +111,14 @@ export const MapForm = <
         ): (Context & Value<ValueTuple> & KeyFormState) | undefined => {
           const element = _.value.values.get(elementIndex) as ValueTuple;
           if (element == undefined) return undefined;
-          if (_.visibilities.kind != "map") return undefined;
-          if (_.disabledFields.kind != "map") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "map")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "map")
+            return undefined;
+          const disabled =
+            _.disabledFields.elementValues[elementIndex].key.value ?? true;
+          const visible =
+            _.visibilities.elementValues[elementIndex].key.value ?? false;
           const elementFormState = _.elementFormStates.get(elementIndex) || {
             KeyFormState: KeyFormState.Default(),
             ValueFormState: ValueFormState.Default(),
@@ -123,6 +133,8 @@ export const MapForm = <
             value: element.values.get(0)!,
             visibilities: elementVisibility,
             disabledFields: elementDisabled,
+            disabled: disabled,
+            visible: visible,
           };
           return elementContext;
         },
@@ -188,7 +200,10 @@ export const MapForm = <
             );
             props.setState((_) => ({
               ..._,
-              commonFormState: { ..._.commonFormState, modifiedByUser: true },
+              commonFormState: {
+                ..._.commonFormState,
+                modifiedByUser: true,
+              },
             }));
           },
           add: (newElement: ValueTuple) => {},
@@ -203,8 +218,14 @@ export const MapForm = <
         ): (Context & Value<ValueTuple> & ValueFormState) | undefined => {
           const element = _.value.values.get(elementIndex) as ValueTuple;
           if (element == undefined) return undefined;
-          if (_.visibilities.kind != "map") return undefined;
-          if (_.disabledFields.kind != "map") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "map")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "map")
+            return undefined;
+          const disabled =
+            _.disabledFields.elementValues[elementIndex].value.value ?? true;
+          const visible =
+            _.visibilities.elementValues[elementIndex].value.value ?? false;
           const elementFormState = _.elementFormStates.get(elementIndex) || {
             KeyFormState: KeyFormState.Default(),
             ValueFormState: ValueFormState.Default(),
@@ -219,6 +240,8 @@ export const MapForm = <
             value: element.values.get(1)!,
             visibilities: elementVisibility,
             disabledFields: elementDisabled,
+            disabled: disabled,
+            visible: visible,
           };
           return elementContext;
         },
@@ -254,47 +277,49 @@ export const MapForm = <
       Context,
       ForeignMutationsExpected
     >
-  >((props) => (
-    <>
-      <props.view
-        {...props}
-        context={{
-          ...props.context,
-        }}
-        foreignMutations={{
-          ...props.foreignMutations,
-          add: (_) => {
-            props.foreignMutations.onChange(
-              Updater((list) =>
-                PredicateValue.Default.tuple(
-                  ListRepo.Updaters.push<ValueTuple>(
-                    PredicateValue.Default.tuple(
-                      List([Key.Default(), Value.Default()]),
-                    ),
-                  )(list.values as List<ValueTuple>),
+  >((props) => {
+    return (
+      <>
+        <props.view
+          {...props}
+          context={{
+            ...props.context,
+          }}
+          foreignMutations={{
+            ...props.foreignMutations,
+            add: (_) => {
+              props.foreignMutations.onChange(
+                Updater((list) =>
+                  PredicateValue.Default.tuple(
+                    ListRepo.Updaters.push<ValueTuple>(
+                      PredicateValue.Default.tuple(
+                        List([Key.Default(), Value.Default()]),
+                      ),
+                    )(list.values as List<ValueTuple>),
+                  ),
                 ),
-              ),
-              List([{ kind: "add" }]),
-            );
-          },
-          remove: (_) => {
-            props.foreignMutations.onChange(
-              Updater((list) =>
-                PredicateValue.Default.tuple(
-                  ListRepo.Updaters.remove<ValueTuple>(_)(
-                    list.values as List<ValueTuple>,
+                List([{ kind: "add" }]),
+              );
+            },
+            remove: (_) => {
+              props.foreignMutations.onChange(
+                Updater((list) =>
+                  PredicateValue.Default.tuple(
+                    ListRepo.Updaters.remove<ValueTuple>(_)(
+                      list.values as List<ValueTuple>,
+                    ),
                   ),
                 ),
-              ),
-              List([_, { kind: "remove" }]),
-            );
-          },
-        }}
-        embeddedKeyTemplate={embeddedKeyTemplate}
-        embeddedValueTemplate={embeddedValueTemplate}
-      />
-    </>
-  )).any([
+                List([_, { kind: "remove" }]),
+              );
+            },
+          }}
+          embeddedKeyTemplate={embeddedKeyTemplate}
+          embeddedValueTemplate={embeddedValueTemplate}
+        />
+      </>
+    );
+  }).any([
     ValidateRunner<
       Context & { disabled: boolean },
       MapFieldState<KeyFormState, ValueFormState>,

package/src/forms/domains/primitives/domains/number/state.ts

@@ -11,6 +11,7 @@ export type NumberView<
   Context &
     Value<number> & { commonFormState: CommonFormState } & {
       disabled: boolean;
+      visible: boolean;
     },
   { commonFormState: CommonFormState },
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/number/template.tsx

@@ -19,7 +19,7 @@ export const NumberForm = <Context extends FormLabel, ForeignMutationsExpected>(
   validation?: BasicFun<number, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<number> & { disabled: boolean },
+    Context & Value<number> & { disabled: boolean; visible: boolean },
     { commonFormState: CommonFormState },
     ForeignMutationsExpected & { onChange: OnChange<number> },
     NumberView<Context, ForeignMutationsExpected>
@@ -36,7 +36,7 @@ export const NumberForm = <Context extends FormLabel, ForeignMutationsExpected>(
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       { commonFormState: CommonFormState },
       ForeignMutationsExpected,
       number

package/src/forms/domains/primitives/domains/searchable-infinite-stream/state.ts

@@ -81,6 +81,7 @@ export type SearchableInfiniteStreamView<
     SearchableInfiniteStreamState & {
       hasMoreValues: boolean;
       disabled: boolean;
+      visible: boolean;
     },
   SearchableInfiniteStreamState,
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/searchable-infinite-stream/template.tsx

@@ -34,7 +34,7 @@ export const SearchableInfiniteStreamForm = <
   validation?: BasicFun<ValueOption, Promise<FieldValidation>>,
 ) => {
   const Co = CoTypedFactory<
-    Context & Value<ValueOption> & { disabled: boolean },
+    Context & Value<ValueOption> & { disabled: boolean; visible: boolean },
     SearchableInfiniteStreamState
   >();
   const DebouncerCo = CoTypedFactory<
@@ -92,7 +92,7 @@ export const SearchableInfiniteStreamForm = <
   );
 
   return Template.Default<
-    Context & Value<ValueOption> & { disabled: boolean },
+    Context & Value<ValueOption> & { disabled: boolean; visible: boolean },
     SearchableInfiniteStreamState,
     ForeignMutationsExpected & {
       onChange: OnChange<ValueOption>;
@@ -180,7 +180,7 @@ export const SearchableInfiniteStreamForm = <
         ),
     })),
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       SearchableInfiniteStreamState,
       ForeignMutationsExpected,
       ValueOption

package/src/forms/domains/primitives/domains/searchable-infinite-stream-multiselect/state.ts

@@ -18,6 +18,7 @@ export type InfiniteStreamMultiselectView<
       isLoading: boolean;
       availableOptions: Array<CollectionReference>;
       disabled: boolean;
+      visible: boolean;
     },
   SearchableInfiniteStreamState,
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/searchable-infinite-stream-multiselect/template.tsx

@@ -41,7 +41,7 @@ export const InfiniteMultiselectDropdownForm = <
   validation?: BasicFun<ValueRecord, Promise<FieldValidation>>,
 ) => {
   const Co = CoTypedFactory<
-    Context & Value<ValueRecord> & { disabled: boolean },
+    Context & Value<ValueRecord> & { disabled: boolean; visible: boolean },
     SearchableInfiniteStreamState
   >();
   const DebouncerCo = CoTypedFactory<
@@ -95,7 +95,7 @@ export const InfiniteMultiselectDropdownForm = <
   );
 
   return Template.Default<
-    Context & Value<ValueRecord> & { disabled: boolean },
+    Context & Value<ValueRecord> & { disabled: boolean; visible: boolean },
     SearchableInfiniteStreamState,
     ForeignMutationsExpected & {
       onChange: OnChange<ValueRecord>;
@@ -199,7 +199,7 @@ export const InfiniteMultiselectDropdownForm = <
         ),
     })),
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       SearchableInfiniteStreamState,
       ForeignMutationsExpected,
       ValueRecord

package/src/forms/domains/primitives/domains/secret/state.ts

@@ -11,6 +11,7 @@ export type SecretView<
   Context &
     Value<string> & { commonFormState: CommonFormState } & {
       disabled: boolean;
+      visible: boolean;
     },
   { commonFormState: CommonFormState },
   ForeignMutationsExpected & {

package/src/forms/domains/primitives/domains/secret/template.tsx

@@ -15,7 +15,7 @@ export const SecretForm = <Context extends FormLabel, ForeignMutationsExpected>(
   validation?: BasicFun<string, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<string> & { disabled: boolean },
+    Context & Value<string> & { disabled: boolean; visible: boolean },
     { commonFormState: CommonFormState },
     ForeignMutationsExpected & { onChange: OnChange<string> },
     SecretView<Context, ForeignMutationsExpected>
@@ -32,7 +32,7 @@ export const SecretForm = <Context extends FormLabel, ForeignMutationsExpected>(
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       { commonFormState: CommonFormState },
       ForeignMutationsExpected,
       string

package/src/forms/domains/primitives/domains/string/state.ts

@@ -12,7 +12,7 @@ export type StringView<
     Value<string> & {
       commonFormState: CommonFormState;
       customFormState: Unit;
-    } & { disabled: boolean },
+    } & { disabled: boolean; visible: boolean },
   { commonFormState: CommonFormState; customFormState: Unit },
   ForeignMutationsExpected & {
     onChange: OnChange<string>;

package/src/forms/domains/primitives/domains/string/template.tsx

@@ -26,7 +26,7 @@ export const StringForm = <Context extends FormLabel, ForeignMutationsExpected>(
   validation?: BasicFun<string, Promise<FieldValidation>>,
 ) => {
   return Template.Default<
-    Context & Value<string> & { disabled: boolean },
+    Context & Value<string> & { disabled: boolean; visible: boolean },
     { commonFormState: CommonFormState; customFormState: Unit },
     ForeignMutationsExpected & { onChange: OnChange<string> },
     StringView<Context, ForeignMutationsExpected>
@@ -43,7 +43,7 @@ export const StringForm = <Context extends FormLabel, ForeignMutationsExpected>(
     </>
   )).any([
     ValidateRunner<
-      Context & { disabled: boolean },
+      Context & { disabled: boolean; visible: boolean },
       { commonFormState: CommonFormState; customFormState: Unit },
       ForeignMutationsExpected,
       string

package/src/forms/domains/primitives/domains/sum/state.ts

@@ -6,6 +6,7 @@ import {
   simpleUpdater,
   Sum,
   Template,
+  Unit,
   Value,
   ValueSum,
   View,

package/src/forms/domains/primitives/domains/sum/template.tsx

@@ -2,9 +2,9 @@ import { List } from "immutable";
 import {
   BasicFun,
   BasicUpdater,
-  FormFieldPredicateEvaluation,
   PredicateValue,
   Sum,
+  SumFieldPredicateEvaluation,
   Updater,
   ValidateRunner,
   Value,
@@ -25,8 +25,10 @@ export const SumForm = <
   LeftFormState,
   RightFormState,
   Context extends FormLabel & {
-    visibilities: FormFieldPredicateEvaluation;
-    disabledFields: FormFieldPredicateEvaluation;
+    visibilities: SumFieldPredicateEvaluation;
+    disabledFields: SumFieldPredicateEvaluation;
+    disabled: boolean;
+    visible: boolean;
   },
   ForeignMutationsExpected,
 >(
@@ -84,13 +86,17 @@ export const SumForm = <
             SumFieldState<LeftFormState, RightFormState>,
         ): (Context & Value<PredicateValue> & LeftFormState) | undefined => {
           if (_.value.value.kind != "l") return undefined;
-          if (_.visibilities.kind != "sum") return undefined;
-          if (_.disabledFields.kind != "sum") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "sum")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "sum")
+            return undefined;
           const leftFormState =
             _.customFormState.left || LeftFormState.Default();
           const leftContext: Context & Value<PredicateValue> & LeftFormState = {
             ..._,
             ...leftFormState,
+            disabled: _.disabledFields.innerValue.value ?? true,
+            visible: _.visibilities.innerValue.value ?? false,
             value: _.value.value.value,
             visibilities: _.visibilities.innerValue,
             disabledFields: _.disabledFields.innerValue,
@@ -144,14 +150,18 @@ export const SumForm = <
             SumFieldState<LeftFormState, RightFormState>,
         ): (Context & Value<PredicateValue> & RightFormState) | undefined => {
           if (_.value.value.kind != "r") return undefined;
-          if (_.visibilities.kind != "sum") return undefined;
-          if (_.disabledFields.kind != "sum") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "sum")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "sum")
+            return undefined;
           const rightFormState =
             _.customFormState.right || RightFormState.Default();
           const rightContext: Context & Value<PredicateValue> & RightFormState =
             {
               ..._,
               ...rightFormState,
+              disabled: _.disabledFields.innerValue.value,
+              visible: _.visibilities.innerValue.value,
               value: _.value.value.value,
               visibilities: _.visibilities.innerValue,
               disabledFields: _.disabledFields.innerValue,
@@ -183,32 +193,34 @@ export const SumForm = <
       Context,
       ForeignMutationsExpected
     >
-  >((props) => (
-    <>
-      <props.view
-        {...props}
-        context={{ ...props.context }}
-        foreignMutations={{
-          ...props.foreignMutations,
-          onSwitch: () => {
-            props.foreignMutations.onChange(
-              (_) =>
-                _.value.kind === "l"
-                  ? PredicateValue.Default.sum(
-                      Sum.Default.right(Right.Default()),
-                    )
-                  : PredicateValue.Default.sum(
-                      Sum.Default.left(Left.Default()),
-                    ),
-              List(["switch"]),
-            );
-          },
-        }}
-        embeddedLeftTemplate={embeddedLeftTemplate}
-        embeddedRightTemplate={embeddedRightTemplate}
-      />
-    </>
-  )).any([
+  >((props) => {
+    return (
+      <>
+        <props.view
+          {...props}
+          context={{ ...props.context }}
+          foreignMutations={{
+            ...props.foreignMutations,
+            onSwitch: () => {
+              props.foreignMutations.onChange(
+                (_) =>
+                  _.value.kind === "l"
+                    ? PredicateValue.Default.sum(
+                        Sum.Default.right(Right.Default()),
+                      )
+                    : PredicateValue.Default.sum(
+                        Sum.Default.left(Left.Default()),
+                      ),
+                List(["switch"]),
+              );
+            },
+          }}
+          embeddedLeftTemplate={embeddedLeftTemplate}
+          embeddedRightTemplate={embeddedRightTemplate}
+        />
+      </>
+    );
+  }).any([
     ValidateRunner<
       Context & { disabled: boolean },
       SumFieldState<LeftFormState, RightFormState>,

package/src/forms/domains/primitives/domains/tuple/template.tsx

@@ -12,6 +12,9 @@ import {
   FormFieldPredicateEvaluation,
   ValueTuple,
   PredicateValue,
+  FieldPredicateExpression,
+  TuplePredicateExpression,
+  TupleFieldPredicateEvaluation,
 } from "../../../../../../main";
 import { Template } from "../../../../../template/state";
 import { Value } from "../../../../../value/state";
@@ -28,8 +31,10 @@ export const TupleForm = <
     commonFormState: { modifiedByUser: boolean };
   }>,
   Context extends FormLabel & {
-    visibilities: FormFieldPredicateEvaluation;
-    disabledFields: FormFieldPredicateEvaluation;
+    visibilities: TupleFieldPredicateEvaluation;
+    disabledFields: TupleFieldPredicateEvaluation;
+    disabled: boolean;
+    visible: boolean;
   },
   ForeignMutationsExpected,
 >(
@@ -37,16 +42,17 @@ export const TupleForm = <
     Default: () => { commonFormState: { modifiedByUser: boolean } };
   }>,
   elementTemplates: List<
-    Template<
-      Context &
-        Value<PredicateValue> & {
-          commonFormState: { modifiedByUser: boolean };
-        },
-      any,
-      ForeignMutationsExpected & {
-        onChange: OnChange<PredicateValue>;
-      }
-    >
+    | Template<
+        Context &
+          Value<PredicateValue> & {
+            commonFormState: { modifiedByUser: boolean };
+          },
+        any,
+        ForeignMutationsExpected & {
+          onChange: OnChange<PredicateValue>;
+        }
+      >
+    | undefined
   >,
   validation?: BasicFun<ValueTuple, Promise<FieldValidation>>,
 ) => {
@@ -81,7 +87,10 @@ export const TupleForm = <
             );
             props.setState((_) => ({
               ..._,
-              commonFormState: { ..._.commonFormState, modifiedByUser: true },
+              commonFormState: {
+                ..._.commonFormState,
+                modifiedByUser: true,
+              },
             }));
           },
         }),
@@ -96,8 +105,14 @@ export const TupleForm = <
               })
           | undefined => {
           if (!_.value.values.has(elementIndex)) return undefined;
-          if (_.visibilities.kind != "tuple") return undefined;
-          if (_.disabledFields.kind != "tuple") return undefined;
+          if (_.visibilities == undefined || _.visibilities.kind != "tuple")
+            return undefined;
+          if (_.disabledFields == undefined || _.disabledFields.kind != "tuple")
+            return undefined;
+          const disabled =
+            _.disabledFields.elementValues[elementIndex].value ?? true;
+          const visible =
+            _.visibilities.elementValues[elementIndex].value ?? false;
           const element = _.value.values.get(elementIndex);
           const elementFormState =
             _.elementFormStates.get(elementIndex) ||
@@ -110,6 +125,8 @@ export const TupleForm = <
             } = {
             ..._,
             ...elementFormState,
+            disabled: disabled,
+            visible: visible,
             value: element,
             visibilities: elementVisibility,
             disabledFields: elementDisabled,
@@ -119,7 +136,9 @@ export const TupleForm = <
       )
       .mapState(
         (
-          _: BasicUpdater<{ commonFormState: { modifiedByUser: boolean } }>,
+          _: BasicUpdater<{
+            commonFormState: { modifiedByUser: boolean };
+          }>,
         ): Updater<TupleFieldState<ElementFormStates>> =>
           TupleFieldState<ElementFormStates>().Updaters.Core.elementFormStates(
             MapRepo.Updaters.upsert(

package/src/forms/domains/singleton/state.ts

@@ -87,6 +87,8 @@ export type EntityFormContext<
   ForeignMutationsExpected,
 > = Context &
   EntityFormState<Fields, FieldStates, Context, ForeignMutationsExpected> & {
+    disabled: boolean;
+    visible: boolean;
     elementVisibilities: FormFieldPredicateEvaluation[] | undefined;
     elementDisabledFields: FormFieldPredicateEvaluation | undefined;
     extraContext: any;

package/src/forms/domains/singleton/template.tsx

@@ -45,7 +45,7 @@ export const Form = <
       Context & {
         customFormState: State["formFieldStates"][f]["customFormState"];
         commonFormState: State["formFieldStates"][f]["commonFormState"];
-      } & Value<f> & { disabled: boolean },
+      } & Value<f> & { disabled: boolean; visible: boolean },
       {
         customFormState: State["formFieldStates"][f]["customFormState"];
         commonFormState: State["formFieldStates"][f]["commonFormState"];
@@ -84,7 +84,7 @@ export const Form = <
                 FieldStates,
                 Context,
                 ForeignMutationsExpected
-              > & { disabled: boolean }
+              > & { disabled: boolean; visible: boolean }
             >((_) => {
               // disabled flag is passed in from the wrapping container when mapping over fields
               const visibilitiesFromParent =
@@ -102,6 +102,7 @@ export const Form = <
                 value: (_.value as ValueRecord).fields.get(field as string),
                 extraContext: _.extraContext,
                 disabled: _.disabled,
+                visible: _.visible,
                 commonFormState: _.formFieldStates[field].commonFormState,
                 customFormState: _.formFieldStates[field].customFormState,
                 formFieldStates: _.formFieldStates[field].formFieldStates,
@@ -222,6 +223,7 @@ export const Form = <
           const visibleFieldKeys: OrderedSet<FieldName> = (() => {
             if (
               props.context.visibilities == undefined ||
+              props.context.visible == false ||
               props.context.visibilities.kind != "form"
             )
               return OrderedSet();
@@ -235,9 +237,12 @@ export const Form = <
           const disabledFieldKeys: OrderedSet<FieldName> = (() => {
             if (
               props.context.disabledFields == undefined ||
+              props.context.disabled ||
               props.context.disabledFields.kind != "form"
             )
-              return OrderedSet(Object.keys(props.context.value as object));
+              return OrderedSet(
+                Object.keys(props.context.value.fields.toJS() as object),
+              );
 
             return props.context.disabledFields.fields
               .filter((_) => _.value == true)