@defra/forms-model 3.0.479 → 3.0.481

package/dist/module/conditions/index.js

@@ -7,6 +7,6 @@ export { ConditionGroup } from "./condition-group.js";
 export { ConditionsModel } from "./condition-model.js";
 export { ConditionGroupDef } from "./condition-group-def.js";
 export { getConditionV2, hasConditionField, hasConditionGroup, hasConditionName, hasNestedCondition, isDuplicateCondition, toExpression, toPresentationString } from "./helpers.js";
-export { convertConditionWrapperFromV2, isConditionBooleanValueDataV2, isConditionDateValueDataV2, isConditionListItemRefValueDataV2, isConditionNumberValueDataV2, isConditionStringValueDataV2, isConditionWrapper, isConditionWrapperV2 } from "./migration.js";
+export { convertConditionWrapperFromV2, isConditionBooleanValueDataV2, isConditionDateValueDataV2, isConditionListItemRefValueDataV2, isConditionNumberValueDataV2, isConditionRelativeDateValueDataV2, isConditionStringValueDataV2, isConditionWrapper, isConditionWrapperV2 } from "./migration.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":["absoluteDateOperatorNames","getExpression","getOperatorNames","relativeDateOperatorNames","ConditionValue","RelativeDateValue","conditionValueFrom","ConditionField","Condition","ConditionRef","ConditionGroup","ConditionsModel","ConditionGroupDef","getConditionV2","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","isDuplicateCondition","toExpression","toPresentationString","convertConditionWrapperFromV2","isConditionBooleanValueDataV2","isConditionDateValueDataV2","isConditionListItemRefValueDataV2","isConditionNumberValueDataV2","isConditionStringValueDataV2","isConditionWrapper","isConditionWrapperV2","ConditionType","Coordinator","DateDirections","DateUnits","Operator","OperatorName"],"sources":["../../../src/conditions/index.ts"],"sourcesContent":["export {\n  absoluteDateOperatorNames,\n  getExpression,\n  getOperatorNames,\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  getConditionV2,\n  hasConditionField,\n  hasConditionGroup,\n  hasConditionName,\n  hasNestedCondition,\n  isDuplicateCondition,\n  toExpression,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\n\nexport {\n  convertConditionWrapperFromV2,\n  isConditionBooleanValueDataV2,\n  isConditionDateValueDataV2,\n  isConditionListItemRefValueDataV2,\n  isConditionNumberValueDataV2,\n  isConditionStringValueDataV2,\n  isConditionWrapper,\n  isConditionWrapperV2,\n  type RuntimeFormModel\n} from '~/src/conditions/migration.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,yBAAyB,EACzBC,aAAa,EACbC,gBAAgB,EAChBC,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,cAAc,EACdC,iBAAiB,EACjBC,iBAAiB,EACjBC,gBAAgB,EAChBC,kBAAkB,EAClBC,oBAAoB,EACpBC,YAAY,EACZC,oBAAoB;AAGtB,SACEC,6BAA6B,EAC7BC,6BAA6B,EAC7BC,0BAA0B,EAC1BC,iCAAiC,EACjCC,4BAA4B,EAC5BC,4BAA4B,EAC5BC,kBAAkB,EAClBC,oBAAoB;AAItB,SACEC,aAAa,EACbC,WAAW,EACXC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,YAAY","ignoreList":[]}
+{"version":3,"file":"index.js","names":["absoluteDateOperatorNames","getExpression","getOperatorNames","relativeDateOperatorNames","ConditionValue","RelativeDateValue","conditionValueFrom","ConditionField","Condition","ConditionRef","ConditionGroup","ConditionsModel","ConditionGroupDef","getConditionV2","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","isDuplicateCondition","toExpression","toPresentationString","convertConditionWrapperFromV2","isConditionBooleanValueDataV2","isConditionDateValueDataV2","isConditionListItemRefValueDataV2","isConditionNumberValueDataV2","isConditionRelativeDateValueDataV2","isConditionStringValueDataV2","isConditionWrapper","isConditionWrapperV2","ConditionType","Coordinator","DateDirections","DateUnits","Operator","OperatorName"],"sources":["../../../src/conditions/index.ts"],"sourcesContent":["export {\n  absoluteDateOperatorNames,\n  getExpression,\n  getOperatorNames,\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  getConditionV2,\n  hasConditionField,\n  hasConditionGroup,\n  hasConditionName,\n  hasNestedCondition,\n  isDuplicateCondition,\n  toExpression,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\n\nexport {\n  convertConditionWrapperFromV2,\n  isConditionBooleanValueDataV2,\n  isConditionDateValueDataV2,\n  isConditionListItemRefValueDataV2,\n  isConditionNumberValueDataV2,\n  isConditionRelativeDateValueDataV2,\n  isConditionStringValueDataV2,\n  isConditionWrapper,\n  isConditionWrapperV2,\n  type RuntimeFormModel\n} from '~/src/conditions/migration.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,yBAAyB,EACzBC,aAAa,EACbC,gBAAgB,EAChBC,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,cAAc,EACdC,iBAAiB,EACjBC,iBAAiB,EACjBC,gBAAgB,EAChBC,kBAAkB,EAClBC,oBAAoB,EACpBC,YAAY,EACZC,oBAAoB;AAGtB,SACEC,6BAA6B,EAC7BC,6BAA6B,EAC7BC,0BAA0B,EAC1BC,iCAAiC,EACjCC,4BAA4B,EAC5BC,kCAAkC,EAClCC,4BAA4B,EAC5BC,kBAAkB,EAClBC,oBAAoB;AAItB,SACEC,aAAa,EACbC,WAAW,EACXC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,YAAY","ignoreList":[]}

package/dist/module/conditions/migration.js

@@ -1,18 +1,21 @@
 import { ConditionType } from "./enums.js";
-export function isConditionListItemRefValueDataV2(value) {
-  return value.type === ConditionType.ListItemRef;
+export function isConditionListItemRefValueDataV2(condition) {
+  return condition.type === ConditionType.ListItemRef;
 }
-export function isConditionStringValueDataV2(value) {
-  return value.type === ConditionType.StringValue;
+export function isConditionStringValueDataV2(condition) {
+  return condition.type === ConditionType.StringValue;
 }
-export function isConditionBooleanValueDataV2(value) {
-  return value.type === ConditionType.BooleanValue;
+export function isConditionBooleanValueDataV2(condition) {
+  return condition.type === ConditionType.BooleanValue;
 }
-export function isConditionNumberValueDataV2(value) {
-  return value.type === ConditionType.NumberValue;
+export function isConditionNumberValueDataV2(condition) {
+  return condition.type === ConditionType.NumberValue;
 }
-export function isConditionDateValueDataV2(value) {
-  return value.type === ConditionType.DateValue;
+export function isConditionDateValueDataV2(condition) {
+  return condition.type === ConditionType.DateValue;
+}
+export function isConditionRelativeDateValueDataV2(condition) {
+  return condition.type === ConditionType.RelativeDate;
 }
 function getListItem(model, listId, itemId) {
   const foundList = model.getListById(listId);
@@ -25,7 +28,8 @@ function getListItem(model, listId, itemId) {
   }
   return item;
 }
-function createConditionValueDataFromListItemRefV2(value, model) {
+function createConditionValueDataFromListItemRefV2(condition, model) {
+  const value = condition.value;
   const refValue = getListItem(model, value.listId, value.itemId);
   return {
     display: refValue.text,
@@ -33,31 +37,40 @@ function createConditionValueDataFromListItemRefV2(value, model) {
     value: refValue.value.toString()
   };
 }
-function createConditionValueDataFromStringOrDateValueDataV2(value) {
+function createConditionValueDataFromStringOrDateValueDataV2(condition) {
   return {
     type: ConditionType.Value,
-    value: value.value,
-    display: value.value
+    value: condition.value,
+    display: condition.value
   };
 }
-function createConditionValueDataFromStringValueDataV2(value) {
-  return createConditionValueDataFromStringOrDateValueDataV2(value);
+function createConditionValueDataFromStringValueDataV2(condition) {
+  return createConditionValueDataFromStringOrDateValueDataV2(condition);
+}
+function createConditionValueDataFromDateValueDataV2(condition) {
+  return createConditionValueDataFromStringOrDateValueDataV2(condition);
 }
-function createConditionValueDataFromDateValueDataV2(value) {
-  return createConditionValueDataFromStringOrDateValueDataV2(value);
+function createConditionValueDataFromRelativeDateValueDataV2(condition) {
+  const value = condition.value;
+  return {
+    type: ConditionType.RelativeDate,
+    period: value.period.toString(),
+    unit: value.unit,
+    direction: value.direction
+  };
 }
-function createConditionValueDataFromNumberValueDataV2(value) {
+function createConditionValueDataFromNumberValueDataV2(condition) {
   return {
     type: ConditionType.Value,
-    value: value.value.toString(),
-    display: value.value.toString()
+    value: condition.value.toString(),
+    display: condition.value.toString()
   };
 }
-function createConditionValueDataFromBooleanValueDataV2(value) {
+function createConditionValueDataFromBooleanValueDataV2(condition) {
   return {
     type: ConditionType.Value,
-    value: value.value.toString(),
-    display: value.value ? 'Yes' : 'No'
+    value: condition.value.toString(),
+    display: condition.value ? 'Yes' : 'No'
   };
 }
 function isConditionDataV2(condition) {
@@ -69,18 +82,20 @@ function convertConditionDataV2(model, condition, coordinator) {
     throw Error('Component not found');
   }
   let newValue;
-  if (isConditionListItemRefValueDataV2(condition.value)) {
-    newValue = createConditionValueDataFromListItemRefV2(condition.value, model);
-  } else if (isConditionStringValueDataV2(condition.value)) {
-    newValue = createConditionValueDataFromStringValueDataV2(condition.value);
-  } else if (isConditionBooleanValueDataV2(condition.value)) {
-    newValue = createConditionValueDataFromBooleanValueDataV2(condition.value);
-  } else if (isConditionNumberValueDataV2(condition.value)) {
-    newValue = createConditionValueDataFromNumberValueDataV2(condition.value);
-  } else if (isConditionDateValueDataV2(condition.value)) {
-    newValue = createConditionValueDataFromDateValueDataV2(condition.value);
+  if (isConditionListItemRefValueDataV2(condition)) {
+    newValue = createConditionValueDataFromListItemRefV2(condition, model);
+  } else if (isConditionStringValueDataV2(condition)) {
+    newValue = createConditionValueDataFromStringValueDataV2(condition);
+  } else if (isConditionBooleanValueDataV2(condition)) {
+    newValue = createConditionValueDataFromBooleanValueDataV2(condition);
+  } else if (isConditionNumberValueDataV2(condition)) {
+    newValue = createConditionValueDataFromNumberValueDataV2(condition);
+  } else if (isConditionDateValueDataV2(condition)) {
+    newValue = createConditionValueDataFromDateValueDataV2(condition);
+  } else if (isConditionRelativeDateValueDataV2(condition)) {
+    newValue = createConditionValueDataFromRelativeDateValueDataV2(condition);
   } else {
-    newValue = condition.value;
+    throw Error('Unsupported condition type');
   }
   return {
     field: {

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

@@ -1 +1 @@
-{"version":3,"file":"migration.js","names":["ConditionType","isConditionListItemRefValueDataV2","value","type","ListItemRef","isConditionStringValueDataV2","StringValue","isConditionBooleanValueDataV2","BooleanValue","isConditionNumberValueDataV2","NumberValue","isConditionDateValueDataV2","DateValue","getListItem","model","listId","itemId","foundList","getListById","Error","item","items","find","id","createConditionValueDataFromListItemRefV2","refValue","display","text","Value","toString","createConditionValueDataFromStringOrDateValueDataV2","createConditionValueDataFromStringValueDataV2","createConditionValueDataFromDateValueDataV2","createConditionValueDataFromNumberValueDataV2","createConditionValueDataFromBooleanValueDataV2","isConditionDataV2","condition","convertConditionDataV2","coordinator","component","getComponentById","componentId","newValue","field","name","title","operator","convertConditionRefDataFromV2","refCondition","getConditionById","conditionId","conditionName","displayName","conditionDisplayName","isConditionWrapperV2","wrapper","Array","isArray","isConditionWrapper","convertConditionWrapperFromV2","conditionWrapper","length","newConditionWrapper","conditions","map","index","newCondition","undefined"],"sources":["../../../src/conditions/migration.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type ConditionalComponentType\n} from '~/src/components/types.js'\nimport { ConditionType, type Coordinator } from '~/src/conditions/enums.js'\nimport {\n  type ConditionBooleanValueDataV2,\n  type ConditionData,\n  type ConditionDataV2,\n  type ConditionDateValueDataV2,\n  type ConditionListItemRefValueDataV2,\n  type ConditionNumberValueDataV2,\n  type ConditionRefData,\n  type ConditionRefDataV2,\n  type ConditionStringValueDataV2,\n  type ConditionValueData,\n  type ConditionValueDataV2\n} from '~/src/conditions/types.js'\nimport {\n  type ConditionWrapper,\n  type ConditionWrapperV2,\n  type List\n} from '~/src/form/form-definition/types.js'\n\nexport function isConditionListItemRefValueDataV2(\n  value: ConditionValueDataV2\n): value is ConditionListItemRefValueDataV2 {\n  return value.type === ConditionType.ListItemRef\n}\n\nexport function isConditionStringValueDataV2(\n  value: ConditionValueDataV2\n): value is ConditionStringValueDataV2 {\n  return value.type === ConditionType.StringValue\n}\n\nexport function isConditionBooleanValueDataV2(\n  value: ConditionValueDataV2\n): value is ConditionBooleanValueDataV2 {\n  return value.type === ConditionType.BooleanValue\n}\n\nexport function isConditionNumberValueDataV2(\n  value: ConditionValueDataV2\n): value is ConditionNumberValueDataV2 {\n  return value.type === ConditionType.NumberValue\n}\n\nexport function isConditionDateValueDataV2(\n  value: ConditionValueDataV2\n): value is ConditionDateValueDataV2 {\n  return value.type === ConditionType.DateValue\n}\n\nfunction getListItem(model: RuntimeFormModel, listId: string, itemId: string) {\n  const foundList = model.getListById(listId)\n\n  if (!foundList) {\n    throw Error('List not found')\n  }\n\n  const item = foundList.items.find((item) => item.id === itemId)\n\n  if (!item) {\n    throw Error('List item not found')\n  }\n\n  return item\n}\n\nfunction createConditionValueDataFromListItemRefV2(\n  value: ConditionListItemRefValueDataV2,\n  model: RuntimeFormModel\n): ConditionValueData {\n  const refValue = getListItem(model, value.listId, value.itemId)\n\n  return {\n    display: refValue.text,\n    type: ConditionType.Value,\n    value: refValue.value.toString()\n  }\n}\n\nfunction createConditionValueDataFromStringOrDateValueDataV2(\n  value: ConditionStringValueDataV2 | ConditionDateValueDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: value.value,\n    display: value.value\n  }\n}\n\nfunction createConditionValueDataFromStringValueDataV2(\n  value: ConditionStringValueDataV2\n): ConditionValueData {\n  return createConditionValueDataFromStringOrDateValueDataV2(value)\n}\n\nfunction createConditionValueDataFromDateValueDataV2(\n  value: ConditionDateValueDataV2\n): ConditionValueData {\n  return createConditionValueDataFromStringOrDateValueDataV2(value)\n}\n\nfunction createConditionValueDataFromNumberValueDataV2(\n  value: ConditionNumberValueDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: value.value.toString(),\n    display: value.value.toString()\n  }\n}\n\nfunction createConditionValueDataFromBooleanValueDataV2(\n  value: ConditionBooleanValueDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: value.value.toString(),\n    display: value.value ? 'Yes' : 'No'\n  }\n}\n\nfunction isConditionDataV2(\n  condition: ConditionDataV2 | ConditionRefDataV2\n): condition is ConditionDataV2 {\n  return 'componentId' in condition\n}\n\nfunction convertConditionDataV2(\n  model: RuntimeFormModel,\n  condition: ConditionDataV2,\n  coordinator: Coordinator | undefined\n): ConditionData {\n  const component = model.getComponentById(condition.componentId)\n\n  if (!component) {\n    throw Error('Component not found')\n  }\n\n  let newValue\n  if (isConditionListItemRefValueDataV2(condition.value)) {\n    newValue = createConditionValueDataFromListItemRefV2(condition.value, model)\n  } else if (isConditionStringValueDataV2(condition.value)) {\n    newValue = createConditionValueDataFromStringValueDataV2(condition.value)\n  } else if (isConditionBooleanValueDataV2(condition.value)) {\n    newValue = createConditionValueDataFromBooleanValueDataV2(condition.value)\n  } else if (isConditionNumberValueDataV2(condition.value)) {\n    newValue = createConditionValueDataFromNumberValueDataV2(condition.value)\n  } else if (isConditionDateValueDataV2(condition.value)) {\n    newValue = createConditionValueDataFromDateValueDataV2(condition.value)\n  } else {\n    newValue = condition.value\n  }\n\n  return {\n    field: {\n      name: component.name,\n      type: component.type as ConditionalComponentType /** @todo fix this */,\n      display: component.title\n    },\n    operator: condition.operator,\n    value: newValue,\n    coordinator\n  }\n}\n\nfunction convertConditionRefDataFromV2(\n  model: RuntimeFormModel,\n  condition: ConditionRefDataV2,\n  coordinator: Coordinator | undefined\n): ConditionRefData {\n  const refCondition = model.getConditionById(condition.conditionId)\n\n  if (!refCondition) {\n    throw Error('Component not found')\n  }\n\n  return {\n    conditionName: refCondition.displayName,\n    conditionDisplayName: refCondition.displayName,\n    coordinator\n  }\n}\n\nexport function isConditionWrapperV2(\n  wrapper: ConditionWrapper | ConditionWrapperV2\n): wrapper is ConditionWrapperV2 {\n  return Array.isArray((wrapper as ConditionWrapperV2).items)\n}\n\nexport function isConditionWrapper(\n  wrapper: ConditionWrapper | ConditionWrapperV2\n): wrapper is ConditionWrapper {\n  return !isConditionWrapperV2(wrapper)\n}\n\nexport function convertConditionWrapperFromV2(\n  conditionWrapper: ConditionWrapperV2,\n  model: RuntimeFormModel\n): ConditionWrapper {\n  let coordinator\n\n  if (conditionWrapper.items.length > 1 && !conditionWrapper.coordinator) {\n    throw new Error('Coordinator is required for multiple conditions')\n  } else {\n    coordinator = conditionWrapper.coordinator\n  }\n\n  const newConditionWrapper: ConditionWrapper = {\n    name: conditionWrapper.id,\n    displayName: conditionWrapper.displayName,\n    value: {\n      name: conditionWrapper.id,\n      conditions: conditionWrapper.items.map((condition, index) => {\n        let newCondition: ConditionData | ConditionRefData\n\n        if (isConditionDataV2(condition)) {\n          newCondition = convertConditionDataV2(\n            model,\n            condition,\n            index > 0 ? coordinator : undefined\n          )\n        } else {\n          newCondition = convertConditionRefDataFromV2(\n            model,\n            condition,\n            index > 0 ? coordinator : undefined\n          )\n        }\n\n        return newCondition\n      })\n    }\n  }\n\n  return newConditionWrapper\n}\n\nexport interface RuntimeFormModel {\n  getListById: (listId: string) => List | undefined\n  getComponentById: (componentId: string) => ComponentDef | undefined\n  getConditionById: (conditionId: string) => ConditionWrapperV2 | undefined\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"migration.js","names":["ConditionType","isConditionListItemRefValueDataV2","condition","type","ListItemRef","isConditionStringValueDataV2","StringValue","isConditionBooleanValueDataV2","BooleanValue","isConditionNumberValueDataV2","NumberValue","isConditionDateValueDataV2","DateValue","isConditionRelativeDateValueDataV2","RelativeDate","getListItem","model","listId","itemId","foundList","getListById","Error","item","items","find","id","createConditionValueDataFromListItemRefV2","value","refValue","display","text","Value","toString","createConditionValueDataFromStringOrDateValueDataV2","createConditionValueDataFromStringValueDataV2","createConditionValueDataFromDateValueDataV2","createConditionValueDataFromRelativeDateValueDataV2","period","unit","direction","createConditionValueDataFromNumberValueDataV2","createConditionValueDataFromBooleanValueDataV2","isConditionDataV2","convertConditionDataV2","coordinator","component","getComponentById","componentId","newValue","field","name","title","operator","convertConditionRefDataFromV2","refCondition","getConditionById","conditionId","conditionName","displayName","conditionDisplayName","isConditionWrapperV2","wrapper","Array","isArray","isConditionWrapper","convertConditionWrapperFromV2","conditionWrapper","length","newConditionWrapper","conditions","map","index","newCondition","undefined"],"sources":["../../../src/conditions/migration.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type ConditionalComponentType\n} from '~/src/components/types.js'\nimport { ConditionType, type Coordinator } from '~/src/conditions/enums.js'\nimport {\n  type ConditionData,\n  type ConditionDataV2,\n  type ConditionListItemRefValueDataV2,\n  type ConditionRefData,\n  type ConditionRefDataV2,\n  type ConditionValueData,\n  type RelativeDateValueData,\n  type RelativeDateValueDataV2\n} from '~/src/conditions/types.js'\nimport {\n  type ConditionWrapper,\n  type ConditionWrapperV2,\n  type List\n} from '~/src/form/form-definition/types.js'\n\nexport function isConditionListItemRefValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.ListItemRef\n}\n\nexport function isConditionStringValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.StringValue\n}\n\nexport function isConditionBooleanValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.BooleanValue\n}\n\nexport function isConditionNumberValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.NumberValue\n}\n\nexport function isConditionDateValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.DateValue\n}\n\nexport function isConditionRelativeDateValueDataV2(condition: ConditionDataV2) {\n  return condition.type === ConditionType.RelativeDate\n}\n\nfunction getListItem(model: RuntimeFormModel, listId: string, itemId: string) {\n  const foundList = model.getListById(listId)\n\n  if (!foundList) {\n    throw Error('List not found')\n  }\n\n  const item = foundList.items.find((item) => item.id === itemId)\n\n  if (!item) {\n    throw Error('List item not found')\n  }\n\n  return item\n}\n\nfunction createConditionValueDataFromListItemRefV2(\n  condition: ConditionDataV2,\n  model: RuntimeFormModel\n): ConditionValueData {\n  const value = condition.value as ConditionListItemRefValueDataV2\n  const refValue = getListItem(model, value.listId, value.itemId)\n\n  return {\n    display: refValue.text,\n    type: ConditionType.Value,\n    value: refValue.value.toString()\n  }\n}\n\nfunction createConditionValueDataFromStringOrDateValueDataV2(\n  condition: ConditionDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: condition.value as string,\n    display: condition.value as string\n  }\n}\n\nfunction createConditionValueDataFromStringValueDataV2(\n  condition: ConditionDataV2\n): ConditionValueData {\n  return createConditionValueDataFromStringOrDateValueDataV2(condition)\n}\n\nfunction createConditionValueDataFromDateValueDataV2(\n  condition: ConditionDataV2\n): ConditionValueData {\n  return createConditionValueDataFromStringOrDateValueDataV2(condition)\n}\n\nfunction createConditionValueDataFromRelativeDateValueDataV2(\n  condition: ConditionDataV2\n): RelativeDateValueData {\n  const value = condition.value as RelativeDateValueDataV2\n  return {\n    type: ConditionType.RelativeDate,\n    period: value.period.toString(),\n    unit: value.unit,\n    direction: value.direction\n  }\n}\n\nfunction createConditionValueDataFromNumberValueDataV2(\n  condition: ConditionDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: (condition.value as number).toString(),\n    display: (condition.value as number).toString()\n  }\n}\n\nfunction createConditionValueDataFromBooleanValueDataV2(\n  condition: ConditionDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: (condition.value as boolean).toString(),\n    display: (condition.value as boolean) ? 'Yes' : 'No'\n  }\n}\n\nfunction isConditionDataV2(\n  condition: ConditionDataV2 | ConditionRefDataV2\n): condition is ConditionDataV2 {\n  return 'componentId' in condition\n}\n\nfunction convertConditionDataV2(\n  model: RuntimeFormModel,\n  condition: ConditionDataV2,\n  coordinator: Coordinator | undefined\n): ConditionData {\n  const component = model.getComponentById(condition.componentId)\n\n  if (!component) {\n    throw Error('Component not found')\n  }\n\n  let newValue\n  if (isConditionListItemRefValueDataV2(condition)) {\n    newValue = createConditionValueDataFromListItemRefV2(condition, model)\n  } else if (isConditionStringValueDataV2(condition)) {\n    newValue = createConditionValueDataFromStringValueDataV2(condition)\n  } else if (isConditionBooleanValueDataV2(condition)) {\n    newValue = createConditionValueDataFromBooleanValueDataV2(condition)\n  } else if (isConditionNumberValueDataV2(condition)) {\n    newValue = createConditionValueDataFromNumberValueDataV2(condition)\n  } else if (isConditionDateValueDataV2(condition)) {\n    newValue = createConditionValueDataFromDateValueDataV2(condition)\n  } else if (isConditionRelativeDateValueDataV2(condition)) {\n    newValue = createConditionValueDataFromRelativeDateValueDataV2(condition)\n  } else {\n    throw Error('Unsupported condition type')\n  }\n\n  return {\n    field: {\n      name: component.name,\n      type: component.type as ConditionalComponentType /** @todo fix this */,\n      display: component.title\n    },\n    operator: condition.operator,\n    value: newValue,\n    coordinator\n  }\n}\n\nfunction convertConditionRefDataFromV2(\n  model: RuntimeFormModel,\n  condition: ConditionRefDataV2,\n  coordinator: Coordinator | undefined\n): ConditionRefData {\n  const refCondition = model.getConditionById(condition.conditionId)\n\n  if (!refCondition) {\n    throw Error('Component not found')\n  }\n\n  return {\n    conditionName: refCondition.displayName,\n    conditionDisplayName: refCondition.displayName,\n    coordinator\n  }\n}\n\nexport function isConditionWrapperV2(\n  wrapper: ConditionWrapper | ConditionWrapperV2\n): wrapper is ConditionWrapperV2 {\n  return Array.isArray((wrapper as ConditionWrapperV2).items)\n}\n\nexport function isConditionWrapper(\n  wrapper: ConditionWrapper | ConditionWrapperV2\n): wrapper is ConditionWrapper {\n  return !isConditionWrapperV2(wrapper)\n}\n\nexport function convertConditionWrapperFromV2(\n  conditionWrapper: ConditionWrapperV2,\n  model: RuntimeFormModel\n): ConditionWrapper {\n  let coordinator\n\n  if (conditionWrapper.items.length > 1 && !conditionWrapper.coordinator) {\n    throw new Error('Coordinator is required for multiple conditions')\n  } else {\n    coordinator = conditionWrapper.coordinator\n  }\n\n  const newConditionWrapper: ConditionWrapper = {\n    name: conditionWrapper.id,\n    displayName: conditionWrapper.displayName,\n    value: {\n      name: conditionWrapper.id,\n      conditions: conditionWrapper.items.map((condition, index) => {\n        let newCondition: ConditionData | ConditionRefData\n\n        if (isConditionDataV2(condition)) {\n          newCondition = convertConditionDataV2(\n            model,\n            condition,\n            index > 0 ? coordinator : undefined\n          )\n        } else {\n          newCondition = convertConditionRefDataFromV2(\n            model,\n            condition,\n            index > 0 ? coordinator : undefined\n          )\n        }\n\n        return newCondition\n      })\n    }\n  }\n\n  return newConditionWrapper\n}\n\nexport interface RuntimeFormModel {\n  getListById: (listId: string) => List | undefined\n  getComponentById: (componentId: string) => ComponentDef | undefined\n  getConditionById: (conditionId: string) => ConditionWrapperV2 | undefined\n}\n"],"mappings":"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","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 { 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 ConditionStringValueDataV2 {\n  type: ConditionType.StringValue\n  value: string\n}\n\nexport interface ConditionBooleanValueDataV2 {\n  type: ConditionType.BooleanValue\n  value: boolean\n}\n\nexport interface ConditionNumberValueDataV2 {\n  type: ConditionType.NumberValue\n  value: number\n}\n\nexport interface ConditionDateValueDataV2 {\n  type: ConditionType.DateValue\n  value: string\n}\n\nexport interface ConditionListItemRefValueDataV2 {\n  type: ConditionType.ListItemRef\n  listId: string\n  itemId: 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 type ConditionValueDataV2 =\n  | ConditionListItemRefValueDataV2\n  | ConditionStringValueDataV2\n  | ConditionBooleanValueDataV2\n  | ConditionNumberValueDataV2\n  | ConditionDateValueDataV2\n  | RelativeDateValueData\n\nexport interface ConditionDataV2 {\n  id: string\n  componentId: string\n  operator: OperatorName\n  value: ConditionValueDataV2\n}\n\nexport interface ConditionRefData {\n  conditionName: string\n  conditionDisplayName: string\n  coordinator?: Coordinator\n}\n\nexport interface ConditionRefDataV2 {\n  id: string\n  conditionId: string\n}\n\nexport interface ConditionGroupData {\n  conditions: (ConditionData | ConditionRefData | ConditionGroupData)[]\n}\n\nexport type ConditionGroupDataV2 = (ConditionDataV2 | ConditionRefDataV2)[]\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":[]}
+{"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 ConditionListItemRefValueDataV2 {\n  listId: string\n  itemId: string\n}\n\nexport interface RelativeDateValueDataV2 {\n  period: number\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 type ConditionValueDataV2 =\n  | ConditionListItemRefValueDataV2\n  | RelativeDateValueDataV2\n  | string\n  | boolean\n  | number\n\nexport interface ConditionDataV2 {\n  id: string\n  componentId: string\n  operator: OperatorName\n  type: ConditionType\n  value: ConditionValueDataV2\n}\n\nexport interface ConditionRefData {\n  conditionName: string\n  conditionDisplayName: string\n  coordinator?: Coordinator\n}\n\nexport interface ConditionRefDataV2 {\n  id: string\n  conditionId: string\n}\n\nexport interface ConditionGroupData {\n  conditions: (ConditionData | ConditionRefData | ConditionGroupData)[]\n}\n\nexport type ConditionGroupDataV2 = (ConditionDataV2 | ConditionRefDataV2)[]\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/module/form/form-definition/index.js

@@ -2,6 +2,7 @@ import JoiDate from '@joi/date';
 import JoiBase from 'joi';
 import { v4 as uuidV4 } from 'uuid';
 import { ComponentType } from "../../components/enums.js";
+import { ConditionType, OperatorName } from "../../conditions/enums.js";
 import { SchemaVersion } from "./types.js";
 import { ControllerType } from "../../pages/enums.js";
 import { hasComponents } from "../../pages/helpers.js";
@@ -39,24 +40,7 @@ const conditionValueSchema = Joi.object().description('Value specification for a
   value: Joi.string().trim().required().description('The actual value to compare against'),
   display: Joi.string().trim().required().description('Human-readable version of the value for display purposes')
 });
-const conditionStringValueDataSchemaV2 = Joi.object().description('String value specification for a condition').keys({
-  type: Joi.string().trim().valid('StringValue').required().description('Type of the condition value, should be "StringValue"'),
-  value: Joi.string().trim().required().description('The actual value to compare against')
-});
-const conditionBooleanValueDataSchemaV2 = Joi.object().description('Boolean value specification for a condition').keys({
-  type: Joi.string().trim().valid('BooleanValue').required().description('Type of the condition value, should be "BooleanValue"'),
-  value: Joi.boolean().required().description('The actual value to compare against')
-});
-const conditionNumberValueDataSchemaV2 = Joi.object().description('Number value specification for a condition').keys({
-  type: Joi.string().trim().valid('NumberValue').required().description('Type of the condition value, should be "NumberValue"'),
-  value: Joi.number().required().description('The actual value to compare against')
-});
-const conditionDateValueDataSchemaV2 = Joi.object().description('Date value specification for a condition').keys({
-  type: Joi.string().trim().valid('DateValue').required().description('Type of the condition value, should be "DateValue"'),
-  value: Joi.date().format('YYYY-MM-DD').raw().required().description('The actual value to compare against')
-});
 const conditionListItemRefDataSchemaV2 = Joi.object().description('List item ref specification for a condition').keys({
-  type: Joi.string().trim().valid('ListItemRef').required().description('Type of the condition value, should be "ListItemRef"'),
   listId: Joi.string().trim().required().when('/lists', {
     is: Joi.exist(),
     then: Joi.valid(listIdRef)
@@ -66,6 +50,11 @@ const conditionListItemRefDataSchemaV2 = Joi.object().description('List item ref
     then: Joi.valid(listItemIdRef)
   }).required().description('The id of the list item')
 });
+const relativeDateValueDataSchemaV2 = Joi.object().description('Relative date specification for date-based conditions').keys({
+  period: Joi.number().integer().positive().required().description('Numeric amount of the time period, as a string'),
+  unit: Joi.string().trim().required().description('Time unit (e.g. days, weeks, months, years)'),
+  direction: Joi.string().trim().required().description('Temporal direction, either "past" or "future"')
+});
 const relativeDateValueDataSchema = Joi.object().description('Relative date specification for date-based conditions').keys({
   type: Joi.string().trim().valid('RelativeDate').required().description('Type of the condition value, should be "RelativeDate"'),
   period: Joi.string().trim().required().description('Numeric amount of the time period, as a string'),
@@ -96,8 +85,29 @@ export const conditionDataSchemaV2 = Joi.object().description('Condition definit
     is: Joi.exist(),
     then: Joi.valid(componentIdRefSchema)
   }).description('Reference to the component id being evaluated in this condition'),
-  operator: Joi.string().trim().required().description('Comparison operator (equals, greaterThan, contains, etc.)'),
-  value: Joi.alternatives().try(conditionStringValueDataSchemaV2, conditionBooleanValueDataSchemaV2, conditionNumberValueDataSchemaV2, conditionDateValueDataSchemaV2, conditionListItemRefDataSchemaV2, relativeDateValueDataSchema).required().description('Value to compare the field against, either fixed or relative date')
+  operator: Joi.string().trim().valid(...Object.values(OperatorName)).required().description('Comparison operator (equals, greaterThan, contains, etc.)'),
+  type: Joi.string().trim().valid(...Object.values(ConditionType)).required().description('Type of the condition value'),
+  value: Joi.any().required().description('The actual value to compare against').when('type', {
+    switch: [{
+      is: ConditionType.BooleanValue,
+      then: Joi.boolean()
+    }, {
+      is: ConditionType.StringValue,
+      then: Joi.string()
+    }, {
+      is: ConditionType.NumberValue,
+      then: Joi.number()
+    }, {
+      is: ConditionType.DateValue,
+      then: Joi.date().format('YYYY-MM-DD').raw()
+    }, {
+      is: ConditionType.ListItemRef,
+      then: conditionListItemRefDataSchemaV2
+    }, {
+      is: ConditionType.RelativeDate,
+      then: relativeDateValueDataSchemaV2
+    }]
+  }).description('Value to compare the field against, either fixed or relative date')
 });
 const conditionGroupSchema = Joi.object().description('Group of conditions combined with logical operators').keys({
   conditions: Joi.array().items(Joi.alternatives().try(conditionSchema, conditionRefSchema, Joi.link('#conditionGroupSchema'))).description('Array of conditions or condition references in this group')