@atlaskit/adf-schema 37.1.19 → 37.1.21

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 37.1.21
+
+### Patch Changes
+
+- 988f8c6: add known and unknown to PM groups to DSL
+
+## 37.1.20
+
+### Patch Changes
+
+- e57d797: Add new optional property for string attributes used in the validator ("validatorFn") function used for URL.
+
+  This is used for the validator for "link" and "embedCard".
+
 ## 37.1.19
 
 ### Patch Changes

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

@@ -8,9 +8,10 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _blockGroup = require("./groups/blockGroup");
 var _layoutSection = require("./nodes/layoutSection");
 var _blockRootOnlyGroup = require("./groups/blockRootOnlyGroup");
+var _blockContentGroup = require("./groups/blockContentGroup");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup))]
 });
 var _default = exports.default = doc;

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

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.blockContentGroup = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _blockCard = require("../nodes/blockCard");
+var _blockquote = require("../nodes/blockquote");
+var _bodiedExtension = require("../nodes/bodiedExtension");
+var _codeBlock = require("../nodes/codeBlock");
+var _confluenceUnsupportedBlock = require("../nodes/confluenceUnsupportedBlock");
+var _decisionList = require("../nodes/decisionList");
+var _embedCard = require("../nodes/embedCard");
+var _expand = require("../nodes/expand");
+var _extension = require("../nodes/extension");
+var _heading = require("../nodes/heading");
+var _list = require("../nodes/list");
+var _mediaGroup = require("../nodes/mediaGroup");
+var _mediaSingle = require("../nodes/mediaSingle");
+var _panel = require("../nodes/panel");
+var _paragraph = require("../nodes/paragraph");
+var _rule = require("../nodes/rule");
+var _table = require("../nodes/table");
+var _task = require("../nodes/task");
+var _unsupportedBlock = require("../nodes/unsupportedBlock");
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original blockGroup:
+ * - no base paragraph
+ * - no base codeBlock
+ * - no base extension
+ * - no base mediaSingle
+ * - no base heading
+ * - no base expand
+ */
+var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _blockquote.blockquote, _bodiedExtension.bodiedExtension.use('with_marks'), _list.bulletList, _codeBlock.codeBlock.use('with_no_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand.use('with_no_mark'), _extension.extension.use('with_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _list.orderedList, _panel.panel, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _rule.rule, _table.table, _task.taskList, _unsupportedBlock.unsupportedBlock], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -24,4 +24,8 @@ var _rule = require("../nodes/rule");
 var _table = require("../nodes/table");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _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'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock]);
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _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'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+  // @DSLCompatibilityException
+  // Block group in PM doesn't match ADF
+  ignore: ['validator-spec']
+});

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.inlineContentGroup = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _date = require("../nodes/date");
+var _emoji = require("../nodes/emoji");
+var _hardBreak = require("../nodes/hardBreak");
+var _inlineCard = require("../nodes/inlineCard");
+var _mention = require("../nodes/mention");
+var _placeholder = require("../nodes/placeholder");
+var _text = require("../nodes/text");
+var _status = require("../nodes/status");
+var _inlineExtension = require("../nodes/inlineExtension");
+var _mediaInline = require("../nodes/mediaInline");
+var _unsupportedInline = require("../nodes/unsupportedInline");
+var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
+var _image = require("../nodes/image");
+var _confluenceJiraIssue = require("../nodes/confluenceJiraIssue");
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original inlineGroup:
+ * - 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], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -19,4 +19,8 @@ var _unsupportedInline = require("../nodes/unsupportedInline");
 var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
 var _image = require("../nodes/image");
 var _confluenceJiraIssue = require("../nodes/confluenceJiraIssue");
-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.use('with_marks'), _mediaInline.mediaInline, _image.image, _confluenceJiraIssue.confluenceJiraIssue, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.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.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/nonNestableBlockContentGroup.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nonNestableBlockContent = void 0;
+exports.nonNestableBlockContentGroup = exports.nonNestableBlockContent = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _blockCard = require("../nodes/blockCard");
 var _blockquote = require("../nodes/blockquote");
 var _codeBlock = require("../nodes/codeBlock");
@@ -22,4 +23,11 @@ var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-var nonNestableBlockContent = exports.nonNestableBlockContent = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _unsupportedBlock.unsupportedBlock];
+var nonNestableBlockContent = exports.nonNestableBlockContent = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _unsupportedBlock.unsupportedBlock];
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ */
+var nonNestableBlockContentGroup = exports.nonNestableBlockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('non_nestable_block_content', nonNestableBlockContent);

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

