@atlaskit/adf-schema 37.1.21 → 37.1.23

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 (47) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/next-schema/generated/nodeTypes.js +23 -1
  3. package/dist/cjs/next-schema/groups/inlineGroup.js +1 -1
  4. package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +32 -0
  5. package/dist/cjs/next-schema/nodes/bodiedExtension.js +1 -2
  6. package/dist/cjs/next-schema/nodes/codeBlock.js +2 -2
  7. package/dist/cjs/next-schema/nodes/expand.js +2 -2
  8. package/dist/cjs/next-schema/nodes/extension.js +1 -2
  9. package/dist/cjs/next-schema/nodes/layoutSection.js +2 -3
  10. package/dist/cjs/next-schema/nodes/mediaSingle.js +0 -1
  11. package/dist/cjs/next-schema/nodes/tableCell.js +2 -17
  12. package/dist/cjs/next-schema/nodes/tableCellContent.js +14 -0
  13. package/dist/cjs/next-schema/nodes/tableHeader.js +2 -16
  14. package/dist/cjs/next-schema/nodes/tableRow.js +2 -1
  15. package/dist/es2019/next-schema/generated/nodeTypes.js +22 -0
  16. package/dist/es2019/next-schema/groups/inlineGroup.js +1 -1
  17. package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +26 -0
  18. package/dist/es2019/next-schema/nodes/bodiedExtension.js +1 -2
  19. package/dist/es2019/next-schema/nodes/codeBlock.js +2 -2
  20. package/dist/es2019/next-schema/nodes/expand.js +2 -2
  21. package/dist/es2019/next-schema/nodes/extension.js +1 -2
  22. package/dist/es2019/next-schema/nodes/layoutSection.js +2 -3
  23. package/dist/es2019/next-schema/nodes/mediaSingle.js +0 -1
  24. package/dist/es2019/next-schema/nodes/tableCell.js +3 -18
  25. package/dist/es2019/next-schema/nodes/tableCellContent.js +9 -0
  26. package/dist/es2019/next-schema/nodes/tableHeader.js +3 -17
  27. package/dist/es2019/next-schema/nodes/tableRow.js +2 -1
  28. package/dist/esm/next-schema/generated/nodeTypes.js +22 -0
  29. package/dist/esm/next-schema/groups/inlineGroup.js +1 -1
  30. package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +26 -0
  31. package/dist/esm/next-schema/nodes/bodiedExtension.js +1 -2
  32. package/dist/esm/next-schema/nodes/codeBlock.js +2 -2
  33. package/dist/esm/next-schema/nodes/expand.js +2 -2
  34. package/dist/esm/next-schema/nodes/extension.js +1 -2
  35. package/dist/esm/next-schema/nodes/layoutSection.js +2 -3
  36. package/dist/esm/next-schema/nodes/mediaSingle.js +0 -1
  37. package/dist/esm/next-schema/nodes/tableCell.js +3 -18
  38. package/dist/esm/next-schema/nodes/tableCellContent.js +9 -0
  39. package/dist/esm/next-schema/nodes/tableHeader.js +3 -17
  40. package/dist/esm/next-schema/nodes/tableRow.js +2 -1
  41. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
  42. package/dist/types/next-schema/generated/nodeTypes.d.ts +79 -66
  43. package/dist/types/next-schema/groups/tableCellContentPseudoGroup.d.ts +2 -0
  44. package/dist/types/next-schema/nodes/tableCellContent.d.ts +40 -0
  45. package/package.json +2 -2
  46. package/schema-generators/__tests__/unit/json-full-schema-backwards-compat.unit.ts +0 -18
  47. package/schema-generators/__tests__/unit/__fixtures__/index.fixture.ts +0 -140
