@atlaskit/adf-schema 44.7.0 → 45.1.0

package/json-schema/v1/full.json

@@ -73,70 +73,70 @@
           "$ref": "#/definitions/blockCard_node"
         },
         {
-          "$ref": "#/definitions/codeBlock_with_no_marks_node"
+          "$ref": "#/definitions/paragraph_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/mediaSingle_caption_node"
+          "$ref": "#/definitions/paragraph_with_alignment_node"
         },
         {
-          "$ref": "#/definitions/mediaSingle_full_node"
+          "$ref": "#/definitions/paragraph_with_indentation_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_alignment_node"
+          "$ref": "#/definitions/mediaSingle_caption_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_indentation_node"
+          "$ref": "#/definitions/mediaSingle_full_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_no_marks_node"
+          "$ref": "#/definitions/codeBlock_node"
         },
         {
           "$ref": "#/definitions/taskList_node"
         },
         {
-          "$ref": "#/definitions/orderedList_node"
+          "$ref": "#/definitions/bulletList_node"
         },
         {
-          "$ref": "#/definitions/bulletList_node"
+          "$ref": "#/definitions/orderedList_node"
         },
         {
-          "$ref": "#/definitions/blockquote_node"
+          "$ref": "#/definitions/heading_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/decisionList_node"
+          "$ref": "#/definitions/heading_with_alignment_node"
         },
         {
-          "$ref": "#/definitions/embedCard_node"
+          "$ref": "#/definitions/heading_with_indentation_node"
         },
         {
-          "$ref": "#/definitions/extension_with_marks_node"
+          "$ref": "#/definitions/mediaGroup_node"
         },
         {
-          "$ref": "#/definitions/heading_with_indentation_node"
+          "$ref": "#/definitions/decisionList_node"
         },
         {
-          "$ref": "#/definitions/heading_with_no_marks_node"
+          "$ref": "#/definitions/rule_node"
         },
         {
-          "$ref": "#/definitions/heading_with_alignment_node"
+          "$ref": "#/definitions/panel_node"
         },
         {
-          "$ref": "#/definitions/mediaGroup_node"
+          "$ref": "#/definitions/blockquote_node"
         },
         {
-          "$ref": "#/definitions/rule_node"
+          "$ref": "#/definitions/extension_with_marks_node"
         },
         {
-          "$ref": "#/definitions/panel_node"
+          "$ref": "#/definitions/embedCard_node"
         },
         {
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/bodiedExtension_with_marks_node"
+          "$ref": "#/definitions/expand_with_no_mark_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/bodiedExtension_with_marks_node"
         }
       ]
     },
@@ -242,7 +242,7 @@
                 "$ref": "#/definitions/bulletList_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
@@ -489,13 +489,17 @@
           "enum": ["codeBlock"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -524,41 +528,53 @@
       "additionalProperties": false,
       "required": ["type"]
     },
-    "codeBlock_with_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/codeBlock_node"
+    "codeBlock_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["codeBlock"]
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "codeBlock_with_no_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/codeBlock_node"
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        {
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
+            "language": {
+              "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
+          "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "allOf": [
+              {
+                "$ref": "#/definitions/text_node"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "marks": {
+                    "type": "array",
+                    "maxItems": 0
+                  }
+                },
+                "additionalProperties": true
+              }
+            ]
+          }
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type"]
     },
     "dataConsumer_mark": {
       "type": "object",
@@ -675,10 +691,7 @@
                 "$ref": "#/definitions/blockCard_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_marks_node"
-              },
-              {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
@@ -746,6 +759,9 @@
               {
                 "$ref": "#/definitions/expand_with_breakout_mark_node"
               },
+              {
+                "$ref": "#/definitions/codeBlock_root_only_node"
+              },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
               }
@@ -1441,7 +1457,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 }
               ]
             },
@@ -1466,7 +1482,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 }
               ]
             }
