@defra/forms-model 3.0.253 → 3.0.255

package/dist/module/conditions/index.js

@@ -1,4 +1,4 @@
-export { getExpression, getOperatorConfig, getOperatorNames, absoluteDateOperatorNames, relativeDateOperatorNames } from "./condition-operators.js";
+export { getExpression, getOperatorNames, absoluteDateOperatorNames, relativeDateOperatorNames } from "./condition-operators.js";
 export { ConditionValue, RelativeDateValue, conditionValueFrom } from "./condition-values.js";
 export { ConditionField } from "./condition-field.js";
 export { Condition } from "./condition.js";
@@ -6,6 +6,6 @@ export { ConditionRef } from "./condition-ref.js";
 export { ConditionGroup } from "./condition-group.js";
 export { ConditionsModel } from "./condition-model.js";
 export { ConditionGroupDef } from "./condition-group-def.js";
-export { toExpression, toPresentationString } from "./helpers.js";
+export { hasConditionField, hasConditionGroup, hasConditionName, hasNestedCondition, isDuplicateCondition, toExpression, toPresentationString } from "./helpers.js";
 export { ConditionType, Coordinator, DateDirections, DateUnits, Operator, OperatorName } from "./enums.js";
 //# sourceMappingURL=index.js.map

package/dist/module/conditions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getExpression","getOperatorConfig","getOperatorNames","absoluteDateOperatorNames","relativeDateOperatorNames","ConditionValue","RelativeDateValue","conditionValueFrom","ConditionField","Condition","ConditionRef","ConditionGroup","ConditionsModel","ConditionGroupDef","toExpression","toPresentationString","ConditionType","Coordinator","DateDirections","DateUnits","Operator","OperatorName"],"sources":["../../../src/conditions/index.ts"],"sourcesContent":["export {\n  getExpression,\n  getOperatorConfig,\n  getOperatorNames,\n  absoluteDateOperatorNames,\n  relativeDateOperatorNames\n} from '~/src/conditions/condition-operators.js'\n\nexport {\n  ConditionValue,\n  RelativeDateValue,\n  conditionValueFrom\n} from '~/src/conditions/condition-values.js'\n\nexport { ConditionField } from '~/src/conditions/condition-field.js'\nexport { Condition } from '~/src/conditions/condition.js'\nexport { ConditionRef } from '~/src/conditions/condition-ref.js'\nexport { ConditionGroup } from '~/src/conditions/condition-group.js'\nexport { ConditionsModel } from '~/src/conditions/condition-model.js'\nexport { ConditionGroupDef } from '~/src/conditions/condition-group-def.js'\nexport { toExpression, toPresentationString } from '~/src/conditions/helpers.js'\n\nexport {\n  ConditionType,\n  Coordinator,\n  DateDirections,\n  DateUnits,\n  Operator,\n  OperatorName\n} from '~/src/conditions/enums.js'\n"],"mappings":"AAAA,SACEA,aAAa,EACbC,iBAAiB,EACjBC,gBAAgB,EAChBC,yBAAyB,EACzBC,yBAAyB;AAG3B,SACEC,cAAc,EACdC,iBAAiB,EACjBC,kBAAkB;AAGpB,SAASC,cAAc;AACvB,SAASC,SAAS;AAClB,SAASC,YAAY;AACrB,SAASC,cAAc;AACvB,SAASC,eAAe;AACxB,SAASC,iBAAiB;AAC1B,SAASC,YAAY,EAAEC,oBAAoB;AAE3C,SACEC,aAAa,EACbC,WAAW,EACXC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,YAAY","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getExpression","getOperatorNames","absoluteDateOperatorNames","relativeDateOperatorNames","ConditionValue","RelativeDateValue","conditionValueFrom","ConditionField","Condition","ConditionRef","ConditionGroup","ConditionsModel","ConditionGroupDef","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","isDuplicateCondition","toExpression","toPresentationString","ConditionType","Coordinator","DateDirections","DateUnits","Operator","OperatorName"],"sources":["../../../src/conditions/index.ts"],"sourcesContent":["export {\n  getExpression,\n  getOperatorNames,\n  absoluteDateOperatorNames,\n  relativeDateOperatorNames\n} from '~/src/conditions/condition-operators.js'\n\nexport {\n  ConditionValue,\n  RelativeDateValue,\n  conditionValueFrom\n} from '~/src/conditions/condition-values.js'\n\nexport { ConditionField } from '~/src/conditions/condition-field.js'\nexport { Condition } from '~/src/conditions/condition.js'\nexport { ConditionRef } from '~/src/conditions/condition-ref.js'\nexport { ConditionGroup } from '~/src/conditions/condition-group.js'\nexport { ConditionsModel } from '~/src/conditions/condition-model.js'\nexport { ConditionGroupDef } from '~/src/conditions/condition-group-def.js'\nexport {\n  hasConditionField,\n  hasConditionGroup,\n  hasConditionName,\n  hasNestedCondition,\n  isDuplicateCondition,\n  toExpression,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\n\nexport {\n  ConditionType,\n  Coordinator,\n  DateDirections,\n  DateUnits,\n  Operator,\n  OperatorName\n} from '~/src/conditions/enums.js'\n"],"mappings":"AAAA,SACEA,aAAa,EACbC,gBAAgB,EAChBC,yBAAyB,EACzBC,yBAAyB;AAG3B,SACEC,cAAc,EACdC,iBAAiB,EACjBC,kBAAkB;AAGpB,SAASC,cAAc;AACvB,SAASC,SAAS;AAClB,SAASC,YAAY;AACrB,SAASC,cAAc;AACvB,SAASC,eAAe;AACxB,SAASC,iBAAiB;AAC1B,SACEC,iBAAiB,EACjBC,iBAAiB,EACjBC,gBAAgB,EAChBC,kBAAkB,EAClBC,oBAAoB,EACpBC,YAAY,EACZC,oBAAoB;AAGtB,SACEC,aAAa,EACbC,WAAW,EACXC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,YAAY","ignoreList":[]}

package/dist/module/conditions/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/conditions/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type ConditionalComponentType\n} from '~/src/components/types.js'\nimport {\n  type ConditionValue,\n  type RelativeDateValue\n} from '~/src/conditions/condition-values.js'\nimport {\n  type ConditionType,\n  type Coordinator,\n  type DateDirections,\n  type DateUnits,\n  type OperatorName\n} from '~/src/conditions/enums.js'\n\nexport interface ConditionValueData {\n  type: ConditionType.Value\n  value: string\n  display: string\n}\n\nexport interface RelativeDateValueData {\n  type: ConditionType.RelativeDate\n  period: string\n  unit: DateUnits\n  direction: DateDirections\n}\n\nexport interface ConditionFieldData {\n  name: string\n  type: ConditionalComponentType\n  display: string\n}\n\nexport interface ConditionData {\n  field: ConditionFieldData\n  operator: OperatorName\n  value: ConditionValueData | RelativeDateValueData\n  coordinator?: Coordinator\n}\n\nexport interface ConditionRefData {\n  conditionName: string\n  conditionDisplayName: string\n  coordinator?: Coordinator\n}\n\nexport interface ConditionGroupData {\n  conditions: (ConditionData | ConditionRefData | ConditionGroupData)[]\n}\n\nexport interface ConditionsModelData extends ConditionGroupData {\n  name: string\n}\n\nexport interface OperatorDefinition {\n  expression: (\n    component: Pick<ComponentDef, 'type' | 'name'>,\n    conditionValue: ConditionValue | RelativeDateValue\n  ) => string\n}\n\nexport type Conditionals = Record<OperatorName, OperatorDefinition>\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/conditions/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type ConditionalComponentType\n} from '~/src/components/types.js'\nimport { type Condition } from '~/src/conditions/condition.js'\nimport {\n  type ConditionType,\n  type Coordinator,\n  type DateDirections,\n  type DateUnits,\n  type OperatorName\n} from '~/src/conditions/enums.js'\n\nexport interface ConditionValueData {\n  type: ConditionType.Value\n  value: string\n  display: string\n}\n\nexport interface RelativeDateValueData {\n  type: ConditionType.RelativeDate\n  period: string\n  unit: DateUnits\n  direction: DateDirections\n}\n\nexport interface ConditionFieldData {\n  name: string\n  type: ConditionalComponentType\n  display: string\n}\n\nexport interface ConditionData {\n  field: ConditionFieldData\n  operator: OperatorName\n  value: ConditionValueData | RelativeDateValueData\n  coordinator?: Coordinator\n}\n\nexport interface ConditionRefData {\n  conditionName: string\n  conditionDisplayName: string\n  coordinator?: Coordinator\n}\n\nexport interface ConditionGroupData {\n  conditions: (ConditionData | ConditionRefData | ConditionGroupData)[]\n}\n\nexport interface ConditionsModelData extends ConditionGroupData {\n  name: string\n}\n\nexport interface OperatorDefinition {\n  expression: (\n    component: Pick<ComponentDef, 'type' | 'name'>,\n    conditionValue: Condition['value']\n  ) => string\n}\n\nexport type Conditionals = Record<OperatorName, OperatorDefinition>\n"],"mappings":"","ignoreList":[]}

