@atlaskit/adf-schema 46.0.0 → 46.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 46.2.0
+
+### Minor Changes
+
+- 6bc9490: Stage 0 - non-bodied-macros-in-nested-expand
+
+## 46.1.0
+
+### Minor Changes
+
+- 2eee4d8: Make attrs optional for expand, remove type from layoutSectionFull
+
 ## 46.0.0
 
 ### Major Changes

package/dist/cjs/index.js

@@ -843,6 +843,12 @@ Object.defineProperty(exports, "nestedExpand", {
     return _schema.nestedExpand;
   }
 });
+Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+  enumerable: true,
+  get: function get() {
+    return _schema.nestedExpandWithNonBodiedMacrosStage0;
+  }
+});
 Object.defineProperty(exports, "normalizeHexColor", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.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;
+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.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.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
@@ -863,6 +863,20 @@ 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',
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
 var orderedList = exports.orderedList = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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')];
+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')];
 
 // 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,15 +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')))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.optional': {
-        reason: '@DSLCompatibilityException - required for expand validator spec',
-        remove: true
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('with_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

@@ -10,6 +10,7 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _blockquote = require("./blockquote");
 var _codeBlock = require("./codeBlock");
 var _decisionList = require("./decisionList");
+var _extension = require("./extension");
 var _heading = require("./heading");
 var _list = require("./list");
 var _mediaGroup = require("./mediaGroup");
@@ -19,6 +20,7 @@ var _paragraph = require("./paragraph");
 var _rule = require("./rule");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
+var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
 var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nestedExpand').define({
   isolating: true,
   selectable: true,
@@ -35,7 +37,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock))],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -43,8 +45,13 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
         reason: '@DSLCompatibilityException - mismatch with DSL'
       },
       'props.content': {
-        value: 'nestedExpand_content',
-        reason: '@DSLCompatibilityException - mismatch with DSL'
+        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'
       },
       required: {
         reason: '@DSLCompatibilityException - required for nestedExpand validator spec',
@@ -58,4 +65,10 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
   marks: [],
   content: [],
   noMarks: true
+}).variant('with_non_bodied_macros', {
+  marks: [],
+  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks')])))],
+  stage0: true,
+  noMarks: true,
+  noExtend: true
 });

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

@@ -33,7 +33,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       table: _nodes.tableWithNestedTable,
       tableRow: _nodes.tableRowWithNestedTable,
       tableCell: _nodes.tableCellWithNestedTable,
-      tableHeader: _nodes.tableHeaderWithNestedTable
+      tableHeader: _nodes.tableHeaderWithNestedTable,
+      nestedExpand: _nodes.nestedExpandWithNonBodiedMacrosStage0
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/index.js

@@ -495,6 +495,12 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nodes.nestedExpand;
   }
 });
+Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.nestedExpandWithNonBodiedMacrosStage0;
+  }
+});
 Object.defineProperty(exports, "orderedList", {
   enumerable: true,
   get: function get() {

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

@@ -334,6 +334,12 @@ Object.defineProperty(exports, "nestedExpand", {
     return _nestedExpand.nestedExpand;
   }
 });
+Object.defineProperty(exports, "nestedExpandWithNonBodiedMacrosStage0", {
+  enumerable: true,
+  get: function get() {
+    return _nestedExpand.nestedExpandWithNonBodiedMacrosStage0;
+  }
+});
 Object.defineProperty(exports, "orderedList", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nestedExpand = void 0;
+exports.nestedExpandWithNonBodiedMacrosStage0 = exports.nestedExpand = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name nestedExpand_content
@@ -26,12 +26,7 @@ function getExpandAttrs(domNode) {
     __expanded: true
   };
 }
-
-/**
- * @name nestedExpand
- * @description an expand that can be nested (eg. inside table, layout).
- */
-var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)({
+var nestedExpandFactoryOptions = {
   parseDOM: [{
     context: 'nestedExpand//',
     tag: '[data-node-type="nestedExpand"]',
@@ -54,4 +49,16 @@ var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)({
     };
     return ['div', attrs, 0];
   }
-});
+};
+
+/**
+ * @name nestedExpand
+ * @description an expand that can be nested (eg. inside table, layout).
+ */
+var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)(nestedExpandFactoryOptions);
+
+/**
+ * @name nestedExpandWithNonBodiedMacrosStage0
+ * @description an expand that can be nested (eg. inside table, layout).
+ */
+var nestedExpandWithNonBodiedMacrosStage0 = exports.nestedExpandWithNonBodiedMacrosStage0 = (0, _nodeTypes.nestedExpandWithNonBodiedMacrosStage0)(nestedExpandFactoryOptions);

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

@@ -224,7 +224,7 @@ var tableNodeSpecOptions = {
         isNumberColumnEnabled: dom.getAttribute('data-number-column') === 'true',
         layout:
         // copying from editor
-        dom.getAttribute('data-layout') || ( // copying from renderer
+        dom.getAttribute('data-layout') || (// copying from renderer
         breakoutWrapper === null || breakoutWrapper === void 0 ? void 0 : breakoutWrapper.getAttribute('data-layout')) || 'default',
         __autoSize: dom.getAttribute('data-autosize') === 'true',
         localId: dom.getAttribute('data-table-local-id') || _uuid.uuid.generate(),

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.underline = exports.text_with_no_marks = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_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_with_nested_blockquote = 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_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: {
@@ -505,11 +505,12 @@ var expand = exports.expand = {
           type: 'string',
           optional: true
         }
-      }
+      },
+      optional: true
     },
     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']],
+      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']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1243,7 +1244,12 @@ var nestedExpand = exports.nestedExpand = {
         }
       }
     },
-    content: 'nestedExpand_content'
+    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
+    }
   },
   required: ['content']
 };
@@ -1263,6 +1269,22 @@ 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: {
@@ -1557,7 +1579,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']],
+      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']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1596,7 +1618,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']],
+      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']],
       minItems: 1
     }
   },

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithNonBodiedMacrosStage0, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, 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

