@atlaskit/adf-schema 36.13.0 → 36.14.1

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 (65) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/next-schema/full-schema.adf.js +3 -2
  3. package/dist/cjs/next-schema/generated/markTypes.js +38 -21
  4. package/dist/cjs/next-schema/generated/nodeTypes.js +210 -226
  5. package/dist/cjs/next-schema/groups/blockGroup.js +5 -1
  6. package/dist/cjs/next-schema/groups/inlineGroup.js +1 -3
  7. package/dist/cjs/next-schema/nodes/blockCard.js +7 -3
  8. package/dist/cjs/next-schema/nodes/codeBlock.js +2 -2
  9. package/dist/cjs/next-schema/nodes/inlineExtension.js +5 -1
  10. package/dist/cjs/next-schema/nodes/layoutColumn.js +2 -1
  11. package/dist/cjs/next-schema/nodes/media.js +2 -2
  12. package/dist/cjs/next-schema/nodes/mediaInline.js +29 -12
  13. package/dist/cjs/next-schema/nodes/mediaSingle.js +2 -1
  14. package/dist/cjs/next-schema/nodes/mention.js +2 -1
  15. package/dist/cjs/next-schema/nodes/placeholder.js +1 -0
  16. package/dist/cjs/next-schema/nodes/table.js +1 -0
  17. package/dist/cjs/next-schema/nodes/tableCell.js +2 -2
  18. package/dist/cjs/next-schema/nodes/tableHeader.js +2 -2
  19. package/dist/cjs/next-schema/nodes/tableRow.js +2 -1
  20. package/dist/es2019/next-schema/full-schema.adf.js +3 -2
  21. package/dist/es2019/next-schema/generated/markTypes.js +37 -20
  22. package/dist/es2019/next-schema/generated/nodeTypes.js +209 -225
  23. package/dist/es2019/next-schema/groups/blockGroup.js +5 -1
  24. package/dist/es2019/next-schema/groups/inlineGroup.js +1 -3
  25. package/dist/es2019/next-schema/nodes/blockCard.js +7 -3
  26. package/dist/es2019/next-schema/nodes/codeBlock.js +1 -1
  27. package/dist/es2019/next-schema/nodes/inlineExtension.js +5 -1
  28. package/dist/es2019/next-schema/nodes/layoutColumn.js +2 -1
  29. package/dist/es2019/next-schema/nodes/media.js +2 -2
  30. package/dist/es2019/next-schema/nodes/mediaInline.js +29 -12
  31. package/dist/es2019/next-schema/nodes/mediaSingle.js +2 -1
  32. package/dist/es2019/next-schema/nodes/mention.js +2 -1
  33. package/dist/es2019/next-schema/nodes/placeholder.js +1 -0
  34. package/dist/es2019/next-schema/nodes/table.js +1 -0
  35. package/dist/es2019/next-schema/nodes/tableCell.js +2 -2
  36. package/dist/es2019/next-schema/nodes/tableHeader.js +2 -2
  37. package/dist/es2019/next-schema/nodes/tableRow.js +2 -1
  38. package/dist/esm/next-schema/full-schema.adf.js +3 -2
  39. package/dist/esm/next-schema/generated/markTypes.js +37 -20
  40. package/dist/esm/next-schema/generated/nodeTypes.js +209 -225
  41. package/dist/esm/next-schema/groups/blockGroup.js +5 -1
  42. package/dist/esm/next-schema/groups/inlineGroup.js +1 -3
  43. package/dist/esm/next-schema/nodes/blockCard.js +7 -3
  44. package/dist/esm/next-schema/nodes/codeBlock.js +1 -1
  45. package/dist/esm/next-schema/nodes/inlineExtension.js +5 -1
  46. package/dist/esm/next-schema/nodes/layoutColumn.js +2 -1
  47. package/dist/esm/next-schema/nodes/media.js +2 -2
  48. package/dist/esm/next-schema/nodes/mediaInline.js +29 -12
  49. package/dist/esm/next-schema/nodes/mediaSingle.js +2 -1
  50. package/dist/esm/next-schema/nodes/mention.js +2 -1
  51. package/dist/esm/next-schema/nodes/placeholder.js +1 -0
  52. package/dist/esm/next-schema/nodes/table.js +1 -0
  53. package/dist/esm/next-schema/nodes/tableCell.js +2 -2
  54. package/dist/esm/next-schema/nodes/tableHeader.js +2 -2
  55. package/dist/esm/next-schema/nodes/tableRow.js +2 -1
  56. package/dist/types/next-schema/generated/markTypes.d.ts +56 -33
  57. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +4 -4
  58. package/dist/types/next-schema/generated/nodeTypes.d.ts +165 -156
  59. package/dist/types/next-schema/nodes/codeBlock.d.ts +1 -1
  60. package/dist/types/next-schema/nodes/inlineExtension.d.ts +2 -0
  61. package/package.json +2 -2
  62. package/schema-generators/__tests__/helpers/_utils.ts +123 -0
  63. package/schema-generators/__tests__/helpers/utils.unit.ts +66 -0
  64. package/schema-generators/__tests__/unit/json-full-schema.unit.ts +1142 -1231
  65. package/schema-generators/__tests__/unit/validate-pm-schema.unit.ts +162 -36
