@atlaskit/adf-schema 37.2.1 → 39.0.0

package/dist/es2019/schema/nodes/unsupported-block.js

@@ -1,13 +1,5 @@
-export const unsupportedBlock = {
-  inline: false,
-  group: 'block',
-  atom: true,
-  selectable: true,
-  attrs: {
-    originalValue: {
-      default: {}
-    }
-  },
+import { unsupportedBlock as unsupportedBlockFactory } from '../../next-schema/generated/nodeTypes';
+export const unsupportedBlock = unsupportedBlockFactory({
   parseDOM: [{
     tag: '[data-node-type="unsupportedBlock"]',
     getAttrs: dom => ({
@@ -21,4 +13,4 @@ export const unsupportedBlock = {
     };
     return ['div', attrs, 'Unsupported content'];
   }
-};
+});

package/dist/es2019/schema/nodes/unsupported-inline.js

@@ -1,12 +1,5 @@
-export const unsupportedInline = {
-  inline: true,
-  group: 'inline',
-  selectable: true,
-  attrs: {
-    originalValue: {
-      default: {}
-    }
-  },
+import { unsupportedInline as unsupportedInlineFactory } from '../../next-schema/generated/nodeTypes';
+export const unsupportedInline = unsupportedInlineFactory({
   parseDOM: [{
     tag: '[data-node-type="unsupportedInline"]',
     getAttrs: dom => ({
@@ -20,4 +13,4 @@ export const unsupportedInline = {
     };
     return ['span', attrs, 'Unsupported content'];
   }
-};
+});

package/dist/esm/index.js

@@ -1,3 +1,7 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
-export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
+export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
+
+// ADF createPMSpecFactory
+
+export { createPMNodeSpecFactory, createPMMarkSpecFactory } from './schema';

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

@@ -4,7 +4,7 @@
  * and run "yarn workspace @atlaskit/adf-schema build:pm:full" to regenerate this file.
  */
 
-import { createPMMarkSpecFactory } from '@atlaskit/adf-schema-generator';
+import { createPMMarkSpecFactory } from '../../schema/createPMSpecFactory';
 export var alignment = createPMMarkSpecFactory({
   attrs: {
     align: {}

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

@@ -4,7 +4,7 @@
  * and run "yarn workspace @atlaskit/adf-schema build:pm:full" to regenerate this file.
  */
 
-import { createPMNodeSpecFactory } from '@atlaskit/adf-schema-generator';
+import { createPMNodeSpecFactory } from '../../schema/createPMSpecFactory';
 export var blockCard = createPMNodeSpecFactory({
   group: 'block',
   attrs: {
@@ -28,7 +28,7 @@ export var blockCard = createPMNodeSpecFactory({
   draggable: true
 });
 export var blockquote = createPMNodeSpecFactory({
-  content: '(paragraph | bulletList | orderedList | unsupportedBlock)+',
+  content: '(paragraph | orderedList | bulletList | unsupportedBlock)+',
   group: 'block',
   selectable: false,
   defining: true
@@ -40,7 +40,7 @@ export var blockquoteLegacy = createPMNodeSpecFactory({
   defining: true
 });
 export var bodiedExtension = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   marks: 'dataConsumer fragment',
   group: 'block',
   attrs: {
@@ -96,7 +96,7 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
 });
 export var bulletList = createPMNodeSpecFactory({
   content: 'listItem+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   selectable: false
 });
@@ -210,7 +210,7 @@ export var decisionItem = createPMNodeSpecFactory({
 });
 export var decisionList = createPMNodeSpecFactory({
   content: '(decisionItem | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     localId: {
@@ -222,7 +222,7 @@ export var decisionList = createPMNodeSpecFactory({
 });
 export var doc = createPMNodeSpecFactory({
   content: '(block | layoutSection | blockRootOnly)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment breakout'
+  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment breakout'
 });
 export var embedCard = createPMNodeSpecFactory({
   group: 'block',
@@ -278,8 +278,8 @@ export var emojiStage0 = createPMNodeSpecFactory({
   selectable: true
 });
 export var expand = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark dataConsumer fragment',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
   group: 'block',
   attrs: {
     title: {
@@ -356,7 +356,7 @@ export var extensionWithMarks = createPMNodeSpecFactory({
   selectable: true
 });
 export var extensionFrameStage0 = createPMNodeSpecFactory({
-  content: '(bodiedExtension | panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | blockCard | embedCard | unsupportedBlock)+',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
   marks: 'dataConsumer fragment',
   attrs: {},
   selectable: false,
@@ -512,7 +512,7 @@ export var inlineExtensionWithMarks = createPMNodeSpecFactory({
 });
 export var layoutColumn = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment indentation dataConsumer fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation dataConsumer fragment',
   attrs: {
     width: {
       default: undefined
@@ -523,28 +523,28 @@ export var layoutColumn = createPMNodeSpecFactory({
 });
 export var layoutSection = createPMNodeSpecFactory({
   content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });
 export var layoutSectionFull = createPMNodeSpecFactory({
   content: '(layoutColumn | unsupportedBlock){2,3}',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });
 export var layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
   content: '(layoutColumn | unsupportedBlock){1,3}',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });
 export var listItem = createPMNodeSpecFactory({
-  content: '(codeBlock | paragraph | mediaSingle | unsupportedBlock) (codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | unsupportedBlock)*',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   defining: true
 });
 export var listItemLegacy = createPMNodeSpecFactory({
-  content: '(codeBlock | paragraph | mediaSingle | unsupportedBlock) (codeBlock | paragraph | mediaSingle | bulletList | orderedList | unsupportedBlock)*',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock | unsupportedBlock)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   defining: true
 });
@@ -600,7 +600,7 @@ export var media = createPMNodeSpecFactory({
 });
 export var mediaGroup = createPMNodeSpecFactory({
   content: '(media | unsupportedBlock)+',
-  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  marks: 'link annotation border unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {},
   selectable: false
@@ -669,12 +669,12 @@ export var mediaSingle = createPMNodeSpecFactory({
     }
   },
   selectable: true,
-  content: 'media|media|unsupportedBlock+ unsupportedBlock+',
+  content: 'media|unsupportedBlock+|media unsupportedBlock+',
   marks: 'annotation border link unsupportedMark unsupportedNodeAttribute'
 });
 export var mediaSingleCaption = createPMNodeSpecFactory({
-  content: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
-  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*',
+  marks: 'link annotation border unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   atom: false,
   attrs: {
@@ -688,8 +688,8 @@ export var mediaSingleCaption = createPMNodeSpecFactory({
   selectable: true
 });
 export var mediaSingleFull = createPMNodeSpecFactory({
-  content: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
-  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*',
+  marks: 'link annotation border unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   atom: false,
   attrs: {
@@ -706,8 +706,8 @@ export var mediaSingleFull = createPMNodeSpecFactory({
   selectable: true
 });
 export var mediaSingleWidthType = createPMNodeSpecFactory({
-  content: 'media|media|unsupportedBlock+ unsupportedBlock+',
-  marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
+  content: 'media|unsupportedBlock+|media unsupportedBlock+',
+  marks: 'link annotation border unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   atom: true,
   attrs: {
@@ -794,8 +794,8 @@ export var multiBodiedExtensionStage0 = createPMNodeSpecFactory({
   definingAsContext: true
 });
 export var nestedExpand = createPMNodeSpecFactory({
-  content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     title: {
       default: ''
@@ -821,7 +821,7 @@ export var nestedExpandWithNoMarks = createPMNodeSpecFactory({
 });
 export var orderedList = createPMNodeSpecFactory({
   content: 'listItem+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     order: {
@@ -831,8 +831,8 @@ export var orderedList = createPMNodeSpecFactory({
   selectable: false
 });
 export var panel = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     panelType: {
@@ -854,8 +854,8 @@ export var panel = createPMNodeSpecFactory({
   selectable: true
 });
 export var panelLegacy = createPMNodeSpecFactory({
-  content: '(blockCard | paragraph | bulletList | orderedList | heading | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     panelType: {
@@ -968,7 +968,7 @@ export var statusStage0 = createPMNodeSpecFactory({
 });
 export var table = createPMNodeSpecFactory({
   content: 'tableRow+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     displayMode: {
@@ -995,8 +995,8 @@ export var table = createPMNodeSpecFactory({
   tableRole: 'table'
 });
 export var tableCell = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand | unsupportedBlock)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment dataConsumer fragment',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
+  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1016,8 +1016,8 @@ export var tableCell = createPMNodeSpecFactory({
   tableRole: 'cell'
 });
 export var tableHeader = createPMNodeSpecFactory({
-  content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark alignment dataConsumer fragment',
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
+  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1038,7 +1038,7 @@ export var tableHeader = createPMNodeSpecFactory({
 });
 export var tableRow = createPMNodeSpecFactory({
   content: '(tableCell | tableHeader)+',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   tableRole: 'row'
 });
@@ -1058,7 +1058,7 @@ export var taskItem = createPMNodeSpecFactory({
 });
 export var taskList = createPMNodeSpecFactory({
   content: '(taskItem | unsupportedBlock)+ (taskItem | taskList | unsupportedBlock)*',
-  marks: 'unsupportedNodeAttribute unsupportedMark',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
   attrs: {
     localId: {

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

@@ -18,7 +18,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export var nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
+export var nonNestableBlockContent = [paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table, blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
 
 /**
  * @DSLCompatibilityException

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

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-var tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+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.use('with_no_marks'), 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/nodes/blockCard.js

@@ -4,7 +4,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var blockCard = adfNode('blockCard').define({
   draggable: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     anyOf: [{
       url: {

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

@@ -7,8 +7,8 @@ import { unsupportedBlock } from './unsupportedBlock';
 export var blockquote = adfNode('blockquote').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, unsupportedBlock))]
+  marks: [unsupportedMark, unsupportedNodeAttribute],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock))]
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
   content: [$onePlus($or(paragraph, unsupportedBlock))]

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

@@ -8,7 +8,7 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
   defining: true,
   selectable: true,
   isolating: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     extensionKey: {
@@ -46,7 +46,7 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
   },
   content: [$onePlus($or(nonNestableBlockContentGroup))]
 }).variant('with_marks', {
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 });

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

@@ -13,7 +13,7 @@ import { unsupportedInline } from './unsupportedInline';
 export var caption = adfNode('caption').define({
   isolating: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   allowAnyChildMark: true,
   content: [$zeroPlus($or(hardBreak, mention, emoji, date, placeholder, inlineCard, status, text.use('formatted'), text.use('code_inline'), unsupportedInline))],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -7,7 +7,7 @@ import { unsupportedInline } from './unsupportedInline';
 export var codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     language: {
@@ -44,7 +44,7 @@ export var codeBlock = adfNode('codeBlock').define({
     }
   }
 }).variant('with_marks', {
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   ignore: ['pm-spec']
 }).variant('with_no_marks', {
   content: [],

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

@@ -5,7 +5,7 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var decisionItem = adfNode('decisionItem').define({
   defining: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   allowAnyChildMark: true,
   attrs: {
     localId: {

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

@@ -6,7 +6,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export var decisionList = adfNode('decisionList').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     localId: {
       type: 'string',

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

@@ -3,7 +3,7 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var embedCard = adfNode('embedCard').define({
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     url: {
       type: 'string',

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

@@ -6,7 +6,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var expand = adfNode('expand').define({
   isolating: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     title: {
@@ -30,7 +30,7 @@ export var expand = adfNode('expand').define({
     }
   }
 }).variant('with_breakout_mark', {
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: ['pm-spec']
 }).variant('with_no_mark', {

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

@@ -6,7 +6,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var extension = adfNode('extension').define({
   atom: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     extensionKey: {
@@ -43,6 +43,6 @@ export var extension = adfNode('extension').define({
     }
   }
 }).variant('with_marks', {
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   ignore: []
 });

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

@@ -26,9 +26,9 @@ export var extensionFrame = adfNode('extensionFrame').define({
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
-  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.allowUnsupportedBlock': {

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

@@ -4,7 +4,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var hardBreak = adfNode('hardBreak').define({
   inline: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     // Carried over from original JSON Schema as is
     text: {

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

@@ -7,7 +7,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -36,11 +36,11 @@ export var heading = adfNode('heading').define({
     }
   }
 }).variant('with_alignment', {
-  marks: [alignment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_indentation', {
-  marks: [indentation, unsupportedNodeAttribute, unsupportedMark],
+  marks: [indentation, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_no_marks', {

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

@@ -6,7 +6,7 @@ export var inlineCard = adfNode('inlineCard').define({
   inline: true,
   selectable: true,
   draggable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     anyOf: [{
       url: {
@@ -37,5 +37,5 @@ export var inlineCard = adfNode('inlineCard').define({
     }
   }
 }).variant('with_annotation', {
-  marks: [annotation, unsupportedNodeAttribute, unsupportedMark]
+  marks: [annotation, unsupportedMark, unsupportedNodeAttribute]
 });

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

@@ -6,7 +6,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var inlineExtension = adfNode('inlineExtension').define({
   inline: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     extensionKey: {
@@ -37,5 +37,5 @@ export var inlineExtension = adfNode('inlineExtension').define({
     }
   }
 }).variant('with_marks', {
-  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark]
+  marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute]
 });

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

@@ -7,7 +7,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 export var layoutColumn = adfNode('layoutColumn').define({
   isolating: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     width: {
       type: 'number',

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

@@ -6,7 +6,7 @@ import { layoutColumn } from './layoutColumn';
 import { unsupportedBlock } from './unsupportedBlock';
 export var layoutSection = adfNode('layoutSection').define({
   isolating: true,
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [$or(layoutColumn, unsupportedBlock)],
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
@@ -46,7 +46,7 @@ export var layoutSection = adfNode('layoutSection').define({
     }
   }
 }).variant('full', {
-  marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))],
   ignore: [],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -11,16 +11,16 @@ export var bulletList = adfNode('bulletList');
 var listItem = adfNode('listItem').define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   contentMinItems: 1,
-  content: [$or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), unsupportedBlock), $zeroPlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, unsupportedBlock))]
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))]
 }).variant('legacy', {
-  content: [$or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), unsupportedBlock), $zeroPlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), bulletList, orderedList, unsupportedBlock))],
+  content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))],
   ignore: ['json-schema', 'validator-spec']
 });
 orderedList.define({
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     order: {
       type: 'number',
@@ -33,6 +33,6 @@ orderedList.define({
 });
 bulletList.define({
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   content: [$onePlus($or(listItem, listItem.use('legacy')))]
 });

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

@@ -6,7 +6,7 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var media = adfNode('media').define({
   selectable: true,
-  marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
+  marks: [link, annotation, border, unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     anyOf: [{
       type: {