@atlaskit/adf-schema 37.1.22 → 37.1.23

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 37.1.23
+
+### Patch Changes
+
+- e0280dc: Add backwards compatability for bodied extension, code block, expand, layout section, non-nestable block content
+
 ## 37.1.22
 
 ### Patch Changes

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

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tableHeaderContentPseudoGroup = exports.tableCellContentPseudoGroup = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _blockCard = require("../nodes/blockCard");
+var _blockquote = require("../nodes/blockquote");
+var _codeBlock = require("../nodes/codeBlock");
+var _decisionList = require("../nodes/decisionList");
+var _embedCard = require("../nodes/embedCard");
+var _extension = require("../nodes/extension");
+var _heading = require("../nodes/heading");
+var _list = require("../nodes/list");
+var _mediaGroup = require("../nodes/mediaGroup");
+var _mediaSingle = require("../nodes/mediaSingle");
+var _nestedExpand = require("../nodes/nestedExpand");
+var _panel = require("../nodes/panel");
+var _paragraph = require("../nodes/paragraph");
+var _rule = require("../nodes/rule");
+var _task = require("../nodes/task");
+var _unsupportedBlock = require("../nodes/unsupportedBlock");
+var tableCellContentNodes = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _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
+// In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
+// In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
+// The differences are highighted below.
+var tableCellContentPseudoGroup = exports.tableCellContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_unsupportedBlock.unsupportedBlock])));
+var tableHeaderContentPseudoGroup = exports.tableHeaderContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_nestedExpand.nestedExpand])));

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

@@ -50,8 +50,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))]
 }).variant('with_marks', {
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   content: [],

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

@@ -14,6 +14,7 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
   code: true,
   defining: true,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     language: {
       type: 'string',
@@ -26,8 +27,7 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text, _unsupportedInline.unsupportedInline))],
-  ignore: ['json-schema']
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text, _unsupportedInline.unsupportedInline))]
 }).variant('with_marks', {
   marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   ignore: ['pm-spec']

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

@@ -13,6 +13,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
   isolating: true,
   selectable: true,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -25,8 +26,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))]
 }).variant('with_breakout_mark', {
   marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   content: [],

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

@@ -13,13 +13,12 @@ var _unsupportedBlock = require("./unsupportedBlock");
 var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('layoutSection').define({
   isolating: true,
   marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
-  content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
-  ignore: ['json-schema'],
+  content: [(0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock)],
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
-        reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL."
+        reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
     }
   }

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

@@ -7,22 +7,7 @@ exports.tableCell = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var _blockCard = require("./blockCard");
-var _blockquote = require("./blockquote");
-var _codeBlock = require("./codeBlock");
-var _decisionList = require("./decisionList");
-var _embedCard = require("./embedCard");
-var _extension = require("./extension");
-var _heading = require("./heading");
-var _list = require("./list");
-var _mediaGroup = require("./mediaGroup");
-var _mediaSingle = require("./mediaSingle");
-var _nestedExpand = require("./nestedExpand");
-var _panel = require("./panel");
-var _paragraph = require("./paragraph");
-var _rule = require("./rule");
-var _task = require("./task");
-var _unsupportedBlock = require("./unsupportedBlock");
+var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
 var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
   isolating: true,
   selectable: false,
@@ -53,5 +38,5 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('with_no_marks'), _unsupportedBlock.unsupportedBlock))]
+  content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
 });

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tableCellContent = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
+// @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
+// This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
+var tableCellContent = exports.tableCellContent = (0, _adfSchemaGenerator.adfNode)('tableCellContent').define({
+  ignore: ['pm-spec', 'validator-spec'],
+  content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
+});

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

