@atlaskit/adf-schema 44.7.0 → 45.1.0

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

@@ -7,10 +7,6 @@ import { unsupportedInline } from './unsupportedInline';
 export const codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  marks: [unsupportedMark, unsupportedNodeAttribute],
-  hasEmptyMarks: true,
   attrs: {
     language: {
       type: 'string',
@@ -23,13 +19,10 @@ export const codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
+  noMarks: true,
   content: [$zeroPlus($or(text, unsupportedInline))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
-      'props.attrs.props.uniqueId': {
-        remove: true,
-        reason: '@DSLCompatibilityException - uniqueId is missing in the existing validator spec'
-      },
       'props.content.items': {
         value: [['text', {
           props: {
@@ -45,13 +38,10 @@ export const codeBlock = adfNode('codeBlock').define({
       }
     }
   }
-}).variant('with_marks', {
+})
+// Variant used root scenario where we have breakout
+.variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  ignore: ['pm-spec']
-}).variant('with_no_marks', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
-});
-export const codeBlockWithNoMarks = codeBlock;
+  noMarks: false,
+  noExtend: true
+});

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

@@ -30,7 +30,7 @@ export const extensionFrame = adfNode('extensionFrame').define({
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
-  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -14,9 +14,9 @@ const listItem = adfNode('listItem').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   contentMinItems: 1,
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))]
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock))]
 }).variant('with_nested_decision', {
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList))],
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList))],
   noExtend: true,
   stage0: true
 });

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

@@ -91,13 +91,5 @@ export const mediaInline = adfNode('mediaInline').define({
       type: 'object',
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.url': {
-        remove: true,
-        reason: '@DSLCompatibilityException - url is not specified on the validator spec (but it probably should be)'
-      }
-    }
   }
 });

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

@@ -29,7 +29,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock.use('with_no_marks'), bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -43,9 +43,9 @@ export const panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock))]
 }).variant('with_nested_blockquote', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock, blockquote))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock, blockquote))],
   noExtend: true,
   stage0: true
 });

package/dist/es2019/schema/nodes/code-block.js

@@ -1,16 +1,12 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { codeBlock as codeBlockFactory } from '../../next-schema/generated/nodeTypes';
 
-/**
- * @name codeBlock_node
- */
-
 /**
  * @name codeBlock_with_no_marks_node
  */
 
 /**
- * @name codeBlock_with_marks_node
+ * @name codeBlock_node
  */
 
 const getLanguageFromEditorStyle = dom => {

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

@@ -49,7 +49,7 @@ export const backgroundColor = {
     }
   }
 };
-export const block_content = ['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'];
+export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', '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'];
 export const blockCard = {
   props: {
     type: {
@@ -123,7 +123,7 @@ export const blockquote = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
+      items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -275,6 +275,10 @@ export const codeBlock = {
         language: {
           type: 'string',
           optional: true
+        },
+        uniqueId: {
+          type: 'string',
+          optional: true
         }
       },
       optional: true
@@ -293,15 +297,10 @@ export const codeBlock = {
       }]],
       optional: true,
       allowUnsupportedInline: true
-    },
-    marks: {
-      type: 'array',
-      items: [],
-      optional: true
     }
   }
 };
