@atlaskit/adf-schema 37.0.3 → 37.1.19

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

@@ -29,11 +29,12 @@ export const blockCard = createPMNodeSpecFactory({
 });
 export const blockquote = createPMNodeSpecFactory({
   content: '(paragraph | bulletList | orderedList | unsupportedBlock)+',
+  group: 'block',
   selectable: false,
   defining: true
 });
-export const blockquoteWithList = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+export const blockquoteLegacy = createPMNodeSpecFactory({
+  content: '(paragraph | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -41,6 +42,7 @@ export const blockquoteWithList = createPMNodeSpecFactory({
 export const bodiedExtension = createPMNodeSpecFactory({
   content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
   marks: 'dataConsumer fragment',
+  group: 'block',
   attrs: {
     extensionKey: {
       default: ''
@@ -66,7 +68,6 @@ export const bodiedExtension = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
   marks: 'dataConsumer fragment',
   group: 'block',
   attrs: {
@@ -108,6 +109,7 @@ export const caption = createPMNodeSpecFactory({
 export const codeBlock = createPMNodeSpecFactory({
   content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  group: 'block',
   attrs: {
     language: {
       default: null
@@ -120,7 +122,6 @@ export const codeBlock = createPMNodeSpecFactory({
   defining: true
 });
 export const codeBlockWithNoMarks = createPMNodeSpecFactory({
-  content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
@@ -211,7 +212,7 @@ export const decisionList = createPMNodeSpecFactory({
 });
 export const doc = createPMNodeSpecFactory({
   content: '(block | layoutSection | blockRootOnly)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation fragment dataConsumer breakout'
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment breakout'
 });
 export const embedCard = createPMNodeSpecFactory({
   group: 'block',
@@ -250,7 +251,7 @@ export const emoji = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const expandWithNoMark = createPMNodeSpecFactory({
+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 dataConsumer fragment',
   group: 'block',
@@ -265,7 +266,21 @@ export const expandWithNoMark = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
+export const expandWithNoMark = createPMNodeSpecFactory({
+  group: 'block',
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
 export const extension = createPMNodeSpecFactory({
+  group: 'block',
   atom: true,
   attrs: {
     extensionKey: {
@@ -330,6 +345,7 @@ export const hardBreak = createPMNodeSpecFactory({
 });
 export const heading = createPMNodeSpecFactory({
   content: 'inline*',
+  group: 'block',
   attrs: {
     level: {
       default: 1
@@ -342,7 +358,6 @@ export const heading = createPMNodeSpecFactory({
   defining: true
 });
 export const headingWithAlignment = createPMNodeSpecFactory({
-  content: 'inline*',
   group: 'block',
   attrs: {
     level: {
@@ -356,7 +371,6 @@ export const headingWithAlignment = createPMNodeSpecFactory({
   defining: true
 });
 export const headingWithIndentation = createPMNodeSpecFactory({
-  content: 'inline*',
   group: 'block',
   attrs: {
     level: {
@@ -370,7 +384,6 @@ export const headingWithIndentation = createPMNodeSpecFactory({
   defining: true
 });
 export const headingWithNoMarks = createPMNodeSpecFactory({
-  content: 'inline*',
   group: 'block',
   attrs: {
     level: {
@@ -437,15 +450,22 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
 });
 export const layoutColumn = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation fragment dataConsumer',
+  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment',
   attrs: {
-    width: {}
+    width: {
+      default: undefined
+    }
   },
   selectable: false,
   isolating: true
 });
 export const layoutSection = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
+  isolating: true
+});
+export const layoutSectionFull = createPMNodeSpecFactory({
+  content: '(layoutColumn | unsupportedBlock){2,3}',
   marks: 'unsupportedNodeAttribute unsupportedMark',
   isolating: true
 });
@@ -455,6 +475,12 @@ export const listItem = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export const listItemLegacy = createPMNodeSpecFactory({
+  content: '(codeBlock | paragraph | mediaSingle | unsupportedBlock) (codeBlock | paragraph | mediaSingle | bulletList | orderedList | unsupportedBlock)*',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
+  selectable: false,
+  defining: true
+});
 export const media = createPMNodeSpecFactory({
   attrs: {
     type: {
@@ -565,24 +591,37 @@ export const mediaInline = createPMNodeSpecFactory({
   selectable: true
 });
 export const mediaSingle = createPMNodeSpecFactory({
-  content: 'media',
-  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
-  atom: false,
+  group: 'block',
+  atom: true,
   attrs: {
+    layout: {
+      default: 'center'
+    },
     width: {
       default: null
-    },
+    }
+  },
+  selectable: true,
+  content: 'media|media|unsupportedBlock+ unsupportedBlock+',
+  marks: 'annotation border link unsupportedMark unsupportedNodeAttribute'
+});
+export const mediaSingleCaption = createPMNodeSpecFactory({
+  content: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
+  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  group: 'block',
+  atom: false,
+  attrs: {
     layout: {
       default: 'center'
     },
-    widthType: {
+    width: {
       default: null
     }
   },
   selectable: true
 });
-export const mediaSingleCaption = createPMNodeSpecFactory({
-  content: '(media | unsupportedBlock) (caption | unsupportedBlock)',
+export const mediaSingleFull = createPMNodeSpecFactory({
+  content: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
   marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
   group: 'block',
   atom: false,
@@ -599,11 +638,11 @@ export const mediaSingleCaption = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const mediaSingleFull = createPMNodeSpecFactory({
-  content: 'media',
+export const mediaSingleWidthType = createPMNodeSpecFactory({
+  content: 'media|media|unsupportedBlock+ unsupportedBlock+',
   marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
   group: 'block',
-  atom: false,
+  atom: true,
   attrs: {
     width: {
       default: null
@@ -665,7 +704,7 @@ export const multiBodiedExtension = createPMNodeSpecFactory({
   selectable: true,
   definingAsContext: true
 });
-export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
+export const nestedExpand = createPMNodeSpecFactory({
   content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
   marks: 'unsupportedNodeAttribute unsupportedMark',
   attrs: {
@@ -679,6 +718,18 @@ export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
+export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
 export const orderedList = createPMNodeSpecFactory({
   content: 'listItem+',
   marks: 'unsupportedNodeAttribute unsupportedMark',
@@ -713,6 +764,29 @@ export const panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
+export const panelLegacy = createPMNodeSpecFactory({
+  content: '(blockCard | paragraph | bulletList | orderedList | heading | unsupportedBlock)+',
+  marks: 'unsupportedNodeAttribute unsupportedMark',
+  group: 'block',
+  attrs: {
+    panelType: {
+      default: 'info'
+    },
+    panelIcon: {
+      default: null
+    },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
+    panelColor: {
+      default: null
+    }
+  },
+  selectable: true
+});
 export const paragraph = createPMNodeSpecFactory({
   content: 'inline*',
   marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
@@ -725,8 +799,7 @@ export const paragraph = createPMNodeSpecFactory({
   selectable: false
 });
 export const paragraphWithAlignment = createPMNodeSpecFactory({
-  content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  group: 'block',
   attrs: {
     localId: {
       default: null
@@ -734,9 +807,7 @@ export const paragraphWithAlignment = createPMNodeSpecFactory({
   },
   selectable: false
 });
-export const paragraphWithMarks = createPMNodeSpecFactory({
-  content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+export const paragraphWithIndentation = createPMNodeSpecFactory({
   group: 'block',
   attrs: {
     localId: {
@@ -746,8 +817,7 @@ export const paragraphWithMarks = createPMNodeSpecFactory({
   selectable: false
 });
 export const paragraphWithNoMarks = createPMNodeSpecFactory({
-  content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  group: 'block',
   attrs: {
     localId: {
       default: null

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

@@ -18,4 +18,4 @@ 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', [panel, paragraph, paragraph.use('with_marks'), blockquote.use('with_list'), orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table, expand.use('with_no_mark'), extension.use('with_marks'), bodiedExtension.use('with_marks'), blockCard, embedCard, confluenceUnsupportedBlock, unsupportedBlock]);
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), confluenceUnsupportedBlock, unsupportedBlock]);

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

@@ -13,4 +13,4 @@ import { unsupportedInline } from '../nodes/unsupportedInline';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
 import { image } from '../nodes/image';
 import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
-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, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline]);
+export const inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline]);

package/dist/es2019/next-schema/index.js

@@ -1,2 +1,2 @@
 export { alignment, annotation, backgroundColor, border, breakout, code, confluenceInlineComment, dataConsumer, em, fragment, indentation, link, strike, strong, subsup, textColor, typeAheadQuery, underline, unsupportedMark, unsupportedNodeAttribute } from './generated/markTypes';
-export { blockCard, blockquote, bulletList, blockquoteWithList, bodiedExtension, bodiedExtensionWithMarks, caption, codeBlock, codeBlockWithNoMarks, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, decisionItem, decisionList, doc, embedCard, emoji, expandWithNoMark, extension, extensionFrame, extensionWithMarks, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineExtensionWithMarks, layoutColumn, layoutSection, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mention, multiBodiedExtension, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithMarks, paragraphWithNoMarks, placeholder, rule, status, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textCodeInline, textFormatted, unsupportedBlock, unsupportedInline } from './generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, bulletList, bodiedExtension, bodiedExtensionWithMarks, caption, codeBlock, codeBlockWithNoMarks, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, decisionItem, decisionList, doc, embedCard, emoji, expandWithNoMark, extension, extensionFrame, extensionWithMarks, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineExtensionWithMarks, layoutColumn, layoutSection, layoutSectionFull, listItem, listItemLegacy, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mention, multiBodiedExtension, nestedExpandWithNoMarks, orderedList, panel, panelLegacy, paragraph, paragraphWithAlignment, paragraphWithNoMarks, placeholder, rule, status, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textCodeInline, textFormatted, unsupportedBlock, unsupportedInline } from './generated/nodeTypes';

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

@@ -9,6 +9,7 @@ export const blockquote = adfNode('blockquote').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   content: [$onePlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, unsupportedBlock))]
-}).variant('with_list', {
-  content: [$onePlus($or(paragraph, orderedList, bulletList, unsupportedBlock))]
+}).variant('legacy', {
+  ignore: ['json-schema', 'validator-spec'],
+  content: [$onePlus($or(paragraph, unsupportedBlock))]
 });

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

@@ -9,6 +9,7 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
   selectable: true,
   isolating: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     extensionKey: {
       minLength: 1,
@@ -43,7 +44,10 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
       default: null
     }
   },
-  content: [$onePlus($or(...nonNestableBlockContent))]
+  content: [$onePlus($or(...nonNestableBlockContent))],
+  ignore: ['json-schema']
 }).variant('with_marks', {
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark]
+  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
+  content: [],
+  ignore: []
 });

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

@@ -20,8 +20,15 @@ export const codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
-  content: [$zeroPlus($or(text, unsupportedInline))]
+  content: [$zeroPlus($or(text, unsupportedInline))],
+  ignore: ['json-schema']
 }).variant('with_marks', {
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark]
-}).variant('with_no_marks', {});
+  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  ignore: ['pm-spec']
+}).variant('with_no_marks', {
+  content: [],
+  marks: [],
+  noMarks: true,
+  ignore: []
+});
 export const codeBlockWithNoMarks = codeBlock;

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

@@ -1,10 +1,11 @@
 import { adfNode } from '@atlaskit/adf-schema-generator';
+import { annotation } from '../marks/annotation';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const date = adfNode('date').define({
   inline: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedNodeAttribute, unsupportedMark, annotation],
   attrs: {
     timestamp: {
       minLength: 1,

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

@@ -1,10 +1,11 @@
 import { adfNode } from '@atlaskit/adf-schema-generator';
+import { annotation } from '../marks/annotation';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const emoji = adfNode('emoji').define({
   inline: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedNodeAttribute, unsupportedMark, annotation],
   attrs: {
     shortName: {
       type: 'string',

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

@@ -19,7 +19,15 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(...nonNestableBlockContent))]
+  content: [$onePlus($or(...nonNestableBlockContent))],
+  ignore: ['json-schema']
 }).variant('with_breakout_mark', {
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark]
-}).variant('with_no_mark', {});
+  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  content: [],
+  ignore: ['pm-spec']
+}).variant('with_no_mark', {
+  content: [],
+  marks: [],
+  noMarks: true,
+  ignore: []
+});

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

@@ -7,6 +7,7 @@ export const extension = adfNode('extension').define({
   atom: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     extensionKey: {
       minLength: 1,
@@ -40,7 +41,9 @@ export const extension = adfNode('extension').define({
       optional: true,
       default: null
     }
-  }
+  },
+  ignore: ['json-schema']
 }).variant('with_marks', {
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark]
+  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
+  ignore: []
 });

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

@@ -7,6 +7,7 @@ export const heading = adfNode('heading').define({
   defining: true,
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     level: {
       type: 'number',
@@ -20,9 +21,31 @@ export const heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      marks: {
+        value: {
+          type: 'array',
+          items: [],
+          optional: true
+        },
+        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
+      }
+    }
+  }
 }).variant('with_alignment', {
-  marks: [alignment, unsupportedNodeAttribute, unsupportedMark]
+  marks: [alignment, unsupportedNodeAttribute, unsupportedMark],
+  content: [],
+  ignore: []
 }).variant('with_indentation', {
-  marks: [indentation, unsupportedNodeAttribute, unsupportedMark]
-}).variant('with_no_marks', {});
+  marks: [indentation, unsupportedNodeAttribute, unsupportedMark],
+  content: [],
+  ignore: []
+}).variant('with_no_marks', {
+  content: [],
+  marks: [],
+  noMarks: true,
+  ignore: []
+});
+export const headingWithMarks = heading;

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

@@ -7,6 +7,7 @@ export const inlineExtension = adfNode('inlineExtension').define({
   inline: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     extensionKey: {
       minLength: 1,

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

@@ -7,5 +7,18 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const layoutSection = adfNode('layoutSection').define({
   isolating: true,
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))]
-}).variant('full', {});
+  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
+  ignore: ['json-schema'],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+        reason: `The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL.`
+      }
+    }
+  }
+}).variant('full', {
+  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))],
+  ignore: []
+});

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

@@ -8,7 +8,16 @@ import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 export const orderedList = adfNode('orderedList');
 export const bulletList = adfNode('bulletList');
-const listItem = adfNode('listItem');
+const listItem = adfNode('listItem').define({
+  defining: true,
+  selectable: false,
+  marks: [unsupportedNodeAttribute, unsupportedMark],
+  contentMinItems: 1,
+  content: [$or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), unsupportedBlock), $zeroPlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, unsupportedBlock))]
+}).variant('legacy', {
+  content: [$or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), unsupportedBlock), $zeroPlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), bulletList, orderedList, unsupportedBlock))],
+  ignore: ['json-schema', 'validator-spec']
+});
 orderedList.define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
@@ -20,16 +29,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [$onePlus($or(listItem))]
+  content: [$onePlus($or(listItem, listItem.use('legacy')))]
 });
 bulletList.define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(listItem))]
-});
-listItem.define({
-  defining: true,
-  selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), unsupportedBlock), $zeroPlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, unsupportedBlock))]
+  content: [$onePlus($or(listItem, listItem.use('legacy')))]
 });

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

@@ -18,7 +18,8 @@ export const mediaInline = adfNode('mediaInline').define({
     },
     url: {
       type: 'string',
-      default: null
+      default: null,
+      optional: true
     },
     id: {
       minLength: 1,

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

@@ -1,4 +1,4 @@
-import { $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $range, adfNode } from '@atlaskit/adf-schema-generator';
 import { link } from '../marks/link';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -6,8 +6,9 @@ import { caption } from './caption';
 import { media } from './media';
 import { unsupportedBlock } from './unsupportedBlock';
 export const mediaSingle = adfNode('mediaSingle').define({
-  atom: false,
+  atom: true,
   selectable: true,
+  ignore: ['json-schema'],
   marks: [link, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     anyOf: [{
@@ -47,8 +48,78 @@ export const mediaSingle = adfNode('mediaSingle').define({
       }
     }]
   },
-  content: [$or(media)]
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: 'media|media|unsupportedBlock+ unsupportedBlock+',
+        reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
+      },
+      attrs: {
+        value: {
+          layout: {
+            default: 'center'
+          },
+          width: {
+            default: null
+          }
+        },
+        reason: 'the widthType was not in attrs of original spec'
+      },
+      marks: {
+        value: 'annotation border link unsupportedMark unsupportedNodeAttribute',
+        reason: "Types and PM Spec don't match, in types base mediaSingle doesn't have children, and in ADF DSL marks are derived from children"
+      }
+    }
+  }
 }).variant('caption', {
   atom: false,
-  content: [$or(media, unsupportedBlock), $or(caption, unsupportedBlock)]
-}).variant('full', {});
+  ignore: [],
+  marks: [],
+  contentMinItems: 1,
+  contentMaxItems: 2,
+  content: [$or(media, unsupportedBlock), $or(caption, unsupportedBlock)],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
+        reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
+      },
+      attrs: {
+        value: {
+          layout: {
+            default: 'center'
+          },
+          width: {
+            default: null
+          }
+        },
+        reason: 'the widthType was not in attrs of original spec of mediaSingleWithCaption'
+      }
+    }
+  }
+}).variant('full', {
+  atom: false,
+  content: [$range(1, 1, $or(media, unsupportedBlock))],
+  ignore: [],
+  marks: [],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
+        reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
+      }
+    }
+  }
+}).variant('width_type', {
+  content: [$range(1, 1, $or(media, unsupportedBlock))],
+  ignore: [],
+  marks: [],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: 'media|media|unsupportedBlock+ unsupportedBlock+',
+        reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
+      }
+    }
+  }
+});