@atlaskit/adf-schema 47.3.1 → 47.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 47.5.0
+
+### Minor Changes
+
+- ce54136: [ED-26496]Promote extension in nestedExpand to full schema
+
+## 47.4.0
+
+### Minor Changes
+
+- d016a37: ED-26949 Promote extension in panel to full schema
+
 ## 47.3.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -861,10 +861,10 @@ Object.defineProperty(exports, "nestedExpand", {
     return _schema.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _schema.nestedExpandWithNonBodiedMacrosStage0;
+    return _schema.nestedExpandWithoutNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "normalizeHexColor", {
@@ -897,10 +897,10 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _schema.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _schema.panelWithNonBodiedMacrosStage0;
+    return _schema.panelWithoutNestedNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "paragraph", {

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.panelWithNestedNonBodiedMacrosStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNonBodiedMacrosStage0 = 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.listItemWithNonBodiedMacrosStage0 = 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.blockquoteWithoutNonBodiedMacros = 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.panelWithoutNestedNonBodiedMacros = exports.panel = exports.orderedList = exports.nestedExpandWithoutNonBodiedMacros = 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.listItemWithNonBodiedMacrosStage0 = 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.blockquoteWithoutNonBodiedMacros = 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
@@ -851,8 +851,8 @@ var multiBodiedExtensionStage0 = exports.multiBodiedExtensionStage0 = (0, _creat
   definingAsContext: true
 });
 var nestedExpand = exports.nestedExpand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     title: {
       default: ''
@@ -876,9 +876,9 @@ var nestedExpandWithNoMarks = exports.nestedExpandWithNoMarks = (0, _createPMSpe
   selectable: true,
   isolating: true
 });
-var nestedExpandWithNonBodiedMacrosStage0 = exports.nestedExpandWithNonBodiedMacrosStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+var nestedExpandWithoutNonBodiedMacros = exports.nestedExpandWithoutNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     title: {
       default: ''
@@ -902,8 +902,8 @@ var orderedList = exports.orderedList = (0, _createPMSpecFactory.createPMNodeSpe
   selectable: false
 });
 var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   group: 'block',
   attrs: {
     panelType: {
@@ -924,9 +924,9 @@ var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   },
   selectable: true
 });
-var panelWithNestedNonBodiedMacrosStage0 = exports.panelWithNestedNonBodiedMacrosStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+var panelWithoutNestedNonBodiedMacros = exports.panelWithoutNestedNonBodiedMacros = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     panelType: {

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

@@ -35,7 +35,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base mediaSingle
  * - no base heading
  */
-var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('with_nested_non_bodied_macros'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
+var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('without_nested_non_bodied_macros'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _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, _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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _tableNodes = require("../nodes/tableNodes");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _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_non_bodied_macros'), _tableNodes.table,
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _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('without_nested_non_bodied_macros'), _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('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -21,7 +21,7 @@ var _paragraph = require("../nodes/paragraph");
 var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('with_non_bodied_macros')];
+var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('without_non_bodied_macros')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -26,7 +26,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('with_non_bodied_macros')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('without_non_bodied_macros')))]
 }).variant('without_nested_expand', {
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']

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

@@ -37,7 +37,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks')])))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -45,13 +45,8 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
         reason: '@DSLCompatibilityException - mismatch with DSL'
       },
       'props.content': {
-        value: {
-          type: 'array',
-          items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks']],
-          minItems: 1,
-          allowUnsupportedBlock: true
-        },
-        reason: '@DSLCompatibilityException - this is to loose the validator ristriction to allow extension to be nested inside nestedExpand'
+        value: 'nestedExpand_content',
+        reason: '@DSLCompatibilityException - mismatch with DSL'
       },
       required: {
         reason: '@DSLCompatibilityException - required for nestedExpand validator spec',
@@ -65,10 +60,10 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
   marks: [],
   content: [],
   noMarks: true
-}).variant('with_non_bodied_macros', {
+}).variant('without_non_bodied_macros', {
   marks: [],
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks')])))],
-  stage0: true,
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent))],
   noMarks: true,
-  noExtend: true
+  noExtend: true,
+  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -50,23 +50,9 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
       optional: true
     }
   },
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))]
+}).variant('without_nested_non_bodied_macros', {
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent))],
-  // TODO: remove the mannual override once with_nested_non_bodied_macros is promoted to full schema
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.content': {
-        value: {
-          type: 'array',
-          items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'extension_with_marks']],
-          minItems: 1,
-          allowUnsupportedBlock: true
-        },
-        reason: '@DSLCompatibilityException - this is to loose the validator ristriction to allow extension to be nested inside panel'
-      }
-    }
-  }
-}).variant('with_nested_non_bodied_macros', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))],
   noExtend: true,
