@atlaskit/adf-schema 39.0.1 → 39.0.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 39.0.3
+
+### Patch Changes
+
+- 3f37dcf: Sorting of validator spec is breaking for isTupleLike content
+
+## 39.0.2
+
+### Patch Changes
+
+- 3d69cd2: clean up comments and remove validating pm spec unit tests as we have migrated pm spec
+
 ## 39.0.1
 
 ### Patch Changes

package/dist/cjs/next-schema/groups/blockContentGroup.js

@@ -37,6 +37,6 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base heading
  * - no base expand
  */
-var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _blockquote.blockquote, _bodiedExtension.bodiedExtension.use('with_marks'), _list.bulletList, _codeBlock.codeBlock.use('with_no_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand.use('with_no_mark'), _extension.extension.use('with_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _list.orderedList, _panel.panel, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _rule.rule, _table.table, _task.taskList, _unsupportedBlock.unsupportedBlock], {
+var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -48,7 +48,7 @@ var blockCard = exports.blockCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right'],
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
           optional: true
         }
       }
@@ -173,7 +173,7 @@ var mediaSingle = exports.mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         widthType: {
           type: 'enum',
@@ -193,7 +193,7 @@ var mediaSingle = exports.mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         }
       }
     }],
@@ -214,7 +214,7 @@ var media = exports.media = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'link']
+          values: ['link', 'file']
         },
         id: {
           minLength: 1,
@@ -267,7 +267,7 @@ var media = exports.media = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   },
   required: ['attrs']
@@ -402,7 +402,7 @@ var mention = exports.mention = {
         },
         userType: {
           type: 'enum',
-          values: ['APP', 'DEFAULT', 'SPECIAL'],
+          values: ['DEFAULT', 'SPECIAL', 'APP'],
           optional: true
         }
       }
@@ -520,7 +520,7 @@ var status = exports.status = {
         },
         color: {
           type: 'enum',
-          values: ['blue', 'green', 'neutral', 'purple', 'red', 'yellow']
+          values: ['neutral', 'purple', 'blue', 'red', 'yellow', 'green']
         },
         localId: {
           type: 'string',
@@ -544,7 +544,7 @@ var formatted_text_inline = exports.formatted_text_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'backgroundColor', 'em', 'link', 'strike', 'strong', 'subsup', 'textColor', 'underline', null]]
+      items: [['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'textColor', 'annotation', 'backgroundColor', null]]
     }
   }
 }];
@@ -553,7 +553,7 @@ var code_inline = exports.code_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'code', 'link']]
+      items: [['code', 'link', 'annotation']]
     }
   }
 }];
@@ -668,7 +668,7 @@ var caption = exports.caption = {
     },
     content: {
       type: 'array',
-      items: [['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -679,7 +679,7 @@ var mediaSingle_caption = exports.mediaSingle_caption = ['mediaSingle', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: ['caption', 'media'],
+      items: ['media', 'caption'],
       minItems: 1,
       maxItems: 2,
       allowUnsupportedBlock: true
@@ -774,7 +774,7 @@ var mediaInline = exports.mediaInline = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'image', 'link'],
+          values: ['link', 'file', 'image'],
           optional: true
         },
         id: {
@@ -810,7 +810,7 @@ var mediaInline = exports.mediaInline = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   }
 };
@@ -883,8 +883,8 @@ var confluenceUnsupportedInline = exports.confluenceUnsupportedInline = {
     }
   }
 };