@@ -5,23 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.tableHeader = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var _blockCard = require("./blockCard");
-var _blockquote = require("./blockquote");
-var _codeBlock = require("./codeBlock");
-var _decisionList = require("./decisionList");
-var _embedCard = require("./embedCard");
-var _extension = require("./extension");
-var _heading = require("./heading");
-var _list = require("./list");
-var _mediaGroup = require("./mediaGroup");
-var _mediaSingle = require("./mediaSingle");
-var _nestedExpand = require("./nestedExpand");
-var _panel = require("./panel");
-var _paragraph = require("./paragraph");
-var _rule = require("./rule");
-var _task = require("./task");
 var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
   isolating: true,
   selectable: false,
@@ -52,5 +38,5 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand, _nestedExpand.nestedExpand.use('with_no_marks')))]
+  content: [_tableCellContentPseudoGroup.tableHeaderContentPseudoGroup]
 });

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

@@ -9,9 +9,10 @@ var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _tableCell = require("./tableCell");
 var _tableHeader = require("./tableHeader");
+var _tableCellContent = require("./tableCellContent");
 var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader, _tableCellContent.tableCellContent))],
   tableRole: 'row'
 });

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

@@ -0,0 +1,26 @@
+import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
+import { blockCard } from '../nodes/blockCard';
+import { blockquote } from '../nodes/blockquote';
+import { codeBlock } from '../nodes/codeBlock';
+import { decisionList } from '../nodes/decisionList';
+import { embedCard } from '../nodes/embedCard';
+import { extension } from '../nodes/extension';
+import { heading } from '../nodes/heading';
+import { bulletList, orderedList } from '../nodes/list';
+import { mediaGroup } from '../nodes/mediaGroup';
+import { mediaSingle } from '../nodes/mediaSingle';
+import { nestedExpand } from '../nodes/nestedExpand';
+import { panel } from '../nodes/panel';
+import { paragraph } from '../nodes/paragraph';
+import { rule } from '../nodes/rule';
+import { taskList } from '../nodes/task';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
+const tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, 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
+// In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
+// In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
+// The differences are highighted below.
+export const tableCellContentPseudoGroup = $onePlus($or(...tableCellContentNodes, unsupportedBlock));
+export const tableHeaderContentPseudoGroup = $onePlus($or(...tableCellContentNodes, nestedExpand));

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

@@ -44,8 +44,7 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
       default: null
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [$onePlus($or(nonNestableBlockContentGroup))]
 }).variant('with_marks', {
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -8,6 +8,7 @@ export const codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     language: {
       type: 'string',
@@ -20,8 +21,7 @@ export const codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  ignore: ['json-schema']
+  content: [$zeroPlus($or(text, unsupportedInline))]
 }).variant('with_marks', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   ignore: ['pm-spec']

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

@@ -7,6 +7,7 @@ export const expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -19,8 +20,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [$onePlus($or(nonNestableBlockContentGroup))]
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -7,13 +7,12 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const layoutSection = adfNode('layoutSection').define({
   isolating: true,
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
-  ignore: ['json-schema'],
+  content: [$or(layoutColumn, unsupportedBlock)],
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
-        reason: `The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL.`
+        reason: `The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM.`
       }
     }
   }

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

@@ -1,22 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { adfNode } from '@atlaskit/adf-schema-generator';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { blockCard } from './blockCard';
-import { blockquote } from './blockquote';
-import { codeBlock } from './codeBlock';
-import { decisionList } from './decisionList';
-import { embedCard } from './embedCard';
-import { extension } from './extension';
-import { heading } from './heading';
-import { bulletList, orderedList } from './list';
-import { mediaGroup } from './mediaGroup';
-import { mediaSingle } from './mediaSingle';
-import { nestedExpand } from './nestedExpand';
-import { panel } from './panel';
-import { paragraph } from './paragraph';
-import { rule } from './rule';
-import { taskList } from './task';
-import { unsupportedBlock } from './unsupportedBlock';
+import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
 export const tableCell = adfNode('tableCell').define({
   isolating: true,
   selectable: false,
@@ -47,5 +32,5 @@ export const tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks'), unsupportedBlock))]
+  content: [tableCellContentPseudoGroup]
 });

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

@@ -0,0 +1,9 @@
+import { adfNode } from '@atlaskit/adf-schema-generator';
+import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
+
+// @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
+// This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
+export const tableCellContent = adfNode('tableCellContent').define({
+  ignore: ['pm-spec', 'validator-spec'],
+  content: [tableCellContentPseudoGroup]
+});

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

@@ -1,21 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { adfNode } from '@atlaskit/adf-schema-generator';
+import { tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { blockCard } from './blockCard';
-import { blockquote } from './blockquote';
-import { codeBlock } from './codeBlock';
-import { decisionList } from './decisionList';
-import { embedCard } from './embedCard';
-import { extension } from './extension';
-import { heading } from './heading';
-import { bulletList, orderedList } from './list';
-import { mediaGroup } from './mediaGroup';
-import { mediaSingle } from './mediaSingle';
-import { nestedExpand } from './nestedExpand';
-import { panel } from './panel';
-import { paragraph } from './paragraph';
-import { rule } from './rule';
-import { taskList } from './task';
 export const tableHeader = adfNode('tableHeader').define({
   isolating: true,
   selectable: false,
@@ -46,5 +32,5 @@ export const tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand, nestedExpand.use('with_no_marks')))]
+  content: [tableHeaderContentPseudoGroup]
 });

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

