@atlaskit/adf-utils 14.4.1 → 16.0.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/adf-utils
 
+## 16.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 16.0.0
+
+### Major Changes
+
+- [`304351e4b1e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/304351e4b1e) - CETI-241 - Added additional panel ADF attributes (panelIconId, panelIconText) to uniquely identify custom panel emojis. The change has been categorised as major since it is a change to the full-schema ADF. However, the custom panel feature is behind a feature flag, has not yet been released to production, and is only currently planned for release to Confluence. See ADF change #61 for further details.
+
+### Patch Changes
+
+- [`2f5133aedd7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2f5133aedd7) - ED-13881 Update existing imports from @atlaskit/adf-schema to use declarative entry points
+- [`3b49ff824ec`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3b49ff824ec) - ED-14043 update prosemirror schema to only allow link mark on children of paragraph and mediaSingle
+- Updated dependencies
+
+## 15.0.0
+
+### Major Changes
+
+- [`5af69bfe9be`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5af69bfe9be) - CETI-241 - Added additional panel ADF attributes (panelIconId, panelIconText) to uniquely identify custom panel emojis. The change has been categorised as major since it is a change to the full-schema ADF. However, the custom panel feature is behind a feature flag, has not yet been released to production, and is only currently planned for release to Confluence. See ADF change #61 for further details.
+
+### Minor Changes
+
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - - Allow `table` nodes to have `fragment` marks
+  - Promote `fragment` mark to "full" ADF schema
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.4.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -387,6 +387,12 @@ Object.defineProperty(exports, "tr", {
     return _builders.tr;
   }
 });
