@atlaskit/adf-schema 42.0.2 → 42.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 42.2.0
+
+### Minor Changes
+
+- 767b124: Added columnRuleStyle to layoutSection_with_single_column, and add layoutSectionAdvLayouts nodespec export
+
+## 42.1.0
+
+### Minor Changes
+
+- b54cb82: remove unused legacy panel variant
+
 ## 42.0.2
 
 ### Patch Changes

package/dist/cjs/next-schema/generated/nodeTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panelLegacy = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -563,8 +563,13 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _createPMSpecFactory.cre
   isolating: true
 });
 var layoutSectionWithSingleColumnStage0 = exports.layoutSectionWithSingleColumnStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 var listItem = exports.listItem = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
@@ -891,29 +896,6 @@ var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   },
   selectable: true
 });
-var panelLegacy = exports.panelLegacy = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 var panelWithNestedBlockquoteStage0 = exports.panelWithNestedBlockquoteStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _table = require("../nodes/table");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _panel.panel.use('with_nested_blockquote'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -30,8 +30,16 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
+  content: [(0, _adfSchemaGenerator.$range)(1, 5, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

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

@@ -50,9 +50,6 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
     }
   },
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _rule.rule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock))]
-}).variant('legacy', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _unsupportedBlock.unsupportedBlock))],
-  ignore: ['json-schema', 'validator-spec']
 }).variant('with_nested_blockquote', {
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _rule.rule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock, _blockquote.blockquote))],
   noExtend: true,

package/dist/cjs/schema/nodes/layout-section.js

@@ -53,18 +53,26 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _nodeTypes.layoutSection
   }
 });
 
-// it's same as layoutSection
-var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSection)({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSectionWithSingleColumnStage0)({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: function getAttrs(dom) {
+      var columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle: columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM: function toDOM() {
+  toDOM: function toDOM(node) {
+    var columnRuleStyle = node.attrs.columnRuleStyle;
     var attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCellContent = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem_legacy = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_without_nested_expand = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.confluenceInlineComment = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_without_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCellContent = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem_legacy = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_without_nested_expand = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.confluenceInlineComment = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_without_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -1345,16 +1345,6 @@ var panel = exports.panel = {
     }
   }
 };
-var panel_legacy = exports.panel_legacy = ['panel', {
-  props: {
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-}];
 var panel_with_nested_blockquote = exports.panel_with_nested_blockquote = ['panel', {
   props: {
     content: {
@@ -1813,11 +1803,21 @@ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
 }];
 var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -557,8 +557,13 @@ export const layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 export const listItem = createPMNodeSpecFactory({
@@ -885,29 +890,6 @@ export const panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export const panelLegacy = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 export const panelWithNestedBlockquoteStage0 = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const 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('legacy'), panel.use('with_nested_blockquote'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const 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, 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']

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

@@ -24,8 +24,16 @@ export const layoutSection = adfNode('layoutSection').define({
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
+  content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

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

@@ -44,9 +44,6 @@ export const panel = adfNode('panel').define({
     }
   },
   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))]
-}).variant('legacy', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, unsupportedBlock))],
-  ignore: ['json-schema', 'validator-spec']
 }).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))],
   noExtend: true,

package/dist/es2019/schema/nodes/layout-section.js

@@ -1,4 +1,4 @@
-import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
+import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
 import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
@@ -49,18 +49,28 @@ export const layoutSectionFull = layoutSectionFullFactory({
   }
 });
 
