@atlaskit/adf-schema 37.1.41 → 37.1.42

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 37.1.42
+
+### Patch Changes
+
+- 758ee06: last hacks to support tableCell_content, nestedExpand_content and atomic_inlines pseudo groups in validator spec
+
 ## 37.1.41
 
 ### Patch Changes

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.atomicInlineGroup = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _date = require("../nodes/date");
+var _emoji = require("../nodes/emoji");
+var _hardBreak = require("../nodes/hardBreak");
+var _inlineCard = require("../nodes/inlineCard");
+var _inlineExtension = require("../nodes/inlineExtension");
+var _mediaInline = require("../nodes/mediaInline");
+var _mention = require("../nodes/mention");
+var _placeholder = require("../nodes/placeholder");
+var _status = require("../nodes/status");
+var atomicInlineGroup = exports.atomicInlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('atomic_inline', [_hardBreak.hardBreak, _mention.mention, _emoji.emoji, _inlineExtension.inlineExtension.use('with_marks'), _date.date, _placeholder.placeholder, _inlineCard.inlineCard, _status.status, _mediaInline.mediaInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -27,6 +27,6 @@ var tableCellContentNodes = [_codeBlock.codeBlock.use('with_no_marks'), _blockCa
 // @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.
+// The differences are highlighted 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/nestedExpand.js

@@ -53,7 +53,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
     }
   }
 }).variant('content', {
-  ignore: ['pm-spec', 'validator-spec']
+  ignore: ['pm-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.paragraph = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _atomicInlineGroup = require("../groups/atomicInlineGroup");
 var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
@@ -21,7 +22,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _atomicInlineGroup.atomicInlineGroup, _inlineContentGroup.inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.marks': {

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

@@ -9,6 +9,6 @@ var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGrou
 // @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'],
+  ignore: ['pm-spec'],
   content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
 });

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.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_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_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = 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.code_inline = 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_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.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = 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_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_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = 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.code_inline = 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_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -883,6 +883,7 @@ var confluenceUnsupportedInline = exports.confluenceUnsupportedInline = {
     }
   }
 };
+var atomic_inline = exports.atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 var inline = exports.inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 var paragraph = exports.paragraph = {
   props: {
@@ -1334,9 +1335,12 @@ var panel_legacy = exports.panel_legacy = ['panel', {
     }
   }
 }];