@@ -7,6 +7,7 @@ export var expand = adfNode('expand').define({
7
7
  isolating: true,
8
8
  selectable: true,
9
9
  marks: [unsupportedNodeAttribute, unsupportedMark],
10
+ hasEmptyMarks: true,
10
11
  attrs: {
11
12
  title: {
12
13
  type: 'string',
@@ -19,8 +20,7 @@ export var expand = adfNode('expand').define({
19
20
  optional: true
20
21
  }
21
22
  },
22
- content: [$onePlus($or(nonNestableBlockContentGroup))],
23
- ignore: ['json-schema']
23
+ content: [$onePlus($or(nonNestableBlockContentGroup))]
24
24
  }).variant('with_breakout_mark', {
25
25
  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
26
26
  content: [],
@@ -41,8 +41,7 @@ export var extension = adfNode('extension').define({
41
41
  optional: true,
42
42
  default: null
43
43
  }
44
- },
45
- ignore: ['json-schema']
44
+ }
46
45
  }).variant('with_marks', {
47
46
  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
48
47
  ignore: []
@@ -7,13 +7,12 @@ import { unsupportedBlock } from './unsupportedBlock';
7
7
  export var layoutSection = adfNode('layoutSection').define({
8
8
  isolating: true,
9
9
  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
10
- content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
11
- ignore: ['json-schema'],
10
+ content: [$or(layoutColumn, unsupportedBlock)],
12
11
  DANGEROUS_MANUAL_OVERRIDE: {
13
12
  'pm-spec': {
14
13
  content: {
15
14
  value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
16
- reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL."
15
+ reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
17
16
  }
18
17
  }
19
18
  }
@@ -8,7 +8,6 @@ import { unsupportedBlock } from './unsupportedBlock';
8
8
  export var mediaSingle = adfNode('mediaSingle').define({
9
9
  atom: true,
10
10
  selectable: true,
11
- ignore: ['json-schema'],
12
11
  marks: [link, unsupportedNodeAttribute, unsupportedMark],
13
12
  attrs: {
14
13
  anyOf: [{
@@ -1,22 +1,7 @@
1
- import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
1
+ import { adfNode } from '@atlaskit/adf-schema-generator';
2
2
  import { unsupportedMark } from '../marks/unsupportedMark';
3
3
  import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
4
- import { blockCard } from './blockCard';
5
- import { blockquote } from './blockquote';
6
- import { codeBlock } from './codeBlock';
7
- import { decisionList } from './decisionList';
8
- import { embedCard } from './embedCard';
9
- import { extension } from './extension';
10
- import { heading } from './heading';
11
- import { bulletList, orderedList } from './list';
12
- import { mediaGroup } from './mediaGroup';
13
- import { mediaSingle } from './mediaSingle';
14
- import { nestedExpand } from './nestedExpand';
15
- import { panel } from './panel';
16
- import { paragraph } from './paragraph';
17
- import { rule } from './rule';
18
- import { taskList } from './task';
19
- import { unsupportedBlock } from './unsupportedBlock';
4
+ import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
20
5
  export var tableCell = adfNode('tableCell').define({
21
6
  isolating: true,
22
7
  selectable: false,
@@ -47,5 +32,5 @@ export var tableCell = adfNode('tableCell').define({
47
32
  optional: true
48
33
  }
49
34
  },
50
- content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks'), unsupportedBlock))]
35
+ content: [tableCellContentPseudoGroup]
51
36
  });
@@ -0,0 +1,9 @@
1
+ import { adfNode } from '@atlaskit/adf-schema-generator';
2
+ import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
3
+
4
+ // @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
5
+ // This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
6
+ export var tableCellContent = adfNode('tableCellContent').define({
7
+ ignore: ['pm-spec', 'validator-spec'],
8
+ content: [tableCellContentPseudoGroup]
9
+ });
@@ -1,21 +1,7 @@
1
- import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
1
+ import { adfNode } from '@atlaskit/adf-schema-generator';
2
+ import { tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
2
3
  import { unsupportedMark } from '../marks/unsupportedMark';
3
4
  import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
4
- import { blockCard } from './blockCard';
5
- import { blockquote } from './blockquote';
6
- import { codeBlock } from './codeBlock';
7
- import { decisionList } from './decisionList';
8
- import { embedCard } from './embedCard';
9
- import { extension } from './extension';
10
- import { heading } from './heading';
11
- import { bulletList, orderedList } from './list';
12
- import { mediaGroup } from './mediaGroup';
13
- import { mediaSingle } from './mediaSingle';
14
- import { nestedExpand } from './nestedExpand';
15
- import { panel } from './panel';
16
- import { paragraph } from './paragraph';
17
- import { rule } from './rule';
18
- import { taskList } from './task';
19
5
  export var tableHeader = adfNode('tableHeader').define({
20
6
  isolating: true,
21
7
  selectable: false,
@@ -46,5 +32,5 @@ export var tableHeader = adfNode('tableHeader').define({
46
32
  optional: true
47
33
  }
48
34
  },
49
- content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand, nestedExpand.use('with_no_marks')))]
35
+ content: [tableHeaderContentPseudoGroup]
50
36
  });
@@ -3,9 +3,10 @@ import { unsupportedMark } from '../marks/unsupportedMark';
3
3
  import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
4
4
  import { tableCell } from './tableCell';
5
5
  import { tableHeader } from './tableHeader';
6
+ import { tableCellContent } from './tableCellContent';
6
7
  export var tableRow = adfNode('tableRow').define({
7
8
  selectable: false,
8
9
  marks: [unsupportedNodeAttribute, unsupportedMark],
9
- content: [$onePlus($or(tableCell, tableHeader))],
10
+ content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
10
11
  tableRole: 'row'
11
12
  });
@@ -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:pm:full" to regenerate this file.
5
5
  */
6
- import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, ExpandDefinition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MultiBodiedExtensionDefinition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
6
+ import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, ExpandDefinition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MultiBodiedExtensionDefinition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
7
7
  export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
8
8
  export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionDefinition>;
9
- export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
9
+ export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
10
10
  export type NonNestableBlockContentDefinition = Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;