@atlaskit/adf-schema 48.0.0 → 49.0.0

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

@@ -41,20 +41,6 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
   selectable: true,
   defining: true
 });
-export const blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  defining: true
-});
-export const blockquoteWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  defining: true
-});
 export const bodiedExtension = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
@@ -577,12 +563,6 @@ export const listItemWithNestedDecisionStage0 = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export const listItemWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  selectable: false,
-  defining: true
-});
 export const media = createPMNodeSpecFactory({
   attrs: {
     type: {
@@ -855,20 +835,6 @@ export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export const nestedExpandWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 export const orderedList = createPMNodeSpecFactory({
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
@@ -903,29 +869,6 @@ export const panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const panelWithoutNestedNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 export const paragraph = createPMNodeSpecFactory({
   content: 'inline*',
   marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',

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

@@ -30,7 +30,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('without_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), extension.use('with_marks'), embedCard, table,
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('without_nested_non_bodied_macros'), table,
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')];
+export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // 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/blockquote.js

@@ -17,12 +17,4 @@ export const blockquote = adfNode('blockquote').define({
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]
-}).variant('without_non_bodied_macros', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))],
-  ignore: ['json-schema', 'validator-spec']
-})
-// TODO: Clean up this variant
-.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/expand.js

@@ -20,7 +20,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))]
 }).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   noMarks: false,

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

@@ -20,10 +20,6 @@ const listItem = adfNode('listItem').define({
   content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList, extension.use('with_marks')), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList, extension.use('with_marks')))],
   noExtend: true,
   stage0: true
-}).variant('without_non_bodied_macros', {
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });
 orderedList.define({
   selectable: false,
@@ -36,10 +32,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [$onePlus($or(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(listItem, listItem.use('with_nested_decision')))]
 });
 bulletList.define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(listItem, listItem.use('with_nested_decision')))]
 });

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

