@atlaskit/adf-schema 36.14.0 → 36.14.1

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

@@ -2,6 +2,7 @@ import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from '../groups/blockGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
 export var layoutColumn = adfNode('layoutColumn').define({
   isolating: true,
   selectable: false,
@@ -14,5 +15,5 @@ export var layoutColumn = adfNode('layoutColumn').define({
       default: undefined
     }
   },
-  content: [$onePlus($or(blockGroup))]
+  content: [$onePlus($or(blockGroup, unsupportedBlock))]
 });

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

@@ -55,8 +55,8 @@ export var media = adfNode('media').define({
         optional: true
       },
       __external: {
-        type: 'number',
-        default: null,
+        type: 'boolean',
+        default: false,
         optional: true
       },
       __fileMimeType: {

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

@@ -6,7 +6,8 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var mediaInline = adfNode('mediaInline').define({
   selectable: true,
-  atom: false,
+  // atom: false,
+  inline: true,
   marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     data: {
@@ -15,23 +16,32 @@ export var mediaInline = adfNode('mediaInline').define({
     type: {
       type: 'enum',
       values: ['link', 'file', 'image'],
-      optional: true
+      optional: true,
+      default: 'file'
+    },
+    url: {
+      type: 'string',
+      default: null
     },
     id: {
       minLength: 1,
-      type: 'string'
+      type: 'string',
+      default: ''
     },
     alt: {
       type: 'string',
+      default: '',
       optional: true
     },
     collection: {
-      type: 'string'
+      type: 'string',
+      default: ''
     },
     occurrenceKey: {
       minLength: 1,
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     width: {
       type: 'number',
@@ -45,32 +55,39 @@ export var mediaInline = adfNode('mediaInline').define({
     },
     __fileName: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __fileSize: {
       type: 'number',
-      optional: true
+      optional: true,
+      default: null
     },
     __fileMimeType: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __displayType: {
       type: 'enum',
       values: ['file', 'thumbnail'],
-      optional: true
+      optional: true,
+      default: null
     },
     __contextId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __mediaTraceId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __external: {
       type: 'boolean',
-      optional: true
+      optional: true,
+      default: false
     }
   }
 });

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

@@ -46,7 +46,8 @@ export var mediaSingle = adfNode('mediaSingle').define({
         default: 'center'
       }
     }]
-  }
+  },
+  content: [$or(media)]
 }).variant('caption', {
   atom: false,
   content: [$or(media, unsupportedBlock), $or(caption, unsupportedBlock)]

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

@@ -12,7 +12,8 @@ export var mention = adfNode('mention').define({
     },
     localId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     text: {
       type: 'string',

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

@@ -3,6 +3,7 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var placeholder = adfNode('placeholder').define({
   selectable: false,
+  inline: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     text: {

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

@@ -6,6 +6,7 @@ import { tableRow } from './tableRow';
 export var table = adfNode('table').define({
   isolating: true,
   selectable: true,
+  tableRole: 'table',
   marks: [fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     displayMode: {

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

@@ -35,12 +35,12 @@ export var tableCell = adfNode('tableCell').define({
     },
     colwidth: {
       type: 'numberList',
-      default: [],
+      default: null,
       optional: true
     },
     background: {
       type: 'string',
-      default: '',
+      default: null,
       optional: true
     }
   },

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

@@ -34,12 +34,12 @@ export var tableHeader = adfNode('tableHeader').define({
     },
     colwidth: {
       type: 'numberList',
-      default: [],
+      default: null,
       optional: true
     },
     background: {
       type: 'string',
-      default: '',
+      default: null,
       optional: true
     }
   },

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

@@ -6,5 +6,6 @@ import { tableHeader } from './tableHeader';
 export var tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(tableCell, tableHeader))]
+  content: [$onePlus($or(tableCell, tableHeader))],
+  tableRole: 'row'
 });

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

@@ -22,17 +22,6 @@ export interface UnsupportedMarkMark extends Mark {
     attrs: UnsupportedMarkMarkAttributes;
 }
 export declare const unsupportedMark: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<UnsupportedMarkMark>) => import("prosemirror-model").MarkSpec;
-export interface BreakoutMarkAttributes {
-    mode: 'wide' | 'full-width';
-}
-export interface BreakoutDefinition {
-    type: 'breakout';
-    attrs: BreakoutMarkAttributes;
-}
-export interface BreakoutMark extends Mark {
-    attrs: BreakoutMarkAttributes;
-}
-export declare const breakout: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BreakoutMark>) => import("prosemirror-model").MarkSpec;
 export interface LinkMarkAttributes {
     href: string;
     title?: string;
@@ -77,17 +66,17 @@ export interface EmDefinition {
     type: 'em';
 }
 export type EmMark = Mark;
-export declare const em: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const em: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface StrongDefinition {
     type: 'strong';
 }
 export type StrongMark = Mark;
-export declare const strong: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const strong: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface StrikeDefinition {
     type: 'strike';
 }
 export type StrikeMark = Mark;
-export declare const strike: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const strike: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface SubsupMarkAttributes {
     type: 'sub' | 'sup';
 }
@@ -103,7 +92,7 @@ export interface UnderlineDefinition {
     type: 'underline';
 }
 export type UnderlineMark = Mark;
-export declare const underline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const underline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface TextColorMarkAttributes {
     color: string;
 }
@@ -130,7 +119,30 @@ export interface CodeDefinition {
     type: 'code';
 }
 export type CodeMark = Mark;
-export declare const code: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const code: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
+export interface DataConsumerMarkAttributes {
+    sources: Array<string>;
+}
+export interface DataConsumerDefinition {
+    type: 'dataConsumer';
+    attrs: DataConsumerMarkAttributes;
+}
+export interface DataConsumerMark extends Mark {
+    attrs: DataConsumerMarkAttributes;
+}
+export declare const dataConsumer: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<DataConsumerMark>) => import("prosemirror-model").MarkSpec;
+export interface FragmentMarkAttributes {
+    localId: string;
+    name?: string;
+}
+export interface FragmentDefinition {
+    type: 'fragment';
+    attrs: FragmentMarkAttributes;
+}
+export interface FragmentMark extends Mark {
+    attrs: FragmentMarkAttributes;
+}
+export declare const fragment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<FragmentMark>) => import("prosemirror-model").MarkSpec;
 export interface AlignmentMarkAttributes {
     align: 'center' | 'end';
 }
@@ -153,26 +165,14 @@ export interface IndentationMark extends Mark {
     attrs: IndentationMarkAttributes;
 }
 export declare const indentation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<IndentationMark>) => import("prosemirror-model").MarkSpec;
-export interface DataConsumerMarkAttributes {
-    sources: Array<string>;
-}
-export interface DataConsumerDefinition {
-    type: 'dataConsumer';
-    attrs: DataConsumerMarkAttributes;
-}
-export interface DataConsumerMark extends Mark {
-    attrs: DataConsumerMarkAttributes;
-}
-export declare const dataConsumer: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<DataConsumerMark>) => import("prosemirror-model").MarkSpec;
-export interface FragmentMarkAttributes {
-    localId: string;
-    name?: string;
+export interface BreakoutMarkAttributes {
+    mode: 'wide' | 'full-width';
 }
-export interface FragmentDefinition {
-    type: 'fragment';
-    attrs: FragmentMarkAttributes;
+export interface BreakoutDefinition {
+    type: 'breakout';
+    attrs: BreakoutMarkAttributes;
 }
-export interface FragmentMark extends Mark {
-    attrs: FragmentMarkAttributes;
+export interface BreakoutMark extends Mark {
+    attrs: BreakoutMarkAttributes;
 }
-export declare const fragment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<FragmentMark>) => import("prosemirror-model").MarkSpec;
+export declare const breakout: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BreakoutMark>) => import("prosemirror-model").MarkSpec;

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

@@ -1,4 +1,4 @@
-import { TextDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, InlineCardDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, InlineExtensionDefinition, MediaInlineDefinition, ConfluenceUnsupportedInlineDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type InlineDefinition = Array<TextDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionDefinition | MediaInlineDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
-import { BlockCardDefinition, CodeBlockDefinition, MediaSingleDefinition, ParagraphDefinition, TaskListDefinition, OrderedListDefinition, BulletListDefinition, BlockquoteDefinition, DecisionListDefinition, EmbedCardDefinition, ExtensionDefinition, HeadingDefinition, MediaGroupDefinition, RuleDefinition, PanelDefinition, TableDefinition, BodiedExtensionDefinition, ExpandDefinition, ConfluenceUnsupportedBlockDefinition, UnsupportedBlockDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | ParagraphDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | TableDefinition | BodiedExtensionDefinition | ExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import { TextDefinition, TextFormattedDefinition, TextCodeInlineDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, InlineCardDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, InlineExtensionWithMarksDefinition, MediaInlineDefinition, ConfluenceUnsupportedInlineDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
+import { BlockCardDefinition, CodeBlockWithNoMarksDefinition, MediaSingleDefinition, MediaSingleCaptionDefinition, MediaSingleFullDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, TaskListDefinition, OrderedListDefinition, BulletListDefinition, BlockquoteWithListDefinition, DecisionListDefinition, EmbedCardDefinition, ExtensionWithMarksDefinition, HeadingDefinition, HeadingWithNoMarksDefinition, MediaGroupDefinition, RuleDefinition, PanelDefinition, TableDefinition, BodiedExtensionWithMarksDefinition, ExpandWithNoMarkDefinition, ConfluenceUnsupportedBlockDefinition, UnsupportedBlockDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteWithListDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | TableDefinition | BodiedExtensionWithMarksDefinition | ExpandWithNoMarkDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;

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

@@ -1,6 +1,6 @@
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { InlineDefinition, BlockDefinition } from './nodeGroupTypes';
-import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, BreakoutMark, LinkMark, AnnotationMark, BorderMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, BackgroundColorMark, CodeMark, AlignmentMark, IndentationMark, DataConsumerMark, FragmentMark } from './markTypes';
+import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, AnnotationMark, BorderMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, BackgroundColorMark, CodeMark, DataConsumerMark, FragmentMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
 export interface BlockCardDefinition {
     type: 'blockCard';
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
@@ -26,26 +26,6 @@ export interface UnsupportedInlineDefinition {
 }
 export type UnsupportedInlineNode = PMNode & UnsupportedInlineDefinition;
 export declare const unsupportedInline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<UnsupportedInlineNode>) => import("prosemirror-model").NodeSpec;
-export interface CodeBlockDefinition {
-    type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        language?: string;
-    };
-}
-export type CodeBlockNode = PMNode & CodeBlockDefinition;
-export declare const codeBlock: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CodeBlockNode>) => import("prosemirror-model").NodeSpec;
-export interface CodeBlockWithMarksDefinition {
-    type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
-    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        language?: string;
-    };
-}
-export type CodeBlockWithMarksNode = PMNode & CodeBlockWithMarksDefinition;
-export declare const codeBlockWithMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CodeBlockWithMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockWithNoMarksDefinition {
     type: 'codeBlock';
     content: Array<TextDefinition | UnsupportedInlineDefinition>;
@@ -56,17 +36,6 @@ export interface CodeBlockWithNoMarksDefinition {
 }
 export type CodeBlockWithNoMarksNode = PMNode & CodeBlockWithNoMarksDefinition;
 export declare const codeBlockWithNoMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CodeBlockWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
-export interface MediaSingleDefinition {
-    type: 'mediaSingle';
-    marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        width?: number;
-        layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
-        widthType?: 'pixel';
-    };
-}
-export type MediaSingleNode = PMNode & MediaSingleDefinition;
-export declare const mediaSingle: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleNode>) => import("prosemirror-model").NodeSpec;
 export interface MediaDefinition {
     type: 'media';
     marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
@@ -80,7 +49,7 @@ export interface MediaDefinition {
         width?: number;
         __contextId?: string;
         __displayType?: string;
-        __external?: number;
+        __external?: boolean;
         __fileMimeType?: string;
         __fileName?: string;
         __fileSize?: string;
@@ -90,6 +59,18 @@ export interface MediaDefinition {
 }
 export type MediaNode = PMNode & MediaDefinition;
 export declare const media: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaNode>) => import("prosemirror-model").NodeSpec;
+export interface MediaSingleDefinition {
+    type: 'mediaSingle';
+    content: Array<MediaDefinition>;
+    marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        width?: number;
+        layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+        widthType?: 'pixel';
+    };
+}
+export type MediaSingleNode = PMNode & MediaSingleDefinition;
+export declare const mediaSingle: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleNode>) => import("prosemirror-model").NodeSpec;
 export interface UnsupportedBlockDefinition {
     type: 'unsupportedBlock';
     attrs: {
@@ -203,6 +184,7 @@ export type MediaSingleCaptionNode = PMNode & MediaSingleCaptionDefinition;
 export declare const mediaSingleCaption: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleCaptionNode>) => import("prosemirror-model").NodeSpec;
 export interface MediaSingleFullDefinition {
     type: 'mediaSingle';
+    content: Array<MediaDefinition>;
     marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         width?: number;
@@ -212,21 +194,9 @@ export interface MediaSingleFullDefinition {
 }
 export type MediaSingleFullNode = PMNode & MediaSingleFullDefinition;
 export declare const mediaSingleFull: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleFullNode>) => import("prosemirror-model").NodeSpec;
-export interface InlineExtensionDefinition {
-    type: 'inlineExtension';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        extensionKey: string;
-        extensionType: string;
-        text?: string;
-        localId?: string;
-    };
-}
-export type InlineExtensionNode = PMNode & InlineExtensionDefinition;
-export declare const inlineExtension: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<InlineExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface InlineExtensionWithMarksDefinition {
     type: 'inlineExtension';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         extensionKey: string;
         extensionType: string;
@@ -241,6 +211,7 @@ export interface MediaInlineDefinition {
     marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         type?: 'link' | 'file' | 'image';
+        url: string;
         id: string;
         alt?: string;
         collection: string;
@@ -266,6 +237,13 @@ export interface ConfluenceUnsupportedInlineDefinition {
 }
 export type ConfluenceUnsupportedInlineNode = PMNode & ConfluenceUnsupportedInlineDefinition;
 export declare const confluenceUnsupportedInline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ConfluenceUnsupportedInlineNode>) => import("prosemirror-model").NodeSpec;
+export interface ParagraphDefinition {
+    type: 'paragraph';
+    content: Array<InlineDefinition | UnsupportedInlineDefinition>;
+    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+}
+export type ParagraphNode = PMNode & ParagraphDefinition;
+export declare const paragraph: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphNode>) => import("prosemirror-model").NodeSpec;
 export interface ParagraphWithAlignmentDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition | UnsupportedInlineDefinition>;
@@ -280,13 +258,6 @@ export interface ParagraphWithIndentationDefinition {
 }
 export type ParagraphWithIndentationNode = PMNode & ParagraphWithIndentationDefinition;
 export declare const paragraphWithIndentation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithIndentationNode>) => import("prosemirror-model").NodeSpec;
-export interface ParagraphWithNoMarksDefinition {
-    type: 'paragraph';
-    content: Array<InlineDefinition | UnsupportedInlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-}
-export type ParagraphWithNoMarksNode = PMNode & ParagraphWithNoMarksDefinition;
-export declare const paragraphWithNoMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface TaskItemDefinition {
     type: 'taskItem';
     content: Array<InlineDefinition | UnsupportedInlineDefinition>;
@@ -308,6 +279,13 @@ export interface TaskListDefinition {
 }
 export type TaskListNode = PMNode & TaskListDefinition;
 export declare const taskList: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TaskListNode>) => import("prosemirror-model").NodeSpec;
+export interface ParagraphWithNoMarksDefinition {
+    type: 'paragraph';
+    content: Array<InlineDefinition | UnsupportedInlineDefinition>;
+    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+}
+export type ParagraphWithNoMarksNode = PMNode & ParagraphWithNoMarksDefinition;
+export declare const paragraphWithNoMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface BulletListDefinition {
     type: 'bulletList';
     content: Array<ListItemDefinition>;
@@ -332,13 +310,13 @@ export interface OrderedListDefinition {
 }
 export type OrderedListNode = PMNode & OrderedListDefinition;
 export declare const orderedList: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<OrderedListNode>) => import("prosemirror-model").NodeSpec;
-export interface BlockquoteDefinition {
+export interface BlockquoteWithListDefinition {
     type: 'blockquote';
-    content: Array<ParagraphWithNoMarksDefinition | BulletListDefinition | OrderedListDefinition | UnsupportedBlockDefinition>;
+    content: Array<ParagraphDefinition | OrderedListDefinition | BulletListDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
 }
-export type BlockquoteNode = PMNode & BlockquoteDefinition;
-export declare const blockquote: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteNode>) => import("prosemirror-model").NodeSpec;
+export type BlockquoteWithListNode = PMNode & BlockquoteWithListDefinition;
+export declare const blockquoteWithList: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteWithListNode>) => import("prosemirror-model").NodeSpec;
 export interface DecisionItemDefinition {
     type: 'decisionItem';
     content: Array<InlineDefinition | UnsupportedBlockDefinition>;
@@ -373,19 +351,6 @@ export interface EmbedCardDefinition {
 }
 export type EmbedCardNode = PMNode & EmbedCardDefinition;
 export declare const embedCard: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<EmbedCardNode>) => import("prosemirror-model").NodeSpec;
-export interface ExtensionDefinition {
-    type: 'extension';
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        extensionKey: string;
-        extensionType: string;
-        text?: string;
-        layout?: 'wide' | 'full-width' | 'default';
-        localId?: string;
-    };
-}
-export type ExtensionNode = PMNode & ExtensionDefinition;
-export declare const extension: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionWithMarksDefinition {
     type: 'extension';
     marks: Array<DataConsumerMark | FragmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
@@ -465,6 +430,13 @@ export interface HeadingWithIndentationDefinition {
 }
 export type HeadingWithIndentationNode = PMNode & HeadingWithIndentationDefinition;
 export declare const headingWithIndentation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<HeadingWithIndentationNode>) => import("prosemirror-model").NodeSpec;
