@planning-inspectorate/dynamic-forms 3.15.6 → 3.17.0

package/src/components/utils/question-utils.test.js

@@ -34,8 +34,8 @@ describe('getConditionalAnswer', () => {
 
 	it('returns conditional field value when it exists', () => {
 		const { answers, question } = setup();
-		const expectedResult = 'test';
-		assert.strictEqual(getConditionalAnswer(answers, question, 'yes'), expectedResult);
+		const expectedResult = { yes: 'test' };
+		assert.deepStrictEqual(getConditionalAnswer(answers, question, 'yes'), expectedResult);
 	});
 
 	it('returns null when option chosen does not have conditional value', () => {
@@ -49,4 +49,91 @@ describe('getConditionalAnswer', () => {
 		delete question.options[0].conditional;
 		assert.strictEqual(getConditionalAnswer(answers, question, 'yes'), null);
 	});
+
+	it('returns null when answer is null', () => {
+		const { answers, question } = setup();
+		assert.strictEqual(getConditionalAnswer(answers, question, null), null);
+	});
+
+	it('returns null when answer is empty string', () => {
+		const { answers, question } = setup();
+		assert.strictEqual(getConditionalAnswer(answers, question, ''), null);
+	});
+
+	it('returns null when question has no options', () => {
+		const { answers, question } = setup();
+		delete question.options;
+		assert.strictEqual(getConditionalAnswer(answers, question, 'yes'), null);
+	});
+
+	describe('multi-value answers (checkboxes)', () => {
+		const setupMultiValue = () => {
+			const answers = {
+				field: 'a,b,c',
+				field_detailsA: 'details for A',
+				field_detailsC: 'details for C'
+			};
+			const question = {
+				fieldName: 'field',
+				options: [
+					{
+						value: 'a',
+						conditional: {
+							fieldName: 'detailsA'
+						}
+					},
+					{
+						value: 'b'
+					},
+					{
+						value: 'c',
+						conditional: {
+							fieldName: 'detailsC'
+						}
+					}
+				]
+			};
+			return { answers, question };
+		};
+
+		it('returns object with conditional values for multiple selected options', () => {
+			const { answers, question } = setupMultiValue();
+			const result = getConditionalAnswer(answers, question, 'a,c');
+			assert.deepStrictEqual(result, {
+				a: 'details for A',
+				c: 'details for C'
+			});
+		});
+
+		it('returns object with only options that have conditional values', () => {
+			const { answers, question } = setupMultiValue();
+			const result = getConditionalAnswer(answers, question, 'a,b');
+			assert.deepStrictEqual(result, {
+				a: 'details for A'
+			});
+		});
+
+		it('returns null when no selected options have conditional values', () => {
+			const { answers, question } = setupMultiValue();
+			const result = getConditionalAnswer(answers, question, 'b');
+			assert.strictEqual(result, null);
+		});
+
+		it('returns null when conditional fields have no values', () => {
+			const { answers, question } = setupMultiValue();
+			delete answers.field_detailsA;
+			delete answers.field_detailsC;
+			const result = getConditionalAnswer(answers, question, 'a,c');
+			assert.strictEqual(result, null);
+		});
+
+		it('handles whitespace in comma-separated values', () => {
+			const { answers, question } = setupMultiValue();
+			const result = getConditionalAnswer(answers, question, 'a , c');
+			assert.deepStrictEqual(result, {
+				a: 'details for A',
+				c: 'details for C'
+			});
+		});
+	});
 });

package/{types/src → src}/controller.d.ts

@@ -33,7 +33,7 @@ export function question(req: import("express-serve-static-core").Request<import
 export function buildSave(saveData: SaveDataFn, redirectToTaskListOnSuccess?: boolean): import("express").Handler;
 export type Journey = import("./journey/journey.js").Journey;
 export type Question = import("./questions/question.js").Question;
-export type Section = any;
+export type Section = import("./section.js").Section;
 export type SectionView = {
     heading: string;
     status: string;
@@ -51,14 +51,9 @@ export type RowView = {
         html: string;
     };
     actions?: {
-        items: ActionView[];
+        items: import("#typedefs/question-types.d.ts").ActionView[];
     } | undefined;
 };
-export type ActionView = {
-    href: string;
-    text: string;
-    visuallyHiddenText?: string | undefined;
-};
 export type SaveParams = {
     req: import("express").Request;
     res: import("express").Response;

package/src/controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["controller.js"],"names":[],"mappings":"AA+DA;;;GAGG;AACH,qCAHW,MAAM,GACJ,OAAO,SAAS,EAAE,OAAO,CAIrC;AAED;;;;;GAKG;AACH,0BALW,OAAO,SAAS,EAAE,OAAO,OACzB,OAAO,SAAS,EAAE,QAAQ,eAC1B,MAAM,YACN,MAAM,iBA8DhB;;AAmDD;;;;;;;;;;GAUG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,oCAJW,UAAU,gCACV,OAAO,GACL,OAAO,SAAS,EAAE,OAAO,CAsFrC;sBA7RY,OAAO,sBAAsB,EAAE,OAAO;uBACtC,OAAO,yBAAyB,EAAE,QAAQ;sBAC1C,OAAO,cAAc,EAAE,OAAO;;aAK7B,MAAM;YACN,MAAM;UAEjB;QAAiC,IAAI,EAA1B,KAAK,CAAE,OAAO,CAAC;KAC5B;;;SAIa;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;WAChB;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;eAC1B,OAAO,+BAA+B,EAAE,UAAU,EAAE;;;;SAqK7D,OAAO,SAAS,EAAE,OAAO;SACzB,OAAO,SAAS,EAAE,QAAQ;eAC1B,MAAM;iBACN,MAAM;sBACN,OAAO;;;;;;;yBAOR,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC"}

package/src/controller.js

@@ -8,7 +8,7 @@ import { toArray } from '#src/lib/utils.js';
 /**
  * @typedef {import('./journey/journey.js').Journey} Journey
  * @typedef {import('./questions/question.js').Question} Question
- * @typedef {import('./section').Section} Section
+ * @typedef {import('./section.js').Section} Section
  */
 
 /**
@@ -23,14 +23,7 @@ import { toArray } from '#src/lib/utils.js';
  * @typedef {Object} RowView
  * @property {{ text: string }} key
  * @property {{ text: string } | { html: string }} value
- * @property {{ items: ActionView[] }} [actions]
- */
-
-/**
- * @typedef {Object} ActionView
- * @property {string} href
- * @property {string} text
- * @property {string} [visuallyHiddenText]
+ * @property {{ items: import('#typedefs/question-types.d.ts').ActionView[] }} [actions]
  */
 
 /**
@@ -53,7 +46,7 @@ function buildSectionViewModel(name, status = '') {
  * build a view model for a row in the journey overview
  * @param {string} key
  * @param {string} value
- * @param {ActionView|ActionView[]} [action]
+ * @param {import('#typedefs/question-types.d.ts').ActionView|import('#typedefs/question-types.d.ts').ActionView[]} [action]
  * @returns {RowView} a representation of a row
  */
 function buildSectionRowViewModel(key, value, action) {

package/{types/src → src}/index.d.ts

@@ -1,3 +1,7 @@
+export * from "../typedefs/journey-types.js";
+export * from "../typedefs/question-props.js";
+export * from "../typedefs/question-types.js";
+export * from "../typedefs/section-types.js";
 export * from "./components/address/question.js";
 export * from "./components/boolean/question.js";
 export * from "./components/checkbox/question.js";
@@ -19,7 +23,6 @@ export * from "./components/utils/question-has-answer.js";
 export * from "./components/utils/question-utils.js";
 export * from "./components/utils/component-types.js";
 export * from "./controller.js";
-export * from "./journey/journey-types.js";
 export * from "./lib/address.js";
 export * from "./lib/address-utils.js";
 export * from "./lib/date-utils.js";
@@ -28,8 +31,6 @@ export * from "./lib/utils.js";
 export * from "./middleware/build-get-journey.js";
 export * from "./middleware/redirect-to-unanswered-question.js";
 export * from "./questions/options-question.js";
-export * from "./questions/question-props.js";
-export * from "./questions/question-types.js";
 export * from "./validator/address-validator.js";
 export * from "./validator/base-validator.js";
 export * from "./validator/conditional-required-validator.js";

package/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":""}

package/src/index.js

@@ -1,3 +1,9 @@
+// Type declaration files
+export * from '../typedefs/journey-types.js';
+export * from '../typedefs/question-props.js';
+export * from '../typedefs/question-types.js';
+export * from '../typedefs/section-types.js';
+
 // Components
 export * from './components/address/question.js';
 export * from './components/boolean/question.js';
@@ -29,7 +35,6 @@ export * from './controller.js';
 // Journey
 export { Journey } from './journey/journey.js';
 export { JourneyResponse } from './journey/journey-response.js';
-export * from './journey/journey-types.js';
 
 // lib
 export * from './lib/address.js';
@@ -48,9 +53,6 @@ export { createQuestions } from './questions/create-questions.js';
 export * from './questions/options-question.js';
 export { questionClasses } from './questions/questions.js';
 
-export * from './questions/question-props.js';
-export * from './questions/question-types.js';
-
 // Section
 export { Section } from './section.js';
 

package/src/journey/journey-response.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Defines a response to a journey, a set of Answers to the questions
+ * @class
+ */
+export class JourneyResponse {
+    /**
+     * creates an instance of a JourneyResponse
+     * @param {string} journeyId
+     * @param {string} referenceId
+     * @param {import('#typedefs/journey-types.d.ts').JourneyAnswers | null} answers
+     * @param {string} [lpaCode]
+     */
+    constructor(journeyId: string, referenceId: string, answers: import("#typedefs/journey-types.d.ts").JourneyAnswers | null, lpaCode?: string);
+    /**
+     * @type {string} - reference id used in the url for the journey e.g. appeal id - provides a unique lookup for responses in combination with formId
+     */
+    referenceId: string;
+    /**
+     * @type {string} - a reference to the journey type e.g. has-questionnaire - provides a unique lookup for responses in combination with referenceId
+     */
+    journeyId: string;
+    /**
+     * @type {import('#typedefs/journey-types.d.ts').JourneyAnswers} - answers to the journey
+     */
+    answers: import("#typedefs/journey-types.d.ts").JourneyAnswers;
+    LPACode: string | undefined;
+}
+//# sourceMappingURL=journey-response.d.ts.map

package/src/journey/journey-response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"journey-response.d.ts","sourceRoot":"","sources":["journey-response.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH;IAgBC;;;;;;OAMG;IACH,uBALW,MAAM,eACN,MAAM,WACN,OAAO,8BAA8B,EAAE,cAAc,GAAG,IAAI,YAC5D,MAAM,EAWhB;IA/BD;;OAEG;IACH,aAFU,MAAM,CAEJ;IAEZ;;OAEG;IACH,WAFU,MAAM,CAEN;IAEV;;OAEG;IACH,SAFU,OAAO,8BAA8B,EAAE,cAAc,CAEvD;IAiBP,4BAAsB;CAEvB"}

package/src/journey/journey-response.js

@@ -1,7 +1,3 @@
-/**
- * @typedef {import('./journey-factory').JourneyType} JourneyType
- */
-
 /**
  * Defines a response to a journey, a set of Answers to the questions
  * @class
@@ -13,20 +9,20 @@ export class JourneyResponse {
 	referenceId;
 
 	/**
-	 * @type {JourneyType} - a reference to the journey type e.g. has-questionnaire - provides a unique lookup for responses in combination with referenceId
+	 * @type {string} - a reference to the journey type e.g. has-questionnaire - provides a unique lookup for responses in combination with referenceId
 	 */
 	journeyId;
 
 	/**
-	 * @type {import('./journey-types.js').JourneyAnswers} - answers to the journey
+	 * @type {import('#typedefs/journey-types.d.ts').JourneyAnswers} - answers to the journey
 	 */
 	answers;
 
 	/**
 	 * creates an instance of a JourneyResponse
-	 * @param {JourneyType} journeyId
+	 * @param {string} journeyId
 	 * @param {string} referenceId
-	 * @param {import('./journey-types.js').JourneyAnswers | null} answers
+	 * @param {import('#typedefs/journey-types.d.ts').JourneyAnswers | null} answers
 	 * @param {string} [lpaCode]
 	 */
 	constructor(journeyId, referenceId, answers, lpaCode) {

package/{types/src → src}/journey/journey.d.ts

@@ -62,20 +62,20 @@ export class Journey {
     getSection(sectionSegment: string): import("../section.js").Section | undefined;
     /**
      * gets a question from the object's sections based on a section + question names
-     * @param {import('./journey-types.js').RouteParams} params
+     * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
      * @returns {import('../questions/question.js').Question | undefined} question found by lookup
      */
-    getQuestionByParams(params: import("./journey-types.js").RouteParams): import("../questions/question.js").Question | undefined;
+    getQuestionByParams(params: import("#typedefs/journey-types.d.ts").RouteParams): import("../questions/question.js").Question | undefined;
     /**
      * Get the back link for the journey - e.g. the previous question
      *
      * @param {Object} options
-     * @param {import('./journey-types.js').RouteParams} options.params
+     * @param {import('#typedefs/journey-types.d.ts').RouteParams} options.params
      * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
      * @returns {string|null} url for the next question, or null if unmatched
      */
     getBackLink({ params, manageListQuestion }: {
-        params: import("./journey-types.js").RouteParams;
+        params: import("#typedefs/journey-types.d.ts").RouteParams;
         manageListQuestion?: typeof import("#src/components/manage-list/question.js") | undefined;
     }): string | null;
     /**
@@ -83,21 +83,21 @@ export class Journey {
      * Used after question post/saving
      *
      * @param {import('express').Response} res
-     * @param {import('./journey-types.js').RouteParams} params
+     * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
      * @param {import('#src/components/manage-list/question.js')} [manageListQuestion]
      * @returns {void}
      */
-    redirectToNextQuestion(res: import("express").Response, params: import("./journey-types.js").RouteParams, manageListQuestion?: typeof import("#src/components/manage-list/question.js")): void;
+    redirectToNextQuestion(res: import("express").Response, params: import("#typedefs/journey-types.d.ts").RouteParams, manageListQuestion?: typeof import("#src/components/manage-list/question.js")): void;
     /**
      * Get url for the next question in the journey
      *
-     * @param {import('./journey-types.js').RouteParams} params
+     * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
      * @param {Object} options
      * @param {boolean} [options.reverse] - if passed in this will get the previous question
      * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
      * @returns {string|null} url for the next question, or null if unmatched
      */
-    getNextQuestionUrl(params: import("./journey-types.js").RouteParams, { reverse, manageListQuestion }?: {
+    getNextQuestionUrl(params: import("#typedefs/journey-types.d.ts").RouteParams, { reverse, manageListQuestion }?: {
         reverse?: boolean | undefined;
         manageListQuestion?: typeof import("#src/components/manage-list/question.js") | undefined;
     }): string | null;

package/src/journey/journey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"journey.d.ts","sourceRoot":"","sources":["journey.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IAwBC;;;;;;;;;;;;;;OAcG;IACH,qLAZG;QAAwB,SAAS,EAAzB,MAAM;QACyE,WAAW,EAA1F,CAAC,QAAQ,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM;QACpD,WAAW;QAC6B,QAAQ,EAAjE,OAAO,uBAAuB,EAAE,eAAe;QAC/B,eAAe,EAA/B,MAAM;QACU,gBAAgB,EAAhC,MAAM;QACW,uBAAuB;QACxB,YAAY,EAA5B,MAAM;QACY,eAAe;QACU,QAAQ,EAAnD,OAAO,eAAe,EAAE,OAAO,EAAE;QAChB,eAAe;KAC1C,EAoDA;IAzFD,8EAA8E;IAC9E,WADW,MAAM,CACP;IACV,6FAA6F;IAC7F,UADW,KAAK,CAAE,OAAO,eAAe,EAAE,OAAO,CAAC,CACpC;IACd,mHAAmH;IACnH,UADW,OAAO,uBAAuB,EAAE,eAAe,CACjD;IACT,wFAAwF;IACxF,SADW,MAAM,CACJ;IACb,sJAAsJ;IACtJ,aADW,CAAC,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM,CAChE;IACvB,kEAAkE;IAClE,aADW,MAAM,CACA;IACjB,uEAAuE;IACvE,iBADW,MAAM,CACI;IACrB,qFAAqF;IACrF,kBADW,MAAM,CACK;IACtB,4GAA4G;IAC5G,yBADW,MAAM,CACY;IAC7B,qFAAqF;IACrF,iBADW,OAAO,CACM;IACxB,2DAA2D;IAC3D,cADU,MAAM,CACH;IAmEZ,+BAA8C;IA2C/C;;;;OAIG;IACH,2BAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,GAAG,SAAS,CAMvD;IA8BD;;;;OAIG;IACH,4BAHW,OAAO,8BAA8B,EAAE,WAAW,GAChD,OAAO,0BAA0B,EAAE,QAAQ,GAAG,SAAS,CAiBnE;IAED;;;;;;;OAOG;IACH,4CAJG;QAAoE,MAAM,EAAlE,OAAO,8BAA8B,EAAE,WAAW;QACU,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAWvB;IAED;;;;;;;;OAQG;IACH,4BALW,OAAO,SAAS,EAAE,QAAQ,UAC1B,OAAO,8BAA8B,EAAE,WAAW,kFAEhD,IAAI,CAKhB;IAED;;;;;;;;OAQG;IACH,2BANW,OAAO,8BAA8B,EAAE,WAAW,oCAE1D;QAA0B,OAAO;QACmC,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAyEvB;IAED;;;;;OAKG;IACH,wBAAyB,gBAJd,MAI4B,EAAE,iBAH9B,MAG6C,KAF3C,MAAM,CAqBjB;IAEF;;;;OAIG;IACH,sCAAuC,iBAH5B,MAG2C,KAFzC,MAAM,CAIjB;IAEF;;;;;;OAMG;IACH,0BAA2B,gBALhB,MAK8B,EAAE,iBAJhC,MAI+C,EAAE,UAHjD,MAGyD,KAFvD,MAAM,CAuBjB;IAEF;;;OAGG;IACH,cAFa,OAAO,CAInB;IAED;;OAEG;IACH,6BAFW,OAAO,uBAAuB,EAAE,eAAe,QAKzD;;CACD"}

package/src/journey/journey.js

@@ -131,7 +131,7 @@ export class Journey {
 
 	/**
 	 * utility function to build up a url to a question
-	 * @param {import('./journey-types.js').RouteParams} params
+	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
 	 * @returns {string} url for a question
 	 */
 	#buildQuestionUrl(params) {
@@ -183,7 +183,7 @@ export class Journey {
 
 	/**
 	 * gets a question from the object's sections based on a section + question names
-	 * @param {import('./journey-types.js').RouteParams} params
+	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
 	 * @returns {import('../questions/question.js').Question | undefined} question found by lookup
 	 */
 	getQuestionByParams(params) {
@@ -207,7 +207,7 @@ export class Journey {
 	 * Get the back link for the journey - e.g. the previous question
 	 *
 	 * @param {Object} options
-	 * @param {import('./journey-types.js').RouteParams} options.params
+	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} options.params
 	 * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
 	 * @returns {string|null} url for the next question, or null if unmatched
 	 */
@@ -227,7 +227,7 @@ export class Journey {
 	 * Used after question post/saving
 	 *
 	 * @param {import('express').Response} res
-	 * @param {import('./journey-types.js').RouteParams} params
+	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
 	 * @param {import('#src/components/manage-list/question.js')} [manageListQuestion]
 	 * @returns {void}
 	 */
@@ -239,7 +239,7 @@ export class Journey {
 	/**
 	 * Get url for the next question in the journey
 	 *
-	 * @param {import('./journey-types.js').RouteParams} params
+	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} params
 	 * @param {Object} options
 	 * @param {boolean} [options.reverse] - if passed in this will get the previous question
 	 * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
@@ -293,7 +293,7 @@ export class Journey {
 					 * don't include other params which may be set (e.g. manageList* params), as we may now be
 					 * redirecting to a non-manage list question, having previously been on a manage list question
 					 *
-					 * @type {import('./journey-types.js').RouteParams}
+					 * @type {import('#typedefs/journey-types.d.ts').RouteParams}
 					 */
 					let newParams = {
 						section: currentSection.segment,

package/src/lib/address-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"address-utils.d.ts","sourceRoot":"","sources":["address-utils.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,kDAFa,MAAM,CAKlB"}

package/src/lib/address.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH;IA0BC;;;;;;;;OAQG;IACH,wEANG;QAAuB,YAAY,EAA3B,MAAM;QACS,YAAY,EAA3B,MAAM;QACS,QAAQ,EAAvB,MAAM;QACS,MAAM,EAArB,MAAM;QACS,QAAQ,EAAvB,MAAM;KAChB,EAOA;IAxCD;;OAEG;IACH,cAFU,MAAM,CAEH;IAEb;;OAEG;IACH,cAFU,MAAM,CAEH;IAEb;;OAEG;IACH,UAFU,MAAM,CAEP;IAET;;OAEG;IACH,QAFU,MAAM,CAET;IAEP;;OAEG;IACH,UAFU,MAAM,CAEP;CAkBT"}

package/src/lib/date-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"date-utils.d.ts","sourceRoot":"","sources":["date-utils.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,4CALW,IAAI,GAAC,MAAM,eAEnB;IAAyB,MAAM;CAC/B,GAAU,MAAM,CAMlB;AAED;;;;;;;;;GASG;AAEH;;;;GAIG;AACH,2EAHW,cAAc,GACZ,IAAI,CAMhB;AAED;;GAEG;AACH,mCAWC;AAED;;GAEG;AACH,iCAWC;AAqCD;;;;;GAKG;AACH,4CAJW,IAAI,WACJ,IAAI,GACF,OAAO,CASnB;AAED;;;;GAIG;AACH,+CAHW,IAAI,GACF,OAAO,CASnB;AA/CM,uCAHI,IAAI,GACF,OAAO,CAInB;AAMM,wCAHI,IAAI,GACF,OAAO,CAInB;AAMM,kCAHI,IAAI,GACF,OAAO,CAInB;;UArFa,MAAM;WACN,MAAM;SACN,MAAM"}

package/src/lib/session-answer-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-answer-store.d.ts","sourceRoot":"","sources":["session-answer-store.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,sDAJG;IAAsB,QAAQ;CAE9B,GAAU,OAAO,kBAAkB,EAAE,UAAU,CA8CjD;AASD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,gFANG;IAA0C,GAAG,EAArC,OAAO,SAAS,EAAE,OAAO;IACV,SAAS,EAAxB,MAAM;IACuB,WAAW;;;IACxB,QAAQ;CAChC,GAAU,IAAI,CAkBhB;AAED;;;;;;GAMG;AACH,8DAJW,MAAM,aACN,MAAM,GACJ,OAAO,SAAS,EAAE,OAAO,CA2BrC;AA/ED;;;;GAIG;AACH,gCAFU,OAAO,kBAAkB,EAAE,UAAU,CAEW"}

package/src/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,8BAHW,MAAM,GACJ,MAAM,CAMlB;AAED;;;GAGG;AACH,gCAHW,MAAM,GAAC,GAAG,GACR,MAAM,CAKlB;AAED;;;;;GAKG;AACH,wCAHW,MAAM,GACJ,MAAM,CAKlB;AAED;;;;;GAKG;AACH,wBAFa,CAAC,SADH,CAAC,GAAC,CAAC,EAAE,OAKf"}

package/src/lib/uuid.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uuid.d.ts","sourceRoot":"","sources":["uuid.js"],"names":[],"mappings":"AAEA;;GAEG;AACH;IACC,yEAEC;CACD"}

package/src/middleware/build-get-journey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-get-journey.d.ts","sourceRoot":"","sources":["build-get-journey.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,+CAHW,CAAC,GAAG,EAAE,OAAO,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,gCAAgC,EAAE,eAAe,KAAK,OAAO,uBAAuB,EAAE,OAAO,GACpJ,OAAO,SAAS,EAAE,OAAO,CAgBrC"}

package/src/middleware/redirect-to-unanswered-question.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @typedef {function(import('../questions/question.js').Question, import('#journey-response').JourneyResponse): boolean} ShouldDisplayCondition
+ */
+/**
+ * Redirects to the first unanswered question in a journey, or to the task list if complete
+ *
+ * @param {ShouldDisplayCondition[]} [conditions]
+ * @returns {import('express').Handler}
+ */
+export function redirectToUnansweredQuestion(conditions?: ShouldDisplayCondition[]): import("express").Handler;
+export type ShouldDisplayCondition = (arg0: import("../questions/question.js").Question, arg1: import("#journey-response").JourneyResponse) => boolean;
+//# sourceMappingURL=redirect-to-unanswered-question.d.ts.map

package/src/middleware/redirect-to-unanswered-question.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirect-to-unanswered-question.d.ts","sourceRoot":"","sources":["redirect-to-unanswered-question.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;GAKG;AACH,0DAHW,sBAAsB,EAAE,GACtB,OAAO,SAAS,EAAE,OAAO,CA8BrC;qCArCY,CAAS,IAA2C,EAA3C,OAAO,0BAA0B,EAAE,QAAQ,EAAE,IAA2C,EAA3C,OAAO,mBAAmB,EAAE,eAAe,KAAG,OAAO"}

package/src/middleware/redirect-to-unanswered-question.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {function(import('../section').Question, import('../journey/journey-response').JourneyResponse): boolean} ShouldDisplayCondition
+ * @typedef {function(import('../questions/question.js').Question, import('#journey-response').JourneyResponse): boolean} ShouldDisplayCondition
  */
 
 /**

package/src/questions/create-questions.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @template {string} K Question keys in questionPropsRecord
+ * @template {import('#typedefs/question-props.d.ts').BaseQuestionProps} T
+ * @param {{[questionName in K]: T}} questionPropsRecord
+ * @param {Record<string, import('#typedefs/question-types.d.ts').QuestionClass>} questionClasses
+ * @param {{[questionType: string]: Record<string, Function>}} questionMethodOverrides
+ * @param {{notStartedText?: string, continueButtonText?: string, changeActionText?: string, answerActionText?: string}} [textOverrides] - customise question text
+ * @returns {{[questionName in K]: InstanceType<import('#typedefs/question-types.d.ts').QuestionClass>}} Returns the same question keys that were passed in with each value being an instantiated question
+ */
+export function createQuestions<K extends string, T extends import("#typedefs/question-props.d.ts").BaseQuestionProps>(questionPropsRecord: { [questionName in K]: T; }, questionClasses: Record<string, import("#typedefs/question-types.d.ts").QuestionClass>, questionMethodOverrides: {
+    [questionType: string]: Record<string, Function>;
+}, textOverrides?: {
+    notStartedText?: string;
+    continueButtonText?: string;
+    changeActionText?: string;
+    answerActionText?: string;
+}): { [questionName in K]: InstanceType<import("#typedefs/question-types.d.ts").QuestionClass>; };
+//# sourceMappingURL=create-questions.d.ts.map

package/src/questions/create-questions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-questions.d.ts","sourceRoot":"","sources":["create-questions.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,gCARsB,CAAC,SAAV,MAAQ,EACoD,CAAC,SAA7D,OAAQ,+BAA+B,EAAE,iBAAkB,uBAC7D,GAAE,YAAY,IAAI,CAAC,GAAG,CAAC,GAAC,mBACxB,MAAM,CAAC,MAAM,EAAE,OAAO,+BAA+B,EAAE,aAAa,CAAC,2BACrE;IAAC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,WAAW,CAAA;CAAC,kBAClD;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAC,GAC1G,GAAE,YAAY,IAAI,CAAC,GAAG,YAAY,CAAC,OAAO,+BAA+B,EAAE,aAAa,CAAC,GAAC,CAwBtG"}

package/src/questions/create-questions.js

@@ -1,11 +1,11 @@
 /**
  * @template {string} K Question keys in questionPropsRecord
- * @template {import('./question-props.js').BaseQuestionProps} T
+ * @template {import('#typedefs/question-props.d.ts').BaseQuestionProps} T
  * @param {{[questionName in K]: T}} questionPropsRecord
- * @param {Record<string, import('./question-types.js').QuestionClass>} questionClasses
+ * @param {Record<string, import('#typedefs/question-types.d.ts').QuestionClass>} questionClasses
  * @param {{[questionType: string]: Record<string, Function>}} questionMethodOverrides
  * @param {{notStartedText?: string, continueButtonText?: string, changeActionText?: string, answerActionText?: string}} [textOverrides] - customise question text
- * @returns {{[questionName in K]: InstanceType<import('./question-types.js').QuestionClass>}} Returns the same question keys that were passed in with each value being an instantiated question
+ * @returns {{[questionName in K]: InstanceType<import('#typedefs/question-types.d.ts').QuestionClass>}} Returns the same question keys that were passed in with each value being an instantiated question
  */
 export function createQuestions(questionPropsRecord, questionClasses, questionMethodOverrides, textOverrides) {
 	return Object.fromEntries(

package/{types/src → src}/questions/options-question.d.ts

@@ -22,10 +22,10 @@
  *}} Option
  */
 /**
- * @typedef {import('./question').QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
+ * @typedef {import('#typedefs/question-types.d.ts').QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
  */
 /**
- * @typedef {import('#question-types').QuestionParameters & { options: Array<Option> }} OptionsQuestionParameters
+ * @typedef {import('#typedefs/question-types.d.ts').QuestionParameters & { options: Array<Option> }} OptionsQuestionParameters
  */
 export class OptionsQuestion extends Question {
     /**
@@ -41,10 +41,10 @@ export class OptionsQuestion extends Question {
      * @param {import('#journey').Journey} journey - the journey we are in
      * @param {Record<string, unknown>} [customViewData] additional data to send to view
      * @param {Record<string, unknown>} [payload]
-     * @param {import('#question-types').PrepQuestionForRenderingOptions} options
-     * @returns {import('./question').QuestionViewModel} QuestionViewModel
+     * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} options
+     * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel} QuestionViewModel
      */
-    prepQuestionForRendering(section: import("#section").Section, journey: import("#journey").Journey, customViewData?: Record<string, unknown>, payload?: Record<string, unknown>, options: import("#question-types").PrepQuestionForRenderingOptions): any;
+    prepQuestionForRendering(section: import("#section").Section, journey: import("#journey").Journey, customViewData?: Record<string, unknown>, payload?: Record<string, unknown>, options: import("#typedefs/question-types.d.ts").PrepQuestionForRenderingOptions): import("#typedefs/question-types.d.ts").QuestionViewModel;
 }
 export default OptionsQuestion;
 export type Option = {
@@ -68,12 +68,12 @@ export type Option = {
         html: string;
     };
 };
-export type OptionsViewModel = any & {
+export type OptionsViewModel = import("#typedefs/question-types.d.ts").QuestionViewModel & {
     question: {
         options: Option[];
     };
 };
-export type OptionsQuestionParameters = import("#question-types").QuestionParameters & {
+export type OptionsQuestionParameters = import("#typedefs/question-types.d.ts").QuestionParameters & {
     options: Array<Option>;
 };
 import { Question } from './question.js';

package/src/questions/options-question.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"options-question.d.ts","sourceRoot":"","sources":["options-question.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;GAEG;AACH;;GAEG;AAEH;IAIC;;OAEG;IACH,oBAFW,yBAAyB,EAenC;IAnBD,4BAA4B;IAC5B,SADW,KAAK,CAAC,MAAM,CAAC,CAChB;IAiBP,yBAA+C;IAGhD;;;;;;;;OAQG;IACH,kCAPW,OAAO,UAAU,EAAE,OAAO,WAC1B,OAAO,UAAU,EAAE,OAAO,mBAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WACvB,OAAO,+BAA+B,EAAE,+BAA+B,GACrE,OAAO,+BAA+B,EAAE,iBAAiB,CAkDrE;CA2DD;;qBAxKY;IACR,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,WAAW,CAAC,EAAE;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,OAAO,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAA;KAClB,CAAC;IACA,eAAe,CAAC,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;KAChB,CAAA;CACH;+BAIU,OAAO,+BAA+B,EAAE,iBAAiB,GAAG;IAAE,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;CAAE;wCAG/F,OAAO,+BAA+B,EAAE,kBAAkB,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE;yBApC3E,eAAe"}

package/src/questions/options-question.js

@@ -3,6 +3,7 @@ import { Question } from './question.js';
 import ValidOptionValidator from '../validator/valid-option-validator.js';
 import { getConditionalFieldName } from '../components/utils/question-utils.js';
 import { toArray } from '#src/lib/utils.js';
+import escape from 'escape-html';
 
 const defaultOptionJoinString = ',';
 
@@ -31,10 +32,10 @@ const defaultOptionJoinString = ',';
  */
 
 /**
- * @typedef {import('./question').QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
+ * @typedef {import('#typedefs/question-types.d.ts').QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
  */
 /**
- * @typedef {import('#question-types').QuestionParameters & { options: Array<Option> }} OptionsQuestionParameters
+ * @typedef {import('#typedefs/question-types.d.ts').QuestionParameters & { options: Array<Option> }} OptionsQuestionParameters
  */
 
 export class OptionsQuestion extends Question {
@@ -65,8 +66,8 @@ export class OptionsQuestion extends Question {
 	 * @param {import('#journey').Journey} journey - the journey we are in
 	 * @param {Record<string, unknown>} [customViewData] additional data to send to view
 	 * @param {Record<string, unknown>} [payload]
-	 * @param {import('#question-types').PrepQuestionForRenderingOptions} options
-	 * @returns {import('./question').QuestionViewModel} QuestionViewModel
+	 * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} options
+	 * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel} QuestionViewModel
 	 */
 	prepQuestionForRendering(section, journey, customViewData, payload, options) {
 		const viewModel = super.prepQuestionForRendering(section, journey, customViewData, payload, options);
@@ -118,6 +119,29 @@ export class OptionsQuestion extends Question {
 		return viewModel;
 	}
 
+	/**
+	 * Formats an answer value for display in the summary.
+	 * Looks up the option text for the given value(s).
+	 *
+	 * @param {unknown} answer - the raw answer value
+	 * @returns {string} the formatted answer for display
+	 */
+	formatAnswer(answer) {
+		if (answer === null || answer === undefined || answer === '') {
+			return this.notStartedText;
+		}
+
+		const answerValues = String(answer)
+			.split(this.optionJoinString)
+			.map((value) => value.trim());
+		const texts = answerValues.map((value) => {
+			const option = this.options.find((opt) => opt.value === value);
+			return escape(option ? option.text : value);
+		});
+
+		return texts.join('<br>');
+	}
+
 	/**
 	 * Get the data to save from the request, returns an object of answers
 	 * @param {import('express').Request} req
@@ -137,6 +161,7 @@ export class OptionsQuestion extends Question {
 		if (selectedOptions.length !== fieldValues.length)
 			throw new Error(`User submitted option(s) did not correlate with valid answers to ${this.fieldName} question`);
 
+		// TODO DF-51 treat as an array
 		answers[this.fieldName] = fieldValues.join(this.optionJoinString);
 
 		this.options.forEach((option) => {