@@ -1805,7 +1821,7 @@
             "$ref": "#/definitions/mediaGroup_node"
           },
           {
-            "$ref": "#/definitions/codeBlock_with_no_marks_node"
+            "$ref": "#/definitions/codeBlock_node"
           },
           {
             "$ref": "#/definitions/bulletList_node"
@@ -1895,7 +1911,7 @@
           "$ref": "#/definitions/heading_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/codeBlock_with_no_marks_node"
+          "$ref": "#/definitions/codeBlock_node"
         },
         {
           "$ref": "#/definitions/mediaGroup_node"
@@ -2018,7 +2034,7 @@
                 "$ref": "#/definitions/mediaSingle_full_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/taskList_node"
@@ -2255,7 +2271,7 @@
             "$ref": "#/definitions/heading_with_indentation_node"
           },
           {
-            "$ref": "#/definitions/codeBlock_with_no_marks_node"
+            "$ref": "#/definitions/codeBlock_node"
           },
           {
             "$ref": "#/definitions/mediaSingle_caption_node"

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

@@ -73,73 +73,73 @@
           "$ref": "#/definitions/blockCard_node"
         },
         {
-          "$ref": "#/definitions/codeBlock_with_no_marks_node"
+          "$ref": "#/definitions/paragraph_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/mediaSingle_caption_node"
+          "$ref": "#/definitions/paragraph_with_alignment_node"
         },
         {
-          "$ref": "#/definitions/mediaSingle_full_node"
+          "$ref": "#/definitions/paragraph_with_indentation_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_alignment_node"
+          "$ref": "#/definitions/mediaSingle_caption_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_indentation_node"
+          "$ref": "#/definitions/mediaSingle_full_node"
         },
         {
-          "$ref": "#/definitions/paragraph_with_no_marks_node"
+          "$ref": "#/definitions/codeBlock_node"
         },
         {
           "$ref": "#/definitions/taskList_node"
         },
         {
-          "$ref": "#/definitions/orderedList_node"
+          "$ref": "#/definitions/bulletList_node"
         },
         {
-          "$ref": "#/definitions/bulletList_node"
+          "$ref": "#/definitions/orderedList_node"
         },
         {
-          "$ref": "#/definitions/blockquote_node"
+          "$ref": "#/definitions/heading_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/decisionList_node"
+          "$ref": "#/definitions/heading_with_alignment_node"
         },
         {
-          "$ref": "#/definitions/embedCard_node"
+          "$ref": "#/definitions/heading_with_indentation_node"
         },
         {
-          "$ref": "#/definitions/extension_with_marks_node"
+          "$ref": "#/definitions/mediaGroup_node"
         },
         {
-          "$ref": "#/definitions/heading_with_indentation_node"
+          "$ref": "#/definitions/decisionList_node"
         },
         {
-          "$ref": "#/definitions/heading_with_no_marks_node"
+          "$ref": "#/definitions/rule_node"
         },
         {
-          "$ref": "#/definitions/heading_with_alignment_node"
+          "$ref": "#/definitions/panel_node"
         },
         {
-          "$ref": "#/definitions/mediaGroup_node"
+          "$ref": "#/definitions/panel_with_nested_blockquote_node"
         },
         {
-          "$ref": "#/definitions/rule_node"
+          "$ref": "#/definitions/blockquote_node"
         },
         {
-          "$ref": "#/definitions/panel_node"
+          "$ref": "#/definitions/extension_with_marks_node"
         },
         {
-          "$ref": "#/definitions/panel_with_nested_blockquote_node"
+          "$ref": "#/definitions/embedCard_node"
         },
         {
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/bodiedExtension_with_marks_node"
+          "$ref": "#/definitions/expand_with_no_mark_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/bodiedExtension_with_marks_node"
         }
       ]
     },
@@ -245,7 +245,7 @@
                 "$ref": "#/definitions/bulletList_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
@@ -499,13 +499,17 @@
           "enum": ["codeBlock"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -534,41 +538,53 @@
       "additionalProperties": false,
       "required": ["type"]
     },
-    "codeBlock_with_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/codeBlock_node"
+    "codeBlock_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["codeBlock"]
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "codeBlock_with_no_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/codeBlock_node"
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        {
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
+            "language": {
+              "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
+          "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "allOf": [
+              {
+                "$ref": "#/definitions/text_node"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "marks": {
+                    "type": "array",
+                    "maxItems": 0
+                  }
+                },
+                "additionalProperties": true
+              }
+            ]
+          }
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type"]
     },
     "dataConsumer_mark": {
       "type": "object",
@@ -691,10 +707,7 @@
                 "$ref": "#/definitions/blockCard_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_marks_node"
-              },
-              {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
@@ -765,6 +778,9 @@
               {
                 "$ref": "#/definitions/expand_with_breakout_mark_node"
               },
+              {
+                "$ref": "#/definitions/codeBlock_root_only_node"
+              },
               {
                 "$ref": "#/definitions/layoutSection_with_single_column_node"
               },
@@ -1050,7 +1066,7 @@
                 "$ref": "#/definitions/heading_with_no_marks_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/mediaGroup_node"
@@ -1596,7 +1612,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 }
               ]
             },
@@ -1621,7 +1637,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 }
               ]
             }
@@ -1653,7 +1669,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 },
                 {
                   "$ref": "#/definitions/decisionList_node"
@@ -1681,7 +1697,7 @@
                   "$ref": "#/definitions/mediaSingle_full_node"
                 },
                 {
-                  "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                  "$ref": "#/definitions/codeBlock_node"
                 },
                 {
                   "$ref": "#/definitions/decisionList_node"
@@ -2074,7 +2090,7 @@
             "$ref": "#/definitions/mediaGroup_node"
           },
           {
-            "$ref": "#/definitions/codeBlock_with_no_marks_node"
+            "$ref": "#/definitions/codeBlock_node"
           },
           {
             "$ref": "#/definitions/bulletList_node"
@@ -2164,7 +2180,7 @@
           "$ref": "#/definitions/heading_with_no_marks_node"
         },
         {
-          "$ref": "#/definitions/codeBlock_with_no_marks_node"
+          "$ref": "#/definitions/codeBlock_node"
         },
         {
           "$ref": "#/definitions/mediaGroup_node"
@@ -2294,7 +2310,7 @@
                 "$ref": "#/definitions/mediaSingle_full_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/taskList_node"
@@ -2378,7 +2394,7 @@
                 "$ref": "#/definitions/mediaSingle_full_node"
               },
               {
-                "$ref": "#/definitions/codeBlock_with_no_marks_node"
+                "$ref": "#/definitions/codeBlock_node"
               },
               {
                 "$ref": "#/definitions/taskList_node"
@@ -2624,7 +2640,7 @@
             "$ref": "#/definitions/heading_with_indentation_node"
           },
           {
-            "$ref": "#/definitions/codeBlock_with_no_marks_node"
+            "$ref": "#/definitions/codeBlock_node"
           },
           {
             "$ref": "#/definitions/mediaSingle_caption_node"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "44.7.0",
+  "version": "45.1.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.24.0",
-    "@atlaskit/adf-schema-generator": "^1.38.1",
+    "@atlaskit/adf-schema-generator": "^1.38.3",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",

package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts

@@ -77,7 +77,7 @@ const panel = {
           'mediaGroup',
           'mediaSingle_caption',
           'mediaSingle_full',
-          'codeBlock_with_no_marks',
+          'codeBlock',
           'taskList',
           'rule',
           'decisionList',