@atlaskit/adf-schema 40.4.0 → 40.6.0

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

@@ -1,9 +1,9 @@
-export { expand, expandWithNestedExpandStage0, toJSON as expandToJSON } from './expand';
+export { expand, expandWithNestedExpand, toJSON as expandToJSON } from './expand';
 export { confluenceJiraIssue } from './confluence-jira-issue';
 export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
-export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0 } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';

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

@@ -1100,49 +1100,49 @@ export const orderedList = {
     }
   }
 };
-export const blockquote = {
+export const 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
     }
   }
 };
-export const blockquote_legacy = ['blockquote', {
+export const blockquote = {
   props: {
+    type: {
+      type: 'enum',
+      values: ['blockquote']
+    },
     content: {
       type: 'array',
-      items: ['paragraph'],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-}];
-export const mediaGroup = {
+};
+export const blockquote_legacy = ['blockquote', {
   props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
     content: {
       type: 'array',
-      items: ['media'],
+      items: ['paragraph'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-};
-export const blockquote_with_nested_codeblock_or_media = ['blockquote', {
+}];
+export const blockquote_without_nested_codeblock_or_media = ['blockquote', {
   props: {
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1663,7 +1663,7 @@ export const expand = {
     },
     content: {
       type: 'array',
-      items: ['non_nestable_block_content'],
+      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     },
@@ -1693,11 +1693,11 @@ export const expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-export const expand_with_nested_expand = ['expand', {
+export const expand_without_nested_expand = ['expand', {
   props: {
     content: {
       type: 'array',
-      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
+      items: ['non_nestable_block_content'],
       minItems: 1,
       allowUnsupportedBlock: true
     }

package/dist/esm/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, 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 { 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, 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/esm/next-schema/generated/nodeTypes.js

@@ -28,7 +28,7 @@ export var blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export var 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 var blockquoteLegacy = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export var blockquoteWithNestedCodeblockOrMediaStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
+export var blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -284,7 +284,7 @@ export var emojiStage0 = createPMNodeSpecFactory({
   selectable: true
 });
 export var expand = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
@@ -298,9 +298,7 @@ export var expand = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export var expandWithNestedExpandStage0 = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
+export var expandWithNoMark = createPMNodeSpecFactory({
   group: 'block',
   attrs: {
     title: {
@@ -313,7 +311,9 @@ export var expandWithNestedExpandStage0 = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export var expandWithNoMark = createPMNodeSpecFactory({
+export var expandWithoutNestedExpand = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
     title: {

package/dist/esm/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 var 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 var 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('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -11,12 +11,11 @@ export var 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/esm/next-schema/nodes/expand.js

@@ -21,7 +21,7 @@ export var expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {
@@ -30,10 +30,9 @@ export var expand = adfNode('expand').define({
       }
     }
   }
-}).variant('with_nested_expand', {
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))],
-  noExtend: true,
-  stage0: true
+}).variant('without_nested_expand', {
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  ignore: ['json-schema', 'validator-spec']
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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, expandWithNestedExpand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {
@@ -77,7 +77,7 @@ var nodesInOrder = [{
   spec: heading
 }, {
   name: 'blockquote',
-  spec: blockquoteWithList
+  spec: blockquoteWithNestedCodeblockOrMedia
 }, {
   name: 'codeBlock',
   spec: codeBlock
@@ -164,7 +164,7 @@ var nodesInOrder = [{
   spec: status
 }, {
   name: 'expand',
-  spec: expand
+  spec: expandWithNestedExpand
 }, {
   name: 'nestedExpand',
   spec: nestedExpand

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

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

package/dist/esm/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, 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, 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 } 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, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, 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 } 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/esm/schema/nodes/blockquote.js

@@ -1,5 +1,5 @@
 import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
-import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithNestedCodeblockOrMediaStage0 as blockquoteWithNestedCodeblockOrMediaStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithoutNestedCodeblockOrMedia as blockquoteWithoutNestedCodeblockOrMediaFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name blockquote_node
@@ -14,12 +14,12 @@ var nodeSpecOptions = {
   }
 };
 export var blockquote = blockquoteLegacyFactory(nodeSpecOptions);
-export var blockquoteWithNestedCodeblockOrMediaStage0 = blockquoteWithNestedCodeblockOrMediaStage0Factory(nodeSpecOptions);
+export var blockquoteWithNestedCodeblockOrMedia = blockquoteFactory(nodeSpecOptions);
 
 /**
  * @name blockquote_with_list_node
  */
-export var blockquoteWithList = blockquoteFactory({
+export var blockquoteWithList = blockquoteWithoutNestedCodeblockOrMediaFactory({
   parseDOM: [{
     tag: 'blockquote'
   }],

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { expand as expandFactory, expandWithNestedExpandStage0 as expandWithNestedExpandStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { expandWithoutNestedExpand as expandWithoutNestedExpandFactory, expand as expandFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name expand_node
@@ -54,8 +54,8 @@ var nodeSpecOptions = {
     return ['div', attrs, 0];
   }
 };
-export var expand = expandFactory(nodeSpecOptions);
-export var expandWithNestedExpandStage0 = expandWithNestedExpandStage0Factory(nodeSpecOptions);
+export var expand = expandWithoutNestedExpandFactory(nodeSpecOptions);
+export var expandWithNestedExpand = expandFactory(nodeSpecOptions);
 export var toJSON = function toJSON(node) {
   return {
     attrs: Object.keys(node.attrs).filter(function (key) {

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

@@ -1,9 +1,9 @@
-export { expand, expandWithNestedExpandStage0, toJSON as expandToJSON } from './expand';
+export { expand, expandWithNestedExpand, toJSON as expandToJSON } from './expand';
 export { confluenceJiraIssue } from './confluence-jira-issue';
 export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
-export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0 } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';

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

@@ -1100,49 +1100,49 @@ export var orderedList = {
     }
   }
 };
-export var blockquote = {
+export var 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
     }
   }
 };
-export var blockquote_legacy = ['blockquote', {
+export var blockquote = {
   props: {
+    type: {
+      type: 'enum',
+      values: ['blockquote']
+    },
     content: {
       type: 'array',
-      items: ['paragraph'],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-}];
-export var mediaGroup = {
+};
+export var blockquote_legacy = ['blockquote', {
   props: {
-    type: {
-      type: 'enum',
-      values: ['mediaGroup']
-    },
     content: {
       type: 'array',
-      items: ['media'],
+      items: ['paragraph'],
       minItems: 1,
       allowUnsupportedBlock: true
     }
   }
-};
-export var blockquote_with_nested_codeblock_or_media = ['blockquote', {
+}];
+export var blockquote_without_nested_codeblock_or_media = ['blockquote', {
   props: {
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1663,7 +1663,7 @@ export var expand = {
     },
     content: {
       type: 'array',
-      items: ['non_nestable_block_content'],
+      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     },
@@ -1693,11 +1693,11 @@ export var expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-export var expand_with_nested_expand = ['expand', {
+export var expand_without_nested_expand = ['expand', {
   props: {
     content: {
       type: 'array',
-      items: [['non_nestable_block_content', 'nestedExpand_with_no_marks']],
+      items: ['non_nestable_block_content'],
       minItems: 1,
       allowUnsupportedBlock: true
     }

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

@@ -1450,26 +1450,16 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "blockquote_node": {
+    "mediaGroup_node": {
       "type": "object",
       "properties": {
         "type": {
-          "enum": ["blockquote"]
+          "enum": ["mediaGroup"]
         },
         "content": {
           "type": "array",
           "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/orderedList_node"
-              },
-              {
-                "$ref": "#/definitions/bulletList_node"
-              }
-            ]
+            "$ref": "#/definitions/media_node"
           },
           "minItems": 1
         }
@@ -1477,16 +1467,38 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "mediaGroup_node": {
+    "blockquote_node": {
       "type": "object",
       "properties": {
         "type": {
-          "enum": ["mediaGroup"]
+          "enum": ["blockquote"]
         },
         "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/media_node"
+            "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/orderedList_node"
+              },
+              {
+                "$ref": "#/definitions/bulletList_node"
+              },
+              {
+                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+              },
+              {
+                "$ref": "#/definitions/mediaGroup_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_caption_node"
+              },
+              {
+                "$ref": "#/definitions/mediaSingle_full_node"
+              }
+            ]
           },
           "minItems": 1
         }
@@ -2229,7 +2241,14 @@
         "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/non_nestable_block_content"
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
           "minItems": 1
         }

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

@@ -1557,33 +1557,6 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "blockquote_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["blockquote"]
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/orderedList_node"
-              },
-              {
-                "$ref": "#/definitions/bulletList_node"
-              }
-            ]
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "mediaGroup_node": {
       "type": "object",
       "properties": {
@@ -1601,7 +1574,7 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "blockquote_with_nested_codeblock_or_media_node": {
+    "blockquote_node": {
       "type": "object",
       "properties": {
         "type": {
@@ -2375,7 +2348,14 @@
         "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/non_nestable_block_content"
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
           "minItems": 1
         }
@@ -2419,39 +2399,6 @@
         }
       ]
     },
-    "expand_with_nested_expand_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["expand"]
-        },
-        "attrs": {
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/non_nestable_block_content"
-              },
-              {
-                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
-              }
-            ]
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "block_content": {
       "anyOf": [
         {
@@ -2487,9 +2434,6 @@
         {
           "$ref": "#/definitions/blockquote_node"
         },
-        {
-          "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
-        },
         {
           "$ref": "#/definitions/decisionList_node"
         },
@@ -2525,9 +2469,6 @@
         },
         {
           "$ref": "#/definitions/expand_with_no_mark_node"
-        },
-        {
-          "$ref": "#/definitions/expand_with_nested_expand_node"
         }
       ]
     },
@@ -2820,9 +2761,6 @@
               {
                 "$ref": "#/definitions/blockquote_node"
               },
-              {
-                "$ref": "#/definitions/blockquote_with_nested_codeblock_or_media_node"
-              },
               {
                 "$ref": "#/definitions/decisionList_node"
               },
@@ -2862,9 +2800,6 @@
               {
                 "$ref": "#/definitions/expand_with_breakout_mark_node"
               },
-              {
-                "$ref": "#/definitions/expand_with_nested_expand_node"
-              },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
               },