@planning-inspectorate/dynamic-forms 3.18.1 → 3.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planning-inspectorate/dynamic-forms",
-  "version": "3.18.1",
+  "version": "3.19.1",
   "description": "This package is for building GDS forms using a configuration-based approach.",
   "main": "./src/index.js",
   "type": "module",

package/src/components/date-period/question.d.ts

@@ -26,13 +26,15 @@ export class DatePeriodQuestion extends Question {
         [x: string]: any;
     };
     /**
-     * returns the formatted answers values to be used to build task list elements
+     * Formats the start/end date period for display in the summary.
+     *
+     * @param {{start?: string|Date, end?: string|Date}} answer
+     * @returns {string}
      */
-    formatAnswerForSummary(sectionSegment: any, journey: any, answer: any): {
-        key: string;
-        value: string;
-        action: import("#typedefs/question-types.d.ts").ActionView | import("#typedefs/question-types.d.ts").ActionView[] | undefined;
-    }[];
+    formatAnswer(answer: {
+        start?: string | Date;
+        end?: string | Date;
+    }): string;
 }
 export default DatePeriodQuestion;
 import { Question } from '#question';

package/src/components/date-period/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"AAOA;;;GAGG;AACH;IACC;;OAEG;IACH,mGAFW,OAAO,+BAA+B,EAAE,wBAAwB,EAuB1E;IAPA,mBAA4B;IAC5B;;;MAAsD;IAEtD,8BAA0B;IAC1B,4BAAsB;IACtB,kEAA+D;IAC/D,gEAA2D;IAkB5D;;;;;OAKG,CACH,mBAJW,OAAO,SAAS,EAAE,OAAO,mBACzB,OAAO,mBAAmB,EAAE,eAAe,GACzC,OAAO,CAAE,MAAM,CAAC,CAgC5B;IAED;;MAuCC;IAWD;;OAEG;IACH;;;;QAyBC;CACD;;yBAzKwB,WAAW"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"AAOA;;;GAGG;AACH;IACC;;OAEG;IACH,mGAFW,OAAO,+BAA+B,EAAE,wBAAwB,EAuB1E;IAPA,mBAA4B;IAC5B;;;MAAsD;IAEtD,8BAA0B;IAC1B,4BAAsB;IACtB,kEAA+D;IAC/D,gEAA2D;IAkB5D;;;;;OAKG,CACH,mBAJW,OAAO,SAAS,EAAE,OAAO,mBACzB,OAAO,mBAAmB,EAAE,eAAe,GACzC,OAAO,CAAE,MAAM,CAAC,CAgC5B;IAED;;MAuCC;IAWD;;;;;OAKG;IACH,qBAHW;QAAC,KAAK,CAAC,EAAE,MAAM,GAAC,IAAI,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;KAAC,GACtC,MAAM,CAoBlB;CACD;;yBArKwB,WAAW"}

package/src/components/date-period/question.js

@@ -140,33 +140,29 @@ export class DatePeriodQuestion extends Question {
 	}
 
 	/**
-	 * returns the formatted answers values to be used to build task list elements
+	 * Formats the start/end date period for display in the summary.
+	 *
+	 * @param {{start?: string|Date, end?: string|Date}} answer
+	 * @returns {string}
 	 */
-	formatAnswerForSummary(sectionSegment, journey, answer) {
-		let formattedAnswer;
+	formatAnswer(answer) {
+		if (!answer) {
+			return this.notStartedText;
+		}
 
-		if (answer) {
-			const start = answer.start && formatDateForDisplay(answer.start, { format: this.dateFormat });
-			const end = answer.end && formatDateForDisplay(answer.end, { format: this.dateFormat });
-			formattedAnswer = '';
-			if (start) {
-				formattedAnswer += `${this.labels.start}: ${start}`;
-				if (end) {
-					formattedAnswer += `\n`;
-				}
-			}
+		const start = answer.start && formatDateForDisplay(answer.start, { format: this.dateFormat });
+		const end = answer.end && formatDateForDisplay(answer.end, { format: this.dateFormat });
+		let formattedAnswer = '';
+		if (start) {
+			formattedAnswer += `${this.labels.start}: ${start}`;
 			if (end) {
-				formattedAnswer += `${this.labels.end}: ${end}`;
+				formattedAnswer += `\n`;
 			}
-			formattedAnswer = nl2br(escape(formattedAnswer));
-		} else {
-			formattedAnswer = this.notStartedText;
 		}
-
-		const action = this.getAction(sectionSegment, journey, answer);
-		const key = this.title ?? this.question;
-
-		return [{ key: key, value: formattedAnswer, action: action }];
+		if (end) {
+			formattedAnswer += `${this.labels.end}: ${end}`;
+		}
+		return nl2br(escape(formattedAnswer));
 	}
 }
 

package/src/components/date-period/question.test.js

@@ -258,7 +258,7 @@ describe('DatePeriodQuestion', () => {
 		});
 	});
 