-var atomic_inline = exports.atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
-var inline = exports.inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
+var atomic_inline = exports.atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
+var inline = exports.inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 var paragraph = exports.paragraph = {
   props: {
     type: {
@@ -954,7 +954,7 @@ var taskItem = exports.taskItem = {
         },
         state: {
           type: 'enum',
-          values: ['DONE', 'TODO']
+          values: ['TODO', 'DONE']
         }
       }
     },
@@ -993,7 +993,7 @@ var listItem_legacy = exports.listItem_legacy = ['listItem', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1021,7 +1021,7 @@ var listItem = exports.listItem = {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'taskList']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1058,7 +1058,7 @@ var blockquote = exports.blockquote = {
     },
     content: {
       type: 'array',
-      items: [['bulletList', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1133,7 +1133,7 @@ var embedCard = exports.embedCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         width: {
           type: 'number',
@@ -1179,7 +1179,7 @@ var extension = exports.extension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1297,7 +1297,7 @@ var panel = exports.panel = {
       props: {
         panelType: {
           type: 'enum',
-          values: ['custom', 'error', 'info', 'note', 'success', 'tip', 'warning']
+          values: ['info', 'note', 'tip', 'warning', 'error', 'success', 'custom']
         },
         panelIcon: {
           type: 'string',
@@ -1319,7 +1319,7 @@ var panel = exports.panel = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'rule', 'taskList']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1329,7 +1329,7 @@ var panel_legacy = exports.panel_legacy = ['panel', {
   props: {
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'heading_with_no_marks', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1337,7 +1337,7 @@ var panel_legacy = exports.panel_legacy = ['panel', {
 }];
 var nestedExpand_content = exports.nestedExpand_content = {
   type: 'array',
-  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1511,7 +1511,7 @@ var tableHeader = exports.tableHeader = {
 };
 var tableCell_content = exports.tableCell_content = {
   type: 'array',
-  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1546,7 +1546,7 @@ var table = exports.table = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
           optional: true
         },
         localId: {
@@ -1573,7 +1573,7 @@ var table = exports.table = {
     }
   }
 };
-var non_nestable_block_content = exports.non_nestable_block_content = ['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+var non_nestable_block_content = exports.non_nestable_block_content = ['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 var bodiedExtension = exports.bodiedExtension = {
   props: {
     type: {
@@ -1600,7 +1600,7 @@ var bodiedExtension = exports.bodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1693,7 +1693,7 @@ var confluenceUnsupportedBlock = exports.confluenceUnsupportedBlock = {
     }
   }
 };
-var block_content = exports.block_content = ['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 var layoutColumn = exports.layoutColumn = {
   props: {
     type: {
@@ -1782,7 +1782,7 @@ var extensionFrame = exports.extensionFrame = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1
     },
     marks: {
@@ -1818,7 +1818,7 @@ var multiBodiedExtension = exports.multiBodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['default', 'wide', 'full-width'],
           optional: true
         },
         localId: {
@@ -1850,7 +1850,7 @@ var breakout = exports.breakout = {
       props: {
         mode: {
           type: 'enum',
-          values: ['full-width', 'wide']
+          values: ['wide', 'full-width']
         }
       }
     }
@@ -1868,7 +1868,7 @@ var doc = exports.doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_marks', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_breakout_mark', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'multiBodiedExtension', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

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

@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, blockquote, bodiedExtension.use('with_marks'), bulletList, codeBlock.use('with_no_marks'), confluenceUnsupportedBlock, decisionList, embedCard, expand.use('with_no_mark'), extension.use('with_marks'), heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), orderedList, panel, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), rule, table, taskList, unsupportedBlock], {
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -42,7 +42,7 @@ export const blockCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right'],
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
           optional: true
         }
       }
@@ -167,7 +167,7 @@ export const mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         widthType: {
           type: 'enum',
@@ -187,7 +187,7 @@ export const mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         }
       }
     }],
@@ -208,7 +208,7 @@ export const media = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'link']
+          values: ['link', 'file']
         },
         id: {
           minLength: 1,
@@ -261,7 +261,7 @@ export const media = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   },
   required: ['attrs']
@@ -396,7 +396,7 @@ export const mention = {
         },
         userType: {
           type: 'enum',
-          values: ['APP', 'DEFAULT', 'SPECIAL'],
+          values: ['DEFAULT', 'SPECIAL', 'APP'],
           optional: true
         }
       }
@@ -514,7 +514,7 @@ export const status = {
         },
         color: {
           type: 'enum',
-          values: ['blue', 'green', 'neutral', 'purple', 'red', 'yellow']
+          values: ['neutral', 'purple', 'blue', 'red', 'yellow', 'green']
         },
         localId: {
           type: 'string',
@@ -538,7 +538,7 @@ export const formatted_text_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'backgroundColor', 'em', 'link', 'strike', 'strong', 'subsup', 'textColor', 'underline', null]]
+      items: [['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'textColor', 'annotation', 'backgroundColor', null]]
     }
   }
 }];
@@ -547,7 +547,7 @@ export const code_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'code', 'link']]
+      items: [['code', 'link', 'annotation']]
     }
   }
 }];
