@atlaskit/adf-utils 15.0.0 → 16.0.0

package/CHANGELOG.md

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

package/dist/cjs/index.js

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

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

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

package/dist/cjs/validator/rules.js

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

package/dist/cjs/version.json

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

package/dist/es2019/index.js

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

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

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

package/dist/es2019/validator/rules.js

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

package/dist/es2019/version.json

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

package/dist/esm/index.js

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

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

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

package/dist/esm/validator/rules.js

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

package/dist/esm/version.json

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

package/dist/types/index.d.ts

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

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

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

package/media-link-transform/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-utils",
-  "version": "15.0.0",
+  "version": "16.0.0",
   "description": "Set of utilities to traverse, modify and create ADF documents.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -24,7 +24,7 @@
     "generate:spec": "rm -rf ./src/validator/specs/ && ../json-schema-generator/bin.js --outDir=./src/validator/specs/ --mode=Spec --stage=0 ./src/validator/entry.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^21.0.0",
+    "@atlaskit/adf-schema": "^22.0.0",
     "@babel/runtime": "^7.0.0"
   },
   "devDependencies": {