@atlaskit/adf-utils 14.2.0 → 15.0.0

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,9 +70,9 @@ function createSpec(nodes, marks) {
           };
         }
 
-        spec.props.content.items = spec.props.content.items. // ['inline'] => [['emoji', 'hr', ...]]
+        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 => 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
@@ -153,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);
@@ -364,19 +367,19 @@ export function validator(nodes, marks, options) {
         } // this checks for mark level attribute errors
         // and propagates error code and message
         else if (finalResult.marksValidationOutput && finalResult.marksValidationOutput.length) {
-            return {
-              valid: false,
-              originalMark: mark,
-              errorCode: finalResult.marksValidationOutput[0].errorCode,
-              message: finalResult.marksValidationOutput[0].message
-            };
-          } else {
-            return {
-              valid: false,
-              originalMark: mark,
-              errorCode: 'INVALID_TYPE'
-            };
-          }
+          return {
+            valid: false,
+            originalMark: mark,
+            errorCode: finalResult.marksValidationOutput[0].errorCode,
+            message: finalResult.marksValidationOutput[0].message
+          };
+        } else {
+          return {
+            valid: false,
+            originalMark: mark,
+            errorCode: 'INVALID_TYPE'
+          };
+        }
       } else {
         return {
           valid: false,

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "14.2.0",
+	"version": "15.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,5 @@ 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 { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';

package/dist/esm/scrub/default-node-replacements.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; }
 
 import { scrubAttrs } from './scrub-content';
 

package/dist/esm/scrub/scrub-adf.js

@@ -1,9 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
 
 import { traverse } from '../traverse/traverse';
 import { scrubAttrs, scrubStr, scrubLink } from './scrub-content';

package/dist/esm/scrub/scrub-content.js

@@ -3,9 +3,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
-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; }
 
 var DUMMY_TEXT = "Lorem ipsum dolor sit amet consectetur adipiscing elit sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur Excepteur sint occaecat cupidatat non proident sunt in culpa qui officia deserunt mollit anim id est laborum";
 var DUMMY_DIGITS = ['2', '7', '4', '3', '5', '9', '1', '8', '0', '5'];

package/dist/esm/transforms/text-link-code-transform.js

