@atlaskit/adf-schema 40.3.1 → 40.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 40.5.0
+
+### Minor Changes
+
+- 401d96d: [ED-24188] Promoting to full schema - Codeblock & Media in Quotes
+
+## 40.4.0
+
+### Minor Changes
+
+- c233ecd: [ED-24169] Stage 0 - Decision in Lists
+
 ## 40.3.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -351,10 +351,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _schema.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _schema.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _schema.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -747,6 +747,12 @@ Object.defineProperty(exports, "listItem", {
     return _schema.listItem;
   }
 });
+Object.defineProperty(exports, "listItemWithDecisionStage0", {
+  enumerable: true,
+  get: function get() {
+    return _schema.listItemWithDecisionStage0;
+  }
+});
 Object.defineProperty(exports, "listItemWithTask", {
   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.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = 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.listItemLegacy = 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.expandWithNoMark = exports.expandWithNestedExpandStage0 = 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.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = 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.listItemLegacy = 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.expandWithNoMark = exports.expandWithNestedExpandStage0 = 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.codeBlockWithNoMarks = 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
@@ -34,7 +34,7 @@ var blockCard = exports.blockCard = (0, _createPMSpecFactory.createPMNodeSpecFac
   draggable: true
 });
 var blockquote = exports.blockquote = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -45,8 +45,8 @@ var blockquoteLegacy = exports.blockquoteLegacy = (0, _createPMSpecFactory.creat
   selectable: false,
   defining: true
 });
-var blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithNestedCodeblockOrMediaStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+var blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteWithoutNestedCodeblockOrMedia = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -575,6 +575,12 @@ var listItemLegacy = exports.listItemLegacy = (0, _createPMSpecFactory.createPMN
   selectable: false,
   defining: true
 });
+var listItemWithNestedDecisionStage0 = exports.listItemWithNestedDecisionStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock | decisionList) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | decisionList)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  selectable: false,
+  defining: true
+});
 var media = exports.media = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   attrs: {
     type: {

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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _table = require("../nodes/table");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _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('with_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('with_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('with_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -17,12 +17,11 @@ var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquo
   defining: true,
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full')))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))]
-}).variant('with_nested_codeblock_or_media', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_codeblock_or_media', {
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock))],
+  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -12,6 +12,7 @@ var _mediaSingle = require("./mediaSingle");
 var _paragraph = require("./paragraph");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
+var _decisionList = require("./decisionList");
 var orderedList = exports.orderedList = (0, _adfSchemaGenerator.adfNode)('orderedList');
 var bulletList = exports.bulletList = (0, _adfSchemaGenerator.adfNode)('bulletList');
 var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
@@ -23,6 +24,10 @@ var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
 }).variant('legacy', {
   content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock))],
   ignore: ['json-schema', 'validator-spec']
+}).variant('with_nested_decision', {
+  content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock, _decisionList.decisionList), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock, _decisionList.decisionList))],
+  noExtend: true,
+  stage0: true
 });
 orderedList.define({
   selectable: false,
@@ -35,10 +40,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
 });
 bulletList.define({
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
 });

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

