@atlaskit/adf-schema 45.1.0 → 46.0.0

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

@@ -7,8 +7,7 @@ import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentG
 export var expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
-  marks: [unsupportedMark, unsupportedNodeAttribute],
-  hasEmptyMarks: true,
+  noMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -33,13 +32,8 @@ export var expand = adfNode('expand').define({
 }).variant('without_nested_expand', {
   content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema', 'validator-spec']
-}).variant('with_breakout_mark', {
+}).variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: ['pm-spec']
-}).variant('with_no_mark', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
+  noMarks: false,
+  noExtend: true
 });

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

@@ -15,6 +15,9 @@ import { confluenceInlineComment } from '../marks/confluenceInlineComment';
 export var text = adfNode('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [link],
   ignore: ['pm-spec', 'json-schema']

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

@@ -12,7 +12,7 @@ import { expandWithoutNestedExpand as expandWithoutNestedExpandFactory, expand a
  */
 
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
 
 function getExpandAttrs(domNode) {

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

@@ -49,7 +49,7 @@ export var backgroundColor = {
     }
   }
 };
-export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export var blockCard = {
   props: {
     type: {
@@ -285,16 +285,7 @@ export var codeBlock = {
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -421,7 +412,7 @@ export var doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only']],
       allowUnsupportedBlock: true
     }
   }
@@ -515,15 +506,10 @@ export var expand = {
       items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      items: [],
-      optional: true
     }
   }
 };
-export var expand_with_breakout_mark = ['expand', {
+export var expand_root_only = ['expand', {
   props: {
     marks: {
       type: 'array',
@@ -532,16 +518,6 @@ export var expand_with_breakout_mark = ['expand', {
     }
   }
 }];
-export var expand_with_no_mark = ['expand', {
-  props: {
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 export var extension = {
   props: {
     type: {
@@ -1723,6 +1699,16 @@ export var text_link_inline = ['text', {
     }
   }
 }];
+export var text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 export var textColor = {
   props: {
     type: {

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

@@ -133,7 +133,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -507,21 +507,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -555,21 +541,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -754,16 +726,16 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
               },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -860,7 +832,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -889,41 +862,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",
@@ -2532,6 +2508,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

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

@@ -136,7 +136,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -517,21 +517,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -565,21 +551,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -773,10 +745,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
@@ -789,6 +758,9 @@
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -891,7 +863,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -920,41 +893,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",
@@ -2901,6 +2877,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

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, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, 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, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TableWithNestedTableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | 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 | PanelWithNestedBlockquoteStage0Definition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TableWithNestedTableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | 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 | PanelWithNestedBlockquoteStage0Definition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | 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 | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

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

@@ -91,7 +91,7 @@ export type CaptionNode = PMNode & CaptionDefinition;
 export declare const caption: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<CaptionNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockDefinition {
     type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
+    content: Array<TextWithNoMarksDefinition | UnsupportedInlineDefinition>;
     attrs: {
         language?: string;
         uniqueId?: string;
@@ -101,7 +101,7 @@ export type CodeBlockNode = PMNode & CodeBlockDefinition;
 export declare const codeBlock: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<CodeBlockNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockRootOnlyDefinition {
     type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
+    content: Array<TextWithNoMarksDefinition | UnsupportedInlineDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         language?: string;
@@ -179,7 +179,7 @@ export type DecisionListNode = PMNode & DecisionListDefinition;
 export declare const decisionList: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<DecisionListNode>) => import("prosemirror-model").NodeSpec;
 export interface DocDefinition {
     type: 'doc';
-    content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
+    content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | ExpandRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
 }
 export type DocNode = PMNode & DocDefinition;
 export declare const doc: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<DocNode>) => import("prosemirror-model").NodeSpec;
@@ -221,7 +221,6 @@ export declare const emojiStage0: ({ parseDOM, toDOM, toDebugString }: import(".
 export interface ExpandDefinition {
     type: 'expand';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
@@ -229,19 +228,20 @@ 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 ExpandWithNoMarkDefinition {
+export interface ExpandRootOnlyDefinition {
     type: 'expand';
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    marks: Array<BreakoutMark | 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 ExpandRootOnlyNode = PMNode & ExpandRootOnlyDefinition;
+export declare const expandRootOnly: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandRootOnlyNode>) => import("prosemirror-model").NodeSpec;
 export interface ExpandWithoutNestedExpandDefinition {
     type: 'expand';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         title?: string;
         __expanded?: boolean;
@@ -880,6 +880,11 @@ export interface TextFormattedDefinition {
 }
 export type TextFormattedNode = PMNode & TextFormattedDefinition;
 export declare const textFormatted: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<TextFormattedNode>) => import("prosemirror-model").NodeSpec;
+export interface TextWithNoMarksDefinition {
+    type: 'text';
+}
+export type TextWithNoMarksNode = PMNode & TextWithNoMarksDefinition;
+export declare const textWithNoMarks: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<TextWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface UnsupportedBlockDefinition {
     type: 'unsupportedBlock';
     attrs: {

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

@@ -5,10 +5,8 @@
  *
  * Has slight differences from the original blockGroup:
  * - no base paragraph
- * - no base codeBlock
  * - no base extension
  * - no base mediaSingle
  * - no base heading
- * - no base expand
  */
 export declare const blockContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

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

@@ -1,13 +1,8 @@
-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 & {
+export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "without_nested_expand", "root_only"], 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")[];
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-    content: any[];
-    ignore: "pm-spec"[];
-} & {
-    content: any[];
-    marks: any[];
-    noMarks: true;
-    ignore: any[];
+    noMarks: false;
+    noExtend: true;
 }>;

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

@@ -1,4 +1,7 @@
-export declare const text: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "link_inline", "formatted", "code_inline"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const text: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_no_marks", "link_inline", "formatted", "code_inline"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+    marks: any[];
+    noMarks: true;
+} & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     ignore: ("pm-spec" | "json-schema")[];
 } & {

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

@@ -1,5 +1,5 @@
 import { CodeBlockWithMarksDefinition as CodeBlockWithMarks } from './code-block';
-import { ExpandWithBreakoutDefinition as ExpandWithBreakout } from './expand';
+import { ExpandRootOnlyDefinition as ExpandRootOnly } from './expand';
 import { LayoutSectionDefinition as LayoutSection } from './layout-section';
 import { ParagraphWithIndentationDefinition } from './paragraph';
 import { BlockContent } from './types/block-content';
@@ -13,6 +13,6 @@ export interface DocNode {
     /**
      * @allowUnsupportedBlock true
      */
-    content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandWithBreakout | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
+    content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandRootOnly | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
 }
 export declare const doc: import("prosemirror-model").NodeSpec;