@atlaskit/adf-schema 40.4.0 → 40.6.0

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 
+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';
+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 type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, MultiBodiedExtensionDefinition, ExtensionFrameDefinition, BackgroundColorDefinition, } 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';
 export type { Match, NameToEmoji } from './utils';

package/dist/types/next-schema/generated/nodeGroupTypes.d.ts

@@ -3,8 +3,8 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
  * and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
  */
-import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithNestedCodeblockOrMediaStage0Definition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNestedExpandStage0Definition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithNestedCodeblockOrMediaStage0Definition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithNestedExpandStage0Definition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
 export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
 export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
 export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -27,7 +27,7 @@ export type BlockCardNode = PMNode & BlockCardDefinition;
 export declare const blockCard: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockCardNode>) => import("prosemirror-model").NodeSpec;
 export interface BlockquoteDefinition {
     type: 'blockquote';
-    content: Array<BulletListDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
+    content: Array<BulletListDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type BlockquoteNode = PMNode & BlockquoteDefinition;
@@ -39,13 +39,13 @@ export interface BlockquoteLegacyDefinition {
 }
 export type BlockquoteLegacyNode = PMNode & BlockquoteLegacyDefinition;
 export declare const blockquoteLegacy: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockquoteLegacyNode>) => import("prosemirror-model").NodeSpec;
-export interface BlockquoteWithNestedCodeblockOrMediaStage0Definition {
+export interface BlockquoteWithoutNestedCodeblockOrMediaDefinition {
     type: 'blockquote';
-    content: Array<BulletListDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
+    content: Array<BulletListDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
-export type BlockquoteWithNestedCodeblockOrMediaStage0Node = PMNode & BlockquoteWithNestedCodeblockOrMediaStage0Definition;
-export declare const blockquoteWithNestedCodeblockOrMediaStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockquoteWithNestedCodeblockOrMediaStage0Node>) => import("prosemirror-model").NodeSpec;
+export type BlockquoteWithoutNestedCodeblockOrMediaNode = PMNode & BlockquoteWithoutNestedCodeblockOrMediaDefinition;
+export declare const blockquoteWithoutNestedCodeblockOrMedia: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<BlockquoteWithoutNestedCodeblockOrMediaNode>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionDefinition {
     type: 'bodiedExtension';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
@@ -219,7 +219,7 @@ export type EmojiStage0Node = PMNode & EmojiStage0Definition;
 export declare const emojiStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<EmojiStage0Node>) => import("prosemirror-model").NodeSpec;
 export interface ExpandDefinition {
     type: 'expand';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
@@ -228,26 +228,26 @@ export interface ExpandDefinition {
 }
 export type ExpandNode = PMNode & ExpandDefinition;
 export declare const expand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandNode>) => import("prosemirror-model").NodeSpec;
-export interface ExpandWithNestedExpandStage0Definition {
+export interface ExpandWithNoMarkDefinition {
     type: 'expand';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
     };
 }
-export type ExpandWithNestedExpandStage0Node = PMNode & ExpandWithNestedExpandStage0Definition;
-export declare const expandWithNestedExpandStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNestedExpandStage0Node>) => import("prosemirror-model").NodeSpec;
-export interface ExpandWithNoMarkDefinition {
+export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
+export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
+export interface ExpandWithoutNestedExpandDefinition {
     type: 'expand';
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
     };
 }
-export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
-export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
+export type ExpandWithoutNestedExpandNode = PMNode & ExpandWithoutNestedExpandDefinition;
+export declare const expandWithoutNestedExpand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithoutNestedExpandNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionDefinition {
     type: 'extension';
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;

package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts

@@ -49,13 +49,17 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
             };
         };
     };
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "without_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     ignore: ("json-schema" | "validator-spec")[];
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
 } & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    noExtend: true;
-    stage0: true;
+    /**
+     * @DSLCompatibilityException
+     *
+     * Pseudo group used to match existing validator and json schema specs.
+     */
+    ignore: ("json-schema" | "validator-spec")[];
 }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
     ignore: ("json-schema" | "validator-spec")[];

package/dist/types/next-schema/nodes/blockquote.d.ts

@@ -1,8 +1,7 @@
-export declare const blockquote: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const blockquote: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "without_nested_codeblock_or_media"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     ignore: ("json-schema" | "validator-spec")[];
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
 } & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    noExtend: true;
