@atlaskit/adf-schema 36.11.0 → 36.12.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.12.1
+
+### Patch Changes
+
+- d589477: Add required field to nodes and marks for JSON Schema transformer from ADF DSL
+
+## 36.12.0
+
+### Minor Changes
+
+- b9c6fee: Update PM Spec to current
+
 ## 36.11.0
 
 ### Minor Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -13,6 +13,6 @@ var _paragraph = require("./nodes/paragraph");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _nestedExpand.nestedExpand, _paragraph.paragraph))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _nestedExpand.nestedExpand, _paragraph.paragraph))]
 });
 var _default = exports.default = doc;

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

@@ -117,9 +117,6 @@ var media = exports.media = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   },
   selectable: true
 });
-var textFormatted = exports.textFormatted = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  group: 'inline'
-});
 var hardBreak = exports.hardBreak = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   group: 'inline',
   inline: true,
@@ -217,9 +214,15 @@ var status = exports.status = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   },
   selectable: true
 });
+var textFormatted = exports.textFormatted = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
+  group: 'inline'
+});
+var textCodeInline = exports.textCodeInline = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
+  group: 'inline'
+});
 var caption = exports.caption = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(text | hardBreak | mention | emoji | date | placeholder | inlineCard | status)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor',
+  content: '(hardBreak | mention | emoji | date | placeholder | inlineCard | status | text)*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code',
   selectable: false,
   isolating: true
 });
@@ -257,9 +260,6 @@ var mediaSingleFull = exports.mediaSingleFull = (0, _adfSchemaGenerator.createPM
   },
   selectable: true
 });
-var textCodeInline = exports.textCodeInline = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  group: 'inline'
-});
 var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   group: 'inline',
   inline: true,
@@ -528,13 +528,8 @@ var mediaGroup = exports.mediaGroup = (0, _adfSchemaGenerator.createPMNodeSpecFa
 var rule = exports.rule = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   group: 'block'
 });
-var paragraph = exports.paragraph = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
-  selectable: false
-});
 var panel = exports.panel = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | rule)+',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule)+',
   marks: 'link',
   group: 'block',
   attrs: {
@@ -578,8 +573,8 @@ var headingWithIndentation = exports.headingWithIndentation = (0, _adfSchemaGene
   selectable: false,
   defining: true
 });
-var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote)+',
+var nestedExpandWithNoMarks = exports.nestedExpandWithNoMarks = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
+  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
   marks: 'link',
   attrs: {
     title: {
@@ -593,8 +588,8 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.createPMNodeSp
   isolating: true
 });
 var tableCell = exports.tableCell = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | extension | blockCard | nestedExpand | embedCard)+',
-  marks: 'alignment indentation link',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
+  marks: 'alignment link indentation dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -612,23 +607,9 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.createPMNodeSpecFact
   selectable: false,
   isolating: true
 });
-var nestedExpandWithNoMarks = exports.nestedExpandWithNoMarks = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote)+',
-  marks: 'link',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | extension | blockCard | nestedExpand | embedCard)+',
-  marks: 'alignment indentation link',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
+  marks: 'alignment link indentation dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -675,8 +656,8 @@ var table = exports.table = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   isolating: true
 });
 var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     extensionType: {
@@ -703,8 +684,8 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.createPM
   isolating: true
 });
 var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     extensionType: {
@@ -731,8 +712,8 @@ var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _adfSchema
   isolating: true
 });
 var expand = exports.expand = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -746,8 +727,8 @@ var expand = exports.expand = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   isolating: true
 });
 var expandWithBreakoutMark = exports.expandWithBreakoutMark = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -761,8 +742,8 @@ var expandWithBreakoutMark = exports.expandWithBreakoutMark = (0, _adfSchemaGene
   isolating: true
 });
 var expandWithNoMark = exports.expandWithNoMark = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -792,7 +773,26 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _adfSchemaGenerator.crea
   content: 'layoutColumn{1,3}',
   isolating: true
 });
+var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
+  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
+  marks: 'link',
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
+var paragraph = exports.paragraph = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
+  content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
+  selectable: false
+});
 var doc = exports.doc = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
