@atlaskit/adf-utils 17.1.3 → 17.1.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-utils
 
+## 17.1.5
+
+### Patch Changes
+
+- [`17014a9004c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/17014a9004c) - [ux] ED-15632 preprocess invalid media adf to avoid empty mediaSingle node and duplicated captions and media inside mediaSingle.The document will be transformed for this cases and validation error not thrown.When mediaSingle with empty content is encountered - it will be removed.When mediaSingle with duplicated captions or media nodes is encountered - duplicate captions or media nodes will be removed, prioritising removal of nodes with empty content first.
+
+## 17.1.4
+
+### Patch Changes
+
+- [`8cc2f888c83`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8cc2f888c83) - Upgrade Typescript from `4.3.5` to `4.5.5`
+
 ## 17.1.3
 
 ### Patch Changes

package/builders/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/builders.js",
   "module:es2019": "../dist/es2019/builders.js",
   "sideEffects": false,
-  "types": "../dist/types/builders.d.ts"
+  "types": "../dist/types/builders.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/builders.d.ts"
+      ]
+    }
+  }
 }

package/codemods/17.0.0-update-imports-to-new-entry-points.ts

@@ -166,9 +166,8 @@ const entryPointChangeRequests: EntryPointChangeRequest[] = [
   scrub,
 ];
 
-export const entryPointChangeMigrates = createMigratesFromEntryPointChangeRequests(
-  entryPointChangeRequests,
-);
+export const entryPointChangeMigrates =
+  createMigratesFromEntryPointChangeRequests(entryPointChangeRequests);
 
 const transformer = createTransformer(entryPointChangeMigrates);
 

package/dist/cjs/transforms/helpers.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmpty = void 0;
+
+var isEmpty = function isEmpty(node) {
+  var _node$content;
+
+  return !(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length);
+};
+
+exports.isEmpty = isEmpty;

package/dist/cjs/transforms/invalid-media-content-transform.js

@@ -0,0 +1,103 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformInvalidMediaContent = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _traverse = require("../traverse/traverse");
+
+var _helpers = require("./helpers");
+
+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) { (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; }
+
+var getChildrenTypeCounts = function getChildrenTypeCounts(nodeContent, allowedTypes) {
+  var childrenTypes = {};
+  nodeContent.forEach(function (childNode, index) {
+    if (!(childNode !== null && childNode !== void 0 && childNode.type) || !allowedTypes.includes(childNode.type)) {
+      return;
+    }
+
+    if (!childrenTypes[childNode.type]) {
+      childrenTypes[childNode.type] = 1;
+      return;
+    }
+
+    childrenTypes[childNode.type]++;
+  });
+  return childrenTypes;
+};
+
+var removeDuplicatedNodes = function removeDuplicatedNodes(type, content, predicate) {
+  var maxIterations = 10;
+  var childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  var firstPredicateNodeIndex = content.findIndex(predicate);
+
+  while (childrenTypeCounts > 1 && firstPredicateNodeIndex > -1 && maxIterations-- > 0) {
+    content.splice(firstPredicateNodeIndex, 1);
+    firstPredicateNodeIndex = content.findIndex(predicate);
+    childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  }
+};
+/**
+ * @param  {{[type:string]:number}} allowedTypes - array types allowed to deduplicate
+ */
+
+
+var deduplicateMediaSingleChildren = function deduplicateMediaSingleChildren(node, allowedTypes) {
+  if (!node.content) {
+    return;
+  }
+
+  var content = (0, _toConsumableArray2.default)(node.content);
+  Object.keys(allowedTypes).forEach(function (type) {
+    //prioritise removing empty nodes first
+    removeDuplicatedNodes(type, content, function (node) {
+      return (node === null || node === void 0 ? void 0 : node.type) === type && (0, _helpers.isEmpty)(node);
+    }); //remove other remaining dupicates
+
+    removeDuplicatedNodes(type, content, function (node) {
+      return (node === null || node === void 0 ? void 0 : node.type) === type;
+    });
+  });
+  return _objectSpread(_objectSpread({}, node), {}, {
+    content: content
+  });
+};
+
+var transformInvalidMediaContent = function transformInvalidMediaContent(adf) {
+  var isTransformed = false;
+  var transformedAdf = (0, _traverse.traverse)(adf, {
+    mediaSingle: function mediaSingle(node) {
+      var _node$content;
+
+      if (!(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length)) {
+        return;
+      }
+
+      var disallowedDuplicateTypes = ['media', 'caption'];
+      var childrenTypes = getChildrenTypeCounts(node.content, disallowedDuplicateTypes);
+
+      if (Object.values(childrenTypes).some(function (occurences) {
+        return occurences > 1;
+      })) {
+        isTransformed = true;
+        return deduplicateMediaSingleChildren(node, childrenTypes);
+      }
+    }
+  });
+  return {
+    transformedAdf: transformedAdf,
+    isTransformed: isTransformed
+  };
+};
+
+exports.transformInvalidMediaContent = transformInvalidMediaContent;

package/dist/cjs/transforms/nodes-missing-content-transform.js

@@ -15,6 +15,8 @@ var _traverse = require("../traverse/traverse");
 
 var _builders = require("../builders");
 
+var _helpers = require("./helpers");
+
 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) { (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; }
@@ -43,15 +45,9 @@ var createValidEmptyContent = function createValidEmptyContent(node) {
   }
 };
 
-var isEmpty = function isEmpty(node) {
-  var _node$content;
-
-  return ((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.length) === 0;
-};
-
 var fixIfTableCellInvalidEmpty = function fixIfTableCellInvalidEmpty(reportTransform) {
   return function (node) {
-    if (isEmpty(node)) {
+    if ((0, _helpers.isEmpty)(node)) {
       reportTransform();
       return _objectSpread(_objectSpread({}, node), {}, {
         content: createValidEmptyContent(node)
@@ -61,17 +57,17 @@ var fixIfTableCellInvalidEmpty = function fixIfTableCellInvalidEmpty(reportTrans
 };
 
 var hasNonListItemChildren = function hasNonListItemChildren(node) {
-  var _node$content2;
+  var _node$content;
 
-  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(function (node) {
+  return (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type) !== 'listItem';
   });
 };
 
 var hasEmptyListItemChildren = function hasEmptyListItemChildren(node) {
-  var _node$content3;
+  var _node$content2;
 
-  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(function (childNode) {
+  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(function (childNode) {
     var _childNode$content2;
 
     return (childNode === null || childNode === void 0 ? void 0 : childNode.type) === 'listItem' && !((_childNode$content2 = childNode.content) !== null && _childNode$content2 !== void 0 && _childNode$content2.length);
@@ -86,7 +82,7 @@ var tryCreateValidListItemWrappedChildren = function tryCreateValidListItemWrapp
       switch (childNode.type) {
         case 'listItem':
           {
-            if (isEmpty(childNode)) {
+            if ((0, _helpers.isEmpty)(childNode)) {
               var result = (0, _builders.listItem)([(0, _builders.paragraph)()]);
               return result;
             }
@@ -118,9 +114,9 @@ var fixIfListParentWithInvalidListItemChildren = function fixIfListParentWithInv
 };
 
 var hasNonTableRowChildren = function hasNonTableRowChildren(node) {
-  var _node$content4;
+  var _node$content3;
 
-  return (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(function (node) {
+  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type) !== 'tableRow';
   });
 };
@@ -144,7 +140,7 @@ var tryCreateValidTableRowWrappedChildren = function tryCreateValidTableRowWrapp
 
         case 'tableRow':
           {
-            if (isEmpty(childNode)) {
+            if ((0, _helpers.isEmpty)(childNode)) {
               return (0, _builders.tableRow)((0, _toConsumableArray2.default)(new Array(maxColsCount).fill((0, _builders.tableCell)({})((0, _builders.paragraph)()))));
             }
 
@@ -161,12 +157,12 @@ var tryCreateValidTableRowWrappedChildren = function tryCreateValidTableRowWrapp
 };
 
 var hasEmptyTableRowChildren = function hasEmptyTableRowChildren(node) {
-  var _node$content5;
+  var _node$content4;
 
-  return node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.some(function (node) {
-    var _node$content6;
+  return node === null || node === void 0 ? void 0 : (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(function (node) {
+    var _node$content5;
 
-    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content6 = node.content) === null || _node$content6 === void 0 ? void 0 : _node$content6.length) === 0;
+    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.length) === 0;
   });
 };
 
@@ -181,6 +177,15 @@ var fixIfTableParentWithInvalidTableRowChildren = function fixIfTableParentWithI
   };
 };
 
+var removeMediaSingleWithNoContent = function removeMediaSingleWithNoContent(reportTransform) {
+  return function (node) {
+    if ((0, _helpers.isEmpty)(node)) {
+      reportTransform();
+      return false;
+    }
+  };
+};
+
 var transformNodesMissingContent = function transformNodesMissingContent(adf) {
   var isTransformed = false;
 
@@ -194,7 +199,8 @@ var transformNodesMissingContent = function transformNodesMissingContent(adf) {
   transformedAdf = (0, _traverse.traverse)(transformedAdf || adf, {
     bulletList: fixIfListParentWithInvalidListItemChildren(reportTransform),
     orderedList: fixIfListParentWithInvalidListItemChildren(reportTransform),
-    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform)
+    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform),
+    mediaSingle: removeMediaSingleWithNoContent(reportTransform)
   });
   return {
     transformedAdf: transformedAdf,

package/dist/cjs/transforms.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "transformIndentationMarks", {
     return _indentationMarksTransform.transformIndentationMarks;
   }
 });
+Object.defineProperty(exports, "transformInvalidMediaContent", {
+  enumerable: true,
+  get: function get() {
+    return _invalidMediaContentTransform.transformInvalidMediaContent;
+  }
+});
 Object.defineProperty(exports, "transformMediaLinkMarks", {
   enumerable: true,
   get: function get() {
@@ -42,4 +48,6 @@ var _dedupeMarksTransform = require("./transforms/dedupe-marks-transform");
 
 var _nodesMissingContentTransform = require("./transforms/nodes-missing-content-transform");
 
-var _indentationMarksTransform = require("./transforms/indentation-marks-transform");
+var _indentationMarksTransform = require("./transforms/indentation-marks-transform");
+
+var _invalidMediaContentTransform = require("./transforms/invalid-media-content-transform");

package/dist/cjs/version.json

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

package/dist/es2019/transforms/helpers.js

@@ -0,0 +1,5 @@
+export const isEmpty = node => {
+  var _node$content;
+
+  return !(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length);
+};

package/dist/es2019/transforms/invalid-media-content-transform.js

@@ -0,0 +1,77 @@
+import { traverse } from '../traverse/traverse';
+import { isEmpty } from './helpers';
+
+const getChildrenTypeCounts = (nodeContent, allowedTypes) => {
+  let childrenTypes = {};
+  nodeContent.forEach((childNode, index) => {
+    if (!(childNode !== null && childNode !== void 0 && childNode.type) || !allowedTypes.includes(childNode.type)) {
+      return;
+    }
+
+    if (!childrenTypes[childNode.type]) {
+      childrenTypes[childNode.type] = 1;
+      return;
+    }
+
+    childrenTypes[childNode.type]++;
+  });
+  return childrenTypes;
+};
+
+const removeDuplicatedNodes = (type, content, predicate) => {
+  let maxIterations = 10;
+  let childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  let firstPredicateNodeIndex = content.findIndex(predicate);
+
+  while (childrenTypeCounts > 1 && firstPredicateNodeIndex > -1 && maxIterations-- > 0) {
+    content.splice(firstPredicateNodeIndex, 1);
+    firstPredicateNodeIndex = content.findIndex(predicate);
+    childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  }
+};
+/**
+ * @param  {{[type:string]:number}} allowedTypes - array types allowed to deduplicate
+ */
+
+
+const deduplicateMediaSingleChildren = (node, allowedTypes) => {
+  if (!node.content) {
+    return;
+  }
+
+  const content = [...node.content];
+  Object.keys(allowedTypes).forEach(type => {
+    //prioritise removing empty nodes first
+    removeDuplicatedNodes(type, content, node => (node === null || node === void 0 ? void 0 : node.type) === type && isEmpty(node)); //remove other remaining dupicates
+
+    removeDuplicatedNodes(type, content, node => (node === null || node === void 0 ? void 0 : node.type) === type);
+  });
+  return { ...node,
+    content
+  };
+};
+
+export const transformInvalidMediaContent = adf => {
+  let isTransformed = false;
+  const transformedAdf = traverse(adf, {
+    mediaSingle: node => {
+      var _node$content;
+
+      if (!(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length)) {
+        return;
+      }
+
+      const disallowedDuplicateTypes = ['media', 'caption'];
+      const childrenTypes = getChildrenTypeCounts(node.content, disallowedDuplicateTypes);
+
+      if (Object.values(childrenTypes).some(occurences => occurences > 1)) {
+        isTransformed = true;
+        return deduplicateMediaSingleChildren(node, childrenTypes);
+      }
+    }
+  });
+  return {
+    transformedAdf,
+    isTransformed
+  };
+};

package/dist/es2019/transforms/nodes-missing-content-transform.js

@@ -1,5 +1,6 @@
 import { traverse } from '../traverse/traverse';
 import { tableRow, tableCell, paragraph, listItem } from '../builders';
+import { isEmpty } from './helpers';
 
 const getMaxColumnsCountForTable = tableNode => {
   var _tableNode$content;
@@ -25,12 +26,6 @@ const createValidEmptyContent = node => {
   }
 };
 
-const isEmpty = node => {
-  var _node$content;
-
-  return ((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.length) === 0;
-};
-
 const fixIfTableCellInvalidEmpty = reportTransform => node => {
   if (isEmpty(node)) {
     reportTransform();
@@ -41,15 +36,15 @@ const fixIfTableCellInvalidEmpty = reportTransform => node => {
 };
 
 const hasNonListItemChildren = node => {
-  var _node$content2;
+  var _node$content;
 
-  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(node => (node === null || node === void 0 ? void 0 : node.type) !== 'listItem');
+  return (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.some(node => (node === null || node === void 0 ? void 0 : node.type) !== 'listItem');
 };
 
 const hasEmptyListItemChildren = node => {
-  var _node$content3;
+  var _node$content2;
 
-  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(childNode => {
+  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(childNode => {
     var _childNode$content2;
 
     return (childNode === null || childNode === void 0 ? void 0 : childNode.type) === 'listItem' && !((_childNode$content2 = childNode.content) !== null && _childNode$content2 !== void 0 && _childNode$content2.length);
@@ -94,9 +89,9 @@ const fixIfListParentWithInvalidListItemChildren = reportTransform => node => {
 };
 
 const hasNonTableRowChildren = node => {
-  var _node$content4;
+  var _node$content3;
 
-  return (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(node => (node === null || node === void 0 ? void 0 : node.type) !== 'tableRow');
+  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(node => (node === null || node === void 0 ? void 0 : node.type) !== 'tableRow');
 };
 
 const tryCreateValidTableRowWrappedChildren = parentTableNode => {
@@ -135,12 +130,12 @@ const tryCreateValidTableRowWrappedChildren = parentTableNode => {
 };
 
 const hasEmptyTableRowChildren = node => {
-  var _node$content5;
+  var _node$content4;
 
-  return node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.some(node => {
-    var _node$content6;
+  return node === null || node === void 0 ? void 0 : (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(node => {
+    var _node$content5;
 
-    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content6 = node.content) === null || _node$content6 === void 0 ? void 0 : _node$content6.length) === 0;
+    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.length) === 0;
   });
 };
 
@@ -153,6 +148,13 @@ const fixIfTableParentWithInvalidTableRowChildren = reportTransform => node => {
   }
 };
 
+const removeMediaSingleWithNoContent = reportTransform => node => {
+  if (isEmpty(node)) {
+    reportTransform();
+    return false;
+  }
+};
+
 export const transformNodesMissingContent = adf => {
   let isTransformed = false;
 
@@ -166,7 +168,8 @@ export const transformNodesMissingContent = adf => {
   transformedAdf = traverse(transformedAdf || adf, {
     bulletList: fixIfListParentWithInvalidListItemChildren(reportTransform),
     orderedList: fixIfListParentWithInvalidListItemChildren(reportTransform),
-    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform)
+    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform),
+    mediaSingle: removeMediaSingleWithNoContent(reportTransform)
   });
   return {
     transformedAdf,

package/dist/es2019/transforms.js

@@ -2,4 +2,5 @@ export { transformMediaLinkMarks } from './transforms/media-link-transform';
 export { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';
 export { transformDedupeMarks } from './transforms/dedupe-marks-transform';
 export { transformNodesMissingContent } from './transforms/nodes-missing-content-transform';
-export { transformIndentationMarks } from './transforms/indentation-marks-transform';
+export { transformIndentationMarks } from './transforms/indentation-marks-transform';
+export { transformInvalidMediaContent } from './transforms/invalid-media-content-transform';

package/dist/es2019/version.json

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

package/dist/esm/transforms/helpers.js

@@ -0,0 +1,5 @@
+export var isEmpty = function isEmpty(node) {
+  var _node$content;
+
+  return !(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length);
+};

package/dist/esm/transforms/invalid-media-content-transform.js

@@ -0,0 +1,91 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+
+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';
+import { isEmpty } from './helpers';
+
+var getChildrenTypeCounts = function getChildrenTypeCounts(nodeContent, allowedTypes) {
+  var childrenTypes = {};
+  nodeContent.forEach(function (childNode, index) {
+    if (!(childNode !== null && childNode !== void 0 && childNode.type) || !allowedTypes.includes(childNode.type)) {
+      return;
+    }
+
+    if (!childrenTypes[childNode.type]) {
+      childrenTypes[childNode.type] = 1;
+      return;
+    }
+
+    childrenTypes[childNode.type]++;
+  });
+  return childrenTypes;
+};
+
+var removeDuplicatedNodes = function removeDuplicatedNodes(type, content, predicate) {
+  var maxIterations = 10;
+  var childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  var firstPredicateNodeIndex = content.findIndex(predicate);
+
+  while (childrenTypeCounts > 1 && firstPredicateNodeIndex > -1 && maxIterations-- > 0) {
+    content.splice(firstPredicateNodeIndex, 1);
+    firstPredicateNodeIndex = content.findIndex(predicate);
+    childrenTypeCounts = getChildrenTypeCounts(content, [type])[type];
+  }
+};
+/**
+ * @param  {{[type:string]:number}} allowedTypes - array types allowed to deduplicate
+ */
+
+
+var deduplicateMediaSingleChildren = function deduplicateMediaSingleChildren(node, allowedTypes) {
+  if (!node.content) {
+    return;
+  }
+
+  var content = _toConsumableArray(node.content);
+
+  Object.keys(allowedTypes).forEach(function (type) {
+    //prioritise removing empty nodes first
+    removeDuplicatedNodes(type, content, function (node) {
+      return (node === null || node === void 0 ? void 0 : node.type) === type && isEmpty(node);
+    }); //remove other remaining dupicates
+
+    removeDuplicatedNodes(type, content, function (node) {
+      return (node === null || node === void 0 ? void 0 : node.type) === type;
+    });
+  });
+  return _objectSpread(_objectSpread({}, node), {}, {
+    content: content
+  });
+};
+
+export var transformInvalidMediaContent = function transformInvalidMediaContent(adf) {
+  var isTransformed = false;
+  var transformedAdf = traverse(adf, {
+    mediaSingle: function mediaSingle(node) {
+      var _node$content;
+
+      if (!(node !== null && node !== void 0 && (_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length)) {
+        return;
+      }
+
+      var disallowedDuplicateTypes = ['media', 'caption'];
+      var childrenTypes = getChildrenTypeCounts(node.content, disallowedDuplicateTypes);
+
+      if (Object.values(childrenTypes).some(function (occurences) {
+        return occurences > 1;
+      })) {
+        isTransformed = true;
+        return deduplicateMediaSingleChildren(node, childrenTypes);
+      }
+    }
+  });
+  return {
+    transformedAdf: transformedAdf,
+    isTransformed: isTransformed
+  };
+};

package/dist/esm/transforms/nodes-missing-content-transform.js

@@ -7,6 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import { traverse } from '../traverse/traverse';
 import { tableRow, tableCell, paragraph, listItem } from '../builders';
+import { isEmpty } from './helpers';
 
 var getMaxColumnsCountForTable = function getMaxColumnsCountForTable(tableNode) {
   var _tableNode$content;
@@ -32,12 +33,6 @@ var createValidEmptyContent = function createValidEmptyContent(node) {
   }
 };
 
-var isEmpty = function isEmpty(node) {
-  var _node$content;
-
-  return ((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.length) === 0;
-};
-
 var fixIfTableCellInvalidEmpty = function fixIfTableCellInvalidEmpty(reportTransform) {
   return function (node) {
     if (isEmpty(node)) {
@@ -50,17 +45,17 @@ var fixIfTableCellInvalidEmpty = function fixIfTableCellInvalidEmpty(reportTrans
 };
 
 var hasNonListItemChildren = function hasNonListItemChildren(node) {
-  var _node$content2;
+  var _node$content;
 
-  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(function (node) {
+  return (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type) !== 'listItem';
   });
 };
 
 var hasEmptyListItemChildren = function hasEmptyListItemChildren(node) {
-  var _node$content3;
+  var _node$content2;
 
-  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(function (childNode) {
+  return (_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.some(function (childNode) {
     var _childNode$content2;
 
     return (childNode === null || childNode === void 0 ? void 0 : childNode.type) === 'listItem' && !((_childNode$content2 = childNode.content) !== null && _childNode$content2 !== void 0 && _childNode$content2.length);
@@ -107,9 +102,9 @@ var fixIfListParentWithInvalidListItemChildren = function fixIfListParentWithInv
 };
 
 var hasNonTableRowChildren = function hasNonTableRowChildren(node) {
-  var _node$content4;
+  var _node$content3;
 
-  return (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(function (node) {
+  return (_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.some(function (node) {
     return (node === null || node === void 0 ? void 0 : node.type) !== 'tableRow';
   });
 };
@@ -150,12 +145,12 @@ var tryCreateValidTableRowWrappedChildren = function tryCreateValidTableRowWrapp
 };
 
 var hasEmptyTableRowChildren = function hasEmptyTableRowChildren(node) {
-  var _node$content5;
+  var _node$content4;
 
-  return node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.some(function (node) {
-    var _node$content6;
+  return node === null || node === void 0 ? void 0 : (_node$content4 = node.content) === null || _node$content4 === void 0 ? void 0 : _node$content4.some(function (node) {
+    var _node$content5;
 
-    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content6 = node.content) === null || _node$content6 === void 0 ? void 0 : _node$content6.length) === 0;
+    return (node === null || node === void 0 ? void 0 : node.type) === 'tableRow' && (node === null || node === void 0 ? void 0 : (_node$content5 = node.content) === null || _node$content5 === void 0 ? void 0 : _node$content5.length) === 0;
   });
 };
 
@@ -170,6 +165,15 @@ var fixIfTableParentWithInvalidTableRowChildren = function fixIfTableParentWithI
   };
 };
 
+var removeMediaSingleWithNoContent = function removeMediaSingleWithNoContent(reportTransform) {
+  return function (node) {
+    if (isEmpty(node)) {
+      reportTransform();
+      return false;
+    }
+  };
+};
+
 export var transformNodesMissingContent = function transformNodesMissingContent(adf) {
   var isTransformed = false;
 
@@ -183,7 +187,8 @@ export var transformNodesMissingContent = function transformNodesMissingContent(
   transformedAdf = traverse(transformedAdf || adf, {
     bulletList: fixIfListParentWithInvalidListItemChildren(reportTransform),
     orderedList: fixIfListParentWithInvalidListItemChildren(reportTransform),
-    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform)
+    table: fixIfTableParentWithInvalidTableRowChildren(reportTransform),
+    mediaSingle: removeMediaSingleWithNoContent(reportTransform)
   });
   return {
     transformedAdf: transformedAdf,

package/dist/esm/transforms.js

@@ -2,4 +2,5 @@ export { transformMediaLinkMarks } from './transforms/media-link-transform';
 export { transformTextLinkCodeMarks } from './transforms/text-link-code-transform';
 export { transformDedupeMarks } from './transforms/dedupe-marks-transform';
 export { transformNodesMissingContent } from './transforms/nodes-missing-content-transform';
-export { transformIndentationMarks } from './transforms/indentation-marks-transform';
+export { transformIndentationMarks } from './transforms/indentation-marks-transform';
+export { transformInvalidMediaContent } from './transforms/invalid-media-content-transform';

package/dist/esm/version.json

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

package/dist/types/transforms/helpers.d.ts

@@ -0,0 +1,2 @@
+import { ADFEntity } from '../types';
+export declare const isEmpty: (node: ADFEntity) => boolean;

package/dist/types/transforms/invalid-media-content-transform.d.ts

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

package/dist/types/transforms.d.ts

@@ -3,3 +3,4 @@ export { transformTextLinkCodeMarks } from './transforms/text-link-code-transfor
 export { transformDedupeMarks } from './transforms/dedupe-marks-transform';
 export { transformNodesMissingContent } from './transforms/nodes-missing-content-transform';
 export { transformIndentationMarks } from './transforms/indentation-marks-transform';
+export { transformInvalidMediaContent } from './transforms/invalid-media-content-transform';

package/empty-adf/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/empty-adf.js",
   "module:es2019": "../dist/es2019/empty-adf.js",
   "sideEffects": false,
-  "types": "../dist/types/empty-adf.d.ts"
+  "types": "../dist/types/empty-adf.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/empty-adf.d.ts"
+      ]
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-utils",
-  "version": "17.1.3",
+  "version": "17.1.5",
   "description": "Set of utilities to traverse, modify and create ADF documents.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -39,11 +39,11 @@
   },
   "devDependencies": {
     "@atlaskit/docs": "*",
-    "@atlaskit/json-schema-generator": "^3.2.0",
+    "@atlaskit/json-schema-generator": "^3.3.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "jscodeshift": "^0.13.0",
     "react": "^16.8.0",
-    "typescript": "4.3.5",
+    "typescript": "4.5.5",
     "wait-for-expect": "^1.2.0"
   },
   "techstack": {
@@ -53,7 +53,10 @@
       ]
     },
     "@repo/internal": {
-      "deprecation": "no-deprecated-imports"
+      "deprecation": "no-deprecated-imports",
+      "styling": [
+        "emotion"
+      ]
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"

package/report.api.md

@@ -1,7 +1,20 @@
+<!-- API Report Version: 2.2 -->
+
 ## API Report File for "@atlaskit/adf-utils"
 
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+> Do not edit this file. This report is auto-generated using [API Extractor](https://api-extractor.com/).
+> [Learn more about API reports](https://hello.atlassian.net/wiki/spaces/UR/pages/1825484529/Package+API+Reports)
+
+### Table of contents
+
+- [Main Entry Types](#main-entry-types)
+
+### Main Entry Types
+
+<!--SECTION START: Main Entry Types-->
 
 ```ts
-export {};
+// (No @packageDocumentation comment for this package)
 ```
+
+<!--SECTION END: Main Entry Types-->

package/scrub/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/scrub.js",
   "module:es2019": "../dist/es2019/scrub.js",
   "sideEffects": false,
-  "types": "../dist/types/scrub.d.ts"
+  "types": "../dist/types/scrub.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/scrub.d.ts"
+      ]
+    }
+  }
 }

package/transforms/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/transforms.js",
   "module:es2019": "../dist/es2019/transforms.js",
   "sideEffects": false,
-  "types": "../dist/types/transforms.d.ts"
+  "types": "../dist/types/transforms.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/transforms.d.ts"
+      ]
+    }
+  }
 }

package/traverse/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/traverse.js",
   "module:es2019": "../dist/es2019/traverse.js",
   "sideEffects": false,
-  "types": "../dist/types/traverse.d.ts"
+  "types": "../dist/types/traverse.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/traverse.d.ts"
+      ]
+    }
+  }
 }

package/types/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/types/index.js",
   "module:es2019": "../dist/es2019/types/index.js",
   "sideEffects": false,
-  "types": "../dist/types/types/index.d.ts"
+  "types": "../dist/types/types/index.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/types/index.d.ts"
+      ]
+    }
+  }
 }

package/validator/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/validator.js",
   "module:es2019": "../dist/es2019/validator.js",
   "sideEffects": false,
-  "types": "../dist/types/validator.d.ts"
+  "types": "../dist/types/validator.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/validator.d.ts"
+      ]
+    }
+  }
 }

package/validatorTypes/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/types/validatorTypes.js",
   "module:es2019": "../dist/es2019/types/validatorTypes.js",
   "sideEffects": false,
-  "types": "../dist/types/types/validatorTypes.d.ts"
+  "types": "../dist/types/types/validatorTypes.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.5": {
+      "*": [
+        "../dist/types-ts4.0/types/validatorTypes.d.ts"
+      ]
+    }
+  }
 }