@atlaskit/adf-schema 57.7.28 → 57.7.30

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 57.7.30
+
+### Patch Changes
+
+- Updated dependencies
+
+## 57.7.29
+
+### Patch Changes
+
+- [`9de7fd5676824`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9de7fd5676824) -
+  [ux] [EDITOR-9955] preserve rule attributes (color, style and weight) inside nested containers
+  during renderer validation for `platform_editor_lovability_dividers_attributes`.
+
 ## 57.7.28
 
 ### Patch Changes

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

@@ -25,7 +25,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: ED-29537 - make it an actual group
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
+var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _unsupportedBlock.unsupportedBlock];
 

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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
+var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.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/cjs/next-schema/nodes/bodiedSyncBlock.js

@@ -46,7 +46,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfNode.adfNode)('bodiedSyn
   content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList,
   // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
   // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
-  _panel.panel.use('c1'), _panel.panel, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _tableNodes.table,
+  _panel.panel.use('c1'), _panel.panel, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _tableNodes.table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   _tableNodes.table.use('with_nested_table'), _task.taskList, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -39,7 +39,7 @@ var extensionFrame = exports.extensionFrame = (0, _adfNode.adfNode)('extensionFr
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: {},
-  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   _tableNodes.table.use('with_nested_table'), _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _unsupportedBlock.unsupportedBlock, _blockCard.blockCard, _embedCard.embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -23,7 +23,7 @@ var _paragraph = require("./paragraph");
 var _rule = require("./rule");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
-var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
+var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
 var nestedExpand = exports.nestedExpand = (0, _adfNode.adfNode)('nestedExpand').define({
   isolating: true,
   selectable: true,

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

@@ -24,7 +24,7 @@ var _rule = require("./rule");
 var _tableStub = require("./tableStub");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
-var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
+var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule.use('with_attrs'), _rule.rule, _bodiedRule.bodiedRule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
 var panel = exports.panel = (0, _adfNode.adfNode)('panel').define({
   selectable: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],

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

@@ -325,7 +325,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'rule_with_attrs', 'bodiedRule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule_with_attrs', 'rule', 'bodiedRule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -704,7 +704,7 @@ var expand = exports.expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -823,7 +823,7 @@ var extensionFrame = exports.extensionFrame = {
   },
   props: {
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1,
       type: 'array'
     },
@@ -1582,7 +1582,7 @@ var nestedExpand = exports.nestedExpand = {
 };
 var nestedExpand_content = exports.nestedExpand_content = {
   allowUnsupportedBlock: true,
-  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule_with_attrs', 'rule', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
   minItems: 1,
   type: 'array'
 };
@@ -1596,7 +1596,7 @@ var nestedExpand_with_no_marks = exports.nestedExpand_with_no_marks = ['nestedEx
     }
   }
 }];
-var non_nestable_block_content = exports.non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+var non_nestable_block_content = exports.non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 var orderedList = exports.orderedList = {
   props: {
     attrs: {
@@ -1656,7 +1656,7 @@ var panel = exports.panel = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -1673,7 +1673,7 @@ var panel_c1 = exports.panel_c1 = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     }
@@ -1686,7 +1686,7 @@ var panel_c1_root_only = exports.panel_c1_root_only = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     },
@@ -2062,7 +2062,7 @@ var tableCell = exports.tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -2109,7 +2109,7 @@ var tableHeader = exports.tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

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

@@ -20,7 +20,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: ED-29537 - make it an actual group
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
+export const nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule.use('with_attrs'), rule, bodiedRule, 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/es2019/next-schema/groups/tableCellContentPseudoGroup.js

@@ -19,7 +19,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, 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'), extension.use('with_annotation'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule.use('with_attrs'), rule, bodiedRule, 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'), extension.use('with_annotation'), 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/es2019/next-schema/nodes/bodiedSyncBlock.js

@@ -40,7 +40,7 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
   content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList,
   // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
   // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
-  panel.use('c1'), panel, rule, rule.use('with_attrs'), bodiedRule, table,
+  panel.use('c1'), panel, rule.use('with_attrs'), rule, bodiedRule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

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

@@ -33,7 +33,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'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  content: [$onePlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule.use('with_attrs'), rule, bodiedRule, 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/nestedExpand.js

@@ -17,7 +17,7 @@ import { paragraph } from './paragraph';
 import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
-const nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, unsupportedBlock];
+const nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule.use('with_attrs'), rule, bodiedRule, panel, blockquote, unsupportedBlock];
 export const nestedExpand = adfNode('nestedExpand').define({
   isolating: true,
   selectable: true,

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

@@ -18,7 +18,7 @@ import { rule } from './rule';
 import { table } from './tableStub';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
-const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, rule.use('with_attrs'), bodiedRule, decisionList, unsupportedBlock];
+const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule.use('with_attrs'), rule, bodiedRule, decisionList, unsupportedBlock];
 export const panel = adfNode('panel').define({
   selectable: true,
   marks: [unsupportedMark, unsupportedNodeAttribute],

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

@@ -318,7 +318,7 @@ export const bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'rule_with_attrs', 'bodiedRule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule_with_attrs', 'rule', 'bodiedRule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -697,7 +697,7 @@ export const expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -816,7 +816,7 @@ export const extensionFrame = {
   },
   props: {
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1,
       type: 'array'
     },
@@ -1575,7 +1575,7 @@ export const nestedExpand = {
 };
 export const nestedExpand_content = {
   allowUnsupportedBlock: true,
-  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule_with_attrs', 'rule', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
   minItems: 1,
   type: 'array'
 };
@@ -1589,7 +1589,7 @@ export const nestedExpand_with_no_marks = ['nestedExpand', {
     }
   }
 }];
