@defra/forms-engine-plugin 0.0.5 → 0.0.6

package/src/server/services/cacheService.ts

@@ -27,8 +27,15 @@ export class CacheService {
   cache
   logger: Server['logger']
 
-  constructor(server: Server) {
-    this.cache = server.cache({ cache: 'session', segment: 'formSubmission' })
+  constructor(server: Server, cacheName?: string) {
+    if (!cacheName) {
+      server.log(
+        'warn',
+        'You are using the default hapi cache. Please provide a cache name in plugin registration options.'
+      )
+    }
+
+    this.cache = server.cache({ cache: cacheName, segment: 'formSubmission' })
     this.logger = server.logger
   }
 

package/src/typings/hapi/index.d.ts

@@ -18,6 +18,9 @@ declare module '@hapi/hapi' {
     crumb: {
       generate?: (request: Request | FormRequest | FormRequestPayload) => string
     }
+    'forms-engine-plugin': {
+      cacheService: CacheService
+    }
   }
 
   interface PluginsStates {
@@ -49,17 +52,6 @@ declare module '@hapi/hapi' {
   }
 }
 
-declare module '@hapipal/schmervice' {
-  interface RegisteredServices {
-    cacheService: CacheService
-  }
-
-  interface SchmerviceDecorator {
-    (all?: boolean): RegisteredServices
-    (namespace?: string[]): RegisteredServices
-  }
-}
-
 declare module '@hapi/scooter' {
   declare const hapiScooter: {
     plugin: Plugin

package/.server/server/views/components/service-banner/template.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"template.test.js","names":["renderMacro","describe","$component","$content","$text","beforeEach","container","document","params","title","text","getByRole","querySelector","it","expect","toBeInTheDocument","toHaveClass","toContainElement","toHaveAttribute","toHaveAccessibleName","toHaveTextContent"],"sources":["../../../../../src/server/views/components/service-banner/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Service banner component', () => {\n  let $component = /** @type {HTMLElement | null} */ (null)\n  let $content = /** @type {HTMLElement | null} */ (null)\n  let $text = /** @type {HTMLElement | null} */ (null)\n\n  beforeEach(() => {\n    const { container, document } = renderMacro(\n      'appServiceBanner',\n      'components/service-banner/macro.njk',\n      {\n        params: {\n          title: 'Service status',\n          text: 'This is a service status message'\n        }\n      }\n    )\n\n    $component = container.getByRole('complementary')\n    $content = document.querySelector('.app-service-banner__content')\n    $text = document.querySelector('.app-service-banner__text')\n  })\n\n  it('should render contents', () => {\n    expect($component).toBeInTheDocument()\n    expect($component).toHaveClass('app-service-banner')\n    expect($component).toContainElement($content)\n    expect($content).toContainElement($text)\n  })\n\n  it('should announce service message', () => {\n    expect($component).toHaveAttribute('aria-live', 'polite')\n  })\n\n  it('should have accessible name', () => {\n    expect($component).toHaveAccessibleName('Service status')\n  })\n\n  it('should have text content', () => {\n    expect($text).toHaveTextContent('This is a service status message')\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,0BAA0B,EAAE,MAAM;EACzC,IAAIC,UAAU,GAAG,iCAAmC,IAAK;EACzD,IAAIC,QAAQ,GAAG,iCAAmC,IAAK;EACvD,IAAIC,KAAK,GAAG,iCAAmC,IAAK;EAEpDC,UAAU,CAAC,MAAM;IACf,MAAM;MAAEC,SAAS;MAAEC;IAAS,CAAC,GAAGP,WAAW,CACzC,kBAAkB,EAClB,qCAAqC,EACrC;MACEQ,MAAM,EAAE;QACNC,KAAK,EAAE,gBAAgB;QACvBC,IAAI,EAAE;MACR;IACF,CACF,CAAC;IAEDR,UAAU,GAAGI,SAAS,CAACK,SAAS,CAAC,eAAe,CAAC;IACjDR,QAAQ,GAAGI,QAAQ,CAACK,aAAa,CAAC,8BAA8B,CAAC;IACjER,KAAK,GAAGG,QAAQ,CAACK,aAAa,CAAC,2BAA2B,CAAC;EAC7D,CAAC,CAAC;EAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;IACjCC,MAAM,CAACZ,UAAU,CAAC,CAACa,iBAAiB,CAAC,CAAC;IACtCD,MAAM,CAACZ,UAAU,CAAC,CAACc,WAAW,CAAC,oBAAoB,CAAC;IACpDF,MAAM,CAACZ,UAAU,CAAC,CAACe,gBAAgB,CAACd,QAAQ,CAAC;IAC7CW,MAAM,CAACX,QAAQ,CAAC,CAACc,gBAAgB,CAACb,KAAK,CAAC;EAC1C,CAAC,CAAC;EAEFS,EAAE,CAAC,iCAAiC,EAAE,MAAM;IAC1CC,MAAM,CAACZ,UAAU,CAAC,CAACgB,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC;EAC3D,CAAC,CAAC;EAEFL,EAAE,CAAC,6BAA6B,EAAE,MAAM;IACtCC,MAAM,CAACZ,UAAU,CAAC,CAACiB,oBAAoB,CAAC,gBAAgB,CAAC;EAC3D,CAAC,CAAC;EAEFN,EAAE,CAAC,0BAA0B,EAAE,MAAM;IACnCC,MAAM,CAACV,KAAK,CAAC,CAACgB,iBAAiB,CAAC,kCAAkC,CAAC;EACrE,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/.server/server/views/components/tag-env/template.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"template.test.js","names":["renderMacro","describe","each","text","env","colour","$component","beforeEach","container","params","getByRole","it","expect","toBeInTheDocument","toHaveClass","toHaveTextContent"],"sources":["../../../../../src/server/views/components/tag-env/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Tag environment component', () => {\n  describe.each([\n    {\n      text: 'Local',\n      env: 'local',\n      colour: 'green'\n    },\n    {\n      text: 'Development',\n      env: 'dev',\n      colour: 'grey'\n    },\n    {\n      text: 'Test',\n      env: 'test',\n      colour: 'yellow'\n    },\n    {\n      text: 'External test',\n      env: 'ext-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Performance test',\n      env: 'perf-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Production',\n      env: 'prod',\n      colour: 'red'\n    },\n    {\n      text: 'Unknown environment',\n      env: 'unknown-environment',\n      colour: 'grey'\n    }\n  ])('Environment: $text', ({ text, env, colour }) => {\n    let $component = /** @type {HTMLElement | null} */ (null)\n\n    beforeEach(() => {\n      const { container } = renderMacro(\n        'appTagEnv',\n        'components/tag-env/macro.njk',\n        { params: { env } }\n      )\n\n      $component = container.getByRole('strong')\n    })\n\n    it('should render contents', () => {\n      expect($component).toBeInTheDocument()\n      expect($component).toHaveClass('govuk-tag')\n    })\n\n    it('should have text content', () => {\n      expect($component).toHaveTextContent(text)\n    })\n\n    it('should use environment colour', () => {\n      expect($component).toHaveClass(`govuk-tag--${colour}`)\n    })\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1CA,QAAQ,CAACC,IAAI,CAAC,CACZ;IACEC,IAAI,EAAE,OAAO;IACbC,GAAG,EAAE,OAAO;IACZC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,aAAa;IACnBC,GAAG,EAAE,KAAK;IACVC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,MAAM;IACZC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,eAAe;IACrBC,GAAG,EAAE,UAAU;IACfC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,kBAAkB;IACxBC,GAAG,EAAE,WAAW;IAChBC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,YAAY;IAClBC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,qBAAqB;IAC3BC,GAAG,EAAE,qBAAqB;IAC1BC,MAAM,EAAE;EACV,CAAC,CACF,CAAC,CAAC,oBAAoB,EAAE,CAAC;IAAEF,IAAI;IAAEC,GAAG;IAAEC;EAAO,CAAC,KAAK;IAClD,IAAIC,UAAU,GAAG,iCAAmC,IAAK;IAEzDC,UAAU,CAAC,MAAM;MACf,MAAM;QAAEC;MAAU,CAAC,GAAGR,WAAW,CAC/B,WAAW,EACX,8BAA8B,EAC9B;QAAES,MAAM,EAAE;UAAEL;QAAI;MAAE,CACpB,CAAC;MAEDE,UAAU,GAAGE,SAAS,CAACE,SAAS,CAAC,QAAQ,CAAC;IAC5C,CAAC,CAAC;IAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;MACjCC,MAAM,CAACN,UAAU,CAAC,CAACO,iBAAiB,CAAC,CAAC;MACtCD,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,WAAW,CAAC;IAC7C,CAAC,CAAC;IAEFH,EAAE,CAAC,0BAA0B,EAAE,MAAM;MACnCC,MAAM,CAACN,UAAU,CAAC,CAACS,iBAAiB,CAACZ,IAAI,CAAC;IAC5C,CAAC,CAAC;IAEFQ,EAAE,CAAC,+BAA+B,EAAE,MAAM;MACxCC,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,cAAcT,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}