package/dist/types/components/helpers.d.ts

@@ -21,6 +21,7 @@ export declare function hasEditor(component?: Partial<ComponentDef>): component
  * Filter known components with lists
  */
 export declare function hasListField(component?: Partial<ComponentDef>): component is ListComponentsDef;
+export declare function isListType(type?: ComponentType): type is ListComponentsDef['type'];
 /**
  * Filter known components with selection fields
  */

package/dist/types/components/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAA;AAElC;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,4BAMrE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,wBAAwB,CAEvC;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,CAAC,EAAE,aAAa,GACnB,IAAI,IAAI,wBAAwB,CAclC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,oBAAoB,CAQnC;AAED;;GAEG;AACH,wBAAgB,SAAS,CACvB,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,mBAAmB,CAmBlC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,iBAAiB,CAUhC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,sBAAsB,CASrC;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE,kBAAkB,GAAG,aAAa,CAAC,CAGxE"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAA;AAElC;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,4BAMrE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,wBAAwB,CAEvC;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,CAAC,EAAE,aAAa,GACnB,IAAI,IAAI,wBAAwB,CAclC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,oBAAoB,CAQnC;AAED;;GAEG;AACH,wBAAgB,SAAS,CACvB,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,mBAAmB,CAmBlC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,iBAAiB,CAEhC;AAED,wBAAgB,UAAU,CACxB,IAAI,CAAC,EAAE,aAAa,GACnB,IAAI,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAUnC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,sBAAsB,CASrC;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAChC,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE,kBAAkB,GAAG,aAAa,CAAC,CAGxE"}

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