-export const codeBlock_with_marks = ['codeBlock', {
+export const codeBlock_root_only = ['codeBlock', {
   props: {
     marks: {
       type: 'array',
@@ -310,16 +309,6 @@ export const codeBlock_with_marks = ['codeBlock', {
     }
   }
 }];
-export const codeBlock_with_no_marks = ['codeBlock', {
-  props: {
-    marks: {
-      type: 'array',
-      maxItems: 0,
-      items: [],
-      optional: true
-    }
-  }
-}];
 export const confluenceInlineComment = {
   props: {
     type: {
@@ -432,7 +421,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_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', '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_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }
@@ -523,7 +512,7 @@ export const expand = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     },
@@ -613,7 +602,7 @@ export const extensionFrame = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
+      items: [['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1
     },
     marks: {
@@ -940,7 +929,7 @@ export const listItem = {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -951,7 +940,7 @@ export const listItem_with_nested_decision = ['listItem', {
     content: {
       type: 'array',
       isTupleLike: true,
-      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList']],
+      items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'decisionList'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'decisionList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1052,6 +1041,10 @@ export const mediaInline = {
           values: ['link', 'file', 'image'],
           optional: true
         },
+        url: {
+          type: 'string',
+          optional: true
+        },
         id: {
           minLength: 1,
           type: 'string'
@@ -1274,7 +1267,7 @@ export const nestedExpand = {
 };
 export const nestedExpand_content = {
   type: 'array',
-  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
+  items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
   minItems: 1,
   allowUnsupportedBlock: true
 };
@@ -1288,7 +1281,7 @@ export const nestedExpand_with_no_marks = ['nestedExpand', {
     }
   }
 }];
-export const non_nestable_block_content = ['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+export const non_nestable_block_content = ['paragraph_with_no_marks', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export const orderedList = {
   props: {
     type: {
@@ -1344,7 +1337,7 @@ export const panel = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1354,7 +1347,7 @@ export const panel_with_nested_blockquote = ['panel', {
   props: {
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList', 'blockquote']],
+      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'blockquote']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1582,7 +1575,7 @@ export const tableCell = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       allowUnsupportedBlock: true
     }
@@ -1621,7 +1614,7 @@ export const tableHeader = {
     },
     content: {
       type: 'array',
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1
     }
   },

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

@@ -3,12 +3,12 @@ import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
 import { blockContentGroup } from './groups/blockContentGroup';
-import { codeBlock } from './nodes/codeBlock';
 import { expand } from './nodes/expand';
+import { codeBlock } from './nodes/codeBlock';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), 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/generated/nodeTypes.js

@@ -130,9 +130,9 @@ export var codeBlock = createPMNodeSpecFactory({
   code: true,
   defining: true
 });
-export var codeBlockWithNoMarks = createPMNodeSpecFactory({
+export var codeBlockRootOnly = createPMNodeSpecFactory({
+  content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
   attrs: {
     language: {
       default: null
@@ -230,7 +230,7 @@ export var decisionList = createPMNodeSpecFactory({
   defining: true
 });
 export var doc = createPMNodeSpecFactory({
-  content: '(block | layoutSection | blockRootOnly)+',
+  content: '(block | codeBlock | layoutSection | blockRootOnly)+',
   marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment breakout'
 });
 export var embedCard = createPMNodeSpecFactory({

package/dist/esm/next-schema/groups/blockContentGroup.js

@@ -32,8 +32,8 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table,
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
-  ignore: ['pm-spec', 'json-schema']
+  ignore: ['pm-spec']
 });

package/dist/esm/next-schema/groups/blockGroup.js

@@ -18,10 +18,10 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), table,
+export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
-  ignore: ['validator-spec']
+  ignore: ['validator-spec', 'json-schema']
 });

package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js

@@ -18,7 +18,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export var nonNestableBlockContent = [paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
+export var nonNestableBlockContent = [paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
 

package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -13,7 +13,7 @@ export var blockquote = adfNode('blockquote').define({
   // Marks don't make it into the PM node spec, as they get overridden by the marks in
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [unsupportedMark, unsupportedNodeAttribute],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]

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

@@ -7,10 +7,6 @@ import { unsupportedInline } from './unsupportedInline';
 export var codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  marks: [unsupportedMark, unsupportedNodeAttribute],
-  hasEmptyMarks: true,
   attrs: {
     language: {
       type: 'string',
@@ -23,13 +19,10 @@ export var codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
+  noMarks: true,
   content: [$zeroPlus($or(text, unsupportedInline))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
-      'props.attrs.props.uniqueId': {
-        remove: true,
-        reason: '@DSLCompatibilityException - uniqueId is missing in the existing validator spec'
-      },
       'props.content.items': {
         value: [['text', {
           props: {
@@ -45,13 +38,10 @@ export var codeBlock = adfNode('codeBlock').define({
       }
     }
   }
-}).variant('with_marks', {
+})
+// Variant used root scenario where we have breakout
+.variant('root_only', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  ignore: ['pm-spec']
-}).variant('with_no_marks', {
-  content: [],
-  marks: [],
-  noMarks: true,
-  ignore: []
-});
-export var codeBlockWithNoMarks = codeBlock;
+  noMarks: false,
+  noExtend: true
+});

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

@@ -30,7 +30,7 @@ export var extensionFrame = adfNode('extensionFrame').define({
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
-  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -14,9 +14,9 @@ var listItem = adfNode('listItem').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   contentMinItems: 1,
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))]
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock))]
 }).variant('with_nested_decision', {
-  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList))],
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, decisionList))],
   noExtend: true,
   stage0: true
 });

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

@@ -91,13 +91,5 @@ export var mediaInline = adfNode('mediaInline').define({
       type: 'object',
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.url': {
-        remove: true,
-        reason: '@DSLCompatibilityException - url is not specified on the validator spec (but it probably should be)'
-      }
-    }
   }
 });

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

@@ -29,7 +29,7 @@ export var nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock.use('with_no_marks'), bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -43,9 +43,9 @@ export var panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock))]
 }).variant('with_nested_blockquote', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock, blockquote))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock, blockquote))],
   noExtend: true,
   stage0: true
 });

package/dist/esm/schema/nodes/code-block.js

@@ -1,16 +1,12 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { codeBlock as codeBlockFactory } from '../../next-schema/generated/nodeTypes';
 
-/**
- * @name codeBlock_node
- */
-
 /**
  * @name codeBlock_with_no_marks_node
  */
 
 /**
- * @name codeBlock_with_marks_node
+ * @name codeBlock_node
  */
 
 var getLanguageFromEditorStyle = function getLanguageFromEditorStyle(dom) {