feat: add embedded-resource-block schema validation

contentful · Jun 21, 2023 · 4d29651 · 4d29651
1 parent 46cfd51
commit 4d29651
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/src/lib/offline-api/validator/schema/allowed-resources-schema.ts b/src/lib/offline-api/validator/schema/allowed-resources-schema.ts
@@ -0,0 +1,14 @@
+import * as Joi from 'joi'
+import { MAX_ALLOWED_RESOURCES } from '../../../utils/resource-links'
+
+export const allowedResourcesSchema = Joi.array()
+  .min(1)
+  .max(MAX_ALLOWED_RESOURCES)
+  .unique('source')
+  .items(
+    Joi.object({
+      type: Joi.string().valid('Contentful:Entry'),
+      source: Joi.string(),
+      contentTypes: Joi.array().min(1).items(Joi.string())
+    })
+  )
diff --git a/src/lib/offline-api/validator/schema/field-validations-schema.ts b/src/lib/offline-api/validator/schema/field-validations-schema.ts
@@ -1,4 +1,5 @@
 import * as Joi from 'joi'
+import { allowedResourcesSchema } from './allowed-resources-schema'
 
 const validation = (name, constraint) =>
   Joi.object({
@@ -61,6 +62,10 @@ const nodes = validation(
     'embedded-entry-block': Joi.array(),
     'embedded-entry-inline': Joi.array(),
     'embedded-asset-block': Joi.array(),
+    'embedded-resource-block': Joi.object({
+      validations: Joi.array().items(size),
+      allowedResources: allowedResourcesSchema
+    }),
     'entry-hyperlink': Joi.array(),
     'asset-hyperlink': Joi.array(),
     hyperlink: Joi.array()
@@ -69,7 +74,9 @@ const nodes = validation(
 
 const enabledMarks = validation(
   'enabledMarks',
-  Joi.array().items(Joi.string().valid('bold', 'italic', 'code', 'underline', 'superscript', 'subscript'))
+  Joi.array().items(
+    Joi.string().valid('bold', 'italic', 'code', 'underline', 'superscript', 'subscript')
+  )
 )
 
 const enabledNodeTypes = validation(
@@ -89,6 +96,7 @@ const enabledNodeTypes = validation(
       'table',
       'embedded-entry-block',
       'embedded-asset-block',
+      'embedded-resource-block',
       'hyperlink',
       'entry-hyperlink',
       'asset-hyperlink',

diff --git a/src/lib/offline-api/validator/schema/fields-schema.ts b/src/lib/offline-api/validator/schema/fields-schema.ts
@@ -1,6 +1,6 @@
 import * as Joi from 'joi'
 import fieldValidations from './field-validations-schema'
-import { MAX_ALLOWED_RESOURCES } from '../../../utils/resource-links'
+import { allowedResourcesSchema } from './allowed-resources-schema'
 
 export function createFieldsSchema(locales: string[]) {
   const fieldSchema = Joi.object().keys({
@@ -42,17 +42,7 @@ export function createFieldsSchema(locales: string[]) {
     localized: Joi.boolean(),
     required: Joi.boolean(),
     validations: Joi.array().unique().items(fieldValidations),
-    allowedResources: Joi.array()
-      .min(1)
-      .max(MAX_ALLOWED_RESOURCES)
-      .unique('source')
-      .items(
-        Joi.object({
-          type: Joi.string().valid('Contentful:Entry'),
-          source: Joi.string(),
-          contentTypes: Joi.array().min(1).items(Joi.string())
-        })
-      ),
+    allowedResources: allowedResourcesSchema,
     defaultValue: Joi.object()
       .strict()
       .pattern(