@atlaskit/adf-schema 45.1.0 → 46.0.0

package/dist/types/schema/nodes/expand.d.ts

@@ -17,16 +17,15 @@ export interface ExpandBaseDefinition {
      * @allowUnsupportedBlock true
      */
     content: Array<NonNestableBlockContent | NestedExpandDefinition>;
-    marks?: Array<any>;
 }
 /**
  * @name expand_with_no_mark_node
  */
 export type ExpandDefinition = ExpandBaseDefinition & NoMark;
 /**
- * @name expand_with_breakout_mark_node
+ * @name expand_root_only_node
  */
-export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
+export type ExpandRootOnlyDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
 export declare const expand: import("prosemirror-model").NodeSpec;
 export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
 export declare const toJSON: (node: PMNode) => {

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

@@ -295,16 +295,7 @@ export declare const codeBlock: {
         };
         content: {
             type: string;
-            items: (string | {
-                props: {
-                    marks: {
-                        items: any[];
-                        maxItems: number;
-                        optional: boolean;
-                        type: string;
-                    };
-                };
-            })[][];
+            items: string[];
             optional: boolean;
             allowUnsupportedInline: boolean;
         };
@@ -526,14 +517,9 @@ export declare const expand: {
             minItems: number;
             allowUnsupportedBlock: boolean;
         };
-        marks: {
-            type: string;
-            items: any[];
-            optional: boolean;
-        };
     };
 };
-export declare const expand_with_breakout_mark: (string | {
+export declare const expand_root_only: (string | {
     props: {
         marks: {
             type: string;
@@ -542,16 +528,6 @@ export declare const expand_with_breakout_mark: (string | {
         };
     };
 })[];
-export declare const expand_with_no_mark: (string | {
-    props: {
-        marks: {
-            type: string;
-            maxItems: number;
-            items: any[];
-            optional: boolean;
-        };
-    };
-})[];
 export declare const extension: {
     props: {
         type: {
@@ -1742,6 +1718,16 @@ export declare const text_link_inline: (string | {
         };
     };
 })[];
+export declare const text_with_no_marks: (string | {
+    props: {
+        marks: {
+            type: string;
+            maxItems: number;
+            items: any[];
+            optional: boolean;
+        };
+    };
+})[];
 export declare const textColor: {
     props: {
         type: {

package/json-schema/v1/full.json

@@ -133,7 +133,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -507,21 +507,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -555,21 +541,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -754,16 +726,16 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
               },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -860,7 +832,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -889,41 +862,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",
@@ -2532,6 +2508,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

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

@@ -136,7 +136,7 @@
           "$ref": "#/definitions/table_node"
         },
         {
-          "$ref": "#/definitions/expand_with_no_mark_node"
+          "$ref": "#/definitions/expand_node"
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
@@ -517,21 +517,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -565,21 +551,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -773,10 +745,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/expand_with_no_mark_node"
-              },
-              {
-                "$ref": "#/definitions/expand_with_breakout_mark_node"
+                "$ref": "#/definitions/expand_node"
               },
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
@@ -789,6 +758,9 @@
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"
+              },
+              {
+                "$ref": "#/definitions/expand_root_only_node"
               }
             ]
           }
@@ -891,7 +863,8 @@
           "enum": ["expand"]
         },
         "marks": {
-          "type": "array"
+          "type": "array",
+          "maxItems": 0
         },
         "attrs": {
           "type": "object",
@@ -920,41 +893,44 @@
       "additionalProperties": false,
       "required": ["type", "content", "attrs"]
     },
-    "expand_with_breakout_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+    "expand_root_only_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["expand"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
+            "title": {
+              "type": "string"
             }
           },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "expand_with_no_mark_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/expand_node"
+          "additionalProperties": false
         },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "maxItems": 0
-            }
+        "content": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/non_nestable_block_content"
+              },
+              {
+                "$ref": "#/definitions/nestedExpand_with_no_marks_node"
+              }
+            ]
           },
-          "additionalProperties": true
+          "minItems": 1
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extension_node": {
       "type": "object",
@@ -2901,6 +2877,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "45.1.0",
+  "version": "46.0.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.3",
+    "@atlaskit/adf-schema-generator": "^2.0.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",