@atlaskit/adf-schema 42.2.0 → 42.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 42.3.0
+
+### Minor Changes
+
+- 8aff3bc: [ED-25105] This change aligns the node attributes between schema and next-schema for these nodes: codeblock, expand and nested expand, media and media inline.
+
+## 42.2.1
+
+### Patch Changes
+
+- e4e695f: Change order of layoutSection_with_single_column with layoutSection_full to fix validator issues in the editor
+
 ## 42.2.0
 
 ### Minor Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -14,7 +14,7 @@ var _expand = require("./nodes/expand");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('with_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _layoutSection.layoutSection.use('with_single_column'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('with_breakout_mark')))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('with_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('with_breakout_mark')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

package/dist/cjs/next-schema/nodes/media.js

@@ -56,7 +56,8 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -71,7 +72,7 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -109,6 +110,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -1781,26 +1781,6 @@ var layoutSection = exports.layoutSection = {
     }
   }
 };
-var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
-  props: {
-    content: {
-      type: 'array',
-      items: ['layoutColumn'],
-      minItems: 2,
-      maxItems: 3,
-      allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      optional: true,
-      items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    }
-  }
-}];
 var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
   props: {
     attrs: {
@@ -1831,6 +1811,26 @@ var layoutSection_with_single_column = exports.layoutSection_with_single_column
     }
   }
 }];