-// it's same as layoutSection
-export const layoutSectionWithSingleColumn = layoutSectionFactory({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+export const layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: dom => {
+      const columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM() {
+  toDOM(node) {
+    const {
+      columnRuleStyle
+    } = node.attrs;
     const attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -1339,16 +1339,6 @@ export const panel = {
     }
   }
 };
-export const panel_legacy = ['panel', {
-  props: {
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-}];
 export const panel_with_nested_blockquote = ['panel', {
   props: {
     content: {
@@ -1807,11 +1797,21 @@ export const layoutSection_full = ['layoutSection', {
 }];
 export const layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

package/dist/esm/next-schema/generated/nodeTypes.js

@@ -557,8 +557,13 @@ export var layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export var layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 export var listItem = createPMNodeSpecFactory({
@@ -885,29 +890,6 @@ export var panel = createPMNodeSpecFactory({
   },
   selectable: true
 });
-export var panelLegacy = createPMNodeSpecFactory({
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  attrs: {
-    panelType: {
-      default: 'info'
-    },
-    panelIcon: {
-      default: null
-    },
-    panelIconId: {
-      default: null
-    },
-    panelIconText: {
-      default: null
-    },
-    panelColor: {
-      default: null
-    }
-  },
-  selectable: true
-});
 export var panelWithNestedBlockquoteStage0 = createPMNodeSpecFactory({
   content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 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('legacy'), panel.use('with_nested_blockquote'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, 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, 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']

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

@@ -24,8 +24,16 @@ export var layoutSection = adfNode('layoutSection').define({
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
+  content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

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

@@ -44,9 +44,6 @@ export var panel = adfNode('panel').define({
     }
   },
   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))]
-}).variant('legacy', {
-  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, unsupportedBlock))],
-  ignore: ['json-schema', 'validator-spec']
 }).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))],
   noExtend: true,

package/dist/esm/schema/nodes/layout-section.js

@@ -1,4 +1,4 @@
-import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
+import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
 import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
@@ -49,18 +49,26 @@ export var layoutSectionFull = layoutSectionFullFactory({
   }
 });
 
-// it's same as layoutSection
-export var layoutSectionWithSingleColumn = layoutSectionFactory({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+export var layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: function getAttrs(dom) {
+      var columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle: columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM: function toDOM() {
+  toDOM: function toDOM(node) {
+    var columnRuleStyle = node.attrs.columnRuleStyle;
     var attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -1339,16 +1339,6 @@ export var panel = {
     }
   }
 };
-export var panel_legacy = ['panel', {
-  props: {
-    content: {
-      type: 'array',
-      items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
-}];
 export var panel_with_nested_blockquote = ['panel', {
   props: {
     content: {
@@ -1807,11 +1797,21 @@ export var layoutSection_full = ['layoutSection', {
 }];
 export var layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

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

@@ -2645,35 +2645,37 @@
       ]
     },
     "layoutSection_with_single_column_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["layoutSection"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 1,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
+            "columnRuleStyle": {
+              "enum": ["solid"]
             }
           },
-          "required": ["type", "content"],
           "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/layoutColumn_node"
+          },
+          "minItems": 1,
+          "maxItems": 5
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extensionFrame_node": {
       "type": "object",

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

@@ -3,8 +3,8 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
  * and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
  */
-import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | PanelWithNestedBlockquoteStage0Definition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelWithNestedBlockquoteStage0Definition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | 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 | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;

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

@@ -421,6 +421,9 @@ export interface LayoutSectionWithSingleColumnStage0Definition {
     type: 'layoutSection';
     content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
+    attrs: {
+        columnRuleStyle?: 'solid';
+    };
 }
 export type LayoutSectionWithSingleColumnStage0Node = PMNode & LayoutSectionWithSingleColumnStage0Definition;
 export declare const layoutSectionWithSingleColumnStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<LayoutSectionWithSingleColumnStage0Node>) => import("prosemirror-model").NodeSpec;
@@ -659,20 +662,6 @@ export interface PanelDefinition {
 }
 export type PanelNode = PMNode & PanelDefinition;
 export declare const panel: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelNode>) => import("prosemirror-model").NodeSpec;
-export interface PanelLegacyDefinition {
-    type: 'panel';
-    content: Array<BlockCardDefinition | BulletListDefinition | HeadingWithNoMarksDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        panelType: 'info' | 'note' | 'tip' | 'warning' | 'error' | 'success' | 'custom';
-        panelIcon?: string;
-        panelIconId?: string;
-        panelIconText?: string;
-        panelColor?: string;
-    };
-}
-export type PanelLegacyNode = PMNode & PanelLegacyDefinition;
-export declare const panelLegacy: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelLegacyNode>) => import("prosemirror-model").NodeSpec;
 export interface PanelWithNestedBlockquoteStage0Definition {
     type: 'panel';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts

@@ -55,10 +55,7 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
 } & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
     ignore: ("json-schema" | "validator-spec")[];
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
-    content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    ignore: ("json-schema" | "validator-spec")[];
-} & {
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
     noExtend: true;
     stage0: true;

package/dist/types/next-schema/nodes/layoutSection.d.ts

@@ -2,6 +2,14 @@ export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/
     stage0: true;
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentRangeSpec[];
     ignore: any[];
+    attrs: {
+        columnRuleStyle: {
+            type: "enum";
+            values: string[];
+            default: any;
+            optional: true;
+        };
+    };
     DANGEROUS_MANUAL_OVERRIDE: {
         'validator-spec': {
             'props.type': {

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

@@ -1,7 +1,4 @@
-export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
-    content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-    ignore: ("json-schema" | "validator-spec")[];
-} & {
+export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
     noExtend: true;
     stage0: true;

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

@@ -1358,16 +1358,6 @@ export declare const panel: {
         };
     };
 };
-export declare const panel_legacy: (string | {
-    props: {
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-    };
-})[];
 export declare const panel_with_nested_blockquote: (string | {
     props: {
         content: {
@@ -1826,6 +1816,16 @@ export declare const layoutSection_full: (string | {
 })[];
 export declare const layoutSection_with_single_column: (string | {
     props: {
+        attrs: {
+            props: {
+                columnRuleStyle: {
+                    type: string;
+                    values: string[];
+                    optional: boolean;
+                };
+            };
+            optional: boolean;
+        };
         content: {
             type: string;
             items: string[];

package/eslint-plugin-warn-schema.js

@@ -0,0 +1,3 @@
+const warnSchemaChangeRule = require('./warn-schema-change');
+const plugin = { rules: { "warn-schema-change": warnSchemaChangeRule } };
+module.exports = plugin;

package/eslint.config.js

@@ -0,0 +1,19 @@
+'use strict';
+
+// Import the ESLint plugin locally
+const warnSchemaEslintPlugin = require('./eslint-plugin-warn-schema');
+const tsParser = require('@typescript-eslint/parser');
+
+module.exports = [
+  {
+    files: ['**/*.ts'],
+    languageOptions: {
+      parser: tsParser,
+    },
+    // Using the eslint-plugin-example plugin defined locally
+    plugins: { warnSchemaPlugin: warnSchemaEslintPlugin },
+    rules: {
+      'warnSchemaPlugin/warn-schema-change': 'warn',
+    },
+  },
+];

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

@@ -2645,35 +2645,37 @@
       ]
     },
     "layoutSection_with_single_column_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["layoutSection"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 1,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
+            "columnRuleStyle": {
+              "enum": ["solid"]
             }
           },
-          "required": ["type", "content"],
           "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/layoutColumn_node"
+          },
+          "minItems": 1,
+          "maxItems": 5
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extensionFrame_node": {
       "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "42.0.2",
+  "version": "42.2.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/warn-schema-change.js

@@ -0,0 +1,152 @@
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description:
+        'Warn that changes to next-schema or schema should be reflected in the other.',
+    },
+    schema: [],
+  },
+  create(context) {
+    const filename = context.filename;
+    const nextSchemaFilesPattern =
+      /.*\/adf-schema\/packages\/adf-schema\/src\/next-schema\/.*/;
+    const schemaFilesPattern =
+      /.*\/adf-schema\/packages\/adf-schema\/src\/schema\/.*/;
+
+    const isInSchemaOrNextSchema =
+      filename.match(nextSchemaFilesPattern) ||
+      filename.match(schemaFilesPattern);
+
+    const findDefine = (node) => {
+      const callExpression = node;
+      const memberExpression = callExpression.callee;
+      const property = memberExpression.property;
+      if (
+        property &&
+        property?.type === 'Identifier' &&
+        property?.name === 'define'
+      ) {
+        return callExpression;
+      }
+      if (
+        memberExpression &&
+        memberExpression?.object?.type === 'CallExpression'
+      ) {
+        return findDefine(memberExpression.object);
+      }
+    };
+
+    const reportInSchema = (objectExpression) => {
+      if (!objectExpression) {
+        return;
+      }
+
+      const parseDOMProp = objectExpression?.properties?.find(
+        (p) => p?.key?.type === 'Identifier' && p?.key?.name === 'parseDOM',
+      );
+
+      const toDOMProp = objectExpression?.properties?.find(
+        (p) => p?.key?.type === 'Identifier' && p?.key?.name === 'toDOM',
+      );
+
+      if (parseDOMProp) {
+        context.report({
+          node: parseDOMProp.key,
+          message:
+            'Changes to next-schema or schema should be reflected in the other.',
+        });
+      }
+
+      if (toDOMProp) {
+        context.report({
+          node: toDOMProp.key,
+          message:
+            'Changes to next-schema or schema should be reflected in the other.',
+        });
+      }
+    };
+
+    const reportInNextSchema = (defineCallExpression) => {
+      const defineArgs = defineCallExpression.arguments.find((p) => {
+        return p.type === 'ObjectExpression';
+      });
+      const attrsProp = defineArgs?.properties?.find(
+        (p) => p.key.type === 'Identifier' && p.key.name === 'attrs',
+      );
+      if (attrsProp) {
+        context.report({
+          node: attrsProp.key,
+          message:
+            'Changes to next-schema or schema should be reflected in the other.',
+        });
+      }
+    };
+
+    return {
+      // packages/adf-schema/src/schema/nodes/unknown-block.ts
+      ExportDefaultDeclaration: function (node) {
+        if (!isInSchemaOrNextSchema) {
+          return;
+        }
+        if (node?.declaration?.expression?.type === 'ObjectExpression') {
+          const objectExpression = node.declaration.expression;
+          reportInSchema(objectExpression);
+        }
+      },
+      ExpressionStatement(node) {
+        if (!isInSchemaOrNextSchema) {
+          return;
+        }
+        if (node.expression.type === 'CallExpression') {
+          const defineCallExpression = findDefine(node.expression);
+
+          if (defineCallExpression) {
+            reportInNextSchema(defineCallExpression);
+          }
+        }
+      },
+      ReturnStatement: function (node) {
+        if (!isInSchemaOrNextSchema) {
+          return;
+        }
+        if (node?.argument && node?.argument?.type === 'CallExpression') {
+          const callExpression = node.argument;
+          const args = callExpression.arguments;
+          const objectExpression = args.find(
+            (a) => a?.type === 'ObjectExpression',
+          );
+          if (objectExpression) {
+            reportInSchema(objectExpression);
+          }
+        }
+      },
+      VariableDeclarator(node) {
+        if (!isInSchemaOrNextSchema) {
+          return;
+        }
+        if (node.init && node.init.type === 'ObjectExpression') {
+          const objExpression = node.init;
+          reportInSchema(objExpression);
+        }
+        if (node.init && node.init.type === 'CallExpression') {
+          const callExpression = node.init;
+
+          const arg = callExpression.arguments.find((a) => {
+            return a.type === 'ObjectExpression';
+          });
+
+          if (arg) {
+            reportInSchema(arg);
+          }
+
+          const define = findDefine(callExpression);
+
+          if (define) {
+            reportInNextSchema(define);
+          }
+        }
+      },
+    };
+  },
+};

package/warn-schema-change.test.js

@@ -0,0 +1,42 @@
+const { RuleTester } = require('eslint');
+const tsParser = require('@typescript-eslint/parser');
+const warnSchemaChangeRule = require('./warn-schema-change');
+
+const ruleTester = new RuleTester({
+  parserOptions: { ecmaVersion: 2015 },
+});
+
+// Throws error if the tests in ruleTester.run() do not pass
+ruleTester.run(
+  'warn-schema-change', // rule name
+  warnSchemaChangeRule, // rule code
+  {
+    // checks
+    // 'valid' checks cases that should pass
+    valid: [
+      {
+        code: 'const codeBlock = codeBlockFactory({noDOM: []})',
+      },
+      {
+        code: "const codeBlock = adfNode('codeBlock').define({noAttrs: {}})",
+      },
+    ],
+    // 'invalid' checks cases that should not pass
+    invalid: [
+      {
+        code: 'const codeBlock = codeBlockFactory({parseDOM: [],toDOM: []})',
+        errors: 2
+      },
+      {
+        code: "const codeBlock = adfNode('codeBlock').define({attrs: {}})",
+        errors: 1
+      },
+      {
+        code: "const codeBlock = adfNode('codeBlock').define({attrs: {}}).variant('with_marks', {})",
+        errors: 1
+      },
+    ],
+  },
+);
+
+console.log('All tests passed!');