@atlaskit/adf-schema 47.3.1 → 47.5.0

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

@@ -28,7 +28,7 @@ export { mention, toJSON as mentionToJSON } from './mention';
 export type { MentionAttributes, UserType as MentionUserType, MentionDefinition, } from './mention';
 export { listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithNonBodiedMacrosStage0, } from './list-item';
 export type { ListItemArray, ListItemDefinition } from './types/list';
-export { extendedPanel, PanelType, panelWithNonBodiedMacrosStage0, } from './panel';
+export { extendedPanel, panelWithoutNestedNonBodiedMacros, PanelType, } from './panel';
 export type { PanelAttributes, PanelDefinition } from './panel';
 export { text } from './text';
 export type { TextDefinition } from './text';
@@ -69,7 +69,7 @@ export { unsupportedBlock } from './unsupported-block';
 export { unsupportedInline } from './unsupported-inline';
 export { status } from './status';
 export type { StatusDefinition } from './status';
-export { nestedExpand, nestedExpandWithNonBodiedMacrosStage0, } from './nested-expand';
+export { nestedExpand, nestedExpandWithoutNonBodiedMacros, } from './nested-expand';
 export type { NestedExpandDefinition } from './nested-expand';
 export type { NoMark } from './types/mark';
 export type { MarksObject } from './types/mark';

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

@@ -37,7 +37,7 @@ export type NestedExpandDefinition = NestedExpandBaseDefinition & NoMark;
  */
 export declare const nestedExpand: import("prosemirror-model").NodeSpec;
 /**
- * @name nestedExpandWithNonBodiedMacrosStage0
+ * @name nestedExpandWithNonBodiedMacros
  * @description an expand that can be nested (eg. inside table, layout).
  */
-export declare const nestedExpandWithNonBodiedMacrosStage0: import("prosemirror-model").NodeSpec;
+export declare const nestedExpandWithoutNonBodiedMacros: import("prosemirror-model").NodeSpec;

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

@@ -47,4 +47,4 @@ export interface DOMAttributes {
  * addition to content allowed inside panel
  */
 export declare const extendedPanel: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
-export declare const panelWithNonBodiedMacrosStage0: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
+export declare const panelWithoutNestedNonBodiedMacros: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;

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

@@ -1268,12 +1268,7 @@ export declare const nestedExpand: {
                 };
             };
         };
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
+        content: string;
     };
     required: string[];
 };
@@ -1293,22 +1288,6 @@ export declare const nestedExpand_with_no_marks: (string | {
         };
     };
 })[];
-export declare const nestedExpand_with_non_bodied_macros: (string | {
-    props: {
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-        marks: {
-            type: string;
-            maxItems: number;
-            items: any[];
-            optional: boolean;
-        };
-    };
-})[];
 export declare const non_nestable_block_content: string[];
 export declare const orderedList: {
     props: {
@@ -1371,16 +1350,6 @@ export declare const panel: {
         };
     };
 };
-export declare const panel_with_nested_non_bodied_macros: (string | {
-    props: {
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-    };
-})[];
 export declare const paragraph: {
     props: {
         type: {

package/json-schema/v1/full.json

@@ -1819,6 +1819,9 @@
           },
           {
             "$ref": "#/definitions/blockquote_node"
+          },
+          {
+            "$ref": "#/definitions/extension_with_marks_node"
           }
         ]
       },
@@ -2020,6 +2023,9 @@
               },
               {
                 "$ref": "#/definitions/decisionList_node"
+              },
+              {
+                "$ref": "#/definitions/extension_with_marks_node"
               }
             ]
           },

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

@@ -120,9 +120,6 @@
         {
           "$ref": "#/definitions/panel_node"
         },
-        {
-          "$ref": "#/definitions/panel_with_nested_non_bodied_macros_node"
-        },
         {
           "$ref": "#/definitions/blockquote_node"
         },
@@ -741,9 +738,6 @@
               {
                 "$ref": "#/definitions/panel_node"
               },
-              {
-                "$ref": "#/definitions/panel_with_nested_non_bodied_macros_node"
-              },
               {
                 "$ref": "#/definitions/table_node"
               },