+Object.defineProperty(exports, "transformMediaLinkMarks", {
+  enumerable: true,
+  get: function get() {
+    return _mediaLinkTransform.transformMediaLinkMarks;
+  }
+});
 Object.defineProperty(exports, "transformTextLinkCodeMarks", {
   enumerable: true,
   get: function get() {
@@ -440,4 +446,6 @@ var _validator = require("./validator");
 
 var _emptyAdf = require("./empty-adf");
 
+var _mediaLinkTransform = require("./media-link-transform");
+
 var _textLinkCodeTransform = require("./transforms/text-link-code-transform");

package/dist/cjs/media-link-transform.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformMediaLinkMarks = void 0;
+
+var _traverse = require("./traverse/traverse");
+
+// link mark on mediaSingle is deprecated, need to move link mark to child media node
+// https://product-fabric.atlassian.net/browse/ED-14043
+var transformMediaLinkMarks = function transformMediaLinkMarks(adf) {
+  var isTransformed = false;
+  var transformedAdf = (0, _traverse.traverse)(adf, {
+    mediaSingle: function mediaSingle(node) {
+      var _node$content$;
+
+      if (!node.marks || !node.content || ((_node$content$ = node.content[0]) === null || _node$content$ === void 0 ? void 0 : _node$content$.type) !== 'media') {
+        return node;
+      }
+
+      var linkMark = null;
+      node.marks.forEach(function (mark, i) {
+        if (mark.type === 'link') {
+          var _node$marks;
+
+          linkMark = mark;
+          (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.splice(i, 1);
+          isTransformed = true;
+        }
+      });
+
+      if (node.marks.length === 0) {
+        delete node.marks;
+      }
+
+      if (linkMark) {
+        var _mediaNode$marks;
+
+        var mediaNode = node.content[0]; // only add link mark if media node doesnt already have one
+
+        if ((_mediaNode$marks = mediaNode.marks) !== null && _mediaNode$marks !== void 0 && _mediaNode$marks.every(function (mark) {
+          return mark.type !== 'link';
+        })) {
+          mediaNode.marks.push(linkMark);
+        } else if (!mediaNode.marks) {
+          mediaNode.marks = [linkMark];
+        }
+      }
+
+      return node;
+    }
+  });
+  return {
+    transformedAdf: transformedAdf,
+    isTransformed: isTransformed
+  };
+};
+
+exports.transformMediaLinkMarks = transformMediaLinkMarks;

package/dist/cjs/validator/rules.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.validatorFnMap = void 0;
 
-var _adfSchema = require("@atlaskit/adf-schema");
+var _url = require("@atlaskit/adf-schema/url");
 
 var validatorFnMap = {
-  safeUrl: _adfSchema.isSafeUrl
+  safeUrl: _url.isSafeUrl
 };
 exports.validatorFnMap = validatorFnMap;

package/dist/cjs/validator/specs/block_content.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks'];
+var _default = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 exports.default = _default;

package/dist/cjs/validator/specs/bodiedExtension_with_marks.js

@@ -8,7 +8,7 @@ var _default = ['bodiedExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/cjs/validator/specs/doc.js

@@ -16,7 +16,7 @@ var _default = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
       allowUnsupportedBlock: true
     }
   }

package/dist/cjs/validator/specs/extension_with_marks.js

@@ -8,7 +8,7 @@ var _default = ['extension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/cjs/validator/specs/index.js

@@ -47,12 +47,6 @@ Object.defineProperty(exports, "bodiedExtension", {
     return _bodiedExtension.default;
   }
 });
-Object.defineProperty(exports, "bodiedExtension_with_experimental_marks", {
-  enumerable: true,
-  get: function get() {
-    return _bodiedExtension_with_experimental_marks.default;
-  }
-});
 Object.defineProperty(exports, "bodiedExtension_with_marks", {
   enumerable: true,
   get: function get() {
@@ -179,12 +173,6 @@ Object.defineProperty(exports, "extension", {
     return _extension.default;
   }
 });
-Object.defineProperty(exports, "extension_with_experimental_marks", {
-  enumerable: true,
-  get: function get() {
-    return _extension_with_experimental_marks.default;
-  }
-});
 Object.defineProperty(exports, "extension_with_marks", {
   enumerable: true,
   get: function get() {
@@ -257,12 +245,6 @@ Object.defineProperty(exports, "inlineExtension", {
     return _inlineExtension.default;
   }
 });
-Object.defineProperty(exports, "inlineExtension_with_experimental_marks", {
-  enumerable: true,
-  get: function get() {
-    return _inlineExtension_with_experimental_marks.default;
-  }
-});
 Object.defineProperty(exports, "inlineExtension_with_marks", {
   enumerable: true,
   get: function get() {
@@ -556,8 +538,6 @@ var _inlineExtension = _interopRequireDefault(require("./inlineExtension"));
 
 var _inlineExtension_with_marks = _interopRequireDefault(require("./inlineExtension_with_marks"));
 
-var _inlineExtension_with_experimental_marks = _interopRequireDefault(require("./inlineExtension_with_experimental_marks"));
-
 var _date = _interopRequireDefault(require("./date"));
 
 var _placeholder = _interopRequireDefault(require("./placeholder"));
@@ -640,8 +620,6 @@ var _extension = _interopRequireDefault(require("./extension"));
 
 var _extension_with_marks = _interopRequireDefault(require("./extension_with_marks"));
 
-var _extension_with_experimental_marks = _interopRequireDefault(require("./extension_with_experimental_marks"));
-
 var _embedCard = _interopRequireDefault(require("./embedCard"));
 
 var _nestedExpand_content = _interopRequireDefault(require("./nestedExpand_content"));
@@ -672,8 +650,6 @@ var _bodiedExtension = _interopRequireDefault(require("./bodiedExtension"));
 
 var _bodiedExtension_with_marks = _interopRequireDefault(require("./bodiedExtension_with_marks"));
 
-var _bodiedExtension_with_experimental_marks = _interopRequireDefault(require("./bodiedExtension_with_experimental_marks"));
-
 var _block_content = _interopRequireDefault(require("./block_content"));
 
 var _layoutColumn = _interopRequireDefault(require("./layoutColumn"));

package/dist/cjs/validator/specs/inline.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'inlineExtension_with_experimental_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];
+var _default = ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];
 exports.default = _default;

package/dist/cjs/validator/specs/inlineExtension_with_marks.js

@@ -8,7 +8,7 @@ var _default = ['inlineExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/cjs/validator/specs/non_nestable_block_content.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table'];
+var _default = ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table'];
 exports.default = _default;

package/dist/cjs/validator/specs/panel.js

@@ -23,6 +23,14 @@ var _default = {
         panelColor: {
           type: 'string',
           optional: true
+        },
+        panelIconId: {
+          type: 'string',
+          optional: true
+        },
+        panelIconText: {
+          type: 'string',
+          optional: true
         }
       }
     },

package/dist/cjs/validator/specs/table.js

@@ -33,6 +33,11 @@ var _default = {
       type: 'array',
       items: ['tableRow'],
       minItems: 1
+    },
+    marks: {
+      type: 'array',
+      items: ['fragment'],
+      optional: true
     }
   }
 };

package/dist/cjs/validator/specs/tableCell_content.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   type: 'array',
-  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'nestedExpand_with_no_marks']],
+  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "14.4.1",
+	"version": "16.0.1",
 	"sideEffects": false
 }

package/dist/es2019/index.js

@@ -3,4 +3,5 @@ export { filter, map, reduce, traverse } from './traverse';
 export { scrubAdf } from './scrub';
 export { validateAttrs, validator } from './validator';
 export { getEmptyADF } from './empty-adf';
+export { transformMediaLinkMarks } from './media-link-transform';
 export { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';

package/dist/es2019/media-link-transform.js

@@ -0,0 +1,48 @@
+import { traverse } from './traverse/traverse';
+// link mark on mediaSingle is deprecated, need to move link mark to child media node
+// https://product-fabric.atlassian.net/browse/ED-14043
+export const transformMediaLinkMarks = adf => {
+  let isTransformed = false;
+  const transformedAdf = traverse(adf, {
+    mediaSingle: node => {
+      var _node$content$;
+
+      if (!node.marks || !node.content || ((_node$content$ = node.content[0]) === null || _node$content$ === void 0 ? void 0 : _node$content$.type) !== 'media') {
+        return node;
+      }
+
+      let linkMark = null;
+      node.marks.forEach((mark, i) => {
+        if (mark.type === 'link') {
+          var _node$marks;
+
+          linkMark = mark;
+          (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.splice(i, 1);
+          isTransformed = true;
+        }
+      });
+
+      if (node.marks.length === 0) {
+        delete node.marks;
+      }
+
+      if (linkMark) {
+        var _mediaNode$marks;
+
+        const mediaNode = node.content[0]; // only add link mark if media node doesnt already have one
+
+        if ((_mediaNode$marks = mediaNode.marks) !== null && _mediaNode$marks !== void 0 && _mediaNode$marks.every(mark => mark.type !== 'link')) {
+          mediaNode.marks.push(linkMark);
+        } else if (!mediaNode.marks) {
+          mediaNode.marks = [linkMark];
+        }
+      }
+
+      return node;
+    }
+  });
+  return {
+    transformedAdf,
+    isTransformed
+  };
+};

package/dist/es2019/validator/rules.js

@@ -1,4 +1,4 @@
-import { isSafeUrl } from '@atlaskit/adf-schema';
+import { isSafeUrl } from '@atlaskit/adf-schema/url';
 export const validatorFnMap = {
   safeUrl: isSafeUrl
 };

package/dist/es2019/validator/specs/block_content.js

@@ -1 +1 @@
-export default ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks'];
+export default ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];

package/dist/es2019/validator/specs/bodiedExtension_with_marks.js

@@ -2,7 +2,7 @@ export default ['bodiedExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/es2019/validator/specs/doc.js

@@ -10,7 +10,7 @@ export default {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
       allowUnsupportedBlock: true
     }
   }

package/dist/es2019/validator/specs/extension_with_marks.js

@@ -2,7 +2,7 @@ export default ['extension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/es2019/validator/specs/index.js

@@ -19,7 +19,6 @@ export { default as mention } from './mention';
 export { default as emoji } from './emoji';
 export { default as inlineExtension } from './inlineExtension';
 export { default as inlineExtension_with_marks } from './inlineExtension_with_marks';
-export { default as inlineExtension_with_experimental_marks } from './inlineExtension_with_experimental_marks';
 export { default as date } from './date';
 export { default as placeholder } from './placeholder';
 export { default as blockCard } from './blockCard';
@@ -61,7 +60,6 @@ export { default as taskItem } from './taskItem';
 export { default as taskList } from './taskList';
 export { default as extension } from './extension';
 export { default as extension_with_marks } from './extension_with_marks';
-export { default as extension_with_experimental_marks } from './extension_with_experimental_marks';
 export { default as embedCard } from './embedCard';
 export { default as nestedExpand_content } from './nestedExpand_content';
 export { default as nestedExpand } from './nestedExpand';
@@ -77,7 +75,6 @@ export { default as expand_with_no_mark } from './expand_with_no_mark';
 export { default as expand_with_breakout_mark } from './expand_with_breakout_mark';
 export { default as bodiedExtension } from './bodiedExtension';
 export { default as bodiedExtension_with_marks } from './bodiedExtension_with_marks';
-export { default as bodiedExtension_with_experimental_marks } from './bodiedExtension_with_experimental_marks';
 export { default as block_content } from './block_content';
 export { default as layoutColumn } from './layoutColumn';
 export { default as layoutSection } from './layoutSection';

package/dist/es2019/validator/specs/inline.js

@@ -1 +1 @@
-export default ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'inlineExtension_with_experimental_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];
+export default ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];

package/dist/es2019/validator/specs/inlineExtension_with_marks.js

@@ -2,7 +2,7 @@ export default ['inlineExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/es2019/validator/specs/non_nestable_block_content.js

@@ -1 +1 @@
-export default ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table'];
+export default ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table'];

package/dist/es2019/validator/specs/panel.js

@@ -17,6 +17,14 @@ export default {
         panelColor: {
           type: 'string',
           optional: true
+        },
+        panelIconId: {
+          type: 'string',
+          optional: true
+        },
+        panelIconText: {
+          type: 'string',
+          optional: true
         }
       }
     },

package/dist/es2019/validator/specs/table.js

@@ -27,6 +27,11 @@ export default {
       type: 'array',
       items: ['tableRow'],
       minItems: 1
+    },
+    marks: {
+      type: 'array',
+      items: ['fragment'],
+      optional: true
     }
   }
 };

package/dist/es2019/validator/specs/tableCell_content.js

@@ -1,6 +1,6 @@
 export default {
   type: 'array',
-  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'nestedExpand_with_no_marks']],
+  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "14.4.1",
+	"version": "16.0.1",
 	"sideEffects": false
 }

