@defra/forms-model 3.0.371 → 3.0.373

package/dist/module/pages/helpers.js

@@ -6,10 +6,11 @@ import { PageTypes } from "./page-types.js";
  * Return component defaults by type
  */
 export function getPageDefaults(page) {
-  const controller = controllerNameFromPath(page.controller ?? ControllerType.Page);
+  const nameOrPath = page?.controller ?? ControllerType.Page;
+  const controller = controllerNameFromPath(nameOrPath);
   const defaults = PageTypes.find(pageType => pageType.controller === controller);
   if (!defaults) {
-    throw new Error(`Defaults not found for page type '${page.controller}'`);
+    throw new Error(`Defaults not found for page type '${nameOrPath}'`);
   }
   return structuredClone(defaults);
 }
@@ -18,28 +19,22 @@ export function getPageDefaults(page) {
  * Check page has components
  */
 export function hasComponents(page) {
-  return isLinkablePage(page) && Array.isArray(page.components);
+  return hasNext(page) && Array.isArray(page.components);
 }
 
 /**
  * Check page has form components
  */
 export function hasFormComponents(page) {
-  return isLinkablePage(page) && Array.isArray(page.components);
+  const controller = controllerNameFromPath(page?.controller);
+  return hasComponents(page) && controller !== ControllerType.Start;
 }
 
 /**
  * Check page has sections
  */
 export function hasSection(page) {
-  return isLinkablePage(page) && typeof page.section === 'string';
-}
-
-/**
- * Check page has next link
- */
-export function hasNext(page) {
-  return isLinkablePage(page);
+  return hasNext(page) && typeof page.section === 'string';
 }
 
 /**
@@ -50,9 +45,9 @@ export function isControllerName(nameOrPath) {
 }
 
 /**
- * Check page is linkable
+ * Check page has next link
  */
-export function isLinkablePage(page) {
+export function hasNext(page) {
   if (!page || !('next' in page)) {
     return false;
   }

package/dist/module/pages/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","names":["ControllerNames","ControllerTypes","ControllerType","PageTypes","getPageDefaults","page","controller","controllerNameFromPath","Page","defaults","find","pageType","Error","structuredClone","hasComponents","isLinkablePage","Array","isArray","components","hasFormComponents","hasSection","section","hasNext","isControllerName","nameOrPath","map","String","includes","Start","FileUpload","isQuestionPage","options","path","name"],"sources":["../../../src/pages/helpers.ts"],"sourcesContent":["import { type ComponentDef } from '~/src/components/types.js'\nimport {\n  type Link,\n  type Page,\n  type PageFileUpload,\n  type PageQuestion,\n  type PageStart,\n  type RequiredField\n} from '~/src/form/form-definition/types.js'\nimport {\n  ControllerNames,\n  ControllerTypes\n} from '~/src/pages/controller-types.js'\nimport { ControllerType } from '~/src/pages/enums.js'\nimport { PageTypes } from '~/src/pages/page-types.js'\n\n/**\n * Return component defaults by type\n */\nexport function getPageDefaults<PageType extends Page>(\n  page: Pick<PageType, 'controller'>\n) {\n  const controller = controllerNameFromPath(\n    page.controller ?? ControllerType.Page\n  )\n\n  const defaults = PageTypes.find(\n    (pageType) => pageType.controller === controller\n  )\n\n  if (!defaults) {\n    throw new Error(`Defaults not found for page type '${page.controller}'`)\n  }\n\n  return structuredClone(defaults) as PageType\n}\n\n/**\n * Check page has components\n */\nexport function hasComponents(\n  page?: Partial<Page>\n): page is Extract<Page, { components: ComponentDef[] }> {\n  return isLinkablePage(page) && Array.isArray(page.components)\n}\n\n/**\n * Check page has form components\n */\nexport function hasFormComponents(\n  page?: Partial<Page>\n): page is Extract<Page, { components: ComponentDef[] }> {\n  return isLinkablePage(page) && Array.isArray(page.components)\n}\n\n/**\n * Check page has sections\n */\nexport function hasSection(\n  page: Partial<Page>\n): page is\n  | RequiredField<PageStart, 'section'>\n  | RequiredField<PageQuestion, 'section'>\n  | RequiredField<PageFileUpload, 'section'> {\n  return isLinkablePage(page) && typeof page.section === 'string'\n}\n\n/**\n * Check page has next link\n */\nexport function hasNext(page?: Partial<Page>) {\n  return isLinkablePage(page)\n}\n\n/**\n * Check for known page controller names\n */\nexport function isControllerName(\n  nameOrPath?: ControllerType | string\n): nameOrPath is ControllerType {\n  return !!nameOrPath && ControllerNames.map(String).includes(nameOrPath)\n}\n\n/**\n * Check page is linkable\n */\nexport function isLinkablePage(\n  page?: Partial<Page>\n): page is Extract<Page, { next: Link[] }> {\n  if (!page || !('next' in page)) {\n    return false\n  }\n\n  const controller = controllerNameFromPath(page.controller)\n\n  return (\n    !controller ||\n    controller === ControllerType.Start ||\n    controller === ControllerType.Page ||\n    controller === ControllerType.FileUpload\n  )\n}\n\n/**\n * Check page supports questions\n */\nexport function isQuestionPage(page?: Partial<Page>): page is PageQuestion {\n  const controller = controllerNameFromPath(page?.controller)\n\n  return (\n    !controller ||\n    controller === ControllerType.Page ||\n    controller === ControllerType.FileUpload\n  )\n}\n\n/**\n * Check and optionally replace legacy path with controller name\n * @param {string} [nameOrPath] - Controller name or legacy controller path\n */\nexport function controllerNameFromPath(nameOrPath?: ControllerType | string) {\n  if (isControllerName(nameOrPath)) {\n    return nameOrPath\n  }\n\n  const options = ControllerTypes.find(({ path }) => path === nameOrPath)\n  return options?.name\n}\n"],"mappings":"AASA,SACEA,eAAe,EACfC,eAAe;AAEjB,SAASC,cAAc;AACvB,SAASC,SAAS;;AAElB;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,IAAkC,EAClC;EACA,MAAMC,UAAU,GAAGC,sBAAsB,CACvCF,IAAI,CAACC,UAAU,IAAIJ,cAAc,CAACM,IACpC,CAAC;EAED,MAAMC,QAAQ,GAAGN,SAAS,CAACO,IAAI,CAC5BC,QAAQ,IAAKA,QAAQ,CAACL,UAAU,KAAKA,UACxC,CAAC;EAED,IAAI,CAACG,QAAQ,EAAE;IACb,MAAM,IAAIG,KAAK,CAAC,qCAAqCP,IAAI,CAACC,UAAU,GAAG,CAAC;EAC1E;EAEA,OAAOO,eAAe,CAACJ,QAAQ,CAAC;AAClC;;AAEA;AACA;AACA;AACA,OAAO,SAASK,aAAaA,CAC3BT,IAAoB,EACmC;EACvD,OAAOU,cAAc,CAACV,IAAI,CAAC,IAAIW,KAAK,CAACC,OAAO,CAACZ,IAAI,CAACa,UAAU,CAAC;AAC/D;;AAEA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/Bd,IAAoB,EACmC;EACvD,OAAOU,cAAc,CAACV,IAAI,CAAC,IAAIW,KAAK,CAACC,OAAO,CAACZ,IAAI,CAACa,UAAU,CAAC;AAC/D;;AAEA;AACA;AACA;AACA,OAAO,SAASE,UAAUA,CACxBf,IAAmB,EAIwB;EAC3C,OAAOU,cAAc,CAACV,IAAI,CAAC,IAAI,OAAOA,IAAI,CAACgB,OAAO,KAAK,QAAQ;AACjE;;AAEA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAACjB,IAAoB,EAAE;EAC5C,OAAOU,cAAc,CAACV,IAAI,CAAC;AAC7B;;AAEA;AACA;AACA;AACA,OAAO,SAASkB,gBAAgBA,CAC9BC,UAAoC,EACN;EAC9B,OAAO,CAAC,CAACA,UAAU,IAAIxB,eAAe,CAACyB,GAAG,CAACC,MAAM,CAAC,CAACC,QAAQ,CAACH,UAAU,CAAC;AACzE;;AAEA;AACA;AACA;AACA,OAAO,SAAST,cAAcA,CAC5BV,IAAoB,EACqB;EACzC,IAAI,CAACA,IAAI,IAAI,EAAE,MAAM,IAAIA,IAAI,CAAC,EAAE;IAC9B,OAAO,KAAK;EACd;EAEA,MAAMC,UAAU,GAAGC,sBAAsB,CAACF,IAAI,CAACC,UAAU,CAAC;EAE1D,OACE,CAACA,UAAU,IACXA,UAAU,KAAKJ,cAAc,CAAC0B,KAAK,IACnCtB,UAAU,KAAKJ,cAAc,CAACM,IAAI,IAClCF,UAAU,KAAKJ,cAAc,CAAC2B,UAAU;AAE5C;;AAEA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACzB,IAAoB,EAAwB;EACzE,MAAMC,UAAU,GAAGC,sBAAsB,CAACF,IAAI,EAAEC,UAAU,CAAC;EAE3D,OACE,CAACA,UAAU,IACXA,UAAU,KAAKJ,cAAc,CAACM,IAAI,IAClCF,UAAU,KAAKJ,cAAc,CAAC2B,UAAU;AAE5C;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAAStB,sBAAsBA,CAACiB,UAAoC,EAAE;EAC3E,IAAID,gBAAgB,CAACC,UAAU,CAAC,EAAE;IAChC,OAAOA,UAAU;EACnB;EAEA,MAAMO,OAAO,GAAG9B,eAAe,CAACS,IAAI,CAAC,CAAC;IAAEsB;EAAK,CAAC,KAAKA,IAAI,KAAKR,UAAU,CAAC;EACvE,OAAOO,OAAO,EAAEE,IAAI;AACtB","ignoreList":[]}
+{"version":3,"file":"helpers.js","names":["ControllerNames","ControllerTypes","ControllerType","PageTypes","getPageDefaults","page","nameOrPath","controller","Page","controllerNameFromPath","defaults","find","pageType","Error","structuredClone","hasComponents","hasNext","Array","isArray","components","hasFormComponents","Start","hasSection","section","isControllerName","map","String","includes","FileUpload","isQuestionPage","options","path","name"],"sources":["../../../src/pages/helpers.ts"],"sourcesContent":["import { type ComponentDef } from '~/src/components/types.js'\nimport {\n  type Link,\n  type Page,\n  type PageFileUpload,\n  type PageQuestion,\n  type PageStart,\n  type RequiredField\n} from '~/src/form/form-definition/types.js'\nimport {\n  ControllerNames,\n  ControllerTypes\n} from '~/src/pages/controller-types.js'\nimport { ControllerType } from '~/src/pages/enums.js'\nimport { PageTypes } from '~/src/pages/page-types.js'\n\n/**\n * Return component defaults by type\n */\nexport function getPageDefaults<PageType extends Page>(\n  page?: Pick<PageType, 'controller'>\n) {\n  const nameOrPath = page?.controller ?? ControllerType.Page\n  const controller = controllerNameFromPath(nameOrPath)\n\n  const defaults = PageTypes.find(\n    (pageType) => pageType.controller === controller\n  )\n\n  if (!defaults) {\n    throw new Error(`Defaults not found for page type '${nameOrPath}'`)\n  }\n\n  return structuredClone(defaults) as PageType\n}\n\n/**\n * Check page has components\n */\nexport function hasComponents(\n  page?: Partial<Page>\n): page is Extract<Page, { components: ComponentDef[] }> {\n  return hasNext(page) && Array.isArray(page.components)\n}\n\n/**\n * Check page has form components\n */\nexport function hasFormComponents(\n  page?: Partial<Page>\n): page is PageQuestion | PageFileUpload {\n  const controller = controllerNameFromPath(page?.controller)\n  return hasComponents(page) && controller !== ControllerType.Start\n}\n\n/**\n * Check page has sections\n */\nexport function hasSection(\n  page?: Partial<Page>\n): page is\n  | RequiredField<PageStart, 'section'>\n  | RequiredField<PageQuestion, 'section'>\n  | RequiredField<PageFileUpload, 'section'> {\n  return hasNext(page) && typeof page.section === 'string'\n}\n\n/**\n * Check for known page controller names\n */\nexport function isControllerName(\n  nameOrPath?: ControllerType | string\n): nameOrPath is ControllerType {\n  return !!nameOrPath && ControllerNames.map(String).includes(nameOrPath)\n}\n\n/**\n * Check page has next link\n */\nexport function hasNext(\n  page?: Partial<Page>\n): page is Extract<Page, { next: Link[] }> {\n  if (!page || !('next' in page)) {\n    return false\n  }\n\n  const controller = controllerNameFromPath(page.controller)\n\n  return (\n    !controller ||\n    controller === ControllerType.Start ||\n    controller === ControllerType.Page ||\n    controller === ControllerType.FileUpload\n  )\n}\n\n/**\n * Check page supports questions\n */\nexport function isQuestionPage(page?: Partial<Page>): page is PageQuestion {\n  const controller = controllerNameFromPath(page?.controller)\n\n  return (\n    !controller ||\n    controller === ControllerType.Page ||\n    controller === ControllerType.FileUpload\n  )\n}\n\n/**\n * Check and optionally replace legacy path with controller name\n * @param {string} [nameOrPath] - Controller name or legacy controller path\n */\nexport function controllerNameFromPath(nameOrPath?: ControllerType | string) {\n  if (isControllerName(nameOrPath)) {\n    return nameOrPath\n  }\n\n  const options = ControllerTypes.find(({ path }) => path === nameOrPath)\n  return options?.name\n}\n"],"mappings":"AASA,SACEA,eAAe,EACfC,eAAe;AAEjB,SAASC,cAAc;AACvB,SAASC,SAAS;;AAElB;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,IAAmC,EACnC;EACA,MAAMC,UAAU,GAAGD,IAAI,EAAEE,UAAU,IAAIL,cAAc,CAACM,IAAI;EAC1D,MAAMD,UAAU,GAAGE,sBAAsB,CAACH,UAAU,CAAC;EAErD,MAAMI,QAAQ,GAAGP,SAAS,CAACQ,IAAI,CAC5BC,QAAQ,IAAKA,QAAQ,CAACL,UAAU,KAAKA,UACxC,CAAC;EAED,IAAI,CAACG,QAAQ,EAAE;IACb,MAAM,IAAIG,KAAK,CAAC,qCAAqCP,UAAU,GAAG,CAAC;EACrE;EAEA,OAAOQ,eAAe,CAACJ,QAAQ,CAAC;AAClC;;AAEA;AACA;AACA;AACA,OAAO,SAASK,aAAaA,CAC3BV,IAAoB,EACmC;EACvD,OAAOW,OAAO,CAACX,IAAI,CAAC,IAAIY,KAAK,CAACC,OAAO,CAACb,IAAI,CAACc,UAAU,CAAC;AACxD;;AAEA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/Bf,IAAoB,EACmB;EACvC,MAAME,UAAU,GAAGE,sBAAsB,CAACJ,IAAI,EAAEE,UAAU,CAAC;EAC3D,OAAOQ,aAAa,CAACV,IAAI,CAAC,IAAIE,UAAU,KAAKL,cAAc,CAACmB,KAAK;AACnE;;AAEA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CACxBjB,IAAoB,EAIuB;EAC3C,OAAOW,OAAO,CAACX,IAAI,CAAC,IAAI,OAAOA,IAAI,CAACkB,OAAO,KAAK,QAAQ;AAC1D;;AAEA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAC9BlB,UAAoC,EACN;EAC9B,OAAO,CAAC,CAACA,UAAU,IAAIN,eAAe,CAACyB,GAAG,CAACC,MAAM,CAAC,CAACC,QAAQ,CAACrB,UAAU,CAAC;AACzE;;AAEA;AACA;AACA;AACA,OAAO,SAASU,OAAOA,CACrBX,IAAoB,EACqB;EACzC,IAAI,CAACA,IAAI,IAAI,EAAE,MAAM,IAAIA,IAAI,CAAC,EAAE;IAC9B,OAAO,KAAK;EACd;EAEA,MAAME,UAAU,GAAGE,sBAAsB,CAACJ,IAAI,CAACE,UAAU,CAAC;EAE1D,OACE,CAACA,UAAU,IACXA,UAAU,KAAKL,cAAc,CAACmB,KAAK,IACnCd,UAAU,KAAKL,cAAc,CAACM,IAAI,IAClCD,UAAU,KAAKL,cAAc,CAAC0B,UAAU;AAE5C;;AAEA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACxB,IAAoB,EAAwB;EACzE,MAAME,UAAU,GAAGE,sBAAsB,CAACJ,IAAI,EAAEE,UAAU,CAAC;EAE3D,OACE,CAACA,UAAU,IACXA,UAAU,KAAKL,cAAc,CAACM,IAAI,IAClCD,UAAU,KAAKL,cAAc,CAAC0B,UAAU;AAE5C;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASnB,sBAAsBA,CAACH,UAAoC,EAAE;EAC3E,IAAIkB,gBAAgB,CAAClB,UAAU,CAAC,EAAE;IAChC,OAAOA,UAAU;EACnB;EAEA,MAAMwB,OAAO,GAAG7B,eAAe,CAACU,IAAI,CAAC,CAAC;IAAEoB;EAAK,CAAC,KAAKA,IAAI,KAAKzB,UAAU,CAAC;EACvE,OAAOwB,OAAO,EAAEE,IAAI;AACtB","ignoreList":[]}

package/dist/module/pages/index.js

@@ -1,5 +1,5 @@
 export { ControllerNames, ControllerTypes } from "./controller-types.js";
 export { PageTypes } from "./page-types.js";
-export { controllerNameFromPath, getPageDefaults, hasComponents, hasFormComponents, hasSection, hasNext, isControllerName, isLinkablePage, isQuestionPage } from "./helpers.js";
+export { controllerNameFromPath, getPageDefaults, hasComponents, hasFormComponents, hasSection, hasNext, isControllerName, isQuestionPage } from "./helpers.js";
 export { ControllerPath, ControllerType } from "./enums.js";
 //# sourceMappingURL=index.js.map

package/dist/module/pages/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["ControllerNames","ControllerTypes","PageTypes","controllerNameFromPath","getPageDefaults","hasComponents","hasFormComponents","hasSection","hasNext","isControllerName","isLinkablePage","isQuestionPage","ControllerPath","ControllerType"],"sources":["../../../src/pages/index.ts"],"sourcesContent":["export {\n  ControllerNames,\n  ControllerTypes\n} from '~/src/pages/controller-types.js'\n\nexport { PageTypes } from '~/src/pages/page-types.js'\n\nexport {\n  controllerNameFromPath,\n  getPageDefaults,\n  hasComponents,\n  hasFormComponents,\n  hasSection,\n  hasNext,\n  isControllerName,\n  isLinkablePage,\n  isQuestionPage\n} from '~/src/pages/helpers.js'\n\nexport { ControllerPath, ControllerType } from '~/src/pages/enums.js'\n"],"mappings":"AAAA,SACEA,eAAe,EACfC,eAAe;AAGjB,SAASC,SAAS;AAElB,SACEC,sBAAsB,EACtBC,eAAe,EACfC,aAAa,EACbC,iBAAiB,EACjBC,UAAU,EACVC,OAAO,EACPC,gBAAgB,EAChBC,cAAc,EACdC,cAAc;AAGhB,SAASC,cAAc,EAAEC,cAAc","ignoreList":[]}
+{"version":3,"file":"index.js","names":["ControllerNames","ControllerTypes","PageTypes","controllerNameFromPath","getPageDefaults","hasComponents","hasFormComponents","hasSection","hasNext","isControllerName","isQuestionPage","ControllerPath","ControllerType"],"sources":["../../../src/pages/index.ts"],"sourcesContent":["export {\n  ControllerNames,\n  ControllerTypes\n} from '~/src/pages/controller-types.js'\n\nexport { PageTypes } from '~/src/pages/page-types.js'\n\nexport {\n  controllerNameFromPath,\n  getPageDefaults,\n  hasComponents,\n  hasFormComponents,\n  hasSection,\n  hasNext,\n  isControllerName,\n  isQuestionPage\n} from '~/src/pages/helpers.js'\n\nexport { ControllerPath, ControllerType } from '~/src/pages/enums.js'\n"],"mappings":"AAAA,SACEA,eAAe,EACfC,eAAe;AAGjB,SAASC,SAAS;AAElB,SACEC,sBAAsB,EACtBC,eAAe,EACfC,aAAa,EACbC,iBAAiB,EACjBC,UAAU,EACVC,OAAO,EACPC,gBAAgB,EAChBC,cAAc;AAGhB,SAASC,cAAc,EAAEC,cAAc","ignoreList":[]}

package/dist/types/pages/helpers.d.ts

@@ -4,7 +4,7 @@ import { ControllerType } from '../pages/enums.js';
 /**
  * Return component defaults by type
  */
-export declare function getPageDefaults<PageType extends Page>(page: Pick<PageType, 'controller'>): PageType;
+export declare function getPageDefaults<PageType extends Page>(page?: Pick<PageType, 'controller'>): PageType;
 /**
  * Check page has components
  */
@@ -14,25 +14,19 @@ export declare function hasComponents(page?: Partial<Page>): page is Extract<Pag
 /**
  * Check page has form components
  */
-export declare function hasFormComponents(page?: Partial<Page>): page is Extract<Page, {
-    components: ComponentDef[];
-}>;
+export declare function hasFormComponents(page?: Partial<Page>): page is PageQuestion | PageFileUpload;
 /**
  * Check page has sections
  */
-export declare function hasSection(page: Partial<Page>): page is RequiredField<PageStart, 'section'> | RequiredField<PageQuestion, 'section'> | RequiredField<PageFileUpload, 'section'>;
-/**
- * Check page has next link
- */
-export declare function hasNext(page?: Partial<Page>): page is PageStart | PageQuestion | PageFileUpload;
+export declare function hasSection(page?: Partial<Page>): page is RequiredField<PageStart, 'section'> | RequiredField<PageQuestion, 'section'> | RequiredField<PageFileUpload, 'section'>;
 /**
  * Check for known page controller names
  */
 export declare function isControllerName(nameOrPath?: ControllerType | string): nameOrPath is ControllerType;
 /**
- * Check page is linkable
+ * Check page has next link
  */
-export declare function isLinkablePage(page?: Partial<Page>): page is Extract<Page, {
+export declare function hasNext(page?: Partial<Page>): page is Extract<Page, {
     next: Link[];
 }>;
 /**

package/dist/types/pages/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/pages/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EACL,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,qCAAqC,CAAA;AAK5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,SAAS,IAAI,EACnD,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,GAcE,QAAQ,CAC7C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CAEvD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CAEvD;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAClB,IAAI,IACH,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,GACnC,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,GACtC,aAAa,CAAC,cAAc,EAAE,SAAS,CAAC,CAE3C;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,qDAE3C;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,CAAC,EAAE,cAAc,GAAG,MAAM,GACnC,UAAU,IAAI,cAAc,CAE9B;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CAazC;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,YAAY,CAQzE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,cAAc,GAAG,MAAM,8BAO1E"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/pages/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EACL,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,qCAAqC,CAAA;AAK5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,SAAS,IAAI,EACnD,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,GAaC,QAAQ,CAC7C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CAEvD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,YAAY,GAAG,cAAc,CAGvC;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IACH,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,GACnC,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,GACtC,aAAa,CAAC,cAAc,EAAE,SAAS,CAAC,CAE3C;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,CAAC,EAAE,cAAc,GAAG,MAAM,GACnC,UAAU,IAAI,cAAc,CAE9B;AAED;;GAEG;AACH,wBAAgB,OAAO,CACrB,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GACnB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CAazC;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,YAAY,CAQzE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,cAAc,GAAG,MAAM,8BAO1E"}

package/dist/types/pages/index.d.ts

@@ -1,5 +1,5 @@
 export { ControllerNames, ControllerTypes } from '../pages/controller-types.js';
 export { PageTypes } from '../pages/page-types.js';
-export { controllerNameFromPath, getPageDefaults, hasComponents, hasFormComponents, hasSection, hasNext, isControllerName, isLinkablePage, isQuestionPage } from '../pages/helpers.js';
+export { controllerNameFromPath, getPageDefaults, hasComponents, hasFormComponents, hasSection, hasNext, isControllerName, isQuestionPage } from '../pages/helpers.js';
 export { ControllerPath, ControllerType } from '../pages/enums.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/pages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EAChB,MAAM,iCAAiC,CAAA;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,cAAc,EACf,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EAChB,MAAM,iCAAiC,CAAA;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-model",
-  "version": "3.0.371",
+  "version": "3.0.373",
   "description": "A hapi plugin providing the model for Defra forms",
   "homepage": "https://github.com/DEFRA/forms-designer/tree/main/model#readme",
   "repository": {
@@ -25,7 +25,9 @@
     "slug": "^9.1.0"
   },
   "devDependencies": {
-    "joi": "^17.13.3"
+    "@types/slug": "^5.0.9",
+    "joi": "^17.13.3",
+    "tsc-alias": "^1.8.10"
   },
   "peerDependencies": {
     "joi": "^17.0.0"

package/src/pages/helpers.ts

@@ -18,18 +18,17 @@ import { PageTypes } from '~/src/pages/page-types.js'
  * Return component defaults by type
  */
 export function getPageDefaults<PageType extends Page>(
-  page: Pick<PageType, 'controller'>
+  page?: Pick<PageType, 'controller'>
 ) {
-  const controller = controllerNameFromPath(
-    page.controller ?? ControllerType.Page
-  )
+  const nameOrPath = page?.controller ?? ControllerType.Page
+  const controller = controllerNameFromPath(nameOrPath)
 
   const defaults = PageTypes.find(
     (pageType) => pageType.controller === controller
   )
 
   if (!defaults) {
-    throw new Error(`Defaults not found for page type '${page.controller}'`)
+    throw new Error(`Defaults not found for page type '${nameOrPath}'`)
   }
 
   return structuredClone(defaults) as PageType
@@ -41,7 +40,7 @@ export function getPageDefaults<PageType extends Page>(
 export function hasComponents(
   page?: Partial<Page>
 ): page is Extract<Page, { components: ComponentDef[] }> {
-  return isLinkablePage(page) && Array.isArray(page.components)
+  return hasNext(page) && Array.isArray(page.components)
 }
 
 /**
@@ -49,27 +48,21 @@ export function hasComponents(
  */
 export function hasFormComponents(
   page?: Partial<Page>
-): page is Extract<Page, { components: ComponentDef[] }> {
-  return isLinkablePage(page) && Array.isArray(page.components)
+): page is PageQuestion | PageFileUpload {
+  const controller = controllerNameFromPath(page?.controller)
+  return hasComponents(page) && controller !== ControllerType.Start
 }
 
 /**
  * Check page has sections
  */
 export function hasSection(
-  page: Partial<Page>
+  page?: Partial<Page>
 ): page is
   | RequiredField<PageStart, 'section'>
   | RequiredField<PageQuestion, 'section'>
   | RequiredField<PageFileUpload, 'section'> {
-  return isLinkablePage(page) && typeof page.section === 'string'
-}
-
-/**
- * Check page has next link
- */
-export function hasNext(page?: Partial<Page>) {
-  return isLinkablePage(page)
+  return hasNext(page) && typeof page.section === 'string'
 }
 
 /**
@@ -82,9 +75,9 @@ export function isControllerName(
 }
 
 /**
- * Check page is linkable
+ * Check page has next link
  */
-export function isLinkablePage(
+export function hasNext(
   page?: Partial<Page>
 ): page is Extract<Page, { next: Link[] }> {
   if (!page || !('next' in page)) {

package/src/pages/index.ts

@@ -13,7 +13,6 @@ export {
   hasSection,
   hasNext,
   isControllerName,
-  isLinkablePage,
   isQuestionPage
 } from '~/src/pages/helpers.js'