+var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
+  props: {
+    content: {
+      type: 'array',
+      items: ['layoutColumn'],
+      minItems: 2,
+      maxItems: 3,
+      allowUnsupportedBlock: true
+    },
+    marks: {
+      type: 'array',
+      optional: true,
+      items: ['breakout']
+    },
+    type: {
+      type: 'enum',
+      values: ['layoutSection']
+    }
+  }
+}];
 var extensionFrame = exports.extensionFrame = {
   props: {
     type: {
@@ -1925,7 +1925,7 @@ var doc = exports.doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/dist/es2019/next-schema/full-schema.adf.js

@@ -8,7 +8,7 @@ import { expand } from './nodes/expand';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('full'), layoutSection.use('with_single_column'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

package/dist/es2019/next-schema/nodes/media.js

@@ -50,7 +50,8 @@ export const media = adfNode('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -65,7 +66,7 @@ export const media = adfNode('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -103,6 +104,11 @@ export const media = adfNode('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -1775,26 +1775,6 @@ export const layoutSection = {
     }
   }
 };
-export const layoutSection_full = ['layoutSection', {
-  props: {
-    content: {
-      type: 'array',
-      items: ['layoutColumn'],
-      minItems: 2,
-      maxItems: 3,
-      allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      optional: true,
-      items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    }
-  }
-}];
 export const layoutSection_with_single_column = ['layoutSection', {
   props: {
     attrs: {
@@ -1825,6 +1805,26 @@ export const layoutSection_with_single_column = ['layoutSection', {
     }
   }
 }];
+export const layoutSection_full = ['layoutSection', {
+  props: {
+    content: {
+      type: 'array',
+      items: ['layoutColumn'],
+      minItems: 2,
+      maxItems: 3,
+      allowUnsupportedBlock: true
+    },
+    marks: {
+      type: 'array',
+      optional: true,
+      items: ['breakout']
+    },
+    type: {
+      type: 'enum',
+      values: ['layoutSection']
+    }
+  }
+}];
 export const extensionFrame = {
   props: {
     type: {
@@ -1919,7 +1919,7 @@ export const doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/dist/esm/next-schema/full-schema.adf.js

@@ -8,7 +8,7 @@ import { expand } from './nodes/expand';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('full'), layoutSection.use('with_single_column'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

package/dist/esm/next-schema/nodes/media.js

@@ -50,7 +50,8 @@ export var media = adfNode('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -65,7 +66,7 @@ export var media = adfNode('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -103,6 +104,11 @@ export var media = adfNode('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

package/dist/esm/validator-schema/generated/validatorSpec.js

@@ -1775,26 +1775,6 @@ export var layoutSection = {
     }
   }
 };
-export var layoutSection_full = ['layoutSection', {
-  props: {
-    content: {
-      type: 'array',
-      items: ['layoutColumn'],
-      minItems: 2,
-      maxItems: 3,
-      allowUnsupportedBlock: true
-    },
-    marks: {
-      type: 'array',
-      optional: true,
-      items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    }
-  }
-}];
 export var layoutSection_with_single_column = ['layoutSection', {
   props: {
     attrs: {
@@ -1825,6 +1805,26 @@ export var layoutSection_with_single_column = ['layoutSection', {
     }
   }
 }];
+export var layoutSection_full = ['layoutSection', {
+  props: {
+    content: {
+      type: 'array',
+      items: ['layoutColumn'],
+      minItems: 2,
+      maxItems: 3,
+      allowUnsupportedBlock: true
+    },
+    marks: {
+      type: 'array',
+      optional: true,
+      items: ['breakout']
+    },
+    type: {
+      type: 'enum',
+      values: ['layoutSection']
+    }
+  }
+}];
 export var extensionFrame = {
   props: {
     type: {
@@ -1919,7 +1919,7 @@ export var doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

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

@@ -2613,37 +2613,6 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "layoutSection_full_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 2,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
-            }
-          },
-          "required": ["type", "content"],
-          "additionalProperties": false
-        }
-      ]
-    },
     "layoutSection_with_single_column_node": {
       "type": "object",
       "properties": {
@@ -2677,6 +2646,37 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            },
+            "type": {
+              "enum": ["layoutSection"]
+            }
+          },
+          "required": ["type", "content"],
+          "additionalProperties": false
+        }
+      ]
+    },
     "extensionFrame_node": {
       "type": "object",
       "properties": {
@@ -2896,10 +2896,10 @@
                 "$ref": "#/definitions/expand_with_breakout_mark_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_full_node"
+                "$ref": "#/definitions/layoutSection_with_single_column_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_with_single_column_node"
+                "$ref": "#/definitions/layoutSection_full_node"
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -457,10 +457,10 @@ export interface MediaNodeAttributes0 {
     occurrenceKey?: string;
     width?: number;
     __contextId?: string;
-    __displayType?: string;
+    __displayType?: 'file' | 'thumbnail';
     __external?: boolean;
     __fileMimeType?: string;
-    __fileName?: string;
+    __fileName?: number;
     __fileSize?: string;
     __mediaTraceId?: string;
 }
@@ -470,6 +470,7 @@ export interface MediaNodeAttributes1 {
     height?: number;
     width?: number;
     url: string;
+    __external?: boolean;
 }
 export interface MediaDefinition {
     type: 'media';

package/dist/types/schema/nodes/code-block.d.ts

@@ -16,6 +16,7 @@ export type CodeBlockBaseDefinition = {
 };
 export type CodeBlockAttrs = {
     language?: string;
+    uniqueId?: string;
 };
 /**
  * @name codeBlock_with_no_marks_node

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

@@ -10,6 +10,7 @@ export interface ExpandBaseDefinition {
     type: 'expand';
     attrs: {
         title?: string;
+        __expanded?: boolean;
     };
     /**
      * @minItems 1

package/dist/types/schema/nodes/media-inline.d.ts

@@ -6,6 +6,7 @@ import { AnnotationMarkDefinition } from '../marks/annotation';
 export interface MediaInlineAttributes extends MediaBaseAttributes {
     data?: object;
     type?: 'file' | 'link' | 'image';
+    url?: string | null;
 }
 /**
  * @name mediaInline_node

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

@@ -23,6 +23,7 @@ export interface NestedExpandBaseDefinition {
     type: 'nestedExpand';
     attrs: {
         title?: string;
+        __expanded?: boolean;
     };
     content: NestedExpandContent;
 }

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

@@ -1794,26 +1794,6 @@ export declare const layoutSection: {
         };
     };
 };
-export declare const layoutSection_full: (string | {
-    props: {
-        content: {
-            type: string;
-            items: string[];
-            minItems: number;
-            maxItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-        marks: {
-            type: string;
-            optional: boolean;
-            items: string[];
-        };
-        type: {
-            type: string;
-            values: string[];
-        };
-    };
-})[];
 export declare const layoutSection_with_single_column: (string | {
     props: {
         attrs: {
@@ -1844,6 +1824,26 @@ export declare const layoutSection_with_single_column: (string | {
         };
     };
 })[];
+export declare const layoutSection_full: (string | {
+    props: {
+        content: {
+            type: string;
+            items: string[];
+            minItems: number;
+            maxItems: number;
+            allowUnsupportedBlock: boolean;
+        };
+        marks: {
+            type: string;
+            optional: boolean;
+            items: string[];
+        };
+        type: {
+            type: string;
+            values: string[];
+        };
+    };
+})[];
 export declare const extensionFrame: {
     props: {
         type: {

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

@@ -2613,37 +2613,6 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
-    "layoutSection_full_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 2,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
-            }
-          },
-          "required": ["type", "content"],
-          "additionalProperties": false
-        }
-      ]
-    },
     "layoutSection_with_single_column_node": {
       "type": "object",
       "properties": {
@@ -2677,6 +2646,37 @@
       "additionalProperties": false,
       "required": ["type", "content"]
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            },
+            "type": {
+              "enum": ["layoutSection"]
+            }
+          },
+          "required": ["type", "content"],
+          "additionalProperties": false
+        }
+      ]
+    },
     "extensionFrame_node": {
       "type": "object",
       "properties": {
@@ -2896,10 +2896,10 @@
                 "$ref": "#/definitions/expand_with_breakout_mark_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_full_node"
+                "$ref": "#/definitions/layoutSection_with_single_column_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_with_single_column_node"
+                "$ref": "#/definitions/layoutSection_full_node"
               },
               {
                 "$ref": "#/definitions/multiBodiedExtension_node"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "42.2.0",
+  "version": "42.3.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.22.0",
-    "@atlaskit/adf-schema-generator": "^1.32.1",
+    "@atlaskit/adf-schema-generator": "^1.33.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",