@atlaskit/adf-schema 36.14.0 → 36.15.0

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -2,10 +2,18 @@ import { createPMNodeSpecFactory } from '@atlaskit/adf-schema-generator';
 export const blockCard = createPMNodeSpecFactory({
   group: 'block',
   attrs: {
-    url: {},
-    datasource: {},
-    width: {},
-    layout: {},
+    url: {
+      default: null
+    },
+    datasource: {
+      default: null
+    },
+    width: {
+      default: null
+    },
+    layout: {
+      default: null
+    },
     data: {
       default: null
     }
@@ -13,7 +21,9 @@ export const blockCard = createPMNodeSpecFactory({
   selectable: true,
   draggable: true
 });
-export const text = createPMNodeSpecFactory({});
+export const text = createPMNodeSpecFactory({
+  group: 'inline'
+});
 export const unsupportedInline = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
@@ -24,28 +34,6 @@ export const unsupportedInline = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const codeBlock = createPMNodeSpecFactory({
-  content: '(text | unsupportedInline)*',
-  group: 'block',
-  attrs: {
-    language: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
-export const codeBlockWithMarks = createPMNodeSpecFactory({
-  content: '(text | unsupportedInline)*',
-  group: 'block',
-  attrs: {
-    language: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
 export const codeBlockWithNoMarks = createPMNodeSpecFactory({
   content: '(text | unsupportedInline)*',
   group: 'block',
@@ -57,22 +45,6 @@ export const codeBlockWithNoMarks = createPMNodeSpecFactory({
   code: true,
   defining: true
 });
-export const mediaSingle = createPMNodeSpecFactory({
-  group: 'block',
-  atom: false,
-  attrs: {
-    width: {
-      default: null
-    },
-    layout: {
-      default: 'center'
-    },
-    widthType: {
-      default: 'pixel'
-    }
-  },
-  selectable: true
-});
 export const media = createPMNodeSpecFactory({
   attrs: {
     type: {
@@ -103,7 +75,7 @@ export const media = createPMNodeSpecFactory({
       default: null
     },
     __external: {
-      default: null
+      default: false
     },
     __fileMimeType: {
       default: null
@@ -123,6 +95,24 @@ export const media = createPMNodeSpecFactory({
   },
   selectable: true
 });
+export const mediaSingle = createPMNodeSpecFactory({
+  content: 'media',
+  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  group: 'block',
+  atom: false,
+  attrs: {
+    width: {
+      default: null
+    },
+    layout: {
+      default: 'center'
+    },
+    widthType: {
+      default: 'pixel'
+    }
+  },
+  selectable: true
+});
 export const unsupportedBlock = createPMNodeSpecFactory({
   group: 'block',
   atom: true,
@@ -150,7 +140,9 @@ export const mention = createPMNodeSpecFactory({
     id: {
       default: ''
     },
-    localId: {},
+    localId: {
+      default: null
+    },
     text: {
       default: ''
     },
@@ -190,7 +182,9 @@ export const date = createPMNodeSpecFactory({
   selectable: true
 });
 export const placeholder = createPMNodeSpecFactory({
+  marks: '',
   group: 'inline',
+  inline: true,
   attrs: {
     text: {
       default: ''
@@ -238,12 +232,12 @@ export const textCodeInline = createPMNodeSpecFactory({
 });
 export const caption = createPMNodeSpecFactory({
   content: '(hardBreak | mention | emoji | date | placeholder | inlineCard | status | text | unsupportedInline)*',
-  marks: 'unsupportedNodeAttribute unsupportedMark link em strong strike subsup underline textColor annotation backgroundColor code',
+  marks: '_',
   selectable: false,
   isolating: true
 });
 export const mediaSingleCaption = createPMNodeSpecFactory({
-  content: 'media | unsupportedBlock caption | unsupportedBlock',
+  content: '(media | unsupportedBlock) (caption | unsupportedBlock)',
   marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
   group: 'block',
   atom: false,
@@ -261,6 +255,8 @@ export const mediaSingleCaption = createPMNodeSpecFactory({
   selectable: true
 });
 export const mediaSingleFull = createPMNodeSpecFactory({
+  content: 'media',
+  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
   group: 'block',
   atom: false,
   attrs: {
@@ -276,7 +272,7 @@ export const mediaSingleFull = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const inlineExtension = createPMNodeSpecFactory({
+export const inlineExtensionWithMarks = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
   attrs: {
@@ -298,51 +294,56 @@ export const inlineExtension = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const inlineExtensionWithMarks = createPMNodeSpecFactory({
+export const mediaInline = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
   attrs: {
-    extensionKey: {
+    data: {},
+    type: {
+      default: 'file'
+    },
+    url: {
+      default: null
+    },
+    id: {
       default: ''
     },
-    extensionType: {
+    alt: {
       default: ''
     },
-    parameters: {
-      default: null
+    collection: {
+      default: ''
     },
-    text: {
+    occurrenceKey: {
       default: null
     },
-    localId: {
-      default: null
-    }
-  },
-  selectable: true
-});
-export const mediaInline = createPMNodeSpecFactory({
-  group: 'inline',
-  atom: false,
-  attrs: {
-    data: {},
-    type: {},
-    id: {},
-    alt: {},
-    collection: {},
-    occurrenceKey: {},
     width: {
       default: null
     },
     height: {
       default: null
     },
-    __fileName: {},
-    __fileSize: {},
-    __fileMimeType: {},
-    __displayType: {},
-    __contextId: {},
-    __mediaTraceId: {},
-    __external: {}
+    __fileName: {
+      default: null
+    },
+    __fileSize: {
+      default: null
+    },
+    __fileMimeType: {
+      default: null
+    },
+    __displayType: {
+      default: null
+    },
+    __contextId: {
+      default: null
+    },
+    __mediaTraceId: {
+      default: null
+    },
+    __external: {
+      default: false
+    }
   },
   selectable: true
 });
@@ -356,27 +357,27 @@ export const confluenceUnsupportedInline = createPMNodeSpecFactory({
     }
   }
 });
-export const paragraphWithAlignment = createPMNodeSpecFactory({
+export const paragraph = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
-export const paragraphWithIndentation = createPMNodeSpecFactory({
+export const paragraphWithAlignment = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
-export const paragraphWithNoMarks = createPMNodeSpecFactory({
+export const paragraphWithIndentation = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
 export const taskItem = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
+  marks: '_',
   attrs: {
     localId: {
       default: ''
@@ -400,6 +401,11 @@ export const taskList = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export const paragraphWithNoMarks = createPMNodeSpecFactory({
+  content: '(inline | unsupportedInline)*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  selectable: false
+});
 export const bulletList = createPMNodeSpecFactory({
   content: 'listItem+',
   marks: 'unsupportedNodeAttribute unsupportedMark',
@@ -407,8 +413,8 @@ export const bulletList = createPMNodeSpecFactory({
   selectable: false
 });
 export const listItem = createPMNodeSpecFactory({
-  content: 'codeBlock | paragraph | mediaSingle | mediaSingle | unsupportedBlock (codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | unsupportedBlock)*',
-  marks: 'unsupportedNodeAttribute unsupportedMark link',
+  content: '(codeBlock | paragraph | mediaSingle | unsupportedBlock) (codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | unsupportedBlock)*',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   selectable: false,
   defining: true
 });
@@ -423,8 +429,8 @@ export const orderedList = createPMNodeSpecFactory({
   },
   selectable: false
 });
-export const blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | bulletList | orderedList | unsupportedBlock)+',
+export const blockquoteWithList = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   marks: 'unsupportedNodeAttribute unsupportedMark',
   group: 'block',
   selectable: false,
@@ -432,7 +438,7 @@ export const blockquote = createPMNodeSpecFactory({
 });
 export const decisionItem = createPMNodeSpecFactory({
   content: '(inline | unsupportedBlock)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
+  marks: '_',
   attrs: {
     localId: {
       default: ''
@@ -476,31 +482,6 @@ export const embedCard = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const extension = createPMNodeSpecFactory({
-  group: 'block',
-  atom: true,
-  attrs: {
-    extensionKey: {
-      default: ''
-    },
-    extensionType: {
-      default: ''
-    },
-    parameters: {
-      default: null
-    },
-    text: {
-      default: null
-    },
-    layout: {
-      default: 'default'
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: true
-});
 export const extensionWithMarks = createPMNodeSpecFactory({
   group: 'block',
   atom: true,
@@ -528,7 +509,6 @@ export const extensionWithMarks = createPMNodeSpecFactory({
 });
 export const heading = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
   group: 'block',
   attrs: {
     level: {
@@ -540,7 +520,6 @@ export const heading = createPMNodeSpecFactory({
 });
 export const headingWithNoMarks = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
   group: 'block',
   attrs: {
     level: {
@@ -561,7 +540,7 @@ export const rule = createPMNodeSpecFactory({
 });
 export const panel = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   group: 'block',
   attrs: {
     panelType: {
@@ -584,7 +563,6 @@ export const panel = createPMNodeSpecFactory({
 });
 export const headingWithAlignment = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
   attrs: {
     level: {
       default: 1
@@ -595,7 +573,6 @@ export const headingWithAlignment = createPMNodeSpecFactory({
 });
 export const headingWithIndentation = createPMNodeSpecFactory({
   content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
   attrs: {
     level: {
       default: 1
@@ -604,9 +581,15 @@ export const headingWithIndentation = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export const blockquote = createPMNodeSpecFactory({
+  content: '(paragraph | bulletList | orderedList | unsupportedBlock)+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
+  selectable: false,
+  defining: true
+});
 export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
   content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
   attrs: {
     title: {
       default: ''
@@ -620,7 +603,7 @@ export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
 });
 export const tableCell = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment link indentation dataConsumer fragment',
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -629,18 +612,19 @@ export const tableCell = createPMNodeSpecFactory({
       default: 1
     },
     colwidth: {
-      default: []
+      default: null
     },
     background: {
-      default: ''
+      default: null
     }
   },
   selectable: false,
-  isolating: true
+  isolating: true,
+  tableRole: 'cell'
 });
 export const tableHeader = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment link indentation dataConsumer fragment',
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -649,19 +633,21 @@ export const tableHeader = createPMNodeSpecFactory({
       default: 1
     },
     colwidth: {
-      default: []
+      default: null
     },
     background: {
-      default: ''
+      default: null
     }
   },
   selectable: false,
-  isolating: true
+  isolating: true,
+  tableRole: 'header_cell'
 });
 export const tableRow = createPMNodeSpecFactory({
   content: '(tableCell | tableHeader)+',
   marks: 'unsupportedNodeAttribute unsupportedMark',
-  selectable: false
+  selectable: false,
+  tableRole: 'row'
 });
 export const table = createPMNodeSpecFactory({
   content: 'tableRow+',
@@ -688,39 +674,12 @@ export const table = createPMNodeSpecFactory({
     }
   },
   selectable: true,
-  isolating: true
-});
-export const bodiedExtension = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
-  group: 'block',
-  attrs: {
-    extensionKey: {
-      default: ''
-    },
-    extensionType: {
-      default: ''
-    },
-    parameters: {
-      default: null
-    },
-    text: {
-      default: null
-    },
-    layout: {
-      default: 'default'
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: true,
-  defining: true,
-  isolating: true
+  isolating: true,
+  tableRole: 'table'
 });
 export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
+  marks: 'unsupportedNodeAttribute unsupportedMark dataConsumer fragment',
   group: 'block',
   attrs: {
     extensionKey: {
@@ -746,39 +705,9 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   defining: true,
   isolating: true
 });
-export const expand = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
-  group: 'block',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
-export const expandWithBreakoutMark = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
-  group: 'block',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 export const expandWithNoMark = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
+  marks: 'unsupportedNodeAttribute unsupportedMark dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -800,8 +729,8 @@ export const confluenceUnsupportedBlock = createPMNodeSpecFactory({
   }
 });
 export const layoutColumn = createPMNodeSpecFactory({
-  content: 'block+',
-  marks: 'unsupportedNodeAttribute unsupportedMark breakout link alignment indentation dataConsumer fragment',
+  content: '(block | unsupportedBlock)+',
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment',
   attrs: {
     width: {}
   },
@@ -818,9 +747,9 @@ export const layoutSectionFull = createPMNodeSpecFactory({
   marks: 'unsupportedNodeAttribute unsupportedMark',
   isolating: true
 });
-export const nestedExpand = createPMNodeSpecFactory({
-  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark link',
+export const expandWithBreakoutMark = createPMNodeSpecFactory({
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
+  marks: 'unsupportedNodeAttribute unsupportedMark dataConsumer fragment',
   attrs: {
     title: {
       default: ''
@@ -832,12 +761,17 @@ export const nestedExpand = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const paragraph = createPMNodeSpecFactory({
-  content: '(inline | unsupportedInline)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
-  selectable: false
+export const codeBlockWithMarks = createPMNodeSpecFactory({
+  content: '(text | unsupportedInline)*',
+  attrs: {
+    language: {
+      default: null
+    }
+  },
+  code: true,
+  defining: true
 });
 export const doc = createPMNodeSpecFactory({
-  content: '(block | layoutSection | blockRootOnly | nestedExpand | paragraph | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark breakout link alignment indentation dataConsumer fragment'
+  content: '(block | layoutSection | blockRootOnly | expand | codeBlock | paragraph | unsupportedBlock)+',
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment breakout'
 });

package/dist/es2019/next-schema/groups/blockGroup.js

@@ -18,4 +18,8 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_no_marks'), mediaGroup, rule, panel, table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_breakout_mark'), expand.use('with_no_mark'), confluenceUnsupportedBlock, unsupportedBlock]);
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), taskList, orderedList, bulletList, blockquote.use('with_list'), decisionList, embedCard,
+// extension,
+extension.use('with_marks'), heading, heading.use('with_no_marks'), mediaGroup, rule, panel, table,
+// bodiedExtension,
+bodiedExtension.use('with_marks'), expand.use('with_no_mark'), confluenceUnsupportedBlock, unsupportedBlock]);

package/dist/es2019/next-schema/groups/inlineGroup.js

@@ -11,6 +11,4 @@ import { inlineExtension } from '../nodes/inlineExtension';
 import { mediaInline } from '../nodes/mediaInline';
 import { unsupportedInline } from '../nodes/unsupportedInline';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
-export const inlineGroup = adfNodeGroup('inline', [
-// text,
-text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline, confluenceUnsupportedInline, unsupportedInline]);
+export const inlineGroup = adfNodeGroup('inline', [text, text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, confluenceUnsupportedInline, unsupportedInline]);

package/dist/es2019/next-schema/nodes/blockCard.js

@@ -9,10 +9,12 @@ export const blockCard = adfNode('blockCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        optional: true
+        optional: true,
+        default: null
       },
       datasource: {
         type: 'object',
+        default: null,
         additionalProperties: false,
         properties: {
           id: {
@@ -41,12 +43,14 @@ export const blockCard = adfNode('blockCard').define({
       },
       width: {
         type: 'number',
-        optional: true
+        optional: true,
+        default: null
       },
       layout: {
         type: 'enum',
         values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
-        optional: true
+        optional: true,
+        default: null
       }
     }, {
       url: {

package/dist/es2019/next-schema/nodes/caption.js

@@ -14,5 +14,6 @@ export const caption = adfNode('caption').define({
   isolating: true,
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  allowAnyChildMark: true,
   content: [$zeroPlus($or(hardBreak, mention, emoji, date, placeholder, inlineCard, status, text.use('formatted'), text.use('code_inline'), unsupportedInline))]
 });

package/dist/es2019/next-schema/nodes/codeBlock.js

@@ -19,4 +19,4 @@ export const codeBlock = adfNode('codeBlock').define({
 }).variant('with_marks', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark]
 }).variant('with_no_marks', {});
-export const codeBlockWithMarks = codeBlock;
+export const codeBlockWithNoMarks = codeBlock;

package/dist/es2019/next-schema/nodes/decisionItem.js

@@ -6,6 +6,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const decisionItem = adfNode('decisionItem').define({
   defining: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  allowAnyChildMark: true,
   attrs: {
     localId: {
       type: 'string',