package/dist/esm/index.js

@@ -3,4 +3,5 @@ export { filter, map, reduce, traverse } from './traverse';
 export { scrubAdf } from './scrub';
 export { validateAttrs, validator } from './validator';
 export { getEmptyADF } from './empty-adf';
+export { transformMediaLinkMarks } from './media-link-transform';
 export { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';

package/dist/esm/media-link-transform.js

@@ -0,0 +1,50 @@
+import { traverse } from './traverse/traverse';
+// link mark on mediaSingle is deprecated, need to move link mark to child media node
+// https://product-fabric.atlassian.net/browse/ED-14043
+export var transformMediaLinkMarks = function transformMediaLinkMarks(adf) {
+  var isTransformed = false;
+  var transformedAdf = traverse(adf, {
+    mediaSingle: function mediaSingle(node) {
+      var _node$content$;
+
+      if (!node.marks || !node.content || ((_node$content$ = node.content[0]) === null || _node$content$ === void 0 ? void 0 : _node$content$.type) !== 'media') {
+        return node;
+      }
+
+      var linkMark = null;
+      node.marks.forEach(function (mark, i) {
+        if (mark.type === 'link') {
+          var _node$marks;
+
+          linkMark = mark;
+          (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.splice(i, 1);
+          isTransformed = true;
+        }
+      });
+
+      if (node.marks.length === 0) {
+        delete node.marks;
+      }
+
+      if (linkMark) {
+        var _mediaNode$marks;
+
+        var mediaNode = node.content[0]; // only add link mark if media node doesnt already have one
+
+        if ((_mediaNode$marks = mediaNode.marks) !== null && _mediaNode$marks !== void 0 && _mediaNode$marks.every(function (mark) {
+          return mark.type !== 'link';
+        })) {
+          mediaNode.marks.push(linkMark);
+        } else if (!mediaNode.marks) {
+          mediaNode.marks = [linkMark];
+        }
+      }
+
+      return node;
+    }
+  });
+  return {
+    transformedAdf: transformedAdf,
+    isTransformed: isTransformed
+  };
+};

package/dist/esm/validator/rules.js

@@ -1,4 +1,4 @@
-import { isSafeUrl } from '@atlaskit/adf-schema';
+import { isSafeUrl } from '@atlaskit/adf-schema/url';
 export var validatorFnMap = {
   safeUrl: isSafeUrl
 };

package/dist/esm/validator/specs/block_content.js

@@ -1 +1 @@
-export default ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks'];
+export default ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];

package/dist/esm/validator/specs/bodiedExtension_with_marks.js

@@ -2,7 +2,7 @@ export default ['bodiedExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/esm/validator/specs/doc.js

@@ -10,7 +10,7 @@ export default {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'bodiedExtension_with_experimental_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'codeBlock_with_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_marks', 'layoutSection_full', 'layoutSection_with_single_column']],
       allowUnsupportedBlock: true
     }
   }

package/dist/esm/validator/specs/extension_with_marks.js

@@ -2,7 +2,7 @@ export default ['extension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/esm/validator/specs/index.js

@@ -19,7 +19,6 @@ export { default as mention } from './mention';
 export { default as emoji } from './emoji';
 export { default as inlineExtension } from './inlineExtension';
 export { default as inlineExtension_with_marks } from './inlineExtension_with_marks';
-export { default as inlineExtension_with_experimental_marks } from './inlineExtension_with_experimental_marks';
 export { default as date } from './date';
 export { default as placeholder } from './placeholder';
 export { default as blockCard } from './blockCard';
@@ -61,7 +60,6 @@ export { default as taskItem } from './taskItem';
 export { default as taskList } from './taskList';
 export { default as extension } from './extension';
 export { default as extension_with_marks } from './extension_with_marks';
-export { default as extension_with_experimental_marks } from './extension_with_experimental_marks';
 export { default as embedCard } from './embedCard';
 export { default as nestedExpand_content } from './nestedExpand_content';
 export { default as nestedExpand } from './nestedExpand';
@@ -77,7 +75,6 @@ export { default as expand_with_no_mark } from './expand_with_no_mark';
 export { default as expand_with_breakout_mark } from './expand_with_breakout_mark';
 export { default as bodiedExtension } from './bodiedExtension';
 export { default as bodiedExtension_with_marks } from './bodiedExtension_with_marks';
-export { default as bodiedExtension_with_experimental_marks } from './bodiedExtension_with_experimental_marks';
 export { default as block_content } from './block_content';
 export { default as layoutColumn } from './layoutColumn';
 export { default as layoutSection } from './layoutSection';

package/dist/esm/validator/specs/inline.js

@@ -1 +1 @@
-export default ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'inlineExtension_with_experimental_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];
+export default ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_marks', 'date', 'placeholder', 'inlineCard', 'status', 'mediaInline', 'formatted_text_inline', 'code_inline'];

package/dist/esm/validator/specs/inlineExtension_with_marks.js

@@ -2,7 +2,7 @@ export default ['inlineExtension', {
   props: {
     marks: {
       type: 'array',
-      items: ['dataConsumer'],
+      items: [['dataConsumer', 'fragment']],
       optional: true
     }
   }

package/dist/esm/validator/specs/non_nestable_block_content.js

@@ -1 +1 @@
-export default ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'table'];
+export default ['blockCard', 'paragraph_with_no_marks', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'table'];

package/dist/esm/validator/specs/panel.js

@@ -17,6 +17,14 @@ export default {
         panelColor: {
           type: 'string',
           optional: true
+        },
+        panelIconId: {
+          type: 'string',
+          optional: true
+        },
+        panelIconText: {
+          type: 'string',
+          optional: true
         }
       }
     },

package/dist/esm/validator/specs/table.js

@@ -27,6 +27,11 @@ export default {
       type: 'array',
       items: ['tableRow'],
       minItems: 1
+    },
+    marks: {
+      type: 'array',
+      items: ['fragment'],
+      optional: true
     }
   }
 };