-  stage0: true
+  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -28,12 +28,10 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       extensionFrame: _nodes.extensionFrame,
       expand: _nodes.expandWithNestedExpand,
       listItem: _nodes.listItemWithNonBodiedMacrosStage0,
-      panel: (0, _nodes.panelWithNonBodiedMacrosStage0)(true),
       table: _nodes.tableWithNestedTable,
       tableRow: _nodes.tableRowWithNestedTable,
       tableCell: _nodes.tableCellWithNestedTable,
-      tableHeader: _nodes.tableHeaderWithNestedTable,
-      nestedExpand: _nodes.nestedExpandWithNonBodiedMacrosStage0
+      tableHeader: _nodes.tableHeaderWithNestedTable
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/index.js

@@ -513,10 +513,10 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nodes.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _nodes.nestedExpandWithNonBodiedMacrosStage0;
+    return _nodes.nestedExpandWithoutNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "orderedList", {
@@ -537,10 +537,10 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _nodes.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _nodes.panelWithNonBodiedMacrosStage0;
+    return _nodes.panelWithoutNestedNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "paragraph", {

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

@@ -352,10 +352,10 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nestedExpand.nestedExpand;
   }
 });
-Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "nestedExpandWithoutNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _nestedExpand.nestedExpandWithNonBodiedMacrosStage0;
+    return _nestedExpand.nestedExpandWithoutNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "orderedList", {
@@ -376,10 +376,10 @@ Object.defineProperty(exports, "orderedListWithOrder", {
     return _orderedList.orderedListWithOrder;
   }
 });
-Object.defineProperty(exports, "panelWithNonBodiedMacrosStage0", {
+Object.defineProperty(exports, "panelWithoutNestedNonBodiedMacros", {
   enumerable: true,
   get: function get() {
-    return _panel.panelWithNonBodiedMacrosStage0;
+    return _panel.panelWithoutNestedNonBodiedMacros;
   }
 });
 Object.defineProperty(exports, "paragraph", {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nestedExpandWithNonBodiedMacrosStage0 = exports.nestedExpand = void 0;
+exports.nestedExpandWithoutNonBodiedMacros = exports.nestedExpand = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name nestedExpand_content
@@ -50,6 +50,30 @@ var nestedExpandFactoryOptions = {
     return ['div', attrs, 0];
   }
 };
+var nestedExpandWithoutNonBodiedMacrosFactoryOptions = {
+  parseDOM: [{
+    context: 'nestedExpand//',
+    tag: '[data-node-type="nestedExpand"]',
+    getAttrs: getExpandAttrs
+  }, {
+    tag: '[data-node-type="nestedExpand"] button',
+    ignore: true
+  }, {
+    tag: '[data-node-type="expand"] button',
+    ignore: true
+  }, {
+    tag: 'div[data-node-type="nestedExpand"]',
+    getAttrs: getExpandAttrs
+  }],
+  toDOM: function toDOM(node) {
+    var attrs = {
+      'data-node-type': 'nestedExpand',
+      'data-title': node.attrs.title,
+      'data-expanded': node.attrs.__expanded
+    };
+    return ['div', attrs, 0];
+  }
+};
 
 /**
  * @name nestedExpand
@@ -58,7 +82,7 @@ var nestedExpandFactoryOptions = {
 var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)(nestedExpandFactoryOptions);
 
 /**
- * @name nestedExpandWithNonBodiedMacrosStage0
+ * @name nestedExpandWithNonBodiedMacros
  * @description an expand that can be nested (eg. inside table, layout).
  */
-var nestedExpandWithNonBodiedMacrosStage0 = exports.nestedExpandWithNonBodiedMacrosStage0 = (0, _nodeTypes.nestedExpandWithNonBodiedMacrosStage0)(nestedExpandFactoryOptions);
+var nestedExpandWithoutNonBodiedMacros = exports.nestedExpandWithoutNonBodiedMacros = (0, _nodeTypes.nestedExpandWithoutNonBodiedMacros)(nestedExpandWithoutNonBodiedMacrosFactoryOptions);

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.panelWithNonBodiedMacrosStage0 = exports.extendedPanel = exports.PanelType = void 0;
+exports.panelWithoutNestedNonBodiedMacros = exports.extendedPanel = exports.PanelType = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -75,6 +75,6 @@ var createPanelNodeSpecOptions = function createPanelNodeSpecOptions(allowCustom
 var extendedPanel = exports.extendedPanel = function extendedPanel(allowCustomPanel) {
   return (0, _nodeTypes.panel)(createPanelNodeSpecOptions(allowCustomPanel));
 };
-var panelWithNonBodiedMacrosStage0 = exports.panelWithNonBodiedMacrosStage0 = function panelWithNonBodiedMacrosStage0(allowCustomPanel) {
-  return (0, _nodeTypes.panelWithNestedNonBodiedMacrosStage0)(createPanelNodeSpecOptions(allowCustomPanel));
+var panelWithoutNestedNonBodiedMacros = exports.panelWithoutNestedNonBodiedMacros = function panelWithoutNestedNonBodiedMacros(allowCustomPanel) {
+  return (0, _nodeTypes.panelWithoutNestedNonBodiedMacros)(createPanelNodeSpecOptions(allowCustomPanel));
 };

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_non_bodied_macros = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_non_bodied_macros = 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_non_bodied_macros = 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;
+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 = 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_non_bodied_macros = 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_non_bodied_macros', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
+var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', '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_non_bodied_macros', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only']],
+      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', '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
     }
   }
@@ -510,7 +510,7 @@ var expand = exports.expand = {
     },
     content: {
       type: 'array',
-      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', 'nestedExpand_with_non_bodied_macros']],
+      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
     }
@@ -1255,18 +1255,13 @@ var nestedExpand = exports.nestedExpand = {
         }
       }
     },
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
+    content: 'nestedExpand_content'
   },
   required: ['content']
 };
 var nestedExpand_content = exports.nestedExpand_content = {
   type: 'array',
-  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
+  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1280,22 +1275,6 @@ var nestedExpand_with_no_marks = exports.nestedExpand_with_no_marks = ['nestedEx
     }
   }
 }];