@@ -15,7 +15,8 @@ link.define({
   inclusive: false,
   attrs: {
     href: {
-      type: 'string'
+      type: 'string',
+      validatorFn: 'safeUrl'
     },
     title: {
       type: 'string',

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

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.bodiedExtension = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _nonNestableBlockContentGroup = require("../groups/nonNestableBlockContentGroup");
 var _dataConsumer = require("../marks/dataConsumer");
@@ -52,7 +50,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_nonNestableBlockContentGroup.nonNestableBlockContent)))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_marks', {
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.decisionItem = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -22,5 +23,5 @@ var decisionItem = exports.decisionItem = (0, _adfSchemaGenerator.adfNode)('deci
       default: 'DECIDED'
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 });

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

@@ -13,7 +13,8 @@ var embedCard = exports.embedCard = (0, _adfSchemaGenerator.adfNode)('embedCard'
   attrs: {
     url: {
       type: 'string',
-      default: ''
+      default: '',
+      validatorFn: 'safeUrl'
     },
     layout: {
       type: 'enum',

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

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.expand = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _nonNestableBlockContentGroup = require("../groups/nonNestableBlockContentGroup");
 var _breakout = require("../marks/breakout");
@@ -27,7 +25,7 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_nonNestableBlockContentGroup.nonNestableBlockContent)))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_breakout_mark', {
   marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.headingWithMarks = exports.heading = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var _unsupportedMark = require("../marks/unsupportedMark");
@@ -27,7 +28,7 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))],
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.layoutColumn = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _blockContentGroup = require("../groups/blockContentGroup");
 var _blockGroup = require("../groups/blockGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -21,5 +22,5 @@ var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layo
       default: undefined
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _unsupportedBlock.unsupportedBlock))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.paragraph = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var _unsupportedMark = require("../marks/unsupportedMark");
@@ -20,7 +21,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))],
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.taskList = exports.taskItem = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
@@ -27,7 +28,7 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 });
 taskList.define({
   defining: true,

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

@@ -2,9 +2,10 @@ import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
+import { blockContentGroup } from './groups/blockContentGroup';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
+  content: [$onePlus($or(blockGroup, blockContentGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
 });
 export default doc;

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

@@ -0,0 +1,37 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { blockCard } from '../nodes/blockCard';
+import { blockquote } from '../nodes/blockquote';
+import { bodiedExtension } from '../nodes/bodiedExtension';
+import { codeBlock } from '../nodes/codeBlock';
+import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
+import { decisionList } from '../nodes/decisionList';
+import { embedCard } from '../nodes/embedCard';
+import { expand } from '../nodes/expand';
+import { extension } from '../nodes/extension';
+import { heading } from '../nodes/heading';
+import { bulletList, orderedList } from '../nodes/list';
+import { mediaGroup } from '../nodes/mediaGroup';
+import { mediaSingle } from '../nodes/mediaSingle';
+import { panel } from '../nodes/panel';
+import { paragraph } from '../nodes/paragraph';
+import { rule } from '../nodes/rule';
+import { table } from '../nodes/table';
+import { taskList } from '../nodes/task';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original blockGroup:
+ * - no base paragraph
+ * - no base codeBlock
+ * - no base extension
+ * - no base mediaSingle
+ * - no base heading
+ * - no base expand
+ */
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, blockquote, bodiedExtension.use('with_marks'), bulletList, codeBlock.use('with_no_marks'), confluenceUnsupportedBlock, decisionList, embedCard, expand.use('with_no_mark'), extension.use('with_marks'), heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), orderedList, panel, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), rule, table, taskList, unsupportedBlock], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -18,4 +18,8 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), confluenceUnsupportedBlock, unsupportedBlock]);
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), confluenceUnsupportedBlock, unsupportedBlock], {
+  // @DSLCompatibilityException
+  // Block group in PM doesn't match ADF
+  ignore: ['validator-spec']
+});

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

@@ -0,0 +1,28 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { date } from '../nodes/date';
+import { emoji } from '../nodes/emoji';
+import { hardBreak } from '../nodes/hardBreak';
+import { inlineCard } from '../nodes/inlineCard';
+import { mention } from '../nodes/mention';
+import { placeholder } from '../nodes/placeholder';
+import { text } from '../nodes/text';
+import { status } from '../nodes/status';
+import { inlineExtension } from '../nodes/inlineExtension';
+import { mediaInline } from '../nodes/mediaInline';
+import { unsupportedInline } from '../nodes/unsupportedInline';
+import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
+import { image } from '../nodes/image';
+import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original inlineGroup:
+ * - no text
+ * - no text.use('link_inline')
+ */
+export const inlineContentGroup = adfNodeGroup('inline_content', [text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -13,4 +13,8 @@ import { unsupportedInline } from '../nodes/unsupportedInline';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
 import { image } from '../nodes/image';
 import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
-export const inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline]);
+export const inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline], {
+  // @DSLCompatibilityException
+  // Inline group in PM doesn't match ADF
+  ignore: ['validator-spec']
+});

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

