@atlaskit/adf-schema 37.1.21 → 37.1.23

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

@@ -20,29 +20,29 @@ export interface BlockCardNodeAttributes2 {
 }
 export interface BlockCardDefinition {
     type: 'blockCard';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: BlockCardNodeAttributes0 | BlockCardNodeAttributes1 | BlockCardNodeAttributes2;
 }
 export type BlockCardNode = PMNode & BlockCardDefinition;
 export declare const blockCard: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockCardNode>) => import("prosemirror-model").NodeSpec;
 export interface BlockquoteDefinition {
     type: 'blockquote';
-    content: Array<ParagraphWithNoMarksDefinition | BulletListDefinition | OrderedListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BulletListDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type BlockquoteNode = PMNode & BlockquoteDefinition;
 export declare const blockquote: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteNode>) => import("prosemirror-model").NodeSpec;
 export interface BlockquoteLegacyDefinition {
     type: 'blockquote';
     content: Array<ParagraphDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type BlockquoteLegacyNode = PMNode & BlockquoteLegacyDefinition;
 export declare const blockquoteLegacy: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteLegacyNode>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionDefinition {
     type: 'bodiedExtension';
-    content: Array<CodeBlockDefinition | BlockCardDefinition | ParagraphDefinition | MediaSingleDefinition | MediaSingleDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | MediaSingleDefinition | MediaSingleDefinition | OrderedListDefinition | PanelDefinition | ParagraphDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -56,7 +56,7 @@ export type BodiedExtensionNode = PMNode & BodiedExtensionDefinition;
 export declare const bodiedExtension: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BodiedExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionWithMarksDefinition {
     type: 'bodiedExtension';
-    marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<DataConsumerMark | FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -71,21 +71,21 @@ export declare const bodiedExtensionWithMarks: ({ parseDOM, toDOM, toDebugString
 export interface BulletListDefinition {
     type: 'bulletList';
     content: Array<ListItemDefinition | ListItemLegacyDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type BulletListNode = PMNode & BulletListDefinition;
 export declare const bulletList: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BulletListNode>) => import("prosemirror-model").NodeSpec;
 export interface CaptionDefinition {
     type: 'caption';
-    content: Array<HardBreakDefinition | MentionDefinition | EmojiDefinition | DateDefinition | PlaceholderDefinition | InlineCardDefinition | StatusDefinition | TextFormattedDefinition | TextCodeInlineDefinition | UnsupportedInlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | TextCodeInlineDefinition | TextFormattedDefinition | UnsupportedInlineDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type CaptionNode = PMNode & CaptionDefinition;
 export declare const caption: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CaptionNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockDefinition {
     type: 'codeBlock';
     content: Array<TextDefinition | UnsupportedInlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         language?: string;
         uniqueId?: string;
@@ -132,7 +132,7 @@ export type ConfluenceUnsupportedInlineNode = PMNode & ConfluenceUnsupportedInli
 export declare const confluenceUnsupportedInline: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ConfluenceUnsupportedInlineNode>) => import("prosemirror-model").NodeSpec;
 export interface DateDefinition {
     type: 'date';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark | AnnotationMark>;
+    marks: Array<AnnotationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         timestamp: string;
     };
@@ -142,7 +142,7 @@ export declare const date: ({ parseDOM, toDOM, toDebugString }: import("@atlaski
 export interface DecisionItemDefinition {
     type: 'decisionItem';
     content: Array<InlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId: string;
         state: string;
@@ -153,7 +153,7 @@ export declare const decisionItem: ({ parseDOM, toDOM, toDebugString }: import("
 export interface DecisionListDefinition {
     type: 'decisionList';
     content: Array<DecisionItemDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId: string;
     };
@@ -162,13 +162,13 @@ export type DecisionListNode = PMNode & DecisionListDefinition;
 export declare const decisionList: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<DecisionListNode>) => import("prosemirror-model").NodeSpec;
 export interface DocDefinition {
     type: 'doc';
-    content: Array<BlockDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | BlockRootOnlyDefinition>;
+    content: Array<BlockDefinition | BlockRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition>;
 }
 export type DocNode = PMNode & DocDefinition;
 export declare const doc: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<DocNode>) => import("prosemirror-model").NodeSpec;
 export interface EmbedCardDefinition {
     type: 'embedCard';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         url: string;
         layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
@@ -181,7 +181,7 @@ export type EmbedCardNode = PMNode & EmbedCardDefinition;
 export declare const embedCard: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<EmbedCardNode>) => import("prosemirror-model").NodeSpec;
 export interface EmojiDefinition {
     type: 'emoji';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark | AnnotationMark>;
+    marks: Array<AnnotationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         shortName: string;
         id?: string;
@@ -192,8 +192,8 @@ export type EmojiNode = PMNode & EmojiDefinition;
 export declare const emoji: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<EmojiNode>) => import("prosemirror-model").NodeSpec;
 export interface ExpandDefinition {
     type: 'expand';
-    content: Array<CodeBlockDefinition | BlockCardDefinition | ParagraphDefinition | MediaSingleDefinition | MediaSingleDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | MediaSingleDefinition | MediaSingleDefinition | OrderedListDefinition | PanelDefinition | ParagraphDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
@@ -212,7 +212,7 @@ export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
 export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionDefinition {
     type: 'extension';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -226,7 +226,7 @@ export type ExtensionNode = PMNode & ExtensionDefinition;
 export declare const extension: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionWithMarksDefinition {
     type: 'extension';
-    marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<DataConsumerMark | FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -240,14 +240,14 @@ export type ExtensionWithMarksNode = PMNode & ExtensionWithMarksDefinition;
 export declare const extensionWithMarks: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExtensionWithMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionFrameDefinition {
     type: 'extensionFrame';
-    content: Array<BodiedExtensionDefinition | PanelDefinition | ParagraphDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | ExtensionDefinition | BlockCardDefinition | EmbedCardDefinition | UnsupportedBlockDefinition>;
-    marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BodiedExtensionDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | MediaSingleDefinition | OrderedListDefinition | PanelDefinition | ParagraphDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<DataConsumerMark | FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type ExtensionFrameNode = PMNode & ExtensionFrameDefinition;
 export declare const extensionFrame: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExtensionFrameNode>) => import("prosemirror-model").NodeSpec;
 export interface HardBreakDefinition {
     type: 'hardBreak';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         text?: '\n';
     };
@@ -257,7 +257,7 @@ export declare const hardBreak: ({ parseDOM, toDOM, toDebugString }: import("@at
 export interface HeadingDefinition {
     type: 'heading';
     content: Array<InlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;
@@ -267,7 +267,7 @@ export type HeadingNode = PMNode & HeadingDefinition;
 export declare const heading: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<HeadingNode>) => import("prosemirror-model").NodeSpec;
 export interface HeadingWithAlignmentDefinition {
     type: 'heading';
-    marks: Array<AlignmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AlignmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;
@@ -277,7 +277,7 @@ export type HeadingWithAlignmentNode = PMNode & HeadingWithAlignmentDefinition;
 export declare const headingWithAlignment: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<HeadingWithAlignmentNode>) => import("prosemirror-model").NodeSpec;
 export interface HeadingWithIndentationDefinition {
     type: 'heading';
-    marks: Array<IndentationMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<IndentationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;
@@ -312,14 +312,27 @@ export interface InlineCardNodeAttributes1 {
 }
 export interface InlineCardDefinition {
     type: 'inlineCard';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: InlineCardNodeAttributes0 | InlineCardNodeAttributes1;
 }
 export type InlineCardNode = PMNode & InlineCardDefinition;
 export declare const inlineCard: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<InlineCardNode>) => import("prosemirror-model").NodeSpec;
+export interface InlineExtensionDefinition {
+    type: 'inlineExtension';
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
+    attrs: {
+        extensionKey: string;
+        extensionType: string;
+        parameters?: Record<string, unknown>;
+        text?: string;
+        localId?: string;
+    };
+}
+export type InlineExtensionNode = PMNode & InlineExtensionDefinition;
+export declare const inlineExtension: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<InlineExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface InlineExtensionWithMarksDefinition {
     type: 'inlineExtension';
-    marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<DataConsumerMark | FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -333,7 +346,7 @@ export declare const inlineExtensionWithMarks: ({ parseDOM, toDOM, toDebugString
 export interface LayoutColumnDefinition {
     type: 'layoutColumn';
     content: Array<BlockDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         width: number;
     };
@@ -343,28 +356,28 @@ export declare const layoutColumn: ({ parseDOM, toDOM, toDebugString }: import("
 export interface LayoutSectionDefinition {
     type: 'layoutSection';
     content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
-    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type LayoutSectionNode = PMNode & LayoutSectionDefinition;
 export declare const layoutSection: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<LayoutSectionNode>) => import("prosemirror-model").NodeSpec;
 export interface LayoutSectionFullDefinition {
     type: 'layoutSection';
     content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
-    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type LayoutSectionFullNode = PMNode & LayoutSectionFullDefinition;
 export declare const layoutSectionFull: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<LayoutSectionFullNode>) => import("prosemirror-model").NodeSpec;
 export interface ListItemDefinition {
     type: 'listItem';
-    content: Array<CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | UnsupportedBlockDefinition | CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BulletListDefinition | CodeBlockWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type ListItemNode = PMNode & ListItemDefinition;
 export declare const listItem: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ListItemNode>) => import("prosemirror-model").NodeSpec;
 export interface ListItemLegacyDefinition {
     type: 'listItem';
-    content: Array<CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | UnsupportedBlockDefinition | CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | BulletListDefinition | OrderedListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BulletListDefinition | CodeBlockWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type ListItemLegacyNode = PMNode & ListItemLegacyDefinition;
 export declare const listItemLegacy: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ListItemLegacyNode>) => import("prosemirror-model").NodeSpec;
@@ -393,7 +406,7 @@ export interface MediaNodeAttributes1 {
 }
 export interface MediaDefinition {
     type: 'media';
-    marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AnnotationMark | BorderMark | LinkMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: MediaNodeAttributes0 | MediaNodeAttributes1;
 }
 export type MediaNode = PMNode & MediaDefinition;
@@ -401,13 +414,13 @@ export declare const media: ({ parseDOM, toDOM, toDebugString }: import("@atlask
 export interface MediaGroupDefinition {
     type: 'mediaGroup';
     content: Array<MediaDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type MediaGroupNode = PMNode & MediaGroupDefinition;
 export declare const mediaGroup: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaGroupNode>) => import("prosemirror-model").NodeSpec;
 export interface MediaInlineDefinition {
     type: 'mediaInline';
-    marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AnnotationMark | BorderMark | LinkMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         type?: 'link' | 'file' | 'image';
         url?: string;
@@ -440,7 +453,7 @@ export interface MediaSingleNodeAttributes1 {
 }
 export interface MediaSingleDefinition {
     type: 'mediaSingle';
-    marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<LinkMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: MediaSingleNodeAttributes0 | MediaSingleNodeAttributes1;
 }
 export type MediaSingleNode = PMNode & MediaSingleDefinition;
@@ -457,7 +470,7 @@ export interface MediaSingleCaptionNodeAttributes1 {
 }
 export interface MediaSingleCaptionDefinition {
     type: 'mediaSingle';
-    content: Array<MediaDefinition | UnsupportedBlockDefinition | CaptionDefinition | UnsupportedBlockDefinition>;
+    content: Array<CaptionDefinition | MediaDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     attrs: MediaSingleCaptionNodeAttributes0 | MediaSingleCaptionNodeAttributes1;
 }
 export type MediaSingleCaptionNode = PMNode & MediaSingleCaptionDefinition;
@@ -498,7 +511,7 @@ export type MediaSingleWidthTypeNode = PMNode & MediaSingleWidthTypeDefinition;
 export declare const mediaSingleWidthType: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleWidthTypeNode>) => import("prosemirror-model").NodeSpec;
 export interface MentionDefinition {
     type: 'mention';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark | AnnotationMark>;
+    marks: Array<AnnotationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         id: string;
         localId?: string;
@@ -512,7 +525,7 @@ export declare const mention: ({ parseDOM, toDOM, toDebugString }: import("@atla
 export interface MultiBodiedExtensionDefinition {
     type: 'multiBodiedExtension';
     content: Array<ExtensionFrameDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -526,8 +539,8 @@ export type MultiBodiedExtensionNode = PMNode & MultiBodiedExtensionDefinition;
 export declare const multiBodiedExtension: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MultiBodiedExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface NestedExpandDefinition {
     type: 'nestedExpand';
-    content: Array<CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
@@ -547,7 +560,7 @@ export declare const nestedExpandWithNoMarks: ({ parseDOM, toDOM, toDebugString
 export interface OrderedListDefinition {
     type: 'orderedList';
     content: Array<ListItemDefinition | ListItemLegacyDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         order?: number;
     };
@@ -556,8 +569,8 @@ export type OrderedListNode = PMNode & OrderedListDefinition;
 export declare const orderedList: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<OrderedListNode>) => import("prosemirror-model").NodeSpec;
 export interface PanelDefinition {
     type: 'panel';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         panelType: 'info' | 'note' | 'tip' | 'warning' | 'error' | 'success' | 'custom';
         panelIcon?: string;
@@ -570,8 +583,8 @@ export type PanelNode = PMNode & PanelDefinition;
 export declare const panel: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<PanelNode>) => import("prosemirror-model").NodeSpec;
 export interface PanelLegacyDefinition {
     type: 'panel';
-    content: Array<BlockCardDefinition | ParagraphWithNoMarksDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BulletListDefinition | HeadingWithNoMarksDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         panelType: 'info' | 'note' | 'tip' | 'warning' | 'error' | 'success' | 'custom';
         panelIcon?: string;
@@ -585,7 +598,7 @@ export declare const panelLegacy: ({ parseDOM, toDOM, toDebugString }: import("@
 export interface ParagraphDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
     };
@@ -594,7 +607,7 @@ export type ParagraphNode = PMNode & ParagraphDefinition;
 export declare const paragraph: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphNode>) => import("prosemirror-model").NodeSpec;
 export interface ParagraphWithAlignmentDefinition {
     type: 'paragraph';
-    marks: Array<AlignmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AlignmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
     };
@@ -603,7 +616,7 @@ export type ParagraphWithAlignmentNode = PMNode & ParagraphWithAlignmentDefiniti
 export declare const paragraphWithAlignment: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithAlignmentNode>) => import("prosemirror-model").NodeSpec;
 export interface ParagraphWithIndentationDefinition {
     type: 'paragraph';
-    marks: Array<IndentationMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<IndentationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
     };
@@ -620,7 +633,7 @@ export type ParagraphWithNoMarksNode = PMNode & ParagraphWithNoMarksDefinition;
 export declare const paragraphWithNoMarks: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface PlaceholderDefinition {
     type: 'placeholder';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         text: string;
     };
@@ -634,7 +647,7 @@ export type RuleNode = PMNode & RuleDefinition;
 export declare const rule: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<RuleNode>) => import("prosemirror-model").NodeSpec;
 export interface StatusDefinition {
     type: 'status';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark | AnnotationMark>;
+    marks: Array<AnnotationMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         text: string;
         color: 'neutral' | 'purple' | 'blue' | 'red' | 'yellow' | 'green';
@@ -647,7 +660,7 @@ export declare const status: ({ parseDOM, toDOM, toDebugString }: import("@atlas
 export interface TableDefinition {
     type: 'table';
     content: Array<TableRowDefinition>;
-    marks: Array<FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         displayMode?: 'default' | 'fixed';
         isNumberColumnEnabled?: boolean;
@@ -661,8 +674,8 @@ export type TableNode = PMNode & TableDefinition;
 export declare const table: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TableNode>) => import("prosemirror-model").NodeSpec;
 export interface TableCellDefinition {
     type: 'tableCell';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | ParagraphWithAlignmentDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | NestedExpandWithNoMarksDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         colspan?: number;
         rowspan?: number;
@@ -674,8 +687,8 @@ export type TableCellNode = PMNode & TableCellDefinition;
 export declare const tableCell: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TableCellNode>) => import("prosemirror-model").NodeSpec;
 export interface TableHeaderDefinition {
     type: 'tableHeader';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | ParagraphWithAlignmentDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         colspan?: number;
         rowspan?: number;
@@ -688,14 +701,14 @@ export declare const tableHeader: ({ parseDOM, toDOM, toDebugString }: import("@
 export interface TableRowDefinition {
     type: 'tableRow';
     content: Array<TableCellDefinition | TableHeaderDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type TableRowNode = PMNode & TableRowDefinition;
 export declare const tableRow: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TableRowNode>) => import("prosemirror-model").NodeSpec;
 export interface TaskItemDefinition {
     type: 'taskItem';
     content: Array<InlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId: string;
         state: 'TODO' | 'DONE';
@@ -705,8 +718,8 @@ export type TaskItemNode = PMNode & TaskItemDefinition;
 export declare const taskItem: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TaskItemNode>) => import("prosemirror-model").NodeSpec;
 export interface TaskListDefinition {
     type: 'taskList';
-    content: Array<TaskItemDefinition | UnsupportedBlockDefinition | TaskItemDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    content: Array<TaskItemDefinition | TaskItemDefinition | TaskListDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId: string;
     };
@@ -720,13 +733,13 @@ export type TextNode = PMNode & TextDefinition;
 export declare const text: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TextNode>) => import("prosemirror-model").NodeSpec;
 export interface TextCodeInlineDefinition {
     type: 'text';
-    marks: Array<CodeMark | LinkMark | AnnotationMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AnnotationMark | CodeMark | LinkMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type TextCodeInlineNode = PMNode & TextCodeInlineDefinition;
 export declare const textCodeInline: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TextCodeInlineNode>) => import("prosemirror-model").NodeSpec;
 export interface TextFormattedDefinition {
     type: 'text';
-    marks: Array<LinkMark | EmMark | StrongMark | StrikeMark | SubsupMark | UnderlineMark | TextColorMark | AnnotationMark | BackgroundColorMark | TypeAheadQueryMark | ConfluenceInlineCommentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<AnnotationMark | BackgroundColorMark | ConfluenceInlineCommentMark | EmMark | LinkMark | StrikeMark | StrongMark | SubsupMark | TextColorMark | TypeAheadQueryMark | UnderlineMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type TextFormattedNode = PMNode & TextFormattedDefinition;
 export declare const textFormatted: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TextFormattedNode>) => import("prosemirror-model").NodeSpec;

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

@@ -0,0 +1,2 @@
+export declare const tableCellContentPseudoGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec;
+export declare const tableHeaderContentPseudoGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec;

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

@@ -0,0 +1,40 @@
+export declare const tableCellContent: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    contentMinItems?: number;
+    contentMaxItems?: number;
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    allowAnyChildMark?: boolean;
+    allowNoChildMark?: boolean;
+    noMarks?: boolean;
+    hasEmptyMarks?: boolean;
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+    tableRole?: "table" | "row" | "cell" | "header_cell";
+    DANGEROUS_MANUAL_OVERRIDE?: {
+        'pm-spec'?: {
+            [x: string]: {
+                value: any;
+                reason: string;
+            };
+        };
+        'validator-spec'?: {
+            [x: string]: {
+                value: any;
+                reason: string;
+            };
+        };
+    };
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.21",
+  "version": "37.1.23",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.25.0",
+    "@atlaskit/adf-schema-generator": "^1.25.2",
     "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",

package/schema-generators/__tests__/unit/json-full-schema-backwards-compat.unit.ts

@@ -1,10 +1,6 @@
 import { validateSchemaCompatibility } from 'json-schema-diff-validator';
 import { adfToJSON } from '@atlaskit/adf-schema-generator';
 import adfNode from '@atlaskit/adf-schema/src/next-schema/full-schema.adf';
-import {
-  tableCellNodeContent,
-  tableHeaderNodeContent,
-} from './__fixtures__/index.fixture';
 
 declare let expect: any;
 expect.extend({
@@ -45,23 +41,9 @@ expect.extend({
 function transformFullFixtureForKnownFailures(json) {
   const definitions = json.definitions;
 
-  delete definitions.bodiedExtension_node;
-  delete definitions.codeBlock_node;
-  delete definitions.expand_node;
-  delete definitions.extension_node;
-  delete definitions.inlineExtension_node;
-  delete definitions.layoutSection_node;
-  delete definitions.mediaSingle_node;
   delete definitions.nestedExpand_content;
   delete definitions.nestedExpand_node;
   delete definitions.nestedExpand_with_no_marks_node;
-  delete definitions.non_nestable_block_content;
-  delete definitions.table_cell_content;
-  delete definitions.mediaInline_node.properties.attrs.properties.data;
-
-  // New JSON, different to the old JSON schema
-  definitions.table_cell_node.properties.content = tableCellNodeContent;
-  definitions.table_header_node.properties.content = tableHeaderNodeContent;
 
   return json;
 }