@atlaskit/adf-schema 44.7.0 → 45.0.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 (56) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/next-schema/full-schema.adf.js +2 -2
  3. package/dist/cjs/next-schema/generated/nodeTypes.js +4 -4
  4. package/dist/cjs/next-schema/groups/blockContentGroup.js +2 -2
  5. package/dist/cjs/next-schema/groups/blockGroup.js +2 -2
  6. package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
  7. package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +1 -1
  8. package/dist/cjs/next-schema/nodes/blockquote.js +1 -1
  9. package/dist/cjs/next-schema/nodes/codeBlock.js +8 -14
  10. package/dist/cjs/next-schema/nodes/extensionFrame.js +1 -1
  11. package/dist/cjs/next-schema/nodes/list.js +2 -2
  12. package/dist/cjs/next-schema/nodes/nestedExpand.js +1 -1
  13. package/dist/cjs/next-schema/nodes/panel.js +2 -2
  14. package/dist/cjs/schema/nodes/code-block.js +1 -5
  15. package/dist/cjs/validator-schema/generated/validatorSpec.js +15 -30
  16. package/dist/es2019/next-schema/full-schema.adf.js +2 -2
  17. package/dist/es2019/next-schema/generated/nodeTypes.js +3 -3
  18. package/dist/es2019/next-schema/groups/blockContentGroup.js +2 -2
  19. package/dist/es2019/next-schema/groups/blockGroup.js +2 -2
  20. package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
  21. package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +1 -1
  22. package/dist/es2019/next-schema/nodes/blockquote.js +1 -1
  23. package/dist/es2019/next-schema/nodes/codeBlock.js +7 -13
  24. package/dist/es2019/next-schema/nodes/extensionFrame.js +1 -1
  25. package/dist/es2019/next-schema/nodes/list.js +2 -2
  26. package/dist/es2019/next-schema/nodes/nestedExpand.js +1 -1
  27. package/dist/es2019/next-schema/nodes/panel.js +2 -2
  28. package/dist/es2019/schema/nodes/code-block.js +1 -5
  29. package/dist/es2019/validator-schema/generated/validatorSpec.js +14 -29
  30. package/dist/esm/next-schema/full-schema.adf.js +2 -2
  31. package/dist/esm/next-schema/generated/nodeTypes.js +3 -3
  32. package/dist/esm/next-schema/groups/blockContentGroup.js +2 -2
  33. package/dist/esm/next-schema/groups/blockGroup.js +2 -2
  34. package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
  35. package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +1 -1
  36. package/dist/esm/next-schema/nodes/blockquote.js +1 -1
  37. package/dist/esm/next-schema/nodes/codeBlock.js +7 -13
  38. package/dist/esm/next-schema/nodes/extensionFrame.js +1 -1
  39. package/dist/esm/next-schema/nodes/list.js +2 -2
  40. package/dist/esm/next-schema/nodes/nestedExpand.js +1 -1
  41. package/dist/esm/next-schema/nodes/panel.js +2 -2
  42. package/dist/esm/schema/nodes/code-block.js +1 -5
  43. package/dist/esm/validator-schema/generated/validatorSpec.js +14 -29
  44. package/dist/json-schema/v1/full.json +73 -60
  45. package/dist/json-schema/v1/stage-0.json +78 -65
  46. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +3 -3
  47. package/dist/types/next-schema/generated/nodeTypes.d.ts +20 -19
  48. package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts +5 -1
  49. package/dist/types/next-schema/groups/tableCellContentPseudoGroup.d.ts +5 -1
  50. package/dist/types/next-schema/nodes/codeBlock.d.ts +3 -16
  51. package/dist/types/schema/nodes/code-block.d.ts +1 -4
  52. package/dist/types/validator-schema/generated/validatorSpec.d.ts +1 -16
  53. package/json-schema/v1/full.json +73 -60
  54. package/json-schema/v1/stage-0.json +78 -65
  55. package/package.json +2 -2
  56. package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts +1 -1
