@atlaskit/adf-schema 57.5.4 → 57.6.1

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -787,6 +787,30 @@ export declare const extension_root_only: (string | {
         };
     };
 })[];
+export declare const extension_root_only_with_annotation: (string | {
+    meta: {
+        stage0: boolean;
+    };
+    props: {
+        marks: {
+            items: string[][];
+            optional: boolean;
+            type: string;
+        };
+    };
+})[];
+export declare const extension_with_annotation: (string | {
+    meta: {
+        stage0: boolean;
+    };
+    props: {
+        marks: {
+            items: string[][];
+            optional: boolean;
+            type: string;
+        };
+    };
+})[];
 export declare const extension_with_marks: (string | {
     props: {
         marks: {

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

@@ -132,6 +132,9 @@
         {
           "$ref": "#/definitions/extension_with_marks_node"
         },
+        {
+          "$ref": "#/definitions/extension_with_annotation_node"
+        },
         {
           "$ref": "#/definitions/embedCard_node"
         },
@@ -279,6 +282,9 @@
               },
               {
                 "$ref": "#/definitions/extension_with_marks_node"
+              },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
               }
             ]
           },
@@ -320,6 +326,9 @@
                 },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
+                },
+                {
+                  "$ref": "#/definitions/extension_with_annotation_node"
                 }
               ]
             },
@@ -333,6 +342,9 @@
                 },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
+                },
+                {
+                  "$ref": "#/definitions/extension_with_annotation_node"
                 }
               ]
             }
@@ -1100,6 +1112,9 @@
               {
                 "$ref": "#/definitions/extension_with_marks_node"
               },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/heading_with_indentation_node"
               },
@@ -1157,6 +1172,9 @@
               {
                 "$ref": "#/definitions/extension_root_only_node"
               },
+              {
+                "$ref": "#/definitions/extension_root_only_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/bodiedExtension_root_only_node"
               },
@@ -1310,6 +1328,9 @@
               {
                 "$ref": "#/definitions/non_nestable_block_content"
               },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/nestedExpand_with_no_marks_node"
               }
@@ -1352,6 +1373,9 @@
               {
                 "$ref": "#/definitions/non_nestable_block_content"
               },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/nestedExpand_with_no_marks_node"
               }
@@ -1431,6 +1455,67 @@
         }
       ]
     },
+    "extension_root_only_with_annotation_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/extension_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/annotation_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/breakout_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
+              }
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
+    "extension_with_annotation_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/extension_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/annotation_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
+              }
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "extension_with_marks_node": {
       "allOf": [
         {
@@ -2132,6 +2217,9 @@
               },
               {
                 "$ref": "#/definitions/extension_with_marks_node"
+              },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
               }
             ]
           },
@@ -2625,6 +2713,9 @@
           },
           {
             "$ref": "#/definitions/extension_with_marks_node"
+          },
+          {
+            "$ref": "#/definitions/extension_with_annotation_node"
           }
         ]
       },
@@ -2857,6 +2948,9 @@
               {
                 "$ref": "#/definitions/extension_with_marks_node"
               },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/table_node"
               }
@@ -2965,6 +3059,9 @@
               {
                 "$ref": "#/definitions/extension_with_marks_node"
               },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
+              },
               {
                 "$ref": "#/definitions/table_node"
               }
@@ -3066,6 +3163,9 @@
               },
               {
                 "$ref": "#/definitions/extension_with_marks_node"
+              },
+              {
+                "$ref": "#/definitions/extension_with_annotation_node"
               }
             ]
           },
@@ -3140,6 +3240,9 @@
                   },
                   {
                     "$ref": "#/definitions/extension_with_marks_node"
+                  },
+                  {
+                    "$ref": "#/definitions/extension_with_annotation_node"
                   }
                 ]
               },
@@ -3569,6 +3672,9 @@
           {
             "$ref": "#/definitions/extension_with_marks_node"
           },
+          {
+            "$ref": "#/definitions/extension_with_annotation_node"
+          },
           {
             "$ref": "#/definitions/nestedExpand_with_no_marks_node"
           }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "57.5.4",
+	"version": "57.6.1",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -40,13 +40,17 @@
 		"@atlaskit/adf-schema-generator": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^201.0.0",
+		"@atlaskit/tmp-editor-statsig": "^202.0.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^5.0.2",
 		"memoize-one": "^6.0.0"
 	},
 	"platform-feature-flags": {
+		"cc_maui_annotations_on_extensions": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_bugfix_invalid_urls_parsing_in_editor": {
 			"type": "boolean"
 		},

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

@@ -82,6 +82,7 @@ const panel = {
 					'bodiedRule',
 					'decisionList',
 					'extension_with_marks',
+					'extension_with_annotation',
 				],
 			],
 			minItems: 1,