-export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export const orderedList = {
   props: {
     attrs: {
@@ -1649,7 +1649,7 @@ export const panel = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -1666,7 +1666,7 @@ export const panel_c1 = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     }
@@ -1679,7 +1679,7 @@ export const panel_c1_root_only = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     },
@@ -2055,7 +2055,7 @@ export const tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -2102,7 +2102,7 @@ export const tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

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

@@ -20,7 +20,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: ED-29537 - make it an actual group
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export var nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
+export var nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule.use('with_attrs'), rule, bodiedRule, 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

@@ -19,7 +19,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, 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'), extension.use('with_annotation'), 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.use('with_attrs'), rule, bodiedRule, 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'), extension.use('with_annotation'), 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/bodiedSyncBlock.js

@@ -40,7 +40,7 @@ export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
   content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList,
   // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
   // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
-  panel.use('c1'), panel, rule, rule.use('with_attrs'), bodiedRule, table,
+  panel.use('c1'), panel, rule.use('with_attrs'), rule, bodiedRule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

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

@@ -33,7 +33,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'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  content: [$onePlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule.use('with_attrs'), rule, bodiedRule, 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/nestedExpand.js

@@ -17,7 +17,7 @@ import { paragraph } from './paragraph';
 import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
-var nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, unsupportedBlock];
+var nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule.use('with_attrs'), rule, bodiedRule, panel, blockquote, unsupportedBlock];
 export var nestedExpand = adfNode('nestedExpand').define({
   isolating: true,
   selectable: true,

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

@@ -18,7 +18,7 @@ import { rule } from './rule';
 import { table } from './tableStub';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
-var panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, rule.use('with_attrs'), bodiedRule, decisionList, unsupportedBlock];
+var panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule.use('with_attrs'), rule, bodiedRule, decisionList, unsupportedBlock];
 export var panel = adfNode('panel').define({
   selectable: true,
   marks: [unsupportedMark, unsupportedNodeAttribute],

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

@@ -318,7 +318,7 @@ export var bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'rule_with_attrs', 'bodiedRule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule_with_attrs', 'rule', 'bodiedRule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -697,7 +697,7 @@ export var expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -816,7 +816,7 @@ export var extensionFrame = {
   },
   props: {
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
       minItems: 1,
       type: 'array'
     },
@@ -1575,7 +1575,7 @@ export var nestedExpand = {
 };
 export var nestedExpand_content = {
   allowUnsupportedBlock: true,
-  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
+  items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule_with_attrs', 'rule', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'extension_with_annotation']],
   minItems: 1,
   type: 'array'
 };
@@ -1589,7 +1589,7 @@ export var nestedExpand_with_no_marks = ['nestedExpand', {
     }
   }
 }];