@@ -3,9 +3,10 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
+import { tableCellContent } from './tableCellContent';
 export const tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(tableCell, tableHeader))],
+  content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
   tableRole: 'row'
 });

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

@@ -0,0 +1,26 @@
+import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
+import { blockCard } from '../nodes/blockCard';
+import { blockquote } from '../nodes/blockquote';
+import { codeBlock } from '../nodes/codeBlock';
+import { decisionList } from '../nodes/decisionList';
+import { embedCard } from '../nodes/embedCard';
+import { extension } from '../nodes/extension';
+import { heading } from '../nodes/heading';
+import { bulletList, orderedList } from '../nodes/list';
+import { mediaGroup } from '../nodes/mediaGroup';
+import { mediaSingle } from '../nodes/mediaSingle';
+import { nestedExpand } from '../nodes/nestedExpand';
+import { panel } from '../nodes/panel';
+import { paragraph } from '../nodes/paragraph';
+import { rule } from '../nodes/rule';
+import { taskList } from '../nodes/task';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
+var tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, 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
+// In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
+// In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
+// The differences are highighted below.
+export var tableCellContentPseudoGroup = $onePlus($or.apply(void 0, tableCellContentNodes.concat([unsupportedBlock])));
+export var tableHeaderContentPseudoGroup = $onePlus($or.apply(void 0, tableCellContentNodes.concat([nestedExpand])));

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