@@ -662,7 +662,7 @@ export const caption = {
     },
     content: {
       type: 'array',
-      items: [['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -673,7 +673,7 @@ export const mediaSingle_caption = ['mediaSingle', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: ['caption', 'media'],
+      items: ['media', 'caption'],
       minItems: 1,
       maxItems: 2,
       allowUnsupportedBlock: true
@@ -768,7 +768,7 @@ export const mediaInline = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'image', 'link'],
+          values: ['link', 'file', 'image'],
           optional: true
         },
         id: {
@@ -804,7 +804,7 @@ export const mediaInline = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   }
 };
@@ -877,8 +877,8 @@ export const confluenceUnsupportedInline = {
     }
   }
 };
-export const atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
-export const inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
+export const atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
+export const inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 export const paragraph = {
   props: {
     type: {
@@ -948,7 +948,7 @@ export const taskItem = {
         },
         state: {
           type: 'enum',
-          values: ['DONE', 'TODO']
+          values: ['TODO', 'DONE']
         }
       }
     },
@@ -987,7 +987,7 @@ export const listItem_legacy = ['listItem', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1015,7 +1015,7 @@ export const listItem = {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'taskList']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1052,7 +1052,7 @@ export const blockquote = {
     },
     content: {
       type: 'array',
-      items: [['bulletList', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1127,7 +1127,7 @@ export const embedCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         width: {
           type: 'number',
@@ -1173,7 +1173,7 @@ export const extension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1291,7 +1291,7 @@ export const panel = {
       props: {
         panelType: {
           type: 'enum',
-          values: ['custom', 'error', 'info', 'note', 'success', 'tip', 'warning']
+          values: ['info', 'note', 'tip', 'warning', 'error', 'success', 'custom']
         },
         panelIcon: {
           type: 'string',
@@ -1313,7 +1313,7 @@ export const panel = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'rule', 'taskList']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1323,7 +1323,7 @@ export const panel_legacy = ['panel', {
   props: {
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'heading_with_no_marks', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1331,7 +1331,7 @@ export const panel_legacy = ['panel', {
 }];
 export const nestedExpand_content = {
   type: 'array',
-  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1505,7 +1505,7 @@ export const tableHeader = {
 };
 export const tableCell_content = {
   type: 'array',
-  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1540,7 +1540,7 @@ export const table = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
           optional: true
         },
         localId: {
@@ -1567,7 +1567,7 @@ export const table = {
     }
   }
 };
-export const non_nestable_block_content = ['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+export const non_nestable_block_content = ['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export const bodiedExtension = {
   props: {
     type: {
@@ -1594,7 +1594,7 @@ export const bodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1687,7 +1687,7 @@ export const confluenceUnsupportedBlock = {
     }
   }
 };
-export const block_content = ['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 export const layoutColumn = {
   props: {
     type: {
@@ -1776,7 +1776,7 @@ export const extensionFrame = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1
     },
     marks: {
@@ -1812,7 +1812,7 @@ export const multiBodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['default', 'wide', 'full-width'],
           optional: true
         },
         localId: {
@@ -1844,7 +1844,7 @@ export const breakout = {
       props: {
         mode: {
           type: 'enum',
-          values: ['full-width', 'wide']
+          values: ['wide', 'full-width']
         }
       }
     }
@@ -1862,7 +1862,7 @@ export const doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_marks', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_breakout_mark', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'multiBodiedExtension', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/dist/esm/next-schema/groups/blockContentGroup.js

@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export var blockContentGroup = adfNodeGroup('block_content', [blockCard, blockquote, bodiedExtension.use('with_marks'), bulletList, codeBlock.use('with_no_marks'), confluenceUnsupportedBlock, decisionList, embedCard, expand.use('with_no_mark'), extension.use('with_marks'), heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), orderedList, panel, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), rule, table, taskList, unsupportedBlock], {
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

package/dist/esm/validator-schema/generated/validatorSpec.js

@@ -42,7 +42,7 @@ export var blockCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right'],
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
           optional: true
         }
       }
@@ -167,7 +167,7 @@ export var mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         widthType: {
           type: 'enum',
@@ -187,7 +187,7 @@ export var mediaSingle = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         }
       }
     }],
@@ -208,7 +208,7 @@ export var media = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'link']
+          values: ['link', 'file']
         },
         id: {
           minLength: 1,
@@ -261,7 +261,7 @@ export var media = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   },
   required: ['attrs']
@@ -396,7 +396,7 @@ export var mention = {
         },
         userType: {
           type: 'enum',
-          values: ['APP', 'DEFAULT', 'SPECIAL'],
+          values: ['DEFAULT', 'SPECIAL', 'APP'],
           optional: true
         }
       }
@@ -514,7 +514,7 @@ export var status = {
         },
         color: {
           type: 'enum',
-          values: ['blue', 'green', 'neutral', 'purple', 'red', 'yellow']
+          values: ['neutral', 'purple', 'blue', 'red', 'yellow', 'green']
         },
         localId: {
           type: 'string',
@@ -538,7 +538,7 @@ export var formatted_text_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'backgroundColor', 'em', 'link', 'strike', 'strong', 'subsup', 'textColor', 'underline', null]]
+      items: [['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'textColor', 'annotation', 'backgroundColor', null]]
     }
   }
 }];
@@ -547,7 +547,7 @@ export var code_inline = ['text', {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'code', 'link']]
+      items: [['code', 'link', 'annotation']]
     }
   }
 }];
@@ -662,7 +662,7 @@ export var caption = {
     },
     content: {
       type: 'array',
-      items: [['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -673,7 +673,7 @@ export var mediaSingle_caption = ['mediaSingle', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: ['caption', 'media'],
+      items: ['media', 'caption'],
       minItems: 1,
       maxItems: 2,
       allowUnsupportedBlock: true
@@ -768,7 +768,7 @@ export var mediaInline = {
       props: {
         type: {
           type: 'enum',
-          values: ['file', 'image', 'link'],
+          values: ['link', 'file', 'image'],
           optional: true
         },
         id: {
@@ -804,7 +804,7 @@ export var mediaInline = {
     marks: {
       type: 'array',
       optional: true,
-      items: [['annotation', 'border', 'link']]
+      items: [['link', 'annotation', 'border']]
     }
   }
 };
@@ -877,8 +877,8 @@ export var confluenceUnsupportedInline = {
     }
   }
 };
-export var atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
-export var inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
+export var atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
+export var inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 export var paragraph = {
   props: {
     type: {
@@ -948,7 +948,7 @@ export var taskItem = {
         },
         state: {
           type: 'enum',
-          values: ['DONE', 'TODO']
+          values: ['TODO', 'DONE']
         }
       }
     },
@@ -987,7 +987,7 @@ export var listItem_legacy = ['listItem', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1015,7 +1015,7 @@ export var listItem = {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'paragraph_with_no_marks'], ['bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'taskList']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1052,7 +1052,7 @@ export var blockquote = {
     },
     content: {
       type: 'array',
-      items: [['bulletList', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1127,7 +1127,7 @@ export var embedCard = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'full-width', 'wide', 'wrap-left', 'wrap-right']
+          values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
         },
         width: {
           type: 'number',
@@ -1173,7 +1173,7 @@ export var extension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1291,7 +1291,7 @@ export var panel = {
       props: {
         panelType: {
           type: 'enum',
-          values: ['custom', 'error', 'info', 'note', 'success', 'tip', 'warning']
+          values: ['info', 'note', 'tip', 'warning', 'error', 'success', 'custom']
         },
         panelIcon: {
           type: 'string',
@@ -1313,7 +1313,7 @@ export var panel = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'paragraph_with_no_marks', 'rule', 'taskList']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1323,7 +1323,7 @@ export var panel_legacy = ['panel', {
   props: {
     content: {
       type: 'array',
-      items: [['blockCard', 'bulletList', 'heading_with_no_marks', 'orderedList', 'paragraph_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1331,7 +1331,7 @@ export var panel_legacy = ['panel', {
 }];
 export var nestedExpand_content = {
   type: 'array',
-  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1505,7 +1505,7 @@ export var tableHeader = {
 };
 export var tableCell_content = {
   type: 'array',
-  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1540,7 +1540,7 @@ export var table = {
         },
         layout: {
           type: 'enum',
-          values: ['align-end', 'align-start', 'center', 'default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
           optional: true
         },
         localId: {
@@ -1567,7 +1567,7 @@ export var table = {
     }
   }
 };
-export var non_nestable_block_content = ['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+export var non_nestable_block_content = ['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export var bodiedExtension = {
   props: {
     type: {
@@ -1594,7 +1594,7 @@ export var bodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['wide', 'full-width', 'default'],
           optional: true
         },
         localId: {
@@ -1687,7 +1687,7 @@ export var confluenceUnsupportedBlock = {
     }
   }
 };
-export var block_content = ['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList'];
+export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 export var layoutColumn = {
   props: {
     type: {
@@ -1776,7 +1776,7 @@ export var extensionFrame = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1
     },
     marks: {
@@ -1812,7 +1812,7 @@ export var multiBodiedExtension = {
         },
         layout: {
           type: 'enum',
-          values: ['default', 'full-width', 'wide'],
+          values: ['default', 'wide', 'full-width'],
           optional: true
         },
         localId: {
@@ -1844,7 +1844,7 @@ export var breakout = {
       props: {
         mode: {
           type: 'enum',
-          values: ['full-width', 'wide']
+          values: ['wide', 'full-width']
         }
       }
     }
@@ -1862,7 +1862,7 @@ export var doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bodiedExtension_with_marks', 'bulletList', 'codeBlock_with_marks', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'expand_with_breakout_mark', 'expand_with_no_mark', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'multiBodiedExtension', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "39.0.1",
+  "version": "39.0.3",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/schema-generators/validator-full-schema.ts

@@ -1,13 +1,12 @@
 import path from 'path';
 import { adfToValidatorSpec } from '@atlaskit/adf-schema-generator';
 import adfNode from 'src/next-schema/full-schema.adf';
-import { sortNestedArrays } from 'src/validator-schema/utils/sortNestedArrays';
 import { writeToFile } from './helpers/writeToFile';
 
 const outputPath = path.join('src', 'validator-schema', 'generated');
 
 function generateValidatorSpec() {
-  const output = sortNestedArrays(adfToValidatorSpec(adfNode));
+  const output = adfToValidatorSpec(adfNode);
   return Object.entries(output)
     .map(
       ([key, value]) => `export const ${key} = ${JSON.stringify(value.json)};`,

package/schema-generators/__tests__/unit/validate-pm-schema.unit.ts

@@ -1,307 +0,0 @@
-import { MarkSpec, NodeSpec } from '@atlaskit/editor-prosemirror/model';
-import * as newMarkSpecs from '@atlaskit/adf-schema/src/next-schema/generated/markTypes';
-import * as newNodeSpecs from '@atlaskit/adf-schema/src/next-schema/generated/nodeTypes';
-import { getNodesAndMarksMap } from '../../../src/schema/create-schema';
-import { printExpected, printReceived, matcherHint } from 'jest-matcher-utils';
-import { filterAndSortMarks, formatContent } from '../helpers/_utils';
-import {
-  blockCard,
-  blockquote,
-  blockquoteWithList,
-  bodiedExtension,
-  bulletList,
-  caption,
-  codeBlock,
-  confluenceJiraIssue,
-  confluenceUnsupportedBlock,
-  confluenceUnsupportedInline,
-  date,
-  decisionItem,
-  decisionList,
-  doc,
-  embedCard,
-  emoji,
-  expand,
-  extendedPanel,
-  extension,
-  extensionFrame,
-  hardBreak,
-  heading,
-  image,
-  inlineCard,
-  inlineExtension,
-  layoutColumn,
-  layoutSection,
-  listItem,
-  listItemWithTask,
-  media,
-  mediaGroup,
-  mediaInline,
-  mediaSingle,
-  mediaSingleFull,
-  mediaSingleWithCaption,
-  mediaSingleWithWidthType,
-  mention,
-  multiBodiedExtension,
-  nestedExpand,
-  orderedList,
-  orderedListWithOrder,
-  panel,
-  paragraph,
-  placeholder,
-  rule,
-  status,
-  taskItem,
-  taskList,
-  table,
-  tableCell,
-  tableHeader,
-  tableRow,
-  text,
-  unsupportedBlock,
-  unsupportedInline,
-} from '../../../src/schema/nodes';
-import {
-  MarkSpecFactory,
-  NodeSpecFactory,
-} from '../../../src/schema/createPMSpecFactory';
-
-const defaultSchema = getNodesAndMarksMap();
-
-/**
- * TODO: The SKIPPED consts are defined to pass the test
- * Once following ticket is done, will need to remove exclude and unskip tests.
- * https://product-fabric.atlassian.net/browse/ED-23488
- */
-const SKIPPED_NODESPEC_TESTS = [];
-
-const newSpecNameReference = {
-  blockquote: 'blockquoteLegacy',
-  blockquoteWithList: 'blockquote',
-  extendedPanel: 'panel',
-  inlineExtension: 'inlineExtensionWithMarks',
-  listItem: 'listItemLegacy',
-  listItemWithTask: 'listItem',
-  mediaSingleWithCaption: 'mediaSingleCaption',
-  mediaSingleWithWidthType: 'mediaSingleWidthType',
-  orderedListWithOrder: 'orderedList',
-  panel: 'panelLegacy',
-  multiBodiedExtension: 'multiBodiedExtensionStage0',
-  extensionFrame: 'extensionFrameStage0',
-};
-
-const getNewSpecName = (nodeName: string) => {
-  const customNodeSpecName = newSpecNameReference[nodeName];
-  return customNodeSpecName ? customNodeSpecName : nodeName;
-};
-
-const oldSpecReferences = {
-  blockCard,
-  blockquote,
-  blockquoteWithList,
-  bodiedExtension,
-  bulletList,
-  caption,
-  codeBlock,
-  confluenceJiraIssue,
-  confluenceUnsupportedBlock,
-  confluenceUnsupportedInline,
-  date,
-  decisionItem,
-  decisionList,
-  doc,
-  embedCard,
-  emoji,
-  expand,
-  extendedPanel: extendedPanel(true),
-  extension,
-  extensionFrame,
-  hardBreak,
-  heading,
-  image,
-  inlineCard,
-  inlineExtension,
-  layoutColumn,
-  layoutSection,
-  listItem,
-  listItemWithTask,
-  media,
-  mediaGroup,
-  mediaInline,
-  mediaSingle,
-  mediaSingleFull,
-  mediaSingleWithCaption,
-  mediaSingleWithWidthType,
-  mention,
-  multiBodiedExtension,
-  nestedExpand,
-  orderedList,
-  orderedListWithOrder,
-  panel: panel(true),
-  paragraph,
-  placeholder,
-  rule,
-  status,
-  taskItem,
-  taskList,
-  table,
-  tableCell,
-  tableHeader,
-  tableRow,
-  text,
-  unsupportedBlock,
-  unsupportedInline,
-};
-
-const failMessage = (actual, expected, not) => () =>
-  `${matcherHint(
-    `${not ? '.not' : ''}.toMatchNodeSpec`,
-    'received',
-    'expected',
-  )}
-
-Expected nodeSpec${not ? ' not ' : ' '}to be equal:
-  
-Expected: ${printExpected(expected)}
-Received: ${printReceived(actual)}`;
-
-declare let expect: any;
-expect.extend({
-  toMatchNodeSpec(actual: NodeSpec, expected: NodeSpec) {
-    const formattedActual = {
-      ...actual,
-      ...(actual.content && { content: formatContent(actual.content) }),
-      ...(actual.marks && {
-        marks: filterAndSortMarks(actual.marks),
-      }),
-    };
-
-    const formattedExpected = {
-      ...expected,
-      ...(expected.content && {
-        content: formatContent(expected.content),
-      }),
-      ...(expected.marks && {
-        marks: filterAndSortMarks(expected.marks),
-      }),
-    };
-
-    // status node used uuid for localId, which is incorrect, and not supported in DSL.
-    if (formattedExpected?.attrs?.localId?.default) {
-      formattedExpected.attrs.localId.default = '';
-    }
-
-    const pass = this.equals(
-      formattedActual,
-      formattedExpected,
-      undefined,
-      true, // enable strict equal
-    );
-    return {
-      pass,
-      message: failMessage(formattedActual, formattedExpected, pass),
-    };
-  },
-});
-
-function isNodeSpec(_value: MarkSpec | NodeSpec): _value is NodeSpec {
-  return true;
-}
-
-/**
- * Custom omit function, mainly used to filter out parseDOM and toDOM from old spec
- * and some special logic to filter out certain field when compare spec
- * @param data
- * @param keys
- * @returns
- */
-function omit<T extends object>(data: T, keys = []): T {
-  const result = { ...data };
-  for (const k of keys) {
-    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-    delete result[k];
-  }
-  if (isNodeSpec(data)) {
-    // Treat inline: false same as no inline property
-    if (data.inline !== undefined && data.inline === false) {
-      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-      delete result['inline'];
-    }
-  }
-  return result;
-}
-
-describe('validate PM schema', () => {
-  describe('marks', () => {
-    const { marks } = defaultSchema;
-
-    const testCases = Object.entries(marks).map(([key, value]) => {
-      return {
-        name: key,
-        legacyMarkSpec: value,
-        newMarkSpecFn: newMarkSpecs[key] as MarkSpecFactory,
-        skip: key.startsWith('__'),
-      };
-    });
-
-    const getTestingMethod = (skip: boolean) => {
-      return skip ? it.skip : it;
-    };
-
-    testCases.forEach(({ name, legacyMarkSpec, newMarkSpecFn, skip }) => {
-      const testMethod = getTestingMethod(skip);
-
-      testMethod(`validate markSpec for mark ${name}`, () => {
-        // check if there's any missing markSpec
-        expect(newMarkSpecFn).toBeDefined();
-        const newMarkSpec = newMarkSpecFn<any>({});
-        expect(
-          omit(newMarkSpec, ['parseDOM', 'toDOM', 'toDebugString']),
-        ).toStrictEqual(
-          omit(legacyMarkSpec, ['parseDOM', 'toDOM', 'toDebugString']),
-        );
-      });
-    });
-  });
-
-  describe('nodes', () => {
-    const skipLists = SKIPPED_NODESPEC_TESTS;
-    const testCases = Object.entries(oldSpecReferences).map(([key, value]) => {
-      const newSpecName = getNewSpecName(key);
-      return {
-        name: key,
-        legacyNodeSpec: value,
-        newNodeSpecFn: newNodeSpecs[newSpecName] as NodeSpecFactory,
-        testingMethod: {
-          skip: skipLists.includes(key),
-        },
-      };
-    });
-
-    const getTestingMethod = ({ only = false, skip = false }) => {
-      if (skip) {
-        return it.skip;
-      }
-      if (only) {
-        return it.only;
-      }
-      return it;
-    };
-
-    testCases.forEach(
-      ({ name, legacyNodeSpec, newNodeSpecFn, testingMethod }) => {
-        const testMethod = getTestingMethod(testingMethod);
-        testMethod(`validate nodeSpec for node ${name}`, () => {
-          // check if there's any missing nodeSpec
-          expect(newNodeSpecFn).toBeDefined();
-          const newNodeSpec = newNodeSpecFn<any>({});
-          expect(
-            omit(newNodeSpec, ['parseDOM', 'toDOM', 'toDebugString']),
-          ).toMatchNodeSpec(
-            omit(legacyNodeSpec, ['parseDOM', 'toDOM', 'toDebugString']),
-          );
-        });
-      },
-    );
-  });
-});