-  content: '(block | layoutSection | blockRootOnly)*',
+  content: '(block | layoutSection | blockRootOnly | nestedExpand | paragraph)*',
   marks: 'breakout link alignment indentation dataConsumer fragment'
 });

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

@@ -16,7 +16,6 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
       },
       datasource: {
         type: 'object',
-        optional: true,
         properties: {
           id: {
             type: 'string'
@@ -32,12 +31,14 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
                   type: 'string'
                 }
               },
+              required: ['type'],
               type: 'object'
             },
             minItems: 1,
             type: 'array'
           }
-        }
+        },
+        required: ['id', 'parameters', 'views']
       },
       width: {
         type: 'number',
@@ -50,12 +51,11 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
       }
     }, {
       url: {
-        type: 'string',
-        optional: true
+        type: 'string'
       }
     }, {
       data: {
-        optional: true
+        default: null
       }
     }]
   }

package/dist/cjs/next-schema/nodes/bodiedExtension.js

@@ -15,12 +15,12 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
   selectable: true,
   isolating: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -13,7 +13,8 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
   attrs: {
     language: {
       type: 'string',
-      default: null
+      default: null,
+      optional: true
     }
   },
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text))]

package/dist/cjs/next-schema/nodes/extension.js

@@ -11,12 +11,12 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
   atom: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

package/dist/cjs/next-schema/nodes/inlineCard.js

@@ -14,12 +14,10 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
     anyOf: [{
       url: {
         type: 'string',
-        optional: true,
         default: null
       }
     }, {
       data: {
-        optional: true,
         default: null
       }
     }]

package/dist/cjs/next-schema/nodes/inlineExtension.js

@@ -9,12 +9,12 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
   inline: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

package/dist/cjs/next-schema/nodes/list.js

@@ -18,7 +18,8 @@ orderedList.define({
     order: {
       type: 'number',
       minimum: 0,
-      default: 1
+      default: 1,
+      optional: true
     }
   },
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem))]

package/dist/cjs/next-schema/nodes/media.js

@@ -18,6 +18,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         values: ['link', 'file'],
         default: 'file'
       },
+      id: {
+        minLength: 1,
+        type: 'string',
+        default: ''
+      },
       alt: {
         type: 'string',
         default: '',
@@ -27,11 +32,6 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         type: 'string',
         default: ''
       },
-      id: {
-        minLength: 1,
-        type: 'string',
-        default: ''
-      },
       height: {
         type: 'number',
         default: null,
@@ -84,6 +84,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       }
     }, {
+      type: {
+        type: 'enum',
+        values: ['external'],
+        default: 'file'
+      },
       alt: {
         type: 'string',
         default: '',
@@ -102,12 +107,7 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
       url: {
         type: 'string',
         default: null,
-        optional: true
-      },
-      type: {
-        type: 'enum',
-        values: ['external'],
-        default: 'file'
+        optional: false
       }
     }]
   }

package/dist/cjs/next-schema/nodes/mediaInline.js

@@ -26,7 +26,8 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
       type: 'string'
     },
     alt: {
-      type: 'string'
+      type: 'string',
+      optional: true
     },
     collection: {
       type: 'string'

package/dist/cjs/next-schema/nodes/mediaSingle.js

@@ -23,7 +23,8 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
       },
       layout: {
         type: 'enum',
-        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        default: 'center'
       },
       widthType: {
         type: 'enum',
@@ -35,19 +36,17 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
       width: {
         type: 'number',
         minimum: 0,
-        default: null,
-        optional: true
+        default: null
+      },
+      widthType: {
+        type: 'enum',
+        values: ['pixel'],
+        default: 'pixel'
       },
       layout: {
         type: 'enum',
         values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
         default: 'center'
-      },
-      widthType: {
-        type: 'enum',
-        values: ['pixel'],
-        default: 'pixel',
-        optional: true
       }
     }]
   }

package/dist/cjs/next-schema/nodes/table.js