@@ -54,10 +54,4 @@ export const nestedExpand = adfNode('nestedExpand').define({
   marks: [],
   content: [],
   noMarks: true
-}).variant('without_non_bodied_macros', {
-  marks: [],
-  content: [$onePlus($or(...nestedExpandContent))],
-  noMarks: true,
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -45,8 +45,4 @@ export const panel = adfNode('panel').define({
     }
   },
   content: [$onePlus($or(...panelContent, extension.use('with_marks')))]
-}).variant('without_nested_non_bodied_macros', {
-  content: [$onePlus($or(...panelContent))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -2,7 +2,7 @@ import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { sanitizeNodes } from './sanitizeNodes';
 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, 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, extendedBlockquote } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, 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, extendedBlockquote } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
     return {};
@@ -67,7 +67,7 @@ const nodesInOrder = [{
   spec: orderedListWithOrder
 }, {
   name: 'listItem',
-  spec: listItemWithTask
+  spec: listItem
 }, {
   name: 'heading',
   spec: heading

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, 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, extendedBlockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, 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, 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/blockquote.js

@@ -1,5 +1,5 @@
 import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
-import { blockquoteLegacy as blockquoteLegacyFactory, blockquoteWithoutNestedCodeblockOrMedia as blockquoteWithoutNestedCodeblockOrMediaFactory, blockquoteWithoutNonBodiedMacros as blockquoteWithoutNonBodiedMacrosFactory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name blockquote_node
@@ -15,40 +15,8 @@ const nodeSpecOptions = {
 };
 export const blockquote = blockquoteLegacyFactory(nodeSpecOptions);
 
-/**
- * @name blockquoteWithNestedCodeblockOrMedia
- * @deprecated use extentedBlockquote instead
- */
-export const blockquoteWithNestedCodeblockOrMedia = blockquoteWithoutNonBodiedMacrosFactory(nodeSpecOptions);
-
 /**
  * @name extentedBlockquote
  * @description the block quote node with nested code block, media, and extension
  */
-export const extendedBlockquote = blockquoteFactory(nodeSpecOptions);
-
-/**
- * @name blockquote_with_list_node
- * @deprecated use extentedBlockquote instead
- * TODO: remove this node in the next major version
- */
-export const blockquoteWithList = blockquoteWithoutNestedCodeblockOrMediaFactory({
-  parseDOM: [{
-    tag: 'blockquote'
-  }],
-  toDOM() {
-    return ['blockquote', 0];
-  }
-});
-
-/**
- * @name blockquote_without_non_bodied_macros_node
- */
-export const blockquoteWithoutNonBodiedMacros = blockquoteWithoutNonBodiedMacrosFactory({
-  parseDOM: [{
-    tag: 'blockquote'
-  }],
-  toDOM() {
-    return ['blockquote', 0];
-  }
-});
+export const extendedBlockquote = blockquoteFactory(nodeSpecOptions);

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

@@ -3,7 +3,7 @@ export { confluenceJiraIssue } from './confluence-jira-issue';
 export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
 export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
-export { blockquote, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithList, blockquoteWithoutNonBodiedMacros } from './blockquote';
+export { blockquote, extendedBlockquote } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
@@ -14,8 +14,8 @@ export { paragraph } from './paragraph';
 export { emoji } from './emoji';
 export { image } from './image';
 export { mention, toJSON as mentionToJSON } from './mention';
-export { listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros } from './list-item';
-export { extendedPanel, panelWithoutNestedNonBodiedMacros, PanelType } from './panel';
+export { listItem, listItemWithDecisionStage0 } from './list-item';
+export { extendedPanel, PanelType } from './panel';
 export { text } from './text';
 export { default as unknownBlock } from './unknown-block';
 export { caption } from './caption';
@@ -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, nestedExpandWithoutNonBodiedMacros } from './nested-expand';
+export { nestedExpand } from './nested-expand';
 export { embedCard } from './embed-card';
 // Extensions
 export { extension } from './extension';

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

@@ -1,4 +1,4 @@
-import { listItem as listItemFactory, listItemWithNestedDecisionStage0 as listItemWithNestedDecisionStage0Factory, listItemWithoutNonBodiedMacros as listItemWithoutNonBodiedMacrosFactory } from '../../next-schema/generated/nodeTypes';
+import { listItem as listItemFactory, listItemWithNestedDecisionStage0 as listItemWithNestedDecisionStage0Factory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name list_item
@@ -13,12 +13,6 @@ export const listItem = listItemFactory({
   }
 });
 
-/**
- * @name list_item_with_task
- * @description this node allows task-list to be nested inside list-item
- */
-export const listItemWithTask = listItem;
-
 /**
  * @name list_item_with_decision_stage0
  * @description this node allows decisions to be nested inside list-item
@@ -30,16 +24,4 @@ export const listItemWithDecisionStage0 = listItemWithNestedDecisionStage0Factor
   toDOM() {
     return ['li', 0];
   }
-});
-/**
- * @name list_item_without_non_bodied_macros
- * @description this node does not allow extension inside list-item
- */
-export const listItemWithoutNonBodiedMacros = listItemWithoutNonBodiedMacrosFactory({
-  parseDOM: [{
-    tag: 'li'
-  }],
-  toDOM() {
-    return ['li', 0];
-  }
 });

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

@@ -1,4 +1,4 @@
-import { nestedExpand as nestedExpandFactory, nestedExpandWithoutNonBodiedMacros as nestedExpandWithoutNonBodiedMacrosFactory } from '../../next-schema/generated/nodeTypes';
+import { nestedExpand as nestedExpandFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name nestedExpand_content
@@ -45,39 +45,9 @@ const nestedExpandFactoryOptions = {
     return ['div', attrs, 0];
   }
 };
-const nestedExpandWithoutNonBodiedMacrosFactoryOptions = {
-  parseDOM: [{
-    context: 'nestedExpand//',
-    tag: '[data-node-type="nestedExpand"]',
-    getAttrs: getExpandAttrs
-  }, {
-    tag: '[data-node-type="nestedExpand"] button',
-    ignore: true
-  }, {
-    tag: '[data-node-type="expand"] button',
-    ignore: true
-  }, {
-    tag: 'div[data-node-type="nestedExpand"]',
-    getAttrs: getExpandAttrs
-  }],
-  toDOM(node) {
-    const attrs = {
-      'data-node-type': 'nestedExpand',
-      'data-title': node.attrs.title,
-      'data-expanded': node.attrs.__expanded
-    };
-    return ['div', attrs, 0];
-  }
-};
 
 /**
  * @name nestedExpand
  * @description an expand that can be nested (eg. inside table, layout).
  */
-export const nestedExpand = nestedExpandFactory(nestedExpandFactoryOptions);
-
-/**
- * @name nestedExpandWithNonBodiedMacros
- * @description an expand that can be nested (eg. inside table, layout).
- */
-export const nestedExpandWithoutNonBodiedMacros = nestedExpandWithoutNonBodiedMacrosFactory(nestedExpandWithoutNonBodiedMacrosFactoryOptions);
+export const nestedExpand = nestedExpandFactory(nestedExpandFactoryOptions);

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

@@ -1,4 +1,4 @@
-import { panel as panelFactory, panelWithoutNestedNonBodiedMacros as panelWithoutNestedNonBodiedMacrosFactory } from '../../next-schema/generated/nodeTypes';
+import { panel as panelFactory } from '../../next-schema/generated/nodeTypes';
 export let PanelType = /*#__PURE__*/function (PanelType) {
   PanelType["INFO"] = "info";
   PanelType["NOTE"] = "note";
@@ -61,5 +61,4 @@ const createPanelNodeSpecOptions = allowCustomPanel => ({
  * Specifically, it allows Media, action, code-block, rule and decision nodes in
  * addition to content allowed inside panel
  */
-export const extendedPanel = allowCustomPanel => panelFactory(createPanelNodeSpecOptions(allowCustomPanel));
-export const panelWithoutNestedNonBodiedMacros = allowCustomPanel => panelWithoutNestedNonBodiedMacrosFactory(createPanelNodeSpecOptions(allowCustomPanel));
+export const extendedPanel = allowCustomPanel => panelFactory(createPanelNodeSpecOptions(allowCustomPanel));

package/dist/esm/index.js

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

@@ -41,20 +41,6 @@ export var blockquoteLegacy = createPMNodeSpecFactory({
   selectable: true,
   defining: true
 });
-export var blockquoteWithoutNestedCodeblockOrMedia = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  defining: true
-});
-export var blockquoteWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  selectable: true,
-  defining: true
-});
 export var bodiedExtension = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
@@ -577,12 +563,6 @@ export var listItemWithNestedDecisionStage0 = createPMNodeSpecFactory({
   selectable: false,
   defining: true
 });
-export var listItemWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  selectable: false,
-  defining: true
-});
 export var media = createPMNodeSpecFactory({
   attrs: {
     type: {
@@ -855,20 +835,6 @@ export var nestedExpandWithNoMarks = createPMNodeSpecFactory({
   selectable: true,
   isolating: true
 });
-export var nestedExpandWithoutNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    title: {
-      default: ''
-    },
-    __expanded: {
-      default: true
-    }
-  },
-  selectable: true,
-  isolating: true
-});
 export var orderedList = createPMNodeSpecFactory({
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
@@ -903,29 +869,6 @@ export var panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export var panelWithoutNestedNonBodiedMacros = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 export var paragraph = createPMNodeSpecFactory({
   content: 'inline*',
   marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',

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

@@ -30,7 +30,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('without_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), extension.use('with_marks'), embedCard, table,
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('without_nested_non_bodied_macros'), table,
+export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

package/dist/esm/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 var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')];
+export var 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')];
 
 // 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/esm/next-schema/nodes/blockquote.js

@@ -17,12 +17,4 @@ export var blockquote = adfNode('blockquote').define({
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]
-}).variant('without_non_bodied_macros', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))],
-  ignore: ['json-schema', 'validator-spec']
-})
-// TODO: Clean up this variant
-.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

@@ -20,7 +20,7 @@ export var expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))]
 }).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   noMarks: false,

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

