@atlaskit/adf-schema 40.10.0 → 41.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 41.0.0
+
+### Major Changes
+
+- 5c60258: remove getNodeNameOverrides from adfToValidatorSpec
+
 ## 40.10.0
 
 ### Minor Changes

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

@@ -42,12 +42,8 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        reason: '@DSLCompatibilityException - required for tableCell validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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'],
+  ignore: ['pm-spec', 'validator-spec'],
   content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
 });

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

@@ -44,10 +44,6 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
       required: {
         reason: '@DSLCompatibilityException - required for tableHeader validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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_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_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_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.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_without_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
+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.atomic_inline = exports.annotation = exports.alignment = void 0;
 exports.unsupportedInline = void 0;
 var blockCard = exports.blockCard = {
   props: {
@@ -540,7 +540,7 @@ var status = exports.status = {
     }
   }
 };
-var formatted_text_inline = exports.formatted_text_inline = ['text', {
+var text_formatted = exports.text_formatted = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -549,7 +549,7 @@ var formatted_text_inline = exports.formatted_text_inline = ['text', {
     }
   }
 }];
-var code_inline = exports.code_inline = ['text', {
+var text_code_inline = exports.text_code_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -638,7 +638,7 @@ var backgroundColor = exports.backgroundColor = {
     }
   }
 };
-var inline_comment_marker = exports.inline_comment_marker = {
+var confluenceInlineComment = exports.confluenceInlineComment = {
   props: {
     type: {
       type: 'enum',
@@ -669,7 +669,7 @@ var caption = exports.caption = {
     },
     content: {
       type: 'array',
-      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'text_formatted', 'text_code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -709,7 +709,7 @@ var mediaSingle_width_type = exports.mediaSingle_width_type = ['mediaSingle', {
     }
   }
 }];
-var link_text_inline = exports.link_text_inline = ['text', {
+var text_link_inline = exports.text_link_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -885,7 +885,7 @@ var confluenceUnsupportedInline = exports.confluenceUnsupportedInline = {
   }
 };
 var atomic_inline = exports.atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
-var inline = exports.inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
+var inline_content = exports.inline_content = ['text_formatted', 'text_code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 var paragraph = exports.paragraph = {
   props: {
     type: {
@@ -903,7 +903,7 @@ var paragraph = exports.paragraph = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -961,7 +961,7 @@ var taskItem = exports.taskItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1018,7 +1018,7 @@ var decisionItem = exports.decisionItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1262,7 +1262,7 @@ var heading = exports.heading = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -1485,7 +1485,12 @@ var tableCell = exports.tableCell = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
   },
   required: ['content']
 };
@@ -1537,15 +1542,27 @@ var tableHeader = exports.tableHeader = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      minItems: 1
+    }
   },
   required: ['content']
 };
-var tableCell_content = exports.tableCell_content = {
-  type: 'array',
-  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
-  minItems: 1,
-  allowUnsupportedBlock: true
+var tableCellContent = exports.tableCellContent = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['tableCellContent']
+    },
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
 };
 var tableRow = exports.tableRow = {
   props: {

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

@@ -36,12 +36,8 @@ export const tableCell = adfNode('tableCell').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        reason: '@DSLCompatibilityException - required for tableCell validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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'],
+  ignore: ['pm-spec', 'validator-spec'],
   content: [tableCellContentPseudoGroup]
 });

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

@@ -38,10 +38,6 @@ export const tableHeader = adfNode('tableHeader').define({
       required: {
         reason: '@DSLCompatibilityException - required for tableHeader validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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

@@ -533,7 +533,7 @@ export const status = {
     }
   }
 };
-export const formatted_text_inline = ['text', {
+export const text_formatted = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -542,7 +542,7 @@ export const formatted_text_inline = ['text', {
     }
   }
 }];
-export const code_inline = ['text', {
+export const text_code_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -631,7 +631,7 @@ export const backgroundColor = {
     }
   }
 };
-export const inline_comment_marker = {
+export const confluenceInlineComment = {
   props: {
     type: {
       type: 'enum',
@@ -662,7 +662,7 @@ export const caption = {
     },
     content: {
       type: 'array',
-      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'text_formatted', 'text_code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -702,7 +702,7 @@ export const mediaSingle_width_type = ['mediaSingle', {
     }
   }
 }];
-export const link_text_inline = ['text', {
+export const text_link_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -878,7 +878,7 @@ export const confluenceUnsupportedInline = {
   }
 };
 export const atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
-export const inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
+export const inline_content = ['text_formatted', 'text_code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 export const paragraph = {
   props: {
     type: {
@@ -896,7 +896,7 @@ export const paragraph = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -954,7 +954,7 @@ export const taskItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1011,7 +1011,7 @@ export const decisionItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1255,7 +1255,7 @@ export const heading = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -1478,7 +1478,12 @@ export const tableCell = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
   },
   required: ['content']
 };
@@ -1530,15 +1535,27 @@ export const tableHeader = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      minItems: 1
+    }
   },
   required: ['content']
 };
-export const tableCell_content = {
-  type: 'array',
-  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
-  minItems: 1,
-  allowUnsupportedBlock: true
+export const tableCellContent = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['tableCellContent']
+    },
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
 };
 export const tableRow = {
   props: {

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

@@ -36,12 +36,8 @@ export var tableCell = adfNode('tableCell').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        reason: '@DSLCompatibilityException - required for tableCell validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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'],
+  ignore: ['pm-spec', 'validator-spec'],
   content: [tableCellContentPseudoGroup]
 });

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