package/json-schema/v1/stage-0.json CHANGED
@@ -73,73 +73,73 @@
73
73
  "$ref": "#/definitions/blockCard_node"
74
74
  },
75
75
  {
76
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
76
+ "$ref": "#/definitions/paragraph_with_no_marks_node"
77
77
  },
78
78
  {
79
- "$ref": "#/definitions/mediaSingle_caption_node"
79
+ "$ref": "#/definitions/paragraph_with_alignment_node"
80
80
  },
81
81
  {
82
- "$ref": "#/definitions/mediaSingle_full_node"
82
+ "$ref": "#/definitions/paragraph_with_indentation_node"
83
83
  },
84
84
  {
85
- "$ref": "#/definitions/paragraph_with_alignment_node"
85
+ "$ref": "#/definitions/mediaSingle_caption_node"
86
86
  },
87
87
  {
88
- "$ref": "#/definitions/paragraph_with_indentation_node"
88
+ "$ref": "#/definitions/mediaSingle_full_node"
89
89
  },
90
90
  {
91
- "$ref": "#/definitions/paragraph_with_no_marks_node"
91
+ "$ref": "#/definitions/codeBlock_node"
92
92
  },
93
93
  {
94
94
  "$ref": "#/definitions/taskList_node"
95
95
  },
96
96
  {
97
- "$ref": "#/definitions/orderedList_node"
97
+ "$ref": "#/definitions/bulletList_node"
98
98
  },
99
99
  {
100
- "$ref": "#/definitions/bulletList_node"
100
+ "$ref": "#/definitions/orderedList_node"
101
101
  },
102
102
  {
103
- "$ref": "#/definitions/blockquote_node"
103
+ "$ref": "#/definitions/heading_with_no_marks_node"
104
104
  },
105
105
  {
106
- "$ref": "#/definitions/decisionList_node"
106
+ "$ref": "#/definitions/heading_with_alignment_node"
107
107
  },
108
108
  {
109
- "$ref": "#/definitions/embedCard_node"
109
+ "$ref": "#/definitions/heading_with_indentation_node"
110
110
  },
111
111
  {
112
- "$ref": "#/definitions/extension_with_marks_node"
112
+ "$ref": "#/definitions/mediaGroup_node"
113
113
  },
114
114
  {
115
- "$ref": "#/definitions/heading_with_indentation_node"
115
+ "$ref": "#/definitions/decisionList_node"
116
116
  },
117
117
  {
118
- "$ref": "#/definitions/heading_with_no_marks_node"
118
+ "$ref": "#/definitions/rule_node"
119
119
  },
120
120
  {
121
- "$ref": "#/definitions/heading_with_alignment_node"
121
+ "$ref": "#/definitions/panel_node"
122
122
  },
123
123
  {
124
- "$ref": "#/definitions/mediaGroup_node"
124
+ "$ref": "#/definitions/panel_with_nested_blockquote_node"
125
125
  },
126
126
  {
127
- "$ref": "#/definitions/rule_node"
127
+ "$ref": "#/definitions/blockquote_node"
128
128
  },
129
129
  {
130
- "$ref": "#/definitions/panel_node"
130
+ "$ref": "#/definitions/extension_with_marks_node"
131
131
  },
132
132
  {
133
- "$ref": "#/definitions/panel_with_nested_blockquote_node"
133
+ "$ref": "#/definitions/embedCard_node"
134
134
  },
135
135
  {
136
136
  "$ref": "#/definitions/table_node"
137
137
  },
138
138
  {
139
- "$ref": "#/definitions/bodiedExtension_with_marks_node"
139
+ "$ref": "#/definitions/expand_with_no_mark_node"
140
140
  },
141
141
  {
142
- "$ref": "#/definitions/expand_with_no_mark_node"
142
+ "$ref": "#/definitions/bodiedExtension_with_marks_node"
143
143
  }
144
144
  ]
145
145
  },
@@ -245,7 +245,7 @@
245
245
  "$ref": "#/definitions/bulletList_node"
