@atlaskit/adf-schema 57.5.4 → 57.6.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/adf-schema
 
+## 57.6.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 57.6.0
+
+### Minor Changes
+
+- [`8e4fd6774f6ec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e4fd6774f6ec) -
+  Add Stage-0 ADF schema support for the `annotation` mark on `extension` nodes (ADF Change 111).
+  Adds the `with_annotation` and `root_only_with_annotation` Stage-0 variants and wires them into
+  the approved root and nested placements (doc root, panel, blockquote, expand, nestedExpand,
+  listItem, blockTaskItem, table cells), registers the matching validator specs, and adds
+  valid/invalid reference fixtures, with regenerated PM/JSON/validator artifacts. Scoped to
+  `extension` only (not `bodiedExtension`/`multiBodiedExtension`); the full schema is unchanged.
+  Editor/renderer acceptance of the mark is gated by `cc_maui_annotations_on_extensions`.
+
+  Allowing the `annotation` mark on `extension` requires its container nodes (panel, table cells,
+  list items, etc.) to permit the mark too, so they can hold an annotated extension child. This made
+  the renderer's `getIndexMatch` double-count text inside those containers, corrupting inline
+  text-comment anchoring. Fixed by skipping block containers during serialisation (they are still
+  walked through so their inner text is counted once); leaf nodes and media are unaffected.
+
 ## 57.5.4
 
 ### Patch Changes

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

@@ -31,7 +31,7 @@ var doc = (0, _adfSchemaGenerator.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.panel.use('c1'), _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _rule.rule.use('with_attrs_root_only'), _bodiedRule.bodiedRule.use('root_only'), _extension.extension.use('root_only'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
+  _panel.panel.use('c1'), _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _rule.rule.use('with_attrs_root_only'), _bodiedRule.bodiedRule.use('root_only'), _extension.extension.use('root_only'), _extension.extension.use('root_only_with_annotation'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.ruleWithAttrsStage0 = exports.ruleWithAttrsRootOnlyStage0 = exports.ruleRootOnlyStage0 = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelRootOnlyStage0 = exports.panelC1Stage0 = exports.panelC1RootOnlyStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.multiBodiedExtensionRootOnlyStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionRootOnlyStage0 = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedRuleStage0 = exports.bodiedRuleRootOnlyStage0 = exports.bodiedExtensionWithMarks = exports.bodiedExtensionRootOnlyStage0 = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.ruleWithAttrsStage0 = exports.ruleWithAttrsRootOnlyStage0 = exports.ruleRootOnlyStage0 = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelRootOnlyStage0 = exports.panelC1Stage0 = exports.panelC1RootOnlyStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.multiBodiedExtensionRootOnlyStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionWithAnnotationStage0 = exports.extensionRootOnlyWithAnnotationStage0 = exports.extensionRootOnlyStage0 = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedRuleStage0 = exports.bodiedRuleRootOnlyStage0 = exports.bodiedExtensionWithMarks = exports.bodiedExtensionRootOnlyStage0 = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -38,7 +38,7 @@ var blockCard = exports.blockCard = (0, _createPMSpecFactory.createPMNodeSpecFac
 });
 var blockquote = exports.blockquote = (0, _createPMSpecFactory.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: {
@@ -62,7 +62,7 @@ var blockquoteLegacy = exports.blockquoteLegacy = (0, _createPMSpecFactory.creat
 });
 var blockTaskItem = exports.blockTaskItem = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | extension) (paragraph | extension)*',
-  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
   attrs: {
     localId: {
       default: ''
@@ -373,7 +373,7 @@ var decisionList = exports.decisionList = (0, _createPMSpecFactory.createPMNodeS
 });
 var doc = exports.doc = (0, _createPMSpecFactory.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'
 });
 var embedCard = exports.embedCard = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'block',
@@ -439,7 +439,7 @@ var emojiStage0 = exports.emojiStage0 = (0, _createPMSpecFactory.createPMNodeSpe
 });
 var expand = exports.expand = (0, _createPMSpecFactory.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: {
@@ -457,7 +457,7 @@ var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)(
 });
 var expandRootOnly = exports.expandRootOnly = (0, _createPMSpecFactory.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: ''
@@ -521,6 +521,55 @@ var extensionRootOnlyStage0 = exports.extensionRootOnlyStage0 = (0, _createPMSpe
   },
   selectable: true
 });
+var extensionRootOnlyWithAnnotationStage0 = exports.extensionRootOnlyWithAnnotationStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  atom: true,
+  attrs: {
+    extensionKey: {
+      default: ''
+    },
+    extensionType: {
+      default: ''
+    },
+    parameters: {
+      default: null
+    },
+    text: {
+      default: null
+    },
+    layout: {
+      default: 'default'
+    },
+    localId: {
+      default: null
+    }
+  },
+  selectable: true
+});
+var extensionWithAnnotationStage0 = exports.extensionWithAnnotationStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  group: 'block',
+  atom: true,
+  attrs: {
+    extensionKey: {
+      default: ''
+    },
+    extensionType: {
+      default: ''
+    },
+    parameters: {
+      default: null
+    },
+    text: {
+      default: null
+    },
+    layout: {
+      default: 'default'
+    },
+    localId: {
+      default: null
+    }
+  },
+  selectable: true
+});
 var extensionWithMarks = exports.extensionWithMarks = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'block',
   atom: true,
@@ -719,7 +768,7 @@ var inlineExtensionWithMarks = exports.inlineExtensionWithMarks = (0, _createPMS
 });
 var layoutColumn = exports.layoutColumn = (0, _createPMSpecFactory.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
@@ -769,7 +818,7 @@ var layoutSectionWithSingleColumnStage0 = exports.layoutSectionWithSingleColumnS
 });
 var listItem = exports.listItem = (0, _createPMSpecFactory.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
@@ -1064,7 +1113,7 @@ var multiBodiedExtensionStage0 = exports.multiBodiedExtensionStage0 = (0, _creat
 });
 var nestedExpand = exports.nestedExpand = (0, _createPMSpecFactory.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: ''
@@ -1110,7 +1159,7 @@ var orderedList = exports.orderedList = (0, _createPMSpecFactory.createPMNodeSpe
 });
 var panel = exports.panel = (0, _createPMSpecFactory.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: {
@@ -1136,7 +1185,7 @@ var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
 });
 var panelC1RootOnlyStage0 = exports.panelC1RootOnlyStage0 = (0, _createPMSpecFactory.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'
@@ -1161,7 +1210,7 @@ var panelC1RootOnlyStage0 = exports.panelC1RootOnlyStage0 = (0, _createPMSpecFac
 });
 var panelC1Stage0 = exports.panelC1Stage0 = (0, _createPMSpecFactory.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: {
@@ -1187,7 +1236,7 @@ var panelC1Stage0 = exports.panelC1Stage0 = (0, _createPMSpecFactory.createPMNod
 });
 var panelRootOnlyStage0 = exports.panelRootOnlyStage0 = (0, _createPMSpecFactory.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'
@@ -1425,7 +1474,7 @@ var tableWithNestedTable = exports.tableWithNestedTable = (0, _createPMSpecFacto
 });
 var tableCell = exports.tableCell = (0, _createPMSpecFactory.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
@@ -1452,7 +1501,7 @@ var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFac
 });
 var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMSpecFactory.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
@@ -1479,7 +1528,7 @@ var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMS
 });
 var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.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
@@ -1506,7 +1555,7 @@ var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpe
 });
 var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _createPMSpecFactory.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/cjs/next-schema/groups/blockContentGroup.js

@@ -37,7 +37,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base mediaSingle
  * - no base heading
  */
-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, _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, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
+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, _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, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _embedCard.embedCard, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -25,7 +25,7 @@ var _rule = require("../nodes/rule");
 var _tableNodes = require("../nodes/tableNodes");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -23,7 +23,7 @@ var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
+var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.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/cjs/next-schema/nodes/blockquote.js

@@ -14,7 +14,7 @@ var _mediaGroup = require("./mediaGroup");
 var _mediaSingle = require("./mediaSingle");
 var _paragraph = require("./paragraph");
 var _unsupportedBlock = require("./unsupportedBlock");
-var blockQuoteContent = [_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _extension.extension.use('with_marks')];
+var blockQuoteContent = [_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')];
 var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquote').define({
   defining: true,
   selectable: true,

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

@@ -9,6 +9,7 @@ var _nonNestableBlockContentGroup = require("../groups/nonNestableBlockContentGr
 var _breakout = require("../marks/breakout");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
+var _extension = require("./extension");
 var _nestedExpand = require("./nestedExpand");
 var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define({
   isolating: true,
@@ -31,7 +32,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _extension.extension.use('with_annotation'), _nestedExpand.nestedExpand.use('with_no_marks')))]
 }).variant('root_only', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   noMarks: false,

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extension = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _annotation = require("../marks/annotation");
 var _breakout = require("../marks/breakout");
 var _dataConsumer = require("../marks/dataConsumer");
 var _fragment = require("../marks/fragment");
@@ -52,9 +53,16 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
 }).variant('with_marks', {
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   ignore: []
+}).variant('with_annotation', {
+  stage0: true,
+  marks: [_annotation.annotation, _dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
+  ignore: []
 })
 // this variant is used to support breakout resizing for extension nodes at the document root
 .variant('root_only', {
   stage0: true,
   marks: [_breakout.breakout, _dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
+}).variant('root_only_with_annotation', {
+  stage0: true,
+  marks: [_annotation.annotation, _breakout.breakout, _dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
 });

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

@@ -27,7 +27,7 @@ var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
   },
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   contentMinItems: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_font_size'), _paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock, _extension.extension.use('with_marks')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_font_size'), _paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _unsupportedBlock.unsupportedBlock, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')))]
 });
 orderedList.define({
   selectable: false,

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

@@ -43,7 +43,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks')])))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation')])))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -58,7 +58,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))]
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.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.
@@ -67,7 +67,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   // acceptance is gated in adf-utils behind the patch flag.
   stage0: true,
   noExtend: true,
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _tableStub.table])))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
   preserveVariantNameInPm: true
 })
 // this variant is used to support breakout resizing for panel nodes at the document root
@@ -81,6 +81,6 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   noExtend: true,
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   // panel_c1_root_only allows all standard panel content plus table (see c1 above).
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _tableStub.table])))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
   preserveVariantNameInPm: true
 });

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

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

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

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSchemaBasedOnStage = exports.defaultSchemaConfig = exports.defaultSchema = void 0;
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _createSchema = require("./create-schema");
 var _nodes = require("./nodes");
 var _bodiedRule = require("./nodes/bodied-rule");
 var _extendedPanelC1RootOnlyStage = require("./nodes/extended-panel-c1-root-only-stage0");
 var _extendedPanelRootOnlyStage = require("./nodes/extended-panel-root-only-stage0");
+var _extension = require("./nodes/extension");
 var _rule = require("./nodes/rule");
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -32,7 +34,7 @@ function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn,
-      extension: _nodes.extensionRootOnlyStage0,
+      extension: (0, _fg.fg)('cc_maui_annotations_on_extensions') ? _extension.extensionRootOnlyWithAnnotationStage0 : _nodes.extensionRootOnlyStage0,
       bodiedExtension: _nodes.bodiedExtensionRootOnlyStage0,
       multiBodiedExtension: _nodes.multiBodiedExtensionRootOnlyStage0,
       extensionFrame: _nodes.extensionFrame,

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extensionRootOnlyStage0 = exports.extension = void 0;
+exports.extensionWithAnnotationStage0 = exports.extensionRootOnlyWithAnnotationStage0 = exports.extensionRootOnlyStage0 = exports.extension = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 var _getExtensionAttrs = require("../../utils/get-extension-attrs");
@@ -22,6 +22,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @name extension_root_only_node
  */
 
+/**
+ * @name extension_with_annotation_node
+ */
+
+/**
+ * @name extension_root_only_with_annotation_node
+ */
+
 var extension = exports.extension = (0, _nodeTypes.extension)({
   parseDOM: [{
     tag: '[data-node-type="extension"]',
@@ -45,4 +53,10 @@ var extension = exports.extension = (0, _nodeTypes.extension)({
 });
 var extensionRootOnlyStage0 = exports.extensionRootOnlyStage0 = _objectSpread(_objectSpread({}, extension), {}, {
   marks: 'breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
+});
+var extensionWithAnnotationStage0 = exports.extensionWithAnnotationStage0 = _objectSpread(_objectSpread({}, extension), {}, {
+  marks: 'annotation dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
+});
+var extensionRootOnlyWithAnnotationStage0 = exports.extensionRootOnlyWithAnnotationStage0 = _objectSpread(_objectSpread({}, extension), {}, {
+  marks: 'annotation breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
 });