@atlaskit/adf-schema 36.16.0 → 36.17.0

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

@@ -24,8 +24,4 @@ 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.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote.use('with_list'), _decisionList.decisionList, _embedCard.embedCard,
-// extension,
-_extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _table.table,
-// bodiedExtension,
-_bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand.use('with_no_mark'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock]);
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_panel.panel, _paragraph.paragraph, _paragraph.paragraph.use('with_marks'), _blockquote.blockquote.use('with_list'), _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _table.table, _expand.expand.use('with_no_mark'), _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _blockCard.blockCard, _embedCard.embedCard, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock]);

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

@@ -5,4 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.blockRootOnlyGroup = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var blockRootOnlyGroup = exports.blockRootOnlyGroup = (0, _adfSchemaGenerator.adfNodeGroup)('blockRootOnly');
+var _multiBodiedExtension = require("../nodes/multiBodiedExtension");
+var blockRootOnlyGroup = exports.blockRootOnlyGroup = (0, _adfSchemaGenerator.adfNodeGroup)('blockRootOnly', [_multiBodiedExtension.multiBodiedExtension]);

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

@@ -17,4 +17,6 @@ var _inlineExtension = require("../nodes/inlineExtension");
 var _mediaInline = require("../nodes/mediaInline");
 var _unsupportedInline = require("../nodes/unsupportedInline");
 var _confluenceUnsupportedInline = require("../nodes/confluenceUnsupportedInline");
-var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [_text.text, _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, _confluenceUnsupportedInline.confluenceUnsupportedInline, _unsupportedInline.unsupportedInline]);
+var _image = require("../nodes/image");
+var _confluenceJiraIssue = require("../nodes/confluenceJiraIssue");
+var inlineGroup = exports.inlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('inline', [_text.text, _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]);

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

@@ -19,6 +19,11 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
       type: 'string',
       default: null,
       optional: true
+    },
+    uniqueId: {
+      type: 'string',
+      default: null,
+      optional: true
     }
   },
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text, _unsupportedInline.unsupportedInline))]

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

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.confluenceJiraIssue = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var confluenceJiraIssue = exports.confluenceJiraIssue = (0, _adfSchemaGenerator.adfNode)('confluenceJiraIssue').define({
+  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+  atom: true,
+  inline: true,
+  attrs: {
+    issueKey: {
+      type: 'string',
+      default: ''
+    },
+    macroId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    schemaVersion: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    server: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    serverId: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  }
+});

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

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

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

@@ -25,11 +25,13 @@ var _paragraph = require("./paragraph");
 var _rule = require("./rule");
 var _table = require("./table");
 var _task = require("./task");
+var _unsupportedBlock = require("./unsupportedBlock");
 var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('extensionFrame').define({
   isolating: true,
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension, _panel.panel, _paragraph.paragraph, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading, _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _table.table, _extension.extension, _blockCard.blockCard, _embedCard.embedCard))]
+  attrs: {},
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension, _panel.panel, _paragraph.paragraph, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading, _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _table.table, _extension.extension, _blockCard.blockCard, _embedCard.embedCard, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -9,7 +9,6 @@ var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var _unsupportedInline = require("./unsupportedInline");
 var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').define({
   defining: true,
   selectable: false,
