@atlaskit/adf-schema 57.7.7 → 57.7.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 57.7.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 57.7.7
 
 ### Patch Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$onePlus = require("@atlaskit/adf-schema-generator/$onePlus");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _blockContentGroup = require("./groups/blockContentGroup");
 var _blockGroup = require("./groups/blockGroup");
 var _blockRootOnlyGroup = require("./groups/blockRootOnlyGroup");
@@ -19,10 +21,10 @@ var _multiBodiedExtension = require("./nodes/multiBodiedExtension");
 var _panel = require("./nodes/panel");
 var _rule = require("./nodes/rule");
 var _syncBlock = require("./nodes/syncBlock");
-var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
+var doc = (0, _adfNode.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup,
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_blockGroup.blockGroup,
   // `panel.use('c1')` must precede `blockContentGroup`, which contributes the bare `panel`
   // name to the validator spec. The validator's repairing loop takes the FIRST candidate that
   // reports valid, and with a repairing callback the less permissive base `panel` "succeeds"

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockContentGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _blockCard = require("../nodes/blockCard");
 var _blockquote = require("../nodes/blockquote");
 var _bodiedExtension = require("../nodes/bodiedExtension");
@@ -37,7 +37,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base mediaSingle
  * - no base heading
  */
-var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _embedCard.embedCard, _tableNodes.table,
+var blockContentGroup = exports.blockContentGroup = (0, _adfNodeGroup.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _embedCard.embedCard, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _blockCard = require("../nodes/blockCard");
 var _blockquote = require("../nodes/blockquote");
 var _bodiedExtension = require("../nodes/bodiedExtension");
@@ -25,7 +25,7 @@ var _rule = require("../nodes/rule");
 var _tableNodes = require("../nodes/tableNodes");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
+var blockGroup = exports.blockGroup = (0, _adfNodeGroup.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockRootOnlyGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _multiBodiedExtension = require("../nodes/multiBodiedExtension");
-var blockRootOnlyGroup = exports.blockRootOnlyGroup = (0, _adfSchemaGenerator.adfNodeGroup)('blockRootOnly', [_multiBodiedExtension.multiBodiedExtension], {
+var blockRootOnlyGroup = exports.blockRootOnlyGroup = (0, _adfNodeGroup.adfNodeGroup)('blockRootOnly', [_multiBodiedExtension.multiBodiedExtension], {
   // @DSLCompatibilityException - Generated JSON Schema does not have this.
   // We should introduce this to the JSON Schema since it is in PM Spec
   ignore: ['json-schema']

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fontStyleGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
 var _em = require("../marks/em");
 var _strike = require("../marks/strike");
 var _strong = require("../marks/strong");
 var _subsup = require("../marks/subsup");
 var _underline = require("../marks/underline");
-var fontStyleGroup = exports.fontStyleGroup = (0, _adfSchemaGenerator.adfMarkGroup)('fontStyle', [_em.em, _strike.strike, _strong.strong, _subsup.subsup, _underline.underline]);
+var fontStyleGroup = exports.fontStyleGroup = (0, _adfMarkGroup.adfMarkGroup)('fontStyle', [_em.em, _strike.strike, _strong.strong, _subsup.subsup, _underline.underline]);

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.inlineContentGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _confluenceJiraIssue = require("../nodes/confluenceJiraIssue");
 var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
 var _date = require("../nodes/date");
@@ -29,6 +29,6 @@ var _unsupportedInline = require("../nodes/unsupportedInline");
  * - no text
  * - no text.use('link_inline')
  */
-var inlineContentGroup = exports.inlineContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline_content', [_text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _image.image, _confluenceJiraIssue.confluenceJiraIssue, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline], {
+var inlineContentGroup = exports.inlineContentGroup = (0, _adfNodeGroup.adfNodeGroup)('inline_content', [_text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _image.image, _confluenceJiraIssue.confluenceJiraIssue, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline], {
   ignore: ['pm-spec', 'json-schema']
 });

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.inlineGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _confluenceJiraIssue = require("../nodes/confluenceJiraIssue");
 var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
 var _date = require("../nodes/date");
@@ -19,7 +19,7 @@ var _placeholder = require("../nodes/placeholder");
 var _status = require("../nodes/status");
 var _text = require("../nodes/text");
 var _unsupportedInline = require("../nodes/unsupportedInline");
-var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [_text.text, _text.text.use('link_inline'), _text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _image.image, _confluenceJiraIssue.confluenceJiraIssue, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline], {
+var inlineGroup = exports.inlineGroup = (0, _adfNodeGroup.adfNodeGroup)('inline', [_text.text, _text.text.use('link_inline'), _text.text.use('formatted'), _text.text.use('code_inline'), _date.date, _emoji.emoji, _hardBreak.hardBreak, _inlineCard.inlineCard, _mention.mention, _placeholder.placeholder, _status.status, _inlineExtension.inlineExtension, _inlineExtension.inlineExtension.use('with_marks'), _mediaInline.mediaInline, _image.image, _confluenceJiraIssue.confluenceJiraIssue, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline], {
   // @DSLCompatibilityException
   // Inline group in PM doesn't match ADF
   ignore: ['validator-spec']

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

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.linkMarkGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
 var _link = require("../marks/link");
-var linkMarkGroup = exports.linkMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('link', [_link.link]);
+var linkMarkGroup = exports.linkMarkGroup = (0, _adfMarkGroup.adfMarkGroup)('link', [_link.link]);

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.nonNestableBlockContentGroup = exports.nonNestableBlockContent = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNodeGroup = require("@atlaskit/adf-schema-generator/adfNodeGroup");
 var _blockCard = require("../nodes/blockCard");
 var _blockquote = require("../nodes/blockquote");
 var _bodiedRule = require("../nodes/bodiedRule");
@@ -35,4 +35,4 @@ _tableNodes.table.use('with_nested_table'), _blockCard.blockCard, _embedCard.emb
  *
  * Pseudo group used to match existing validator and json schema specs.
  */
-var nonNestableBlockContentGroup = exports.nonNestableBlockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('non_nestable_block_content', nonNestableBlockContent);
+var nonNestableBlockContentGroup = exports.nonNestableBlockContentGroup = (0, _adfNodeGroup.adfNodeGroup)('non_nestable_block_content', nonNestableBlockContent);

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

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.searchQueryMarkGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
 var _typeAheadQuery = require("../marks/typeAheadQuery");
-var searchQueryMarkGroup = exports.searchQueryMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('searchQuery', [_typeAheadQuery.typeAheadQuery]);
+var searchQueryMarkGroup = exports.searchQueryMarkGroup = (0, _adfMarkGroup.adfMarkGroup)('searchQuery', [_typeAheadQuery.typeAheadQuery]);

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tableHeaderContentPseudoGroup = exports.tableCellContentPseudoGroup = exports.tableCellContentNodes = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$onePlus = require("@atlaskit/adf-schema-generator/$onePlus");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
 var _blockCard = require("../nodes/blockCard");
 var _blockquote = require("../nodes/blockquote");
 var _bodiedRule = require("../nodes/bodiedRule");
@@ -30,5 +31,5 @@ var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragrap
 // In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
 // In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
 // The differences are highlighted below.
-var tableCellContentPseudoGroup = exports.tableCellContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_unsupportedBlock.unsupportedBlock])));
-var tableHeaderContentPseudoGroup = exports.tableHeaderContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_nestedExpand.nestedExpand])));
+var tableCellContentPseudoGroup = exports.tableCellContentPseudoGroup = (0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, tableCellContentNodes.concat([_unsupportedBlock.unsupportedBlock])));
+var tableHeaderContentPseudoGroup = exports.tableHeaderContentPseudoGroup = (0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, tableCellContentNodes.concat([_nestedExpand.nestedExpand])));