@@ -24,4 +24,8 @@ var _rule = require("../nodes/rule");
24
24
  var _table = require("../nodes/table");
25
25
  var _task = require("../nodes/task");
26
26
  var _unsupportedBlock = require("../nodes/unsupportedBlock");
27
- var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_breakout_mark'), _expand.expand.use('with_no_mark'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock]);
27
+ var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote.use('with_list'), _decisionList.decisionList, _embedCard.embedCard,
28
+ // extension,
29
+ _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _table.table,
30
+ // bodiedExtension,
31
+ _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand.use('with_no_mark'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock]);
@@ -17,6 +17,4 @@ var _inlineExtension = require("../nodes/inlineExtension");
17
17
  var _mediaInline = require("../nodes/mediaInline");
18
18
  var _unsupportedInline = require("../nodes/unsupportedInline");
19
19
  var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
20
- var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [
21
- // text,
22
- _text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline]);
20
+ var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [_text.text, _text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline]);
@@ -15,10 +15,12 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
15
15
  anyOf: [{
16
16
  url: {
17
17
  type: 'string',
18
- optional: true
18
+ optional: true,
19
+ default: null
19
20
  },
20
21
  datasource: {
21
22
  type: 'object',
23
+ default: null,
22
24
  additionalProperties: false,
23
25
  properties: {
24
26
  id: {
@@ -47,12 +49,14 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
47
49
  },
48
50
  width: {
49
51
  type: 'number',
50
- optional: true
52
+ optional: true,
53
+ default: null
51
54
  },
52
55
  layout: {
53
56
  type: 'enum',
54
57
  values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
55
- optional: true
58
+ optional: true,
59
+ default: null
56
60
  }
57
61
  }, {
58
62
  url: {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.codeBlockWithMarks = exports.codeBlock = void 0;
6
+ exports.codeBlockWithNoMarks = exports.codeBlock = void 0;
7
7
  var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
8
8
  var _breakout = require("../marks/breakout");
9
9
  var _unsupportedMark = require("../marks/unsupportedMark");
@@ -25,4 +25,4 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
25
25
  }).variant('with_marks', {
26
26
  marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
27
27
  }).variant('with_no_marks', {});
28
- var codeBlockWithMarks = exports.codeBlockWithMarks = codeBlock;
28
+ var codeBlockWithNoMarks = exports.codeBlockWithNoMarks = codeBlock;
@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.inlineExtension = void 0;
7
7
  var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
8
+ var _dataConsumer = require("../marks/dataConsumer");
9
+ var _fragment = require("../marks/fragment");
8
10
  var _unsupportedMark = require("../marks/unsupportedMark");
9
11
  var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
10
12
  var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)('inlineExtension').define({
@@ -38,4 +40,6 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
38
40
  default: null
39
41
  }
40
42
  }
41
- }).variant('with_marks', {});
43
+ }).variant('with_marks', {
44
+ marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
45
+ });
@@ -8,6 +8,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
8
8
  var _blockGroup = require("../groups/blockGroup");
9
9
  var _unsupportedMark = require("../marks/unsupportedMark");
10
10
  var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
11
+ var _unsupportedBlock = require("../nodes/unsupportedBlock");
11
12
  var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layoutColumn').define({
12
13
  isolating: true,
13
14
  selectable: false,
@@ -20,5 +21,5 @@ var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layo
20
21
  default: undefined
