@atlaskit/adf-schema 52.8.0 → 52.9.1

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

@@ -49,7 +49,7 @@ export const backgroundColor = {
     }
   }
 };
-export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
+export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export const blockCard = {
   props: {
     attrs: [{
@@ -248,7 +248,7 @@ export const bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -568,7 +568,7 @@ export const doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -1601,7 +1601,7 @@ export const paragraph = {
 export const paragraph_with_alignment = ['paragraph', {
   props: {
     marks: {
-      items: ['alignment'],
+      items: [['fontSize', 'alignment']],
       optional: true,
       type: 'array'
     }
@@ -1616,28 +1616,10 @@ export const paragraph_with_font_size = ['paragraph', {
     }
   }
 }];
-export const paragraph_with_font_size_and_alignment = ['paragraph', {
-  props: {
-    marks: {
-      items: [['fontSize', 'alignment']],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
-export const paragraph_with_font_size_and_indentation = ['paragraph', {
-  props: {
-    marks: {
-      items: [['fontSize', 'indentation']],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
 export const paragraph_with_indentation = ['paragraph', {
   props: {
     marks: {
-      items: ['indentation'],
+      items: [['fontSize', 'indentation']],
       optional: true,
       type: 'array'
     }
@@ -1855,7 +1837,7 @@ export const tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_font_size_and_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1897,7 +1879,7 @@ export const tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_font_size_and_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

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

@@ -125,7 +125,7 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
 });
 export var bodiedSyncBlock = createPMNodeSpecFactory({
   content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | rule | table | taskList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize breakout link fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {
       default: ''
@@ -334,7 +334,7 @@ export var decisionList = createPMNodeSpecFactory({
 });
 export var doc = createPMNodeSpecFactory({
   content: '(block | codeBlock | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize dataConsumer fragment breakout'
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
 });
 export var embedCard = createPMNodeSpecFactory({
   group: 'block',
@@ -656,7 +656,7 @@ export var inlineExtensionWithMarks = createPMNodeSpecFactory({
 });
 export var layoutColumn = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize dataConsumer fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {
     width: {
       default: undefined
@@ -1062,25 +1062,7 @@ export var paragraphWithAlignment = createPMNodeSpecFactory({
   },
   selectable: false
 });
-export var paragraphWithFontSizeAndAlignmentStage0 = createPMNodeSpecFactory({
-  group: 'block',
-  attrs: {
-    localId: {
-      default: null
-    }
-  },
-  selectable: false
-});
-export var paragraphWithFontSizeAndIndentationStage0 = createPMNodeSpecFactory({
-  group: 'block',
-  attrs: {
-    localId: {
-      default: null
-    }
-  },
-  selectable: false
-});
-export var paragraphWithFontSizeStage0 = createPMNodeSpecFactory({
+export var paragraphWithFontSize = createPMNodeSpecFactory({
   attrs: {
     localId: {
       default: null
@@ -1235,7 +1217,7 @@ export var tableWithNestedTable = createPMNodeSpecFactory({
 });
 export var tableCell = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1259,7 +1241,7 @@ export var tableCell = createPMNodeSpecFactory({
 });
 export var tableCellWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1283,7 +1265,7 @@ export var tableCellWithNestedTable = createPMNodeSpecFactory({
 });
 export var tableHeader = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1307,7 +1289,7 @@ export var tableHeader = createPMNodeSpecFactory({
 });
 export var tableHeaderWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1

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

@@ -31,7 +31,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, codeBlock.use('with_extended_attributes'), 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, table,
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, codeBlock.use('with_extended_attributes'), 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, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
+export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -17,7 +17,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_font_size_and_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

package/dist/esm/next-schema/marks/fontSize.js

@@ -21,6 +21,5 @@ export var fontSize = adfMark('fontSize').define({
       type: 'enum',
       values: ['small']
     }
-  },
-  stage0: true
+  }
 });

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

@@ -34,7 +34,7 @@ export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

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

@@ -18,11 +18,11 @@ export var paragraph = adfNode('paragraph').define({
   hasEmptyMarks: true,
   content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
-  marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
+  marks: [fontSize, alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_indentation', {
-  marks: [indentation, unsupportedMark, unsupportedNodeAttribute],
+  marks: [fontSize, indentation, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_marks', {
@@ -37,16 +37,5 @@ export var paragraph = adfNode('paragraph').define({
 }).variant('with_font_size', {
   marks: [fontSize, unsupportedMark, unsupportedNodeAttribute],
   content: [],
-  ignore: [],
-  stage0: true
-}).variant('with_font_size_and_alignment', {
-  marks: [fontSize, alignment, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: [],
-  stage0: true
-}).variant('with_font_size_and_indentation', {
-  marks: [fontSize, indentation, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: [],
-  stage0: true
+  ignore: []
 });

package/dist/esm/schema/default-schema.js

@@ -1,11 +1,10 @@
 import memoizeOne from 'memoize-one';
 import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, codeBlockWithExtendedAttributes } from './nodes';
 import { createSchema } from './create-schema';
-import { fontSize } from './marks/font-size';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
     nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'caption', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'mediaInline', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'blockTaskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'syncBlock', 'bodiedSyncBlock', 'unsupportedBlock', 'unsupportedInline'],
-    marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'backgroundColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'dataConsumer', 'border', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery',
+    marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'backgroundColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'fontSize', 'dataConsumer', 'border', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery',
     // https://product-fabric.atlassian.net/browse/ED-10214,
     'fragment']
   };
@@ -31,9 +30,6 @@ function () {
       tableHeader: tableHeaderWithNestedTable,
       codeBlock: codeBlockWithExtendedAttributes
     };
-    defaultSchemaConfig.customMarkSpecs = {
-      fontSize: fontSize
-    };
   }
   return createSchema(defaultSchemaConfig);
 });

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

@@ -49,7 +49,7 @@ export var backgroundColor = {
     }
   }
 };
-export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
+export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export var blockCard = {
   props: {
     attrs: [{
@@ -248,7 +248,7 @@ export var bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -568,7 +568,7 @@ export var doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_font_size_and_alignment', 'paragraph_with_font_size_and_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -1601,7 +1601,7 @@ export var paragraph = {
 export var paragraph_with_alignment = ['paragraph', {
   props: {
     marks: {
-      items: ['alignment'],
+      items: [['fontSize', 'alignment']],
       optional: true,
       type: 'array'
     }
@@ -1616,28 +1616,10 @@ export var paragraph_with_font_size = ['paragraph', {
     }
   }
 }];
-export var paragraph_with_font_size_and_alignment = ['paragraph', {
-  props: {
-    marks: {
-      items: [['fontSize', 'alignment']],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
-export var paragraph_with_font_size_and_indentation = ['paragraph', {
-  props: {
-    marks: {
-      items: [['fontSize', 'indentation']],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
 export var paragraph_with_indentation = ['paragraph', {
   props: {
     marks: {
-      items: ['indentation'],
+      items: [['fontSize', 'indentation']],
       optional: true,
       type: 'array'
     }
@@ -1855,7 +1837,7 @@ export var tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_font_size_and_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1897,7 +1879,7 @@ export var tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_font_size_and_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

package/dist/json-schema/v1/full.json

@@ -309,6 +309,9 @@
                 {
                   "$ref": "#/definitions/paragraph_with_no_marks_node"
                 },
+                {
+                  "$ref": "#/definitions/paragraph_with_font_size_node"
+                },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
                 }
@@ -319,6 +322,9 @@
                 {
                   "$ref": "#/definitions/paragraph_with_no_marks_node"
                 },
+                {
+                  "$ref": "#/definitions/paragraph_with_font_size_node"
+                },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
                 }
@@ -1196,6 +1202,26 @@
         }
       ]
     },
+    "fontSize_mark": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["fontSize"]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "fontSize": {
+              "enum": ["small"]
+            }
+          },
+          "required": ["fontSize"],
+          "additionalProperties": false
+        }
+      },
+      "required": ["type", "attrs"],
+      "additionalProperties": false
+    },
     "formatted_text_inline_node": {
       "allOf": [
         {
@@ -1679,6 +1705,9 @@
           "type": "array",
           "items": {
             "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_with_font_size_node"
+              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -2047,6 +2076,9 @@
           {
             "$ref": "#/definitions/paragraph_with_no_marks_node"
           },
+          {
+            "$ref": "#/definitions/paragraph_with_font_size_node"
+          },
           {
             "$ref": "#/definitions/heading_with_no_marks_node"
           },
@@ -2137,6 +2169,9 @@
         {
           "$ref": "#/definitions/paragraph_with_no_marks_node"
         },
+        {
+          "$ref": "#/definitions/paragraph_with_font_size_node"
+        },
         {
           "$ref": "#/definitions/panel_node"
         },
@@ -2263,6 +2298,9 @@
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
+              {
+                "$ref": "#/definitions/paragraph_with_font_size_node"
+              },
               {
                 "$ref": "#/definitions/heading_with_no_marks_node"
               },
@@ -2346,7 +2384,33 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/alignment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/alignment_mark"
+                  }
+                ]
+              }
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
+    "paragraph_with_font_size_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/paragraph_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/fontSize_mark"
               }
             }
           },
@@ -2365,7 +2429,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/indentation_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/indentation_mark"
+                  }
+                ]
               }
             }
           },

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

@@ -81,12 +81,6 @@
         {
           "$ref": "#/definitions/paragraph_with_indentation_node"
         },
-        {
-          "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-        },
-        {
-          "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-        },
         {
           "$ref": "#/definitions/mediaSingle_caption_node"
         },
@@ -456,12 +450,6 @@
               {
                 "$ref": "#/definitions/paragraph_with_indentation_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -1006,12 +994,6 @@
               {
                 "$ref": "#/definitions/paragraph_with_indentation_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -2691,25 +2673,6 @@
       "required": ["type"]
     },
     "paragraph_with_alignment_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/paragraph_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/alignment_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "paragraph_with_font_size_and_alignment_node": {
       "allOf": [
         {
           "$ref": "#/definitions/paragraph_node"
@@ -2735,32 +2698,6 @@
         }
       ]
     },
-    "paragraph_with_font_size_and_indentation_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/paragraph_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/fontSize_mark"
-                  },
-                  {
-                    "$ref": "#/definitions/indentation_mark"
-                  }
-                ]
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
     "paragraph_with_font_size_node": {
       "allOf": [
         {
@@ -2791,7 +2728,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/indentation_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/indentation_mark"
+                  }
+                ]
               }
             }
           },
@@ -2973,9 +2917,6 @@
           {
             "$ref": "#/definitions/paragraph_with_alignment_node"
           },
-          {
-            "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-          },
           {
             "$ref": "#/definitions/panel_node"
           },