@defra/forms-engine-plugin 4.11.0 → 4.11.1

package/.server/server/plugins/engine/components/MultilineTextField.js

@@ -9,7 +9,7 @@ export class MultilineTextField extends FormComponent {
       schema,
       options
     } = def;
-    let formSchema = Joi.string().trim().label(this.label).required();
+    let formSchema = Joi.string().replace(/\r\n/g, '\n').trim().label(this.label).required();
     if (options.required === false) {
       formSchema = formSchema.allow('');
     }

package/.server/server/plugins/engine/components/MultilineTextField.js.map

@@ -1 +1 @@
-{"version":3,"file":"MultilineTextField.js","names":["Joi","FormComponent","messageTemplate","MultilineTextField","isCharacterOrWordCount","constructor","def","props","schema","options","formSchema","string","trim","label","required","allow","length","max","min","maxWords","custom","getValidatorMaxWords","regex","pattern","RegExp","customValidationMessage","message","messages","customValidationMessages","minMaxErrorText","buildMinMaxText","ruleset","default","stateSchema","getViewModel","payload","errors","viewModel","maxlength","maxwords","rows","minMaxError","minMax","replace","toString","getAllPossibleErrors","staticErrors","advancedSettingsErrors","type","template","baseErrors","component","validator","value","helpers","limit","count","error","text","tokens","match"],"sources":["../../../../../src/server/plugins/engine/components/MultilineTextField.ts"],"sourcesContent":["import { type MultilineTextFieldComponent } from '@defra/forms-model'\nimport Joi, { type CustomValidator, type StringSchema } from 'joi'\n\nimport { type ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js'\nimport { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormSubmissionError\n} from '~/src/server/plugins/engine/types.js'\n\nexport class MultilineTextField extends FormComponent {\n  declare options: MultilineTextFieldComponent['options']\n  declare schema: MultilineTextFieldComponent['schema']\n  declare formSchema: StringSchema\n  declare stateSchema: StringSchema\n\n  isCharacterOrWordCount = false\n\n  constructor(\n    def: MultilineTextFieldComponent,\n    props: ConstructorParameters<typeof ComponentBase>[1]\n  ) {\n    super(def, props)\n\n    const { schema, options } = def\n\n    let formSchema = Joi.string().trim().label(this.label).required()\n\n    if (options.required === false) {\n      formSchema = formSchema.allow('')\n    }\n\n    if (typeof schema.length !== 'number') {\n      if (typeof schema.max === 'number') {\n        formSchema = formSchema.max(schema.max)\n        this.isCharacterOrWordCount = true\n      }\n\n      if (typeof schema.min === 'number') {\n        formSchema = formSchema.min(schema.min)\n      }\n    } else {\n      formSchema = formSchema.length(schema.length)\n    }\n\n    if (typeof options.maxWords === 'number') {\n      formSchema = formSchema.custom(\n        getValidatorMaxWords(this),\n        'max words validation'\n      )\n\n      this.isCharacterOrWordCount = true\n    }\n\n    if (schema.regex) {\n      const pattern = new RegExp(schema.regex)\n      formSchema = formSchema.pattern(pattern)\n    }\n\n    if (options.customValidationMessage) {\n      const message = options.customValidationMessage\n\n      formSchema = formSchema.messages({\n        'any.required': message,\n        'string.empty': message,\n        'string.max': message,\n        'string.min': message,\n        'string.length': message,\n        'string.pattern.base': message,\n        'string.maxWords': message\n      })\n    } else if (options.customValidationMessages) {\n      formSchema = formSchema.messages(options.customValidationMessages)\n    } else if (\n      typeof schema.max === 'number' &&\n      typeof schema.min === 'number'\n    ) {\n      const minMaxErrorText = this.buildMinMaxText(schema.min, schema.max)\n      formSchema = formSchema.ruleset\n        .min(schema.min)\n        .max(schema.max)\n        .message(minMaxErrorText)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n    this.schema = schema\n  }\n\n  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {\n    const { schema, options, isCharacterOrWordCount } = this\n\n    const viewModel = super.getViewModel(payload, errors)\n    let { maxlength, maxwords, rows } = viewModel\n\n    if (schema.max) {\n      maxlength = schema.max\n    }\n\n    if (options.maxWords) {\n      maxwords = options.maxWords\n    }\n\n    if (options.rows) {\n      rows = options.rows\n    }\n\n    return {\n      ...viewModel,\n      isCharacterOrWordCount,\n      maxlength,\n      maxwords,\n      rows\n    }\n  }\n\n  buildMinMaxText(min?: number, max?: number): string {\n    const minMaxError = messageTemplate.minMax as string\n    return minMaxError\n      .replace('{{#min}}', min ? min.toString() : '[min length]')\n      .replace('{{#max}}', max ? max.toString() : '[max length]')\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    const staticErrors = MultilineTextField.getAllPossibleErrors()\n    return {\n      ...staticErrors,\n      advancedSettingsErrors: [\n        ...staticErrors.advancedSettingsErrors,\n        {\n          type: 'minMax',\n          template: this.buildMinMaxText(this.schema.min, this.schema.max)\n        }\n      ]\n    }\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [{ type: 'required', template: messageTemplate.required }],\n      advancedSettingsErrors: [\n        { type: 'min', template: messageTemplate.min },\n        { type: 'max', template: messageTemplate.max }\n      ]\n    }\n  }\n}\n\nfunction getValidatorMaxWords(component: MultilineTextField) {\n  const validator: CustomValidator = (value: string, helpers) => {\n    const { options } = component\n\n    const {\n      customValidationMessage: custom,\n      maxWords: limit // See {{#limit}} variable\n    } = options\n\n    if (!limit || count(value) <= limit) {\n      return value\n    }\n\n    return custom\n      ? helpers.message({ custom }, { limit })\n      : helpers.error('string.maxWords', { limit })\n  }\n\n  /**\n   * Count the number of words in the given text\n   * @see GOV.UK Frontend {@link https://github.com/alphagov/govuk-frontend/blob/v5.4.0/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs#L343 | Character count `maxwords` implementation}\n   */\n  function count(text: string) {\n    const tokens = text.match(/\\S+/g) ?? []\n    return tokens.length\n  }\n\n  return validator\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"MultilineTextField.js","names":["Joi","FormComponent","messageTemplate","MultilineTextField","isCharacterOrWordCount","constructor","def","props","schema","options","formSchema","string","replace","trim","label","required","allow","length","max","min","maxWords","custom","getValidatorMaxWords","regex","pattern","RegExp","customValidationMessage","message","messages","customValidationMessages","minMaxErrorText","buildMinMaxText","ruleset","default","stateSchema","getViewModel","payload","errors","viewModel","maxlength","maxwords","rows","minMaxError","minMax","toString","getAllPossibleErrors","staticErrors","advancedSettingsErrors","type","template","baseErrors","component","validator","value","helpers","limit","count","error","text","tokens","match"],"sources":["../../../../../src/server/plugins/engine/components/MultilineTextField.ts"],"sourcesContent":["import { type MultilineTextFieldComponent } from '@defra/forms-model'\nimport Joi, { type CustomValidator, type StringSchema } from 'joi'\n\nimport { type ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js'\nimport { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormSubmissionError\n} from '~/src/server/plugins/engine/types.js'\n\nexport class MultilineTextField extends FormComponent {\n  declare options: MultilineTextFieldComponent['options']\n  declare schema: MultilineTextFieldComponent['schema']\n  declare formSchema: StringSchema\n  declare stateSchema: StringSchema\n\n  isCharacterOrWordCount = false\n\n  constructor(\n    def: MultilineTextFieldComponent,\n    props: ConstructorParameters<typeof ComponentBase>[1]\n  ) {\n    super(def, props)\n\n    const { schema, options } = def\n\n    let formSchema = Joi.string()\n      .replace(/\\r\\n/g, '\\n')\n      .trim()\n      .label(this.label)\n      .required()\n\n    if (options.required === false) {\n      formSchema = formSchema.allow('')\n    }\n\n    if (typeof schema.length !== 'number') {\n      if (typeof schema.max === 'number') {\n        formSchema = formSchema.max(schema.max)\n        this.isCharacterOrWordCount = true\n      }\n\n      if (typeof schema.min === 'number') {\n        formSchema = formSchema.min(schema.min)\n      }\n    } else {\n      formSchema = formSchema.length(schema.length)\n    }\n\n    if (typeof options.maxWords === 'number') {\n      formSchema = formSchema.custom(\n        getValidatorMaxWords(this),\n        'max words validation'\n      )\n\n      this.isCharacterOrWordCount = true\n    }\n\n    if (schema.regex) {\n      const pattern = new RegExp(schema.regex)\n      formSchema = formSchema.pattern(pattern)\n    }\n\n    if (options.customValidationMessage) {\n      const message = options.customValidationMessage\n\n      formSchema = formSchema.messages({\n        'any.required': message,\n        'string.empty': message,\n        'string.max': message,\n        'string.min': message,\n        'string.length': message,\n        'string.pattern.base': message,\n        'string.maxWords': message\n      })\n    } else if (options.customValidationMessages) {\n      formSchema = formSchema.messages(options.customValidationMessages)\n    } else if (\n      typeof schema.max === 'number' &&\n      typeof schema.min === 'number'\n    ) {\n      const minMaxErrorText = this.buildMinMaxText(schema.min, schema.max)\n      formSchema = formSchema.ruleset\n        .min(schema.min)\n        .max(schema.max)\n        .message(minMaxErrorText)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n    this.schema = schema\n  }\n\n  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {\n    const { schema, options, isCharacterOrWordCount } = this\n\n    const viewModel = super.getViewModel(payload, errors)\n    let { maxlength, maxwords, rows } = viewModel\n\n    if (schema.max) {\n      maxlength = schema.max\n    }\n\n    if (options.maxWords) {\n      maxwords = options.maxWords\n    }\n\n    if (options.rows) {\n      rows = options.rows\n    }\n\n    return {\n      ...viewModel,\n      isCharacterOrWordCount,\n      maxlength,\n      maxwords,\n      rows\n    }\n  }\n\n  buildMinMaxText(min?: number, max?: number): string {\n    const minMaxError = messageTemplate.minMax as string\n    return minMaxError\n      .replace('{{#min}}', min ? min.toString() : '[min length]')\n      .replace('{{#max}}', max ? max.toString() : '[max length]')\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    const staticErrors = MultilineTextField.getAllPossibleErrors()\n    return {\n      ...staticErrors,\n      advancedSettingsErrors: [\n        ...staticErrors.advancedSettingsErrors,\n        {\n          type: 'minMax',\n          template: this.buildMinMaxText(this.schema.min, this.schema.max)\n        }\n      ]\n    }\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [{ type: 'required', template: messageTemplate.required }],\n      advancedSettingsErrors: [\n        { type: 'min', template: messageTemplate.min },\n        { type: 'max', template: messageTemplate.max }\n      ]\n    }\n  }\n}\n\nfunction getValidatorMaxWords(component: MultilineTextField) {\n  const validator: CustomValidator = (value: string, helpers) => {\n    const { options } = component\n\n    const {\n      customValidationMessage: custom,\n      maxWords: limit // See {{#limit}} variable\n    } = options\n\n    if (!limit || count(value) <= limit) {\n      return value\n    }\n\n    return custom\n      ? helpers.message({ custom }, { limit })\n      : helpers.error('string.maxWords', { limit })\n  }\n\n  /**\n   * Count the number of words in the given text\n   * @see GOV.UK Frontend {@link https://github.com/alphagov/govuk-frontend/blob/v5.4.0/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs#L343 | Character count `maxwords` implementation}\n   */\n  function count(text: string) {\n    const tokens = text.match(/\\S+/g) ?? []\n    return tokens.length\n  }\n\n  return validator\n}\n"],"mappings":"AACA,OAAOA,GAAG,MAAmD,KAAK;AAGlE,SAASC,aAAa;AACtB,SAASC,eAAe;AAOxB,OAAO,MAAMC,kBAAkB,SAASF,aAAa,CAAC;EAMpDG,sBAAsB,GAAG,KAAK;EAE9BC,WAAWA,CACTC,GAAgC,EAChCC,KAAqD,EACrD;IACA,KAAK,CAACD,GAAG,EAAEC,KAAK,CAAC;IAEjB,MAAM;MAAEC,MAAM;MAAEC;IAAQ,CAAC,GAAGH,GAAG;IAE/B,IAAII,UAAU,GAAGV,GAAG,CAACW,MAAM,CAAC,CAAC,CAC1BC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CACtBC,IAAI,CAAC,CAAC,CACNC,KAAK,CAAC,IAAI,CAACA,KAAK,CAAC,CACjBC,QAAQ,CAAC,CAAC;IAEb,IAAIN,OAAO,CAACM,QAAQ,KAAK,KAAK,EAAE;MAC9BL,UAAU,GAAGA,UAAU,CAACM,KAAK,CAAC,EAAE,CAAC;IACnC;IAEA,IAAI,OAAOR,MAAM,CAACS,MAAM,KAAK,QAAQ,EAAE;MACrC,IAAI,OAAOT,MAAM,CAACU,GAAG,KAAK,QAAQ,EAAE;QAClCR,UAAU,GAAGA,UAAU,CAACQ,GAAG,CAACV,MAAM,CAACU,GAAG,CAAC;QACvC,IAAI,CAACd,sBAAsB,GAAG,IAAI;MACpC;MAEA,IAAI,OAAOI,MAAM,CAACW,GAAG,KAAK,QAAQ,EAAE;QAClCT,UAAU,GAAGA,UAAU,CAACS,GAAG,CAACX,MAAM,CAACW,GAAG,CAAC;MACzC;IACF,CAAC,MAAM;MACLT,UAAU,GAAGA,UAAU,CAACO,MAAM,CAACT,MAAM,CAACS,MAAM,CAAC;IAC/C;IAEA,IAAI,OAAOR,OAAO,CAACW,QAAQ,KAAK,QAAQ,EAAE;MACxCV,UAAU,GAAGA,UAAU,CAACW,MAAM,CAC5BC,oBAAoB,CAAC,IAAI,CAAC,EAC1B,sBACF,CAAC;MAED,IAAI,CAAClB,sBAAsB,GAAG,IAAI;IACpC;IAEA,IAAII,MAAM,CAACe,KAAK,EAAE;MAChB,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAACjB,MAAM,CAACe,KAAK,CAAC;MACxCb,UAAU,GAAGA,UAAU,CAACc,OAAO,CAACA,OAAO,CAAC;IAC1C;IAEA,IAAIf,OAAO,CAACiB,uBAAuB,EAAE;MACnC,MAAMC,OAAO,GAAGlB,OAAO,CAACiB,uBAAuB;MAE/ChB,UAAU,GAAGA,UAAU,CAACkB,QAAQ,CAAC;QAC/B,cAAc,EAAED,OAAO;QACvB,cAAc,EAAEA,OAAO;QACvB,YAAY,EAAEA,OAAO;QACrB,YAAY,EAAEA,OAAO;QACrB,eAAe,EAAEA,OAAO;QACxB,qBAAqB,EAAEA,OAAO;QAC9B,iBAAiB,EAAEA;MACrB,CAAC,CAAC;IACJ,CAAC,MAAM,IAAIlB,OAAO,CAACoB,wBAAwB,EAAE;MAC3CnB,UAAU,GAAGA,UAAU,CAACkB,QAAQ,CAACnB,OAAO,CAACoB,wBAAwB,CAAC;IACpE,CAAC,MAAM,IACL,OAAOrB,MAAM,CAACU,GAAG,KAAK,QAAQ,IAC9B,OAAOV,MAAM,CAACW,GAAG,KAAK,QAAQ,EAC9B;MACA,MAAMW,eAAe,GAAG,IAAI,CAACC,eAAe,CAACvB,MAAM,CAACW,GAAG,EAAEX,MAAM,CAACU,GAAG,CAAC;MACpER,UAAU,GAAGA,UAAU,CAACsB,OAAO,CAC5Bb,GAAG,CAACX,MAAM,CAACW,GAAG,CAAC,CACfD,GAAG,CAACV,MAAM,CAACU,GAAG,CAAC,CACfS,OAAO,CAACG,eAAe,CAAC;IAC7B;IAEA,IAAI,CAACpB,UAAU,GAAGA,UAAU,CAACuB,OAAO,CAAC,EAAE,CAAC;IACxC,IAAI,CAACC,WAAW,GAAGxB,UAAU,CAACuB,OAAO,CAAC,IAAI,CAAC,CAACjB,KAAK,CAAC,IAAI,CAAC;IACvD,IAAI,CAACP,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACD,MAAM,GAAGA,MAAM;EACtB;EAEA2B,YAAYA,CAACC,OAAoB,EAAEC,MAA8B,EAAE;IACjE,MAAM;MAAE7B,MAAM;MAAEC,OAAO;MAAEL;IAAuB,CAAC,GAAG,IAAI;IAExD,MAAMkC,SAAS,GAAG,KAAK,CAACH,YAAY,CAACC,OAAO,EAAEC,MAAM,CAAC;IACrD,IAAI;MAAEE,SAAS;MAAEC,QAAQ;MAAEC;IAAK,CAAC,GAAGH,SAAS;IAE7C,IAAI9B,MAAM,CAACU,GAAG,EAAE;MACdqB,SAAS,GAAG/B,MAAM,CAACU,GAAG;IACxB;IAEA,IAAIT,OAAO,CAACW,QAAQ,EAAE;MACpBoB,QAAQ,GAAG/B,OAAO,CAACW,QAAQ;IAC7B;IAEA,IAAIX,OAAO,CAACgC,IAAI,EAAE;MAChBA,IAAI,GAAGhC,OAAO,CAACgC,IAAI;IACrB;IAEA,OAAO;MACL,GAAGH,SAAS;MACZlC,sBAAsB;MACtBmC,SAAS;MACTC,QAAQ;MACRC;IACF,CAAC;EACH;EAEAV,eAAeA,CAACZ,GAAY,EAAED,GAAY,EAAU;IAClD,MAAMwB,WAAW,GAAGxC,eAAe,CAACyC,MAAgB;IACpD,OAAOD,WAAW,CACf9B,OAAO,CAAC,UAAU,EAAEO,GAAG,GAAGA,GAAG,CAACyB,QAAQ,CAAC,CAAC,GAAG,cAAc,CAAC,CAC1DhC,OAAO,CAAC,UAAU,EAAEM,GAAG,GAAGA,GAAG,CAAC0B,QAAQ,CAAC,CAAC,GAAG,cAAc,CAAC;EAC/D;;EAEA;AACF;AACA;EACEC,oBAAoBA,CAAA,EAA6B;IAC/C,MAAMC,YAAY,GAAG3C,kBAAkB,CAAC0C,oBAAoB,CAAC,CAAC;IAC9D,OAAO;MACL,GAAGC,YAAY;MACfC,sBAAsB,EAAE,CACtB,GAAGD,YAAY,CAACC,sBAAsB,EACtC;QACEC,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE,IAAI,CAAClB,eAAe,CAAC,IAAI,CAACvB,MAAM,CAACW,GAAG,EAAE,IAAI,CAACX,MAAM,CAACU,GAAG;MACjE,CAAC;IAEL,CAAC;EACH;;EAEA;AACF;AACA;EACE,OAAO2B,oBAAoBA,CAAA,EAA6B;IACtD,OAAO;MACLK,UAAU,EAAE,CAAC;QAAEF,IAAI,EAAE,UAAU;QAAEC,QAAQ,EAAE/C,eAAe,CAACa;MAAS,CAAC,CAAC;MACtEgC,sBAAsB,EAAE,CACtB;QAAEC,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE/C,eAAe,CAACiB;MAAI,CAAC,EAC9C;QAAE6B,IAAI,EAAE,KAAK;QAAEC,QAAQ,EAAE/C,eAAe,CAACgB;MAAI,CAAC;IAElD,CAAC;EACH;AACF;AAEA,SAASI,oBAAoBA,CAAC6B,SAA6B,EAAE;EAC3D,MAAMC,SAA0B,GAAGA,CAACC,KAAa,EAAEC,OAAO,KAAK;IAC7D,MAAM;MAAE7C;IAAQ,CAAC,GAAG0C,SAAS;IAE7B,MAAM;MACJzB,uBAAuB,EAAEL,MAAM;MAC/BD,QAAQ,EAAEmC,KAAK,CAAC;IAClB,CAAC,GAAG9C,OAAO;IAEX,IAAI,CAAC8C,KAAK,IAAIC,KAAK,CAACH,KAAK,CAAC,IAAIE,KAAK,EAAE;MACnC,OAAOF,KAAK;IACd;IAEA,OAAOhC,MAAM,GACTiC,OAAO,CAAC3B,OAAO,CAAC;MAAEN;IAAO,CAAC,EAAE;MAAEkC;IAAM,CAAC,CAAC,GACtCD,OAAO,CAACG,KAAK,CAAC,iBAAiB,EAAE;MAAEF;IAAM,CAAC,CAAC;EACjD,CAAC;;EAED;AACF;AACA;AACA;EACE,SAASC,KAAKA,CAACE,IAAY,EAAE;IAC3B,MAAMC,MAAM,GAAGD,IAAI,CAACE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;IACvC,OAAOD,MAAM,CAAC1C,MAAM;EACtB;EAEA,OAAOmC,SAAS;AAClB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "Defra forms engine",
   "type": "module",
   "files": [

package/src/server/plugins/engine/components/MultilineTextField.ts

@@ -26,7 +26,11 @@ export class MultilineTextField extends FormComponent {
 
     const { schema, options } = def
 
-    let formSchema = Joi.string().trim().label(this.label).required()
+    let formSchema = Joi.string()
+      .replace(/\r\n/g, '\n')
+      .trim()
+      .label(this.label)
+      .required()
 
     if (options.required === false) {
       formSchema = formSchema.allow('')