@@ -1,4 +1,4 @@
 export { ComponentTypes } from '../components/component-types.js';
-export { getComponentDefaults, hasConditionSupport, hasContentField, hasEditor, hasListField, hasSelectionFields, hasTitle } from '../components/helpers.js';
+export { getComponentDefaults, hasConditionSupport, hasContentField, hasEditor, hasListField, hasSelectionFields, hasTitle, isConditionalType, isListType } from '../components/helpers.js';
 export { ComponentType } from '../components/enums.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,QAAQ,EACT,MAAM,6BAA6B,CAAA;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,UAAU,EACX,MAAM,6BAA6B,CAAA;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA"}

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

@@ -6,6 +6,8 @@ export declare class ConditionField {
     type: ConditionalComponentType;
     display: string;
     constructor(name?: string, type?: ComponentType, display?: string);
+    clone(): ConditionField;
+    toJSON(): ConditionFieldData;
     static from(obj: ConditionField | ConditionFieldData): ConditionField;
 }
 //# sourceMappingURL=condition-field.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"condition-field.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-field.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,qBAAa,cAAc;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,wBAAwB,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;gBAEH,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM;IAkBjE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,kBAAkB;CAGrD"}
+{"version":3,"file":"condition-field.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-field.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,qBAAa,cAAc;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,wBAAwB,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;gBAEH,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM;IAkBjE,KAAK,IAAI,cAAc;IAIvB,MAAM,IAAI,kBAAkB;IAI5B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,kBAAkB;CAGrD"}

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

@@ -1,6 +1,7 @@
 import { type ConditionRef } from '../conditions/condition-ref.js';
 import { type Condition } from '../conditions/condition.js';
 import { type Coordinator } from '../conditions/enums.js';