21
22
  }
22
23
  },
23
- content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup))]
24
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _unsupportedBlock.unsupportedBlock))]
24
25
  });
@@ -61,8 +61,8 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
61
61
  optional: true
62
62
  },
63
63
  __external: {
64
- type: 'number',
65
- default: null,
64
+ type: 'boolean',
65
+ default: false,
66
66
  optional: true
67
67
  },
68
68
  __fileMimeType: {
@@ -12,7 +12,8 @@ var _unsupportedMark = require("../marks/unsupportedMark");
12
12
  var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
13
13
  var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaInline').define({
14
14
  selectable: true,
15
- atom: false,
15
+ // atom: false,
16
+ inline: true,
16
17
  marks: [_link.link, _annotation.annotation, _border.border, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
17
18
  attrs: {
18
19
  data: {
@@ -21,23 +22,32 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
21
22
  type: {
22
23
  type: 'enum',
23
24
  values: ['link', 'file', 'image'],
24
- optional: true
25
+ optional: true,
26
+ default: 'file'
27
+ },
28
+ url: {
29
+ type: 'string',
30
+ default: null
25
31
  },
26
32
  id: {
27
33
  minLength: 1,
28
- type: 'string'
34
+ type: 'string',
35
+ default: ''
29
36
  },
30
37
  alt: {
31
38
  type: 'string',
39
+ default: '',
32
40
  optional: true
33
41
  },
34
42
  collection: {
35
- type: 'string'
43
+ type: 'string',
44
+ default: ''
36
45
  },
37
46
  occurrenceKey: {
38
47
  minLength: 1,
39
48
  type: 'string',
40
- optional: true
49
+ optional: true,
50
+ default: null
41
51
  },
42
52
  width: {
43
53
  type: 'number',
@@ -51,32 +61,39 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
51
61
  },
52
62
  __fileName: {
53
63
  type: 'string',
54
- optional: true
64
+ optional: true,
65
+ default: null
55
66
  },
56
67
  __fileSize: {
57
68
  type: 'number',
58
- optional: true
69
+ optional: true,
70
+ default: null
59
71
  },
60
72
  __fileMimeType: {
61
73
  type: 'string',
62
- optional: true
74
+ optional: true,
75
+ default: null
63
76
  },
64
77
  __displayType: {
65
78
  type: 'enum',
66
79
  values: ['file', 'thumbnail'],
67
- optional: true
80
+ optional: true,
81
+ default: null
68
82
  },
69
83
  __contextId: {
70
84
  type: 'string',
71
- optional: true
85
+ optional: true,
86
+ default: null
72
87
  },
73
88
  __mediaTraceId: {
74
89
  type: 'string',
75
- optional: true
90
+ optional: true,
91
+ default: null
76
92
  },
77
93
  __external: {
78
94
  type: 'boolean',
79
- optional: true
95
+ optional: true,
96
+ default: false
80
97
  }
81
98
  }
82
99
  });
@@ -52,7 +52,8 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
52
52
  default: 'center'
53
53
  }
54
54
  }]
55
- }
55
+ },
56
+ content: [(0, _adfSchemaGenerator.$or)(_media.media)]
56
57
  }).variant('caption', {
57
58
  atom: false,
58
59
  content: [(0, _adfSchemaGenerator.$or)(_media.media, _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$or)(_caption.caption, _unsupportedBlock.unsupportedBlock)]
@@ -18,7 +18,8 @@ var mention = exports.mention = (0, _adfSchemaGenerator.adfNode)('mention').defi
18
18
  },
19
19
  localId: {
20
20
  type: 'string',
21
- optional: true
21
+ optional: true,
22
+ default: null
22
23
  },
23
24
  text: {
24
25
  type: 'string',
@@ -9,6 +9,7 @@ var _unsupportedMark = require("../marks/unsupportedMark");
9
9
  var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
10
10
  var placeholder = exports.placeholder = (0, _adfSchemaGenerator.adfNode)('placeholder').define({
11
11
  selectable: false,
12
+ inline: true,
12
13
  marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
13
14
  attrs: {
14
15
  text: {
@@ -12,6 +12,7 @@ var _tableRow = require("./tableRow");
12
12
  var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table').define({
13
13
  isolating: true,
14
14
  selectable: true,
15
+ tableRole: 'table',
15
16
  marks: [_fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
16
17
  attrs: {
17
18
  displayMode: {
@@ -41,12 +41,12 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
41
41
  },
42
42
  colwidth: {
43
43
  type: 'numberList',
44
- default: [],
44
+ default: null,
45
45
  optional: true
46
46
  },
47
47
  background: {
48
48
  type: 'string',
49
- default: '',
49
+ default: null,
50
50
  optional: true
51
51
  }
52
52
  },
@@ -40,12 +40,12 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
40
40
  },
41
41
  colwidth: {
42
42
  type: 'numberList',
43
- default: [],
43
+ default: null,
44
44
  optional: true
45
45
  },
46
46
  background: {
47
47
  type: 'string',
48
- default: '',
48
+ default: null,
49
49
  optional: true
50
50
  }
51
51
  },
@@ -12,5 +12,6 @@ var _tableHeader = require("./tableHeader");
12
12
  var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
13
13
  selectable: false,
14
14
  marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
15
- content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
15
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))],
16
+ tableRole: 'row'
16
17
  });
