@defra/forms-model 3.0.178 → 3.0.180

package/dist/types/conditions/condition-operators.d.ts

@@ -1,249 +1,73 @@
-import { ComponentType } from '../components/enums.js';
-import { type ComponentDef } from '../components/types.js';
-import { type ConditionValueAbstract } from '../conditions/condition-value-abstract.js';
+import { type ConditionalComponentType } from '../components/types.js';
+import { ConditionValue, RelativeTimeValue } from '../conditions/condition-values.js';
+import { OperatorName } from '../conditions/enums.js';
+import { type OperatorDefinition } from '../conditions/types.js';
 export declare const customOperators: {
-    CheckboxesField: {
-        contains: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'does not contain': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly CheckboxesField: {
+        readonly contains: OperatorDefinition;
+        readonly "does not contain": OperatorDefinition;
     };
-    NumberField: {
-        'is at least': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly NumberField: {
+        "is at least": OperatorDefinition;
+        "is at most": OperatorDefinition;
+        "is less than": OperatorDefinition;
+        "is more than": OperatorDefinition;
     } & {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
     };
-    DateField: {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is before': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is after': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    } & {
-        'is at least': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    };
-    TimeField: {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is before': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is after': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    } & {
-        'is at least': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly TimeField: {
+        readonly "is at least": OperatorDefinition;
+        readonly "is at most": OperatorDefinition;
+        readonly "is less than": OperatorDefinition;
+        readonly "is more than": OperatorDefinition;
+        readonly is: OperatorDefinition;
+        readonly "is not": OperatorDefinition;
+        readonly "is before": OperatorDefinition;
+        readonly "is after": OperatorDefinition;
     };
-    DatePartsField: {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is before': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is after': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    } & {
-        'is at least': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly DatePartsField: {
+        readonly "is at least": OperatorDefinition;
+        readonly "is at most": OperatorDefinition;
+        readonly "is less than": OperatorDefinition;
+        readonly "is more than": OperatorDefinition;
+        readonly is: OperatorDefinition;
+        readonly "is not": OperatorDefinition;
+        readonly "is before": OperatorDefinition;
+        readonly "is after": OperatorDefinition;
     };
-    DateTimeField: {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is before': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is after': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly TextField: {
+        "is longer than": OperatorDefinition;
+        "is shorter than": OperatorDefinition;
+        "has length": OperatorDefinition;
     } & {
-        'is at least': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
     };
-    DateTimePartsField: {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is before': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is after': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly MultilineTextField: {
+        "is longer than": OperatorDefinition;
+        "is shorter than": OperatorDefinition;
+        "has length": OperatorDefinition;
     } & {
-        'is at least': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is at most': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is less than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is more than': {
-            units: any;
-            expression: (field: ComponentDef, value: any) => string;
-        };
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
     };
-    TextField: {
-        'is longer than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is shorter than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'has length': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly EmailAddressField: {
+        "is longer than": OperatorDefinition;
+        "is shorter than": OperatorDefinition;
+        "has length": OperatorDefinition;
     } & {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
     };
-    MultilineTextField: {
-        'is longer than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is shorter than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'has length': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    } & {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    };
-    EmailAddressField: {
-        'is longer than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is shorter than': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'has length': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-    } & {
-        is: {
-            expression: (field: ComponentDef, value: any) => string;
-        };
-        'is not': {
-            expression: (field: ComponentDef, value: any) => string;
-        };
+    readonly YesNoField: {
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
     };
 };
-export declare function getOperatorNames(fieldType: any): string[];
-export declare function getExpression(fieldType: ComponentType, fieldName: string, operator: string, value: ConditionValueAbstract): any;
-export declare function getOperatorConfig(fieldType: ComponentType, operator: any): any;
+export declare function getOperatorNames(fieldType: ConditionalComponentType): string[];
+export declare function getExpression(fieldType: ConditionalComponentType, fieldName: string, operator: OperatorName, value: ConditionValue | RelativeTimeValue): string | undefined;
+export declare function getOperatorConfig(fieldType: ConditionalComponentType, operator: OperatorName): OperatorDefinition | undefined;
 export declare const absoluteDateOrTimeOperatorNames: string[];
 export declare const relativeDateOrTimeOperatorNames: string[];
 //# sourceMappingURL=condition-operators.d.ts.map

package/dist/types/conditions/condition-operators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"condition-operators.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-operators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,8CAA8C,CAAA;AAyC1F,eAAO,MAAM,eAAe;;;gCAmFJ,YAAY;;;gCAOZ,YAAY;;;;;gCArBZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCA8CZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCAYZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;;gCAZZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCAYZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;;gCAZZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCAYZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;;gCAZZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCAYZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;;gCAZZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;;gCAYZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;gCAAZ,YAAY;;;;;gCAnDZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;gCAPZ,YAAY;;;gCAAZ,YAAY;;;;;gCAOZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;gCAPZ,YAAY;;;gCAAZ,YAAY;;;;;gCAOZ,YAAY;;;gCAAZ,YAAY;;;gCAAZ,YAAY;;;;gCAPZ,YAAY;;;gCAAZ,YAAY;;;CA5BnC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,KAAA,YAEzC;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,sBAAsB,OAM9B;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,KAAA,OAEnE;AA6CD,eAAO,MAAM,+BAA+B,UAE3C,CAAA;AACD,eAAO,MAAM,+BAA+B,UAE3C,CAAA"}
+{"version":3,"file":"condition-operators.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-operators.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAIL,cAAc,EACd,iBAAiB,EAClB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,2BAA2B,CAAA;AA+ClC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBgD,CAAA;AAE5E,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,wBAAwB,YAEnE;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,wBAAwB,EACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,cAAc,GAAG,iBAAiB,sBAM1C;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,YAAY,kCAGvB;AA2DD,eAAO,MAAM,+BAA+B,UAE3C,CAAA;AAED,eAAO,MAAM,+BAA+B,UAE3C,CAAA"}

package/dist/types/conditions/condition-ref.d.ts

@@ -1,12 +1,12 @@
 import { ConditionAbstract } from '../conditions/condition-abstract.js';
 import { type Coordinator } from '../conditions/enums.js';
 export declare class ConditionRef extends ConditionAbstract {
-    conditionName: string;
-    conditionDisplayName: string;
+    conditionName: any;
+    conditionDisplayName: any;
     constructor(conditionName: string, conditionDisplayName: string, coordinator: Coordinator | undefined);
     asFirstCondition(): this;
     conditionString(): string;
-    conditionExpression(): string;
+    conditionExpression(): any;
     clone(): ConditionRef;
 }
 //# sourceMappingURL=condition-ref.d.ts.map

package/dist/types/conditions/condition-ref.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"condition-ref.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,qBAAa,YAAa,SAAQ,iBAAiB;IACjD,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;gBAG1B,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,WAAW,EAAE,WAAW,GAAG,SAAS;IAkBtC,gBAAgB;IAKhB,eAAe;IAIf,mBAAmB;IAInB,KAAK;CAON"}
+{"version":3,"file":"condition-ref.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,qBAAa,YAAa,SAAQ,iBAAiB;IACjD,aAAa,MAAA;IACb,oBAAoB,MAAA;gBAGlB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,WAAW,EAAE,WAAW,GAAG,SAAS;IAkBtC,gBAAgB;IAKhB,eAAe;IAIf,mBAAmB;IAInB,KAAK;CAON"}

package/dist/types/conditions/condition-values.d.ts

@@ -1,7 +1,8 @@
 import { ConditionValueAbstract } from '../conditions/condition-value-abstract.js';
+import { ConditionType, DateDirections } from '../conditions/enums.js';
 import { type DateTimeUnitValues, type DateUnits, type TimeUnits } from '../conditions/types.js';
 export declare class ConditionValue extends ConditionValueAbstract implements ConditionValueFrom {
-    type: 'Value';
+    type: ConditionType.Value;
     value: string;
     display: string;
     constructor(value: string, display?: string);
@@ -14,15 +15,11 @@ export interface ConditionValueFrom {
     value: string;
     display?: string;
 }
-export declare enum DateDirections {
-    FUTURE = "in the future",
-    PAST = "in the past"
-}
 export declare const dateUnits: DateUnits;
 export declare const timeUnits: TimeUnits;
 export declare const dateTimeUnits: DateUnits & TimeUnits;
 export declare class RelativeTimeValue extends ConditionValueAbstract implements RelativeTimeValueFrom {
-    type: 'RelativeTime';
+    type: ConditionType.RelativeTime;
     timePeriod: string;
     timeUnit: DateTimeUnitValues;
     direction: DateDirections;
@@ -40,8 +37,8 @@ export interface RelativeTimeValueFrom {
     timeOnly: boolean;
 }
 export declare function conditionValueFrom(obj: ConditionValue | RelativeTimeValue | ({
-    type: 'Value';
+    type: ConditionType.Value;
 } & ConditionValueFrom) | ({
-    type: 'RelativeTime';
+    type: ConditionType.RelativeTime;
 } & RelativeTimeValueFrom)): ConditionValue | RelativeTimeValue;
 //# sourceMappingURL=condition-values.d.ts.map

package/dist/types/conditions/condition-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"condition-values.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAA;AACrF,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,2BAA2B,CAAA;AAElC,qBAAa,cACX,SAAQ,sBACR,YAAW,kBAAkB;IAE7B,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;gBAEH,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgB3C,oBAAoB;IAIpB,YAAY;IAIZ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,kBAAkB;IAIpD,KAAK;CAGN;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,oBAAY,cAAc;IACxB,MAAM,kBAAkB;IACxB,IAAI,gBAAgB;CACrB;AAED,eAAO,MAAM,SAAS,EAAE,SAIvB,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,SAIvB,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,SAAS,GAAG,SAIvC,CAAA;AAED,qBAAa,iBACX,SAAQ,sBACR,YAAW,qBAAqB;IAEhC,IAAI,EAAE,cAAc,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,SAAS,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;gBAGf,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,cAAc,EACzB,QAAQ,UAAQ;IA+BlB,oBAAoB;IAIpB,YAAY,IAAI,MAAM;IAUtB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,qBAAqB;IAS1D,KAAK;CAGN;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,SAAS,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EACC,cAAc,GACd,iBAAiB,GACjB,CAAC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,kBAAkB,CAAC,GACxC,CAAC;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,GAAG,qBAAqB,CAAC,sCASvD"}
+{"version":3,"file":"condition-values.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAA;AACrF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,2BAA2B,CAAA;AAElC,qBAAa,cACX,SAAQ,sBACR,YAAW,kBAAkB;IAE7B,IAAI,EAAE,aAAa,CAAC,KAAK,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;gBAEH,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAgB3C,oBAAoB;IAIpB,YAAY;IAIZ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,kBAAkB;IAIpD,KAAK;CAGN;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,SAAS,EAAE,SAId,CAAA;AAEV,eAAO,MAAM,SAAS,EAAE,SAId,CAAA;AAEV,eAAO,MAAM,aAAa,EAAE,SAAS,GAAG,SAG9B,CAAA;AAEV,qBAAa,iBACX,SAAQ,sBACR,YAAW,qBAAqB;IAEhC,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,SAAS,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;gBAGf,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,cAAc,EACzB,QAAQ,UAAQ;IA+BlB,oBAAoB;IAIpB,YAAY,IAAI,MAAM;IAUtB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,qBAAqB;IAS1D,KAAK;CAGN;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,SAAS,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EACC,cAAc,GACd,iBAAiB,GACjB,CAAC;IAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAA;CAAE,GAAG,kBAAkB,CAAC,GACpD,CAAC;IAAE,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;CAAE,GAAG,qBAAqB,CAAC,sCASnE"}

package/dist/types/conditions/condition.d.ts

@@ -1,15 +1,15 @@
 import { ConditionAbstract } from '../conditions/condition-abstract.js';
 import { ConditionField } from '../conditions/condition-field.js';
 import { type ConditionValue, type RelativeTimeValue } from '../conditions/condition-values.js';
-import { type Coordinator } from '../conditions/enums.js';
+import { type Coordinator, type OperatorName } from '../conditions/enums.js';
 export declare class Condition extends ConditionAbstract {
-    field: ConditionField;
-    operator: string;
-    value: ConditionValue | RelativeTimeValue;
-    constructor(field?: ConditionField, operator?: string, value?: ConditionValue | RelativeTimeValue, coordinator?: Coordinator);
+    field: any;
+    operator: any;
+    value: any;
+    constructor(field?: ConditionField, operator?: OperatorName, value?: ConditionValue | RelativeTimeValue, coordinator?: Coordinator);
     asFirstCondition(): this;
     conditionString(): string;
-    conditionExpression(): any;
+    conditionExpression(): string | undefined;
     clone(): Condition;
 }
 //# sourceMappingURL=condition.d.ts.map

package/dist/types/conditions/condition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAGpE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,cAAc,GAAG,iBAAiB,CAAA;gBAGvC,KAAK,CAAC,EAAE,cAAc,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,cAAc,GAAG,iBAAiB,EAC1C,WAAW,CAAC,EAAE,WAAW;IAqB3B,gBAAgB;IAKhB,eAAe;IAMf,mBAAmB;IASnB,KAAK;CAQN"}
+{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAGpE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE/E,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,KAAK,MAAA;IACL,QAAQ,MAAA;IACR,KAAK,MAAA;gBAGH,KAAK,CAAC,EAAE,cAAc,EACtB,QAAQ,CAAC,EAAE,YAAY,EACvB,KAAK,CAAC,EAAE,cAAc,GAAG,iBAAiB,EAC1C,WAAW,CAAC,EAAE,WAAW;IAqB3B,gBAAgB;IAKhB,eAAe;IAMf,mBAAmB;IASnB,KAAK;CAQN"}

package/dist/types/conditions/enums.d.ts

@@ -6,4 +6,32 @@ export declare enum Coordinator {
     AND = "and",
     OR = "or"
 }
+export declare enum Operator {
+    Is = "==",
+    IsNot = "!=",
+    Contains = "in",
+    IsAtLeast = ">=",
+    IsAtMost = "<=",
+    IsLessThan = "<",
+    IsMoreThan = ">"
+}
+export declare enum OperatorName {
+    Is = "is",
+    IsNot = "is not",
+    IsLongerThan = "is longer than",
+    IsShorterThan = "is shorter than",
+    HasLength = "has length",
+    Contains = "contains",
+    DoesNotContain = "does not contain",
+    IsAtLeast = "is at least",
+    IsAtMost = "is at most",
+    IsLessThan = "is less than",
+    IsMoreThan = "is more than",
+    IsBefore = "is before",
+    IsAfter = "is after"
+}
+export declare enum DateDirections {
+    FUTURE = "in the future",
+    PAST = "in the past"
+}
 //# sourceMappingURL=enums.d.ts.map

package/dist/types/conditions/enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../src/conditions/enums.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,YAAY,iBAAiB;CAC9B;AAED,oBAAY,WAAW;IACrB,GAAG,QAAQ;IACX,EAAE,OAAO;CACV"}
+{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../../src/conditions/enums.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,YAAY,iBAAiB;CAC9B;AAED,oBAAY,WAAW;IACrB,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,QAAQ;IAClB,EAAE,OAAO;IACT,KAAK,OAAO;IACZ,QAAQ,OAAO;IACf,SAAS,OAAO;IAChB,QAAQ,OAAO;IACf,UAAU,MAAM;IAChB,UAAU,MAAM;CACjB;AAED,oBAAY,YAAY;IACtB,EAAE,OAAO;IACT,KAAK,WAAW;IAChB,YAAY,mBAAmB;IAC/B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,QAAQ,aAAa;IACrB,cAAc,qBAAqB;IACnC,SAAS,gBAAgB;IACzB,QAAQ,eAAe;IACvB,UAAU,iBAAiB;IAC3B,UAAU,iBAAiB;IAC3B,QAAQ,cAAc;IACtB,OAAO,aAAa;CACrB;AAED,oBAAY,cAAc;IACxB,MAAM,kBAAkB;IACxB,IAAI,gBAAgB;CACrB"}

package/dist/types/conditions/index.d.ts

@@ -1,5 +1,5 @@
 export { getExpression, getOperatorConfig, getOperatorNames, absoluteDateOrTimeOperatorNames, relativeDateOrTimeOperatorNames } from '../conditions/condition-operators.js';
-export { timeUnits, dateUnits, dateTimeUnits, ConditionValue, DateDirections, RelativeTimeValue, conditionValueFrom } from '../conditions/condition-values.js';
+export { timeUnits, dateUnits, dateTimeUnits, ConditionValue, RelativeTimeValue, conditionValueFrom } from '../conditions/condition-values.js';
 export { ConditionField } from '../conditions/condition-field.js';
 export { Condition } from '../conditions/condition.js';
 export { ConditionRef } from '../conditions/condition-ref.js';
@@ -7,5 +7,5 @@ export { ConditionGroup } from '../conditions/condition-group.js';
 export { ConditionsModel } from '../conditions/condition-model.js';
 export { ConditionGroupDef } from '../conditions/condition-group-def.js';
 export { toExpression, toPresentationString } from '../conditions/helpers.js';
-export { ConditionType, Coordinator } from '../conditions/enums.js';
+export { ConditionType, Coordinator, DateDirections, Operator, OperatorName } from '../conditions/enums.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/conditions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/conditions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,yCAAyC,CAAA;AAEhD,OAAO,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAEhF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/conditions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,yCAAyC,CAAA;AAEhD,OAAO,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAEhF,OAAO,EACL,aAAa,EACb,WAAW,EACX,cAAc,EACd,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAA"}

package/dist/types/conditions/types.d.ts

@@ -1,6 +1,9 @@
+import { type ConditionalComponentsDef } from '../components/types.js';
 import { type ConditionGroup } from '../conditions/condition-group.js';
 import { type ConditionRef } from '../conditions/condition-ref.js';
+import { type ConditionValue, type RelativeTimeValue } from '../conditions/condition-values.js';
 import { type Condition } from '../conditions/condition.js';
+import { type OperatorName } from '../conditions/enums.js';
 export type ConditionsArray = (Condition | ConditionGroup | ConditionRef)[];
 export type DateTimeUnitValues = 'years' | 'months' | 'days' | 'hours' | 'minutes' | 'seconds';
 export interface DateUnits {
@@ -31,4 +34,9 @@ export interface TimeUnits {
         value: 'seconds';
     };
 }
+export interface OperatorDefinition {
+    units?: DateUnits | TimeUnits;
+    expression: (component: Pick<ConditionalComponentsDef, 'type' | 'name'>, conditionValue: ConditionValue | RelativeTimeValue) => string;
+}
+export type Conditionals = Record<OperatorName, OperatorDefinition>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types/conditions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/conditions/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAE9D,MAAM,MAAM,eAAe,GAAG,CAAC,SAAS,GAAG,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;AAE3E,MAAM,MAAM,kBAAkB,GAC1B,OAAO,GACP,QAAQ,GACR,MAAM,GACN,OAAO,GACP,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7C,MAAM,EAAE;QAAE,OAAO,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,QAAQ,CAAA;KAAE,CAAA;IAChD,IAAI,EAAE;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7C,OAAO,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAA;IACnD,OAAO,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAA;CACpD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/conditions/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG,CAAC,SAAS,GAAG,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;AAE3E,MAAM,MAAM,kBAAkB,GAC1B,OAAO,GACP,QAAQ,GACR,MAAM,GACN,OAAO,GACP,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7C,MAAM,EAAE;QAAE,OAAO,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,QAAQ,CAAA;KAAE,CAAA;IAChD,IAAI,EAAE;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7C,OAAO,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAA;IACnD,OAAO,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAA;CACpD;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAC7B,UAAU,EAAE,CACV,SAAS,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC1D,cAAc,EAAE,cAAc,GAAG,iBAAiB,KAC/C,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-model",
-  "version": "3.0.178",
+  "version": "3.0.180",
   "description": "A hapi plugin providing the model for Defra forms",
   "homepage": "https://github.com/DEFRA/forms-designer/tree/main/model#readme",
   "repository": {

package/src/components/component-types.ts

@@ -1,4 +1,5 @@
 import { ComponentSubType, ComponentType } from '~/src/components/enums.js'
+import { hasConditionSupport } from '~/src/components/helpers.js'
 import { type ComponentDef } from '~/src/components/types.js'
 
 export const ComponentTypes: ComponentDef[] = [
@@ -29,15 +30,6 @@ export const ComponentTypes: ComponentDef[] = [
     options: {},
     schema: {}
   },
-  {
-    name: 'DateField',
-    type: ComponentType.DateField,
-    title: 'Date field',
-    subType: ComponentSubType.Field,
-    hint: '',
-    options: {},
-    schema: {}
-  },
   {
     name: 'TimeField',
     type: ComponentType.TimeField,
@@ -47,28 +39,10 @@ export const ComponentTypes: ComponentDef[] = [
     options: {},
     schema: {}
   },
-  {
-    name: 'DateTimeField',
-    type: ComponentType.DateTimeField,
-    title: 'Date time field',
-    subType: ComponentSubType.Field,
-    hint: '',
-    options: {},
-    schema: {}
-  },
   {
     name: 'DatePartsField',
     type: ComponentType.DatePartsField,
-    title: 'Date parts field',
-    subType: ComponentSubType.Field,
-    hint: '',
-    options: {},
-    schema: {}
-  },
-  {
-    name: 'DateTimePartsField',
-    type: ComponentType.DateTimePartsField,
-    title: 'Date time parts field',
+    title: 'Date field',
     subType: ComponentSubType.Field,
     hint: '',
     options: {},
@@ -77,7 +51,7 @@ export const ComponentTypes: ComponentDef[] = [
   {
     name: 'MonthYearField',
     type: ComponentType.MonthYearField,
-    title: 'Month year field',
+    title: 'Month & year field',
     subType: ComponentSubType.Field,
     hint: '',
     options: {},
@@ -155,15 +129,6 @@ export const ComponentTypes: ComponentDef[] = [
     options: {},
     schema: {}
   },
-  {
-    name: 'FileUploadField',
-    type: ComponentType.FileUploadField,
-    title: 'File upload field',
-    subType: ComponentSubType.Field,
-    hint: '',
-    options: {},
-    schema: {}
-  },
   {
     name: 'Html',
     type: ComponentType.Html,
@@ -199,14 +164,8 @@ export const ComponentTypes: ComponentDef[] = [
     options: {},
     schema: {},
     list: ''
-  },
-  {
-    name: 'WebsiteField',
-    type: ComponentType.WebsiteField,
-    title: 'Website field',
-    subType: ComponentSubType.Field,
-    hint: '',
-    options: {},
-    schema: {}
   }
 ]
+
+export const ConditionalComponentTypes =
+  ComponentTypes.filter(hasConditionSupport)

package/src/components/enums.ts

@@ -2,12 +2,9 @@ export enum ComponentType {
   TextField = 'TextField',
   MultilineTextField = 'MultilineTextField',
   YesNoField = 'YesNoField',
-  DateField = 'DateField',
   TimeField = 'TimeField',
-  DateTimeField = 'DateTimeField',
   DatePartsField = 'DatePartsField',
   MonthYearField = 'MonthYearField',
-  DateTimePartsField = 'DateTimePartsField',
   SelectField = 'SelectField',
   AutocompleteField = 'AutocompleteField',
   RadiosField = 'RadiosField',
@@ -16,12 +13,10 @@ export enum ComponentType {
   UkAddressField = 'UkAddressField',
   TelephoneNumberField = 'TelephoneNumberField',
   EmailAddressField = 'EmailAddressField',
-  FileUploadField = 'FileUploadField',
   Html = 'Html',
   InsetText = 'InsetText',
   Details = 'Details',
-  List = 'List',
-  WebsiteField = 'WebsiteField'
+  List = 'List'
 }
 
 export enum ComponentSubType {