@planning-inspectorate/dynamic-forms 3.9.0 → 3.10.1

package/test/secondary-actions.test.js

@@ -0,0 +1,253 @@
+import { describe, it } from 'node:test';
+import assert from 'assert';
+import { COMPONENT_TYPES, Journey, Section } from '../src/index.js';
+import { createAppWithQuestions } from '#test/utils/question-test-utils.js';
+import { createQuestions } from '../src/questions/create-questions.js';
+import { questionClasses } from '../src/questions/questions.js';
+import { questionProps, questionsInOrder } from '#test/questions.js';
+import { assertSnapshot } from '#test/utils/utils.js';
+import { mockRandomUUID } from '#test/mock/uuid.js';
+import { createJourney as createTestJourney, JOURNEY_ID } from '#test/journey.js';
+
+/**
+ * @type {import('../src/questions/question-types.d.ts').SecondaryAction[]}
+ */
+const testSecondaryActions = [
+	{
+		text: 'Save and return',
+		href: '/return',
+		classes: 'govuk-button--secondary'
+	},
+	{
+		text: 'Cancel',
+		type: 'submit',
+		formaction: '/cancel',
+		classes: 'govuk-button--secondary'
+	}
+];
+
+/**
+ * Build question props with secondaryActions appended, from questionsInOrder.
+ */
+const questionPropsWithSecondaryActions = Object.fromEntries(
+	Object.entries(questionProps).map(([k, v]) => [
+		k,
+		{
+			...v,
+			viewData: {
+				...v.viewData,
+				secondaryActions: testSecondaryActions
+			}
+		}
+	])
+);
+
+/**
+ * Question definitions that use the deprecated extraActionButtons
+ */
+const questionPropsWithExtraActionButtons = {
+	testRadioLegacy: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Test Radio Legacy',
+		question: 'Pick an option (legacy)',
+		fieldName: 'testRadioLegacy',
+		url: 'test-radio-legacy',
+		options: [
+			{ value: 'a', text: 'Option A' },
+			{ value: 'b', text: 'Option B' }
+		],
+		viewData: {
+			extraActionButtons: testSecondaryActions
+		}
+	}
+};
+
+function createBasicJourney(questions, response) {
+	const section = new Section('Test', 'questions');
+	for (const q of Object.values(questions)) {
+		section.addQuestion(q);
+	}
+	return new Journey({
+		journeyId: JOURNEY_ID,
+		sections: [section],
+		taskListUrl: 'check-your-answers',
+		journeyTemplate: 'views/layout-journey.njk',
+		taskListTemplate: 'views/layout-check-your-answers.njk',
+		journeyTitle: 'Secondary Actions Test',
+		returnToListing: false,
+		makeBaseUrl: () => '/',
+		initialBackLink: '/',
+		response
+	});
+}
+
+function getQuestions(props) {
+	return createQuestions(props, questionClasses, {});
+}
+
+describe('secondary actions', () => {
+	describe('renders secondaryActions buttons', () => {
+		const questionTypes = Object.entries(questionPropsWithSecondaryActions)
+			// filter out manage list sub-questions
+			.filter(([, v]) => questionsInOrder.some((q) => q.fieldName === v.fieldName));
+
+		for (const [, props] of questionTypes) {
+			it(`should render secondary action buttons for ${props.type} component`, async (ctx) => {
+				const questions = getQuestions(questionPropsWithSecondaryActions);
+				const testServer = await createAppWithQuestions(ctx, {
+					journeyId: JOURNEY_ID,
+					questions,
+					createJourneyFn: (q, response) => createTestJourney(q, response)
+				});
+
+				const response = await testServer.get(`/questions/${props.url}`, { redirect: 'manual' });
+				assert.strictEqual(response.status, 200);
+				const text = await response.text();
+
+				// should render the primary submit button
+				assert.match(text, /button-save-and-continue/);
+
+				// should wrap buttons in a button group
+				assert.match(text, /govuk-button-group/);
+
+				// should render the secondary action buttons
+				assert.match(text, /Save and return/);
+				assert.match(text, /button-save-and-return/);
+				assert.match(text, /Cancel/);
+				assert.match(text, /button-cancel/);
+
+				// should have secondary button classes
+				assert.match(text, /govuk-button--secondary/);
+			});
+		}
+	});
+
+	describe('backwards compatibility with extraActionButtons', () => {
+		it('should render buttons when extraActionButtons is used', async (ctx) => {
+			const questions = getQuestions(questionPropsWithExtraActionButtons);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createBasicJourney(q, response)
+			});
+
+			const response = await testServer.get('/questions/test-radio-legacy', { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			// should still render the secondary action buttons via backwards compat
+			assert.match(text, /Save and return/);
+			assert.match(text, /button-save-and-return/);
+			assert.match(text, /Cancel/);
+			assert.match(text, /button-cancel/);
+			assert.match(text, /govuk-button--secondary/);
+		});
+	});
+
+	describe('renders without secondaryActions', () => {
+		it('should render only the submit button when no secondaryActions', async (ctx) => {
+			// Use the first radio question without secondary actions
+			const radioQuestion = questionsInOrder.find((q) => q.type === COMPONENT_TYPES.RADIO);
+			const questionPropsNoActions = {
+				[radioQuestion.fieldName]: { ...radioQuestion }
+			};
+
+			const questions = getQuestions(questionPropsNoActions);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createBasicJourney(q, response)
+			});
+
+			const response = await testServer.get(`/questions/${radioQuestion.url}`, { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			// should render the primary submit button
+			assert.match(text, /button-save-and-continue/);
+
+			// should NOT wrap in a button group
+			assert.doesNotMatch(text, /govuk-button-group/);
+
+			// should NOT render secondary action buttons
+			assert.doesNotMatch(text, /button-save-and-return/);
+			assert.doesNotMatch(text, /button-cancel/);
+		});
+	});
+
+	describe('secondary action button attributes', () => {
+		const firstQuestionProps = Object.values(questionPropsWithSecondaryActions)[0];
+
+		it('should render formaction attribute', async (ctx) => {
+			const questions = getQuestions(questionPropsWithSecondaryActions);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createTestJourney(q, response)
+			});
+
+			const response = await testServer.get(`/questions/${firstQuestionProps.url}`, { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			// Cancel button should have formaction="/cancel"
+			assert.match(text, /formaction="\/cancel"/);
+		});
+
+		it('should render href attribute for link actions', async (ctx) => {
+			const questions = getQuestions(questionPropsWithSecondaryActions);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createTestJourney(q, response)
+			});
+
+			const response = await testServer.get(`/questions/${firstQuestionProps.url}`, { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			// "Save and return" link action should have href="/return"
+			assert.match(text, /href="\/return"/);
+		});
+	});
+
+	describe('snapshots', () => {
+		const radioQuestion = questionsInOrder.find((q) => q.type === COMPONENT_TYPES.RADIO);
+
+		it('should match snapshot with secondary actions', async (ctx) => {
+			const questions = getQuestions(questionPropsWithSecondaryActions);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createTestJourney(q, response)
+			});
+
+			mockRandomUUID(ctx);
+			const response = await testServer.get(`/questions/${radioQuestion.url}`, { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			assertSnapshot(ctx, text, 'secondary-actions-radio.html');
+		});
+
+		it('should match snapshot without secondary actions', async (ctx) => {
+			const questionPropsNoActions = {
+				[radioQuestion.fieldName]: { ...radioQuestion }
+			};
+
+			const questions = getQuestions(questionPropsNoActions);
+			const testServer = await createAppWithQuestions(ctx, {
+				journeyId: JOURNEY_ID,
+				questions,
+				createJourneyFn: (q, response) => createBasicJourney(q, response)
+			});
+
+			mockRandomUUID(ctx);
+			const response = await testServer.get(`/questions/${radioQuestion.url}`, { redirect: 'manual' });
+			assert.strictEqual(response.status, 200);
+			const text = await response.text();
+
+			assertSnapshot(ctx, text, 'secondary-actions-radio-plain.html');
+		});
+	});
+});