@@ -14,7 +14,9 @@ var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table').define({
   attrs: {
     displayMode: {
       type: 'enum',
-      values: ['default', 'fixed']
+      values: ['default', 'fixed'],
+      default: 'default',
+      optional: true
     },
     isNumberColumnEnabled: {
       type: 'boolean',

package/dist/cjs/next-schema/nodes/tableRow.js

@@ -9,5 +9,5 @@ var _tableCell = require("./tableCell");
 var _tableHeader = require("./tableHeader");
 var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   selectable: false,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
 });

package/dist/es2019/next-schema/full-schema.adf.js

@@ -1,4 +1,4 @@
-import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
@@ -7,6 +7,6 @@ import { paragraph } from './nodes/paragraph';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
+  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
 });
 export default doc;

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

@@ -111,9 +111,6 @@ export const media = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const textFormatted = createPMNodeSpecFactory({
-  group: 'inline'
-});
 export const hardBreak = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
@@ -211,9 +208,15 @@ export const status = createPMNodeSpecFactory({
   },
   selectable: true
 });
+export const textFormatted = createPMNodeSpecFactory({
+  group: 'inline'
+});
+export const textCodeInline = createPMNodeSpecFactory({
+  group: 'inline'
+});
 export const caption = createPMNodeSpecFactory({
-  content: '(text | hardBreak | mention | emoji | date | placeholder | inlineCard | status)*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor',
+  content: '(hardBreak | mention | emoji | date | placeholder | inlineCard | status | text)*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code',
   selectable: false,
   isolating: true
 });
@@ -251,9 +254,6 @@ export const mediaSingleFull = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const textCodeInline = createPMNodeSpecFactory({
-  group: 'inline'
-});
 export const inlineExtension = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
@@ -522,13 +522,8 @@ export const mediaGroup = createPMNodeSpecFactory({
 export const rule = createPMNodeSpecFactory({
   group: 'block'
 });
-export const paragraph = createPMNodeSpecFactory({
-  content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
-  selectable: false
-});
 export const panel = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | rule)+',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule)+',
   marks: 'link',
   group: 'block',
   attrs: {
@@ -572,8 +567,8 @@ export const headingWithIndentation = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export const nestedExpand = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote)+',
+export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
+  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
   marks: 'link',
   attrs: {
     title: {
@@ -587,8 +582,8 @@ export const nestedExpand = createPMNodeSpecFactory({
   isolating: true
 });
 export const tableCell = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | extension | blockCard | nestedExpand | embedCard)+',
-  marks: 'alignment indentation link',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
+  marks: 'alignment link indentation dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -606,23 +601,9 @@ export const tableCell = createPMNodeSpecFactory({
   selectable: false,
   isolating: true
 });
-export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote)+',
-  marks: 'link',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 export const tableHeader = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | extension | blockCard | nestedExpand | embedCard)+',
-  marks: 'alignment indentation link',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
+  marks: 'alignment link indentation dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -669,8 +650,8 @@ export const table = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedExtension = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     extensionType: {
@@ -697,8 +678,8 @@ export const bodiedExtension = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     extensionType: {
@@ -725,8 +706,8 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export const expand = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -740,8 +721,8 @@ export const expand = createPMNodeSpecFactory({
   isolating: true
 });
 export const expandWithBreakoutMark = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -755,8 +736,8 @@ export const expandWithBreakoutMark = createPMNodeSpecFactory({
   isolating: true
 });
 export const expandWithNoMark = createPMNodeSpecFactory({
-  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard)+',
-  marks: 'link fragment',
+  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
+  marks: 'link dataConsumer fragment',
   group: 'block',
   attrs: {
     title: {
@@ -786,7 +767,26 @@ export const layoutSectionFull = createPMNodeSpecFactory({
   content: 'layoutColumn{1,3}',
   isolating: true
 });
+export const nestedExpand = createPMNodeSpecFactory({
+  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
+  marks: 'link',
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
+export const paragraph = createPMNodeSpecFactory({
+  content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
+  selectable: false
+});
 export const doc = createPMNodeSpecFactory({
-  content: '(block | layoutSection | blockRootOnly)*',
+  content: '(block | layoutSection | blockRootOnly | nestedExpand | paragraph)*',
   marks: 'breakout link alignment indentation dataConsumer fragment'
 });