+export interface BlockquoteDefinition {
+    type: 'blockquote';
+    content: Array<ParagraphWithNoMarksDefinition | BulletListDefinition | OrderedListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+}
+export type BlockquoteNode = PMNode & BlockquoteDefinition;
+export declare const blockquote: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteNode>) => import("prosemirror-model").NodeSpec;
 export interface NestedExpandWithNoMarksDefinition {
     type: 'nestedExpand';
     content: Array<CodeBlockWithNoMarksDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | UnsupportedBlockDefinition>;
@@ -524,20 +496,6 @@ export interface TableDefinition {
 }
 export type TableNode = PMNode & TableDefinition;
 export declare const table: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TableNode>) => import("prosemirror-model").NodeSpec;
-export interface BodiedExtensionDefinition {
-    type: 'bodiedExtension';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        extensionKey: string;
-        extensionType: string;
-        text?: string;
-        layout?: 'wide' | 'full-width' | 'default';
-        localId?: string;
-    };
-}
-export type BodiedExtensionNode = PMNode & BodiedExtensionDefinition;
-export declare const bodiedExtension: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BodiedExtensionNode>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionWithMarksDefinition {
     type: 'bodiedExtension';
     content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
@@ -552,28 +510,6 @@ export interface BodiedExtensionWithMarksDefinition {
 }
 export type BodiedExtensionWithMarksNode = PMNode & BodiedExtensionWithMarksDefinition;
 export declare const bodiedExtensionWithMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BodiedExtensionWithMarksNode>) => import("prosemirror-model").NodeSpec;