@@ -20,10 +20,6 @@ var listItem = adfNode('listItem').define({
   content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList, extension.use('with_marks')), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList, extension.use('with_marks')))],
   noExtend: true,
   stage0: true
-}).variant('without_non_bodied_macros', {
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });
 orderedList.define({
   selectable: false,
@@ -36,10 +32,10 @@ orderedList.define({
       optional: true
     }
   },
-  content: [$onePlus($or(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(listItem, listItem.use('with_nested_decision')))]
 });
 bulletList.define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(listItem, listItem.use('with_nested_decision'), listItem.use('without_non_bodied_macros')))]
+  content: [$onePlus($or(listItem, listItem.use('with_nested_decision')))]
 });

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

@@ -54,10 +54,4 @@ export var nestedExpand = adfNode('nestedExpand').define({
   marks: [],
   content: [],
   noMarks: true
-}).variant('without_non_bodied_macros', {
-  marks: [],
-  content: [$onePlus($or.apply(void 0, nestedExpandContent))],
-  noMarks: true,
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -45,8 +45,4 @@ export var panel = adfNode('panel').define({
     }
   },
   content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks')])))]
-}).variant('without_nested_non_bodied_macros', {
-  content: [$onePlus($or.apply(void 0, panelContent))],
-  noExtend: true,
-  ignore: ['json-schema', 'validator-spec']
 });

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

@@ -2,7 +2,7 @@ import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { sanitizeNodes } from './sanitizeNodes';
 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, 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, extendedBlockquote } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, 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, extendedBlockquote } from './nodes';
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {
@@ -69,7 +69,7 @@ var nodesInOrder = [{
   spec: orderedListWithOrder
 }, {
   name: 'listItem',
-  spec: listItemWithTask
+  spec: listItem
 }, {
   name: 'heading',
   spec: heading