@atlaskit/adf-schema 45.2.0 → 46.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/adf-schema
 
+## 46.0.0
+
+### Major Changes
+
+- a0f224a: Remove `expand_with_with_no_mark` and replace `expand_with_breakout_mark` with `expand_root_only`
+
+  Upgrade instructions
+
+  - Replace `expand_with_breakout_mark` with `expand_root_only`
+  - Replace `expand_no_mark` with `expand`
+
 ## 45.2.0
 
 ### Minor Changes

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

@@ -14,7 +14,7 @@ var _codeBlock = require("./nodes/codeBlock");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('with_breakout_mark')))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only')))],
   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.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = 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.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = 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.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = 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.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = 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.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = 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.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -236,7 +236,7 @@ var decisionList = exports.decisionList = (0, _createPMSpecFactory.createPMNodeS
   defining: true
 });
 var doc = exports.doc = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(block | codeBlock | layoutSection | blockRootOnly)+',
+  content: '(block | codeBlock | layoutSection | blockRootOnly | expand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment breakout'
 });
 var embedCard = exports.embedCard = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
@@ -307,8 +307,9 @@ var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)(
   selectable: true,
   isolating: true
 });
-var expandWithNoMark = exports.expandWithNoMark = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  group: 'block',
+var expandRootOnly = exports.expandRootOnly = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   attrs: {
     title: {
       default: ''

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

@@ -31,14 +31,12 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  *
  * Has slight differences from the original blockGroup:
  * - no base paragraph
- * - no base codeBlock
  * - no base extension
  * - no base mediaSingle
  * - no base heading
- * - no base expand
  */
 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, _panel.panel, _panel.panel.use('with_nested_blockquote'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _extension.extension.use('with_marks'), _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.use('without_nested_expand'), _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+_tableNodes.table.use('with_nested_table'), _expand.expand, _expand.expand.use('without_nested_expand'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec']
 });

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

@@ -26,7 +26,7 @@ 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'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _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, _panel.panel, _panel.panel.use('with_nested_blockquote'), _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, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+_tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec', 'json-schema']

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

@@ -13,8 +13,7 @@ var _nonNestableBlockContentGroup = require("../groups/nonNestableBlockContentGr
 var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define({
   isolating: true,
   selectable: true,
-  marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  hasEmptyMarks: true,
+  noMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -39,13 +38,8 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
 }).variant('without_nested_expand', {
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']
-}).variant('with_breakout_mark', {
+}).variant('root_only', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [],
-  ignore: ['pm-spec']
-}).variant('with_no_mark', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
+  noMarks: false,
+  noExtend: true
 });

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

