@defra/forms-model 3.0.461 → 3.0.463

package/dist/module/conditions/condition-abstract.js

@@ -10,6 +10,9 @@ export class ConditionAbstract {
   coordinatorString() {
     return this.coordinator ? `${this.coordinator} ` : '';
   }
+  coordinatorHtml() {
+    return this.coordinator ? `<span class="govuk-!-font-weight-bold">${this.coordinator.toUpperCase()}</span> ` : '';
+  }
   getCoordinator() {
     return this.coordinator;
   }

package/dist/module/conditions/condition-abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-abstract.js","names":["Coordinator","ConditionAbstract","coordinator","constructor","Object","values","includes","Error","coordinatorString","getCoordinator","setCoordinator","isGroup","getGroupedConditions","_asFirstCondition","asFirstCondition","clone","conditionString","conditionExpression"],"sources":["../../../src/conditions/condition-abstract.ts"],"sourcesContent":["import { Coordinator } from '~/src/conditions/enums.js'\n\nexport class ConditionAbstract {\n  coordinator?: Coordinator\n\n  constructor(coordinator?: Coordinator) {\n    if (coordinator && !Object.values(Coordinator).includes(coordinator)) {\n      throw Error(`coordinator ${coordinator} is not a valid coordinator`)\n    }\n\n    this.coordinator = coordinator\n  }\n\n  coordinatorString(): string {\n    return this.coordinator ? `${this.coordinator} ` : ''\n  }\n\n  getCoordinator(): Coordinator | undefined {\n    return this.coordinator\n  }\n\n  setCoordinator(coordinator?: Coordinator) {\n    this.coordinator = coordinator\n  }\n\n  isGroup() {\n    return false\n  }\n\n  getGroupedConditions() {\n    return [this]\n  }\n\n  _asFirstCondition() {\n    delete this.coordinator\n  }\n\n  asFirstCondition() {\n    throw Error(\n      'Unsupported Operation. Method asFirstCondition have not been implemented'\n    )\n  }\n\n  clone() {\n    throw Error('Unsupported Operation. Method clone have not been implemented')\n  }\n\n  conditionString() {\n    throw Error(\n      'Unsupported Operation. Method conditionString have not been implemented'\n    )\n  }\n\n  conditionExpression() {\n    throw Error(\n      'Unsupported Operation. Method conditionExpression have not been implemented'\n    )\n  }\n}\n"],"mappings":"AAAA,SAASA,WAAW;AAEpB,OAAO,MAAMC,iBAAiB,CAAC;EAC7BC,WAAW;EAEXC,WAAWA,CAACD,WAAyB,EAAE;IACrC,IAAIA,WAAW,IAAI,CAACE,MAAM,CAACC,MAAM,CAACL,WAAW,CAAC,CAACM,QAAQ,CAACJ,WAAW,CAAC,EAAE;MACpE,MAAMK,KAAK,CAAC,eAAeL,WAAW,6BAA6B,CAAC;IACtE;IAEA,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;EAEAM,iBAAiBA,CAAA,EAAW;IAC1B,OAAO,IAAI,CAACN,WAAW,GAAG,GAAG,IAAI,CAACA,WAAW,GAAG,GAAG,EAAE;EACvD;EAEAO,cAAcA,CAAA,EAA4B;IACxC,OAAO,IAAI,CAACP,WAAW;EACzB;EAEAQ,cAAcA,CAACR,WAAyB,EAAE;IACxC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;EAEAS,OAAOA,CAAA,EAAG;IACR,OAAO,KAAK;EACd;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,CAAC,IAAI,CAAC;EACf;EAEAC,iBAAiBA,CAAA,EAAG;IAClB,OAAO,IAAI,CAACX,WAAW;EACzB;EAEAY,gBAAgBA,CAAA,EAAG;IACjB,MAAMP,KAAK,CACT,0EACF,CAAC;EACH;EAEAQ,KAAKA,CAAA,EAAG;IACN,MAAMR,KAAK,CAAC,+DAA+D,CAAC;EAC9E;EAEAS,eAAeA,CAAA,EAAG;IAChB,MAAMT,KAAK,CACT,yEACF,CAAC;EACH;EAEAU,mBAAmBA,CAAA,EAAG;IACpB,MAAMV,KAAK,CACT,6EACF,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"file":"condition-abstract.js","names":["Coordinator","ConditionAbstract","coordinator","constructor","Object","values","includes","Error","coordinatorString","coordinatorHtml","toUpperCase","getCoordinator","setCoordinator","isGroup","getGroupedConditions","_asFirstCondition","asFirstCondition","clone","conditionString","conditionExpression"],"sources":["../../../src/conditions/condition-abstract.ts"],"sourcesContent":["import { Coordinator } from '~/src/conditions/enums.js'\n\nexport class ConditionAbstract {\n  coordinator?: Coordinator\n\n  constructor(coordinator?: Coordinator) {\n    if (coordinator && !Object.values(Coordinator).includes(coordinator)) {\n      throw Error(`coordinator ${coordinator} is not a valid coordinator`)\n    }\n\n    this.coordinator = coordinator\n  }\n\n  coordinatorString(): string {\n    return this.coordinator ? `${this.coordinator} ` : ''\n  }\n\n  coordinatorHtml(): string {\n    return this.coordinator\n      ? `<span class=\"govuk-!-font-weight-bold\">${this.coordinator.toUpperCase()}</span> `\n      : ''\n  }\n\n  getCoordinator(): Coordinator | undefined {\n    return this.coordinator\n  }\n\n  setCoordinator(coordinator?: Coordinator) {\n    this.coordinator = coordinator\n  }\n\n  isGroup() {\n    return false\n  }\n\n  getGroupedConditions() {\n    return [this]\n  }\n\n  _asFirstCondition() {\n    delete this.coordinator\n  }\n\n  asFirstCondition() {\n    throw Error(\n      'Unsupported Operation. Method asFirstCondition have not been implemented'\n    )\n  }\n\n  clone() {\n    throw Error('Unsupported Operation. Method clone have not been implemented')\n  }\n\n  conditionString() {\n    throw Error(\n      'Unsupported Operation. Method conditionString have not been implemented'\n    )\n  }\n\n  conditionExpression() {\n    throw Error(\n      'Unsupported Operation. Method conditionExpression have not been implemented'\n    )\n  }\n}\n"],"mappings":"AAAA,SAASA,WAAW;AAEpB,OAAO,MAAMC,iBAAiB,CAAC;EAC7BC,WAAW;EAEXC,WAAWA,CAACD,WAAyB,EAAE;IACrC,IAAIA,WAAW,IAAI,CAACE,MAAM,CAACC,MAAM,CAACL,WAAW,CAAC,CAACM,QAAQ,CAACJ,WAAW,CAAC,EAAE;MACpE,MAAMK,KAAK,CAAC,eAAeL,WAAW,6BAA6B,CAAC;IACtE;IAEA,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;EAEAM,iBAAiBA,CAAA,EAAW;IAC1B,OAAO,IAAI,CAACN,WAAW,GAAG,GAAG,IAAI,CAACA,WAAW,GAAG,GAAG,EAAE;EACvD;EAEAO,eAAeA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACP,WAAW,GACnB,0CAA0C,IAAI,CAACA,WAAW,CAACQ,WAAW,CAAC,CAAC,UAAU,GAClF,EAAE;EACR;EAEAC,cAAcA,CAAA,EAA4B;IACxC,OAAO,IAAI,CAACT,WAAW;EACzB;EAEAU,cAAcA,CAACV,WAAyB,EAAE;IACxC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;EAEAW,OAAOA,CAAA,EAAG;IACR,OAAO,KAAK;EACd;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,CAAC,IAAI,CAAC;EACf;EAEAC,iBAAiBA,CAAA,EAAG;IAClB,OAAO,IAAI,CAACb,WAAW;EACzB;EAEAc,gBAAgBA,CAAA,EAAG;IACjB,MAAMT,KAAK,CACT,0EACF,CAAC;EACH;EAEAU,KAAKA,CAAA,EAAG;IACN,MAAMV,KAAK,CAAC,+DAA+D,CAAC;EAC9E;EAEAW,eAAeA,CAAA,EAAG;IAChB,MAAMX,KAAK,CACT,yEACF,CAAC;EACH;EAEAY,mBAAmBA,CAAA,EAAG;IACpB,MAAMZ,KAAK,CACT,6EACF,CAAC;EACH;AACF","ignoreList":[]}

package/dist/module/conditions/condition-group.js