@@ -1,3 +1,4 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { codeBlock } from '../nodes/codeBlock';
@@ -17,4 +18,11 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export const nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
+export const nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ */
+export const nonNestableBlockContentGroup = adfNodeGroup('non_nestable_block_content', nonNestableBlockContent);

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

@@ -9,7 +9,8 @@ link.define({
   inclusive: false,
   attrs: {
     href: {
-      type: 'string'
+      type: 'string',
+      validatorFn: 'safeUrl'
     },
     title: {
       type: 'string',

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

@@ -1,5 +1,5 @@
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
-import { nonNestableBlockContent } from '../groups/nonNestableBlockContentGroup';
+import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
 import { dataConsumer } from '../marks/dataConsumer';
 import { fragment } from '../marks/fragment';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -44,7 +44,7 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
       default: null
     }
   },
-  content: [$onePlus($or(...nonNestableBlockContent))],
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_marks', {
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -16,5 +17,5 @@ export const decisionItem = adfNode('decisionItem').define({
       default: 'DECIDED'
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 });

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

@@ -7,7 +7,8 @@ export const embedCard = adfNode('embedCard').define({
   attrs: {
     url: {
       type: 'string',
-      default: ''
+      default: '',
+      validatorFn: 'safeUrl'
     },
     layout: {
       type: 'enum',

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

@@ -1,5 +1,5 @@
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
-import { nonNestableBlockContent } from '../groups/nonNestableBlockContentGroup';
+import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
 import { breakout } from '../marks/breakout';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -19,7 +19,7 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(...nonNestableBlockContent))],
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -21,7 +22,7 @@ export const heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup))],
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -1,4 +1,5 @@
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { blockContentGroup } from '../groups/blockContentGroup';
 import { blockGroup } from '../groups/blockGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -15,5 +16,5 @@ export const layoutColumn = adfNode('layoutColumn').define({
       default: undefined
     }
   },
-  content: [$onePlus($or(blockGroup, unsupportedBlock))]
+  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))]
 });

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -14,7 +15,7 @@ export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup))],
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -1,4 +1,5 @@
 import { $onePlus, $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -21,7 +22,7 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 });
 taskList.define({
   defining: true,

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

@@ -2,9 +2,10 @@ import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
+import { blockContentGroup } from './groups/blockContentGroup';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
+  content: [$onePlus($or(blockGroup, blockContentGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
 });
 export default doc;

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

@@ -0,0 +1,37 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { blockCard } from '../nodes/blockCard';
+import { blockquote } from '../nodes/blockquote';
+import { bodiedExtension } from '../nodes/bodiedExtension';
+import { codeBlock } from '../nodes/codeBlock';
+import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
+import { decisionList } from '../nodes/decisionList';
+import { embedCard } from '../nodes/embedCard';
+import { expand } from '../nodes/expand';
+import { extension } from '../nodes/extension';
+import { heading } from '../nodes/heading';
+import { bulletList, orderedList } from '../nodes/list';
+import { mediaGroup } from '../nodes/mediaGroup';
+import { mediaSingle } from '../nodes/mediaSingle';
+import { panel } from '../nodes/panel';
+import { paragraph } from '../nodes/paragraph';
+import { rule } from '../nodes/rule';
+import { table } from '../nodes/table';
+import { taskList } from '../nodes/task';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original blockGroup:
+ * - no base paragraph
+ * - no base codeBlock
+ * - no base extension
+ * - no base mediaSingle
+ * - no base heading
+ * - no base expand
+ */
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, blockquote, bodiedExtension.use('with_marks'), bulletList, codeBlock.use('with_no_marks'), confluenceUnsupportedBlock, decisionList, embedCard, expand.use('with_no_mark'), extension.use('with_marks'), heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), orderedList, panel, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), rule, table, taskList, unsupportedBlock], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -18,4 +18,8 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), confluenceUnsupportedBlock, unsupportedBlock]);
+export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), confluenceUnsupportedBlock, unsupportedBlock], {
+  // @DSLCompatibilityException
+  // Block group in PM doesn't match ADF
+  ignore: ['validator-spec']
+});

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