246
246
  },
247
247
  {
248
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
248
+ "$ref": "#/definitions/codeBlock_node"
249
249
  },
250
250
  {
251
251
  "$ref": "#/definitions/mediaSingle_caption_node"
@@ -499,7 +499,8 @@
499
499
  "enum": ["codeBlock"]
500
500
  },
501
501
  "marks": {
502
- "type": "array"
502
+ "type": "array",
503
+ "maxItems": 0
503
504
  },
504
505
  "attrs": {
505
506
  "type": "object",
@@ -534,41 +535,53 @@
534
535
  "additionalProperties": false,
535
536
  "required": ["type"]
536
537
  },
537
- "codeBlock_with_marks_node": {
538
- "allOf": [
539
- {
540
- "$ref": "#/definitions/codeBlock_node"
538
+ "codeBlock_root_only_node": {
539
+ "type": "object",
540
+ "properties": {
541
+ "type": {
542
+ "enum": ["codeBlock"]
541
543
  },
542
- {
543
- "type": "object",
544
- "properties": {
545
- "marks": {
546
- "type": "array",
547
- "items": {
548
- "$ref": "#/definitions/breakout_mark"
549
- }
550
- }
551
- },
552
- "additionalProperties": true
553
- }
554
- ]
555
- },
556
- "codeBlock_with_no_marks_node": {
557
- "allOf": [
558
- {
559
- "$ref": "#/definitions/codeBlock_node"
544
+ "marks": {
545
+ "type": "array",
546
+ "items": {
547
+ "$ref": "#/definitions/breakout_mark"
548
+ }
560
549
  },
561
- {
550
+ "attrs": {
562
551
  "type": "object",
563
552
  "properties": {
564
- "marks": {
565
- "type": "array",
566
- "maxItems": 0
553
+ "language": {
554
+ "type": "string"
555
+ },
556
+ "uniqueId": {
557
+ "type": "string"
567
558
  }
568
559
  },
569
- "additionalProperties": true
560
+ "additionalProperties": false
561
+ },
562
+ "content": {
563
+ "type": "array",
564
+ "items": {
565
+ "allOf": [
566
+ {
567
+ "$ref": "#/definitions/text_node"
568
+ },
569
+ {
570
+ "type": "object",
571
+ "properties": {
572
+ "marks": {
573
+ "type": "array",
574
+ "maxItems": 0
575
+ }
576
+ },
577
+ "additionalProperties": true
578
+ }
579
+ ]
580
+ }
570
581
  }
571
- ]
582
+ },
583
+ "additionalProperties": false,
584
+ "required": ["type"]
572
585
  },
573
586
  "dataConsumer_mark": {
574
587
  "type": "object",
@@ -691,10 +704,7 @@
691
704
  "$ref": "#/definitions/blockCard_node"
692
705
  },
693
706
  {
694
- "$ref": "#/definitions/codeBlock_with_marks_node"
695
- },
696
- {
697
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
707
+ "$ref": "#/definitions/codeBlock_node"
698
708
  },
699
709
  {
700
710
  "$ref": "#/definitions/mediaSingle_caption_node"
@@ -765,6 +775,9 @@
765
775
  {
766
776
  "$ref": "#/definitions/expand_with_breakout_mark_node"
767
777
  },
778
+ {
779
+ "$ref": "#/definitions/codeBlock_root_only_node"
780
+ },
768
781
  {
769
782
  "$ref": "#/definitions/layoutSection_with_single_column_node"
770
783
  },
@@ -1050,7 +1063,7 @@
1050
1063
  "$ref": "#/definitions/heading_with_no_marks_node"
1051
1064
  },
1052
1065
  {
1053
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
1066
+ "$ref": "#/definitions/codeBlock_node"
1054
1067
  },
1055
1068
  {
1056
1069
  "$ref": "#/definitions/mediaGroup_node"
@@ -1596,7 +1609,7 @@
1596
1609
  "$ref": "#/definitions/mediaSingle_full_node"
1597
1610
  },
1598
1611
  {
1599
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
1612
+ "$ref": "#/definitions/codeBlock_node"
1600
1613
  }
1601
1614
  ]
1602
1615
  },
@@ -1621,7 +1634,7 @@
1621
1634
  "$ref": "#/definitions/mediaSingle_full_node"
1622
1635
  },
1623
1636
  {
1624
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
1637
+ "$ref": "#/definitions/codeBlock_node"
1625
1638
  }
1626
1639
  ]
1627
1640
  }