-export var non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+export var non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export var orderedList = {
   props: {
     attrs: {
@@ -1649,7 +1649,7 @@ export var panel = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation']],
       minItems: 1,
       type: 'array'
     },
@@ -1666,7 +1666,7 @@ export var panel_c1 = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     }
@@ -1679,7 +1679,7 @@ export var panel_c1_root_only = ['panel', {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule_with_attrs', 'rule', 'bodiedRule', 'decisionList', 'extension_with_marks', 'extension_with_annotation', 'table']],
       minItems: 1,
       type: 'array'
     },
@@ -2055,7 +2055,7 @@ export var tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -2102,7 +2102,7 @@ export var tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule_with_attrs', 'rule', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'extension_with_annotation', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

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

@@ -677,10 +677,10 @@
                 "$ref": "#/definitions/panel_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -1584,10 +1584,10 @@
                 "$ref": "#/definitions/bulletList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -2697,10 +2697,10 @@
             "$ref": "#/definitions/decisionList_node"
           },
           {
-            "$ref": "#/definitions/rule_node"
+            "$ref": "#/definitions/rule_with_attrs_node"
           },
           {
-            "$ref": "#/definitions/rule_with_attrs_node"
+            "$ref": "#/definitions/rule_node"
           },
           {
             "$ref": "#/definitions/bodiedRule_node"
@@ -2784,10 +2784,10 @@
           "$ref": "#/definitions/bulletList_node"
         },
         {
-          "$ref": "#/definitions/rule_node"
+          "$ref": "#/definitions/rule_with_attrs_node"
         },
         {
-          "$ref": "#/definitions/rule_with_attrs_node"
+          "$ref": "#/definitions/rule_node"
         },
         {
           "$ref": "#/definitions/bodiedRule_node"
@@ -2934,10 +2934,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3045,10 +3045,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3150,10 +3150,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3227,10 +3227,10 @@
                     "$ref": "#/definitions/taskList_node"
                   },
                   {
-                    "$ref": "#/definitions/rule_node"
+                    "$ref": "#/definitions/rule_with_attrs_node"
                   },
                   {
-                    "$ref": "#/definitions/rule_with_attrs_node"
+                    "$ref": "#/definitions/rule_node"
                   },
                   {
                     "$ref": "#/definitions/bodiedRule_node"
@@ -3628,10 +3628,10 @@
             "$ref": "#/definitions/bulletList_node"
           },
           {
-            "$ref": "#/definitions/rule_node"
+            "$ref": "#/definitions/rule_with_attrs_node"
           },
           {
-            "$ref": "#/definitions/rule_with_attrs_node"
+            "$ref": "#/definitions/rule_node"
           },
           {
             "$ref": "#/definitions/bodiedRule_node"

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

@@ -7,4 +7,4 @@ import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinit
 export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | ExtensionWithAnnotationStage0Definition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | RuleWithAttrsStage0Definition | BodiedRuleStage0Definition | PanelDefinition | PanelC1Stage0Definition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
 export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
 export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
-export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | ParagraphWithFontSizeDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | RuleWithAttrsStage0Definition | BodiedRuleStage0Definition | HeadingWithNoMarksDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;
+export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | ParagraphWithFontSizeDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleWithAttrsStage0Definition | RuleDefinition | BodiedRuleStage0Definition | HeadingWithNoMarksDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

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

@@ -677,10 +677,10 @@
                 "$ref": "#/definitions/panel_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -1584,10 +1584,10 @@
                 "$ref": "#/definitions/bulletList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -2697,10 +2697,10 @@
             "$ref": "#/definitions/decisionList_node"
           },
           {
-            "$ref": "#/definitions/rule_node"
+            "$ref": "#/definitions/rule_with_attrs_node"
           },
           {
-            "$ref": "#/definitions/rule_with_attrs_node"
+            "$ref": "#/definitions/rule_node"
           },
           {
             "$ref": "#/definitions/bodiedRule_node"
@@ -2784,10 +2784,10 @@
           "$ref": "#/definitions/bulletList_node"
         },
         {
-          "$ref": "#/definitions/rule_node"
+          "$ref": "#/definitions/rule_with_attrs_node"
         },
         {
-          "$ref": "#/definitions/rule_with_attrs_node"
+          "$ref": "#/definitions/rule_node"
         },
         {
           "$ref": "#/definitions/bodiedRule_node"
@@ -2934,10 +2934,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3045,10 +3045,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3150,10 +3150,10 @@
                 "$ref": "#/definitions/taskList_node"
               },
               {
-                "$ref": "#/definitions/rule_node"
+                "$ref": "#/definitions/rule_with_attrs_node"
               },
               {
-                "$ref": "#/definitions/rule_with_attrs_node"
+                "$ref": "#/definitions/rule_node"
               },
               {
                 "$ref": "#/definitions/bodiedRule_node"
@@ -3227,10 +3227,10 @@
                     "$ref": "#/definitions/taskList_node"
                   },
                   {
-                    "$ref": "#/definitions/rule_node"
+                    "$ref": "#/definitions/rule_with_attrs_node"
                   },
                   {
-                    "$ref": "#/definitions/rule_with_attrs_node"
+                    "$ref": "#/definitions/rule_node"
                   },
                   {
                     "$ref": "#/definitions/bodiedRule_node"
@@ -3628,10 +3628,10 @@
             "$ref": "#/definitions/bulletList_node"
           },
           {
-            "$ref": "#/definitions/rule_node"
+            "$ref": "#/definitions/rule_with_attrs_node"
           },
           {
-            "$ref": "#/definitions/rule_with_attrs_node"
+            "$ref": "#/definitions/rule_node"
           },
           {
             "$ref": "#/definitions/bodiedRule_node"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "57.7.28",
+	"version": "57.7.30",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^250.0.0",
+		"@atlaskit/tmp-editor-statsig": "^251.0.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^5.0.2",

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

@@ -77,8 +77,8 @@ const panel = {
 					'mediaSingle_full',
 					'codeBlock',
 					'taskList',
-					'rule',
 					'rule_with_attrs',
+					'rule',
 					'bodiedRule',
 					'decisionList',
 					'extension_with_marks',