package/test/snapshots/add-insurance.html

@@ -26,9 +26,10 @@
 </div>
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/companions.html

@@ -29,7 +29,7 @@
 
 </fieldset>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
 

package/test/snapshots/contact-email.html

@@ -15,9 +15,10 @@
 </div>
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/departure-date.html

@@ -38,10 +38,10 @@
 </div>
 
 
-
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-activities.html

@@ -31,9 +31,10 @@
 </fieldset>
 </div>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-arrival.html

@@ -84,9 +84,10 @@
                     </fieldset>
                 </div>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-description.html

@@ -15,9 +15,10 @@
 
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-destination.html

@@ -37,10 +37,10 @@
 
 </fieldset>
 
-
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-period.html

@@ -83,9 +83,10 @@
 </div>
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/holiday-snack.html

@@ -15,9 +15,10 @@
 </div>
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/hotel-address.html

@@ -48,10 +48,11 @@
   <input class="govuk-input govuk-input--width-10" id="address-postcode" name="hotelAddress_postcode" type="text" value="" autocomplete="postal-code">
 </div>
 
-                    <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
 
+
 </fieldset>
             </form>
         </div>

package/test/snapshots/luggage-weight-units.html

@@ -52,9 +52,10 @@
 
 </fieldset>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/manage-list-render-questions.html

