@atlaskit/adf-schema 57.7.7 → 57.7.8

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

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

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

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.multiBodiedExtension = 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 _breakout = require("../marks/breakout");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _extensionFrame = require("./extensionFrame");
-var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerator.adfNode)('multiBodiedExtension').define({
+var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfNode.adfNode)('multiBodiedExtension').define({
   stage0: true,
   definingAsContext: true,
   selectable: true,
@@ -52,7 +54,7 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
       minLength: 1
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_extensionFrame.extensionFrame))],
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(_extensionFrame.extensionFrame))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.nestedExpand = 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 _blockquote = require("./blockquote");
@@ -22,7 +24,7 @@ var _rule = require("./rule");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
 var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
-var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nestedExpand').define({
+var nestedExpand = exports.nestedExpand = (0, _adfNode.adfNode)('nestedExpand').define({
   isolating: true,
   selectable: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
@@ -43,7 +45,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation')])))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, nestedExpandContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation')])))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.attrs.optional': {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.panel = 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 _breakout = require("../marks/breakout");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -23,7 +25,7 @@ var _tableStub = require("./tableStub");
 var _task = require("./task");
 var _unsupportedBlock = require("./unsupportedBlock");
 var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
-var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
+var panel = exports.panel = (0, _adfNode.adfNode)('panel').define({
   selectable: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: {
@@ -58,7 +60,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation')])))]
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation')])))]
 }).variant('c1', {
   // panel_c1 allows all standard panel content plus table. `stage0: true` includes it in the
   // stage-0 JSON schema (not full) and the validator spec so table-in-panel validates.
@@ -67,7 +69,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   // acceptance is gated in adf-utils behind the patch flag.
   stage0: true,
   noExtend: true,
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
   preserveVariantNameInPm: true
 })
 // this variant is used to support breakout resizing for panel nodes at the document root
@@ -81,6 +83,6 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   noExtend: true,
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   // panel_c1_root_only allows all standard panel content plus table (see c1 above).
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks'), _extension.extension.use('with_annotation'), _tableStub.table])))],
   preserveVariantNameInPm: true
 });

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

@@ -4,14 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.paragraph = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _$zeroPlus = require("@atlaskit/adf-schema-generator/$zeroPlus");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var _fontSize = require("../marks/fontSize");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph').define({
+var paragraph = exports.paragraph = (0, _adfNode.adfNode)('paragraph').define({
   attrs: {
     localId: {
       type: 'string',
@@ -22,7 +24,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
+  content: [(0, _$zeroPlus.$zeroPlus)((0, _$or.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [_fontSize.fontSize, _alignmentAndIndentation.alignment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.placeholder = 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 placeholder = exports.placeholder = (0, _adfSchemaGenerator.adfNode)('placeholder').define({
+var placeholder = exports.placeholder = (0, _adfNode.adfNode)('placeholder').define({
   selectable: false,
   inline: true,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.rule = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _breakout = require("../marks/breakout");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -34,7 +34,7 @@ var ruleAttributes = {
     optional: true
   }
 };
-var rule = exports.rule = (0, _adfSchemaGenerator.adfNode)('rule').define({
+var rule = exports.rule = (0, _adfNode.adfNode)('rule').define({
   attrs: {
     localId: {
       type: 'string',

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

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

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

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

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

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tableCellContent = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
 // @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
 // This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
-var tableCellContent = exports.tableCellContent = (0, _adfSchemaGenerator.adfNode)('tableCellContent').define({
+var tableCellContent = exports.tableCellContent = (0, _adfNode.adfNode)('tableCellContent').define({
   ignore: ['pm-spec', 'validator-spec'],
   content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
 });

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

@@ -11,7 +11,9 @@ Object.defineProperty(exports, "table", {
   }
 });
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-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 _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
 var _fragment = require("../marks/fragment");
 var _unsupportedMark = require("../marks/unsupportedMark");
@@ -57,7 +59,7 @@ var cellAttributes = {
   },
   valign: valign
 };
-var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
+var tableCell = (0, _adfNode.adfNode)('tableCell').define({
   isolating: true,
   selectable: false,
   tableRole: 'cell',
@@ -73,10 +75,10 @@ var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
     }
   }
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, _tableStub.table])))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec']
 });
-var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
+var tableHeader = (0, _adfNode.adfNode)('tableHeader').define({
   isolating: true,
   selectable: false,
   tableRole: 'header_cell',
@@ -92,13 +94,13 @@ var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
     }
   }
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, _tableStub.table])))],
+  content: [(0, _$onePlus.$onePlus)(_$or.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, _tableStub.table])))],
   ignore: ['json-schema', 'validator-spec']
 });
-var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
+var tableRow = (0, _adfNode.adfNode)('tableRow').define({
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableCell, tableHeader, _tableCellContent.tableCellContent))],
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(tableCell, tableHeader, _tableCellContent.tableCellContent))],
   tableRole: 'row',
   attrs: {
     localId: {
@@ -116,7 +118,7 @@ var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
     }
   }
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableCell.use('with_nested_table'), tableHeader.use('with_nested_table')))],
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(tableCell.use('with_nested_table'), tableHeader.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
 });
 _tableStub.table.define({
@@ -159,9 +161,9 @@ _tableStub.table.define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableRow))]
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(tableRow))]
 }).variant('with_nested_table', {
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableRow.use('with_nested_table')))],
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(tableRow.use('with_nested_table')))],
   ignore: ['json-schema', 'validator-spec']
 });
 

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.table = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 // A bare `table` node stub, declared in an import-cycle-free leaf module so that other node
 // modules (e.g. `panel`) can reference `table` in their content WITHOUT importing the heavy
 // `tableNodes.ts` definition module. Importing `tableNodes.ts` from `panel.ts` would form a
