@atlaskit/adf-schema 57.5.4 → 57.6.0

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

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.text_with_no_marks = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.syncBlock = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule_with_attrs_root_only = exports.rule_with_attrs = exports.rule_root_only = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_font_size = exports.paragraph_with_alignment = exports.paragraph = exports.panel_root_only = exports.panel_c1_root_only = exports.panel_c1 = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension_root_only = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.fontSize = exports.extension_with_marks = exports.extension_root_only = exports.extensionFrame = exports.extension = exports.expand_root_only = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedSyncBlock = exports.bodiedRule_root_only = exports.bodiedRule = exports.bodiedExtension_with_marks = exports.bodiedExtension_root_only = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockTaskItem = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
-exports.underline = void 0;
+exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.syncBlock = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule_with_attrs_root_only = exports.rule_with_attrs = exports.rule_root_only = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_font_size = exports.paragraph_with_alignment = exports.paragraph = exports.panel_root_only = exports.panel_c1_root_only = exports.panel_c1 = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension_root_only = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.fontSize = exports.extension_with_marks = exports.extension_with_annotation = exports.extension_root_only_with_annotation = exports.extension_root_only = exports.extensionFrame = exports.extension = exports.expand_root_only = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedSyncBlock = exports.bodiedRule_root_only = exports.bodiedRule = exports.bodiedExtension_with_marks = exports.bodiedExtension_root_only = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockTaskItem = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.underline = exports.text_with_no_marks = exports.text_link_inline = void 0;
 var alignment = exports.alignment = {
   props: {
     attrs: {
@@ -56,7 +56,7 @@ var backgroundColor = exports.backgroundColor = {
     }
   }
 };
-var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
+var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 var blockCard = exports.blockCard = {
   props: {
     attrs: [{
@@ -147,7 +147,7 @@ var blockquote = exports.blockquote = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'extension_with_marks']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -173,7 +173,7 @@ var blockTaskItem = exports.blockTaskItem = {
     },
     content: {
       isTupleLike: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'extension_with_marks'], ['paragraph_with_no_marks', 'paragraph_with_font_size', 'extension_with_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'extension_with_marks', 'extension_with_annotation'], ['paragraph_with_no_marks', 'paragraph_with_font_size', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -596,7 +596,7 @@ var doc = exports.doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'rule_with_attrs_root_only', 'bodiedRule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'rule_with_attrs_root_only', 'bodiedRule_root_only', 'extension_root_only', 'extension_root_only_with_annotation', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -704,7 +704,7 @@ var expand = exports.expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -784,6 +784,30 @@ var extension_root_only = exports.extension_root_only = ['extension', {
     }
   }
 }];
+var extension_root_only_with_annotation = exports.extension_root_only_with_annotation = ['extension', {
+  meta: {
+    stage0: true
+  },
+  props: {
+    marks: {
+      items: [['annotation', 'breakout', 'dataConsumer', 'fragment']],
+      optional: true,
+      type: 'array'
+    }
+  }
+}];
+var extension_with_annotation = exports.extension_with_annotation = ['extension', {
+  meta: {
+    stage0: true
+  },
+  props: {
+    marks: {
+      items: [['annotation', 'dataConsumer', 'fragment']],
+      optional: true,
+      type: 'array'
+    }
+  }
+}];
 var extension_with_marks = exports.extension_with_marks = ['extension', {
   props: {
     marks: {
@@ -1055,7 +1079,7 @@ var layoutColumn = exports.layoutColumn = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1188,7 +1212,7 @@ var listItem = exports.listItem = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_font_size', 'paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'extension_with_marks']],
+      items: [['paragraph_with_font_size', 'paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -1558,7 +1582,7 @@ var nestedExpand = exports.nestedExpand = {
 };
 var nestedExpand_content = exports.nestedExpand_content = {
   allowUnsupportedBlock: true,
-  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
   minItems: 1,
   type: 'array'
 };
@@ -1632,7 +1656,7 @@ var panel = exports.panel = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -1649,7 +1673,7 @@ var panel_c1 = exports.panel_c1 = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     }
@@ -1662,7 +1686,7 @@ var panel_c1_root_only = exports.panel_c1_root_only = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     },
@@ -2038,7 +2062,7 @@ var tableCell = exports.tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -2085,7 +2109,7 @@ var tableHeader = exports.tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

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

@@ -25,7 +25,7 @@ const doc = adfNode('doc').define({
   // Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
   // for `pm-spec`, so this keeps `block` the leading alternative in the PM content
   // expression and leaves ProseMirror's defaultType/fill behaviour untouched.
-  panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), rule.use('with_attrs_root_only'), bodiedRule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
+  panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), rule.use('with_attrs_root_only'), bodiedRule.use('root_only'), extension.use('root_only'), extension.use('root_only_with_annotation'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -32,7 +32,7 @@ export const blockCard = createPMNodeSpecFactory({
 });
 export const blockquote = createPMNodeSpecFactory({
   content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup | extension)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   group: 'block',
   attrs: {
     localId: {
@@ -56,7 +56,7 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
 });
 export const blockTaskItem = createPMNodeSpecFactory({
   content: '(paragraph | extension) (paragraph | extension)*',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     localId: {
       default: ''
@@ -367,7 +367,7 @@ export const decisionList = createPMNodeSpecFactory({
 });
 export const doc = createPMNodeSpecFactory({
   content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | bodiedRule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment annotation breakout'
 });
 export const embedCard = createPMNodeSpecFactory({
   group: 'block',
@@ -433,7 +433,7 @@ export const emojiStage0 = createPMNodeSpecFactory({
 });
 export const expand = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer annotation',
   group: 'block',
   attrs: {
     title: {
@@ -451,7 +451,7 @@ export const expand = createPMNodeSpecFactory({
 });
 export const expandRootOnly = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer annotation',
   attrs: {
     title: {
       default: ''
@@ -515,6 +515,55 @@ export const extensionRootOnlyStage0 = createPMNodeSpecFactory({
   },
   selectable: true
 });
+export const extensionRootOnlyWithAnnotationStage0 = createPMNodeSpecFactory({
+  atom: true,
+  attrs: {
+    extensionKey: {
+      default: ''
+    },
+    extensionType: {
+      default: ''
+    },
+    parameters: {
+      default: null
+    },
+    text: {
+      default: null
+    },
+    layout: {
+      default: 'default'
+    },
+    localId: {
+      default: null
+    }
+  },
+  selectable: true
+});
+export const extensionWithAnnotationStage0 = createPMNodeSpecFactory({
+  group: 'block',
+  atom: true,
+  attrs: {
+    extensionKey: {
+      default: ''
+    },
+    extensionType: {
+      default: ''
+    },
+    parameters: {
+      default: null
+    },
+    text: {
+      default: null
+    },
+    layout: {
+      default: 'default'
+    },
+    localId: {
+      default: null
+    }
+  },
+  selectable: true
+});
 export const extensionWithMarks = createPMNodeSpecFactory({
   group: 'block',
   atom: true,
@@ -713,7 +762,7 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
 });
 export const layoutColumn = createPMNodeSpecFactory({
   content: '(block | panel_c1 | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment annotation',
   attrs: {
     width: {
       default: undefined
@@ -763,7 +812,7 @@ export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
 });
 export const listItem = createPMNodeSpecFactory({
   content: '(paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | extension)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     localId: {
       default: null
@@ -1058,7 +1107,7 @@ export const multiBodiedExtensionStage0 = createPMNodeSpecFactory({
 });
 export const nestedExpand = createPMNodeSpecFactory({
   content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | bodiedRule | panel | blockquote | unsupportedBlock | extension)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     title: {
       default: ''
@@ -1104,7 +1153,7 @@ export const orderedList = createPMNodeSpecFactory({
 });
 export const panel = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   group: 'block',
   attrs: {
     panelType: {
@@ -1130,7 +1179,7 @@ export const panel = createPMNodeSpecFactory({
 });
 export const panelC1RootOnlyStage0 = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     panelType: {
       default: 'info'
@@ -1155,7 +1204,7 @@ export const panelC1RootOnlyStage0 = createPMNodeSpecFactory({
 });
 export const panelC1Stage0 = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   group: 'block',
   attrs: {
     panelType: {
@@ -1181,7 +1230,7 @@ export const panelC1Stage0 = createPMNodeSpecFactory({
 });
 export const panelRootOnlyStage0 = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     panelType: {
       default: 'info'
@@ -1419,7 +1468,7 @@ export const tableWithNestedTable = createPMNodeSpecFactory({
 });
 export const tableCell = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     colspan: {
       default: 1
@@ -1446,7 +1495,7 @@ export const tableCell = createPMNodeSpecFactory({
 });
 export const tableCellWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     colspan: {
       default: 1
@@ -1473,7 +1522,7 @@ export const tableCellWithNestedTable = createPMNodeSpecFactory({
 });
 export const tableHeader = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     colspan: {
       default: 1
@@ -1500,7 +1549,7 @@ export const tableHeader = createPMNodeSpecFactory({
 });
 export const tableHeaderWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     colspan: {
       default: 1

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

@@ -32,7 +32,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-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, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, extension.use('with_marks'), embedCard, table,
+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, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, extension.use('with_marks'), extension.use('with_annotation'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -19,7 +19,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, 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, rule.use('with_attrs'), bodiedRule, panel, panel.use('c1'), table,
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, 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'), extension.use('with_annotation'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, rule.use('with_attrs'), bodiedRule, panel, panel.use('c1'), table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -18,7 +18,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), extension.use('with_annotation'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -8,7 +8,7 @@ import { mediaGroup } from './mediaGroup';
 import { mediaSingle } from './mediaSingle';
 import { paragraph } from './paragraph';
 import { unsupportedBlock } from './unsupportedBlock';
-const blockQuoteContent = [paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, extension.use('with_marks')];
+const blockQuoteContent = [paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, extension.use('with_marks'), extension.use('with_annotation')];
 export const blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: true,

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

@@ -3,6 +3,7 @@ import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentG
 import { breakout } from '../marks/breakout';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { extension } from './extension';
 import { nestedExpand } from './nestedExpand';
 export const expand = adfNode('expand').define({
   isolating: true,
@@ -25,7 +26,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))]
+  content: [$onePlus($or(nonNestableBlockContentGroup, extension.use('with_annotation'), nestedExpand.use('with_no_marks')))]
 }).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   noMarks: false,

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

@@ -1,4 +1,5 @@
 import { adfNode } from '@atlaskit/adf-schema-generator';
+import { annotation } from '../marks/annotation';
 import { breakout } from '../marks/breakout';
 import { dataConsumer } from '../marks/dataConsumer';
 import { fragment } from '../marks/fragment';
@@ -46,9 +47,16 @@ export const extension = adfNode('extension').define({
 }).variant('with_marks', {
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   ignore: []
+}).variant('with_annotation', {
+  stage0: true,
+  marks: [annotation, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
+  ignore: []
 })
 // this variant is used to support breakout resizing for extension nodes at the document root
 .variant('root_only', {
   stage0: true,
   marks: [breakout, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute]
+}).variant('root_only_with_annotation', {
+  stage0: true,
+  marks: [annotation, breakout, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute]
 });

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

@@ -21,7 +21,7 @@ const listItem = adfNode('listItem').define({
   },
   marks: [unsupportedMark, unsupportedNodeAttribute],
   contentMinItems: 1,
-  content: [$onePlus($or(paragraph.use('with_font_size'), paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, extension.use('with_marks')))]
+  content: [$onePlus($or(paragraph.use('with_font_size'), paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, extension.use('with_marks'), extension.use('with_annotation')))]
 });
 orderedList.define({
   selectable: false,

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

@@ -37,7 +37,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(...nestedExpandContent, extension.use('with_marks')))],
+  content: [$onePlus($or(...nestedExpandContent, extension.use('with_marks'), extension.use('with_annotation')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -52,7 +52,7 @@ export const panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(...panelContent, extension.use('with_marks')))]
+  content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation')))]
 }).variant('c1', {
   // panel_c1 allows all standard panel content plus table. `stage0: true` includes it in the
   // stage-0 JSON schema (not full) and the validator spec so table-in-panel validates.
@@ -61,7 +61,7 @@ export const panel = adfNode('panel').define({
   // acceptance is gated in adf-utils behind the patch flag.
   stage0: true,
   noExtend: true,
-  content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
+  content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation'), table))],
   preserveVariantNameInPm: true
 })
 // this variant is used to support breakout resizing for panel nodes at the document root
@@ -75,6 +75,6 @@ export const panel = adfNode('panel').define({
   noExtend: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   // panel_c1_root_only allows all standard panel content plus table (see c1 above).
-  content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
+  content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation'), table))],
   preserveVariantNameInPm: true
 });

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

@@ -36,7 +36,7 @@ blockTaskItem.define({
   allowAnyChildMark: false,
   // Override the commonTaskItemProps setting
   contentMinItems: 1,
-  content: [$or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks')), $zeroPlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks')))]
+  content: [$or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks'), extension.use('with_annotation')), $zeroPlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks'), extension.use('with_annotation')))]
 });
 taskList.define({
   defining: true,

package/dist/es2019/schema/default-schema.js

@@ -1,9 +1,11 @@
 import memoizeOne from 'memoize-one';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createSchema } from './create-schema';
 import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtensionRootOnlyStage0, bodiedExtensionRootOnlyStage0, extensionRootOnlyStage0, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0 } from './nodes';
 import { bodiedRuleRootOnlyStage0 } from './nodes/bodied-rule';
 import { extendedPanelC1RootOnlyStage0 } from './nodes/extended-panel-c1-root-only-stage0';
 import { extendedPanelRootOnlyStage0 } from './nodes/extended-panel-root-only-stage0';
+import { extensionRootOnlyWithAnnotationStage0 } from './nodes/extension';
 import { ruleWithAttrsRootOnlyStage0 } from './nodes/rule';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -24,7 +26,7 @@ export const getSchemaBasedOnStage = memoizeOne(
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      extension: extensionRootOnlyStage0,
+      extension: fg('cc_maui_annotations_on_extensions') ? extensionRootOnlyWithAnnotationStage0 : extensionRootOnlyStage0,
       bodiedExtension: bodiedExtensionRootOnlyStage0,
       multiBodiedExtension: multiBodiedExtensionRootOnlyStage0,
       extensionFrame: extensionFrame,

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

@@ -13,6 +13,14 @@ import { getExtensionAttrs } from '../../utils/get-extension-attrs';
  * @name extension_root_only_node
  */
 
+/**
+ * @name extension_with_annotation_node
+ */
+
+/**
+ * @name extension_root_only_with_annotation_node
+ */
+
 export const extension = extensionFactory({
   parseDOM: [{
     tag: '[data-node-type="extension"]',
@@ -35,4 +43,12 @@ export const extension = extensionFactory({
 export const extensionRootOnlyStage0 = {
   ...extension,
   marks: 'breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
+};
+export const extensionWithAnnotationStage0 = {
+  ...extension,
+  marks: 'annotation dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
+};
+export const extensionRootOnlyWithAnnotationStage0 = {
+  ...extension,
+  marks: 'annotation breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
 };