@@ -89,9 +89,10 @@
                     <a href="/add/00000000-0000-0000-0000-000000000000/first-question" class="govuk-link">Add another</a>
                 </p>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/manage-list-render.html

@@ -83,9 +83,10 @@
                     <a href="/add/00000000-0000-0000-0000-000000000000/first-question" class="govuk-link">Add another</a>
                 </p>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/nights.html

@@ -9,9 +9,10 @@
   <input class="govuk-input govuk-input--width-5" id="nights" name="nights" type="text" spellcheck="false" value="" inputmode="numeric">
 </div>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
-            </form>
+
+</form>
         </div>
     </div>

package/test/snapshots/secondary-actions-radio-plain.html

@@ -0,0 +1,46 @@
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">
+            <form action="" method="post" novalidate>
+
+
+<fieldset class="govuk-fieldset">
+  <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+    <h1 class="govuk-fieldset__heading">
+      Which type of travel insurance would you like?
+    </h1>
+  </legend>
+
+                        <div class="govuk-form-group">
+  <div class="govuk-radios govuk-radios" data-module="govuk-radios">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType" name="travelInsuranceType" type="radio" value="basic" data-cy="answer-basic">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType">
+        Basic
+      </label>
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType-2" name="travelInsuranceType" type="radio" value="comprehensive" data-cy="answer-comprehensive">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType-2">
+        Comprehensive
+      </label>
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType-3" name="travelInsuranceType" type="radio" value="premium" data-cy="answer-premium">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType-3">
+        Premium
+      </label>
+    </div>
+  </div>
+</div>
+
+
+
+</fieldset>
+
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+  Continue
+</button>
+
+            </form>
+        </div>
+    </div>

package/test/snapshots/secondary-actions-radio.html

@@ -0,0 +1,53 @@
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">
+            <form action="" method="post" novalidate>
+
+
+<fieldset class="govuk-fieldset">
+  <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+    <h1 class="govuk-fieldset__heading">
+      Which type of travel insurance would you like?
+    </h1>
+  </legend>
+
+                        <div class="govuk-form-group">
+  <div class="govuk-radios govuk-radios" data-module="govuk-radios">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType" name="travelInsuranceType" type="radio" value="basic" data-cy="answer-basic">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType">
+        Basic
+      </label>
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType-2" name="travelInsuranceType" type="radio" value="comprehensive" data-cy="answer-comprehensive">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType-2">
+        Comprehensive
+      </label>
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="travelInsuranceType-3" name="travelInsuranceType" type="radio" value="premium" data-cy="answer-premium">
+      <label class="govuk-label govuk-radios__label" for="travelInsuranceType-3">
+        Premium
+      </label>
+    </div>
+  </div>
+</div>
+
+
+
+</fieldset>
+
+<div class="govuk-button-group">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+  Continue
+</button>
+
+    <a href="/return" role="button" draggable="false" class="govuk-button govuk-button--secondary" data-module="govuk-button" data-cy="button-save-and-return">
+  Save and return
+</a>
+    <button type="submit" class="govuk-button govuk-button--secondary" data-module="govuk-button" data-cy="button-cancel" name="cancel" formaction="/cancel">
+  Cancel
+</button>
+</div>            </form>
+        </div>
+    </div>

package/test/snapshots/secret-wish.html