package/dist/esm/validator/specs/tableCell_content.js

@@ -1,6 +1,6 @@
 export default {
   type: 'array',
-  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'extension_with_experimental_marks', 'embedCard', 'nestedExpand_with_no_marks']],
+  items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'bulletList', 'mediaSingle_full', 'mediaSingle_caption', 'codeBlock_with_no_marks', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'panel', 'blockquote', 'rule', 'mediaGroup', 'decisionList', 'taskList', 'extension_with_marks', 'embedCard', 'nestedExpand_with_no_marks']],
   minItems: 1,
   allowUnsupportedBlock: true
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "14.4.1",
+	"version": "16.0.1",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -5,4 +5,5 @@ export { validateAttrs, validator } from './validator';
 export type { Content, ErrorCallback, Output, ValidationError, ValidationErrorMap, ValidationErrorType, ValidationMode, ValidationOptions, ErrorCallbackOptions, Validate, } from './types/validatorTypes';
 export type { ADFEntity, ADFEntityMark, Visitor, VisitorCollection, } from './types';
 export { getEmptyADF } from './empty-adf';
+export { transformMediaLinkMarks } from './media-link-transform';
 export { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';

package/dist/types/media-link-transform.d.ts

@@ -0,0 +1,5 @@
+import { ADFEntity } from './types';
+export declare const transformMediaLinkMarks: (adf: ADFEntity) => {
+    transformedAdf: false | ADFEntity;
+    isTransformed: boolean;
+};

package/dist/types/validator/specs/bodiedExtension_with_marks.d.ts

@@ -2,7 +2,7 @@ declare const _default: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
+            items: string[][];
             optional: boolean;
         };
     };