-export interface ExpandDefinition {
-    type: 'expand';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        title?: string;
-        __expanded?: boolean;
-    };
-}
-export type ExpandNode = PMNode & ExpandDefinition;
-export declare const expand: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExpandNode>) => import("prosemirror-model").NodeSpec;
-export interface ExpandWithBreakoutMarkDefinition {
-    type: 'expand';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
-    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        title?: string;
-        __expanded?: boolean;
-    };
-}
-export type ExpandWithBreakoutMarkNode = PMNode & ExpandWithBreakoutMarkDefinition;
-export declare const expandWithBreakoutMark: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExpandWithBreakoutMarkNode>) => import("prosemirror-model").NodeSpec;
 export interface ExpandWithNoMarkDefinition {
     type: 'expand';
     content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
@@ -595,7 +531,7 @@ export type ConfluenceUnsupportedBlockNode = PMNode & ConfluenceUnsupportedBlock
 export declare const confluenceUnsupportedBlock: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ConfluenceUnsupportedBlockNode>) => import("prosemirror-model").NodeSpec;
 export interface LayoutColumnDefinition {
     type: 'layoutColumn';
-    content: Array<BlockDefinition>;
+    content: Array<BlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         width: number;
@@ -617,27 +553,30 @@ export interface LayoutSectionFullDefinition {
 }
 export type LayoutSectionFullNode = PMNode & LayoutSectionFullDefinition;
 export declare const layoutSectionFull: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<LayoutSectionFullNode>) => 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>;
+export interface ExpandWithBreakoutMarkDefinition {
+    type: 'expand';
+    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
+    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
     };
 }
-export type NestedExpandNode = PMNode & NestedExpandDefinition;
-export declare const nestedExpand: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<NestedExpandNode>) => import("prosemirror-model").NodeSpec;
-export interface ParagraphDefinition {
-    type: 'paragraph';
-    content: Array<InlineDefinition | UnsupportedInlineDefinition>;
-    marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+export type ExpandWithBreakoutMarkNode = PMNode & ExpandWithBreakoutMarkDefinition;
+export declare const expandWithBreakoutMark: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExpandWithBreakoutMarkNode>) => import("prosemirror-model").NodeSpec;
+export interface CodeBlockWithMarksDefinition {
+    type: 'codeBlock';
+    content: Array<TextDefinition | UnsupportedInlineDefinition>;
+    marks: Array<BreakoutMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        language?: string;
+    };
 }
-export type ParagraphNode = PMNode & ParagraphDefinition;
-export declare const paragraph: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphNode>) => import("prosemirror-model").NodeSpec;
+export type CodeBlockWithMarksNode = PMNode & CodeBlockWithMarksDefinition;
+export declare const codeBlockWithMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CodeBlockWithMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface DocDefinition {
     type: 'doc';
-    content: Array<BlockDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | NestedExpandDefinition | ParagraphDefinition | UnsupportedBlockDefinition>;
+    content: Array<BlockDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | ExpandWithBreakoutMarkDefinition | CodeBlockWithNoMarksDefinition | CodeBlockWithMarksDefinition | ParagraphWithIndentationDefinition | UnsupportedBlockDefinition>;
 }
 export type DocNode = PMNode & DocDefinition;
 export declare const doc: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<DocNode>) => import("prosemirror-model").NodeSpec;