-	describe('formatAnswerForSummary', () => {
+	describe('formatAnswer', () => {
 		it('should return correctly formatted answer if it exists', () => {
 			const dateQuestion = new DatePeriodQuestion({
 				title: TITLE,
@@ -274,22 +274,12 @@ describe('DatePeriodQuestion', () => {
 				start: new Date('2023-01-01T00:00:00.000Z'),
 				end: new Date('2023-01-10T00:00:00.000Z')
 			};
-			const href = 'fake href';
-
-			const journey = {
-				getCurrentQuestionUrl: () => {
-					return href;
-				}
-			};
 
-			const result = dateQuestion.formatAnswerForSummary('segment', journey, answer);
+			const result = dateQuestion.formatAnswer(answer);
 
-			assert.strictEqual(result[0].value, 'Start: 00:00 1 January 2023<br>End: 00:00 10 January 2023');
-			assert.strictEqual(result[0].action.href, href);
-			assert.strictEqual(result[0].action.text, 'Change');
-			assert.strictEqual(result[0].action.visuallyHiddenText, QUESTION);
-			assert.strictEqual(result[0].key, TITLE);
+			assert.strictEqual(result, 'Start: 00:00 1 January 2023<br>End: 00:00 10 January 2023');
 		});
+
 		it('should return start only if set', () => {
 			const dateQuestion = new DatePeriodQuestion({
 				title: TITLE,
@@ -304,21 +294,30 @@ describe('DatePeriodQuestion', () => {
 			const answer = {
 				start: new Date('2023-01-01T00:00:00.000Z')
 			};
-			const href = 'fake href';
 
-			const journey = {
-				getCurrentQuestionUrl: () => {
-					return href;
-				}
+			const result = dateQuestion.formatAnswer(answer);
+
+			assert.strictEqual(result, 'Start: 00:00 1 January 2023');
+		});
+
+		it('should return end only if set', () => {
+			const dateQuestion = new DatePeriodQuestion({
+				title: TITLE,
+				question: QUESTION,
+				fieldName: FIELDNAME,
+				hint: HINT,
+				hintStart: HINTSTART,
+				hintEnd: HINTEND,
+				validators: VALIDATORS
+			});
+
+			const answer = {
+				end: new Date('2023-01-10T00:00:00.000Z')
 			};
 
-			const result = dateQuestion.formatAnswerForSummary('segment', journey, answer);
+			const result = dateQuestion.formatAnswer(answer);
 
-			assert.strictEqual(result[0].value, 'Start: 00:00 1 January 2023');
-			assert.strictEqual(result[0].action.href, href);
-			assert.strictEqual(result[0].action.text, 'Change');
-			assert.strictEqual(result[0].action.visuallyHiddenText, QUESTION);
-			assert.strictEqual(result[0].key, TITLE);
+			assert.strictEqual(result, 'End: 00:00 10 January 2023');
 		});
 
 		it('should use custom labels if set', () => {
@@ -333,6 +332,66 @@ describe('DatePeriodQuestion', () => {
 				labels: { start: 'Open', end: 'Close' }
 			});
 
+			const answer = {
+				start: new Date('2023-01-01T00:00:00.000Z'),
+				end: new Date('2023-01-10T00:00:00.000Z')
+			};
+
+			const result = dateQuestion.formatAnswer(answer);
+
+			assert.strictEqual(result, 'Open: 00:00 1 January 2023<br>Close: 00:00 10 January 2023');
+		});
+
+		it('should return not started text if answer does not exist', () => {
+			const dateQuestion = new DatePeriodQuestion({
+				title: TITLE,
+				question: QUESTION,
+				fieldName: FIELDNAME,
+				hint: HINT,
+				hintStart: HINTSTART,
+				hintEnd: HINTEND,
+				validators: VALIDATORS
+			});
+
+			const result = dateQuestion.formatAnswer(null);
+
+			assert.strictEqual(result, dateQuestion.notStartedText);
+		});
+
+		it('should escape html in labels', () => {
+			const dateQuestion = new DatePeriodQuestion({
+				title: TITLE,
+				question: QUESTION,
+				fieldName: FIELDNAME,
+				hint: HINT,
+				hintStart: HINTSTART,
+				hintEnd: HINTEND,
+				validators: VALIDATORS,
+				labels: { start: '<b>Start</b>', end: 'End' }
+			});
+
+			const answer = {
+				start: new Date('2023-01-01T00:00:00.000Z')
+			};
+
+			const result = dateQuestion.formatAnswer(answer);
+
+			assert.strictEqual(result, '&lt;b&gt;Start&lt;/b&gt;: 00:00 1 January 2023');
+		});
+	});
+
+	describe('formatAnswerForSummary', () => {
+		it('should integrate formatAnswer output with the summary row action and key', () => {
+			const dateQuestion = new DatePeriodQuestion({
+				title: TITLE,
+				question: QUESTION,
+				fieldName: FIELDNAME,
+				hint: HINT,
+				hintStart: HINTSTART,
+				hintEnd: HINTEND,
+				validators: VALIDATORS
+			});
+
 			const answer = {
 				start: new Date('2023-01-01T00:00:00.000Z'),
 				end: new Date('2023-01-10T00:00:00.000Z')
@@ -347,14 +406,15 @@ describe('DatePeriodQuestion', () => {
 
 			const result = dateQuestion.formatAnswerForSummary('segment', journey, answer);
 
-			assert.strictEqual(result[0].value, 'Open: 00:00 1 January 2023<br>Close: 00:00 10 January 2023');
+			assert.strictEqual(result[0].value, dateQuestion.formatAnswer(answer));
+			assert.strictEqual(result[0].value, 'Start: 00:00 1 January 2023<br>End: 00:00 10 January 2023');
 			assert.strictEqual(result[0].action.href, href);
 			assert.strictEqual(result[0].action.text, 'Change');
 			assert.strictEqual(result[0].action.visuallyHiddenText, QUESTION);
 			assert.strictEqual(result[0].key, TITLE);
 		});
 
-		it('should return not started if answer does not exist', () => {
+		it('should return not started action if answer does not exist', () => {
 			const dateQuestion = new DatePeriodQuestion({
 				title: TITLE,
 				question: QUESTION,

package/src/components/manage-list/question.d.ts

@@ -17,13 +17,9 @@ export class ManageListQuestion extends Question {
         };
     }>;
     /**
-     * returns the formatted answers values to be used to build task list elements
+     * Format the answer for display in the summary, either as a count or as a list of answers
      */
-    formatAnswerForSummary(sectionSegment: any, journey: any, answer: any): {
-        key: string;
-        value: string;
-        action: import("#typedefs/question-types.d.ts").ActionView | import("#typedefs/question-types.d.ts").ActionView[] | undefined;
-    }[];
+    formatAnswer(answer: any): any;
     renderConfirmationAction(res: any, itemToRemove: any, viewModel: any): void;
     set section(section: import("../../section.js").Section);
     get section(): import("../../section.js").Section;

package/src/components/manage-list/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;IAOC;;OAEG;IACH,oBAFW,OAAO,+BAA+B,EAAE,wBAAwB,EAe1E;IAcD,wCAEC;IAyDD;;;;OAMC;IAED;;OAEG;IACH;;;;QAsBC;IAED,4EAQC;IAoCD,yDAEC;IATD,kDAKC;;CAKD;;;;;;mBAxLa,MAAM;;;;;;;;;;;;;;yBAPK,WAAW"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;IAOC;;OAEG;IACH,oBAFW,OAAO,+BAA+B,EAAE,wBAAwB,EAe1E;IAcD,wCAEC;IAyDD;;;;OAMC;IAED;;OAEG;IACH,+BAkBC;IAED,4EAQC;IAoCD,yDAEC;IATD,kDAKC;;CAKD;;;;;;mBApLa,MAAM;;;;;;;;;;;;;;yBAPK,WAAW"}

package/src/components/manage-list/question.js

@@ -116,30 +116,26 @@ export class ManageListQuestion extends Question {
 	}
 
 	/**
-	 * returns the formatted answers values to be used to build task list elements
+	 * Format the answer for display in the summary, either as a count or as a list of answers
 	 */
-	formatAnswerForSummary(sectionSegment, journey, answer) {
-		let formattedAnswer = this.notStartedText;
-		if (answer && Array.isArray(answer)) {
-			if (this.#showAnswersInSummary) {
-				const answers = answer.map((a) => this.#formatItemAnswers(a));
-				// note: nunjucks.render uses the last configured environment
-				// so we assume here that it is the one used by the main application and
-				// is configured for dynamic-forms and govuk components
-				formattedAnswer = nunjucks.render('components/manage-list/answer-summary-list.njk', { answers });
-			} else if (answer.length > 0) {
-				formattedAnswer = `${answer.length} ${this.title}`;
-			}
+	formatAnswer(answer) {
+		if (!answer || !Array.isArray(answer)) {
+			return this.notStartedText;
 		}
-		const action = this.getAction(sectionSegment, journey, answer);
-		const key = this.title ?? this.question;
-		return [
-			{
-				key: key,
-				value: formattedAnswer,
-				action: action
-			}
-		];
+
+		if (this.#showAnswersInSummary) {
+			const answers = answer.map((a) => this.#formatItemAnswers(a));
+			// note: nunjucks.render uses the last configured environment
+			// so we assume here that it is the one used by the main application and
+			// is configured for dynamic-forms and govuk components
+			return nunjucks.render('components/manage-list/answer-summary-list.njk', { answers });
+		}
+
+		if (answer.length > 0) {
+			return `${answer.length} ${this.title}`;
+		}
+
+		return this.notStartedText;
 	}
 
 	renderConfirmationAction(res, itemToRemove, viewModel) {

package/src/components/manage-list/question.test.js

@@ -81,21 +81,45 @@ describe('components/manage-list/question', () => {
 		});
 	});
 
-	it('should format list answer for summary', (ctx) => {
+	describe('formatAnswer', () => {
+		it('should return the not started text when answer is not set', () => {
+			const q = newQuestion();
+			assert.strictEqual(q.formatAnswer(undefined), q.notStartedText);
+		});
+
+		it('should return the not started text when answer is not an array', () => {
+			const q = newQuestion();
+			assert.strictEqual(q.formatAnswer('not-an-array'), q.notStartedText);
+		});
+
+		it('should return the not started text when answer is an empty array', () => {
+			const q = newQuestion();
+			assert.strictEqual(q.formatAnswer([]), q.notStartedText);
+		});
+
+		it('should return a count of the answers by default', () => {
+			const q = newQuestion();
+			assert.strictEqual(q.formatAnswer([{}, {}, {}]), '3 Things');
+		});
+
+		it('should render all answers when showAnswersInSummary is true', (ctx) => {
+			// nunjucks.render uses the last environment configured, so make sure one is configured
+			configureNunjucksTestEnv();
+			const { q } = questionWithManageQuestions(ctx, { showAnswersInSummary: true });
+			const formatted = q.formatAnswer([{}, {}, {}]);
+			assertSnapshot(ctx, formatted, 'manage-list-answer-summary.html');
+		});
+	});
+
+	it('should integrate with formatAnswerForSummary to build a full summary row', (ctx) => {
 		const q = newQuestion();
 		mockRandomUUID(ctx);
-		const answerForSummary = q.formatAnswerForSummary('section-1', mockJourney(), [{}, {}, {}]);
+		const journey = mockJourney();
+		const answerForSummary = q.formatAnswerForSummary('section-1', journey, [{}, {}, {}]);
 		assert.strictEqual(answerForSummary.length, 1);
+		assert.deepStrictEqual(answerForSummary[0].key, TITLE);
 		assert.strictEqual(answerForSummary[0].value, '3 Things');
-	});
-
-	it('should support showing all answers in the format list answer for summary', (ctx) => {
-		// nunjucks.render uses the last environment configured, so make sure one is configured
-		configureNunjucksTestEnv();
-		const { q } = questionWithManageQuestions(ctx, { showAnswersInSummary: true });
-		const answerForSummary = q.formatAnswerForSummary('section-1', mockJourney(), [{}, {}, {}]);
-		assert.strictEqual(answerForSummary.length, 1);
-		assertSnapshot(ctx, answerForSummary[0].value, 'manage-list-answer-summary.html');
+		assert.ok(answerForSummary[0].action);
 	});
 
 	it('should render with answers', (ctx) => {

package/src/questions/question.d.ts

@@ -105,7 +105,7 @@ export class Question {
      *
      * @param {Object} options
      * @param {import('#typedefs/journey-types.d.ts').RouteParams} options.params
-     * @param {import('../components/manage-list/question.js')} [options.manageListQuestion]
+     * @param {import('../components/manage-list/question.js').ManageListQuestion} [options.manageListQuestion]
      * @param {import('../section.js').Section} options.section - the current section
      * @param {import('../journey/journey.js').Journey} options.journey - the journey we are in
      * @param {Record<string, unknown>} [options.customViewData] additional data to send to view
@@ -114,7 +114,7 @@ export class Question {
      */
     toViewModel({ params, manageListQuestion, section, journey, customViewData, payload }: {
         params: import("#typedefs/journey-types.d.ts").RouteParams;
-        manageListQuestion?: typeof import("../components/manage-list/question.js") | undefined;
+        manageListQuestion?: import("../components/manage-list/question.js").ManageListQuestion | undefined;
         section: import("../section.js").Section;
         journey: import("../journey/journey.js").Journey;
         customViewData?: Record<string, unknown> | undefined;
@@ -167,10 +167,10 @@ export class Question {
      * @param {import('express').Request} req
      * @param {import('../journey/journey.js').Journey} journey
      * @param {import('../section.js').Section} section
-     * @param {import('../components/manage-list/question.js')} [manageListQuestion]
+     * @param {import('../components/manage-list/question.js').ManageListQuestion} [manageListQuestion]
      * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel|undefined} returns the view model for displaying the error or undefined if there are no errors
      */
-    checkForValidationErrors(req: import("express").Request, section: import("../section.js").Section, journey: import("../journey/journey.js").Journey, manageListQuestion?: typeof import("../components/manage-list/question.js")): import("#typedefs/question-types.d.ts").QuestionViewModel | undefined;
+    checkForValidationErrors(req: import("express").Request, section: import("../section.js").Section, journey: import("../journey/journey.js").Journey, manageListQuestion?: import("../components/manage-list/question.js").ManageListQuestion): import("#typedefs/question-types.d.ts").QuestionViewModel | undefined;
     /**
      * Get the data to save from the request, returns an object of answers
      *

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

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"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"}

package/src/questions/question.js

@@ -192,7 +192,7 @@ export class Question {
 	 *
 	 * @param {Object} options
 	 * @param {import('#typedefs/journey-types.d.ts').RouteParams} options.params
-	 * @param {import('../components/manage-list/question.js')} [options.manageListQuestion]
+	 * @param {import('../components/manage-list/question.js').ManageListQuestion} [options.manageListQuestion]
 	 * @param {import('../section.js').Section} options.section - the current section
 	 * @param {import('../journey/journey.js').Journey} options.journey - the journey we are in
 	 * @param {Record<string, unknown>} [options.customViewData] additional data to send to view
@@ -320,7 +320,7 @@ export class Question {
 	 * @param {import('express').Request} req
 	 * @param {import('../journey/journey.js').Journey} journey
 	 * @param {import('../section.js').Section} section
-	 * @param {import('../components/manage-list/question.js')} [manageListQuestion]
+	 * @param {import('../components/manage-list/question.js').ManageListQuestion} [manageListQuestion]
 	 * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel|undefined} returns the view model for displaying the error or undefined if there are no errors
 	 */
 	checkForValidationErrors(req, section, journey, manageListQuestion) {

package/src/validator/conditional-required-validator.d.ts

@@ -1,6 +1,3 @@
-/**
- * @typedef {import('../questions/question.js')} Question
- */
 /**
  * enforces a field is not empty when condition is satisfied
  * @class
@@ -20,6 +17,5 @@ export class ConditionalRequiredValidator extends BaseValidator {
     isValueIncluded(questionObj: any, value: any): import("express-validator").ValidationChain;
 }
 export default ConditionalRequiredValidator;
-export type Question = typeof import("../questions/question.js");
 import BaseValidator from './base-validator.js';
 //# sourceMappingURL=conditional-required-validator.d.ts.map

package/src/validator/conditional-required-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditional-required-validator.d.ts","sourceRoot":"","sources":["conditional-required-validator.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;GAGG;AACH;IAMC;;;OAGG;IACH,2BAFW,MAAM,EAQhB;IAED;;;OAGG;IACH,sBAFW,OAAO,kCAAkC,EAAE,eAAe,WAcpE;IAED,+DAEC;IAED,2FAKC;CACD;;;0BAzDyB,qBAAqB"}
+{"version":3,"file":"conditional-required-validator.d.ts","sourceRoot":"","sources":["conditional-required-validator.js"],"names":[],"mappings":"AAIA;;;GAGG;AACH;IAMC;;;OAGG;IACH,2BAFW,MAAM,EAQhB;IAED;;;OAGG;IACH,sBAFW,OAAO,kCAAkC,EAAE,eAAe,WAcpE;IAED,+DAEC;IAED,2FAKC;CACD;;0BArDyB,qBAAqB"}

package/src/validator/conditional-required-validator.js

@@ -1,12 +1,7 @@
 import { body } from 'express-validator';
-
 import BaseValidator from './base-validator.js';
 import { toArray } from '#src/lib/utils.js';
 
-/**
- * @typedef {import('../questions/question.js')} Question
- */
-
 /**
  * enforces a field is not empty when condition is satisfied
  * @class

package/src/validator/confirmation-checkbox-validator.d.ts

@@ -1,6 +1,3 @@
-/**
- * @typedef {import('../questions/question.js')} Question
- */
 /**
  * enforces a confirmation checkbox is checked before proceeding
  * @class
@@ -23,6 +20,5 @@ export class ConfirmationCheckboxValidator extends BaseValidator {
     validate(): import("express-validator").ValidationChain;
 }
 export default ConfirmationCheckboxValidator;
-export type Question = typeof import("../questions/question.js");
 import BaseValidator from './base-validator.js';
 //# sourceMappingURL=confirmation-checkbox-validator.d.ts.map

package/src/validator/confirmation-checkbox-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"confirmation-checkbox-validator.d.ts","sourceRoot":"","sources":["confirmation-checkbox-validator.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;;;GAGG;AACH;IAMC;;;;;OAKG;IACH,4CAHG;QAAuB,YAAY,EAA3B,MAAM;QACS,YAAY,EAA3B,MAAM;KAChB,EAMA;IAFA,qBAAgC;IAIjC;;OAEG;IACH,wDAEC;CACD;;;0BAnCyB,qBAAqB"}
+{"version":3,"file":"confirmation-checkbox-validator.d.ts","sourceRoot":"","sources":["confirmation-checkbox-validator.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH;IAMC;;;;;OAKG;IACH,4CAHG;QAAuB,YAAY,EAA3B,MAAM;QACS,YAAY,EAA3B,MAAM;KAChB,EAMA;IAFA,qBAAgC;IAIjC;;OAEG;IACH,wDAEC;CACD;;0BA/ByB,qBAAqB"}

package/src/validator/confirmation-checkbox-validator.js

@@ -1,11 +1,6 @@
 import { body } from 'express-validator';
-
 import BaseValidator from './base-validator.js';
 
-/**
- * @typedef {import('../questions/question.js')} Question
- */
-
 /**
  * enforces a confirmation checkbox is checked before proceeding
  * @class

package/test/questions.test.js

@@ -31,7 +31,7 @@ describe('question pages', () => {
 	 * @param {import('node:test').TestContext} ctx
 	 * @param {string} url
 	 * @param {string} snapshotName
-	 * @param {import('#src/questions/question.js')} q
+	 * @param {import('#src/questions/question.js').Question} q
 	 * @returns {Promise<void>}
 	 */
 	async function renderQuestionAndSnapshot(ctx, url, snapshotName, q) {
@@ -59,7 +59,7 @@ describe('question pages', () => {
 	/**
 	 * @param {import('node:test').TestContext} ctx
 	 * @param {string} url
-	 * @param {import('#src/questions/question.js')} q
+	 * @param {import('#src/questions/question.js').Question} q
 	 * @returns {Promise<string>}
 	 */
 	async function postQuestionCheck(ctx, url, q) {