@defra/forms-model 3.0.474 → 3.0.475

package/dist/module/conditions/migration.js

@@ -64,7 +64,7 @@ function convertConditionRefDataFromV2(model, condition, coordinator) {
     throw Error('Component not found');
   }
   return {
-    conditionName: refCondition.id,
+    conditionName: refCondition.displayName,
     conditionDisplayName: refCondition.displayName,
     coordinator
   };

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

@@ -1 +1 @@
-{"version":3,"file":"migration.js","names":["ConditionType","isConditionListItemRefValueDataV2","value","type","ListItemRef","isConditionStringValueDataV2","StringValue","getListItem","model","listId","itemId","foundList","getListById","Error","item","items","find","id","createConditionValueDataFromListItemRefV2","refValue","display","text","Value","toString","createConditionValueDataFromStringValueDataV2","isConditionDataV2","condition","convertConditionDataV2","coordinator","component","getComponentById","componentId","newValue","field","name","title","operator","convertConditionRefDataFromV2","refCondition","getConditionById","conditionId","conditionName","conditionDisplayName","displayName","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 ConditionStringValueDataV2,\n  type ConditionValueData,\n  type RelativeDateValueData\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\nfunction isConditionListItemRefValueDataV2(\n  value:\n    | ConditionListItemRefValueDataV2\n    | ConditionStringValueDataV2\n    | RelativeDateValueData\n): value is ConditionListItemRefValueDataV2 {\n  return value.type === ConditionType.ListItemRef\n}\n\nfunction isConditionStringValueDataV2(\n  value:\n    | ConditionListItemRefValueDataV2\n    | ConditionStringValueDataV2\n    | RelativeDateValueData\n): value is ConditionStringValueDataV2 {\n  return value.type === ConditionType.StringValue\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 createConditionValueDataFromStringValueDataV2(\n  value: ConditionStringValueDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: value.value,\n    display: value.value\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 {\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.id,\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":"AAIA,SAASA,aAAa;AAiBtB,SAASC,iCAAiCA,CACxCC,KAGyB,EACiB;EAC1C,OAAOA,KAAK,CAACC,IAAI,KAAKH,aAAa,CAACI,WAAW;AACjD;AAEA,SAASC,4BAA4BA,CACnCH,KAGyB,EACY;EACrC,OAAOA,KAAK,CAACC,IAAI,KAAKH,aAAa,CAACM,WAAW;AACjD;AAEA,SAASC,WAAWA,CAACC,KAAuB,EAAEC,MAAc,EAAEC,MAAc,EAAE;EAC5E,MAAMC,SAAS,GAAGH,KAAK,CAACI,WAAW,CAACH,MAAM,CAAC;EAE3C,IAAI,CAACE,SAAS,EAAE;IACd,MAAME,KAAK,CAAC,gBAAgB,CAAC;EAC/B;EAEA,MAAMC,IAAI,GAAGH,SAAS,CAACI,KAAK,CAACC,IAAI,CAAEF,IAAI,IAAKA,IAAI,CAACG,EAAE,KAAKP,MAAM,CAAC;EAE/D,IAAI,CAACI,IAAI,EAAE;IACT,MAAMD,KAAK,CAAC,qBAAqB,CAAC;EACpC;EAEA,OAAOC,IAAI;AACb;AAEA,SAASI,yCAAyCA,CAChDhB,KAAsC,EACtCM,KAAuB,EACH;EACpB,MAAMW,QAAQ,GAAGZ,WAAW,CAACC,KAAK,EAAEN,KAAK,CAACO,MAAM,EAAEP,KAAK,CAACQ,MAAM,CAAC;EAE/D,OAAO;IACLU,OAAO,EAAED,QAAQ,CAACE,IAAI;IACtBlB,IAAI,EAAEH,aAAa,CAACsB,KAAK;IACzBpB,KAAK,EAAEiB,QAAQ,CAACjB,KAAK,CAACqB,QAAQ,CAAC;EACjC,CAAC;AACH;AAEA,SAASC,6CAA6CA,CACpDtB,KAAiC,EACb;EACpB,OAAO;IACLC,IAAI,EAAEH,aAAa,CAACsB,KAAK;IACzBpB,KAAK,EAAEA,KAAK,CAACA,KAAK;IAClBkB,OAAO,EAAElB,KAAK,CAACA;EACjB,CAAC;AACH;AAEA,SAASuB,iBAAiBA,CACxBC,SAA+C,EACjB;EAC9B,OAAO,aAAa,IAAIA,SAAS;AACnC;AAEA,SAASC,sBAAsBA,CAC7BnB,KAAuB,EACvBkB,SAA0B,EAC1BE,WAAoC,EACrB;EACf,MAAMC,SAAS,GAAGrB,KAAK,CAACsB,gBAAgB,CAACJ,SAAS,CAACK,WAAW,CAAC;EAE/D,IAAI,CAACF,SAAS,EAAE;IACd,MAAMhB,KAAK,CAAC,qBAAqB,CAAC;EACpC;EAEA,IAAImB,QAAQ;EACZ,IAAI/B,iCAAiC,CAACyB,SAAS,CAACxB,KAAK,CAAC,EAAE;IACtD8B,QAAQ,GAAGd,yCAAyC,CAACQ,SAAS,CAACxB,KAAK,EAAEM,KAAK,CAAC;EAC9E,CAAC,MAAM,IAAIH,4BAA4B,CAACqB,SAAS,CAACxB,KAAK,CAAC,EAAE;IACxD8B,QAAQ,GAAGR,6CAA6C,CAACE,SAAS,CAACxB,KAAK,CAAC;EAC3E,CAAC,MAAM;IACL8B,QAAQ,GAAGN,SAAS,CAACxB,KAAK;EAC5B;EAEA,OAAO;IACL+B,KAAK,EAAE;MACLC,IAAI,EAAEL,SAAS,CAACK,IAAI;MACpB/B,IAAI,EAAE0B,SAAS,CAAC1B,IAAgC,CAAC;MACjDiB,OAAO,EAAES,SAAS,CAACM;IACrB,CAAC;IACDC,QAAQ,EAAEV,SAAS,CAACU,QAAQ;IAC5BlC,KAAK,EAAE8B,QAAQ;IACfJ;EACF,CAAC;AACH;AAEA,SAASS,6BAA6BA,CACpC7B,KAAuB,EACvBkB,SAA6B,EAC7BE,WAAoC,EAClB;EAClB,MAAMU,YAAY,GAAG9B,KAAK,CAAC+B,gBAAgB,CAACb,SAAS,CAACc,WAAW,CAAC;EAElE,IAAI,CAACF,YAAY,EAAE;IACjB,MAAMzB,KAAK,CAAC,qBAAqB,CAAC;EACpC;EAEA,OAAO;IACL4B,aAAa,EAAEH,YAAY,CAACrB,EAAE;IAC9ByB,oBAAoB,EAAEJ,YAAY,CAACK,WAAW;IAC9Cf;EACF,CAAC;AACH;AAEA,OAAO,SAASgB,oBAAoBA,CAClCC,OAA8C,EACf;EAC/B,OAAOC,KAAK,CAACC,OAAO,CAAEF,OAAO,CAAwB9B,KAAK,CAAC;AAC7D;AAEA,OAAO,SAASiC,kBAAkBA,CAChCH,OAA8C,EACjB;EAC7B,OAAO,CAACD,oBAAoB,CAACC,OAAO,CAAC;AACvC;AAEA,OAAO,SAASI,6BAA6BA,CAC3CC,gBAAoC,EACpC1C,KAAuB,EACL;EAClB,IAAIoB,WAAW;EAEf,IAAIsB,gBAAgB,CAACnC,KAAK,CAACoC,MAAM,GAAG,CAAC,IAAI,CAACD,gBAAgB,CAACtB,WAAW,EAAE;IACtE,MAAM,IAAIf,KAAK,CAAC,iDAAiD,CAAC;EACpE,CAAC,MAAM;IACLe,WAAW,GAAGsB,gBAAgB,CAACtB,WAAW;EAC5C;EAEA,MAAMwB,mBAAqC,GAAG;IAC5ClB,IAAI,EAAEgB,gBAAgB,CAACjC,EAAE;IACzB0B,WAAW,EAAEO,gBAAgB,CAACP,WAAW;IACzCzC,KAAK,EAAE;MACLgC,IAAI,EAAEgB,gBAAgB,CAACjC,EAAE;MACzBoC,UAAU,EAAEH,gBAAgB,CAACnC,KAAK,CAACuC,GAAG,CAAC,CAAC5B,SAAS,EAAE6B,KAAK,KAAK;QAC3D,IAAIC,YAA8C;QAElD,IAAI/B,iBAAiB,CAACC,SAAS,CAAC,EAAE;UAChC8B,YAAY,GAAG7B,sBAAsB,CACnCnB,KAAK,EACLkB,SAAS,EACT6B,KAAK,GAAG,CAAC,GAAG3B,WAAW,GAAG6B,SAC5B,CAAC;QACH,CAAC,MAAM;UACLD,YAAY,GAAGnB,6BAA6B,CAC1C7B,KAAK,EACLkB,SAAS,EACT6B,KAAK,GAAG,CAAC,GAAG3B,WAAW,GAAG6B,SAC5B,CAAC;QACH;QAEA,OAAOD,YAAY;MACrB,CAAC;IACH;EACF,CAAC;EAED,OAAOJ,mBAAmB;AAC5B","ignoreList":[]}
+{"version":3,"file":"migration.js","names":["ConditionType","isConditionListItemRefValueDataV2","value","type","ListItemRef","isConditionStringValueDataV2","StringValue","getListItem","model","listId","itemId","foundList","getListById","Error","item","items","find","id","createConditionValueDataFromListItemRefV2","refValue","display","text","Value","toString","createConditionValueDataFromStringValueDataV2","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 ConditionData,\n  type ConditionDataV2,\n  type ConditionListItemRefValueDataV2,\n  type ConditionRefData,\n  type ConditionRefDataV2,\n  type ConditionStringValueDataV2,\n  type ConditionValueData,\n  type RelativeDateValueData\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\nfunction isConditionListItemRefValueDataV2(\n  value:\n    | ConditionListItemRefValueDataV2\n    | ConditionStringValueDataV2\n    | RelativeDateValueData\n): value is ConditionListItemRefValueDataV2 {\n  return value.type === ConditionType.ListItemRef\n}\n\nfunction isConditionStringValueDataV2(\n  value:\n    | ConditionListItemRefValueDataV2\n    | ConditionStringValueDataV2\n    | RelativeDateValueData\n): value is ConditionStringValueDataV2 {\n  return value.type === ConditionType.StringValue\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 createConditionValueDataFromStringValueDataV2(\n  value: ConditionStringValueDataV2\n): ConditionValueData {\n  return {\n    type: ConditionType.Value,\n    value: value.value,\n    display: value.value\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 {\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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-model",
-  "version": "3.0.474",
+  "version": "3.0.475",
   "description": "A hapi plugin providing the model for Defra forms",
   "homepage": "https://github.com/DEFRA/forms-designer/tree/main/model#readme",
   "types": "dist/types/index.d.ts",

package/src/conditions/migration.ts

@@ -126,7 +126,7 @@ function convertConditionRefDataFromV2(
   }
 
   return {
-    conditionName: refCondition.id,
+    conditionName: refCondition.displayName,
     conditionDisplayName: refCondition.displayName,
     coordinator
   }