@@ -890,9 +884,6 @@
               },
               {
                 "$ref": "#/definitions/nestedExpand_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/nestedExpand_with_non_bodied_macros_node"
               }
             ]
           },
@@ -932,9 +923,6 @@
               },
               {
                 "$ref": "#/definitions/nestedExpand_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/nestedExpand_with_non_bodied_macros_node"
               }
             ]
           },
@@ -2166,6 +2154,9 @@
           },
           {
             "$ref": "#/definitions/blockquote_node"
+          },
+          {
+            "$ref": "#/definitions/extension_with_marks_node"
           }
         ]
       },
@@ -2210,79 +2201,6 @@
         }
       ]
     },
-    "nestedExpand_with_non_bodied_macros_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["nestedExpand"]
-        },
-        "marks": {
-          "type": "array",
-          "maxItems": 0
-        },
-        "attrs": {
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/heading_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/mediaSingle_caption_node"
-              },
-              {
-                "$ref": "#/definitions/mediaSingle_full_node"
-              },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
-              {
-                "$ref": "#/definitions/codeBlock_node"
-              },
-              {
-                "$ref": "#/definitions/bulletList_node"
-              },
-              {
-                "$ref": "#/definitions/orderedList_node"
-              },
-              {
-                "$ref": "#/definitions/taskList_node"
-              },
-              {
-                "$ref": "#/definitions/decisionList_node"
-              },
-              {
-                "$ref": "#/definitions/rule_node"
-              },
-              {
-                "$ref": "#/definitions/panel_node"
-              },
-              {
-                "$ref": "#/definitions/blockquote_node"
-              },
-              {
-                "$ref": "#/definitions/extension_with_marks_node"
-              }
-            ]
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "content"]
-    },
     "non_nestable_block_content": {
       "anyOf": [
         {
@@ -2376,90 +2294,6 @@
       "required": ["type", "content"]
     },
     "panel_node": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["panel"]
-        },
-        "attrs": {
-          "type": "object",
-          "properties": {
-            "panelType": {
-              "enum": [
-                "info",
-                "note",
-                "tip",
-                "warning",
-                "error",
-                "success",
-                "custom"
-              ]
-            },
-            "panelIcon": {
-              "type": "string"
-            },
-            "panelIconId": {
-              "type": "string"
-            },
-            "panelIconText": {
-              "type": "string"
-            },
-            "panelColor": {
-              "type": "string"
-            }
-          },
-          "required": ["panelType"],
-          "additionalProperties": false
-        },
-        "content": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/heading_with_no_marks_node"
-              },
-              {
-                "$ref": "#/definitions/bulletList_node"
-              },
-              {
-                "$ref": "#/definitions/orderedList_node"
-              },
-              {
-                "$ref": "#/definitions/blockCard_node"
-              },
-              {
-                "$ref": "#/definitions/mediaGroup_node"
-              },
-              {
-                "$ref": "#/definitions/mediaSingle_caption_node"
-              },
-              {
-                "$ref": "#/definitions/mediaSingle_full_node"
-              },
-              {
-                "$ref": "#/definitions/codeBlock_node"
-              },
-              {
-                "$ref": "#/definitions/taskList_node"
-              },
-              {
-                "$ref": "#/definitions/rule_node"
-              },
-              {
-                "$ref": "#/definitions/decisionList_node"
-              }
-            ]
-          },
-          "minItems": 1
-        }
-      },
-      "additionalProperties": false,
-      "required": ["type", "attrs", "content"]
-    },
-    "panel_with_nested_non_bodied_macros_node": {
       "type": "object",
       "properties": {
         "type": {
@@ -2798,9 +2632,6 @@
           },
           {
             "$ref": "#/definitions/nestedExpand_with_no_marks_node"
-          },
-          {
-            "$ref": "#/definitions/nestedExpand_with_non_bodied_macros_node"
           }
         ]
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "47.3.1",
+  "version": "47.5.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.28.0",
+    "@atlassian/adf-schema-json": "^1.30.0",
     "@atlaskit/adf-schema-generator": "^2.1.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",