@@ -88,7 +88,7 @@ var nodesInOrder = [{
   spec: _nodes.heading
 }, {
   name: 'blockquote',
-  spec: _nodes.blockquoteWithList
+  spec: _nodes.blockquoteWithNestedCodeblockOrMedia
 }, {
   name: 'codeBlock',
   spec: _nodes.codeBlock

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

@@ -27,7 +27,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       multiBodiedExtension: _nodes.multiBodiedExtension,
       extensionFrame: _nodes.extensionFrame,
       expand: _nodes.expandWithNestedExpandStage0,
-      blockquote: _nodes.blockquoteWithNestedCodeblockOrMediaStage0
+      blockquote: _nodes.blockquoteWithNestedCodeblockOrMedia,
+      listItem: _nodes.listItemWithDecisionStage0
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/index.js

@@ -69,10 +69,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _nodes.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _nodes.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _nodes.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -399,6 +399,12 @@ Object.defineProperty(exports, "listItem", {
     return _nodes.listItem;
   }
 });
+Object.defineProperty(exports, "listItemWithDecisionStage0", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.listItemWithDecisionStage0;
+  }
+});
 Object.defineProperty(exports, "listItemWithTask", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithList = exports.blockquote = void 0;
+exports.blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithList = exports.blockquote = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 /**
  * @name blockquote_node
@@ -18,12 +18,12 @@ var nodeSpecOptions = {
   }
 };
 var blockquote = exports.blockquote = (0, _nodeTypes.blockquoteLegacy)(nodeSpecOptions);
-var blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteWithNestedCodeblockOrMediaStage0 = (0, _nodeTypes.blockquoteWithNestedCodeblockOrMediaStage0)(nodeSpecOptions);
+var blockquoteWithNestedCodeblockOrMedia = exports.blockquoteWithNestedCodeblockOrMedia = (0, _nodeTypes.blockquote)(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node
  */
-var blockquoteWithList = exports.blockquoteWithList = (0, _nodeTypes.blockquote)({
+var blockquoteWithList = exports.blockquoteWithList = (0, _nodeTypes.blockquoteWithoutNestedCodeblockOrMedia)({
   parseDOM: [{
     tag: 'blockquote'
   }],

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

@@ -28,10 +28,10 @@ Object.defineProperty(exports, "blockquoteWithList", {
     return _blockquote.blockquoteWithList;
   }
 });
-Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMediaStage0", {
+Object.defineProperty(exports, "blockquoteWithNestedCodeblockOrMedia", {
   enumerable: true,
   get: function get() {
-    return _blockquote.blockquoteWithNestedCodeblockOrMediaStage0;
+    return _blockquote.blockquoteWithNestedCodeblockOrMedia;
   }
 });
 Object.defineProperty(exports, "bodiedExtension", {
@@ -238,6 +238,12 @@ Object.defineProperty(exports, "listItem", {
     return _listItem.listItem;
   }
 });
+Object.defineProperty(exports, "listItemWithDecisionStage0", {
+  enumerable: true,
+  get: function get() {
+    return _listItem.listItemWithDecisionStage0;
+  }
+});
 Object.defineProperty(exports, "listItemWithTask", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.listItemWithTask = exports.listItem = void 0;
+exports.listItemWithTask = exports.listItemWithDecisionStage0 = exports.listItem = void 0;
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 var listItem = exports.listItem = (0, _nodeTypes.listItemLegacy)({
   parseDOM: [{
@@ -25,4 +25,17 @@ var listItemWithTask = exports.listItemWithTask = (0, _nodeTypes.listItem)({
   toDOM: function toDOM() {
     return ['li', 0];
   }
+});
+
+/**
+ * @name list_item_with_decision_stage0
+ * @description this node allows decisions to be nested inside list-item
+ */
+var listItemWithDecisionStage0 = exports.listItemWithDecisionStage0 = (0, _nodeTypes.listItemWithNestedDecisionStage0)({
+  parseDOM: [{
+    tag: 'li'
+  }],
+  toDOM: function toDOM() {
+    return ['li', 0];
+  }
 });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = 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_legacy = 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_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_nested_expand = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_with_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = 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_legacy = 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_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_nested_expand = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_without_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -999,6 +999,62 @@ var listItem_legacy = exports.listItem_legacy = ['listItem', {
     }
   }
 }];
+var decisionItem = exports.decisionItem = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['decisionItem']
+    },
+    attrs: {
+      props: {
+        localId: {
+          type: 'string'
+        },
+        state: {
+          type: 'string'
+        }
+      }
+    },
+    content: {
+      type: 'array',
+      items: ['inline'],
+      optional: true,
+      allowUnsupportedInline: true
+    }
+  }
+};
+var decisionList = exports.decisionList = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['decisionList']
+    },
+    attrs: {
+      props: {
+        localId: {
+          type: 'string'
+        }
+      }
+    },
+    content: {
+      type: 'array',
+      items: ['decisionItem'],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+};
+var listItem_with_nested_decision = exports.listItem_with_nested_decision = ['listItem', {
+  props: {
+    content: {
+      type: 'array',
+      isTupleLike: true,
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
+}];
 var bulletList = exports.bulletList = {
   props: {
     type: {
@@ -1007,7 +1063,7 @@ var bulletList = exports.bulletList = {
     },
     content: {
       type: 'array',
-      items: ['listItem'],
+      items: [['listItem', 'listItem_with_nested_decision']],
       minItems: 1
     }
   }
@@ -1045,104 +1101,59 @@ var orderedList = exports.orderedList = {
     },
     content: {
       type: 'array',
-      items: ['listItem'],
+      items: [['listItem', 'listItem_with_nested_decision']],
       minItems: 1
     }
   }
 };
-var blockquote = exports.blockquote = {
+var mediaGroup = exports.mediaGroup = {
   props: {
     type: {
       type: 'enum',
-      values: ['blockquote']
+      values: ['mediaGroup']
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
+      items: ['media'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
 };
-var blockquote_legacy = exports.blockquote_legacy = ['blockquote', {
-  props: {
-    content: {
-      type: 'array',
-      items: ['paragraph'],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-}];
-var mediaGroup = exports.mediaGroup = {
+var blockquote = exports.blockquote = {
   props: {
     type: {
       type: 'enum',
-      values: ['mediaGroup']
+      values: ['blockquote']
     },
     content: {
       type: 'array',
-      items: ['media'],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
 };
-var blockquote_with_nested_codeblock_or_media = exports.blockquote_with_nested_codeblock_or_media = ['blockquote', {
+var blockquote_legacy = exports.blockquote_legacy = ['blockquote', {
   props: {
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: ['paragraph'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
 }];
-var decisionItem = exports.decisionItem = {
+var blockquote_without_nested_codeblock_or_media = exports.blockquote_without_nested_codeblock_or_media = ['blockquote', {
   props: {
-    type: {
-      type: 'enum',
-      values: ['decisionItem']
-    },
-    attrs: {
-      props: {
-        localId: {
-          type: 'string'
-        },
-        state: {
-          type: 'string'
-        }
-      }
-    },
     content: {
       type: 'array',
-      items: ['inline'],
-      optional: true,
-      allowUnsupportedInline: true
-    }
-  }
-};
-var decisionList = exports.decisionList = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['decisionList']
-    },
-    attrs: {
-      props: {
-        localId: {
-          type: 'string'
-        }
-      }
-    },
-    content: {
-      type: 'array',
-      items: ['decisionItem'],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-};
+}];
 var embedCard = exports.embedCard = {
   props: {
     type: {

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, 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, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, 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 } from './schema';
+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, expandWithNestedExpandStage0, 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, 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 } 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

@@ -28,7 +28,7 @@ export const blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export const blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -39,8 +39,8 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export const blockquoteWithNestedCodeblockOrMediaStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+export const blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -569,6 +569,12 @@ export const listItemLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
+export const listItemWithNestedDecisionStage0 = createPMNodeSpecFactory({
+  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock | decisionList) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | decisionList)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  selectable: false,
+  defining: true
+});
 export const media = createPMNodeSpecFactory({
   attrs: {
     type: {

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), 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('with_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('with_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('with_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -11,12 +11,11 @@ export const blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]
-}).variant('with_nested_codeblock_or_media', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_codeblock_or_media', {
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock))],
+  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -6,6 +6,7 @@ import { mediaSingle } from './mediaSingle';
 import { paragraph } from './paragraph';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
+import { decisionList } from './decisionList';
 export const orderedList = adfNode('orderedList');
 export const bulletList = adfNode('bulletList');
 const listItem = adfNode('listItem').define({
@@ -17,6 +18,10 @@ const listItem = adfNode('listItem').define({
 }).variant('legacy', {
   content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))],
   ignore: ['json-schema', 'validator-spec']
+}).variant('with_nested_decision', {
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList))],
+  noExtend: true,
+  stage0: true
 });
 orderedList.define({
   selectable: false,
@@ -29,10 +34,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [$onePlus($or(listItem, listItem.use('legacy')))]
+  content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
 });
 bulletList.define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(listItem, listItem.use('legacy')))]
+  content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
 });

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

@@ -1,7 +1,7 @@
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border, backgroundColor } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithNestedCodeblockOrMedia, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
     return {};
@@ -72,7 +72,7 @@ const nodesInOrder = [{
   spec: heading
 }, {
   name: 'blockquote',
-  spec: blockquoteWithList
+  spec: blockquoteWithNestedCodeblockOrMedia
 }, {
   name: 'codeBlock',
   spec: codeBlock

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0 } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -19,7 +19,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
       expand: expandWithNestedExpandStage0,
-      blockquote: blockquoteWithNestedCodeblockOrMediaStage0
+      blockquote: blockquoteWithNestedCodeblockOrMedia,
+      listItem: listItemWithDecisionStage0
     };
   }
   return createSchema(defaultSchemaConfig);