@atlaskit/adf-utils 14.3.0 → 16.0.0

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_no_marks', 'inlineExtension_with_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/inlineCard.js

@@ -13,7 +13,8 @@ var _default = {
     attrs: [{
       props: {
         url: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         }
       }
     }, {

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/link.js

@@ -13,7 +13,8 @@ var _default = {
     attrs: {
       props: {
         href: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         },
         title: {
           type: 'string',

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_no_marks', 'extension_with_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_no_marks', 'extension_with_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/validator/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.makeArray = exports.copy = exports.isPlainObject = exports.isString = exports.isBoolean = exports.isInteger = exports.isNumber = exports.isDefined = void 0;
+exports.makeArray = exports.isString = exports.isPlainObject = exports.isNumber = exports.isInteger = exports.isDefined = exports.isBoolean = exports.copy = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 

package/dist/cjs/validator/validator.js

@@ -20,13 +20,17 @@ var specs = _interopRequireWildcard(require("./specs"));
 
 var _utils = require("./utils");
 
+var _rules = require("./rules");
+
+var _excluded = ["items"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function mapMarksItems(spec) {
   var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (x) {
@@ -36,7 +40,7 @@ function mapMarksItems(spec) {
   if (spec.props && spec.props.marks) {
     var _ref = spec.props.marks,
         items = _ref.items,
-        rest = (0, _objectWithoutProperties2.default)(_ref, ["items"]);
+        rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
     return _objectSpread(_objectSpread({}, spec), {}, {
       props: _objectSpread(_objectSpread({}, spec.props), {}, {
         marks: _objectSpread(_objectSpread({}, rest), {}, {
@@ -99,7 +103,9 @@ function createSpec(nodes, marks) {
           spec.props.content = _objectSpread({}, spec.props.content);
         }
 
-        spec.props.content.items = spec.props.content.items.map(function (item) {
+        spec.props.content.items = spec.props.content.items // ['inline'] => [['emoji', 'hr', ...]]
+        // ['media'] => [['media']]
+        .map(function (item) {
           return (0, _utils.isString)(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item;
         }) // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
         .map(function (item) {
@@ -194,7 +200,11 @@ function validateAttrs(spec, value) {
       return (0, _utils.isInteger)(value) && ((0, _utils.isDefined)(spec.minimum) ? spec.minimum <= value : true) && ((0, _utils.isDefined)(spec.maximum) ? spec.maximum >= value : true);
 
     case 'string':
-      return (0, _utils.isString)(value) && ((0, _utils.isDefined)(spec.minLength) ? spec.minLength <= value.length : true) && (spec.pattern ? new RegExp(spec.pattern).test(value) : true);
+      var validatorFnPassed = function validatorFnPassed(rule) {
+        return typeof value === 'string' && (0, _utils.isDefined)(_rules.validatorFnMap[rule]) && _rules.validatorFnMap[rule](value);
+      };
+
+      return (0, _utils.isString)(value) && ((0, _utils.isDefined)(spec.minLength) ? spec.minLength <= value.length : true) && ((0, _utils.isDefined)(spec.validatorFn) ? validatorFnPassed(spec.validatorFn) : true) && (spec.pattern ? new RegExp(spec.pattern).test(value) : true);
 
     case 'object':
       return (0, _utils.isPlainObject)(value);

package/dist/cjs/version.json

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

package/dist/es2019/builders/marks/fragment.js

@@ -0,0 +1,7 @@
+import { applyMark } from '../utils/apply-mark';
+export const fragment = attrs => maybeNode => {
+  return applyMark({
+    type: 'fragment',
+    attrs
+  }, maybeNode);
+};

package/dist/es2019/builders.js

@@ -13,7 +13,8 @@ export { underline } from './builders/marks/underline';
 export { underline as u } from './builders/marks/underline';
 export { alignment } from './builders/marks/alignment';
 export { indentation } from './builders/marks/indentation';
-export { dataConsumer } from './builders/marks/data-consumer'; // Nodes Builders
+export { dataConsumer } from './builders/marks/data-consumer';
+export { fragment } from './builders/marks/fragment'; // Nodes Builders
 
 export { blockQuote } from './builders/nodes/blockquote';
 export { bodiedExtension } from './builders/nodes/bodied-extension';

package/dist/es2019/index.js

@@ -2,4 +2,6 @@ export { a, alignment, b, blockCard, blockQuote, bodiedExtension, br, breakout,
 export { filter, map, reduce, traverse } from './traverse';
 export { scrubAdf } from './scrub';
 export { validateAttrs, validator } from './validator';
-export { getEmptyADF } from './empty-adf';
+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/transforms/text-link-code-transform.js

@@ -0,0 +1,37 @@
+import { traverse } from '../traverse/traverse';
+
+const hasLinkAndCodeMarks = node => {
+  var _node$marks;
+
+  const marks = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.map(mark => mark.type);
+  return (marks === null || marks === void 0 ? void 0 : marks.includes('link')) && (marks === null || marks === void 0 ? void 0 : marks.includes('code'));
+};
+
+const removeCodeMarks = node => {
+  if (node.marks) {
+    return { ...node,
+      marks: node.marks.filter(mark => mark.type !== 'code')
+    };
+  }
+
+  return node;
+}; // See: HOT-97965 https://product-fabric.atlassian.net/browse/ED-14400
+// We declared in code mark spec that links and marks should not co-exist on
+// text nodes. This util strips code marks from bad text nodes and preserves links.
+
+
+export const transformTextLinkCodeMarks = adf => {
+  let isTransformed = false;
+  const transformedAdf = traverse(adf, {
+    text: node => {
+      if (hasLinkAndCodeMarks(node)) {
+        isTransformed = true;
+        return removeCodeMarks(node);
+      }
+    }
+  });
+  return {
+    transformedAdf,
+    isTransformed
+  };
+};

package/dist/es2019/validator/rules.js

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

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

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

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

@@ -7,7 +7,8 @@ export default {
     attrs: [{
       props: {
         url: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         }
       }
     }, {

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_no_marks', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_no_marks', 'bodiedExtension_with_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_no_marks', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_no_marks', 'bodiedExtension_with_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/embedCard.js

@@ -15,7 +15,8 @@ export default {
           optional: true
         },
         url: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         },
         width: {
           type: 'number',

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/fragment.js

@@ -0,0 +1,20 @@
+export default {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['fragment']
+    },
+    attrs: {
+      props: {
+        localId: {
+          type: 'string',
+          minLength: 1
+        },
+        name: {
+          type: 'string',
+          optional: true
+        }
+      }
+    }
+  }
+};

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

@@ -13,11 +13,11 @@ export { default as alignment } from './alignment';
 export { default as indentation } from './indentation';
 export { default as annotation } from './annotation';
 export { default as dataConsumer } from './dataConsumer';
+export { default as fragment } from './fragment';
 export { default as hardBreak } from './hardBreak';
 export { default as mention } from './mention';
 export { default as emoji } from './emoji';
 export { default as inlineExtension } from './inlineExtension';
-export { default as inlineExtension_with_no_marks } from './inlineExtension_with_no_marks';
 export { default as inlineExtension_with_marks } from './inlineExtension_with_marks';
 export { default as date } from './date';
 export { default as placeholder } from './placeholder';
@@ -59,7 +59,6 @@ export { default as decisionList } from './decisionList';
 export { default as taskItem } from './taskItem';
 export { default as taskList } from './taskList';
 export { default as extension } from './extension';
-export { default as extension_with_no_marks } from './extension_with_no_marks';
 export { default as extension_with_marks } from './extension_with_marks';
 export { default as embedCard } from './embedCard';
 export { default as nestedExpand_content } from './nestedExpand_content';
@@ -75,7 +74,6 @@ export { default as expand } from './expand';
 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_no_marks } from './bodiedExtension_with_no_marks';
 export { default as bodiedExtension_with_marks } from './bodiedExtension_with_marks';
 export { default as block_content } from './block_content';
 export { default as layoutColumn } from './layoutColumn';

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

@@ -1 +1 @@
-export default ['hardBreak', 'mention', 'emoji', 'inlineExtension_with_no_marks', 'inlineExtension_with_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/inlineCard.js

@@ -7,7 +7,8 @@ export default {
     attrs: [{
       props: {
         url: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         }
       }
     }, {

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/link.js

@@ -7,7 +7,8 @@ export default {
     attrs: {
       props: {
         href: {
-          type: 'string'
+          type: 'string',
+          validatorFn: 'safeUrl'
         },
         title: {
           type: 'string',

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_no_marks', 'extension_with_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_no_marks', 'extension_with_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/validator/validator.js

@@ -1,5 +1,6 @@
 import * as specs from './specs';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
+import { validatorFnMap } from './rules';
 
 function mapMarksItems(spec, fn = x => x) {
   if (spec.props && spec.props.marks) {
@@ -69,7 +70,9 @@ function createSpec(nodes, marks) {
           };
         }
 
-        spec.props.content.items = spec.props.content.items.map(item => isString(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item) // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
+        spec.props.content.items = spec.props.content.items // ['inline'] => [['emoji', 'hr', ...]]
+        // ['media'] => [['media']]
+        .map(item => isString(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item) // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
         .map(item => item.map(subItem => Array.isArray(specs[subItem]) ? specs[subItem] : isString(subItem) ? subItem : // Now `NoMark` produces `items: []`, should be fixed in generator
         ['text', subItem]) // Remove unsupported nodes & marks
         // Filter nodes
@@ -151,7 +154,9 @@ export function validateAttrs(spec, value) {
       return isInteger(value) && (isDefined(spec.minimum) ? spec.minimum <= value : true) && (isDefined(spec.maximum) ? spec.maximum >= value : true);
 
     case 'string':
-      return isString(value) && (isDefined(spec.minLength) ? spec.minLength <= value.length : true) && (spec.pattern ? new RegExp(spec.pattern).test(value) : true);
+      const validatorFnPassed = rule => typeof value === 'string' && isDefined(validatorFnMap[rule]) && validatorFnMap[rule](value);
+
+      return isString(value) && (isDefined(spec.minLength) ? spec.minLength <= value.length : true) && (isDefined(spec.validatorFn) ? validatorFnPassed(spec.validatorFn) : true) && (spec.pattern ? new RegExp(spec.pattern).test(value) : true);
 
     case 'object':
       return isPlainObject(value);

package/dist/es2019/version.json

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

package/dist/esm/builders/marks/fragment.js

@@ -0,0 +1,9 @@
+import { applyMark } from '../utils/apply-mark';
+export var fragment = function fragment(attrs) {
+  return function (maybeNode) {
+    return applyMark({
+      type: 'fragment',
+      attrs: attrs
+    }, maybeNode);
+  };
+};

package/dist/esm/builders/nodes/mention.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 export var mention = function mention(attrs) {
   return {

package/dist/esm/builders.js

@@ -13,7 +13,8 @@ export { underline } from './builders/marks/underline';
 export { underline as u } from './builders/marks/underline';
 export { alignment } from './builders/marks/alignment';
 export { indentation } from './builders/marks/indentation';
-export { dataConsumer } from './builders/marks/data-consumer'; // Nodes Builders
+export { dataConsumer } from './builders/marks/data-consumer';
+export { fragment } from './builders/marks/fragment'; // Nodes Builders
 
 export { blockQuote } from './builders/nodes/blockquote';
 export { bodiedExtension } from './builders/nodes/bodied-extension';

package/dist/esm/index.js

@@ -2,4 +2,6 @@ export { a, alignment, b, blockCard, blockQuote, bodiedExtension, br, breakout,
 export { filter, map, reduce, traverse } from './traverse';
 export { scrubAdf } from './scrub';
 export { validateAttrs, validator } from './validator';
-export { getEmptyADF } from './empty-adf';
+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
+  };
+};