-var nestedExpand_content = exports.nestedExpand_content = ['nestedExpand', {
-  props: {}
-}];
+var nestedExpand_content = exports.nestedExpand_content = {
+  type: 'array',
+  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
+};
 var nestedExpand_with_no_marks = exports.nestedExpand_with_no_marks = ['nestedExpand', {
   props: {
     marks: {
@@ -1505,19 +1509,11 @@ var tableHeader = exports.tableHeader = {
   },
   required: ['content']
 };
-var tableCellContent = exports.tableCellContent = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['tableCellContent']
-    },
-    content: {
-      type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
+var tableCell_content = exports.tableCell_content = {
+  type: 'array',
+  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
 };
 var tableRow = exports.tableRow = {
   props: {

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

@@ -0,0 +1,13 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { date } from '../nodes/date';
+import { emoji } from '../nodes/emoji';
+import { hardBreak } from '../nodes/hardBreak';
+import { inlineCard } from '../nodes/inlineCard';
+import { inlineExtension } from '../nodes/inlineExtension';
+import { mediaInline } from '../nodes/mediaInline';
+import { mention } from '../nodes/mention';
+import { placeholder } from '../nodes/placeholder';
+import { status } from '../nodes/status';
+export const atomicInlineGroup = adfNodeGroup('atomic_inline', [hardBreak, mention, emoji, inlineExtension.use('with_marks'), date, placeholder, inlineCard, status, mediaInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -21,6 +21,6 @@ const tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragr
 // @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.
+// The differences are highlighted below.
 export const tableCellContentPseudoGroup = $onePlus($or(...tableCellContentNodes, unsupportedBlock));
 export const tableHeaderContentPseudoGroup = $onePlus($or(...tableCellContentNodes, nestedExpand));

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

@@ -47,7 +47,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
     }
   }
 }).variant('content', {
-  ignore: ['pm-spec', 'validator-spec']
+  ignore: ['pm-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { atomicInlineGroup } from '../groups/atomicInlineGroup';
 import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
@@ -15,7 +16,7 @@ export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
+  content: [$zeroPlus($or(inlineGroup, atomicInlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.marks': {

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

@@ -4,6 +4,6 @@ import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGro
 // @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'],
+  ignore: ['pm-spec'],
   content: [tableCellContentPseudoGroup]
 });

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

@@ -877,6 +877,7 @@ export const confluenceUnsupportedInline = {
     }
   }
 };
+export const atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 export const inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 export const paragraph = {
   props: {
@@ -1328,9 +1329,12 @@ export const panel_legacy = ['panel', {
     }
   }
 }];
-export const nestedExpand_content = ['nestedExpand', {
-  props: {}
-}];
+export const nestedExpand_content = {
+  type: 'array',
+  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
+};
 export const nestedExpand_with_no_marks = ['nestedExpand', {
   props: {
     marks: {
@@ -1499,19 +1503,11 @@ export const tableHeader = {
   },
   required: ['content']
 };
-export const tableCellContent = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['tableCellContent']
-    },
-    content: {
-      type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
+export const tableCell_content = {
+  type: 'array',
+  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
 };
 export const tableRow = {
   props: {

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

@@ -0,0 +1,13 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { date } from '../nodes/date';
+import { emoji } from '../nodes/emoji';
+import { hardBreak } from '../nodes/hardBreak';
+import { inlineCard } from '../nodes/inlineCard';
+import { inlineExtension } from '../nodes/inlineExtension';
+import { mediaInline } from '../nodes/mediaInline';
+import { mention } from '../nodes/mention';
+import { placeholder } from '../nodes/placeholder';
+import { status } from '../nodes/status';
+export var atomicInlineGroup = adfNodeGroup('atomic_inline', [hardBreak, mention, emoji, inlineExtension.use('with_marks'), date, placeholder, inlineCard, status, mediaInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -21,6 +21,6 @@ var tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragrap
 // @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.
+// The differences are highlighted 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/nestedExpand.js

@@ -47,7 +47,7 @@ export var nestedExpand = adfNode('nestedExpand').define({
     }
   }
 }).variant('content', {
-  ignore: ['pm-spec', 'validator-spec']
+  ignore: ['pm-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { atomicInlineGroup } from '../groups/atomicInlineGroup';
 import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
@@ -15,7 +16,7 @@ export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
+  content: [$zeroPlus($or(inlineGroup, atomicInlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.marks': {

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

@@ -4,6 +4,6 @@ import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGro
 // @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'],
+  ignore: ['pm-spec'],
   content: [tableCellContentPseudoGroup]
 });

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

@@ -877,6 +877,7 @@ export var confluenceUnsupportedInline = {
     }
   }
 };
+export var atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 export var inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 export var paragraph = {
   props: {
@@ -1328,9 +1329,12 @@ export var panel_legacy = ['panel', {
     }
   }
 }];
-export var nestedExpand_content = ['nestedExpand', {
-  props: {}
-}];
+export var nestedExpand_content = {
+  type: 'array',
+  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
+};
 export var nestedExpand_with_no_marks = ['nestedExpand', {
   props: {
     marks: {
@@ -1499,19 +1503,11 @@ export var tableHeader = {
   },
   required: ['content']
 };
-export var tableCellContent = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['tableCellContent']
-    },
-    content: {
-      type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
+export var tableCell_content = {
+  type: 'array',
+  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
 };
 export var tableRow = {
   props: {

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

@@ -0,0 +1 @@
+export declare const atomicInlineGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

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

@@ -28,7 +28,7 @@ export declare const nestedExpand: import("@atlaskit/adf-schema-generator/dist/t
         'validator-spec'?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").DangerousManualOverride;
     };
 } & {
-    ignore: ("pm-spec" | "validator-spec")[];
+    ignore: "pm-spec"[];
 } & {
     marks: any[];
     content: any[];

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

@@ -896,6 +896,7 @@ export declare const confluenceUnsupportedInline: {
         };
     };
 };
+export declare const atomic_inline: string[];
 export declare const inline: string[];
 export declare const paragraph: {
     props: {
@@ -1347,9 +1348,12 @@ export declare const panel_legacy: (string | {
         };
     };
 })[];
-export declare const nestedExpand_content: (string | {
-    props: {};
-})[];
+export declare const nestedExpand_content: {
+    type: string;
+    items: string[][];
+    minItems: number;
+    allowUnsupportedBlock: boolean;
+};
 export declare const nestedExpand_with_no_marks: (string | {
     props: {
         marks: {
@@ -1518,19 +1522,11 @@ export declare const tableHeader: {
     };
     required: string[];
 };
-export declare const tableCellContent: {
-    props: {
-        type: {
-            type: string;
-            values: string[];
-        };
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-    };
+export declare const tableCell_content: {
+    type: string;
+    items: string[][];
+    minItems: number;
+    allowUnsupportedBlock: boolean;
 };
 export declare const tableRow: {
     props: {

package/package.json

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

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

@@ -4,11 +4,6 @@ import adfNode from '../../../src/next-schema/full-schema.adf';
 import { sortNestedArrays } from '../../../src/validator-schema/utils/sortNestedArrays';
 
 const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
-const SKIP_LIST = [
-  'atomic_inline', // doesn't exist in the output, not even used anywhere...
-  'nestedExpand_content', // doesn't exist in the output, completely different format from other groups
-  'tableCell_content', // doesn't exist in the output, completely different format from other groups
-];
 
 const testCases = Object.entries(currentSpecs).map(([key, value]) => {
   return {
@@ -19,8 +14,7 @@ const testCases = Object.entries(currentSpecs).map(([key, value]) => {
 });
 
 testCases.forEach(({ name, currentSpec, newSpec }) => {
-  const testMethod = SKIP_LIST.includes(name) ? it.skip : it;
-  testMethod(`should be able to handle ${name}`, () => {
+  it(`should be able to handle ${name}`, () => {
     expect(newSpec).toEqual(currentSpec);
   });
 });

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

@@ -101,63 +101,40 @@ test('JSON Schema to ADF DSL backwards compatibility for full schema', () => {
   expect(currentSchema).toBeBackwardsCompatibleWith(nextSchema);
 });
 
-const DEFINITIONS_TO_SKIP_STAGE_0 = [
-  'blockCard_node',
-  'block_content',
-  'bodiedExtension_node',
-  'bodiedExtension_with_marks_node',
-  'codeBlock_node',
-  'codeBlock_with_marks_node',
-  'codeBlock_with_no_marks_node',
-  'code_inline_node',
-  'date_node',
+const DEFINITIONS_TO_SKIP_STAGE_0_BACKWARDS = [
   'doc_node',
-  'emoji_node',
-  'expand_node',
-  'expand_with_breakout_mark_node',
-  'expand_with_no_mark_node',
-  'extensionFrame_node',
-  'extension_node',
-  'extension_with_marks_node',
-  'formatted_text_inline_node',
-  'heading_node',
-  'heading_with_alignment_node',
-  'heading_with_indentation_node',
-  'heading_with_no_marks_node',
   'inlineCard_node',
-  'inlineExtension_node',
-  'inlineExtension_with_marks_node',
-  'inline_node',
-  'layoutSection_node',
-  'layoutSection_full_node',
   'layoutSection_with_single_column_node',
-  'mediaInline_node',
-  'mediaSingle_caption_node',
-  'mediaSingle_full_node',
-  'mediaSingle_node',
-  'mention_node',
   'multiBodiedExtension_node',
-  'nestedExpand_content',
-  'nestedExpand_node',
-  'nestedExpand_with_no_marks_node',
-  'non_nestable_block_content',
-  'paragraph_node',
-  'paragraph_with_alignment_node',
-  'paragraph_with_indentation_node',
-  'paragraph_with_no_marks_node',
-  'status_node',
-  'table_cell_content',
-  'table_cell_node',
-  'table_header_node',
-  'text_node',
 ];
 test('ADF DSL to JSON Schema backwards compatibility for stage0 schema', () => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const currentSchema = require('../../../json-schema/v1/stage-0.json');
   const nextSchema = adfToJSON(adfNode);
-  DEFINITIONS_TO_SKIP_STAGE_0.forEach((definition) => {
+  DEFINITIONS_TO_SKIP_STAGE_0_BACKWARDS.forEach((definition) => {
     nextSchema.definitions[definition] = currentSchema.definitions[definition];
   });
 
   expect(nextSchema).toBeBackwardsCompatibleWith(currentSchema);
 });
+
+const DEFINITIONS_TO_SKIP_STAGE_0_FORWARDS = [
+  'extensionFrame_node',
+  'inline_node',
+  'table_row_node',
+  'table_cell_content',
+  'codeBlock_node',
+  'codeBlock_with_marks_node',
+  'mediaInline_node',
+  'mediaGroup_node',
+];
+test('JSON Schema to ADF DSL backwards compatibility for stage0 schema', () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const currentSchema = require('../../../json-schema/v1/stage-0.json');
+  const nextSchema = adfToJSON(adfNode);
+  DEFINITIONS_TO_SKIP_STAGE_0_FORWARDS.forEach((definition) => {
+    currentSchema.definitions[definition] = nextSchema.definitions[definition];
+  });
+
+  expect(currentSchema).toBeBackwardsCompatibleWith(nextSchema);
+});