@@ -2,12 +2,13 @@ import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
2
2
  import { blockGroup } from './groups/blockGroup';
3
3
  import { layoutSection } from './nodes/layoutSection';
4
4
  import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
5
- import { nestedExpand } from './nodes/nestedExpand';
6
5
  import { paragraph } from './nodes/paragraph';
6
+ import { expand } from './nodes/expand';
7
+ import { codeBlock } from './nodes/codeBlock';
7
8
  import { unsupportedBlock } from './nodes/unsupportedBlock';
8
9
  const doc = adfNode('doc').define({
9
10
  root: true,
10
11
  version: 1,
11
- content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph, unsupportedBlock))]
12
+ content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark'), codeBlock.use('with_no_marks'), codeBlock.use('with_marks'), paragraph.use('with_indentation'), unsupportedBlock))]
12
13
  });
13
14
  export default doc;
@@ -1,12 +1,20 @@
1
1
  import { createPMMarkSpecFactory } from '@atlaskit/adf-schema-generator';
2
- export const breakout = createPMMarkSpecFactory({
2
+ export const unsupportedNodeAttribute = createPMMarkSpecFactory({
3
3
  attrs: {
4
- mode: {
5
- default: 'wide'
4
+ type: {
5
+ default: null
6
+ },
7
+ unsupported: {
8
+ default: {}
6
9
  }
7
- },
8
- inclusive: false,
9
- spanning: false
10
+ }
11
+ });
12
+ export const unsupportedMark = createPMMarkSpecFactory({
13
+ attrs: {
14
+ originalValue: {
15
+ default: {}
16
+ }
17
+ }
10
18
  });
11
19
  export const link = createPMMarkSpecFactory({
12
20
  attrs: {
@@ -86,20 +94,6 @@ export const code = createPMMarkSpecFactory({
86
94
  inclusive: true,
87
95
  excludes: 'fontStyle link searchQuery color'
88
96
  });
89
- export const alignment = createPMMarkSpecFactory({
90
- attrs: {
91
- align: {}
92
- },
93
- excludes: 'alignment indentation',
94
- group: 'alignment'
95
- });
96
- export const indentation = createPMMarkSpecFactory({
97
- attrs: {
98
- level: {}
99
- },
100
- excludes: 'indentation alignment',
101
- group: 'indentation'
102
- });
103
97
  export const dataConsumer = createPMMarkSpecFactory({
104
98
  attrs: {
105
99
  sources: {
@@ -117,4 +111,27 @@ export const fragment = createPMMarkSpecFactory({
117
111
  }
118
112
  },
119
113
  inclusive: false
114
+ });
115
+ export const alignment = createPMMarkSpecFactory({
116
+ attrs: {
117
+ align: {}
118
+ },
119
+ excludes: 'alignment indentation',
120
+ group: 'alignment'
121
+ });
122
+ export const indentation = createPMMarkSpecFactory({
123
+ attrs: {
124
+ level: {}
125
+ },
126
+ excludes: 'indentation alignment',
127
+ group: 'indentation'
128
+ });
129
+ export const breakout = createPMMarkSpecFactory({
130
+ attrs: {
131
+ mode: {
132
+ default: 'wide'
133
+ }
134
+ },
135
+ inclusive: false,
136
+ spanning: false
120
137
  });