@@ -44,8 +44,7 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
       default: null
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [$onePlus($or(nonNestableBlockContentGroup))]
 }).variant('with_marks', {
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -8,6 +8,7 @@ export var codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     language: {
       type: 'string',
@@ -20,8 +21,7 @@ export var codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  ignore: ['json-schema']
+  content: [$zeroPlus($or(text, unsupportedInline))]
 }).variant('with_marks', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   ignore: ['pm-spec']

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

@@ -7,6 +7,7 @@ export var expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  hasEmptyMarks: true,
   attrs: {
     title: {
       type: 'string',
@@ -19,8 +20,7 @@ export var expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))],
-  ignore: ['json-schema']
+  content: [$onePlus($or(nonNestableBlockContentGroup))]
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -7,13 +7,12 @@ import { unsupportedBlock } from './unsupportedBlock';
 export var layoutSection = adfNode('layoutSection').define({
   isolating: true,
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
-  ignore: ['json-schema'],
+  content: [$or(layoutColumn, unsupportedBlock)],
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
-        reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL."
+        reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
     }
   }

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

@@ -1,22 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { adfNode } from '@atlaskit/adf-schema-generator';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { blockCard } from './blockCard';
-import { blockquote } from './blockquote';
-import { codeBlock } from './codeBlock';
-import { decisionList } from './decisionList';
-import { embedCard } from './embedCard';
-import { extension } from './extension';
-import { heading } from './heading';
-import { bulletList, orderedList } from './list';
-import { mediaGroup } from './mediaGroup';
-import { mediaSingle } from './mediaSingle';
-import { nestedExpand } from './nestedExpand';
-import { panel } from './panel';
-import { paragraph } from './paragraph';
-import { rule } from './rule';
-import { taskList } from './task';
-import { unsupportedBlock } from './unsupportedBlock';
+import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
 export var tableCell = adfNode('tableCell').define({
   isolating: true,
   selectable: false,
@@ -47,5 +32,5 @@ export var tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks'), unsupportedBlock))]
+  content: [tableCellContentPseudoGroup]
 });

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

@@ -0,0 +1,9 @@
+import { adfNode } from '@atlaskit/adf-schema-generator';
+import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
+
+// @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
+// This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
+export var tableCellContent = adfNode('tableCellContent').define({
+  ignore: ['pm-spec', 'validator-spec'],
+  content: [tableCellContentPseudoGroup]
+});

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

@@ -1,21 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { adfNode } from '@atlaskit/adf-schema-generator';
+import { tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { blockCard } from './blockCard';
-import { blockquote } from './blockquote';
-import { codeBlock } from './codeBlock';
-import { decisionList } from './decisionList';
-import { embedCard } from './embedCard';
-import { extension } from './extension';
-import { heading } from './heading';
-import { bulletList, orderedList } from './list';
-import { mediaGroup } from './mediaGroup';
-import { mediaSingle } from './mediaSingle';
-import { nestedExpand } from './nestedExpand';
-import { panel } from './panel';
-import { paragraph } from './paragraph';
-import { rule } from './rule';
-import { taskList } from './task';
 export var tableHeader = adfNode('tableHeader').define({
   isolating: true,
   selectable: false,
@@ -46,5 +32,5 @@ export var tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand, nestedExpand.use('with_no_marks')))]
+  content: [tableHeaderContentPseudoGroup]
 });

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

@@ -3,9 +3,10 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
+import { tableCellContent } from './tableCellContent';
 export var tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(tableCell, tableHeader))],
+  content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
   tableRole: 'row'
 });

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

@@ -0,0 +1,2 @@
+export declare const tableCellContentPseudoGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec;
+export declare const tableHeaderContentPseudoGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec;

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

@@ -0,0 +1,40 @@
+export declare const tableCellContent: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    contentMinItems?: number;
+    contentMaxItems?: number;
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    allowAnyChildMark?: boolean;
+    allowNoChildMark?: boolean;
+    noMarks?: boolean;
+    hasEmptyMarks?: boolean;
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+    tableRole?: "table" | "row" | "cell" | "header_cell";
+    DANGEROUS_MANUAL_OVERRIDE?: {
+        'pm-spec'?: {
+            [x: string]: {
+                value: any;
+                reason: string;
+            };
+        };
+        'validator-spec'?: {
+            [x: string]: {
+                value: any;
+                reason: string;
+            };
+        };
+    };
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.22",
+  "version": "37.1.23",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.25.1",
+    "@atlaskit/adf-schema-generator": "^1.25.2",
     "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",

package/schema-generators/__tests__/unit/json-full-schema-backwards-compat.unit.ts

@@ -1,10 +1,6 @@
 import { validateSchemaCompatibility } from 'json-schema-diff-validator';
 import { adfToJSON } from '@atlaskit/adf-schema-generator';
 import adfNode from '@atlaskit/adf-schema/src/next-schema/full-schema.adf';