@@ -18,7 +18,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
 
 function getExpandAttrs(domNode) {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.underline = 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.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = 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.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_breakout_mark = 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.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.underline = 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.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = 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.extension_with_marks = 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.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
 var alignment = exports.alignment = {
   props: {
     type: {
@@ -55,7 +55,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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', '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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -418,7 +418,7 @@ var doc = exports.doc = {
     },
     content: {
       type: 'array',
-      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only']],
       allowUnsupportedBlock: true
     }
   }
@@ -512,15 +512,10 @@ var expand = exports.expand = {
       items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      items: [],
-      optional: true
     }
   }
 };
-var expand_with_breakout_mark = exports.expand_with_breakout_mark = ['expand', {
+var expand_root_only = exports.expand_root_only = ['expand', {
   props: {
     marks: {
       type: 'array',
@@ -529,16 +524,6 @@ var expand_with_breakout_mark = exports.expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-var expand_with_no_mark = exports.expand_with_no_mark = ['expand', {
-  props: {
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 var extension = exports.extension = {
   props: {
     type: {

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

@@ -8,7 +8,7 @@ import { codeBlock } from './nodes/codeBlock';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -230,7 +230,7 @@ export const decisionList = createPMNodeSpecFactory({
   defining: true
 });
 export const doc = createPMNodeSpecFactory({
-  content: '(block | codeBlock | layoutSection | blockRootOnly)+',
+  content: '(block | codeBlock | layoutSection | blockRootOnly | expand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment breakout'
 });
 export const embedCard = createPMNodeSpecFactory({
@@ -301,8 +301,9 @@ export const expand = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const expandWithNoMark = createPMNodeSpecFactory({
-  group: 'block',
+export const expandRootOnly = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   attrs: {
     title: {
       default: ''

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

@@ -26,14 +26,12 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  *
  * Has slight differences from the original blockGroup:
  * - no base paragraph
- * - no base codeBlock
  * - no base extension
  * - no base mediaSingle
  * - no base heading
- * - no base expand
  */
 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, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
-table.use('with_nested_table'), expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
+table.use('with_nested_table'), expand, expand.use('without_nested_expand'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']
 });

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

@@ -20,7 +20,7 @@ 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'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), 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, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec', 'json-schema']

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

@@ -7,8 +7,7 @@ import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentG
 export const expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
-  marks: [unsupportedMark, unsupportedNodeAttribute],
-  hasEmptyMarks: true,
+  noMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -33,13 +32,8 @@ export const expand = adfNode('expand').define({
 }).variant('without_nested_expand', {
   content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']
-}).variant('with_breakout_mark', {
+}).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: ['pm-spec']
-}).variant('with_no_mark', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
+  noMarks: false,
+  noExtend: true
 });

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

@@ -9,7 +9,7 @@ import { expandWithoutNestedExpand as expandWithoutNestedExpandFactory, expand a
  */
 
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
 
 function getExpandAttrs(domNode) {

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

@@ -49,7 +49,7 @@ export const backgroundColor = {
     }
   }
 };
-export const 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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+export const 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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export const blockCard = {
   props: {
     type: {
@@ -412,7 +412,7 @@ export const doc = {
     },
     content: {
       type: 'array',
-      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only']],
       allowUnsupportedBlock: true
     }
   }
@@ -506,15 +506,10 @@ export const expand = {
       items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      items: [],
-      optional: true
     }
   }
 };
-export const expand_with_breakout_mark = ['expand', {
+export const expand_root_only = ['expand', {
   props: {
     marks: {
       type: 'array',
@@ -523,16 +518,6 @@ export const expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-export const expand_with_no_mark = ['expand', {
-  props: {
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 export const extension = {
   props: {
     type: {

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

@@ -8,7 +8,7 @@ import { codeBlock } from './nodes/codeBlock';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -230,7 +230,7 @@ export var decisionList = createPMNodeSpecFactory({
   defining: true
 });
 export var doc = createPMNodeSpecFactory({
-  content: '(block | codeBlock | layoutSection | blockRootOnly)+',
+  content: '(block | codeBlock | layoutSection | blockRootOnly | expand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment breakout'
 });
 export var embedCard = createPMNodeSpecFactory({
@@ -301,8 +301,9 @@ export var expand = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export var expandWithNoMark = createPMNodeSpecFactory({
-  group: 'block',
+export var expandRootOnly = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   attrs: {
     title: {
       default: ''

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

@@ -26,14 +26,12 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  *
  * Has slight differences from the original blockGroup:
  * - no base paragraph
- * - no base codeBlock
  * - no base extension
  * - no base mediaSingle
  * - no base heading
- * - no base expand
  */
 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, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
-table.use('with_nested_table'), expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
+table.use('with_nested_table'), expand, expand.use('without_nested_expand'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']
 });

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

@@ -20,7 +20,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 export var 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'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), 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, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec', 'json-schema']

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

@@ -7,8 +7,7 @@ import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentG
 export var expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
-  marks: [unsupportedMark, unsupportedNodeAttribute],
-  hasEmptyMarks: true,
+  noMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -33,13 +32,8 @@ export var expand = adfNode('expand').define({
 }).variant('without_nested_expand', {
   content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']
-}).variant('with_breakout_mark', {
+}).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: ['pm-spec']
-}).variant('with_no_mark', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
+  noMarks: false,
+  noExtend: true
 });

package/dist/esm/schema/nodes/expand.js

@@ -12,7 +12,7 @@ import { expandWithoutNestedExpand as expandWithoutNestedExpandFactory, expand a
  */
 
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
 
 function getExpandAttrs(domNode) {

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

@@ -49,7 +49,7 @@ export var backgroundColor = {
     }
   }
 };
-export var 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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+export var 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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export var blockCard = {
   props: {
     type: {
@@ -412,7 +412,7 @@ export var doc = {
     },
     content: {
       type: 'array',
-      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['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', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only']],
       allowUnsupportedBlock: true
     }
   }
@@ -506,15 +506,10 @@ export var expand = {
       items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      items: [],
-      optional: true
     }
   }
 };
-export var expand_with_breakout_mark = ['expand', {
+export var expand_root_only = ['expand', {
   props: {
     marks: {
       type: 'array',
@@ -523,16 +518,6 @@ export var expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-export var expand_with_no_mark = ['expand', {
-  props: {
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 export var extension = {
   props: {
     type: {

package/dist/json-schema/v1/full.json

@@ -133,7 +133,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -726,16 +726,16 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
               },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -832,7 +832,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -861,41 +862,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",

package/dist/json-schema/v1/stage-0.json

@@ -136,7 +136,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -745,10 +745,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
@@ -761,6 +758,9 @@
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -863,7 +863,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -892,41 +893,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",

package/dist/types/next-schema/generated/nodeGroupTypes.d.ts

@@ -3,8 +3,8 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
  * and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
  */
-import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TableWithNestedTableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelWithNestedBlockquoteStage0Definition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TableWithNestedTableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelWithNestedBlockquoteStage0Definition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
 export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
 export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
 export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -179,7 +179,7 @@ export type DecisionListNode = PMNode & DecisionListDefinition;
 export declare const decisionList: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<DecisionListNode>) => import("prosemirror-model").NodeSpec;
 export interface DocDefinition {
     type: 'doc';
-    content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
+    content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | ExpandRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
 }
 export type DocNode = PMNode & DocDefinition;
 export declare const doc: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<DocNode>) => import("prosemirror-model").NodeSpec;
@@ -221,7 +221,6 @@ export declare const emojiStage0: ({ parseDOM, toDOM, toDebugString }: import(".
 export interface ExpandDefinition {
     type: 'expand';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
@@ -229,19 +228,20 @@ export interface ExpandDefinition {
 }
 export type ExpandNode = PMNode & ExpandDefinition;
 export declare const expand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandNode>) => import("prosemirror-model").NodeSpec;
-export interface ExpandWithNoMarkDefinition {
+export interface ExpandRootOnlyDefinition {
     type: 'expand';
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
     };
 }
-export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
-export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
+export type ExpandRootOnlyNode = PMNode & ExpandRootOnlyDefinition;
+export declare const expandRootOnly: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandRootOnlyNode>) => import("prosemirror-model").NodeSpec;
 export interface ExpandWithoutNestedExpandDefinition {
     type: 'expand';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;

package/dist/types/next-schema/groups/blockContentGroup.d.ts

@@ -5,10 +5,8 @@
  *
  * Has slight differences from the original blockGroup:
  * - no base paragraph
- * - no base codeBlock
  * - no base extension
  * - no base mediaSingle
  * - no base heading
- * - no base expand
  */
 export declare const blockContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

package/dist/types/next-schema/nodes/expand.d.ts

@@ -1,13 +1,8 @@
-export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "without_nested_expand", "with_breakout_mark", "with_no_mark"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "without_nested_expand", "root_only"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
     ignore: ("json-schema" | "validator-spec")[];
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-    content: any[];
-    ignore: "pm-spec"[];
-} & {
-    content: any[];
-    marks: any[];
-    noMarks: true;
-    ignore: any[];
+    noMarks: false;
+    noExtend: true;
 }>;

package/dist/types/schema/nodes/doc.d.ts

@@ -1,5 +1,5 @@
 import { CodeBlockWithMarksDefinition as CodeBlockWithMarks } from './code-block';
-import { ExpandWithBreakoutDefinition as ExpandWithBreakout } from './expand';
+import { ExpandRootOnlyDefinition as ExpandRootOnly } from './expand';
 import { LayoutSectionDefinition as LayoutSection } from './layout-section';
 import { ParagraphWithIndentationDefinition } from './paragraph';
 import { BlockContent } from './types/block-content';
@@ -13,6 +13,6 @@ export interface DocNode {
     /**
      * @allowUnsupportedBlock true
      */
-    content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandWithBreakout | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
+    content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandRootOnly | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
 }
 export declare const doc: import("prosemirror-model").NodeSpec;

package/dist/types/schema/nodes/expand.d.ts

@@ -17,16 +17,15 @@ export interface ExpandBaseDefinition {
      * @allowUnsupportedBlock true
      */
     content: Array<NonNestableBlockContent | NestedExpandDefinition>;
-    marks?: Array<any>;
 }
 /**
  * @name expand_with_no_mark_node
  */
 export type ExpandDefinition = ExpandBaseDefinition & NoMark;
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
-export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
+export type ExpandRootOnlyDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
 export declare const expand: import("prosemirror-model").NodeSpec;
 export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
 export declare const toJSON: (node: PMNode) => {

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -517,14 +517,9 @@ export declare const expand: {
             minItems: number;
             allowUnsupportedBlock: boolean;
         };
-        marks: {
-            type: string;
-            items: any[];
-            optional: boolean;
-        };
     };
 };
-export declare const expand_with_breakout_mark: (string | {
+export declare const expand_root_only: (string | {
     props: {
         marks: {
             type: string;
@@ -533,16 +528,6 @@ export declare const expand_with_breakout_mark: (string | {
         };
     };
 })[];
-export declare const expand_with_no_mark: (string | {
-    props: {
-        marks: {
-            type: string;
-            maxItems: number;
-            items: any[];
-            optional: boolean;
-        };
-    };
-})[];
 export declare const extension: {
     props: {
         type: {

package/json-schema/v1/full.json

@@ -133,7 +133,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -726,16 +726,16 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
               },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -832,7 +832,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -861,41 +862,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",

package/json-schema/v1/stage-0.json

@@ -136,7 +136,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -745,10 +745,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
@@ -761,6 +758,9 @@
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -863,7 +863,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -892,41 +893,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "45.2.0",
+  "version": "46.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.24.0",
-    "@atlaskit/adf-schema-generator": "^1.38.4",
+    "@atlaskit/adf-schema-generator": "^2.0.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",