-    stage0: true;
+    ignore: ("json-schema" | "validator-spec")[];
 }>;

package/dist/types/next-schema/nodes/expand.d.ts

@@ -1,7 +1,6 @@
-export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_nested_expand", "with_breakout_mark", "with_no_mark"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "without_nested_expand", "with_breakout_mark", "with_no_mark"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    noExtend: true;
-    stage0: true;
+    ignore: ("json-schema" | "validator-spec")[];
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     content: any[];

package/dist/types/schema/index.d.ts

@@ -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 type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, ExtensionFrameDefinition, MultiBodiedExtensionDefinition, } 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. */

package/dist/types/schema/nodes/blockquote.d.ts

@@ -16,7 +16,7 @@ export interface BlockQuoteDefinition {
     content: Array<Paragraph | OrderedList | BulletList | CodeBlock | MediaGroup | MediaSingle>;
 }
 export declare const blockquote: import("prosemirror-model").NodeSpec;
-export declare const blockquoteWithNestedCodeblockOrMediaStage0: import("prosemirror-model").NodeSpec;
+export declare const blockquoteWithNestedCodeblockOrMedia: import("prosemirror-model").NodeSpec;
 /**
  * @name blockquote_with_list_node
  */

package/dist/types/schema/nodes/expand.d.ts

@@ -27,7 +27,7 @@ export type ExpandDefinition = ExpandBaseDefinition & NoMark;
  */
 export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
 export declare const expand: import("prosemirror-model").NodeSpec;
-export declare const expandWithNestedExpandStage0: import("prosemirror-model").NodeSpec;
+export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
 export declare const toJSON: (node: PMNode) => {
     attrs: import("prosemirror-model").Attrs;
 };

package/dist/types/schema/nodes/index.d.ts

@@ -1,11 +1,11 @@
-export { expand, expandWithNestedExpandStage0, toJSON as expandToJSON, } from './expand';
+export { expand, expandWithNestedExpand, toJSON as expandToJSON, } from './expand';
 export type { ExpandDefinition } 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 type { DocNode } from './doc';
-export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, } from './blockquote';
+export { blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, } from './blockquote';
 export type { BlockQuoteDefinition } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export type { BulletListDefinition } from './types/list';

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -1119,7 +1119,7 @@ export declare const orderedList: {
         };
     };
 };
-export declare const blockquote: {
+export declare const mediaGroup: {
     props: {
         type: {
             type: string;
@@ -1127,28 +1127,28 @@ export declare const blockquote: {
         };
         content: {
             type: string;
-            items: string[][];
+            items: string[];
             minItems: number;
             allowUnsupportedBlock: boolean;
         };
     };
 };
-export declare const blockquote_legacy: (string | {
+export declare const blockquote: {
     props: {
+        type: {
+            type: string;
+            values: string[];
+        };
         content: {
             type: string;
-            items: string[];
+            items: string[][];
             minItems: number;
             allowUnsupportedBlock: boolean;
         };
     };
-})[];
-export declare const mediaGroup: {
+};
+export declare const blockquote_legacy: (string | {
     props: {
-        type: {
-            type: string;
-            values: string[];
-        };
         content: {
             type: string;
             items: string[];
@@ -1156,8 +1156,8 @@ export declare const mediaGroup: {
             allowUnsupportedBlock: boolean;
         };
     };
-};
-export declare const blockquote_with_nested_codeblock_or_media: (string | {
+})[];
+export declare const blockquote_without_nested_codeblock_or_media: (string | {
     props: {
         content: {
             type: string;
@@ -1682,7 +1682,7 @@ export declare const expand: {
         };
         content: {
             type: string;
-            items: string[];
+            items: string[][];
             minItems: number;
             allowUnsupportedBlock: boolean;
         };
@@ -1712,11 +1712,11 @@ export declare const expand_with_breakout_mark: (string | {
         };
     };
 })[];
-export declare const expand_with_nested_expand: (string | {
+export declare const expand_without_nested_expand: (string | {
     props: {
         content: {
             type: string;
-            items: string[][];
+            items: string[];
             minItems: number;
             allowUnsupportedBlock: boolean;
         };

package/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/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"
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "40.4.0",
+  "version": "40.6.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.19.0",
+    "@atlassian/adf-schema-json": "^1.21.0",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
     "@atlaskit/adf-schema-generator": "^1.30.0",
     "@atlaskit/codemod-utils": "^4.2.4",