-import {
-  tableCellNodeContent,
-  tableHeaderNodeContent,
-} from './__fixtures__/index.fixture';
 
 declare let expect: any;
 expect.extend({
@@ -45,19 +41,9 @@ expect.extend({
 function transformFullFixtureForKnownFailures(json) {
   const definitions = json.definitions;
 
-  delete definitions.bodiedExtension_node;
-  delete definitions.codeBlock_node;
-  delete definitions.expand_node;
-  delete definitions.layoutSection_node;
   delete definitions.nestedExpand_content;
   delete definitions.nestedExpand_node;
   delete definitions.nestedExpand_with_no_marks_node;
-  delete definitions.non_nestable_block_content;
-  delete definitions.table_cell_content;
-
-  // New JSON, different to the old JSON schema
-  definitions.table_cell_node.properties.content = tableCellNodeContent;
-  definitions.table_header_node.properties.content = tableHeaderNodeContent;
 
   return json;
 }

package/schema-generators/__tests__/unit/__fixtures__/index.fixture.ts

@@ -1,140 +0,0 @@
-import { JSONSchema4 } from 'json-schema';
-
-export const tableCellNodeContent: JSONSchema4 = {
-  type: 'array',
-  items: {
-    anyOf: [
-      {
-        $ref: '#/definitions/codeBlock_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/blockCard_node',
-      },
-      {
-        $ref: '#/definitions/paragraph_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/paragraph_with_alignment_node',
-      },
-      {
-        $ref: '#/definitions/mediaSingle_caption_node',
-      },
-      {
-        $ref: '#/definitions/mediaSingle_full_node',
-      },
-      {
-        $ref: '#/definitions/taskList_node',
-      },
-      {
-        $ref: '#/definitions/bulletList_node',
-      },
-      {
-        $ref: '#/definitions/orderedList_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_alignment_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_indentation_node',
-      },
-      {
-        $ref: '#/definitions/mediaGroup_node',
-      },
-      {
-        $ref: '#/definitions/decisionList_node',
-      },
-      {
-        $ref: '#/definitions/rule_node',
-      },
-      {
-        $ref: '#/definitions/panel_node',
-      },
-      {
-        $ref: '#/definitions/blockquote_node',
-      },
-      {
-        $ref: '#/definitions/extension_with_marks_node',
-      },
-      {
-        $ref: '#/definitions/embedCard_node',
-      },
-      {
-        $ref: '#/definitions/nestedExpand_with_no_marks_node',
-      },
-    ],
-  },
-  minItems: 1,
-};
-
-export const tableHeaderNodeContent: JSONSchema4 = {
-  type: 'array',
-  items: {
-    anyOf: [
-      {
-        $ref: '#/definitions/codeBlock_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/blockCard_node',
-      },
-      {
-        $ref: '#/definitions/paragraph_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/paragraph_with_alignment_node',
-      },
-      {
-        $ref: '#/definitions/mediaSingle_caption_node',
-      },
-      {
-        $ref: '#/definitions/mediaSingle_full_node',
-      },
-      {
-        $ref: '#/definitions/taskList_node',
-      },
-      {
-        $ref: '#/definitions/bulletList_node',
-      },
-      {
-        $ref: '#/definitions/orderedList_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_no_marks_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_alignment_node',
-      },
-      {
-        $ref: '#/definitions/heading_with_indentation_node',
-      },
-      {
-        $ref: '#/definitions/mediaGroup_node',
-      },
-      {
-        $ref: '#/definitions/decisionList_node',
-      },
-      {
-        $ref: '#/definitions/rule_node',
-      },
-      {
-        $ref: '#/definitions/panel_node',
-      },
-      {
-        $ref: '#/definitions/blockquote_node',
-      },
-      { $ref: '#/definitions/nestedExpand_node' },
-      {
-        $ref: '#/definitions/extension_with_marks_node',
-      },
-      {
-        $ref: '#/definitions/embedCard_node',
-      },
-      {
-        $ref: '#/definitions/nestedExpand_with_no_marks_node',
-      },
-    ],
-  },
-  minItems: 1,
-};