@@ -11,6 +11,9 @@ export class ConditionGroup {
   coordinatorString() {
     return this.conditions[0].coordinatorString();
   }
+  coordinatorHtml() {
+    return this.conditions[0].coordinatorHtml();
+  }
   conditionString() {
     const copy = [...this.conditions];
     copy.splice(0, 1);

package/dist/module/conditions/condition-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-group.js","names":["conditionFrom","toExpression","toPresentationString","ConditionGroup","conditions","constructor","Array","isArray","length","Error","coordinatorString","conditionString","copy","splice","map","condition","join","conditionExpression","asFirstCondition","getCoordinator","setCoordinator","coordinator","isGroup","getGroupedConditions","clone","from","toJSON","structuredClone","obj"],"sources":["../../../src/conditions/condition-group.ts"],"sourcesContent":["import { conditionFrom } from '~/src/conditions/condition-model.js'\nimport { type ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { type Condition } from '~/src/conditions/condition.js'\nimport { type Coordinator } from '~/src/conditions/enums.js'\nimport { toExpression, toPresentationString } from '~/src/conditions/helpers.js'\nimport { type ConditionGroupData } from '~/src/conditions/types.js'\n\nexport class ConditionGroup {\n  conditions: (Condition | ConditionRef | ConditionGroup)[]\n\n  constructor(conditions: (Condition | ConditionRef | ConditionGroup)[] = []) {\n    if (!Array.isArray(conditions) || conditions.length < 2) {\n      throw Error('Cannot construct a condition group from a single condition')\n    }\n\n    this.conditions = conditions\n  }\n\n  coordinatorString(): string {\n    return this.conditions[0].coordinatorString()\n  }\n\n  conditionString(): string {\n    const copy = [...this.conditions]\n    copy.splice(0, 1)\n    return `(${this.conditions[0].conditionString()} ${copy\n      .map((condition) => toPresentationString(condition))\n      .join(' ')})`\n  }\n\n  conditionExpression(): string {\n    const copy = [...this.conditions]\n    copy.splice(0, 1)\n    return `(${this.conditions[0].conditionExpression()} ${copy\n      .map((condition) => toExpression(condition))\n      .join(' ')})`\n  }\n\n  asFirstCondition() {\n    this.conditions[0].asFirstCondition()\n    return this\n  }\n\n  getCoordinator(): Coordinator | undefined {\n    return this.conditions[0].getCoordinator()\n  }\n\n  setCoordinator(coordinator?: Coordinator) {\n    this.conditions[0].setCoordinator(coordinator)\n  }\n\n  isGroup() {\n    return true\n  }\n\n  getGroupedConditions(): (Condition | ConditionRef | ConditionGroup)[] {\n    return this.conditions.map((condition) => condition.clone())\n  }\n\n  clone(): ConditionGroup {\n    return ConditionGroup.from(this)\n  }\n\n  toJSON(): ConditionGroupData {\n    const { conditions } = this.clone()\n\n    return structuredClone({\n      conditions: conditions.map((condition) => condition.toJSON())\n    })\n  }\n\n  static from(obj: ConditionGroupData | ConditionGroup): ConditionGroup {\n    return new ConditionGroup(\n      obj.conditions.map((condition) => {\n        return 'clone' in condition\n          ? condition.clone()\n          : conditionFrom(condition)\n      })\n    )\n  }\n}\n"],"mappings":"AAAA,SAASA,aAAa;AAItB,SAASC,YAAY,EAAEC,oBAAoB;AAG3C,OAAO,MAAMC,cAAc,CAAC;EAC1BC,UAAU;EAEVC,WAAWA,CAACD,UAAyD,GAAG,EAAE,EAAE;IAC1E,IAAI,CAACE,KAAK,CAACC,OAAO,CAACH,UAAU,CAAC,IAAIA,UAAU,CAACI,MAAM,GAAG,CAAC,EAAE;MACvD,MAAMC,KAAK,CAAC,4DAA4D,CAAC;IAC3E;IAEA,IAAI,CAACL,UAAU,GAAGA,UAAU;EAC9B;EAEAM,iBAAiBA,CAAA,EAAW;IAC1B,OAAO,IAAI,CAACN,UAAU,CAAC,CAAC,CAAC,CAACM,iBAAiB,CAAC,CAAC;EAC/C;EAEAC,eAAeA,CAAA,EAAW;IACxB,MAAMC,IAAI,GAAG,CAAC,GAAG,IAAI,CAACR,UAAU,CAAC;IACjCQ,IAAI,CAACC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACjB,OAAO,IAAI,IAAI,CAACT,UAAU,CAAC,CAAC,CAAC,CAACO,eAAe,CAAC,CAAC,IAAIC,IAAI,CACpDE,GAAG,CAAEC,SAAS,IAAKb,oBAAoB,CAACa,SAAS,CAAC,CAAC,CACnDC,IAAI,CAAC,GAAG,CAAC,GAAG;EACjB;EAEAC,mBAAmBA,CAAA,EAAW;IAC5B,MAAML,IAAI,GAAG,CAAC,GAAG,IAAI,CAACR,UAAU,CAAC;IACjCQ,IAAI,CAACC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACjB,OAAO,IAAI,IAAI,CAACT,UAAU,CAAC,CAAC,CAAC,CAACa,mBAAmB,CAAC,CAAC,IAAIL,IAAI,CACxDE,GAAG,CAAEC,SAAS,IAAKd,YAAY,CAACc,SAAS,CAAC,CAAC,CAC3CC,IAAI,CAAC,GAAG,CAAC,GAAG;EACjB;EAEAE,gBAAgBA,CAAA,EAAG;IACjB,IAAI,CAACd,UAAU,CAAC,CAAC,CAAC,CAACc,gBAAgB,CAAC,CAAC;IACrC,OAAO,IAAI;EACb;EAEAC,cAAcA,CAAA,EAA4B;IACxC,OAAO,IAAI,CAACf,UAAU,CAAC,CAAC,CAAC,CAACe,cAAc,CAAC,CAAC;EAC5C;EAEAC,cAAcA,CAACC,WAAyB,EAAE;IACxC,IAAI,CAACjB,UAAU,CAAC,CAAC,CAAC,CAACgB,cAAc,CAACC,WAAW,CAAC;EAChD;EAEAC,OAAOA,CAAA,EAAG;IACR,OAAO,IAAI;EACb;EAEAC,oBAAoBA,CAAA,EAAkD;IACpE,OAAO,IAAI,CAACnB,UAAU,CAACU,GAAG,CAAEC,SAAS,IAAKA,SAAS,CAACS,KAAK,CAAC,CAAC,CAAC;EAC9D;EAEAA,KAAKA,CAAA,EAAmB;IACtB,OAAOrB,cAAc,CAACsB,IAAI,CAAC,IAAI,CAAC;EAClC;EAEAC,MAAMA,CAAA,EAAuB;IAC3B,MAAM;MAAEtB;IAAW,CAAC,GAAG,IAAI,CAACoB,KAAK,CAAC,CAAC;IAEnC,OAAOG,eAAe,CAAC;MACrBvB,UAAU,EAAEA,UAAU,CAACU,GAAG,CAAEC,SAAS,IAAKA,SAAS,CAACW,MAAM,CAAC,CAAC;IAC9D,CAAC,CAAC;EACJ;EAEA,OAAOD,IAAIA,CAACG,GAAwC,EAAkB;IACpE,OAAO,IAAIzB,cAAc,CACvByB,GAAG,CAACxB,UAAU,CAACU,GAAG,CAAEC,SAAS,IAAK;MAChC,OAAO,OAAO,IAAIA,SAAS,GACvBA,SAAS,CAACS,KAAK,CAAC,CAAC,GACjBxB,aAAa,CAACe,SAAS,CAAC;IAC9B,CAAC,CACH,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"file":"condition-group.js","names":["conditionFrom","toExpression","toPresentationString","ConditionGroup","conditions","constructor","Array","isArray","length","Error","coordinatorString","coordinatorHtml","conditionString","copy","splice","map","condition","join","conditionExpression","asFirstCondition","getCoordinator","setCoordinator","coordinator","isGroup","getGroupedConditions","clone","from","toJSON","structuredClone","obj"],"sources":["../../../src/conditions/condition-group.ts"],"sourcesContent":["import { conditionFrom } from '~/src/conditions/condition-model.js'\nimport { type ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { type Condition } from '~/src/conditions/condition.js'\nimport { type Coordinator } from '~/src/conditions/enums.js'\nimport { toExpression, toPresentationString } from '~/src/conditions/helpers.js'\nimport { type ConditionGroupData } from '~/src/conditions/types.js'\n\nexport class ConditionGroup {\n  conditions: (Condition | ConditionRef | ConditionGroup)[]\n\n  constructor(conditions: (Condition | ConditionRef | ConditionGroup)[] = []) {\n    if (!Array.isArray(conditions) || conditions.length < 2) {\n      throw Error('Cannot construct a condition group from a single condition')\n    }\n\n    this.conditions = conditions\n  }\n\n  coordinatorString(): string {\n    return this.conditions[0].coordinatorString()\n  }\n\n  coordinatorHtml(): string {\n    return this.conditions[0].coordinatorHtml()\n  }\n\n  conditionString(): string {\n    const copy = [...this.conditions]\n    copy.splice(0, 1)\n    return `(${this.conditions[0].conditionString()} ${copy\n      .map((condition) => toPresentationString(condition))\n      .join(' ')})`\n  }\n\n  conditionExpression(): string {\n    const copy = [...this.conditions]\n    copy.splice(0, 1)\n    return `(${this.conditions[0].conditionExpression()} ${copy\n      .map((condition) => toExpression(condition))\n      .join(' ')})`\n  }\n\n  asFirstCondition() {\n    this.conditions[0].asFirstCondition()\n    return this\n  }\n\n  getCoordinator(): Coordinator | undefined {\n    return this.conditions[0].getCoordinator()\n  }\n\n  setCoordinator(coordinator?: Coordinator) {\n    this.conditions[0].setCoordinator(coordinator)\n  }\n\n  isGroup() {\n    return true\n  }\n\n  getGroupedConditions(): (Condition | ConditionRef | ConditionGroup)[] {\n    return this.conditions.map((condition) => condition.clone())\n  }\n\n  clone(): ConditionGroup {\n    return ConditionGroup.from(this)\n  }\n\n  toJSON(): ConditionGroupData {\n    const { conditions } = this.clone()\n\n    return structuredClone({\n      conditions: conditions.map((condition) => condition.toJSON())\n    })\n  }\n\n  static from(obj: ConditionGroupData | ConditionGroup): ConditionGroup {\n    return new ConditionGroup(\n      obj.conditions.map((condition) => {\n        return 'clone' in condition\n          ? condition.clone()\n          : conditionFrom(condition)\n      })\n    )\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/module/conditions/condition-model.js

@@ -3,7 +3,7 @@ import { ConditionGroup } from "./condition-group.js";
 import { ConditionRef } from "./condition-ref.js";
 import { Condition } from "./condition.js";
 import { Coordinator } from "./enums.js";
-import { hasConditionGroup, hasConditionName, toExpression, toPresentationString } from "./helpers.js";
+import { hasConditionGroup, hasConditionName, toExpression, toPresentationHtml, toPresentationString } from "./helpers.js";
 export class ConditionsModel {
   #groupedConditions = [];
   #userGroupedConditions = [];
@@ -102,6 +102,9 @@ export class ConditionsModel {
   toPresentationString() {
     return this.#groupedConditions.map(condition => toPresentationString(condition)).join(' ');
   }
+  toPresentationHtml() {
+    return this.#groupedConditions.map(condition => toPresentationHtml(condition)).join(' ');
+  }
   toExpression() {
     return this.#groupedConditions.map(condition => toExpression(condition)).join(' ');
   }

package/dist/module/conditions/condition-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-model.js","names":["ConditionGroupDef","ConditionGroup","ConditionRef","Condition","Coordinator","hasConditionGroup","hasConditionName","toExpression","toPresentationString","ConditionsModel","groupedConditions","userGroupedConditions","conditionName","undefined","clone","toReturn","map","it","clear","name","add","condition","coordinatorExpected","length","getCoordinator","Error","push","_applyGroups","replace","index","splice","remove","indexes","filter","_condition","includes","asFirstCondition","addGroups","groupDefs","_group","splitGroup","_ungroup","moveEarlier","switchCoordinators","moveLater","setCoordinator","asPerUserGroupings","hasConditions","lastIndex","join","correctedUserGroups","conditions","_autoGroupDefs","reduce","groups","groupDef","find","contains","startsWith","groupConditions","applyTo","splitIndex","isGroup","copy","getGroupedConditions","orPositions","forEach","OR","hasOr","hasAnd","AND","start","position","thisIsTheLastOr","thereAreMoreConditions","toJSON","from","obj","conditionFrom"],"sources":["../../../src/conditions/condition-model.ts"],"sourcesContent":["import { ConditionGroupDef } from '~/src/conditions/condition-group-def.js'\nimport { ConditionGroup } from '~/src/conditions/condition-group.js'\nimport { ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { Condition } from '~/src/conditions/condition.js'\nimport { Coordinator } from '~/src/conditions/enums.js'\nimport {\n  hasConditionGroup,\n  hasConditionName,\n  toExpression,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\nimport {\n  type ConditionData,\n  type ConditionGroupData,\n  type ConditionRefData,\n  type ConditionsModelData\n} from '~/src/conditions/types.js'\n\nexport class ConditionsModel {\n  #groupedConditions: (Condition | ConditionRef | ConditionGroup)[] = []\n  #userGroupedConditions: (Condition | ConditionRef | ConditionGroup)[] = []\n  #conditionName: string | undefined = undefined\n\n  clone() {\n    const toReturn = new ConditionsModel()\n    toReturn.#groupedConditions = this.#groupedConditions.map((it) =>\n      it.clone()\n    )\n    toReturn.#userGroupedConditions = this.#userGroupedConditions.map((it) =>\n      it.clone()\n    )\n    toReturn.#conditionName = this.#conditionName\n    return toReturn\n  }\n\n  clear() {\n    this.#userGroupedConditions = []\n    this.#groupedConditions = []\n    this.#conditionName = undefined\n    return this\n  }\n\n  set name(name) {\n    this.#conditionName = name\n  }\n\n  get name() {\n    return this.#conditionName\n  }\n\n  add(condition: Condition | ConditionRef | ConditionGroup) {\n    const coordinatorExpected = this.#userGroupedConditions.length !== 0\n\n    if (condition.getCoordinator() && !coordinatorExpected) {\n      throw Error('No coordinator allowed on the first condition')\n    } else if (!condition.getCoordinator() && coordinatorExpected) {\n      throw Error('Coordinator must be present on subsequent conditions')\n    }\n\n    this.#userGroupedConditions.push(condition)\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n\n    return this\n  }\n\n  replace(index: number, condition: Condition | ConditionRef | ConditionGroup) {\n    const coordinatorExpected = index !== 0\n\n    if (condition.getCoordinator() && !coordinatorExpected) {\n      throw Error('No coordinator allowed on the first condition')\n    } else if (!condition.getCoordinator() && coordinatorExpected) {\n      throw Error('Coordinator must be present on subsequent conditions')\n    } else if (index >= this.#userGroupedConditions.length) {\n      throw Error(\n        `Cannot replace condition ${index} as no such condition exists`\n      )\n    }\n\n    this.#userGroupedConditions.splice(index, 1, condition)\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n\n    return this\n  }\n\n  remove(indexes: number[]) {\n    this.#userGroupedConditions = this.#userGroupedConditions\n      .filter((_condition, index) => !indexes.includes(index))\n      .map((condition, index) =>\n        index === 0 ? condition.asFirstCondition() : condition\n      )\n\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  addGroups(groupDefs: ConditionGroupDef[]) {\n    this.#userGroupedConditions = this._group(\n      this.#userGroupedConditions,\n      groupDefs\n    )\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  splitGroup(index: number) {\n    this.#userGroupedConditions = this._ungroup(\n      this.#userGroupedConditions,\n      index\n    )\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  moveEarlier(index: number) {\n    if (index > 0 && index < this.#userGroupedConditions.length) {\n      this.#userGroupedConditions.splice(\n        index - 1,\n        0,\n        this.#userGroupedConditions.splice(index, 1)[0]\n      )\n      if (index === 1) {\n        this.switchCoordinators()\n      }\n      this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    }\n    return this\n  }\n\n  moveLater(index: number) {\n    if (index >= 0 && index < this.#userGroupedConditions.length - 1) {\n      this.#userGroupedConditions.splice(\n        index + 1,\n        0,\n        this.#userGroupedConditions.splice(index, 1)[0]\n      )\n      if (index === 0) {\n        this.switchCoordinators()\n      }\n      this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    }\n    return this\n  }\n\n  switchCoordinators() {\n    this.#userGroupedConditions[1].setCoordinator(\n      this.#userGroupedConditions[0].getCoordinator()\n    )\n    this.#userGroupedConditions[0].setCoordinator()\n  }\n\n  get asPerUserGroupings() {\n    return [...this.#userGroupedConditions]\n  }\n\n  get hasConditions() {\n    return this.#userGroupedConditions.length > 0\n  }\n\n  get lastIndex() {\n    return this.#userGroupedConditions.length - 1\n  }\n\n  toPresentationString() {\n    return this.#groupedConditions\n      .map((condition) => toPresentationString(condition))\n      .join(' ')\n  }\n\n  toExpression() {\n    return this.#groupedConditions\n      .map((condition) => toExpression(condition))\n      .join(' ')\n  }\n\n  _applyGroups(\n    userGroupedConditions: (Condition | ConditionRef | ConditionGroup)[]\n  ) {\n    const correctedUserGroups = userGroupedConditions.map((condition) =>\n      condition instanceof ConditionGroup && condition.conditions.length > 2\n        ? new ConditionGroup(\n            this._group(\n              condition.conditions,\n              this._autoGroupDefs(condition.conditions)\n            )\n          )\n        : condition\n    )\n\n    return this._group(\n      correctedUserGroups,\n      this._autoGroupDefs(correctedUserGroups)\n    )\n  }\n\n  _group(\n    conditions: (Condition | ConditionRef | ConditionGroup)[],\n    groupDefs: ConditionGroupDef[]\n  ) {\n    return conditions.reduce<(Condition | ConditionRef | ConditionGroup)[]>(\n      (groups, condition, index, conditions) => {\n        const groupDef = groupDefs.find((groupDef) => groupDef.contains(index))\n\n        if (groupDef) {\n          if (groupDef.startsWith(index)) {\n            const groupConditions = groupDef.applyTo(conditions)\n            groups.push(new ConditionGroup(groupConditions))\n          }\n        } else {\n          groups.push(condition)\n        }\n\n        return groups\n      },\n      []\n    )\n  }\n\n  _ungroup(\n    conditions: (Condition | ConditionRef | ConditionGroup)[],\n    splitIndex: number\n  ) {\n    if (conditions[splitIndex].isGroup()) {\n      const copy = [...conditions]\n      copy.splice(\n        splitIndex,\n        1,\n        ...conditions[splitIndex].getGroupedConditions()\n      )\n      return copy\n    }\n    return conditions\n  }\n\n  _autoGroupDefs(conditions: (Condition | ConditionRef | ConditionGroup)[]) {\n    const orPositions: number[] = []\n\n    conditions.forEach((condition, index) => {\n      if (condition.getCoordinator() === Coordinator.OR) {\n        orPositions.push(index)\n      }\n    })\n\n    const hasOr = orPositions.length > 0\n    const hasAnd = !!conditions.find(\n      (condition) => condition.getCoordinator() === Coordinator.AND\n    )\n\n    if (hasAnd && hasOr) {\n      let start = 0\n      const groupDefs: ConditionGroupDef[] = []\n      orPositions.forEach((position, index) => {\n        if (start < position - 1) {\n          groupDefs.push(new ConditionGroupDef(start, position - 1))\n        }\n        const thisIsTheLastOr = orPositions.length === index + 1\n        const thereAreMoreConditions = conditions.length - 1 > position\n        if (thisIsTheLastOr && thereAreMoreConditions) {\n          groupDefs.push(new ConditionGroupDef(position, conditions.length - 1))\n        }\n        start = position\n      })\n      return groupDefs\n    }\n\n    return []\n  }\n\n  toJSON() {\n    const name = this.#conditionName\n    const conditions = this.#userGroupedConditions\n    return {\n      name: name ?? '',\n      conditions: conditions.map((it) => it.toJSON())\n    }\n  }\n\n  // TODO:- why is this not a constructor?\n  static from(obj: ConditionsModel | ConditionsModelData) {\n    if (obj instanceof ConditionsModel) {\n      return obj\n    }\n    const toReturn = new ConditionsModel()\n    toReturn.#conditionName = obj.name\n    toReturn.#userGroupedConditions = obj.conditions.map(conditionFrom)\n    toReturn.#groupedConditions = toReturn._applyGroups(\n      toReturn.#userGroupedConditions\n    )\n    return toReturn\n  }\n}\n\nexport function conditionFrom(\n  it: ConditionData | ConditionRefData | ConditionGroupData\n): Condition | ConditionRef | ConditionGroup {\n  if (hasConditionGroup(it)) {\n    return new ConditionGroup(it.conditions.map(conditionFrom))\n  }\n\n  if (hasConditionName(it)) {\n    return ConditionRef.from(it)\n  }\n\n  return Condition.from(it)\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"condition-model.js","names":["ConditionGroupDef","ConditionGroup","ConditionRef","Condition","Coordinator","hasConditionGroup","hasConditionName","toExpression","toPresentationHtml","toPresentationString","ConditionsModel","groupedConditions","userGroupedConditions","conditionName","undefined","clone","toReturn","map","it","clear","name","add","condition","coordinatorExpected","length","getCoordinator","Error","push","_applyGroups","replace","index","splice","remove","indexes","filter","_condition","includes","asFirstCondition","addGroups","groupDefs","_group","splitGroup","_ungroup","moveEarlier","switchCoordinators","moveLater","setCoordinator","asPerUserGroupings","hasConditions","lastIndex","join","correctedUserGroups","conditions","_autoGroupDefs","reduce","groups","groupDef","find","contains","startsWith","groupConditions","applyTo","splitIndex","isGroup","copy","getGroupedConditions","orPositions","forEach","OR","hasOr","hasAnd","AND","start","position","thisIsTheLastOr","thereAreMoreConditions","toJSON","from","obj","conditionFrom"],"sources":["../../../src/conditions/condition-model.ts"],"sourcesContent":["import { ConditionGroupDef } from '~/src/conditions/condition-group-def.js'\nimport { ConditionGroup } from '~/src/conditions/condition-group.js'\nimport { ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { Condition } from '~/src/conditions/condition.js'\nimport { Coordinator } from '~/src/conditions/enums.js'\nimport {\n  hasConditionGroup,\n  hasConditionName,\n  toExpression,\n  toPresentationHtml,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\nimport {\n  type ConditionData,\n  type ConditionGroupData,\n  type ConditionRefData,\n  type ConditionsModelData\n} from '~/src/conditions/types.js'\n\nexport class ConditionsModel {\n  #groupedConditions: (Condition | ConditionRef | ConditionGroup)[] = []\n  #userGroupedConditions: (Condition | ConditionRef | ConditionGroup)[] = []\n  #conditionName: string | undefined = undefined\n\n  clone() {\n    const toReturn = new ConditionsModel()\n    toReturn.#groupedConditions = this.#groupedConditions.map((it) =>\n      it.clone()\n    )\n    toReturn.#userGroupedConditions = this.#userGroupedConditions.map((it) =>\n      it.clone()\n    )\n    toReturn.#conditionName = this.#conditionName\n    return toReturn\n  }\n\n  clear() {\n    this.#userGroupedConditions = []\n    this.#groupedConditions = []\n    this.#conditionName = undefined\n    return this\n  }\n\n  set name(name) {\n    this.#conditionName = name\n  }\n\n  get name() {\n    return this.#conditionName\n  }\n\n  add(condition: Condition | ConditionRef | ConditionGroup) {\n    const coordinatorExpected = this.#userGroupedConditions.length !== 0\n\n    if (condition.getCoordinator() && !coordinatorExpected) {\n      throw Error('No coordinator allowed on the first condition')\n    } else if (!condition.getCoordinator() && coordinatorExpected) {\n      throw Error('Coordinator must be present on subsequent conditions')\n    }\n\n    this.#userGroupedConditions.push(condition)\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n\n    return this\n  }\n\n  replace(index: number, condition: Condition | ConditionRef | ConditionGroup) {\n    const coordinatorExpected = index !== 0\n\n    if (condition.getCoordinator() && !coordinatorExpected) {\n      throw Error('No coordinator allowed on the first condition')\n    } else if (!condition.getCoordinator() && coordinatorExpected) {\n      throw Error('Coordinator must be present on subsequent conditions')\n    } else if (index >= this.#userGroupedConditions.length) {\n      throw Error(\n        `Cannot replace condition ${index} as no such condition exists`\n      )\n    }\n\n    this.#userGroupedConditions.splice(index, 1, condition)\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n\n    return this\n  }\n\n  remove(indexes: number[]) {\n    this.#userGroupedConditions = this.#userGroupedConditions\n      .filter((_condition, index) => !indexes.includes(index))\n      .map((condition, index) =>\n        index === 0 ? condition.asFirstCondition() : condition\n      )\n\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  addGroups(groupDefs: ConditionGroupDef[]) {\n    this.#userGroupedConditions = this._group(\n      this.#userGroupedConditions,\n      groupDefs\n    )\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  splitGroup(index: number) {\n    this.#userGroupedConditions = this._ungroup(\n      this.#userGroupedConditions,\n      index\n    )\n    this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    return this\n  }\n\n  moveEarlier(index: number) {\n    if (index > 0 && index < this.#userGroupedConditions.length) {\n      this.#userGroupedConditions.splice(\n        index - 1,\n        0,\n        this.#userGroupedConditions.splice(index, 1)[0]\n      )\n      if (index === 1) {\n        this.switchCoordinators()\n      }\n      this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    }\n    return this\n  }\n\n  moveLater(index: number) {\n    if (index >= 0 && index < this.#userGroupedConditions.length - 1) {\n      this.#userGroupedConditions.splice(\n        index + 1,\n        0,\n        this.#userGroupedConditions.splice(index, 1)[0]\n      )\n      if (index === 0) {\n        this.switchCoordinators()\n      }\n      this.#groupedConditions = this._applyGroups(this.#userGroupedConditions)\n    }\n    return this\n  }\n\n  switchCoordinators() {\n    this.#userGroupedConditions[1].setCoordinator(\n      this.#userGroupedConditions[0].getCoordinator()\n    )\n    this.#userGroupedConditions[0].setCoordinator()\n  }\n\n  get asPerUserGroupings() {\n    return [...this.#userGroupedConditions]\n  }\n\n  get hasConditions() {\n    return this.#userGroupedConditions.length > 0\n  }\n\n  get lastIndex() {\n    return this.#userGroupedConditions.length - 1\n  }\n\n  toPresentationString() {\n    return this.#groupedConditions\n      .map((condition) => toPresentationString(condition))\n      .join(' ')\n  }\n\n  toPresentationHtml() {\n    return this.#groupedConditions\n      .map((condition) => toPresentationHtml(condition))\n      .join(' ')\n  }\n\n  toExpression() {\n    return this.#groupedConditions\n      .map((condition) => toExpression(condition))\n      .join(' ')\n  }\n\n  _applyGroups(\n    userGroupedConditions: (Condition | ConditionRef | ConditionGroup)[]\n  ) {\n    const correctedUserGroups = userGroupedConditions.map((condition) =>\n      condition instanceof ConditionGroup && condition.conditions.length > 2\n        ? new ConditionGroup(\n            this._group(\n              condition.conditions,\n              this._autoGroupDefs(condition.conditions)\n            )\n          )\n        : condition\n    )\n\n    return this._group(\n      correctedUserGroups,\n      this._autoGroupDefs(correctedUserGroups)\n    )\n  }\n\n  _group(\n    conditions: (Condition | ConditionRef | ConditionGroup)[],\n    groupDefs: ConditionGroupDef[]\n  ) {\n    return conditions.reduce<(Condition | ConditionRef | ConditionGroup)[]>(\n      (groups, condition, index, conditions) => {\n        const groupDef = groupDefs.find((groupDef) => groupDef.contains(index))\n\n        if (groupDef) {\n          if (groupDef.startsWith(index)) {\n            const groupConditions = groupDef.applyTo(conditions)\n            groups.push(new ConditionGroup(groupConditions))\n          }\n        } else {\n          groups.push(condition)\n        }\n\n        return groups\n      },\n      []\n    )\n  }\n\n  _ungroup(\n    conditions: (Condition | ConditionRef | ConditionGroup)[],\n    splitIndex: number\n  ) {\n    if (conditions[splitIndex].isGroup()) {\n      const copy = [...conditions]\n      copy.splice(\n        splitIndex,\n        1,\n        ...conditions[splitIndex].getGroupedConditions()\n      )\n      return copy\n    }\n    return conditions\n  }\n\n  _autoGroupDefs(conditions: (Condition | ConditionRef | ConditionGroup)[]) {\n    const orPositions: number[] = []\n\n    conditions.forEach((condition, index) => {\n      if (condition.getCoordinator() === Coordinator.OR) {\n        orPositions.push(index)\n      }\n    })\n\n    const hasOr = orPositions.length > 0\n    const hasAnd = !!conditions.find(\n      (condition) => condition.getCoordinator() === Coordinator.AND\n    )\n\n    if (hasAnd && hasOr) {\n      let start = 0\n      const groupDefs: ConditionGroupDef[] = []\n      orPositions.forEach((position, index) => {\n        if (start < position - 1) {\n          groupDefs.push(new ConditionGroupDef(start, position - 1))\n        }\n        const thisIsTheLastOr = orPositions.length === index + 1\n        const thereAreMoreConditions = conditions.length - 1 > position\n        if (thisIsTheLastOr && thereAreMoreConditions) {\n          groupDefs.push(new ConditionGroupDef(position, conditions.length - 1))\n        }\n        start = position\n      })\n      return groupDefs\n    }\n\n    return []\n  }\n\n  toJSON() {\n    const name = this.#conditionName\n    const conditions = this.#userGroupedConditions\n    return {\n      name: name ?? '',\n      conditions: conditions.map((it) => it.toJSON())\n    }\n  }\n\n  // TODO:- why is this not a constructor?\n  static from(obj: ConditionsModel | ConditionsModelData) {\n    if (obj instanceof ConditionsModel) {\n      return obj\n    }\n    const toReturn = new ConditionsModel()\n    toReturn.#conditionName = obj.name\n    toReturn.#userGroupedConditions = obj.conditions.map(conditionFrom)\n    toReturn.#groupedConditions = toReturn._applyGroups(\n      toReturn.#userGroupedConditions\n    )\n    return toReturn\n  }\n}\n\nexport function conditionFrom(\n  it: ConditionData | ConditionRefData | ConditionGroupData\n): Condition | ConditionRef | ConditionGroup {\n  if (hasConditionGroup(it)) {\n    return new ConditionGroup(it.conditions.map(conditionFrom))\n  }\n\n  if (hasConditionName(it)) {\n    return ConditionRef.from(it)\n  }\n\n  return Condition.from(it)\n}\n"],"mappings":"AAAA,SAASA,iBAAiB;AAC1B,SAASC,cAAc;AACvB,SAASC,YAAY;AACrB,SAASC,SAAS;AAClB,SAASC,WAAW;AACpB,SACEC,iBAAiB,EACjBC,gBAAgB,EAChBC,YAAY,EACZC,kBAAkB,EAClBC,oBAAoB;AAStB,OAAO,MAAMC,eAAe,CAAC;EAC3B,CAACC,iBAAiB,GAAkD,EAAE;EACtE,CAACC,qBAAqB,GAAkD,EAAE;EAC1E,CAACC,aAAa,GAAuBC,SAAS;EAE9CC,KAAKA,CAAA,EAAG;IACN,MAAMC,QAAQ,GAAG,IAAIN,eAAe,CAAC,CAAC;IACtCM,QAAQ,CAAC,CAACL,iBAAiB,GAAG,IAAI,CAAC,CAACA,iBAAiB,CAACM,GAAG,CAAEC,EAAE,IAC3DA,EAAE,CAACH,KAAK,CAAC,CACX,CAAC;IACDC,QAAQ,CAAC,CAACJ,qBAAqB,GAAG,IAAI,CAAC,CAACA,qBAAqB,CAACK,GAAG,CAAEC,EAAE,IACnEA,EAAE,CAACH,KAAK,CAAC,CACX,CAAC;IACDC,QAAQ,CAAC,CAACH,aAAa,GAAG,IAAI,CAAC,CAACA,aAAa;IAC7C,OAAOG,QAAQ;EACjB;EAEAG,KAAKA,CAAA,EAAG;IACN,IAAI,CAAC,CAACP,qBAAqB,GAAG,EAAE;IAChC,IAAI,CAAC,CAACD,iBAAiB,GAAG,EAAE;IAC5B,IAAI,CAAC,CAACE,aAAa,GAAGC,SAAS;IAC/B,OAAO,IAAI;EACb;EAEA,IAAIM,IAAIA,CAACA,IAAI,EAAE;IACb,IAAI,CAAC,CAACP,aAAa,GAAGO,IAAI;EAC5B;EAEA,IAAIA,IAAIA,CAAA,EAAG;IACT,OAAO,IAAI,CAAC,CAACP,aAAa;EAC5B;EAEAQ,GAAGA,CAACC,SAAoD,EAAE;IACxD,MAAMC,mBAAmB,GAAG,IAAI,CAAC,CAACX,qBAAqB,CAACY,MAAM,KAAK,CAAC;IAEpE,IAAIF,SAAS,CAACG,cAAc,CAAC,CAAC,IAAI,CAACF,mBAAmB,EAAE;MACtD,MAAMG,KAAK,CAAC,+CAA+C,CAAC;IAC9D,CAAC,MAAM,IAAI,CAACJ,SAAS,CAACG,cAAc,CAAC,CAAC,IAAIF,mBAAmB,EAAE;MAC7D,MAAMG,KAAK,CAAC,sDAAsD,CAAC;IACrE;IAEA,IAAI,CAAC,CAACd,qBAAqB,CAACe,IAAI,CAACL,SAAS,CAAC;IAC3C,IAAI,CAAC,CAACX,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IAExE,OAAO,IAAI;EACb;EAEAiB,OAAOA,CAACC,KAAa,EAAER,SAAoD,EAAE;IAC3E,MAAMC,mBAAmB,GAAGO,KAAK,KAAK,CAAC;IAEvC,IAAIR,SAAS,CAACG,cAAc,CAAC,CAAC,IAAI,CAACF,mBAAmB,EAAE;MACtD,MAAMG,KAAK,CAAC,+CAA+C,CAAC;IAC9D,CAAC,MAAM,IAAI,CAACJ,SAAS,CAACG,cAAc,CAAC,CAAC,IAAIF,mBAAmB,EAAE;MAC7D,MAAMG,KAAK,CAAC,sDAAsD,CAAC;IACrE,CAAC,MAAM,IAAII,KAAK,IAAI,IAAI,CAAC,CAAClB,qBAAqB,CAACY,MAAM,EAAE;MACtD,MAAME,KAAK,CACT,4BAA4BI,KAAK,8BACnC,CAAC;IACH;IAEA,IAAI,CAAC,CAAClB,qBAAqB,CAACmB,MAAM,CAACD,KAAK,EAAE,CAAC,EAAER,SAAS,CAAC;IACvD,IAAI,CAAC,CAACX,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IAExE,OAAO,IAAI;EACb;EAEAoB,MAAMA,CAACC,OAAiB,EAAE;IACxB,IAAI,CAAC,CAACrB,qBAAqB,GAAG,IAAI,CAAC,CAACA,qBAAqB,CACtDsB,MAAM,CAAC,CAACC,UAAU,EAAEL,KAAK,KAAK,CAACG,OAAO,CAACG,QAAQ,CAACN,KAAK,CAAC,CAAC,CACvDb,GAAG,CAAC,CAACK,SAAS,EAAEQ,KAAK,KACpBA,KAAK,KAAK,CAAC,GAAGR,SAAS,CAACe,gBAAgB,CAAC,CAAC,GAAGf,SAC/C,CAAC;IAEH,IAAI,CAAC,CAACX,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IACxE,OAAO,IAAI;EACb;EAEA0B,SAASA,CAACC,SAA8B,EAAE;IACxC,IAAI,CAAC,CAAC3B,qBAAqB,GAAG,IAAI,CAAC4B,MAAM,CACvC,IAAI,CAAC,CAAC5B,qBAAqB,EAC3B2B,SACF,CAAC;IACD,IAAI,CAAC,CAAC5B,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IACxE,OAAO,IAAI;EACb;EAEA6B,UAAUA,CAACX,KAAa,EAAE;IACxB,IAAI,CAAC,CAAClB,qBAAqB,GAAG,IAAI,CAAC8B,QAAQ,CACzC,IAAI,CAAC,CAAC9B,qBAAqB,EAC3BkB,KACF,CAAC;IACD,IAAI,CAAC,CAACnB,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IACxE,OAAO,IAAI;EACb;EAEA+B,WAAWA,CAACb,KAAa,EAAE;IACzB,IAAIA,KAAK,GAAG,CAAC,IAAIA,KAAK,GAAG,IAAI,CAAC,CAAClB,qBAAqB,CAACY,MAAM,EAAE;MAC3D,IAAI,CAAC,CAACZ,qBAAqB,CAACmB,MAAM,CAChCD,KAAK,GAAG,CAAC,EACT,CAAC,EACD,IAAI,CAAC,CAAClB,qBAAqB,CAACmB,MAAM,CAACD,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAChD,CAAC;MACD,IAAIA,KAAK,KAAK,CAAC,EAAE;QACf,IAAI,CAACc,kBAAkB,CAAC,CAAC;MAC3B;MACA,IAAI,CAAC,CAACjC,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IAC1E;IACA,OAAO,IAAI;EACb;EAEAiC,SAASA,CAACf,KAAa,EAAE;IACvB,IAAIA,KAAK,IAAI,CAAC,IAAIA,KAAK,GAAG,IAAI,CAAC,CAAClB,qBAAqB,CAACY,MAAM,GAAG,CAAC,EAAE;MAChE,IAAI,CAAC,CAACZ,qBAAqB,CAACmB,MAAM,CAChCD,KAAK,GAAG,CAAC,EACT,CAAC,EACD,IAAI,CAAC,CAAClB,qBAAqB,CAACmB,MAAM,CAACD,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAChD,CAAC;MACD,IAAIA,KAAK,KAAK,CAAC,EAAE;QACf,IAAI,CAACc,kBAAkB,CAAC,CAAC;MAC3B;MACA,IAAI,CAAC,CAACjC,iBAAiB,GAAG,IAAI,CAACiB,YAAY,CAAC,IAAI,CAAC,CAAChB,qBAAqB,CAAC;IAC1E;IACA,OAAO,IAAI;EACb;EAEAgC,kBAAkBA,CAAA,EAAG;IACnB,IAAI,CAAC,CAAChC,qBAAqB,CAAC,CAAC,CAAC,CAACkC,cAAc,CAC3C,IAAI,CAAC,CAAClC,qBAAqB,CAAC,CAAC,CAAC,CAACa,cAAc,CAAC,CAChD,CAAC;IACD,IAAI,CAAC,CAACb,qBAAqB,CAAC,CAAC,CAAC,CAACkC,cAAc,CAAC,CAAC;EACjD;EAEA,IAAIC,kBAAkBA,CAAA,EAAG;IACvB,OAAO,CAAC,GAAG,IAAI,CAAC,CAACnC,qBAAqB,CAAC;EACzC;EAEA,IAAIoC,aAAaA,CAAA,EAAG;IAClB,OAAO,IAAI,CAAC,CAACpC,qBAAqB,CAACY,MAAM,GAAG,CAAC;EAC/C;EAEA,IAAIyB,SAASA,CAAA,EAAG;IACd,OAAO,IAAI,CAAC,CAACrC,qBAAqB,CAACY,MAAM,GAAG,CAAC;EAC/C;EAEAf,oBAAoBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAAC,CAACE,iBAAiB,CAC3BM,GAAG,CAAEK,SAAS,IAAKb,oBAAoB,CAACa,SAAS,CAAC,CAAC,CACnD4B,IAAI,CAAC,GAAG,CAAC;EACd;EAEA1C,kBAAkBA,CAAA,EAAG;IACnB,OAAO,IAAI,CAAC,CAACG,iBAAiB,CAC3BM,GAAG,CAAEK,SAAS,IAAKd,kBAAkB,CAACc,SAAS,CAAC,CAAC,CACjD4B,IAAI,CAAC,GAAG,CAAC;EACd;EAEA3C,YAAYA,CAAA,EAAG;IACb,OAAO,IAAI,CAAC,CAACI,iBAAiB,CAC3BM,GAAG,CAAEK,SAAS,IAAKf,YAAY,CAACe,SAAS,CAAC,CAAC,CAC3C4B,IAAI,CAAC,GAAG,CAAC;EACd;EAEAtB,YAAYA,CACVhB,qBAAoE,EACpE;IACA,MAAMuC,mBAAmB,GAAGvC,qBAAqB,CAACK,GAAG,CAAEK,SAAS,IAC9DA,SAAS,YAAYrB,cAAc,IAAIqB,SAAS,CAAC8B,UAAU,CAAC5B,MAAM,GAAG,CAAC,GAClE,IAAIvB,cAAc,CAChB,IAAI,CAACuC,MAAM,CACTlB,SAAS,CAAC8B,UAAU,EACpB,IAAI,CAACC,cAAc,CAAC/B,SAAS,CAAC8B,UAAU,CAC1C,CACF,CAAC,GACD9B,SACN,CAAC;IAED,OAAO,IAAI,CAACkB,MAAM,CAChBW,mBAAmB,EACnB,IAAI,CAACE,cAAc,CAACF,mBAAmB,CACzC,CAAC;EACH;EAEAX,MAAMA,CACJY,UAAyD,EACzDb,SAA8B,EAC9B;IACA,OAAOa,UAAU,CAACE,MAAM,CACtB,CAACC,MAAM,EAAEjC,SAAS,EAAEQ,KAAK,EAAEsB,UAAU,KAAK;MACxC,MAAMI,QAAQ,GAAGjB,SAAS,CAACkB,IAAI,CAAED,QAAQ,IAAKA,QAAQ,CAACE,QAAQ,CAAC5B,KAAK,CAAC,CAAC;MAEvE,IAAI0B,QAAQ,EAAE;QACZ,IAAIA,QAAQ,CAACG,UAAU,CAAC7B,KAAK,CAAC,EAAE;UAC9B,MAAM8B,eAAe,GAAGJ,QAAQ,CAACK,OAAO,CAACT,UAAU,CAAC;UACpDG,MAAM,CAAC5B,IAAI,CAAC,IAAI1B,cAAc,CAAC2D,eAAe,CAAC,CAAC;QAClD;MACF,CAAC,MAAM;QACLL,MAAM,CAAC5B,IAAI,CAACL,SAAS,CAAC;MACxB;MAEA,OAAOiC,MAAM;IACf,CAAC,EACD,EACF,CAAC;EACH;EAEAb,QAAQA,CACNU,UAAyD,EACzDU,UAAkB,EAClB;IACA,IAAIV,UAAU,CAACU,UAAU,CAAC,CAACC,OAAO,CAAC,CAAC,EAAE;MACpC,MAAMC,IAAI,GAAG,CAAC,GAAGZ,UAAU,CAAC;MAC5BY,IAAI,CAACjC,MAAM,CACT+B,UAAU,EACV,CAAC,EACD,GAAGV,UAAU,CAACU,UAAU,CAAC,CAACG,oBAAoB,CAAC,CACjD,CAAC;MACD,OAAOD,IAAI;IACb;IACA,OAAOZ,UAAU;EACnB;EAEAC,cAAcA,CAACD,UAAyD,EAAE;IACxE,MAAMc,WAAqB,GAAG,EAAE;IAEhCd,UAAU,CAACe,OAAO,CAAC,CAAC7C,SAAS,EAAEQ,KAAK,KAAK;MACvC,IAAIR,SAAS,CAACG,cAAc,CAAC,CAAC,KAAKrB,WAAW,CAACgE,EAAE,EAAE;QACjDF,WAAW,CAACvC,IAAI,CAACG,KAAK,CAAC;MACzB;IACF,CAAC,CAAC;IAEF,MAAMuC,KAAK,GAAGH,WAAW,CAAC1C,MAAM,GAAG,CAAC;IACpC,MAAM8C,MAAM,GAAG,CAAC,CAAClB,UAAU,CAACK,IAAI,CAC7BnC,SAAS,IAAKA,SAAS,CAACG,cAAc,CAAC,CAAC,KAAKrB,WAAW,CAACmE,GAC5D,CAAC;IAED,IAAID,MAAM,IAAID,KAAK,EAAE;MACnB,IAAIG,KAAK,GAAG,CAAC;MACb,MAAMjC,SAA8B,GAAG,EAAE;MACzC2B,WAAW,CAACC,OAAO,CAAC,CAACM,QAAQ,EAAE3C,KAAK,KAAK;QACvC,IAAI0C,KAAK,GAAGC,QAAQ,GAAG,CAAC,EAAE;UACxBlC,SAAS,CAACZ,IAAI,CAAC,IAAI3B,iBAAiB,CAACwE,KAAK,EAAEC,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC5D;QACA,MAAMC,eAAe,GAAGR,WAAW,CAAC1C,MAAM,KAAKM,KAAK,GAAG,CAAC;QACxD,MAAM6C,sBAAsB,GAAGvB,UAAU,CAAC5B,MAAM,GAAG,CAAC,GAAGiD,QAAQ;QAC/D,IAAIC,eAAe,IAAIC,sBAAsB,EAAE;UAC7CpC,SAAS,CAACZ,IAAI,CAAC,IAAI3B,iBAAiB,CAACyE,QAAQ,EAAErB,UAAU,CAAC5B,MAAM,GAAG,CAAC,CAAC,CAAC;QACxE;QACAgD,KAAK,GAAGC,QAAQ;MAClB,CAAC,CAAC;MACF,OAAOlC,SAAS;IAClB;IAEA,OAAO,EAAE;EACX;EAEAqC,MAAMA,CAAA,EAAG;IACP,MAAMxD,IAAI,GAAG,IAAI,CAAC,CAACP,aAAa;IAChC,MAAMuC,UAAU,GAAG,IAAI,CAAC,CAACxC,qBAAqB;IAC9C,OAAO;MACLQ,IAAI,EAAEA,IAAI,IAAI,EAAE;MAChBgC,UAAU,EAAEA,UAAU,CAACnC,GAAG,CAAEC,EAAE,IAAKA,EAAE,CAAC0D,MAAM,CAAC,CAAC;IAChD,CAAC;EACH;;EAEA;EACA,OAAOC,IAAIA,CAACC,GAA0C,EAAE;IACtD,IAAIA,GAAG,YAAYpE,eAAe,EAAE;MAClC,OAAOoE,GAAG;IACZ;IACA,MAAM9D,QAAQ,GAAG,IAAIN,eAAe,CAAC,CAAC;IACtCM,QAAQ,CAAC,CAACH,aAAa,GAAGiE,GAAG,CAAC1D,IAAI;IAClCJ,QAAQ,CAAC,CAACJ,qBAAqB,GAAGkE,GAAG,CAAC1B,UAAU,CAACnC,GAAG,CAAC8D,aAAa,CAAC;IACnE/D,QAAQ,CAAC,CAACL,iBAAiB,GAAGK,QAAQ,CAACY,YAAY,CACjDZ,QAAQ,CAAC,CAACJ,qBACZ,CAAC;IACD,OAAOI,QAAQ;EACjB;AACF;AAEA,OAAO,SAAS+D,aAAaA,CAC3B7D,EAAyD,EACd;EAC3C,IAAIb,iBAAiB,CAACa,EAAE,CAAC,EAAE;IACzB,OAAO,IAAIjB,cAAc,CAACiB,EAAE,CAACkC,UAAU,CAACnC,GAAG,CAAC8D,aAAa,CAAC,CAAC;EAC7D;EAEA,IAAIzE,gBAAgB,CAACY,EAAE,CAAC,EAAE;IACxB,OAAOhB,YAAY,CAAC2E,IAAI,CAAC3D,EAAE,CAAC;EAC9B;EAEA,OAAOf,SAAS,CAAC0E,IAAI,CAAC3D,EAAE,CAAC;AAC3B","ignoreList":[]}

package/dist/module/conditions/helpers.js

@@ -1,6 +1,9 @@
 export function toPresentationString(condition) {
   return `${condition.coordinatorString()}${condition.conditionString()}`;
 }
+export function toPresentationHtml(condition) {
+  return `${condition.coordinatorHtml()}${condition.conditionString()}`;
+}
 export function toExpression(condition) {
   return `${condition.coordinatorString()}${condition.conditionExpression()}`;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","names":["toPresentationString","condition","coordinatorString","conditionString","toExpression","conditionExpression","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","value","conditions","some","isDuplicateCondition","conditionName","name"],"sources":["../../../src/conditions/helpers.ts"],"sourcesContent":["import { type ConditionGroup } from '~/src/conditions/condition-group.js'\nimport { type ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { type Condition } from '~/src/conditions/condition.js'\nimport {\n  type ConditionData,\n  type ConditionGroupData,\n  type ConditionRefData\n} from '~/src/conditions/types.js'\nimport { type ConditionWrapper } from '~/src/form/form-definition/types.js'\n\nexport function toPresentationString(\n  condition: Condition | ConditionRef | ConditionGroup\n) {\n  return `${condition.coordinatorString()}${condition.conditionString()}`\n}\n\nexport function toExpression(\n  condition: Condition | ConditionRef | ConditionGroup\n) {\n  return `${condition.coordinatorString()}${condition.conditionExpression()}`\n}\n\nexport const hasConditionField = (\n  condition?: ConditionGroupData | ConditionData | ConditionRefData\n): condition is ConditionData => {\n  return !!condition && 'field' in condition\n}\n\nexport const hasConditionGroup = (\n  condition?: ConditionGroupData | ConditionData | ConditionRefData\n): condition is ConditionGroupData => {\n  return !!condition && 'conditions' in condition\n}\n\nexport const hasConditionName = (\n  condition?: ConditionGroupData | ConditionData | ConditionRefData\n): condition is ConditionRefData => {\n  return !!condition && 'conditionName' in condition\n}\n\nexport const hasNestedCondition = (condition?: ConditionWrapper) => {\n  return !!condition?.value.conditions.some(hasConditionName)\n}\n\nexport const isDuplicateCondition = (\n  conditions: ConditionWrapper[],\n  conditionName: string\n) => {\n  return conditions.some((condition) => condition.name === conditionName)\n}\n"],"mappings":"AAUA,OAAO,SAASA,oBAAoBA,CAClCC,SAAoD,EACpD;EACA,OAAO,GAAGA,SAAS,CAACC,iBAAiB,CAAC,CAAC,GAAGD,SAAS,CAACE,eAAe,CAAC,CAAC,EAAE;AACzE;AAEA,OAAO,SAASC,YAAYA,CAC1BH,SAAoD,EACpD;EACA,OAAO,GAAGA,SAAS,CAACC,iBAAiB,CAAC,CAAC,GAAGD,SAAS,CAACI,mBAAmB,CAAC,CAAC,EAAE;AAC7E;AAEA,OAAO,MAAMC,iBAAiB,GAC5BL,SAAiE,IAClC;EAC/B,OAAO,CAAC,CAACA,SAAS,IAAI,OAAO,IAAIA,SAAS;AAC5C,CAAC;AAED,OAAO,MAAMM,iBAAiB,GAC5BN,SAAiE,IAC7B;EACpC,OAAO,CAAC,CAACA,SAAS,IAAI,YAAY,IAAIA,SAAS;AACjD,CAAC;AAED,OAAO,MAAMO,gBAAgB,GAC3BP,SAAiE,IAC/B;EAClC,OAAO,CAAC,CAACA,SAAS,IAAI,eAAe,IAAIA,SAAS;AACpD,CAAC;AAED,OAAO,MAAMQ,kBAAkB,GAAIR,SAA4B,IAAK;EAClE,OAAO,CAAC,CAACA,SAAS,EAAES,KAAK,CAACC,UAAU,CAACC,IAAI,CAACJ,gBAAgB,CAAC;AAC7D,CAAC;AAED,OAAO,MAAMK,oBAAoB,GAAGA,CAClCF,UAA8B,EAC9BG,aAAqB,KAClB;EACH,OAAOH,UAAU,CAACC,IAAI,CAAEX,SAAS,IAAKA,SAAS,CAACc,IAAI,KAAKD,aAAa,CAAC;AACzE,CAAC","ignoreList":[]}
+{"version":3,"file":"helpers.js","names":["toPresentationString","condition","coordinatorString","conditionString","toPresentationHtml","coordinatorHtml","toExpression","conditionExpression","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","value","conditions","some","isDuplicateCondition","conditionName","name"],"sources":["../../../src/conditions/helpers.ts"],"sourcesContent":["import { type ConditionGroup } from '~/src/conditions/condition-group.js'\nimport { type ConditionRef } from '~/src/conditions/condition-ref.js'\nimport { type Condition } from '~/src/conditions/condition.js'\nimport {\n  type ConditionData,\n  type ConditionGroupData,\n  type ConditionRefData\n} from '~/src/conditions/types.js'\nimport { type ConditionWrapper } from '~/src/form/form-definition/types.js'\n\ntype ConditionType = Condition | ConditionRef | ConditionGroup\ntype ConditionDataType = ConditionGroupData | ConditionData | ConditionRefData\n\nexport function toPresentationString(condition: ConditionType) {\n  return `${condition.coordinatorString()}${condition.conditionString()}`\n}\n\nexport function toPresentationHtml(condition: ConditionType) {\n  return `${condition.coordinatorHtml()}${condition.conditionString()}`\n}\n\nexport function toExpression(condition: ConditionType) {\n  return `${condition.coordinatorString()}${condition.conditionExpression()}`\n}\n\nexport const hasConditionField = (\n  condition?: ConditionDataType\n): condition is ConditionData => {\n  return !!condition && 'field' in condition\n}\n\nexport const hasConditionGroup = (\n  condition?: ConditionDataType\n): condition is ConditionGroupData => {\n  return !!condition && 'conditions' in condition\n}\n\nexport const hasConditionName = (\n  condition?: ConditionDataType\n): condition is ConditionRefData => {\n  return !!condition && 'conditionName' in condition\n}\n\nexport const hasNestedCondition = (condition?: ConditionWrapper) => {\n  return !!condition?.value.conditions.some(hasConditionName)\n}\n\nexport const isDuplicateCondition = (\n  conditions: ConditionWrapper[],\n  conditionName: string\n) => {\n  return conditions.some((condition) => condition.name === conditionName)\n}\n"],"mappings":"AAaA,OAAO,SAASA,oBAAoBA,CAACC,SAAwB,EAAE;EAC7D,OAAO,GAAGA,SAAS,CAACC,iBAAiB,CAAC,CAAC,GAAGD,SAAS,CAACE,eAAe,CAAC,CAAC,EAAE;AACzE;AAEA,OAAO,SAASC,kBAAkBA,CAACH,SAAwB,EAAE;EAC3D,OAAO,GAAGA,SAAS,CAACI,eAAe,CAAC,CAAC,GAAGJ,SAAS,CAACE,eAAe,CAAC,CAAC,EAAE;AACvE;AAEA,OAAO,SAASG,YAAYA,CAACL,SAAwB,EAAE;EACrD,OAAO,GAAGA,SAAS,CAACC,iBAAiB,CAAC,CAAC,GAAGD,SAAS,CAACM,mBAAmB,CAAC,CAAC,EAAE;AAC7E;AAEA,OAAO,MAAMC,iBAAiB,GAC5BP,SAA6B,IACE;EAC/B,OAAO,CAAC,CAACA,SAAS,IAAI,OAAO,IAAIA,SAAS;AAC5C,CAAC;AAED,OAAO,MAAMQ,iBAAiB,GAC5BR,SAA6B,IACO;EACpC,OAAO,CAAC,CAACA,SAAS,IAAI,YAAY,IAAIA,SAAS;AACjD,CAAC;AAED,OAAO,MAAMS,gBAAgB,GAC3BT,SAA6B,IACK;EAClC,OAAO,CAAC,CAACA,SAAS,IAAI,eAAe,IAAIA,SAAS;AACpD,CAAC;AAED,OAAO,MAAMU,kBAAkB,GAAIV,SAA4B,IAAK;EAClE,OAAO,CAAC,CAACA,SAAS,EAAEW,KAAK,CAACC,UAAU,CAACC,IAAI,CAACJ,gBAAgB,CAAC;AAC7D,CAAC;AAED,OAAO,MAAMK,oBAAoB,GAAGA,CAClCF,UAA8B,EAC9BG,aAAqB,KAClB;EACH,OAAOH,UAAU,CAACC,IAAI,CAAEb,SAAS,IAAKA,SAAS,CAACgB,IAAI,KAAKD,aAAa,CAAC;AACzE,CAAC","ignoreList":[]}

package/dist/module/conditions/index.js

@@ -7,5 +7,6 @@ export { ConditionGroup } from "./condition-group.js";
 export { ConditionsModel } from "./condition-model.js";
 export { ConditionGroupDef } from "./condition-group-def.js";
 export { hasConditionField, hasConditionGroup, hasConditionName, hasNestedCondition, isDuplicateCondition, toExpression, toPresentationString } from "./helpers.js";
+export { convertConditionWrapperFromV2, 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","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","isDuplicateCondition","toExpression","toPresentationString","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  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,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,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":[]}
+{"version":3,"file":"index.js","names":["absoluteDateOperatorNames","getExpression","getOperatorNames","relativeDateOperatorNames","ConditionValue","RelativeDateValue","conditionValueFrom","ConditionField","Condition","ConditionRef","ConditionGroup","ConditionsModel","ConditionGroupDef","hasConditionField","hasConditionGroup","hasConditionName","hasNestedCondition","isDuplicateCondition","toExpression","toPresentationString","convertConditionWrapperFromV2","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  hasConditionField,\n  hasConditionGroup,\n  hasConditionName,\n  hasNestedCondition,\n  isDuplicateCondition,\n  toExpression,\n  toPresentationString\n} from '~/src/conditions/helpers.js'\n\nexport {\n  convertConditionWrapperFromV2,\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,iBAAiB,EACjBC,iBAAiB,EACjBC,gBAAgB,EAChBC,kBAAkB,EAClBC,oBAAoB,EACpBC,YAAY,EACZC,oBAAoB;AAGtB,SACEC,6BAA6B,EAC7BC,kBAAkB,EAClBC,oBAAoB;AAItB,SACEC,aAAa,EACbC,WAAW,EACXC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,YAAY","ignoreList":[]}

package/dist/module/conditions/migration.js

@@ -28,7 +28,7 @@ function createConditionValueDataFromStringValueDataV2(value) {
   return {
     type: ConditionType.Value,
     value: value.value,
-    display: `Condition value: ${value.value}`
+    display: value.value
   };
 }
 function isConditionDataV2(condition) {
@@ -59,16 +59,22 @@ function convertConditionDataV2(model, condition, coordinator) {
   };
 }
 function convertConditionRefDataFromV2(model, condition, coordinator) {
-  const component = model.getComponentById(condition.conditionId);
-  if (!component) {
+  const refCondition = model.getConditionById(condition.conditionId);
+  if (!refCondition) {
     throw Error('Component not found');
   }
   return {
-    conditionName: component.name,
-    conditionDisplayName: component.title,
+    conditionName: refCondition.name,
+    conditionDisplayName: refCondition.displayName,
     coordinator
   };
 }
+export function isConditionWrapperV2(wrapper) {
+  return Array.isArray(wrapper.conditions);
+}
+export function isConditionWrapper(wrapper) {
+  return !isConditionWrapperV2(wrapper);
+}
 export function convertConditionWrapperFromV2(conditionWrapper, model) {
   let coordinator;
   if (conditionWrapper.conditions.length > 1 && !conditionWrapper.coordinator) {
@@ -81,12 +87,12 @@ export function convertConditionWrapperFromV2(conditionWrapper, model) {
     displayName: conditionWrapper.displayName,
     value: {
       name: conditionWrapper.name,
-      conditions: conditionWrapper.conditions.map(condition => {
+      conditions: conditionWrapper.conditions.map((condition, index) => {
         let newCondition;
         if (isConditionDataV2(condition)) {
           newCondition = convertConditionDataV2(model, condition, coordinator);
         } else {
-          newCondition = convertConditionRefDataFromV2(model, condition, coordinator);
+          newCondition = convertConditionRefDataFromV2(model, condition, index > 0 ? coordinator : undefined);
         }
         return newCondition;
       })

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","conditionId","conditionName","conditionDisplayName","convertConditionWrapperFromV2","conditionWrapper","conditions","length","newConditionWrapper","displayName","map","newCondition"],"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: `Condition value: ${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 component = model.getComponentById(condition.conditionId)\n\n  if (!component) {\n    throw Error('Component not found')\n  }\n\n  return {\n    conditionName: component.name,\n    conditionDisplayName: component.title,\n    coordinator\n  }\n}\n\nexport function convertConditionWrapperFromV2(\n  conditionWrapper: ConditionWrapperV2,\n  model: RuntimeFormModel\n): ConditionWrapper {\n  let coordinator\n\n  if (conditionWrapper.conditions.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.name,\n    displayName: conditionWrapper.displayName,\n    value: {\n      name: conditionWrapper.name,\n      conditions: conditionWrapper.conditions.map((condition) => {\n        let newCondition: ConditionData | ConditionRefData\n\n        if (isConditionDataV2(condition)) {\n          newCondition = convertConditionDataV2(model, condition, coordinator)\n        } else {\n          newCondition = convertConditionRefDataFromV2(\n            model,\n            condition,\n            coordinator\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}\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,EAAE,oBAAoBlB,KAAK,CAACA,KAAK;EAC1C,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,MAAMC,SAAS,GAAGrB,KAAK,CAACsB,gBAAgB,CAACJ,SAAS,CAACY,WAAW,CAAC;EAE/D,IAAI,CAACT,SAAS,EAAE;IACd,MAAMhB,KAAK,CAAC,qBAAqB,CAAC;EACpC;EAEA,OAAO;IACL0B,aAAa,EAAEV,SAAS,CAACK,IAAI;IAC7BM,oBAAoB,EAAEX,SAAS,CAACM,KAAK;IACrCP;EACF,CAAC;AACH;AAEA,OAAO,SAASa,6BAA6BA,CAC3CC,gBAAoC,EACpClC,KAAuB,EACL;EAClB,IAAIoB,WAAW;EAEf,IAAIc,gBAAgB,CAACC,UAAU,CAACC,MAAM,GAAG,CAAC,IAAI,CAACF,gBAAgB,CAACd,WAAW,EAAE;IAC3E,MAAM,IAAIf,KAAK,CAAC,iDAAiD,CAAC;EACpE,CAAC,MAAM;IACLe,WAAW,GAAGc,gBAAgB,CAACd,WAAW;EAC5C;EAEA,MAAMiB,mBAAqC,GAAG;IAC5CX,IAAI,EAAEQ,gBAAgB,CAACR,IAAI;IAC3BY,WAAW,EAAEJ,gBAAgB,CAACI,WAAW;IACzC5C,KAAK,EAAE;MACLgC,IAAI,EAAEQ,gBAAgB,CAACR,IAAI;MAC3BS,UAAU,EAAED,gBAAgB,CAACC,UAAU,CAACI,GAAG,CAAErB,SAAS,IAAK;QACzD,IAAIsB,YAA8C;QAElD,IAAIvB,iBAAiB,CAACC,SAAS,CAAC,EAAE;UAChCsB,YAAY,GAAGrB,sBAAsB,CAACnB,KAAK,EAAEkB,SAAS,EAAEE,WAAW,CAAC;QACtE,CAAC,MAAM;UACLoB,YAAY,GAAGX,6BAA6B,CAC1C7B,KAAK,EACLkB,SAAS,EACTE,WACF,CAAC;QACH;QAEA,OAAOoB,YAAY;MACrB,CAAC;IACH;EACF,CAAC;EAED,OAAOH,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","conditionDisplayName","displayName","isConditionWrapperV2","wrapper","Array","isArray","conditions","isConditionWrapper","convertConditionWrapperFromV2","conditionWrapper","length","newConditionWrapper","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.name,\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).conditions)\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.conditions.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.name,\n    displayName: conditionWrapper.displayName,\n    value: {\n      name: conditionWrapper.name,\n      conditions: conditionWrapper.conditions.map((condition, index) => {\n        let newCondition: ConditionData | ConditionRefData\n\n        if (isConditionDataV2(condition)) {\n          newCondition = convertConditionDataV2(model, condition, coordinator)\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/types/conditions/condition-abstract.d.ts

@@ -3,6 +3,7 @@ export declare class ConditionAbstract {
     coordinator?: Coordinator;
     constructor(coordinator?: Coordinator);
     coordinatorString(): string;
+    coordinatorHtml(): string;
     getCoordinator(): Coordinator | undefined;
     setCoordinator(coordinator?: Coordinator): void;
     isGroup(): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"condition-abstract.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,qBAAa,iBAAiB;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;gBAEb,WAAW,CAAC,EAAE,WAAW;IAQrC,iBAAiB,IAAI,MAAM;IAI3B,cAAc,IAAI,WAAW,GAAG,SAAS;IAIzC,cAAc,CAAC,WAAW,CAAC,EAAE,WAAW;IAIxC,OAAO;IAIP,oBAAoB;IAIpB,iBAAiB;IAIjB,gBAAgB;IAMhB,KAAK;IAIL,eAAe;IAMf,mBAAmB;CAKpB"}
+{"version":3,"file":"condition-abstract.d.ts","sourceRoot":"","sources":["../../../src/conditions/condition-abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,qBAAa,iBAAiB;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAA;gBAEb,WAAW,CAAC,EAAE,WAAW;IAQrC,iBAAiB,IAAI,MAAM;IAI3B,eAAe,IAAI,MAAM;IAMzB,cAAc,IAAI,WAAW,GAAG,SAAS;IAIzC,cAAc,CAAC,WAAW,CAAC,EAAE,WAAW;IAIxC,OAAO;IAIP,oBAAoB;IAIpB,iBAAiB;IAIjB,gBAAgB;IAMhB,KAAK;IAIL,eAAe;IAMf,mBAAmB;CAKpB"}

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

@@ -6,6 +6,7 @@ export declare class ConditionGroup {
     conditions: (Condition | ConditionRef | ConditionGroup)[];
     constructor(conditions?: (Condition | ConditionRef | ConditionGroup)[]);
     coordinatorString(): string;
+    coordinatorHtml(): string;
     conditionString(): string;
     conditionExpression(): string;
     asFirstCondition(): this;

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":"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"}
+{"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;IAIzB,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

@@ -21,6 +21,7 @@ export declare class ConditionsModel {
     get hasConditions(): boolean;
     get lastIndex(): number;
     toPresentationString(): string;
+    toPresentationHtml(): string;
     toExpression(): string;
     _applyGroups(userGroupedConditions: (Condition | ConditionRef | ConditionGroup)[]): (Condition | ConditionRef | ConditionGroup)[];
     _group(conditions: (Condition | ConditionRef | ConditionGroup)[], groupDefs: ConditionGroupDef[]): (Condition | ConditionRef | ConditionGroup)[];

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":"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"}
+{"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;AASzD,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,kBAAkB;IAMlB,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/helpers.d.ts

@@ -3,11 +3,15 @@ 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;
+type ConditionType = Condition | ConditionRef | ConditionGroup;
+type ConditionDataType = ConditionGroupData | ConditionData | ConditionRefData;
+export declare function toPresentationString(condition: ConditionType): string;
+export declare function toPresentationHtml(condition: ConditionType): string;
+export declare function toExpression(condition: ConditionType): string;
+export declare const hasConditionField: (condition?: ConditionDataType) => condition is ConditionData;
+export declare const hasConditionGroup: (condition?: ConditionDataType) => condition is ConditionGroupData;
+export declare const hasConditionName: (condition?: ConditionDataType) => condition is ConditionRefData;
 export declare const hasNestedCondition: (condition?: ConditionWrapper) => boolean;
 export declare const isDuplicateCondition: (conditions: ConditionWrapper[], conditionName: string) => boolean;
+export {};
 //# 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;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,GAC5B,YAAY,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,aAEf,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,YAAY,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,kBAEf,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,YAAY,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,KAChE,SAAS,IAAI,gBAEf,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,YAAY,gBAAgB,YAE9D,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC/B,YAAY,gBAAgB,EAAE,EAC9B,eAAe,MAAM,YAGtB,CAAA"}
+{"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,KAAK,aAAa,GAAG,SAAS,GAAG,YAAY,GAAG,cAAc,CAAA;AAC9D,KAAK,iBAAiB,GAAG,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,CAAA;AAE9E,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,aAAa,UAE5D;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,aAAa,UAE1D;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,aAAa,UAEpD;AAED,eAAO,MAAM,iBAAiB,GAC5B,YAAY,iBAAiB,KAC5B,SAAS,IAAI,aAEf,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,YAAY,iBAAiB,KAC5B,SAAS,IAAI,kBAEf,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,YAAY,iBAAiB,KAC5B,SAAS,IAAI,gBAEf,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,YAAY,gBAAgB,YAE9D,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC/B,YAAY,gBAAgB,EAAE,EAC9B,eAAe,MAAM,YAGtB,CAAA"}

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

@@ -7,5 +7,6 @@ export { ConditionGroup } from '../conditions/condition-group.js';
 export { ConditionsModel } from '../conditions/condition-model.js';
 export { ConditionGroupDef } from '../conditions/condition-group-def.js';
 export { hasConditionField, hasConditionGroup, hasConditionName, hasNestedCondition, isDuplicateCondition, toExpression, toPresentationString } from '../conditions/helpers.js';
+export { convertConditionWrapperFromV2, isConditionWrapper, isConditionWrapperV2, type RuntimeFormModel } from '../conditions/migration.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,yBAAyB,EACzB,aAAa,EACb,gBAAgB,EAChB,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/conditions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,aAAa,EACb,gBAAgB,EAChB,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,6BAA6B,EAC7B,kBAAkB,EAClB,oBAAoB,EACpB,KAAK,gBAAgB,EACtB,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EACL,aAAa,EACb,WAAW,EACX,cAAc,EACd,SAAS,EACT,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAA"}

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

@@ -1,8 +1,11 @@
 import { type ComponentDef } from '../components/types.js';
 import { type ConditionWrapper, type ConditionWrapperV2, type List } from '../form/form-definition/types.js';
+export declare function isConditionWrapperV2(wrapper: ConditionWrapper | ConditionWrapperV2): wrapper is ConditionWrapperV2;
+export declare function isConditionWrapper(wrapper: ConditionWrapper | ConditionWrapperV2): wrapper is ConditionWrapper;
 export declare function convertConditionWrapperFromV2(conditionWrapper: ConditionWrapperV2, model: RuntimeFormModel): ConditionWrapper;
 export interface RuntimeFormModel {
     getListById: (listId: string) => List | undefined;
     getComponentById: (componentId: string) => ComponentDef | undefined;
+    getConditionById: (conditionId: string) => ConditionWrapperV2 | undefined;
 }
 //# sourceMappingURL=migration.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../src/conditions/migration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,2BAA2B,CAAA;AAYlC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,IAAI,EACV,MAAM,qCAAqC,CAAA;AAmH5C,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,kBAAkB,EACpC,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,CAiClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAA;IACjD,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAA;CACpE"}
+{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../src/conditions/migration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,2BAA2B,CAAA;AAYlC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,IAAI,EACV,MAAM,qCAAqC,CAAA;AAmH5C,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB,GAC7C,OAAO,IAAI,kBAAkB,CAE/B;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB,GAC7C,OAAO,IAAI,gBAAgB,CAE7B;AAED,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,kBAAkB,EACpC,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,CAiClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAA;IACjD,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,YAAY,GAAG,SAAS,CAAA;IACnE,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAA;CAC1E"}

package/package.json

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

package/src/conditions/condition-abstract.ts

@@ -15,6 +15,12 @@ export class ConditionAbstract {
     return this.coordinator ? `${this.coordinator} ` : ''
   }
 
+  coordinatorHtml(): string {
+    return this.coordinator
+      ? `<span class="govuk-!-font-weight-bold">${this.coordinator.toUpperCase()}</span> `
+      : ''
+  }
+
   getCoordinator(): Coordinator | undefined {
     return this.coordinator
   }

package/src/conditions/condition-group.ts

@@ -20,6 +20,10 @@ export class ConditionGroup {
     return this.conditions[0].coordinatorString()
   }
 
+  coordinatorHtml(): string {
+    return this.conditions[0].coordinatorHtml()
+  }
+
   conditionString(): string {
     const copy = [...this.conditions]
     copy.splice(0, 1)

package/src/conditions/condition-model.ts

@@ -7,6 +7,7 @@ import {
   hasConditionGroup,
   hasConditionName,
   toExpression,
+  toPresentationHtml,
   toPresentationString
 } from '~/src/conditions/helpers.js'
 import {
@@ -166,6 +167,12 @@ export class ConditionsModel {
       .join(' ')
   }
 
+  toPresentationHtml() {
+    return this.#groupedConditions
+      .map((condition) => toPresentationHtml(condition))
+      .join(' ')
+  }
+
   toExpression() {
     return this.#groupedConditions
       .map((condition) => toExpression(condition))

package/src/conditions/helpers.ts

@@ -8,32 +8,35 @@ import {
 } from '~/src/conditions/types.js'
 import { type ConditionWrapper } from '~/src/form/form-definition/types.js'
 
-export function toPresentationString(
-  condition: Condition | ConditionRef | ConditionGroup
-) {
+type ConditionType = Condition | ConditionRef | ConditionGroup
+type ConditionDataType = ConditionGroupData | ConditionData | ConditionRefData
+
+export function toPresentationString(condition: ConditionType) {
   return `${condition.coordinatorString()}${condition.conditionString()}`
 }
 
-export function toExpression(
-  condition: Condition | ConditionRef | ConditionGroup
-) {
+export function toPresentationHtml(condition: ConditionType) {
+  return `${condition.coordinatorHtml()}${condition.conditionString()}`
+}
+
+export function toExpression(condition: ConditionType) {
   return `${condition.coordinatorString()}${condition.conditionExpression()}`
 }
 
 export const hasConditionField = (
-  condition?: ConditionGroupData | ConditionData | ConditionRefData
+  condition?: ConditionDataType
 ): condition is ConditionData => {
   return !!condition && 'field' in condition
 }
 
 export const hasConditionGroup = (
-  condition?: ConditionGroupData | ConditionData | ConditionRefData
+  condition?: ConditionDataType
 ): condition is ConditionGroupData => {
   return !!condition && 'conditions' in condition
 }
 
 export const hasConditionName = (
-  condition?: ConditionGroupData | ConditionData | ConditionRefData
+  condition?: ConditionDataType
 ): condition is ConditionRefData => {
   return !!condition && 'conditionName' in condition
 }

package/src/conditions/index.ts

@@ -27,6 +27,13 @@ export {
   toPresentationString
 } from '~/src/conditions/helpers.js'
 
+export {
+  convertConditionWrapperFromV2,
+  isConditionWrapper,
+  isConditionWrapperV2,
+  type RuntimeFormModel
+} from '~/src/conditions/migration.js'
+
 export {
   ConditionType,
   Coordinator,

package/src/conditions/migration.ts

@@ -72,7 +72,7 @@ function createConditionValueDataFromStringValueDataV2(
   return {
     type: ConditionType.Value,
     value: value.value,
-    display: `Condition value: ${value.value}`
+    display: value.value
   }
 }
 
@@ -119,19 +119,31 @@ function convertConditionRefDataFromV2(
   condition: ConditionRefDataV2,
   coordinator: Coordinator | undefined
 ): ConditionRefData {
-  const component = model.getComponentById(condition.conditionId)
+  const refCondition = model.getConditionById(condition.conditionId)
 
-  if (!component) {
+  if (!refCondition) {
     throw Error('Component not found')
   }
 
   return {
-    conditionName: component.name,
-    conditionDisplayName: component.title,
+    conditionName: refCondition.name,
+    conditionDisplayName: refCondition.displayName,
     coordinator
   }
 }
 
+export function isConditionWrapperV2(
+  wrapper: ConditionWrapper | ConditionWrapperV2
+): wrapper is ConditionWrapperV2 {
+  return Array.isArray((wrapper as ConditionWrapperV2).conditions)
+}
+
+export function isConditionWrapper(
+  wrapper: ConditionWrapper | ConditionWrapperV2
+): wrapper is ConditionWrapper {
+  return !isConditionWrapperV2(wrapper)
+}
+
 export function convertConditionWrapperFromV2(
   conditionWrapper: ConditionWrapperV2,
   model: RuntimeFormModel
@@ -149,7 +161,7 @@ export function convertConditionWrapperFromV2(
     displayName: conditionWrapper.displayName,
     value: {
       name: conditionWrapper.name,
-      conditions: conditionWrapper.conditions.map((condition) => {
+      conditions: conditionWrapper.conditions.map((condition, index) => {
         let newCondition: ConditionData | ConditionRefData
 
         if (isConditionDataV2(condition)) {
@@ -158,7 +170,7 @@ export function convertConditionWrapperFromV2(
           newCondition = convertConditionRefDataFromV2(
             model,
             condition,
-            coordinator
+            index > 0 ? coordinator : undefined
           )
         }
 
@@ -173,4 +185,5 @@ export function convertConditionWrapperFromV2(
 export interface RuntimeFormModel {
   getListById: (listId: string) => List | undefined
   getComponentById: (componentId: string) => ComponentDef | undefined
+  getConditionById: (conditionId: string) => ConditionWrapperV2 | undefined
 }