-var nestedExpand_with_non_bodied_macros = exports.nestedExpand_with_non_bodied_macros = ['nestedExpand', {
-  props: {
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 var non_nestable_block_content = exports.non_nestable_block_content = ['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'];
 var orderedList = exports.orderedList = {
   props: {
@@ -1358,16 +1337,6 @@ var panel = exports.panel = {
     }
   }
 };
-var panel_with_nested_non_bodied_macros = exports.panel_with_nested_non_bodied_macros = ['panel', {
-  props: {
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'extension_with_marks']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-}];
 var paragraph = exports.paragraph = {
   props: {
     type: {
@@ -1590,7 +1559,7 @@ var tableCell = exports.tableCell = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand_with_non_bodied_macros']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1629,7 +1598,7 @@ var tableHeader = exports.tableHeader = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand_with_non_bodied_macros', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1
     }
   },

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithNonBodiedMacrosStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithNonBodiedMacrosStage0, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithNonBodiedMacrosStage0, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithNonBodiedMacrosStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
 
 // ADF createPMSpecFactory

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

@@ -845,8 +845,8 @@ export const multiBodiedExtensionStage0 = createPMNodeSpecFactory({
   definingAsContext: true
 });
 export const nestedExpand = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     title: {
       default: ''
@@ -870,9 +870,9 @@ export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const nestedExpandWithNonBodiedMacrosStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+export const nestedExpandWithoutNonBodiedMacros = createPMNodeSpecFactory({
+  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     title: {
       default: ''
@@ -896,8 +896,8 @@ export const orderedList = createPMNodeSpecFactory({
   selectable: false
 });
 export const panel = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   group: 'block',
   attrs: {
     panelType: {
@@ -918,9 +918,9 @@ export const panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const panelWithNestedNonBodiedMacrosStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+export const panelWithoutNestedNonBodiedMacros = createPMNodeSpecFactory({
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     panelType: {

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

@@ -30,7 +30,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), extension.use('with_marks'), embedCard, table,
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('without_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), 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, expand.use('without_nested_expand'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), 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_non_bodied_macros'), table,
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), 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('without_nested_non_bodied_macros'), 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('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

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

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

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

@@ -20,7 +20,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('with_non_bodied_macros')))]
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')))]
 }).variant('without_nested_expand', {
   content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']