@@ -1653,7 +1666,7 @@
1653
1666
  "$ref": "#/definitions/mediaSingle_full_node"
1654
1667
  },
1655
1668
  {
1656
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
1669
+ "$ref": "#/definitions/codeBlock_node"
1657
1670
  },
1658
1671
  {
1659
1672
  "$ref": "#/definitions/decisionList_node"
@@ -1681,7 +1694,7 @@
1681
1694
  "$ref": "#/definitions/mediaSingle_full_node"
1682
1695
  },
1683
1696
  {
1684
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
1697
+ "$ref": "#/definitions/codeBlock_node"
1685
1698
  },
1686
1699
  {
1687
1700
  "$ref": "#/definitions/decisionList_node"
@@ -2074,7 +2087,7 @@
2074
2087
  "$ref": "#/definitions/mediaGroup_node"
2075
2088
  },
2076
2089
  {
2077
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
2090
+ "$ref": "#/definitions/codeBlock_node"
2078
2091
  },
2079
2092
  {
2080
2093
  "$ref": "#/definitions/bulletList_node"
@@ -2164,7 +2177,7 @@
2164
2177
  "$ref": "#/definitions/heading_with_no_marks_node"
2165
2178
  },
2166
2179
  {
2167
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
2180
+ "$ref": "#/definitions/codeBlock_node"
2168
2181
  },
2169
2182
  {
2170
2183
  "$ref": "#/definitions/mediaGroup_node"
@@ -2294,7 +2307,7 @@
2294
2307
  "$ref": "#/definitions/mediaSingle_full_node"
2295
2308
  },
2296
2309
  {
2297
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
2310
+ "$ref": "#/definitions/codeBlock_node"
2298
2311
  },
2299
2312
  {
2300
2313
  "$ref": "#/definitions/taskList_node"
@@ -2378,7 +2391,7 @@
2378
2391
  "$ref": "#/definitions/mediaSingle_full_node"
2379
2392
  },
2380
2393
  {
2381
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
2394
+ "$ref": "#/definitions/codeBlock_node"
2382
2395
  },
2383
2396
  {
2384
2397
  "$ref": "#/definitions/taskList_node"
@@ -2624,7 +2637,7 @@
2624
2637
  "$ref": "#/definitions/heading_with_indentation_node"
2625
2638
  },
2626
2639
  {
2627
- "$ref": "#/definitions/codeBlock_with_no_marks_node"
2640
+ "$ref": "#/definitions/codeBlock_node"
2628
2641
  },
2629
2642
  {
2630
2643
  "$ref": "#/definitions/mediaSingle_caption_node"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "44.7.0",
3
+ "version": "45.0.0",
4
4
  "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
46
46
  },
47
47
  "devDependencies": {
48
48
  "@atlassian/adf-schema-json": "^1.24.0",
49
- "@atlaskit/adf-schema-generator": "^1.38.1",
49
+ "@atlaskit/adf-schema-generator": "^1.38.2",
50
50
  "@atlaskit/codemod-utils": "^4.2.4",
51
51
  "@babel/cli": "^7.22.9",
52
52
  "@babel/core": "^7.22.9",
package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts CHANGED
@@ -77,7 +77,7 @@ const panel = {
77
77
  'mediaGroup',
78
78
  'mediaSingle_caption',
79
79
  'mediaSingle_full',
80
- 'codeBlock_with_no_marks',
80
+ 'codeBlock',
81
81
  'taskList',
82
82
  'rule',
83
83
  'decisionList',