package/dist/types/validator/specs/extension_with_marks.d.ts

@@ -2,7 +2,7 @@ declare const _default: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
+            items: string[][];
             optional: boolean;
         };
     };

package/dist/types/validator/specs/index.d.ts

@@ -18,7 +18,6 @@ export { default as mention } from './mention';
 export { default as emoji } from './emoji';
 export { default as inlineExtension } from './inlineExtension';
 export { default as inlineExtension_with_marks } from './inlineExtension_with_marks';
-export { default as inlineExtension_with_experimental_marks } from './inlineExtension_with_experimental_marks';
 export { default as date } from './date';
 export { default as placeholder } from './placeholder';
 export { default as blockCard } from './blockCard';
@@ -60,7 +59,6 @@ export { default as taskItem } from './taskItem';
 export { default as taskList } from './taskList';
 export { default as extension } from './extension';
 export { default as extension_with_marks } from './extension_with_marks';
-export { default as extension_with_experimental_marks } from './extension_with_experimental_marks';
 export { default as embedCard } from './embedCard';
 export { default as nestedExpand_content } from './nestedExpand_content';
 export { default as nestedExpand } from './nestedExpand';
@@ -76,7 +74,6 @@ export { default as expand_with_no_mark } from './expand_with_no_mark';
 export { default as expand_with_breakout_mark } from './expand_with_breakout_mark';
 export { default as bodiedExtension } from './bodiedExtension';
 export { default as bodiedExtension_with_marks } from './bodiedExtension_with_marks';
