@atlaskit/adf-schema 45.1.0 → 46.0.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @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
+
+- 0ad17eb: Remove DSL inconsistency for code block with text with new no mark text variant - no functionality changes.
+
+  Added: `text_with_no_marks` variant
+
 ## 45.1.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.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: ''
@@ -1196,6 +1197,7 @@ var textCodeInline = exports.textCodeInline = (0, _createPMSpecFactory.createPMN
 var textFormatted = exports.textFormatted = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'inline'
 });
+var textWithNoMarks = exports.textWithNoMarks = (0, _createPMSpecFactory.createPMNodeSpecFactory)({});
 var unsupportedBlock = exports.unsupportedBlock = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'block',
   atom: true,

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/codeBlock.js

@@ -26,24 +26,7 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
     }
   },
   noMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text, _unsupportedInline.unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text.use('with_no_marks'), _unsupportedInline.unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {

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/next-schema/nodes/text.js

@@ -21,6 +21,9 @@ var _confluenceInlineComment = require("../marks/confluenceInlineComment");
 var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [_link.link],
   ignore: ['pm-spec', 'json-schema']

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_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: {
@@ -291,16 +291,7 @@ var codeBlock = exports.codeBlock = {
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -427,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
     }
   }
@@ -521,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',
@@ -538,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: {
@@ -1729,6 +1705,16 @@ var text_link_inline = exports.text_link_inline = ['text', {
     }
   }
 }];
+var text_with_no_marks = exports.text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 var textColor = exports.textColor = {
   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: ''
@@ -1190,6 +1191,7 @@ export const textCodeInline = createPMNodeSpecFactory({
 export const textFormatted = createPMNodeSpecFactory({
   group: 'inline'
 });
+export const textWithNoMarks = createPMNodeSpecFactory({});
 export const unsupportedBlock = createPMNodeSpecFactory({
   group: 'block',
   atom: true,

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/codeBlock.js

@@ -20,24 +20,7 @@ export const codeBlock = adfNode('codeBlock').define({
     }
   },
   noMarks: true,
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {

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/next-schema/nodes/text.js

@@ -15,6 +15,9 @@ import { confluenceInlineComment } from '../marks/confluenceInlineComment';
 export const text = adfNode('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [link],
   ignore: ['pm-spec', 'json-schema']

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: {
@@ -285,16 +285,7 @@ export const codeBlock = {
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -421,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
     }
   }
@@ -515,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',
@@ -532,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: {
@@ -1723,6 +1699,16 @@ export const text_link_inline = ['text', {
     }
   }
 }];
+export const text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 export const textColor = {
   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: ''
@@ -1190,6 +1191,7 @@ export var textCodeInline = createPMNodeSpecFactory({
 export var textFormatted = createPMNodeSpecFactory({
   group: 'inline'
 });
+export var textWithNoMarks = createPMNodeSpecFactory({});
 export var unsupportedBlock = createPMNodeSpecFactory({
   group: 'block',
   atom: true,

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/codeBlock.js

@@ -20,24 +20,7 @@ export var codeBlock = adfNode('codeBlock').define({
     }
   },
   noMarks: true,
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {