@atlaskit/adf-schema 45.2.0 → 46.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/cjs/next-schema/full-schema.adf.js +1 -1
  3. package/dist/cjs/next-schema/generated/nodeTypes.js +5 -4
  4. package/dist/cjs/next-schema/groups/blockContentGroup.js +1 -3
  5. package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
  6. package/dist/cjs/next-schema/nodes/expand.js +5 -19
  7. package/dist/cjs/schema/nodes/expand.js +1 -1
  8. package/dist/cjs/schema/nodes/tableNodes.js +1 -1
  9. package/dist/cjs/validator-schema/generated/validatorSpec.js +6 -20
  10. package/dist/es2019/next-schema/full-schema.adf.js +1 -1
  11. package/dist/es2019/next-schema/generated/nodeTypes.js +4 -3
  12. package/dist/es2019/next-schema/groups/blockContentGroup.js +1 -3
  13. package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
  14. package/dist/es2019/next-schema/nodes/expand.js +5 -19
  15. package/dist/es2019/schema/nodes/expand.js +1 -1
  16. package/dist/es2019/schema/nodes/tableNodes.js +1 -1
  17. package/dist/es2019/validator-schema/generated/validatorSpec.js +5 -19
  18. package/dist/esm/next-schema/full-schema.adf.js +1 -1
  19. package/dist/esm/next-schema/generated/nodeTypes.js +4 -3
  20. package/dist/esm/next-schema/groups/blockContentGroup.js +1 -3
  21. package/dist/esm/next-schema/groups/blockGroup.js +1 -1
  22. package/dist/esm/next-schema/nodes/expand.js +5 -19
  23. package/dist/esm/schema/nodes/expand.js +1 -1
  24. package/dist/esm/schema/nodes/tableNodes.js +1 -1
  25. package/dist/esm/validator-schema/generated/validatorSpec.js +5 -19
  26. package/dist/json-schema/v1/full.json +40 -39
  27. package/dist/json-schema/v1/stage-0.json +40 -39
  28. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
  29. package/dist/types/next-schema/generated/nodeTypes.d.ts +6 -6
  30. package/dist/types/next-schema/groups/blockContentGroup.d.ts +0 -2
  31. package/dist/types/next-schema/nodes/expand.d.ts +3 -8
  32. package/dist/types/schema/nodes/doc.d.ts +2 -2
  33. package/dist/types/schema/nodes/expand.d.ts +2 -3
  34. package/dist/types/validator-schema/generated/validatorSpec.d.ts +2 -16
  35. package/json-schema/v1/full.json +40 -39
  36. package/json-schema/v1/stage-0.json +40 -39
  37. package/package.json +2 -2
@@ -133,7 +133,7 @@
133
133
  "$ref": "#/definitions/table_node"
134
134
  },
135
135
  {
136
- "$ref": "#/definitions/expand_with_no_mark_node"
136
+ "$ref": "#/definitions/expand_node"
137
137
  },
138
138
  {
139
139
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -726,16 +726,16 @@
726
726
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
727
727
  },
728
728
  {
729
- "$ref": "#/definitions/expand_with_no_mark_node"
730
- },
731
- {
732
- "$ref": "#/definitions/expand_with_breakout_mark_node"
729
+ "$ref": "#/definitions/expand_node"
733
730
  },
734
731
  {
735
732
  "$ref": "#/definitions/codeBlock_root_only_node"
736
733
  },
737
734
  {
738
735
  "$ref": "#/definitions/layoutSection_full_node"
736
+ },
737
+ {
738
+ "$ref": "#/definitions/expand_root_only_node"
739
739
  }
740
740
  ]
741
741
  }
@@ -832,7 +832,8 @@
832
832
  "enum": ["expand"]
833
833
  },
834
834
  "marks": {
835
- "type": "array"
835
+ "type": "array",
836
+ "maxItems": 0
836
837
  },
837
838
  "attrs": {
838
839
  "type": "object",
@@ -859,43 +860,46 @@
859
860
  }
860
861
  },
861
862
  "additionalProperties": false,
862
- "required": ["type", "content", "attrs"]
863
+ "required": ["type", "content"]
863
864
  },
864
- "expand_with_breakout_mark_node": {
865
- "allOf": [
866
- {
867
- "$ref": "#/definitions/expand_node"
865
+ "expand_root_only_node": {
866
+ "type": "object",
867
+ "properties": {
868
+ "type": {
869
+ "enum": ["expand"]
868
870
  },
869
- {
871
+ "marks": {
872
+ "type": "array",
873
+ "items": {
874
+ "$ref": "#/definitions/breakout_mark"
875
+ }
876
+ },
877
+ "attrs": {
870
878
  "type": "object",
871
879
  "properties": {
872
- "marks": {
873
- "type": "array",
874
- "items": {
875
- "$ref": "#/definitions/breakout_mark"
876
- }
880
+ "title": {
881
+ "type": "string"
877
882
  }
878
883
  },
879
- "additionalProperties": true
880
- }
881
- ]
882
- },
883
- "expand_with_no_mark_node": {
884
- "allOf": [
885
- {
886
- "$ref": "#/definitions/expand_node"
884
+ "additionalProperties": false
887
885
  },
888
- {
889
- "type": "object",
890
- "properties": {
891
- "marks": {
892
- "type": "array",
893
- "maxItems": 0
894
- }
886
+ "content": {
887
+ "type": "array",
888
+ "items": {
889
+ "anyOf": [
890
+ {
891
+ "$ref": "#/definitions/non_nestable_block_content"
892
+ },
893
+ {
894
+ "$ref": "#/definitions/nestedExpand_with_no_marks_node"
895
+ }
896
+ ]
895
897
  },
896
- "additionalProperties": true
898
+ "minItems": 1
897
899
  }
898
- ]
900
+ },
901
+ "additionalProperties": false,
902
+ "required": ["type", "content"]
899
903
  },
900
904
  "extension_node": {
901
905
  "type": "object",
@@ -1344,13 +1348,10 @@
1344
1348
  },
1345
1349
  "minItems": 2,
1346
1350
  "maxItems": 3
1347
- },
1348
- "type": {
1349
- "enum": ["layoutSection"]
1350
1351
  }
1351
1352
  },
1352
- "required": ["type", "content"],
1353
- "additionalProperties": false
1353
+ "required": ["content"],
1354
+ "additionalProperties": true
1354
1355
  }
1355
1356
  ]
1356
1357
  },
@@ -136,7 +136,7 @@
136
136
  "$ref": "#/definitions/table_node"
137
137
  },
138
138
  {
139
- "$ref": "#/definitions/expand_with_no_mark_node"
139
+ "$ref": "#/definitions/expand_node"
140
140
  },
141
141
  {
142
142
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -745,10 +745,7 @@
745
745
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
746
746
  },
747
747
  {
748
- "$ref": "#/definitions/expand_with_no_mark_node"
749
- },
750
- {
751
- "$ref": "#/definitions/expand_with_breakout_mark_node"
748
+ "$ref": "#/definitions/expand_node"
752
749
  },
753
750
  {
754
751
  "$ref": "#/definitions/codeBlock_root_only_node"
@@ -761,6 +758,9 @@
761
758
  },
762
759
  {
763
760
  "$ref": "#/definitions/multiBodiedExtension_node"
761
+ },
762
+ {
763
+ "$ref": "#/definitions/expand_root_only_node"
764
764
  }
765
765
  ]
766
766
  }
@@ -863,7 +863,8 @@
863
863
  "enum": ["expand"]
864
864
  },
865
865
  "marks": {
866
- "type": "array"
866
+ "type": "array",
867
+ "maxItems": 0
867
868
  },
868
869
  "attrs": {
869
870
  "type": "object",
@@ -890,43 +891,46 @@
890
891
  }
891
892
  },
892
893
  "additionalProperties": false,
893
- "required": ["type", "content", "attrs"]
894
+ "required": ["type", "content"]
894
895
  },
895
- "expand_with_breakout_mark_node": {
896
- "allOf": [
897
- {
898
- "$ref": "#/definitions/expand_node"
896
+ "expand_root_only_node": {
897
+ "type": "object",
898
+ "properties": {
899
+ "type": {
900
+ "enum": ["expand"]
899
901
  },
900
- {
902
+ "marks": {
903
+ "type": "array",
904
+ "items": {
905
+ "$ref": "#/definitions/breakout_mark"
906
+ }
907
+ },
908
+ "attrs": {
901
909
  "type": "object",
902
910
  "properties": {
903
- "marks": {
904
- "type": "array",
905
- "items": {
906
- "$ref": "#/definitions/breakout_mark"
907
- }
911
+ "title": {
912
+ "type": "string"
908
913
  }
909
914
  },
910
- "additionalProperties": true
911
- }
912
- ]
913
- },
914
- "expand_with_no_mark_node": {
915
- "allOf": [
916
- {
917
- "$ref": "#/definitions/expand_node"
915
+ "additionalProperties": false
918
916
  },
919
- {
920
- "type": "object",
921
- "properties": {
922
- "marks": {
923
- "type": "array",
924
- "maxItems": 0
925
- }
917
+ "content": {
918
+ "type": "array",
919
+ "items": {
920
+ "anyOf": [
921
+ {
922
+ "$ref": "#/definitions/non_nestable_block_content"
923
+ },
924
+ {
925
+ "$ref": "#/definitions/nestedExpand_with_no_marks_node"
926
+ }
927
+ ]
926
928
  },
927
- "additionalProperties": true
929
+ "minItems": 1
928
930
  }
929
- ]
931
+ },
932
+ "additionalProperties": false,
933
+ "required": ["type", "content"]
930
934
  },
931
935
  "extension_node": {
932
936
  "type": "object",
@@ -1466,13 +1470,10 @@
1466
1470
  },
1467
1471
  "minItems": 2,
1468
1472
  "maxItems": 3
1469
- },
1470
- "type": {
1471
- "enum": ["layoutSection"]
1472
1473
  }
1473
1474
  },
1474
- "required": ["type", "content"],
1475
- "additionalProperties": false
1475
+ "required": ["content"],
1476
+ "additionalProperties": true
1476
1477
  }
1477
1478
  ]
1478
1479
  },
@@ -3,8 +3,8 @@
3
3
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
4
4
  * and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
5
5
  */
6
- 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';
7
- 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>;
6
+ 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';
7
+ 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>;
8
8
  export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
9
9
  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>;
10
10
  export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;
@@ -179,7 +179,7 @@ export type DecisionListNode = PMNode & DecisionListDefinition;
179
179
  export declare const decisionList: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<DecisionListNode>) => import("prosemirror-model").NodeSpec;
180
180
  export interface DocDefinition {
181
181
  type: 'doc';
182
- content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
182
+ content: Array<BlockDefinition | BlockRootOnlyDefinition | CodeBlockRootOnlyDefinition | ExpandRootOnlyDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition>;
183
183
  }
184
184
  export type DocNode = PMNode & DocDefinition;
185
185
  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(".
221
221
  export interface ExpandDefinition {
222
222
  type: 'expand';
223
223
  content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
224
- marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
225
224
  attrs: {
226
225
  title?: string;
227
226
  __expanded?: boolean;
@@ -229,19 +228,20 @@ export interface ExpandDefinition {
229
228
  }
230
229
  export type ExpandNode = PMNode & ExpandDefinition;
231
230
  export declare const expand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandNode>) => import("prosemirror-model").NodeSpec;
232
- export interface ExpandWithNoMarkDefinition {
231
+ export interface ExpandRootOnlyDefinition {
233
232
  type: 'expand';
233
+ content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
234
+ marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
234
235
  attrs: {
235
236
  title?: string;
236
237
  __expanded?: boolean;
237
238
  };
238
239
  }
239
- export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
240
- export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
240
+ export type ExpandRootOnlyNode = PMNode & ExpandRootOnlyDefinition;
241
+ export declare const expandRootOnly: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandRootOnlyNode>) => import("prosemirror-model").NodeSpec;
241
242
  export interface ExpandWithoutNestedExpandDefinition {
242
243
  type: 'expand';
243
244
  content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
244
- marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
245
245
  attrs: {
246
246
  title?: string;
247
247
  __expanded?: boolean;
@@ -5,10 +5,8 @@
5
5
  *
6
6
  * Has slight differences from the original blockGroup:
7
7
  * - no base paragraph
8
- * - no base codeBlock
9
8
  * - no base extension
10
9
  * - no base mediaSingle
11
10
  * - no base heading
12
- * - no base expand
13
11
  */
14
12
  export declare const blockContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
@@ -1,13 +1,8 @@
1
- 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 & {
1
+ 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 & {
2
2
  content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
3
3
  ignore: ("json-schema" | "validator-spec")[];
4
4
  } & {
5
5
  marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
6
- content: any[];
7
- ignore: "pm-spec"[];
8
- } & {
9
- content: any[];
10
- marks: any[];
11
- noMarks: true;
12
- ignore: any[];
6
+ noMarks: false;
7
+ noExtend: true;
13
8
  }>;
@@ -1,5 +1,5 @@
1
1
  import { CodeBlockWithMarksDefinition as CodeBlockWithMarks } from './code-block';
2
- import { ExpandWithBreakoutDefinition as ExpandWithBreakout } from './expand';
2
+ import { ExpandRootOnlyDefinition as ExpandRootOnly } from './expand';
3
3
  import { LayoutSectionDefinition as LayoutSection } from './layout-section';
4
4
  import { ParagraphWithIndentationDefinition } from './paragraph';
5
5
  import { BlockContent } from './types/block-content';
@@ -13,6 +13,6 @@ export interface DocNode {
13
13
  /**
14
14
  * @allowUnsupportedBlock true
15
15
  */
16
- content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandWithBreakout | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
16
+ content: Array<BlockContent | LayoutSection | CodeBlockWithMarks | ExpandRootOnly | ParagraphWithIndentationDefinition | MultiBodiedExtension>;
17
17
  }
18
18
  export declare const doc: import("prosemirror-model").NodeSpec;
@@ -17,16 +17,15 @@ export interface ExpandBaseDefinition {
17
17
  * @allowUnsupportedBlock true
18
18
  */
19
19
  content: Array<NonNestableBlockContent | NestedExpandDefinition>;
20
- marks?: Array<any>;
21
20
  }
22
21
  /**
23
22
  * @name expand_with_no_mark_node
24
23
  */
25
24
  export type ExpandDefinition = ExpandBaseDefinition & NoMark;
26
25
  /**
27
- * @name expand_with_breakout_mark_node
26
+ * @name expand_root_only_node
28
27
  */
29
- export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
28
+ export type ExpandRootOnlyDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
30
29
  export declare const expand: import("prosemirror-model").NodeSpec;
31
30
  export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
32
31
  export declare const toJSON: (node: PMNode) => {
@@ -510,6 +510,7 @@ export declare const expand: {
510
510
  optional: boolean;
511
511
  };
512
512
  };
513
+ optional: boolean;
513
514
  };
514
515
  content: {
515
516
  type: string;
@@ -517,14 +518,9 @@ export declare const expand: {
517
518
  minItems: number;
518
519
  allowUnsupportedBlock: boolean;
519
520
  };
520
- marks: {
521
- type: string;
522
- items: any[];
523
- optional: boolean;
524
- };
525
521
  };
526
522
  };
527
- export declare const expand_with_breakout_mark: (string | {
523
+ export declare const expand_root_only: (string | {
528
524
  props: {
529
525
  marks: {
530
526
  type: string;
@@ -533,16 +529,6 @@ export declare const expand_with_breakout_mark: (string | {
533
529
  };
534
530
  };
535
531
  })[];
536
- export declare const expand_with_no_mark: (string | {
537
- props: {
538
- marks: {
539
- type: string;
540
- maxItems: number;
541
- items: any[];
542
- optional: boolean;
543
- };
544
- };
545
- })[];
546
532
  export declare const extension: {
547
533
  props: {
548
534
  type: {
@@ -133,7 +133,7 @@
133
133
  "$ref": "#/definitions/table_node"
134
134
  },
135
135
  {
136
- "$ref": "#/definitions/expand_with_no_mark_node"
136
+ "$ref": "#/definitions/expand_node"
137
137
  },
138
138
  {
139
139
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -726,16 +726,16 @@
726
726
  "$ref": "#/definitions/bodiedExtension_with_marks_node"
727
727
  },
728
728
  {
729
- "$ref": "#/definitions/expand_with_no_mark_node"
730
- },
731
- {
732
- "$ref": "#/definitions/expand_with_breakout_mark_node"
729
+ "$ref": "#/definitions/expand_node"
733
730
  },
734
731
  {
735
732
  "$ref": "#/definitions/codeBlock_root_only_node"
736
733
  },
737
734
  {
738
735
  "$ref": "#/definitions/layoutSection_full_node"
736
+ },
737
+ {
738
+ "$ref": "#/definitions/expand_root_only_node"
739
739
  }
740
740
  ]
741
741
  }
@@ -832,7 +832,8 @@
832
832
  "enum": ["expand"]
833
833
  },
834
834
  "marks": {
835
- "type": "array"
835
+ "type": "array",
836
+ "maxItems": 0
836
837
  },
837
838
  "attrs": {
838
839
  "type": "object",
@@ -859,43 +860,46 @@
859
860
  }
860
861
  },
861
862
  "additionalProperties": false,
862
- "required": ["type", "content", "attrs"]
863
+ "required": ["type", "content"]
863
864
  },
864
- "expand_with_breakout_mark_node": {
865
- "allOf": [
866
- {
867
- "$ref": "#/definitions/expand_node"
865
+ "expand_root_only_node": {
866
+ "type": "object",
867
+ "properties": {
868
+ "type": {
869
+ "enum": ["expand"]
868
870
  },
869
- {
871
+ "marks": {
872
+ "type": "array",
873
+ "items": {
874
+ "$ref": "#/definitions/breakout_mark"
875
+ }
876
+ },
877
+ "attrs": {
870
878
  "type": "object",
871
879
  "properties": {
872
- "marks": {
873
- "type": "array",
874
- "items": {
875
- "$ref": "#/definitions/breakout_mark"
876
- }
880
+ "title": {
881
+ "type": "string"
877
882
  }
878
883
  },
879
- "additionalProperties": true
880
- }
881
- ]
882
- },
883
- "expand_with_no_mark_node": {
884
- "allOf": [
885
- {
886
- "$ref": "#/definitions/expand_node"
884
+ "additionalProperties": false
887
885
  },
888
- {
889
- "type": "object",
890
- "properties": {
891
- "marks": {
892
- "type": "array",
893
- "maxItems": 0
894
- }
886
+ "content": {
887
+ "type": "array",
888
+ "items": {
889
+ "anyOf": [
890
+ {
891
+ "$ref": "#/definitions/non_nestable_block_content"
892
+ },
893
+ {
894
+ "$ref": "#/definitions/nestedExpand_with_no_marks_node"
895
+ }
896
+ ]
895
897
  },
896
- "additionalProperties": true
898
+ "minItems": 1
897
899
  }
898
- ]
900
+ },
901
+ "additionalProperties": false,
902
+ "required": ["type", "content"]
899
903
  },
900
904
  "extension_node": {
901
905
  "type": "object",
@@ -1344,13 +1348,10 @@
1344
1348
  },
1345
1349
  "minItems": 2,
1346
1350
  "maxItems": 3
1347
- },
1348
- "type": {
1349
- "enum": ["layoutSection"]
1350
1351
  }
1351
1352
  },
1352
- "required": ["type", "content"],
1353
- "additionalProperties": false
1353
+ "required": ["content"],
1354
+ "additionalProperties": true
1354
1355
  }
1355
1356
  ]
1356
1357
  },