From 32831cfa9bfc374b4132b5c4a32617aac7b31fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 09:33:54 +0000 Subject: [PATCH 1/2] Bump the lint group with 2 updates Bumps the lint group with 2 updates: [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) and [husky](https://github.com/typicode/husky). Updates `eslint-plugin-jsdoc` from 48.8.3 to 48.9.2 - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc) - [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v48.8.3...v48.9.2) Updates `husky` from 9.1.1 to 9.1.3 - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.1...v9.1.3) --- updated-dependencies: - dependency-name: eslint-plugin-jsdoc dependency-type: direct:development update-type: version-update:semver-minor dependency-group: lint - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch dependency-group: lint ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c43b41fe..4dc66273 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,10 +77,10 @@ "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^28.6.0", - "eslint-plugin-jsdoc": "^48.8.3", + "eslint-plugin-jsdoc": "^48.9.2", "eslint-plugin-n": "^16.6.2", "eslint-plugin-promise": "^6.6.0", - "husky": "^9.1.1", + "husky": "^9.1.3", "jest": "^29.7.0", "lint-staged": "^15.2.7", "nodemon": "^3.1.3", @@ -7618,9 +7618,9 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "48.8.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.8.3.tgz", - "integrity": "sha512-AtIvwwW9D17MRkM0Z0y3/xZYaa9mdAvJrkY6fU/HNUwGbmMtHVvK4qRM9CDixGVtfNrQitb8c6zQtdh6cTOvLg==", + "version": "48.9.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.9.2.tgz", + "integrity": "sha512-ydqg2lEY/WxhMXEb1ZAn+yRbc43DlKYdMP/nUreF5ODE1P9mgeff8atL16lYNNKOvYxNOzL85/5gFVeGylSioA==", "dev": true, "dependencies": { "@es-joy/jsdoccomment": "~0.46.0", @@ -8936,9 +8936,9 @@ } }, "node_modules/husky": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.1.tgz", - "integrity": "sha512-fCqlqLXcBnXa/TJXmT93/A36tJsjdJkibQ1MuIiFyCCYUlpYpIaj2mv1w+3KR6Rzu1IC3slFTje5f6DUp2A2rg==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.3.tgz", + "integrity": "sha512-ET3TQmQgdIu0pt+jKkpo5oGyg/4MQZpG6xcam5J5JyNJV+CBT23OBpCF15bKHKycRyMH9k6ONy8g2HdGIsSkMQ==", "dev": true, "bin": { "husky": "bin.js" diff --git a/package.json b/package.json index f9b99a2c..afce151f 100644 --- a/package.json +++ b/package.json @@ -105,10 +105,10 @@ "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^28.6.0", - "eslint-plugin-jsdoc": "^48.8.3", + "eslint-plugin-jsdoc": "^48.9.2", "eslint-plugin-n": "^16.6.2", "eslint-plugin-promise": "^6.6.0", - "husky": "^9.1.1", + "husky": "^9.1.3", "jest": "^29.7.0", "lint-staged": "^15.2.7", "nodemon": "^3.1.3", From 359f15266a55a1c2dd8526edd848e4c7ba090067 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Mon, 29 Jul 2024 12:59:44 +0100 Subject: [PATCH 2/2] Add missing types used in JSDoc comments --- src/server/plugins/engine/components/ComponentBase.ts | 1 + src/server/plugins/engine/components/MonthYearField.test.ts | 2 ++ .../plugins/engine/pageControllers/SummaryPageController.ts | 2 +- src/server/services/cacheService.ts | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/plugins/engine/components/ComponentBase.ts b/src/server/plugins/engine/components/ComponentBase.ts index 045af8a0..8789d336 100644 --- a/src/server/plugins/engine/components/ComponentBase.ts +++ b/src/server/plugins/engine/components/ComponentBase.ts @@ -19,6 +19,7 @@ import { type ViewModel } from '~/src/server/plugins/engine/components/types.js' import { type FormModel } from '~/src/server/plugins/engine/models/index.js' +import { answerFromDetailItem } from '~/src/server/plugins/engine/pageControllers/SummaryPageController.js' import { type FormPayload, type FormSubmissionErrors diff --git a/src/server/plugins/engine/components/MonthYearField.test.ts b/src/server/plugins/engine/components/MonthYearField.test.ts index 2483d48a..821f08a1 100644 --- a/src/server/plugins/engine/components/MonthYearField.test.ts +++ b/src/server/plugins/engine/components/MonthYearField.test.ts @@ -1,7 +1,9 @@ import { type ComponentDef, ComponentType } from '@defra/forms-model' import joi, { type ObjectSchema } from 'joi' +import { type ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js' import { MonthYearField } from '~/src/server/plugins/engine/components/index.js' +import { type PageControllerBase } from '~/src/server/plugins/engine/pageControllers/PageControllerBase.js' import { messages } from '~/src/server/plugins/engine/pageControllers/validationOptions.js' /** diff --git a/src/server/plugins/engine/pageControllers/SummaryPageController.ts b/src/server/plugins/engine/pageControllers/SummaryPageController.ts index 814b9138..f02a957b 100644 --- a/src/server/plugins/engine/pageControllers/SummaryPageController.ts +++ b/src/server/plugins/engine/pageControllers/SummaryPageController.ts @@ -313,7 +313,7 @@ function getFormSubmissionData( } } -function answerFromDetailItem(item: DetailItem) { +export function answerFromDetailItem(item: DetailItem) { switch (item.dataType) { case 'list': return item.rawValue diff --git a/src/server/services/cacheService.ts b/src/server/services/cacheService.ts index 20ef224b..bade3a09 100644 --- a/src/server/services/cacheService.ts +++ b/src/server/services/cacheService.ts @@ -4,6 +4,7 @@ import { merge } from '@hapi/hoek' import { type ViewModel } from '../plugins/engine/components/types.js' import { config } from '~/src/config/index.js' +import { type createServer } from '~/src/server/index.js' import { type FormSubmissionState } from '~/src/server/plugins/engine/types.js' const partition = 'cache'