+import { type ConditionGroupData } from '../conditions/types.js';
 export declare class ConditionGroup {
     conditions: (Condition | ConditionRef | ConditionGroup)[];
     constructor(conditions?: (Condition | ConditionRef | ConditionGroup)[]);
@@ -13,5 +14,7 @@ export declare class ConditionGroup {
     isGroup(): boolean;
     getGroupedConditions(): (Condition | ConditionRef | ConditionGroup)[];
     clone(): ConditionGroup;
+    toJSON(): ConditionGroupData;
+    static from(obj: ConditionGroupData | ConditionGroup): ConditionGroup;
 }
 //# sourceMappingURL=condition-group.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"condition-group.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAG5D,qBAAa,cAAc;IACzB,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,CAAA;gBAE7C,UAAU,GAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAO;IAQ1E,iBAAiB,IAAI,MAAM;IAI3B,eAAe,IAAI,MAAM;IAQzB,mBAAmB,IAAI,MAAM;IAQ7B,gBAAgB;IAKhB,cAAc,IAAI,WAAW,GAAG,SAAS;IAIzC,cAAc,CAAC,WAAW,CAAC,EAAE,WAAW;IAIxC,OAAO;IAIP,oBAAoB,IAAI,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAIrE,KAAK,IAAI,cAAc;CAKxB"}
+{"version":3,"file":"condition-group.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,qBAAa,cAAc;IACzB,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,CAAA;gBAE7C,UAAU,GAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAO;IAQ1E,iBAAiB,IAAI,MAAM;IAI3B,eAAe,IAAI,MAAM;IAQzB,mBAAmB,IAAI,MAAM;IAQ7B,gBAAgB;IAKhB,cAAc,IAAI,WAAW,GAAG,SAAS;IAIzC,cAAc,CAAC,WAAW,CAAC,EAAE,WAAW;IAIxC,OAAO;IAIP,oBAAoB,IAAI,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAIrE,KAAK,IAAI,cAAc;IAIvB,MAAM,IAAI,kBAAkB;IAQ5B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,GAAG,cAAc,GAAG,cAAc;CAStE"}

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

@@ -2,15 +2,15 @@ import { ConditionGroupDef } from '../conditions/condition-group-def.js';
 import { ConditionGroup } from '../conditions/condition-group.js';
 import { ConditionRef } from '../conditions/condition-ref.js';
 import { Condition } from '../conditions/condition.js';
-import { type ConditionsModelData } from '../conditions/types.js';
+import { type ConditionData, type ConditionGroupData, type ConditionRefData, type ConditionsModelData } from '../conditions/types.js';
 export declare class ConditionsModel {
     #private;
     clone(): ConditionsModel;
     clear(): this;
     set name(name: string | undefined);
     get name(): string | undefined;
-    add(condition: Condition | ConditionRef): this;
-    replace(index: number, condition: Condition): this;
+    add(condition: Condition | ConditionRef | ConditionGroup): this;
+    replace(index: number, condition: Condition | ConditionRef | ConditionGroup): this;
     remove(indexes: number[]): this;
     addGroups(groupDefs: ConditionGroupDef[]): this;
     splitGroup(index: number): this;
@@ -26,7 +26,11 @@ export declare class ConditionsModel {
     _group(conditions: (Condition | ConditionRef | ConditionGroup)[], groupDefs: ConditionGroupDef[]): (Condition | ConditionRef | ConditionGroup)[];
     _ungroup(conditions: (Condition | ConditionRef | ConditionGroup)[], splitIndex: number): (Condition | ConditionRef | ConditionGroup)[];
     _autoGroupDefs(conditions: (Condition | ConditionRef | ConditionGroup)[]): ConditionGroupDef[];
-    toJSON(): ConditionsModelData;
+    toJSON(): {
+        name: string;
+        conditions: (ConditionData | ConditionRefData | ConditionGroupData)[];
+    };
     static from(obj: ConditionsModel | ConditionsModelData): ConditionsModel;
 }
+export declare function conditionFrom(it: ConditionData | ConditionRefData | ConditionGroupData): Condition | ConditionRef | ConditionGroup;
 //# sourceMappingURL=condition-model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"condition-model.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAGzD,OAAO,EAIL,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAA;AAElC,qBAAa,eAAe;;IAK1B,KAAK;IAYL,KAAK;IAOL,IAAI,IAAI,CAAC,IAAI,oBAAA,EAEZ;IAED,IAAI,IAAI,uBAEP;IAED,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;IAevC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;IAmB3C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;IAWxB,SAAS,CAAC,SAAS,EAAE,iBAAiB,EAAE;IASxC,UAAU,CAAC,KAAK,EAAE,MAAM;IASxB,WAAW,CAAC,KAAK,EAAE,MAAM;IAezB,SAAS,CAAC,KAAK,EAAE,MAAM;IAevB,kBAAkB;IAOlB,IAAI,kBAAkB,kDAErB;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,SAAS,WAEZ;IAED,oBAAoB;IAMpB,YAAY;IAMZ,YAAY,CACV,qBAAqB,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAmBtE,MAAM,CACJ,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,EACzD,SAAS,EAAE,iBAAiB,EAAE;IAqBhC,QAAQ,CACN,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,EACzD,UAAU,EAAE,MAAM;IAcpB,cAAc,CAAC,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAkCxE,MAAM,IAAI,mBAAmB;IAU7B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,mBAAmB;CAcvD"}
+{"version":3,"file":"condition-model.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAQzD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACzB,MAAM,2BAA2B,CAAA;AAElC,qBAAa,eAAe;;IAK1B,KAAK;IAYL,KAAK;IAOL,IAAI,IAAI,CAAC,IAAI,oBAAA,EAEZ;IAED,IAAI,IAAI,uBAEP;IAED,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc;IAexD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc;IAmB3E,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;IAWxB,SAAS,CAAC,SAAS,EAAE,iBAAiB,EAAE;IASxC,UAAU,CAAC,KAAK,EAAE,MAAM;IASxB,WAAW,CAAC,KAAK,EAAE,MAAM;IAezB,SAAS,CAAC,KAAK,EAAE,MAAM;IAevB,kBAAkB;IAOlB,IAAI,kBAAkB,kDAErB;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,SAAS,WAEZ;IAED,oBAAoB;IAMpB,YAAY;IAMZ,YAAY,CACV,qBAAqB,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAmBtE,MAAM,CACJ,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,EACzD,SAAS,EAAE,iBAAiB,EAAE;IAqBhC,QAAQ,CACN,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE,EACzD,UAAU,EAAE,MAAM;IAcpB,cAAc,CAAC,UAAU,EAAE,CAAC,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,EAAE;IAkCxE,MAAM;;;;IAUN,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,mBAAmB;CAYvD;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,aAAa,GAAG,gBAAgB,GAAG,kBAAkB,GACxD,SAAS,GAAG,YAAY,GAAG,cAAc,CAU3C"}

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

@@ -1,5 +1,5 @@
 import { ComponentType } from '../components/enums.js';
-import { ConditionValue, RelativeDateValue } from '../conditions/condition-values.js';
+import { type Condition } from '../conditions/condition.js';
 import { OperatorName } from '../conditions/enums.js';
 import { type OperatorDefinition } from '../conditions/types.js';
 export declare const customOperators: {
@@ -12,13 +12,13 @@ export declare const customOperators: {
         "does not contain": OperatorDefinition;
     };
     NumberField: {
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
+    } & {
         "is at least": OperatorDefinition;
         "is at most": OperatorDefinition;
         "is less than": OperatorDefinition;
         "is more than": OperatorDefinition;
-    } & {
-        is: OperatorDefinition;
-        "is not": OperatorDefinition;
     };
     DatePartsField: {
         "is at least": OperatorDefinition;
@@ -31,28 +31,28 @@ export declare const customOperators: {
         "is after": OperatorDefinition;
     };
     TextField: {
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
+    } & {
         "is longer than": OperatorDefinition;
         "is shorter than": OperatorDefinition;
         "has length": OperatorDefinition;
-    } & {
-        is: OperatorDefinition;
-        "is not": OperatorDefinition;
     };
     MultilineTextField: {
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
+    } & {
         "is longer than": OperatorDefinition;
         "is shorter than": OperatorDefinition;
         "has length": OperatorDefinition;
-    } & {
-        is: OperatorDefinition;
-        "is not": OperatorDefinition;
     };
     EmailAddressField: {
+        is: OperatorDefinition;
+        "is not": OperatorDefinition;
+    } & {
         "is longer than": OperatorDefinition;
         "is shorter than": OperatorDefinition;
         "has length": OperatorDefinition;
-    } & {
-        is: OperatorDefinition;
-        "is not": OperatorDefinition;
     };
     SelectField: {
         is: OperatorDefinition;
@@ -63,8 +63,8 @@ export declare const customOperators: {
         "is not": OperatorDefinition;
     };
 };
-export declare function getOperatorNames(fieldType?: ComponentType): string[];
-export declare function getExpression(fieldType: ComponentType, fieldName: string, operator: OperatorName, value: ConditionValue | RelativeDateValue): string | undefined;
+export declare function getOperatorNames(fieldType?: ComponentType): OperatorName[];
+export declare function getExpression(fieldType: ComponentType, fieldName: string, operator: OperatorName, value: Condition['value']): string | undefined;
 export declare function getOperatorConfig(fieldType: ComponentType, operator: OperatorName): OperatorDefinition | undefined;
 export declare const absoluteDateOperatorNames: OperatorName[];
 export declare const relativeDateOperatorNames: OperatorName[];

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":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,OAAO,EACL,cAAc,EACd,iBAAiB,EAClB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAA;AAqClC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqB3B,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,aAAa,YAOzD;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,cAAc,GAAG,iBAAiB,sBAW1C;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,YAAY,kCAGvB;AA6DD,eAAO,MAAM,yBAAyB,EAEjC,YAAY,EAAE,CAAA;AAEnB,eAAO,MAAM,yBAAyB,EAEjC,YAAY,EAAE,CAAA"}
+{"version":3,"file":"condition-operators.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-operators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAMzD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAIL,YAAY,EACb,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAA;AAqClC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqB3B,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,aAAa,kBAOzD;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,sBAW1B;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,YAAY,kCAGvB;AA8DD,eAAO,MAAM,yBAAyB,EAEjC,YAAY,EAAE,CAAA;AAEnB,eAAO,MAAM,yBAAyB,EAEjC,YAAY,EAAE,CAAA"}

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

@@ -1,5 +1,6 @@
 import { ConditionAbstract } from '../conditions/condition-abstract.js';
 import { type Coordinator } from '../conditions/enums.js';
+import { type ConditionRefData } from '../conditions/types.js';
 export declare class ConditionRef extends ConditionAbstract {
     conditionName: string;
     conditionDisplayName: string;
@@ -8,5 +9,7 @@ export declare class ConditionRef extends ConditionAbstract {
     conditionString(): string;
     conditionExpression(): string;
     clone(): ConditionRef;
+    toJSON(): ConditionRefData;
+    static from(obj: ConditionRefData | ConditionRef): 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,CAAC,EAAE,WAAW;IAkB3B,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;AAC5D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAEjE,qBAAa,YAAa,SAAQ,iBAAiB;IACjD,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;gBAG1B,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,WAAW,CAAC,EAAE,WAAW;IAkB3B,gBAAgB;IAKhB,eAAe;IAIf,mBAAmB;IAInB,KAAK;IAIL,MAAM,IAAI,gBAAgB;IAI1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,YAAY;CAOjD"}

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

@@ -9,8 +9,9 @@ export declare class ConditionValue extends ConditionValueAbstract {
     constructor(value: string, display?: string);
     toPresentationString(): string;
     toExpression(): string;
-    static from(obj: ConditionValue | ConditionValueData): ConditionValue;
     clone(): ConditionValue;
+    toJSON(): ConditionValueData;
+    static from(obj: ConditionValue | ConditionValueData): ConditionValue;
 }
 export declare class RelativeDateValue extends ConditionValueAbstract {
     type: ConditionType.RelativeDate;
@@ -20,8 +21,9 @@ export declare class RelativeDateValue extends ConditionValueAbstract {
     constructor(period: string, unit: DateUnits, direction: DateDirections);
     toPresentationString(): string;
     toExpression(): string;
-    static from(obj: RelativeDateValue | RelativeDateValueData): RelativeDateValue;
     clone(): RelativeDateValue;
+    toJSON(): RelativeDateValueData;
+    static from(obj: RelativeDateValue | RelativeDateValueData): RelativeDateValue;
 }
 export declare function conditionValueFrom(obj: ConditionValue | ConditionValueData | RelativeDateValue | RelativeDateValueData): ConditionValue | RelativeDateValue;
 //# 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,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAA;AAElC,qBAAa,cAAe,SAAQ,sBAAsB;IACxD,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,qBAAa,iBAAkB,SAAQ,sBAAsB;IAC3D,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;IAChC,MAAM,MAAA;IACN,IAAI,MAAA;IACJ,SAAS,MAAA;gBAEG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc;IAmBtE,oBAAoB;IAIpB,YAAY,IAAI,MAAM;IAStB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,qBAAqB;IAI1D,KAAK;CAGN;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EACC,cAAc,GACd,kBAAkB,GAClB,iBAAiB,GACjB,qBAAqB,sCAS1B"}
+{"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,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAA;AAElC,qBAAa,cAAe,SAAQ,sBAAsB;IACxD,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,KAAK;IAIL,MAAM,IAAI,kBAAkB;IAI5B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,kBAAkB;CAGrD;AAED,qBAAa,iBAAkB,SAAQ,sBAAsB;IAC3D,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;IAChC,MAAM,MAAA;IACN,IAAI,MAAA;IACJ,SAAS,MAAA;gBAEG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc;IAmBtE,oBAAoB;IAIpB,YAAY,IAAI,MAAM;IAStB,KAAK;IAIL,MAAM,IAAI,qBAAqB;IAI/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,qBAAqB;CAG3D;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EACC,cAAc,GACd,kBAAkB,GAClB,iBAAiB,GACjB,qBAAqB,sCAa1B"}

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

@@ -2,6 +2,7 @@ import { ConditionAbstract } from '../conditions/condition-abstract.js';
 import { ConditionField } from '../conditions/condition-field.js';
 import { type ConditionValue, type RelativeDateValue } from '../conditions/condition-values.js';
 import { type Coordinator, type OperatorName } from '../conditions/enums.js';
+import { type ConditionData } from '../conditions/types.js';
 export declare class Condition extends ConditionAbstract {
     field: ConditionField;
     operator: OperatorName;
@@ -11,5 +12,7 @@ export declare class Condition extends ConditionAbstract {
     conditionString(): string;
     conditionExpression(): string | undefined;
     clone(): Condition;
+    toJSON(): ConditionData;
+    static from(obj: ConditionData | Condition): 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,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE/E,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,cAAc,GAAG,iBAAiB,CAAA;gBAGvC,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"}
+{"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,EAEL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC/E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE9D,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,cAAc,GAAG,iBAAiB,CAAA;gBAGvC,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;IAIL,MAAM,IAAI,aAAa;IAIvB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,SAAS;CAQ3C"}

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

@@ -1,6 +1,13 @@
 import { type ConditionGroup } from '../conditions/condition-group.js';
 import { type ConditionRef } from '../conditions/condition-ref.js';
 import { type Condition } from '../conditions/condition.js';
+import { type ConditionData, type ConditionGroupData, type ConditionRefData } from '../conditions/types.js';
+import { type ConditionWrapper } from '../form/form-definition/types.js';
 export declare function toPresentationString(condition: Condition | ConditionRef | ConditionGroup): string;
 export declare function toExpression(condition: Condition | ConditionRef | ConditionGroup): string;
+export declare const hasConditionField: (condition?: ConditionGroupData | ConditionData | ConditionRefData) => condition is ConditionData;
+export declare const hasConditionGroup: (condition?: ConditionGroupData | ConditionData | ConditionRefData) => condition is ConditionGroupData;
+export declare const hasConditionName: (condition?: ConditionGroupData | ConditionData | ConditionRefData) => condition is ConditionRefData;
+export declare const hasNestedCondition: (condition?: ConditionWrapper) => boolean;
+export declare const isDuplicateCondition: (conditions: ConditionWrapper[], conditionName: string) => boolean;
 //# sourceMappingURL=helpers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/conditions/helpers.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,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc,UAGrD;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc,UAGrD"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/conditions/helpers.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;AAC9D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc,UAGrD;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,cAAc,UAGrD;AAED,eAAO,MAAM,iBAAiB,eAChB,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,aAEf,CAAA;AAED,eAAO,MAAM,iBAAiB,eAChB,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,kBAEf,CAAA;AAED,eAAO,MAAM,gBAAgB,eACf,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,gBAEf,CAAA;AAED,eAAO,MAAM,kBAAkB,eAAgB,gBAAgB,YAE9D,CAAA;AAED,eAAO,MAAM,oBAAoB,eACnB,gBAAgB,EAAE,iBACf,MAAM,YAGtB,CAAA"}

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

@@ -1,4 +1,4 @@
-export { getExpression, getOperatorConfig, getOperatorNames, absoluteDateOperatorNames, relativeDateOperatorNames } from '../conditions/condition-operators.js';
+export { getExpression, getOperatorNames, absoluteDateOperatorNames, relativeDateOperatorNames } from '../conditions/condition-operators.js';
 export { ConditionValue, RelativeDateValue, conditionValueFrom } from '../conditions/condition-values.js';
 export { ConditionField } from '../conditions/condition-field.js';
 export { Condition } from '../conditions/condition.js';
@@ -6,6 +6,6 @@ export { ConditionRef } from '../conditions/condition-ref.js';
 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 { hasConditionField, hasConditionGroup, hasConditionName, hasNestedCondition, isDuplicateCondition, toExpression, toPresentationString } from '../conditions/helpers.js';
 export { ConditionType, Coordinator, DateDirections, DateUnits, 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,yBAAyB,EACzB,yBAAyB,EAC1B,MAAM,yCAAyC,CAAA;AAEhD,OAAO,EACL,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,SAAS,EACT,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/conditions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,yBAAyB,EAC1B,MAAM,yCAAyC,CAAA;AAEhD,OAAO,EACL,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,EACL,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,EACL,aAAa,EACb,WAAW,EACX,cAAc,EACd,SAAS,EACT,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAA"}

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

@@ -1,5 +1,5 @@
 import { type ComponentDef, type ConditionalComponentType } from '../components/types.js';
-import { type ConditionValue, type RelativeDateValue } from '../conditions/condition-values.js';
+import { type Condition } from '../conditions/condition.js';
 import { type ConditionType, type Coordinator, type DateDirections, type DateUnits, type OperatorName } from '../conditions/enums.js';
 export interface ConditionValueData {
     type: ConditionType.Value;
@@ -35,7 +35,7 @@ export interface ConditionsModelData extends ConditionGroupData {
     name: string;
 }
 export interface OperatorDefinition {
-    expression: (component: Pick<ComponentDef, 'type' | 'name'>, conditionValue: ConditionValue | RelativeDateValue) => string;
+    expression: (component: Pick<ComponentDef, 'type' | 'name'>, conditionValue: Condition['value']) => 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,EACL,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,YAAY,EAClB,MAAM,2BAA2B,CAAA;AAElC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,SAAS,CAAA;IACf,SAAS,EAAE,cAAc,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,wBAAwB,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,kBAAkB,CAAA;IACzB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,kBAAkB,GAAG,qBAAqB,CAAA;IACjD,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CAAC,aAAa,GAAG,gBAAgB,GAAG,kBAAkB,CAAC,EAAE,CAAA;CACtE;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CACV,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,EAC9C,cAAc,EAAE,cAAc,GAAG,iBAAiB,KAC/C,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/conditions/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,wBAAwB,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,YAAY,EAClB,MAAM,2BAA2B,CAAA;AAElC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,CAAC,YAAY,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,SAAS,CAAA;IACf,SAAS,EAAE,cAAc,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,wBAAwB,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,kBAAkB,CAAA;IACzB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,kBAAkB,GAAG,qBAAqB,CAAA;IACjD,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CAAC,aAAa,GAAG,gBAAgB,GAAG,kBAAkB,CAAC,EAAE,CAAA;CACtE;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CACV,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,EAC9C,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,KAC/B,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.253",
+  "version": "3.0.255",
   "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/helpers.ts

@@ -97,6 +97,12 @@ export function hasEditor(
 export function hasListField(
   component?: Partial<ComponentDef>
 ): component is ListComponentsDef {
+  return isListType(component?.type)
+}
+
+export function isListType(
+  type?: ComponentType
+): type is ListComponentsDef['type'] {
   const allowedTypes = [
     ComponentType.AutocompleteField,
     ComponentType.List,
@@ -105,7 +111,7 @@ export function hasListField(
     ComponentType.CheckboxesField
   ]
 
-  return !!component?.type && allowedTypes.includes(component.type)
+  return !!type && allowedTypes.includes(type)
 }
 
 /**

package/src/components/index.ts

@@ -6,7 +6,9 @@ export {
   hasEditor,
   hasListField,
   hasSelectionFields,
-  hasTitle
+  hasTitle,
+  isConditionalType,
+  isListType
 } from '~/src/components/helpers.js'
 
 export { ComponentType } from '~/src/components/enums.js'

package/src/conditions/condition-field.ts

@@ -26,6 +26,14 @@ export class ConditionField {
     this.display = display
   }
 
+  clone(): ConditionField {
+    return ConditionField.from(this)
+  }
+
+  toJSON(): ConditionFieldData {
+    return structuredClone(this.clone())
+  }
+
   static from(obj: ConditionField | ConditionFieldData) {
     return new ConditionField(obj.name, obj.type, obj.display)
   }

package/src/conditions/condition-group.ts

@@ -1,7 +1,9 @@
+import { conditionFrom } from '~/src/conditions/condition-model.js'
 import { type ConditionRef } from '~/src/conditions/condition-ref.js'
 import { type Condition } from '~/src/conditions/condition.js'
 import { type Coordinator } from '~/src/conditions/enums.js'
 import { toPresentationString, toExpression } from '~/src/conditions/helpers.js'
+import { type ConditionGroupData } from '~/src/conditions/types.js'
 
 export class ConditionGroup {
   conditions: (Condition | ConditionRef | ConditionGroup)[]
@@ -56,8 +58,24 @@ export class ConditionGroup {
   }
 
   clone(): ConditionGroup {
+    return ConditionGroup.from(this)
+  }
+
+  toJSON(): ConditionGroupData {
+    const { conditions } = this.clone()
+
+    return structuredClone({
+      conditions: conditions.map((condition) => condition.toJSON())
+    })
+  }
+
+  static from(obj: ConditionGroupData | ConditionGroup): ConditionGroup {
     return new ConditionGroup(
-      this.conditions.map((condition) => condition.clone())
+      obj.conditions.map((condition) => {
+        return 'clone' in condition
+          ? condition.clone()
+          : conditionFrom(condition)
+      })
     )
   }
 }

package/src/conditions/condition-model.ts

@@ -1,11 +1,14 @@
-import { ConditionField } from '~/src/conditions/condition-field.js'
 import { ConditionGroupDef } from '~/src/conditions/condition-group-def.js'
 import { ConditionGroup } from '~/src/conditions/condition-group.js'
 import { ConditionRef } from '~/src/conditions/condition-ref.js'
-import { conditionValueFrom } from '~/src/conditions/condition-values.js'
 import { Condition } from '~/src/conditions/condition.js'
 import { Coordinator } from '~/src/conditions/enums.js'
-import { toPresentationString, toExpression } from '~/src/conditions/helpers.js'
+import {
+  toPresentationString,
+  toExpression,
+  hasConditionGroup,
+  hasConditionName
+} from '~/src/conditions/helpers.js'
 import {
   type ConditionData,
   type ConditionGroupData,
@@ -45,7 +48,7 @@ export class ConditionsModel {
     return this.#conditionName
   }
 
-  add(condition: Condition | ConditionRef) {
+  add(condition: Condition | ConditionRef | ConditionGroup) {
     const coordinatorExpected = this.#userGroupedConditions.length !== 0
 
     if (condition.getCoordinator() && !coordinatorExpected) {
@@ -60,7 +63,7 @@ export class ConditionsModel {
     return this
   }
 
-  replace(index: number, condition: Condition) {
+  replace(index: number, condition: Condition | ConditionRef | ConditionGroup) {
     const coordinatorExpected = index !== 0
 
     if (condition.getCoordinator() && !coordinatorExpected) {
@@ -262,12 +265,12 @@ export class ConditionsModel {
     return []
   }
 
-  toJSON(): ConditionsModelData {
+  toJSON() {
     const name = this.#conditionName
     const conditions = this.#userGroupedConditions
     return {
       name: name ?? '',
-      conditions: conditions.map((it) => it.clone())
+      conditions: conditions.map((it) => it.toJSON())
     }
   }
 
@@ -278,9 +281,7 @@ export class ConditionsModel {
     }
     const toReturn = new ConditionsModel()
     toReturn.#conditionName = obj.name
-    toReturn.#userGroupedConditions = obj.conditions.map((condition) =>
-      conditionFrom(condition)
-    )
+    toReturn.#userGroupedConditions = obj.conditions.map(conditionFrom)
     toReturn.#groupedConditions = toReturn._applyGroups(
       toReturn.#userGroupedConditions
     )
@@ -288,27 +289,16 @@ export class ConditionsModel {
   }
 }
 
-function conditionFrom(
+export function conditionFrom(
   it: ConditionData | ConditionRefData | ConditionGroupData
 ): Condition | ConditionRef | ConditionGroup {
-  if ('conditions' in it) {
-    return new ConditionGroup(
-      it.conditions.map((condition) => conditionFrom(condition))
-    )
+  if (hasConditionGroup(it)) {
+    return new ConditionGroup(it.conditions.map(conditionFrom))
   }
 
-  if ('conditionName' in it) {
-    return new ConditionRef(
-      it.conditionName,
-      it.conditionDisplayName,
-      it.coordinator
-    )
+  if (hasConditionName(it)) {
+    return ConditionRef.from(it)
   }
 
-  return new Condition(
-    ConditionField.from(it.field),
-    it.operator,
-    conditionValueFrom(it.value),
-    it.coordinator
-  )
+  return Condition.from(it)
 }