@@ -14,4 +14,4 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 // `tableNodes.ts` imports this same stub and calls `.define()` / `.variant()` on it, so the
 // object here is the one and only `table` node. Spec resolution is deferred to codegen traversal,
 // which is cycle-aware, so referencing this stub before it is defined is safe.
-var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table');
+var table = exports.table = (0, _adfNode.adfNode)('table');

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

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.taskList = exports.taskItem = exports.blockTaskItem = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _$onePlus = require("@atlaskit/adf-schema-generator/$onePlus");
+var _$or = require("@atlaskit/adf-schema-generator/$or");
+var _$zeroPlus = require("@atlaskit/adf-schema-generator/$zeroPlus");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
@@ -16,9 +19,9 @@ var _paragraph = require("./paragraph");
 var _unsupportedBlock = require("./unsupportedBlock");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var taskItem = exports.taskItem = (0, _adfSchemaGenerator.adfNode)('taskItem');
-var taskList = exports.taskList = (0, _adfSchemaGenerator.adfNode)('taskList');
-var blockTaskItem = exports.blockTaskItem = (0, _adfSchemaGenerator.adfNode)('blockTaskItem');
+var taskItem = exports.taskItem = (0, _adfNode.adfNode)('taskItem');
+var taskList = exports.taskList = (0, _adfNode.adfNode)('taskList');
+var blockTaskItem = exports.blockTaskItem = (0, _adfNode.adfNode)('blockTaskItem');
 var commonTaskItemProps = {
   defining: true,
   selectable: false,
@@ -37,14 +40,14 @@ var commonTaskItemProps = {
   }
 };
 taskItem.define(_objectSpread(_objectSpread({}, commonTaskItemProps), {}, {
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
+  content: [(0, _$zeroPlus.$zeroPlus)((0, _$or.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }));
 blockTaskItem.define(_objectSpread(_objectSpread({}, commonTaskItemProps), {}, {
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   allowAnyChildMark: false,
   // Override the commonTaskItemProps setting
   contentMinItems: 1,
-  content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')))]
+  content: [(0, _$or.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')), (0, _$zeroPlus.$zeroPlus)((0, _$or.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _extension.extension.use('with_marks'), _extension.extension.use('with_annotation')))]
 }));
 taskList.define({
   defining: true,
@@ -57,5 +60,5 @@ taskList.define({
     }
   },
   contentMinItems: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(taskItem, taskList, _unsupportedBlock.unsupportedBlock, blockTaskItem))]
+  content: [(0, _$onePlus.$onePlus)((0, _$or.$or)(taskItem, taskList, _unsupportedBlock.unsupportedBlock, blockTaskItem))]
 });

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.text = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _adfNode = require("@atlaskit/adf-schema-generator/adfNode");
 var _annotation = require("../marks/annotation");
 var _code = require("../marks/code");
 var _color = require("../marks/color");
@@ -18,7 +18,7 @@ var _typeAheadQuery = require("../marks/typeAheadQuery");
 var _underline = require("../marks/underline");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({
+var text = exports.text = (0, _adfNode.adfNode)('text').define({
   marks: [],
   hasEmptyMarks: true
 }).variant('with_no_marks', {

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

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

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

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

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

@@ -1,4 +1,6 @@
-import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $onePlus } from '@atlaskit/adf-schema-generator/$onePlus';
+import { $or } from '@atlaskit/adf-schema-generator/$or';
+import { adfNode } from '@atlaskit/adf-schema-generator/adfNode';
 import { blockContentGroup } from './groups/blockContentGroup';
 import { blockGroup } from './groups/blockGroup';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { bodiedExtension } from '../nodes/bodiedExtension';

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { bodiedExtension } from '../nodes/bodiedExtension';

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { multiBodiedExtension } from '../nodes/multiBodiedExtension';
 export const blockRootOnlyGroup = adfNodeGroup('blockRootOnly', [multiBodiedExtension], {
   // @DSLCompatibilityException - Generated JSON Schema does not have this.

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

@@ -1,4 +1,4 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 import { em } from '../marks/em';
 import { strike } from '../marks/strike';
 import { strong } from '../marks/strong';

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
 import { date } from '../nodes/date';

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
 import { date } from '../nodes/date';

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

@@ -1,3 +1,3 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 import { link } from '../marks/link';
 export const linkMarkGroup = adfMarkGroup('link', [link]);

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

@@ -1,4 +1,4 @@
-import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator/adfNodeGroup';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { bodiedRule } from '../nodes/bodiedRule';

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

@@ -1,3 +1,3 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 import { typeAheadQuery } from '../marks/typeAheadQuery';
 export const searchQueryMarkGroup = adfMarkGroup('searchQuery', [typeAheadQuery]);

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

@@ -1,4 +1,5 @@
-import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
+import { $onePlus } from '@atlaskit/adf-schema-generator/$onePlus';
+import { $or } from '@atlaskit/adf-schema-generator/$or';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { bodiedRule } from '../nodes/bodiedRule';

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

@@ -1,5 +1,5 @@
-import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
-
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 // These marks defined together because they form a cycle within the excludes.
 export const alignment = adfMark('alignment');
 export const indentation = adfMark('indentation');

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

@@ -1,4 +1,6 @@
-import { MarkExcludesNone, adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
+import { MarkExcludesNone } from '@atlaskit/adf-schema-generator/types/ADFMarkSpec';
 export const annotation = adfMark('annotation');
 export const annotationGroup = adfMarkGroup('annotation', [annotation]);
 annotation.define({

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const border = adfMark('border').define({
   inclusive: false,
   attrs: {

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const breakout = adfMark('breakout').define({
   spanning: false,
   inclusive: false,

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 import { fontStyleGroup } from '../groups/fontStyleGroup';
 import { linkMarkGroup } from '../groups/linkMarkGroup';
 import { searchQueryMarkGroup } from '../groups/searchQueryMarkGroup';

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

@@ -1,4 +1,5 @@
-import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 export const backgroundColor = adfMark('backgroundColor');
 export const textColor = adfMark('textColor');
 export const colorGroup = adfMarkGroup('color', [textColor, backgroundColor]);

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

@@ -1,4 +1,6 @@
-import { JSONSchemaTransformerName, adfMark, MarkExcludesNone } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { JSONSchemaTransformerName } from '@atlaskit/adf-schema-generator/transformerNames';
+import { MarkExcludesNone } from '@atlaskit/adf-schema-generator/types/ADFMarkSpec';
 export const confluenceInlineComment = adfMark('confluenceInlineComment').define({
   ignore: [JSONSchemaTransformerName],
   inclusive: false,

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const dataConsumer = adfMark('dataConsumer').define({
   attrs: {
     sources: {

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const em = adfMark('em').define({
   inclusive: true
 });

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

@@ -1,5 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 /**
  * fontSize mark - applies size styling to block-level content
  *

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

@@ -1,4 +1,5 @@
-import { adfMark, MarkExcludesNone } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { MarkExcludesNone } from '@atlaskit/adf-schema-generator/types/ADFMarkSpec';
 export const fragment = adfMark('fragment').define({
   inclusive: false,
   excludes: MarkExcludesNone,

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

@@ -1,4 +1,5 @@
-import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator/adfMarkGroup';
 export const link = adfMark('link');
 
 // import { linkMarketGroup } from '../groups/linkMarkGroup' would cause circular deps issue

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const strike = adfMark('strike').define({
   inclusive: true
 });

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const strong = adfMark('strong').define({
   inclusive: true
 });

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

@@ -1,4 +1,4 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMark } from '@atlaskit/adf-schema-generator/adfMark';
 export const subsup = adfMark('subsup').define({
   inclusive: true,
   attrs: {