@@ -38,10 +38,6 @@ export var tableHeader = adfNode('tableHeader').define({
       required: {
         reason: '@DSLCompatibilityException - required for tableHeader validator spec',
         value: ['content']
-      },
-      'props.content': {
-        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
-        value: 'tableCell_content'
       }
     }
   }

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

@@ -533,7 +533,7 @@ export var status = {
     }
   }
 };
-export var formatted_text_inline = ['text', {
+export var text_formatted = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -542,7 +542,7 @@ export var formatted_text_inline = ['text', {
     }
   }
 }];
-export var code_inline = ['text', {
+export var text_code_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -631,7 +631,7 @@ export var backgroundColor = {
     }
   }
 };
-export var inline_comment_marker = {
+export var confluenceInlineComment = {
   props: {
     type: {
       type: 'enum',
@@ -662,7 +662,7 @@ export var caption = {
     },
     content: {
       type: 'array',
-      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'formatted_text_inline', 'code_inline']],
+      items: [['hardBreak', 'mention', 'emoji', 'date', 'placeholder', 'inlineCard', 'status', 'text_formatted', 'text_code_inline']],
       allowUnsupportedInline: true,
       minItems: 0
     }
@@ -702,7 +702,7 @@ export var mediaSingle_width_type = ['mediaSingle', {
     }
   }
 }];
-export var link_text_inline = ['text', {
+export var text_link_inline = ['text', {
   props: {
     marks: {
       type: 'array',
@@ -878,7 +878,7 @@ export var confluenceUnsupportedInline = {
   }
 };
 export var atomic_inline = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline'];
-export var inline = ['formatted_text_inline', 'code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
+export var inline_content = ['text_formatted', 'text_code_inline', 'date', 'emoji', 'hardBreak', 'inlineCard', 'mention', 'placeholder', 'status', 'inlineExtension_with_marks', 'mediaInline'];
 export var paragraph = {
   props: {
     type: {
@@ -896,7 +896,7 @@ export var paragraph = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -954,7 +954,7 @@ export var taskItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1011,7 +1011,7 @@ export var decisionItem = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1255,7 +1255,7 @@ export var heading = {
     },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       optional: true,
       allowUnsupportedInline: true
     },
@@ -1478,7 +1478,12 @@ export var tableCell = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
   },
   required: ['content']
 };
@@ -1530,15 +1535,27 @@ export var tableHeader = {
       },
       optional: true
     },
-    content: 'tableCell_content'
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      minItems: 1
+    }
   },
   required: ['content']
 };
-export var tableCell_content = {
-  type: 'array',
-  items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
-  minItems: 1,
-  allowUnsupportedBlock: true
+export var tableCellContent = {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['tableCellContent']
+    },
+    content: {
+      type: 'array',
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      minItems: 1,
+      allowUnsupportedBlock: true
+    }
+  }
 };
 export var tableRow = {
   props: {

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

@@ -552,7 +552,7 @@ export declare const status: {
         };
     };
 };
-export declare const formatted_text_inline: (string | {
+export declare const text_formatted: (string | {
     props: {
         marks: {
             type: string;
@@ -561,7 +561,7 @@ export declare const formatted_text_inline: (string | {
         };
     };
 })[];
-export declare const code_inline: (string | {
+export declare const text_code_inline: (string | {
     props: {
         marks: {
             type: string;
@@ -650,7 +650,7 @@ export declare const backgroundColor: {
         };
     };
 };
-export declare const inline_comment_marker: {
+export declare const confluenceInlineComment: {
     props: {
         type: {
             type: string;
@@ -721,7 +721,7 @@ export declare const mediaSingle_width_type: (string | {
         };
     };
 })[];
-export declare const link_text_inline: (string | {
+export declare const text_link_inline: (string | {
     props: {
         marks: {
             type: string;
@@ -897,7 +897,7 @@ export declare const confluenceUnsupportedInline: {
     };
 };
 export declare const atomic_inline: string[];
-export declare const inline: string[];
+export declare const inline_content: string[];
 export declare const paragraph: {
     props: {
         type: {
@@ -1497,7 +1497,12 @@ export declare const tableCell: {
             };
             optional: boolean;
         };
-        content: string;
+        content: {
+            type: string;
+            items: string[][];
+            minItems: number;
+            allowUnsupportedBlock: boolean;
+        };
     };
     required: string[];
 };
@@ -1549,15 +1554,27 @@ export declare const tableHeader: {
             };
             optional: boolean;
         };
-        content: string;
+        content: {
+            type: string;
+            items: string[][];
+            minItems: number;
+        };
     };
     required: string[];
 };
-export declare const tableCell_content: {
-    type: string;
-    items: string[][];
-    minItems: number;
-    allowUnsupportedBlock: boolean;
+export declare const tableCellContent: {
+    props: {
+        type: {
+            type: string;
+            values: string[];
+        };
+        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": "40.10.0",
+  "version": "41.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.22.0",
-    "@atlaskit/adf-schema-generator": "^1.32.0",
+    "@atlaskit/adf-schema-generator": "^1.32.1",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",

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

@@ -94,7 +94,7 @@ const heading = {
     type: { type: 'enum', values: ['heading'] },
     content: {
       type: 'array',
-      items: ['inline'],
+      items: ['inline_content'],
       allowUnsupportedInline: true,
       optional: true,
     },