@defra/forms-model 3.0.168 → 3.0.169

package/src/form/form-definition/index.ts

@@ -1,8 +1,13 @@
 import Joi from 'joi'
 
+import {
+  type ComponentSubType,
+  type ComponentType
+} from '~/src/components/enums.js'
 import { type ComponentDef } from '~/src/components/types.js'
 import {
   type ConditionRawData,
+  type ConditionWrapperValue,
   type ConfirmationPage,
   type EmailOutputConfiguration,
   type FormDefinition,
@@ -75,21 +80,24 @@ const conditionGroupSchema = Joi.object().keys({
   )
 })
 
-const conditionsModelSchema = Joi.object().keys({
-  name: Joi.string().required(),
-  conditions: Joi.array().items(
-    Joi.alternatives().try(
-      conditionSchema,
-      conditionRefSchema,
-      conditionGroupSchema
+const conditionsModelSchema = Joi.alternatives<ConditionWrapperValue>().try(
+  Joi.string(),
+  Joi.object().keys({
+    name: Joi.string().required(),
+    conditions: Joi.array().items(
+      Joi.alternatives().try(
+        conditionSchema,
+        conditionRefSchema,
+        conditionGroupSchema
+      )
     )
-  )
-})
+  })
+)
 
 const conditionsSchema = Joi.object<ConditionRawData>().keys({
   name: Joi.string().required(),
   displayName: Joi.string(),
-  value: Joi.alternatives().try(Joi.string(), conditionsModelSchema).required()
+  value: conditionsModelSchema.required()
 })
 
 const localisedString = Joi.alternatives().try(
@@ -99,7 +107,8 @@ const localisedString = Joi.alternatives().try(
 
 export const componentSchema = Joi.object<ComponentDef>()
   .keys({
-    type: Joi.string().required(),
+    subType: Joi.string<ComponentSubType>().optional(),
+    type: Joi.string<ComponentType>().required(),
     name: Joi.string(),
     title: localisedString,
     hint: localisedString.optional(),

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from '~/src/data-model/index.js'
-export * from '~/src/form/form-configuration/index.js'
 export * from '~/src/form/form-definition/index.js'
 export * from '~/src/form/form-metadata/index.js'
 export * from '~/src/components/index.js'

package/dist/module/components/conditional-component-types.js

@@ -1,10 +0,0 @@
-export const ConditionalComponentTypes = [{
-  name: 'TextField',
-  title: 'Text field',
-  subType: 'field'
-}, {
-  name: 'NumberField',
-  title: 'Number field',
-  subType: 'field'
-}];
-//# sourceMappingURL=conditional-component-types.js.map

package/dist/module/components/conditional-component-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"conditional-component-types.js","names":["ConditionalComponentTypes","name","title","subType"],"sources":["../../../src/components/conditional-component-types.ts"],"sourcesContent":["import { type ConditionalComponent } from '~/src/components/types.js'\n\nexport const ConditionalComponentTypes: ConditionalComponent[] = [\n  {\n    name: 'TextField',\n    title: 'Text field',\n    subType: 'field'\n  },\n  {\n    name: 'NumberField',\n    title: 'Number field',\n    subType: 'field'\n  }\n]\n"],"mappings":"AAEA,OAAO,MAAMA,yBAAiD,GAAG,CAC/D;EACEC,IAAI,EAAE,WAAW;EACjBC,KAAK,EAAE,YAAY;EACnBC,OAAO,EAAE;AACX,CAAC,EACD;EACEF,IAAI,EAAE,aAAa;EACnBC,KAAK,EAAE,cAAc;EACrBC,OAAO,EAAE;AACX,CAAC,CACF","ignoreList":[]}

package/dist/module/form/form-configuration/index.js

@@ -1,16 +0,0 @@
-export class FormConfiguration {
-  Key;
-  DisplayName;
-  LastModified;
-  feedbackForm;
-  constructor(Key, DisplayName, LastModified, feedbackForm) {
-    if (!Key) {
-      throw Error('Form configuration must have a key');
-    }
-    this.Key = Key;
-    this.DisplayName = DisplayName || Key;
-    this.LastModified = LastModified;
-    this.feedbackForm = feedbackForm || false;
-  }
-}
-//# sourceMappingURL=index.js.map

package/dist/module/form/form-configuration/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":["FormConfiguration","Key","DisplayName","LastModified","feedbackForm","constructor","Error"],"sources":["../../../../src/form/form-configuration/index.ts"],"sourcesContent":["export class FormConfiguration {\n  Key: string\n  DisplayName: string\n  LastModified: string | undefined\n  feedbackForm: boolean | undefined\n\n  constructor(\n    Key: string,\n    DisplayName?: string,\n    LastModified?: string,\n    feedbackForm?: boolean\n  ) {\n    if (!Key) {\n      throw Error('Form configuration must have a key')\n    }\n    this.Key = Key\n    this.DisplayName = DisplayName || Key\n    this.LastModified = LastModified\n    this.feedbackForm = feedbackForm || false\n  }\n}\n"],"mappings":"AAAA,OAAO,MAAMA,iBAAiB,CAAC;EAC7BC,GAAG;EACHC,WAAW;EACXC,YAAY;EACZC,YAAY;EAEZC,WAAWA,CACTJ,GAAW,EACXC,WAAoB,EACpBC,YAAqB,EACrBC,YAAsB,EACtB;IACA,IAAI,CAACH,GAAG,EAAE;MACR,MAAMK,KAAK,CAAC,oCAAoC,CAAC;IACnD;IACA,IAAI,CAACL,GAAG,GAAGA,GAAG;IACd,IAAI,CAACC,WAAW,GAAGA,WAAW,IAAID,GAAG;IACrC,IAAI,CAACE,YAAY,GAAGA,YAAY;IAChC,IAAI,CAACC,YAAY,GAAGA,YAAY,IAAI,KAAK;EAC3C;AACF","ignoreList":[]}

package/dist/types/components/conditional-component-types.d.ts

@@ -1,3 +0,0 @@
-import { type ConditionalComponent } from '../components/types.js';
-export declare const ConditionalComponentTypes: ConditionalComponent[];
-//# sourceMappingURL=conditional-component-types.d.ts.map

package/dist/types/components/conditional-component-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"conditional-component-types.d.ts","sourceRoot":"","sources":["../../../src/components/conditional-component-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAErE,eAAO,MAAM,yBAAyB,EAAE,oBAAoB,EAW3D,CAAA"}

package/dist/types/form/form-configuration/index.d.ts

@@ -1,8 +0,0 @@
-export declare class FormConfiguration {
-    Key: string;
-    DisplayName: string;
-    LastModified: string | undefined;
-    feedbackForm: boolean | undefined;
-    constructor(Key: string, DisplayName?: string, LastModified?: string, feedbackForm?: boolean);
-}
-//# sourceMappingURL=index.d.ts.map

package/dist/types/form/form-configuration/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/form/form-configuration/index.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAA;gBAG/B,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,OAAO;CAUzB"}

package/src/components/conditional-component-types.ts

@@ -1,14 +0,0 @@
-import { type ConditionalComponent } from '~/src/components/types.js'
-
-export const ConditionalComponentTypes: ConditionalComponent[] = [
-  {
-    name: 'TextField',
-    title: 'Text field',
-    subType: 'field'
-  },
-  {
-    name: 'NumberField',
-    title: 'Number field',
-    subType: 'field'
-  }
-]

package/src/form/form-configuration/index.ts

@@ -1,21 +0,0 @@
-export class FormConfiguration {
-  Key: string
-  DisplayName: string
-  LastModified: string | undefined
-  feedbackForm: boolean | undefined
-
-  constructor(
-    Key: string,
-    DisplayName?: string,
-    LastModified?: string,
-    feedbackForm?: boolean
-  ) {
-    if (!Key) {
-      throw Error('Form configuration must have a key')
-    }
-    this.Key = Key
-    this.DisplayName = DisplayName || Key
-    this.LastModified = LastModified
-    this.feedbackForm = feedbackForm || false
-  }
-}