package/dist/cjs/next-schema/marks/alignmentAndIndentation.js

@@ -4,12 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.indentation = exports.alignment = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
 // These marks defined together because they form a cycle within the excludes.
-var alignment = exports.alignment = (0, _adfSchemaGenerator.adfMark)('alignment');
-var indentation = exports.indentation = (0, _adfSchemaGenerator.adfMark)('indentation');
-var alignementMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('alignment', [alignment]);
-var indentationMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('indentation', [indentation]);
+var alignment = exports.alignment = (0, _adfMark.adfMark)('alignment');
+var indentation = exports.indentation = (0, _adfMark.adfMark)('indentation');
+var alignementMarkExclusionGroup = (0, _adfMarkGroup.adfMarkGroup)('alignment', [alignment]);
+var indentationMarkExclusionGroup = (0, _adfMarkGroup.adfMarkGroup)('indentation', [indentation]);
 alignment.define({
   excludes: [alignementMarkExclusionGroup, indentationMarkExclusionGroup],
   attrs: {

package/dist/cjs/next-schema/marks/annotation.js

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.annotationGroup = exports.annotation = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var annotation = exports.annotation = (0, _adfSchemaGenerator.adfMark)('annotation');
-var annotationGroup = exports.annotationGroup = (0, _adfSchemaGenerator.adfMarkGroup)('annotation', [annotation]);
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
+var _ADFMarkSpec = require("@atlaskit/adf-schema-generator/types/ADFMarkSpec");
+var annotation = exports.annotation = (0, _adfMark.adfMark)('annotation');
+var annotationGroup = exports.annotationGroup = (0, _adfMarkGroup.adfMarkGroup)('annotation', [annotation]);
 annotation.define({
   inclusive: true,
-  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  excludes: _ADFMarkSpec.MarkExcludesNone,
   group: annotationGroup,
   attrs: {
     id: {

package/dist/cjs/next-schema/marks/border.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.border = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var border = exports.border = (0, _adfSchemaGenerator.adfMark)('border').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var border = exports.border = (0, _adfMark.adfMark)('border').define({
   inclusive: false,
   attrs: {
     size: {

package/dist/cjs/next-schema/marks/breakout.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.breakout = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var breakout = exports.breakout = (0, _adfSchemaGenerator.adfMark)('breakout').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var breakout = exports.breakout = (0, _adfMark.adfMark)('breakout').define({
   spanning: false,
   inclusive: false,
   attrs: {

package/dist/cjs/next-schema/marks/code.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.code = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
 var _fontStyleGroup = require("../groups/fontStyleGroup");
 var _linkMarkGroup = require("../groups/linkMarkGroup");
 var _searchQueryMarkGroup = require("../groups/searchQueryMarkGroup");
 var _color = require("./color");
-var code = exports.code = (0, _adfSchemaGenerator.adfMark)('code').define({
+var code = exports.code = (0, _adfMark.adfMark)('code').define({
   excludes: [_fontStyleGroup.fontStyleGroup, _linkMarkGroup.linkMarkGroup, _searchQueryMarkGroup.searchQueryMarkGroup, _color.colorGroup],
   inclusive: true
 });

package/dist/cjs/next-schema/marks/color.js

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.textColor = exports.colorGroup = exports.backgroundColor = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.adfMark)('backgroundColor');
-var textColor = exports.textColor = (0, _adfSchemaGenerator.adfMark)('textColor');
-var colorGroup = exports.colorGroup = (0, _adfSchemaGenerator.adfMarkGroup)('color', [textColor, backgroundColor]);
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
+var backgroundColor = exports.backgroundColor = (0, _adfMark.adfMark)('backgroundColor');
+var textColor = exports.textColor = (0, _adfMark.adfMark)('textColor');
+var colorGroup = exports.colorGroup = (0, _adfMarkGroup.adfMarkGroup)('color', [textColor, backgroundColor]);
 backgroundColor.define({
   inclusive: true,
   attrs: {

package/dist/cjs/next-schema/marks/confluenceInlineComment.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.confluenceInlineComment = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var confluenceInlineComment = exports.confluenceInlineComment = (0, _adfSchemaGenerator.adfMark)('confluenceInlineComment').define({
-  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName],
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _transformerNames = require("@atlaskit/adf-schema-generator/transformerNames");
+var _ADFMarkSpec = require("@atlaskit/adf-schema-generator/types/ADFMarkSpec");
+var confluenceInlineComment = exports.confluenceInlineComment = (0, _adfMark.adfMark)('confluenceInlineComment').define({
+  ignore: [_transformerNames.JSONSchemaTransformerName],
   inclusive: false,
-  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  excludes: _ADFMarkSpec.MarkExcludesNone,
   attrs: {
     reference: {
       type: 'string',

package/dist/cjs/next-schema/marks/dataConsumer.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dataConsumer = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var dataConsumer = exports.dataConsumer = (0, _adfSchemaGenerator.adfMark)('dataConsumer').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var dataConsumer = exports.dataConsumer = (0, _adfMark.adfMark)('dataConsumer').define({
   attrs: {
     sources: {
       type: 'array',

package/dist/cjs/next-schema/marks/em.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.em = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var em = exports.em = (0, _adfSchemaGenerator.adfMark)('em').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var em = exports.em = (0, _adfMark.adfMark)('em').define({
   inclusive: true
 });

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fontSize = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
 /**
  * fontSize mark - applies size styling to block-level content
  *
@@ -20,7 +20,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
  * }
  * ```
  */
-var fontSize = exports.fontSize = (0, _adfSchemaGenerator.adfMark)('fontSize').define({
+var fontSize = exports.fontSize = (0, _adfMark.adfMark)('fontSize').define({
   attrs: {
     fontSize: {
       type: 'enum',

package/dist/cjs/next-schema/marks/fragment.js

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fragment = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var fragment = exports.fragment = (0, _adfSchemaGenerator.adfMark)('fragment').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _ADFMarkSpec = require("@atlaskit/adf-schema-generator/types/ADFMarkSpec");
+var fragment = exports.fragment = (0, _adfMark.adfMark)('fragment').define({
   inclusive: false,
-  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  excludes: _ADFMarkSpec.MarkExcludesNone,
   allowExcludesEmpty: true,
   attrs: {
     localId: {

package/dist/cjs/next-schema/marks/link.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.link = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var link = exports.link = (0, _adfSchemaGenerator.adfMark)('link');
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _adfMarkGroup = require("@atlaskit/adf-schema-generator/adfMarkGroup");
+var link = exports.link = (0, _adfMark.adfMark)('link');
 
 // import { linkMarketGroup } from '../groups/linkMarkGroup' would cause circular deps issue
-var linkMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('link', [link]);
+var linkMarkGroup = (0, _adfMarkGroup.adfMarkGroup)('link', [link]);
 link.define({
   // it seems unnessary to have it here?
   excludes: [linkMarkGroup],

package/dist/cjs/next-schema/marks/strike.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.strike = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var strike = exports.strike = (0, _adfSchemaGenerator.adfMark)('strike').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var strike = exports.strike = (0, _adfMark.adfMark)('strike').define({
   inclusive: true
 });

package/dist/cjs/next-schema/marks/strong.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.strong = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var strong = exports.strong = (0, _adfSchemaGenerator.adfMark)('strong').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var strong = exports.strong = (0, _adfMark.adfMark)('strong').define({
   inclusive: true
 });

package/dist/cjs/next-schema/marks/subsup.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subsup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var subsup = exports.subsup = (0, _adfSchemaGenerator.adfMark)('subsup').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var subsup = exports.subsup = (0, _adfMark.adfMark)('subsup').define({
   inclusive: true,
   attrs: {
     type: {

package/dist/cjs/next-schema/marks/typeAheadQuery.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.typeAheadQuery = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var typeAheadQuery = exports.typeAheadQuery = (0, _adfSchemaGenerator.adfMark)('typeAheadQuery').define({
-  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _transformerNames = require("@atlaskit/adf-schema-generator/transformerNames");
+var typeAheadQuery = exports.typeAheadQuery = (0, _adfMark.adfMark)('typeAheadQuery').define({
+  ignore: [_transformerNames.JSONSchemaTransformerName, _transformerNames.ValidatorSpecTransformerName],
   inclusive: true,
   attrs: {
     trigger: {

package/dist/cjs/next-schema/marks/underline.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.underline = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var underline = exports.underline = (0, _adfSchemaGenerator.adfMark)('underline').define({
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var underline = exports.underline = (0, _adfMark.adfMark)('underline').define({
   inclusive: true
 });

package/dist/cjs/next-schema/marks/unsupportedMark.js

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unsupportedMark = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var unsupportedMark = exports.unsupportedMark = (0, _adfSchemaGenerator.adfMark)('unsupportedMark').define({
-  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
-  excludes: _adfSchemaGenerator.MarkExcludesNone,
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _transformerNames = require("@atlaskit/adf-schema-generator/transformerNames");
+var _ADFMarkSpec = require("@atlaskit/adf-schema-generator/types/ADFMarkSpec");
+var unsupportedMark = exports.unsupportedMark = (0, _adfMark.adfMark)('unsupportedMark').define({
+  ignore: [_transformerNames.JSONSchemaTransformerName, _transformerNames.ValidatorSpecTransformerName],
+  excludes: _ADFMarkSpec.MarkExcludesNone,
   allowExcludesEmpty: true,
   attrs: {
     originalValue: {

package/dist/cjs/next-schema/marks/unsupportedNodeAttribute.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unsupportedNodeAttribute = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var unsupportedNodeAttribute = exports.unsupportedNodeAttribute = (0, _adfSchemaGenerator.adfMark)('unsupportedNodeAttribute').define({
-  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+var _adfMark = require("@atlaskit/adf-schema-generator/adfMark");
+var _transformerNames = require("@atlaskit/adf-schema-generator/transformerNames");
+var unsupportedNodeAttribute = exports.unsupportedNodeAttribute = (0, _adfMark.adfMark)('unsupportedNodeAttribute').define({
+  ignore: [_transformerNames.JSONSchemaTransformerName, _transformerNames.ValidatorSpecTransformerName],
   attrs: {
     unsupported: {
       type: 'object'

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockCard = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard').define({
+var blockCard = exports.blockCard = (0, _adfNode.adfNode)('blockCard').define({
   draggable: true,
   selectable: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.blockquote = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$onePlus = require("@atlaskit/adf-schema-generator/$onePlus");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _codeBlock = require("./codeBlock");
@@ -15,11 +17,11 @@ var _mediaSingle = require("./mediaSingle");
 var _paragraph = require("./paragraph");
 var _unsupportedBlock = require("./unsupportedBlock");
 var blockQuoteContent = [_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')];
-var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquote').define({
+var blockquote = exports.blockquote = (0, _adfNode.adfNode)('blockquote').define({
   defining: true,
   selectable: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, blockQuoteContent))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, blockQuoteContent))],
   attrs: {
     localId: {
       type: 'string',
@@ -29,7 +31,7 @@ var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquo
   }
 }).variant('legacy', {
   ignore: ['json-schema', 'validator-spec'],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))],
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))],
   attrs: {
     localId: {
       type: 'string',

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

@@ -4,14 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.bodiedExtension = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$onePlus = require("@atlaskit/adf-schema-generator/$onePlus");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _nonNestableBlockContentGroup = require("../groups/nonNestableBlockContentGroup");
 var _breakout = require("../marks/breakout");
 var _dataConsumer = require("../marks/dataConsumer");
 var _fragment = require("../marks/fragment");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)('bodiedExtension').define({
+var bodiedExtension = exports.bodiedExtension = (0, _adfNode.adfNode)('bodiedExtension').define({
   defining: true,
   selectable: true,
   isolating: true,
@@ -53,7 +55,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))]
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))]
 }).variant('with_marks', {
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.bodiedRule = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _$range = require("@atlaskit/adf-schema-generator/$range");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _breakout = require("../marks/breakout");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -42,10 +44,10 @@ var bodiedRuleAttributes = {
     optional: true
   }
 };
-var bodiedRule = exports.bodiedRule = (0, _adfSchemaGenerator.adfNode)('bodiedRule').define({
+var bodiedRule = exports.bodiedRule = (0, _adfNode.adfNode)('bodiedRule').define({
   stage0: true,
   attrs: bodiedRuleAttributes,
-  content: [(0, _adfSchemaGenerator.$range)(1, 1, (0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks')))],
+  content: [(0, _$range.$range)(1, 1, (0, _$or.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks')))],
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
 })
 // this variant is used to support breakout resizing for bodiedRule nodes at the document root