@@ -22,7 +21,7 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
       maximum: 6
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _unsupportedInline.unsupportedInline))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
 }).variant('with_indentation', {

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

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.image = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var image = exports.image = (0, _adfSchemaGenerator.adfNode)('image').define({
+  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+  inline: true,
+  draggable: true,
+  attrs: {
+    src: {
+      type: 'string',
+      default: ''
+    },
+    alt: {
+      type: 'string',
+      default: '',
+      optional: true
+    },
+    title: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  }
+});

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

@@ -12,5 +12,7 @@ var _unsupportedBlock = require("./unsupportedBlock");
 var mediaGroup = exports.mediaGroup = (0, _adfSchemaGenerator.adfNode)('mediaGroup').define({
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
+  // Need to be empty object to match old PM Spec
+  attrs: {},
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_media.media, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -16,10 +16,6 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
   inline: true,
   marks: [_link.link, _annotation.annotation, _border.border, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   attrs: {
-    data: {
-      type: 'object',
-      optional: true
-    },
     type: {
       type: 'enum',
       values: ['link', 'file', 'image'],

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

@@ -44,7 +44,7 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
       widthType: {
         type: 'enum',
         values: ['pixel'],
-        default: 'pixel'
+        default: null
       },
       layout: {
         type: 'enum',

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

@@ -9,11 +9,10 @@ var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var _unsupportedInline = require("./unsupportedInline");
 var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph').define({
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _unsupportedInline.unsupportedInline))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
 }).variant('with_indentation', {

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

@@ -8,6 +8,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var status = exports.status = (0, _adfSchemaGenerator.adfNode)('status').define({
+  inline: true,
   selectable: true,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   attrs: {

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

@@ -18,7 +18,7 @@ var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table').define({
     displayMode: {
       type: 'enum',
       values: ['default', 'fixed'],
-      default: 'default',
+      default: null,
       optional: true
     },
     isNumberColumnEnabled: {

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

@@ -8,7 +8,6 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _inlineGroup = require("../groups/inlineGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
-var _unsupportedInline = require("./unsupportedInline");
 var _unsupportedBlock = require("./unsupportedBlock");
 var taskItem = exports.taskItem = (0, _adfSchemaGenerator.adfNode)('taskItem');
 var taskList = exports.taskList = (0, _adfSchemaGenerator.adfNode)('taskList');
@@ -28,7 +27,7 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _unsupportedInline.unsupportedInline))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
 });
 taskList.define({
   defining: true,

package/dist/cjs/schema/create-schema.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.allowCustomPanel = void 0;
 exports.createSchema = createSchema;
+exports.getNodesAndMarksMap = getNodesAndMarksMap;
 exports.sanitizeNodeSpecContent = sanitizeNodeSpecContent;
 exports.sanitizeNodes = sanitizeNodes;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -273,6 +274,26 @@ var marksInOrder = [{
   name: 'unsupportedNodeAttribute',
   spec: _marks.unsupportedNodeAttribute
 }]);
+function getNodesAndMarksMap() {
+  var nodes = nodesInOrder.reduce(function (acc, _ref2) {
+    var name = _ref2.name,
+      spec = _ref2.spec;
+    // @ts-expect-error - Type for SchemaBuiltInItem is not correct
+    acc[name] = spec;
+    return acc;
+  }, {});
+  var marks = marksInOrder.reduce(function (acc, _ref3) {
+    var name = _ref3.name,
+      spec = _ref3.spec;
+    // @ts-expect-error - Type for SchemaBuiltInItem is not correct
+    acc[name] = spec;
+    return acc;
+  }, {});
+  return {
+    nodes: nodes,
+    marks: marks
+  };
+}
 
 /**
  * Creates a schema preserving order of marks and nodes.

package/dist/cjs/schema/nodes/multi-bodied-extension.js

@@ -15,7 +15,6 @@ var _extensions = require("../../utils/extensions");
  * @returns NodeSpec for ExtensionFrameDefinition
  */
 var extensionFrame = exports.extensionFrame = {
-  type: 'extensionFrame',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
   isolating: true,
   marks: 'dataConsumer fragment',
@@ -52,7 +51,6 @@ var createMultiBodiedExtensionNodeSpec = function createMultiBodiedExtensionNode
     inline: false,
     group: 'blockRootOnly',
     content: 'extensionFrame+',
-    block: true,
     definingAsContext: true,
     selectable: true,
     attrs: {

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

@@ -38,7 +38,7 @@ var paragraphStage0 = exports.paragraphStage0 = {
       default: null
     }
   },
-  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p',
     getAttrs: function getAttrs(domNode) {
@@ -63,7 +63,7 @@ var paragraph = exports.paragraph = {
   selectable: false,
   content: 'inline*',
   group: 'block',
-  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p'
   }],

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

@@ -2,13 +2,9 @@ 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 { paragraph } from './nodes/paragraph';
-import { expand } from './nodes/expand';
-import { codeBlock } from './nodes/codeBlock';
-import { unsupportedBlock } from './nodes/unsupportedBlock';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark'), codeBlock.use('with_no_marks'), codeBlock.use('with_marks'), paragraph.use('with_indentation'), unsupportedBlock))]
+  content: [$onePlus($or(blockGroup, layoutSection, blockRootOnlyGroup))]
 });
 export default doc;

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

@@ -31,25 +31,6 @@ export const link = createPMMarkSpecFactory({
   excludes: 'link',
   group: 'link'
 });
-export const annotation = createPMMarkSpecFactory({
-  attrs: {
-    id: {
-      default: ''
-    },
-    annotationType: {
-      default: 'inlineComment'
-    }
-  },
-  inclusive: true,
-  group: 'annotation'
-});
-export const border = createPMMarkSpecFactory({
-  attrs: {
-    size: {},
-    color: {}
-  },
-  inclusive: false
-});
 export const em = createPMMarkSpecFactory({
   inclusive: true,
   group: 'fontStyle'
@@ -82,6 +63,18 @@ export const textColor = createPMMarkSpecFactory({
   inclusive: true,
   group: 'color'
 });
+export const annotation = createPMMarkSpecFactory({
+  attrs: {
+    id: {
+      default: ''
+    },
+    annotationType: {
+      default: 'inlineComment'
+    }
+  },
+  inclusive: true,
+  group: 'annotation'
+});
 export const backgroundColor = createPMMarkSpecFactory({
   attrs: {
     color: {}
@@ -112,6 +105,13 @@ export const fragment = createPMMarkSpecFactory({
   },
   inclusive: false
 });
+export const border = createPMMarkSpecFactory({
+  attrs: {
+    size: {},
+    color: {}
+  },
+  inclusive: false
+});
 export const alignment = createPMMarkSpecFactory({
   attrs: {
     align: {}