@@ -0,0 +1,28 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { date } from '../nodes/date';
+import { emoji } from '../nodes/emoji';
+import { hardBreak } from '../nodes/hardBreak';
+import { inlineCard } from '../nodes/inlineCard';
+import { mention } from '../nodes/mention';
+import { placeholder } from '../nodes/placeholder';
+import { text } from '../nodes/text';
+import { status } from '../nodes/status';
+import { inlineExtension } from '../nodes/inlineExtension';
+import { mediaInline } from '../nodes/mediaInline';
+import { unsupportedInline } from '../nodes/unsupportedInline';
+import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
+import { image } from '../nodes/image';
+import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original inlineGroup:
+ * - no text
+ * - no text.use('link_inline')
+ */
+export var inlineContentGroup = adfNodeGroup('inline_content', [text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

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

@@ -13,4 +13,8 @@ import { unsupportedInline } from '../nodes/unsupportedInline';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
 import { image } from '../nodes/image';
 import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
-export var inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline]);
+export var inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline], {
+  // @DSLCompatibilityException
+  // Inline group in PM doesn't match ADF
+  ignore: ['validator-spec']
+});

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

@@ -1,3 +1,4 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { codeBlock } from '../nodes/codeBlock';
@@ -17,4 +18,11 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export var nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
+export var nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
+
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ */
+export var nonNestableBlockContentGroup = adfNodeGroup('non_nestable_block_content', nonNestableBlockContent);

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

@@ -9,7 +9,8 @@ link.define({
   inclusive: false,
   attrs: {
     href: {
-      type: 'string'
+      type: 'string',
+      validatorFn: 'safeUrl'
     },
     title: {
       type: 'string',

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

@@ -1,6 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
-import { nonNestableBlockContent } from '../groups/nonNestableBlockContentGroup';
+import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
 import { dataConsumer } from '../marks/dataConsumer';
 import { fragment } from '../marks/fragment';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -45,7 +44,7 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
       default: null
     }
   },
-  content: [$onePlus($or.apply(void 0, _toConsumableArray(nonNestableBlockContent)))],
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_marks', {
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -16,5 +17,5 @@ export var decisionItem = adfNode('decisionItem').define({
       default: 'DECIDED'
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 });

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

@@ -7,7 +7,8 @@ export var embedCard = adfNode('embedCard').define({
   attrs: {
     url: {
       type: 'string',
-      default: ''
+      default: '',
+      validatorFn: 'safeUrl'
     },
     layout: {
       type: 'enum',

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

@@ -1,6 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
-import { nonNestableBlockContent } from '../groups/nonNestableBlockContentGroup';
+import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
 import { breakout } from '../marks/breakout';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -20,7 +19,7 @@ export var expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or.apply(void 0, _toConsumableArray(nonNestableBlockContent)))],
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
   ignore: ['json-schema']
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -21,7 +22,7 @@ export var heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup))],
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -1,4 +1,5 @@
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { blockContentGroup } from '../groups/blockContentGroup';
 import { blockGroup } from '../groups/blockGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -15,5 +16,5 @@ export var layoutColumn = adfNode('layoutColumn').define({
       default: undefined
     }
   },
