@atlaskit/adf-schema 37.2.1 → 38.0.0

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

@@ -8,7 +8,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const mediaSingle = adfNode('mediaSingle').define({
   atom: true,
   selectable: true,
-  marks: [link, unsupportedNodeAttribute, unsupportedMark],
+  marks: [link, unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     anyOf: [{
       width: {
@@ -50,7 +50,7 @@ export const mediaSingle = adfNode('mediaSingle').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
-        value: 'media|media|unsupportedBlock+ unsupportedBlock+',
+        value: 'media|unsupportedBlock+|media unsupportedBlock+',
         reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
       },
       attrs: {
@@ -86,7 +86,7 @@ export const mediaSingle = adfNode('mediaSingle').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
-        value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
+        value: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*',
         reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
       },
       attrs: {
@@ -110,7 +110,7 @@ export const mediaSingle = adfNode('mediaSingle').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
-        value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
+        value: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*',
         reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
       }
     }
@@ -124,7 +124,7 @@ export const mediaSingle = adfNode('mediaSingle').define({
   DANGEROUS_MANUAL_OVERRIDE: {
     'pm-spec': {
       content: {
-        value: 'media|media|unsupportedBlock+ unsupportedBlock+',
+        value: 'media|unsupportedBlock+|media unsupportedBlock+',
         reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
       }
     }

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

@@ -16,7 +16,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const nestedExpand = adfNode('nestedExpand').define({
   isolating: true,
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     title: {
       type: 'string',
@@ -29,7 +29,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, unsupportedBlock))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock.use('with_no_marks'), bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -14,7 +14,7 @@ import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 export const panel = adfNode('panel').define({
   selectable: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     panelType: {
       type: 'enum',
@@ -42,8 +42,8 @@ export const panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(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, unsupportedBlock))]
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock))]
 }).variant('legacy', {
-  content: [$onePlus($or(blockCard, paragraph.use('with_no_marks'), bulletList, orderedList, heading.use('with_no_marks'), unsupportedBlock))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, unsupportedBlock))],
   ignore: ['json-schema', 'validator-spec']
 });

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

@@ -14,7 +14,7 @@ export const paragraph = adfNode('paragraph').define({
     }
   },
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   content: [$zeroPlus($or(inlineGroup, atomicInlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
@@ -30,15 +30,15 @@ export const paragraph = adfNode('paragraph').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_marks', {
-  marks: [alignment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_no_marks', {

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

@@ -4,7 +4,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const placeholder = adfNode('placeholder').define({
   selectable: false,
   inline: true,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   allowNoChildMark: true,
   attrs: {
     text: {

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

@@ -7,7 +7,7 @@ export const table = adfNode('table').define({
   isolating: true,
   selectable: true,
   tableRole: 'table',
-  marks: [fragment, unsupportedNodeAttribute, unsupportedMark],
+  marks: [fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     displayMode: {
       type: 'enum',

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

@@ -6,7 +6,7 @@ export const tableCell = adfNode('tableCell').define({
   isolating: true,
   selectable: false,
   tableRole: 'cell',
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     colspan: {
       type: 'number',

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

@@ -6,7 +6,7 @@ export const tableHeader = adfNode('tableHeader').define({
   isolating: true,
   selectable: false,
   tableRole: 'header_cell',
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     colspan: {
       type: 'number',

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

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

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

@@ -9,7 +9,7 @@ export const taskList = adfNode('taskList');
 taskItem.define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   allowAnyChildMark: true,
   attrs: {
     localId: {
@@ -27,7 +27,7 @@ taskItem.define({
 taskList.define({
   defining: true,
   selectable: false,
-  marks: [unsupportedNodeAttribute, unsupportedMark],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     localId: {
       type: 'string',

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

@@ -30,5 +30,5 @@ export const text = adfNode('text').define({
     }
   }
 }).variant('code_inline', {
-  marks: [code, link, annotation, unsupportedNodeAttribute, unsupportedMark]
+  marks: [code, link, annotation, unsupportedMark, unsupportedNodeAttribute]
 });

package/dist/es2019/schema/createPMSpecFactory.js

@@ -0,0 +1,55 @@
+/**
+ * Factory method to attach custom parseDOM and/or toDOM for nodeSpec
+ *
+ * @example
+ * createPMNodeSpecFactory<SomeNode>(node)({parseDOM: {}, toDOM: (node) => {} });
+ *
+ * @param nodeSpec - NodeSpec without toDom and parseDom
+ * @returns A function for a node which allows the consumer to define toDom and parseDom
+ */
+export const createPMNodeSpecFactory = nodeSpec => ({
+  parseDOM,
+  toDOM,
+  toDebugString
+}) => {
+  return {
+    ...nodeSpec,
+    ...(parseDOM && {
+      parseDOM
+    }),
+    ...(toDOM && {
+      toDOM
+    }),
+    ...(toDebugString && {
+      toDebugString
+    })
+  };
+};
+
+/**
+ * Factory method to attach custom parseDOM and/or toDOM for markSpec
+ *
+ * @example
+ * createPMMarkSpecFactory<SomeMark>(mark)({parseDOM: {}, toDOM: (mark, inline) => {} });
+ *
+ * @param markSpec - Markspec without toDom and parseDom
+ * @returns A function for a mark which allows the consumer to define toDom and parseDom
+ */
+export const createPMMarkSpecFactory = markSpec => ({
+  parseDOM,
+  toDOM,
+  toDebugString
+}) => {
+  return {
+    ...markSpec,
+    ...(parseDOM && {
+      parseDOM
+    }),
+    ...(toDOM && {
+      toDOM
+    }),
+    ...(toDebugString && {
+      toDebugString
+    })
+  };
+};

package/dist/es2019/schema/index.js

@@ -3,4 +3,8 @@ export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout,
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
+export { sanitizeNodes, createSchema } from './create-schema';
+
+// ADF createPMSpecFactory
+
+export { createPMNodeSpecFactory, createPMMarkSpecFactory } from './createPMSpecFactory';

package/dist/es2019/schema/marks/alignment.js

@@ -1,4 +1,4 @@
-import { ALIGNMENT, INDENTATION } from '../groups';
+import { alignment as alignmentFactory } from '../../next-schema/generated/markTypes';
 
 /** TODO: Flip these positions for RTL */
 export const alignmentPositionMap = {
@@ -11,12 +11,7 @@ export const alignmentPositionMap = {
  * @name alignment_mark
  */
 
-export const alignment = {
-  excludes: `alignment ${INDENTATION}`,
-  group: ALIGNMENT,
-  attrs: {
-    align: {}
-  },
+export const alignment = alignmentFactory({
   parseDOM: [{
     tag: 'div.fabric-editor-block-mark',
     getAttrs: dom => {
@@ -32,4 +27,4 @@ export const alignment = {
       'data-align': mark.attrs.align
     }, 0];
   }
-};
+});

package/dist/es2019/schema/marks/annotation.js

@@ -1,3 +1,5 @@
+import { annotation as annotationFactory } from '../../next-schema/generated/markTypes';
+
 /**
  * @name annotation_mark
  */
@@ -29,18 +31,7 @@ export function buildDataAttributes({
   }
   return data;
 }
-export const annotation = {
-  inclusive: true,
-  group: 'annotation',
-  excludes: '',
-  attrs: {
-    id: {
-      default: ''
-    },
-    annotationType: {
-      default: AnnotationTypes.INLINE_COMMENT
-    }
-  },
+export const annotation = annotationFactory({
   parseDOM: [{
     tag: 'span[data-mark-type="annotation"]',
     mark: 'annotation',
@@ -71,4 +62,4 @@ export const annotation = {
       })
     }, 0];
   }
-};
+});

package/dist/es2019/schema/marks/background-color.js

@@ -1,5 +1,5 @@
+import { backgroundColor as backgroundColorFactory } from '../../next-schema/generated/markTypes';
 import { hexToEditorTextBackgroundPaletteColor } from '../../utils/editor-palette';
-import { COLOR } from '../groups';
 import { rgbToHex, L200, T200, P200, M200, Neutral300, O200 } from '../../utils/colors';
 import { getGlobalTheme } from './text-color';
 import { getDarkModeLCHColor } from '../../utils/lch-color-inversion';
@@ -24,13 +24,7 @@ const colorArrayPalette = [[Neutral300, 'Gray'],
 // @see https://product-fabric.atlassian.net/wiki/spaces/E/pages/55979455/Colour+picker+decisions#Colourpickerdecisions-Visualdesigndecisions
 export const backgroundColorPalette = new Map();
 colorArrayPalette.forEach(([color, label]) => backgroundColorPalette.set(color.toLowerCase(), label));
-export const backgroundColor = {
-  attrs: {
-    color: {}
-  },
-  inclusive: true,
-  group: COLOR,
-  excludes: `${COLOR}`,
+export const backgroundColor = backgroundColorFactory({
   parseDOM: [{
     style: 'background-color',
     getAttrs: maybeValue => {
@@ -103,4 +97,4 @@ export const backgroundColor = {
       ['data-background-custom-color']: mark.attrs.color
     }];
   }
-};
+});

package/dist/es2019/schema/marks/border.js

@@ -1,3 +1,4 @@
+import { border as borderFactory } from '../../next-schema/generated/markTypes';
 import { hexToEditorBorderPaletteColor } from '../../utils/editor-palette';
 import { N300A, N600, N1000 } from '../../utils/colors';
 
@@ -9,8 +10,7 @@ import { N300A, N600, N1000 } from '../../utils/colors';
 const borderColorArrayPalette = [[N300A, 'Subtle gray'], [N600, 'Gray'], [N1000, 'Bold gray']];
 export const borderColorPalette = new Map();
 borderColorArrayPalette.forEach(([color, label]) => borderColorPalette.set(color.toLowerCase(), label));
-export const border = {
-  inclusive: false,
+export const border = borderFactory({
   parseDOM: [{
     tag: '[data-mark-type="border"]',
     getAttrs: domNode => {
@@ -24,10 +24,6 @@ export const border = {
       };
     }
   }],
-  attrs: {
-    color: {},
-    size: {}
-  },
   toDOM(mark, isInline) {
     const wrapperStyle = isInline ? 'span' : 'div';
 
@@ -42,4 +38,4 @@ export const border = {
       style: `--custom-palette-color: ${paletteColorValue}`
     }];
   }
-};
+});

package/dist/es2019/schema/marks/breakout.js

@@ -1,12 +1,11 @@
+import { breakout as breakoutFactory } from '../../next-schema/generated/markTypes';
 const allowedTypes = ['wide', 'full-width'];
 
 /**
  * @name breakout_mark
  */
 
-export const breakout = {
-  spanning: false,
-  inclusive: false,
+export const breakout = breakoutFactory({
   parseDOM: [{
     tag: 'div.fabric-editor-breakout-mark',
     getAttrs(dom) {
@@ -16,15 +15,10 @@ export const breakout = {
       };
     }
   }],
-  attrs: {
-    mode: {
-      default: 'wide'
-    }
-  },
   toDOM(mark) {
     return ['div', {
       class: 'fabric-editor-breakout-mark',
       'data-mode': mark.attrs.mode
     }, 0];
   }
-};
+});

package/dist/es2019/schema/marks/code.js

@@ -1,12 +1,10 @@
-import { COLOR, FONT_STYLE, LINK, SEARCH_QUERY } from '../groups';
+import { code as codeFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name code_mark
  */
 
-export const code = {
-  excludes: `${FONT_STYLE} ${LINK} ${SEARCH_QUERY} ${COLOR}`,
-  inclusive: true,
+export const code = codeFactory({
   parseDOM: [{
     tag: 'span.code',
     preserveWhitespace: true
@@ -36,4 +34,4 @@ export const code = {
       spellcheck: 'false'
     }];
   }
-};
+});

package/dist/es2019/schema/marks/confluence-inline-comment.js

@@ -1,16 +1,11 @@
+import { confluenceInlineComment as confluenceInlineCommentFactory } from '../../next-schema/generated/markTypes';
+
 /**
  * @name inline_comment_marker
  * @description This temporary mark represents a Confluence-backed inline comment that wraps a piece of text. It will be replaced with a cross-product inline comment solution at later date.
  */
 
-export const confluenceInlineComment = {
-  inclusive: false,
-  excludes: '',
-  attrs: {
-    reference: {
-      default: ''
-    }
-  },
+export const confluenceInlineComment = confluenceInlineCommentFactory({
   parseDOM: [{
     tag: 'span[data-mark-type="confluenceInlineComment"]'
   }],
@@ -20,4 +15,4 @@ export const confluenceInlineComment = {
       'data-reference': node.attrs.reference
     }];
   }
-};
+});

package/dist/es2019/schema/marks/data-consumer.js

@@ -1,3 +1,4 @@
+import { dataConsumer as dataConsumerFactory } from '../../next-schema/generated/markTypes';
 import { isDOMElement } from '../../utils/parseDOM';
 
 /**
@@ -27,12 +28,7 @@ const parseDataConsumer = maybeValue => {
     return false;
   }
 };
-export const dataConsumer = {
-  attrs: {
-    sources: {
-      default: []
-    }
-  },
+export const dataConsumer = dataConsumerFactory({
   parseDOM: [{
     tag: '[data-mark-type="dataConsumer"]',
     getAttrs: maybeValue => parseDataConsumer(maybeValue)
@@ -44,7 +40,7 @@ export const dataConsumer = {
       'data-sources': JSON.stringify(mark.attrs.sources)
     }];
   }
-};
+});
 
 /**
  * We want to ensure any "invalid ADF" doesn't get serialised, but the entire

package/dist/es2019/schema/marks/em.js

@@ -1,13 +1,11 @@
-import { FONT_STYLE } from '../groups';
+import { em as emFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name em_mark
  */
 
 const emDOM = ['em'];
-export const em = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const em = emFactory({
   parseDOM: [{
     tag: 'i'
   }, {
@@ -18,4 +16,4 @@ export const em = {
   toDOM() {
     return emDOM;
   }
-};
+});

package/dist/es2019/schema/marks/fragment.js

@@ -1,3 +1,4 @@
+import { fragment as fragmentFactory } from '../../next-schema/generated/markTypes';
 import { isDOMElement } from '../../utils/parseDOM';
 
 /**
@@ -21,17 +22,7 @@ const parseFragment = maybeValue => {
     name
   };
 };
-export const fragment = {
-  inclusive: false,
-  excludes: '',
-  attrs: {
-    localId: {
-      default: ''
-    },
-    name: {
-      default: null
-    }
-  },
+export const fragment = fragmentFactory({
   parseDOM: [{
     tag: '[data-mark-type="fragment"]',
     getAttrs: maybeValue => parseFragment(maybeValue)
@@ -44,7 +35,7 @@ export const fragment = {
       'data-localId': mark.attrs.localId
     }];
   }
-};
+});
 export const toJSON = mark => {
   return {
     type: mark.type.name,

package/dist/es2019/schema/marks/indentation.js

@@ -1,15 +1,10 @@
-import { ALIGNMENT, INDENTATION } from '../groups';
+import { indentation as indentationFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name indentation_mark
  */
 
-export const indentation = {
-  excludes: `indentation ${ALIGNMENT}`,
-  group: INDENTATION,
-  attrs: {
-    level: {}
-  },
+export const indentation = indentationFactory({
   parseDOM: [{
     tag: 'div.fabric-editor-indentation-mark',
     getAttrs(dom) {
@@ -25,4 +20,4 @@ export const indentation = {
       'data-level': mark.attrs.level
     }, 0];
   }
-};
+});

package/dist/es2019/schema/marks/link.js

@@ -1,4 +1,4 @@
-import { LINK } from '../groups';
+import { link as linkFactory } from '../../next-schema/generated/markTypes';
 import { isRootRelative, isSafeUrl, normalizeUrl } from '../../utils/url';
 
 /**
@@ -21,17 +21,7 @@ const getLinkAttrs = attribute => domNode => {
   attrs.href = normalizeUrl(href);
   return attrs;
 };
-export const link = {
-  excludes: `${LINK}`,
-  // ED-5844 No multiple links in media node
-  group: LINK,
-  attrs: {
-    href: {},
-    __confluenceMetadata: {
-      default: null
-    }
-  },
-  inclusive: false,
+export const link = linkFactory({
   parseDOM: [{
     tag: '[data-block-link]',
     getAttrs: getLinkAttrs('data-block-link'),
@@ -69,7 +59,7 @@ export const link = {
       class: 'blockLink'
     }, 0];
   }
-};
+});
 const OPTIONAL_ATTRS = ['title', 'id', 'collection', 'occurrenceKey', '__confluenceMetadata'];
 export const toJSON = mark => ({
   type: mark.type.name,

package/dist/es2019/schema/marks/strike.js

@@ -1,12 +1,10 @@
-import { FONT_STYLE } from '../groups';
+import { strike as strikeFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name strike_mark
  */
 
-export const strike = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const strike = strikeFactory({
   parseDOM: [{
     tag: 'strike'
   }, {
@@ -20,4 +18,4 @@ export const strike = {
   toDOM() {
     return ['s'];
   }
-};
+});

package/dist/es2019/schema/marks/strong.js

@@ -1,13 +1,11 @@
-import { FONT_STYLE } from '../groups';
+import { strong as strongFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name strong_mark
  */
 
 const strongDOM = ['strong'];
-export const strong = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const strong = strongFactory({
   parseDOM: [{
     tag: 'strong'
   },
@@ -33,4 +31,4 @@ export const strong = {
   toDOM() {
     return strongDOM;
   }
-};
+});

package/dist/es2019/schema/marks/subsup.js

@@ -1,4 +1,4 @@
-import { FONT_STYLE } from '../groups';
+import { subsup as subsupFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name subsup_mark
@@ -15,14 +15,7 @@ function getAttrFromVerticalAlign(node) {
   }
   return false;
 }
-export const subsup = {
-  inclusive: true,
-  group: FONT_STYLE,
-  attrs: {
-    type: {
-      default: 'sub'
-    }
-  },
+export const subsup = subsupFactory({
   parseDOM: [{
     tag: 'sub',
     attrs: {
@@ -47,4 +40,4 @@ export const subsup = {
   toDOM(mark) {
     return [mark.attrs.type];
   }
-};
+});