@@ -0,0 +1,47 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 = 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; }
+
+import { traverse } from '../traverse/traverse';
+
+var hasLinkAndCodeMarks = function hasLinkAndCodeMarks(node) {
+  var _node$marks;
+
+  var marks = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.map(function (mark) {
+    return mark.type;
+  });
+  return (marks === null || marks === void 0 ? void 0 : marks.includes('link')) && (marks === null || marks === void 0 ? void 0 : marks.includes('code'));
+};
+
+var removeCodeMarks = function removeCodeMarks(node) {
+  if (node.marks) {
+    return _objectSpread(_objectSpread({}, node), {}, {
+      marks: node.marks.filter(function (mark) {
+        return 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 var transformTextLinkCodeMarks = function transformTextLinkCodeMarks(adf) {
+  var isTransformed = false;
+  var transformedAdf = traverse(adf, {
+    text: function text(node) {
+      if (hasLinkAndCodeMarks(node)) {
+        isTransformed = true;
+        return removeCodeMarks(node);
+      }
+    }
+  });
+  return {
+    transformedAdf: transformedAdf,
+    isTransformed: isTransformed
+  };
+};

package/dist/esm/traverse/traverse.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 function validateVisitors(_visitors) {
   return true;

package/dist/esm/validator/rules.js

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

package/dist/esm/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/esm/validator/specs/blockCard.js

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

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_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/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_no_marks', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'expand_with_breakout_mark', 'bodiedExtension_with_no_marks', 'bodiedExtension_with_marks', 'layoutSection']],
+      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/embedCard.js

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

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/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/esm/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,9 +74,10 @@ 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';
 export { default as layoutSection } from './layoutSection';
+export { default as layoutSection_full } from './layoutSection_full';
+export { default as layoutSection_with_single_column } from './layoutSection_with_single_column';
 export { default as doc } from './doc';

package/dist/esm/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/esm/validator/specs/inlineCard.js

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

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

@@ -4,17 +4,14 @@ export default {
       type: 'enum',
       values: ['layoutSection']
     },
-    content: {
-      type: 'array',
-      items: ['layoutColumn'],
-      minItems: 2,
-      maxItems: 3,
-      allowUnsupportedBlock: true
-    },
     marks: {
       type: 'array',
       items: ['breakout'],
       optional: true
+    },
+    content: {
+      type: 'array',
+      items: ['layoutColumn']
     }
   }
 };

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

@@ -0,0 +1,20 @@
+export default ['layoutSection', {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['layoutSection']
+    },
+    marks: {
+      type: 'array',
+      items: ['breakout'],
+      optional: true
+    },
+    content: {
+      type: 'array',
+      items: ['layoutColumn'],
+      minItems: 2,
+      maxItems: 3,
+      allowUnsupportedBlock: true
+    }
+  }
+}];

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

@@ -0,0 +1,20 @@
+export default ['layoutSection', {
+  props: {
+    type: {
+      type: 'enum',
+      values: ['layoutSection']
+    },
+    marks: {
+      type: 'array',
+      items: ['breakout'],
+      optional: true
+    },
+    content: {
+      type: 'array',
+      items: ['layoutColumn'],
+      minItems: 1,
+      maxItems: 3,
+      allowUnsupportedBlock: true
+    }
+  }
+}];

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

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

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_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/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_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/esm/validator/validator.js

@@ -1,13 +1,15 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["items"];
 
-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; }
 
 import * as specs from './specs';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
+import { validatorFnMap } from './rules';
 
 function mapMarksItems(spec) {
   var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (x) {
@@ -17,7 +19,7 @@ function mapMarksItems(spec) {
   if (spec.props && spec.props.marks) {
     var _ref = spec.props.marks,
         items = _ref.items,
-        rest = _objectWithoutProperties(_ref, ["items"]);
+        rest = _objectWithoutProperties(_ref, _excluded);
 
     return _objectSpread(_objectSpread({}, spec), {}, {
       props: _objectSpread(_objectSpread({}, spec.props), {}, {
@@ -81,9 +83,9 @@ function createSpec(nodes, marks) {
           spec.props.content = _objectSpread({}, spec.props.content);
         }
 
-        spec.props.content.items = spec.props.content.items. // ['inline'] => [['emoji', 'hr', ...]]
+        spec.props.content.items = spec.props.content.items // ['inline'] => [['emoji', 'hr', ...]]
         // ['media'] => [['media']]
-        map(function (item) {
+        .map(function (item) {
           return isString(item) ? Array.isArray(specs[item]) ? specs[item] : [item] : item;
         }) // [['emoji', 'hr', 'inline_code']] => [['emoji', 'hr', ['text', { marks: {} }]]]
         .map(function (item) {
@@ -178,7 +180,11 @@ 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);
+      var validatorFnPassed = function validatorFnPassed(rule) {
+        return 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);
@@ -385,19 +391,19 @@ export function validator(nodes, marks, options) {
         } // this checks for mark level attribute errors
         // and propagates error code and message
         else if (finalResult.marksValidationOutput && finalResult.marksValidationOutput.length) {
-            return {
-              valid: false,
-              originalMark: mark,
-              errorCode: finalResult.marksValidationOutput[0].errorCode,
-              message: finalResult.marksValidationOutput[0].message
-            };
-          } else {
-            return {
-              valid: false,
-              originalMark: mark,
-              errorCode: 'INVALID_TYPE'
-            };
-          }
+          return {
+            valid: false,
+            originalMark: mark,
+            errorCode: finalResult.marksValidationOutput[0].errorCode,
+            message: finalResult.marksValidationOutput[0].message
+          };
+        } else {
+          return {
+            valid: false,
+            originalMark: mark,
+            errorCode: 'INVALID_TYPE'
+          };
+        }
       } else {
         return {
           valid: false,

package/dist/esm/version.json

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

package/dist/types/builders/marks/breakout.d.ts

@@ -1,3 +1,3 @@
 import { BreakoutMarkAttrs, BreakoutMarkDefinition, CodeBlockDefinition, LayoutSectionDefinition } from '@atlaskit/adf-schema';
 import { WithAppliedMark } from '../types';
-export declare const breakout: (attrs: BreakoutMarkAttrs) => (maybeNode: CodeBlockDefinition | LayoutSectionDefinition) => WithAppliedMark<CodeBlockDefinition | LayoutSectionDefinition, BreakoutMarkDefinition>;
+export declare const breakout: (attrs: BreakoutMarkAttrs) => (maybeNode: CodeBlockDefinition | LayoutSectionDefinition) => WithAppliedMark<CodeBlockDefinition | import("@atlaskit/adf-schema").LayoutSectionFullDefinition | import("@atlaskit/adf-schema").LayoutSectionWithSingleColumnDefinition, BreakoutMarkDefinition>;

package/dist/types/builders/marks/fragment.d.ts

@@ -0,0 +1,3 @@
+import { ExtensionDefinition, BodiedExtensionDefinition, InlineExtensionDefinition, TableDefinition, FragmentAttributes, FragmentDefinition } from '@atlaskit/adf-schema';
+import { WithAppliedMark } from '../types';
+export declare const fragment: (attrs: FragmentAttributes) => (maybeNode: TableDefinition | ExtensionDefinition | BodiedExtensionDefinition | InlineExtensionDefinition) => WithAppliedMark<ExtensionDefinition | BodiedExtensionDefinition | InlineExtensionDefinition | TableDefinition, FragmentDefinition>;

package/dist/types/builders.d.ts

@@ -13,6 +13,7 @@ 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';
+export { fragment } from './builders/marks/fragment';
 export { blockQuote } from './builders/nodes/blockquote';
 export { bodiedExtension } from './builders/nodes/bodied-extension';
 export { blockCard } from './builders/nodes/block-card';

package/dist/types/index.d.ts

@@ -5,3 +5,4 @@ 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 { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';