-  content: [$onePlus($or(blockGroup, unsupportedBlock))]
+  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))]
 });

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -14,7 +15,7 @@ export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup))],
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       marks: {

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

@@ -1,4 +1,5 @@
 import { $onePlus, $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
@@ -21,7 +22,7 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 });
 taskList.define({
   defining: true,

package/dist/types/next-schema/generated/nodeGroupTypes.d.ts

@@ -3,9 +3,8 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
  * and run "yarn workspace @atlaskit/adf-schema build:pm:full" to regenerate this file.
  */
-import { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceUnsupportedBlockDefinition, DecisionListDefinition, EmbedCardDefinition, ExpandDefinition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, MediaGroupDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, RuleDefinition, TableDefinition, TaskListDefinition, UnsupportedBlockDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | BulletListDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | ConfluenceUnsupportedBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | OrderedListDefinition | PanelDefinition | PanelLegacyDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-import { MultiBodiedExtensionDefinition } from './nodeTypes';
+import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, ExpandDefinition, ExpandWithNoMarkDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MultiBodiedExtensionDefinition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
 export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionDefinition>;
-import { ConfluenceJiraIssueDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, ImageDefinition, InlineCardDefinition, InlineExtensionWithMarksDefinition, MediaInlineDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type InlineDefinition = Array<ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | ImageDefinition | InlineCardDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | TextCodeInlineDefinition | TextDefinition | TextFormattedDefinition | UnsupportedInlineDefinition>;
+export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
+export type NonNestableBlockContentDefinition = Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -41,7 +41,7 @@ export type BlockquoteLegacyNode = PMNode & BlockquoteLegacyDefinition;
 export declare const blockquoteLegacy: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockquoteLegacyNode>) => import("prosemirror-model").NodeSpec;
 export interface BodiedExtensionDefinition {
     type: 'bodiedExtension';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
+    content: Array<CodeBlockDefinition | BlockCardDefinition | ParagraphDefinition | MediaSingleDefinition | MediaSingleDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         extensionKey: string;
@@ -192,7 +192,7 @@ export type EmojiNode = PMNode & EmojiDefinition;
 export declare const emoji: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<EmojiNode>) => import("prosemirror-model").NodeSpec;
 export interface ExpandDefinition {
     type: 'expand';
-    content: Array<CodeBlockWithNoMarksDefinition | BlockCardDefinition | ParagraphWithNoMarksDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionWithMarksDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
+    content: Array<CodeBlockDefinition | BlockCardDefinition | ParagraphDefinition | MediaSingleDefinition | MediaSingleDefinition | TaskListDefinition | BulletListDefinition | OrderedListDefinition | HeadingDefinition | MediaGroupDefinition | DecisionListDefinition | RuleDefinition | PanelDefinition | BlockquoteDefinition | ExtensionDefinition | EmbedCardDefinition | TableDefinition | UnsupportedBlockDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         title?: string;

package/dist/types/next-schema/groups/blockContentGroup.d.ts

@@ -0,0 +1,14 @@
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original blockGroup:
+ * - no base paragraph
+ * - no base codeBlock
+ * - no base extension
+ * - no base mediaSingle
+ * - no base heading
+ * - no base expand
+ */
+export declare const blockContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

package/dist/types/next-schema/groups/inlineContentGroup.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ *
+ * Has slight differences from the original inlineGroup:
+ * - no text
+ * - no text.use('link_inline')
+ */
+export declare const inlineContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts

@@ -212,3 +212,9 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     ignore: any[];
 }>)[];
+/**
+ * @DSLCompatibilityException
+ *
+ * Pseudo group used to match existing validator and json schema specs.
+ */
+export declare const nonNestableBlockContentGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.19",
+  "version": "37.1.21",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.24.1",
+    "@atlaskit/adf-schema-generator": "^1.25.0",
     "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",

package/schema-generators/__tests__/unit/adfToValidatorSpecValidation.unit.ts

@@ -4,20 +4,15 @@ import adfNode from '../../../src/next-schema/full-schema.adf';
 
 const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
 const SKIP_LIST = [
-  'link', // doesn't exist in the output - validatorFn in DSL
-
   'blockCard', // doesn't match existing spec
-  'bodiedExtension', // doesn't match existing spec
   'caption', // doesn't match existing spec
   'codeBlock', // doesn't match existing spec
-  'doc', // doesn't match existing spec
-  'embedCard', // doesn't match existing spec, validatorFn
+  'doc', // doesn't match existing spec, need to flatten groups
   'expand', // doesn't match existing spec
   'extensionFrame', // doesn't match existing spec
   'inlineCard', // doesn't match existing spec
   'inlineExtension', // doesn't exist in the output
   'inline_comment_marker', // doesn't exist in the output
-  'layoutColumn', // doesn't match existing spec, wrong group name in content, allowUnsupportedBlock
   'layoutSection', // doesn't match existing spec, maxItem/minItem, extra marks
   'layoutSection_full', // doesn't match existing spec, allowUnsupportedBlock, extra marks
   'layoutSection_with_single_column', // doesn't exist in the output
@@ -29,12 +24,9 @@ const SKIP_LIST = [
   'tableHeader', // doesn't match existing spec
   'tableRow', // doesn't match existing spec, extra minItems
 
-  'atomic_inline', // doesn't exist in the output
-  'inline', // doesn't exist in the output
-  'block_content', // doesn't exist in the output
-  'nestedExpand_content', // doesn't exist in the output
-  'non_nestable_block_content', // doesn't exist in the output
-  'tableCell_content', // doesn't exist in the output
+  'atomic_inline', // doesn't exist in the output, not even used anywhere...
+  'nestedExpand_content', // doesn't exist in the output, completely different format from other groups
+  'tableCell_content', // doesn't exist in the output, completely different format from other groups
 ];
 
 const testCases = Object.entries(currentSpecs).map(([key, value]) => {