-export { default as bodiedExtension_with_experimental_marks } from './bodiedExtension_with_experimental_marks';
 export { default as block_content } from './block_content';
 export { default as layoutColumn } from './layoutColumn';
 export { default as layoutSection } from './layoutSection';

package/dist/types/validator/specs/inlineExtension_with_marks.d.ts

@@ -2,7 +2,7 @@ declare const _default: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
+            items: string[][];
             optional: boolean;
         };
     };

package/dist/types/validator/specs/panel.d.ts

@@ -18,6 +18,14 @@ declare const _default: {
                     type: string;
                     optional: boolean;
                 };
+                panelIconId: {
+                    type: string;
+                    optional: boolean;
+                };
+                panelIconText: {
+                    type: string;
+                    optional: boolean;
+                };
             };
         };
         content: {

package/dist/types/validator/specs/table.d.ts

@@ -28,6 +28,11 @@ declare const _default: {
             items: string[];
             minItems: number;
         };
+        marks: {
+            type: string;
+            items: string[];
+            optional: boolean;
+        };
     };
 };
 export default _default;

package/media-link-transform/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@atlaskit/adf-utils/media-link-transform",
+  "main": "../dist/cjs/media-link-transform.js",
+  "module": "../dist/esm/media-link-transform.js",
+  "module:es2019": "../dist/es2019/media-link-transform.js",
+  "types": "../dist/types/media-link-transform.d.ts"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-utils",
-  "version": "14.4.1",
+  "version": "16.0.1",
   "description": "Set of utilities to traverse, modify and create ADF documents.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -24,7 +24,7 @@
     "generate:spec": "rm -rf ./src/validator/specs/ && ../json-schema-generator/bin.js --outDir=./src/validator/specs/ --mode=Spec --stage=0 ./src/validator/entry.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^20.1.0",