@@ -857,6 +857,20 @@ 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',
+  attrs: {
+    title: {
+      default: ''
+    },
+    __expanded: {
+      default: true
+    }
+  },
+  selectable: true,
+  isolating: true
+});
 export const orderedList = createPMNodeSpecFactory({
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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')];
+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')];
 
 // 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,15 +20,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.optional': {
-        reason: '@DSLCompatibilityException - required for expand validator spec',
-        remove: true
-      }
-    }
-  }
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('with_non_bodied_macros')))]
 }).variant('without_nested_expand', {
   content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']

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

@@ -4,6 +4,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { blockquote } from './blockquote';
 import { codeBlock } from './codeBlock';
 import { decisionList } from './decisionList';
+import { extension } from './extension';
 import { heading } from './heading';
 import { bulletList, orderedList } from './list';
 import { mediaGroup } from './mediaGroup';
@@ -13,6 +14,7 @@ import { paragraph } from './paragraph';
 import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
+const nestedExpandContent = [paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock];
 export const nestedExpand = adfNode('nestedExpand').define({
   isolating: true,
   selectable: true,
@@ -29,7 +31,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
+  content: [$onePlus($or(...nestedExpandContent))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -37,8 +39,13 @@ export const nestedExpand = adfNode('nestedExpand').define({
         reason: '@DSLCompatibilityException - mismatch with DSL'
       },
       'props.content': {
-        value: 'nestedExpand_content',
-        reason: '@DSLCompatibilityException - mismatch with DSL'
+        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'
       },
       required: {
         reason: '@DSLCompatibilityException - required for nestedExpand validator spec',
@@ -52,4 +59,10 @@ export const nestedExpand = adfNode('nestedExpand').define({
   marks: [],
   content: [],
   noMarks: true
+}).variant('with_non_bodied_macros', {
+  marks: [],
+  content: [$onePlus($or(...nestedExpandContent, extension.use('with_marks')))],
+  stage0: true,
+  noMarks: true,
+  noExtend: true
 });

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, nestedExpandWithNonBodiedMacrosStage0 } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -25,7 +25,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
       table: tableWithNestedTable,
       tableRow: tableRowWithNestedTable,
       tableCell: tableCellWithNestedTable,
-      tableHeader: tableHeaderWithNestedTable
+      tableHeader: tableHeaderWithNestedTable,
+      nestedExpand: nestedExpandWithNonBodiedMacrosStage0
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
+export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithNonBodiedMacrosStage0, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -37,7 +37,7 @@ export { blockCard } from './block-card';
 export { unsupportedBlock } from './unsupported-block';
 export { unsupportedInline } from './unsupported-inline';
 export { status } from './status';
-export { nestedExpand } from './nested-expand';
+export { nestedExpand, nestedExpandWithNonBodiedMacrosStage0 } from './nested-expand';
 export { embedCard } from './embed-card';
 // Extensions
 export { extension } from './extension';

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

@@ -1,4 +1,4 @@
-import { nestedExpand as nestedExpandFactory } from '../../next-schema/generated/nodeTypes';
+import { nestedExpand as nestedExpandFactory, nestedExpandWithNonBodiedMacrosStage0 as nestedExpandWithNonBodiedMacrosStage0Factory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name nestedExpand_content
@@ -21,12 +21,7 @@ function getExpandAttrs(domNode) {
     __expanded: true
   };
 }
-
-/**
- * @name nestedExpand
- * @description an expand that can be nested (eg. inside table, layout).
- */
-export const nestedExpand = nestedExpandFactory({
+const nestedExpandFactoryOptions = {
   parseDOM: [{
     context: 'nestedExpand//',
     tag: '[data-node-type="nestedExpand"]',
@@ -49,4 +44,16 @@ export const nestedExpand = nestedExpandFactory({
     };
     return ['div', attrs, 0];
   }
-});
+};
+
+/**
+ * @name nestedExpand
+ * @description an expand that can be nested (eg. inside table, layout).
+ */
+export const nestedExpand = nestedExpandFactory(nestedExpandFactoryOptions);
+
+/**
+ * @name nestedExpandWithNonBodiedMacrosStage0
+ * @description an expand that can be nested (eg. inside table, layout).
+ */
+export const nestedExpandWithNonBodiedMacrosStage0 = nestedExpandWithNonBodiedMacrosStage0Factory(nestedExpandFactoryOptions);

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

@@ -211,7 +211,7 @@ const tableNodeSpecOptions = {
         isNumberColumnEnabled: dom.getAttribute('data-number-column') === 'true',
         layout:
         // copying from editor
-        dom.getAttribute('data-layout') || ( // copying from renderer
+        dom.getAttribute('data-layout') || (// copying from renderer
         breakoutWrapper === null || breakoutWrapper === void 0 ? void 0 : breakoutWrapper.getAttribute('data-layout')) || 'default',
         __autoSize: dom.getAttribute('data-autosize') === 'true',
         localId: dom.getAttribute('data-table-local-id') || uuid.generate(),

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

@@ -499,11 +499,12 @@ export const expand = {
           type: 'string',
           optional: true
         }
-      }
+      },
+      optional: true
     },
     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']],
+      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']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1237,7 +1238,12 @@ export const nestedExpand = {
         }
       }
     },
-    content: 'nestedExpand_content'
+    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
+    }
   },
   required: ['content']
 };
@@ -1257,6 +1263,22 @@ export const nestedExpand_with_no_marks = ['nestedExpand', {
     }
   }
 }];
+export const 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
+    }
+  }
+}];
 export const 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'];
 export const orderedList = {
   props: {
@@ -1551,7 +1573,7 @@ export const 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']],
+      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']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1590,7 +1612,7 @@ export const 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']],
+      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']],
       minItems: 1
     }
   },

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithNonBodiedMacrosStage0, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, 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