@@ -47,9 +47,10 @@
 </button>
                 </div>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
 

package/test/snapshots/travel-class.html

@@ -18,11 +18,11 @@
 </div>
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
 
-
             </form>
         </div>
     </div>

package/test/snapshots/travel-companions.html

@@ -11,9 +11,10 @@
                     <a href="/questions/travel-companions/add/00000000-0000-0000-0000-000000000000/travel-companion-name" class="govuk-link">Add another</a>
                 </p>
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/travel-companions_travel-companion-email.html

@@ -13,9 +13,10 @@
 
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/travel-companions_travel-companion-name.html

@@ -13,9 +13,10 @@
 
 
 
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/test/snapshots/travel-insurance-type.html

@@ -37,10 +37,10 @@
 
 </fieldset>
 
-
-                <button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
+<button type="submit" class="govuk-button" data-module="govuk-button" data-cy="button-save-and-continue">
   Continue
 </button>
+
             </form>
         </div>
     </div>

package/types/src/components/boolean/question.d.ts

@@ -20,8 +20,9 @@ export default class BooleanQuestion extends RadioQuestion {
      * @param {Array.<import('../../questions/options-question.js').Option>} [params.options]
      * @param {Array.<import('#base-validator').BaseValidator>} [params.validators]
      * @param {boolean} [params.editable]
+     * @param {import('#question-types').QuestionParameters['viewData']} [params.viewData]
      */
-    constructor({ title, question, fieldName, url, hint, pageTitle, description, html, validators, interfaceType, options, editable }: {
+    constructor({ title, question, fieldName, url, hint, pageTitle, description, html, validators, interfaceType, options, editable, viewData }: {
         title: string;
         question: string;
         fieldName: string;
@@ -34,6 +35,7 @@ export default class BooleanQuestion extends RadioQuestion {
         options?: import("../../questions/options-question.js").Option[] | undefined;
         validators?: any[] | undefined;
         editable?: boolean | undefined;
+        viewData?: import("#question-types").QuestionParameters["viewData"];
     });
     interfaceType: string;
     /**

package/types/src/components/boolean/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/components/boolean/question.js"],"names":[],"mappings":"AAEA;;;GAGG;AAMI,sCAHI,MAAM,GAAC,GAAC,GACN,OAAO,CAOnB;AAEM,8DAEN;AAMM,4CAHI,OAAO,GAAC,IAAI,GACV,MAAM,GAAC,IAAI,CAOvB;AAED;IACC;;;;;;;;;;;;;;OAcG;IACH,mIAbG;QAAuB,KAAK,EAApB,MAAM;QACS,QAAQ,EAAvB,MAAM;QACS,SAAS,EAAxB,MAAM;QACU,GAAG;QACH,IAAI;QACJ,SAAS;QACT,WAAW;QACX,IAAI;QACJ,aAAa;QACyC,OAAO;QACpB,UAAU;QAClD,QAAQ;KAAC,EAiDpC;IADA,sBAAkC;IAGnC;;;;;OAKG,CACH,yCAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAe5B;CACD;0BAtHyB,sBAAsB"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/components/boolean/question.js"],"names":[],"mappings":"AAEA;;;GAGG;AAMI,sCAHI,MAAM,GAAC,GAAC,GACN,OAAO,CAOnB;AAEM,8DAEN;AAMM,4CAHI,OAAO,GAAC,IAAI,GACV,MAAM,GAAC,IAAI,CAOvB;AAED;IACC;;;;;;;;;;;;;;;OAeG;IACH,6IAdG;QAAuB,KAAK,EAApB,MAAM;QACS,QAAQ,EAAvB,MAAM;QACS,SAAS,EAAxB,MAAM;QACU,GAAG;QACH,IAAI;QACJ,SAAS;QACT,WAAW;QACX,IAAI;QACJ,aAAa;QACyC,OAAO;QACpB,UAAU;QAClD,QAAQ;QACyC,QAAQ,GAA1E,OAAO,iBAAiB,EAAE,kBAAkB,CAAC,UAAU,CAAC;KAAmB,EAmDrF;IADA,sBAAkC;IAGnC;;;;;OAKG,CACH,yCAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAe5B;CACD;0BAzHyB,sBAAsB"}