+    "@atlaskit/adf-schema": "^23.0.0",
     "@babel/runtime": "^7.0.0"
   },
   "devDependencies": {
@@ -32,7 +32,7 @@
     "@atlaskit/json-schema-generator": "^3.2.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "react": "^16.8.0",
-    "typescript": "3.9.6",
+    "typescript": "3.9.10",
     "wait-for-expect": "^1.2.0"
   },
   "techstack": {

package/dist/cjs/validator/specs/bodiedExtension_with_experimental_marks.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = ['bodiedExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];
-exports.default = _default;

package/dist/cjs/validator/specs/extension_with_experimental_marks.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = ['extension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];
-exports.default = _default;

package/dist/cjs/validator/specs/inlineExtension_with_experimental_marks.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = ['inlineExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];
-exports.default = _default;

package/dist/es2019/validator/specs/bodiedExtension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['bodiedExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/es2019/validator/specs/extension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['extension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/es2019/validator/specs/inlineExtension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['inlineExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/esm/validator/specs/bodiedExtension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['bodiedExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/esm/validator/specs/extension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['extension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/esm/validator/specs/inlineExtension_with_experimental_marks.js

@@ -1,9 +0,0 @@
-export default ['inlineExtension', {
-  props: {
-    marks: {
-      type: 'array',
-      items: ['fragment'],
-      optional: true
-    }
-  }
-}];

package/dist/types/validator/specs/bodiedExtension_with_experimental_marks.d.ts

@@ -1,10 +0,0 @@
-declare const _default: (string | {
-    props: {
-        marks: {
-            type: string;
-            items: string[];
-            optional: boolean;
-        };
-    };
-})[];
-export default _default;

package/dist/types/validator/specs/extension_with_experimental_marks.d.ts

@@ -1,10 +0,0 @@
-declare const _default: (string | {
-    props: {
-        marks: {
-            type: string;
-            items: string[];
-            optional: boolean;
-        };
-    };
-})[];
-export default _default;

package/dist/types/validator/specs/inlineExtension_with_experimental_marks.d.ts

@@ -1,10 +0,0 @@
-declare const _default: (string | {
-    props: {
-        marks: {
-            type: string;
-            items: string[];
-            optional: boolean;
-        };
-    };
-})[];
-export default _default;