@atlaskit/editor-json-transformer 8.13.0 → 8.13.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-json-transformer
 
+## 8.13.1
+
+### Patch Changes
+
+-   [#101524](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101524)
+    [`4821570088e6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4821570088e6) -
+    ED-23362 Bump ADF schema to version 36.8.1 and add support for adf validation and transformation
+
 ## 8.13.0
 
 ### Minor Changes

package/dist/cjs/sanitize/remove-marks.js

@@ -5,20 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removeMarks = removeMarks;
+exports.removeNonAnnotationMarks = removeNonAnnotationMarks;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function removeMarks(node) {
   var newNode = _objectSpread({}, node);
-
-  // Rolling this mark out to all nodes is expected to occur in FY24 Q4.
-  // see https://team.atlassian.com/project/ATLAS-54592 for details.
-  if (node.type === 'inlineCard' && node.marks) {
+  delete newNode.marks;
+  return newNode;
+}
+function removeNonAnnotationMarks(node) {
+  var newNode = _objectSpread({}, node);
+  if (node.marks) {
     newNode.marks = node.marks.filter(function (mark) {
       return mark.type === 'annotation';
     });
-    return newNode;
   }
-  delete newNode.marks;
   return newNode;
 }

package/dist/cjs/sanitize/sanitize-node.js

@@ -24,7 +24,7 @@ function sanitizeNode(json) {
     },
     status: function status(node) {
       if (node.attrs && !!node.attrs.text) {
-        return (0, _removeMarks.removeMarks)(node);
+        return (0, _removeMarks.removeNonAnnotationMarks)(node);
       }
       return false; // empty status
     },
@@ -34,11 +34,11 @@ function sanitizeNode(json) {
       }
       return false; // empty caption
     },
-    emoji: _removeMarks.removeMarks,
-    mention: _removeMarks.removeMarks,
-    date: _removeMarks.removeMarks,
+    emoji: _removeMarks.removeNonAnnotationMarks,
+    mention: _removeMarks.removeNonAnnotationMarks,
+    date: _removeMarks.removeNonAnnotationMarks,
     hardBreak: _removeMarks.removeMarks,
-    inlineCard: _removeMarks.removeMarks
+    inlineCard: _removeMarks.removeNonAnnotationMarks
   });
   return sanitizedJSON;
 }

package/dist/es2019/sanitize/remove-marks.js

@@ -2,13 +2,15 @@ export function removeMarks(node) {
   let newNode = {
     ...node
   };
-
-  // Rolling this mark out to all nodes is expected to occur in FY24 Q4.
-  // see https://team.atlassian.com/project/ATLAS-54592 for details.
-  if (node.type === 'inlineCard' && node.marks) {
+  delete newNode.marks;
+  return newNode;
+}
+export function removeNonAnnotationMarks(node) {
+  let newNode = {
+    ...node
+  };
+  if (node.marks) {
     newNode.marks = node.marks.filter(mark => mark.type === 'annotation');
-    return newNode;
   }
-  delete newNode.marks;
   return newNode;
 }

package/dist/es2019/sanitize/sanitize-node.js

@@ -1,5 +1,5 @@
 import { traverse } from '@atlaskit/adf-utils/traverse';
-import { removeMarks } from './remove-marks';
+import { removeMarks, removeNonAnnotationMarks } from './remove-marks';
 export function sanitizeNode(json) {
   const sanitizedJSON = traverse(json, {
     text: node => {
@@ -13,7 +13,7 @@ export function sanitizeNode(json) {
     },
     status: node => {
       if (node.attrs && !!node.attrs.text) {
-        return removeMarks(node);
+        return removeNonAnnotationMarks(node);
       }
       return false; // empty status
     },
@@ -23,11 +23,11 @@ export function sanitizeNode(json) {
       }
       return false; // empty caption
     },
-    emoji: removeMarks,
-    mention: removeMarks,
-    date: removeMarks,
+    emoji: removeNonAnnotationMarks,
+    mention: removeNonAnnotationMarks,
+    date: removeNonAnnotationMarks,
     hardBreak: removeMarks,
-    inlineCard: removeMarks
+    inlineCard: removeNonAnnotationMarks
   });
   return sanitizedJSON;
 }

package/dist/esm/sanitize/remove-marks.js

@@ -3,15 +3,15 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 export function removeMarks(node) {
   var newNode = _objectSpread({}, node);
-
-  // Rolling this mark out to all nodes is expected to occur in FY24 Q4.
-  // see https://team.atlassian.com/project/ATLAS-54592 for details.
-  if (node.type === 'inlineCard' && node.marks) {
+  delete newNode.marks;
+  return newNode;
+}
+export function removeNonAnnotationMarks(node) {
+  var newNode = _objectSpread({}, node);
+  if (node.marks) {
     newNode.marks = node.marks.filter(function (mark) {
       return mark.type === 'annotation';
     });
-    return newNode;
   }
-  delete newNode.marks;
   return newNode;
 }

package/dist/esm/sanitize/sanitize-node.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { traverse } from '@atlaskit/adf-utils/traverse';
-import { removeMarks } from './remove-marks';
+import { removeMarks, removeNonAnnotationMarks } from './remove-marks';
 export function sanitizeNode(json) {
   var sanitizedJSON = traverse(json, {
     text: function text(node) {
@@ -17,7 +17,7 @@ export function sanitizeNode(json) {
     },
     status: function status(node) {
       if (node.attrs && !!node.attrs.text) {
-        return removeMarks(node);
+        return removeNonAnnotationMarks(node);
       }
       return false; // empty status
     },
@@ -27,11 +27,11 @@ export function sanitizeNode(json) {
       }
       return false; // empty caption
     },
-    emoji: removeMarks,
-    mention: removeMarks,
-    date: removeMarks,
+    emoji: removeNonAnnotationMarks,
+    mention: removeNonAnnotationMarks,
+    date: removeNonAnnotationMarks,
     hardBreak: removeMarks,
-    inlineCard: removeMarks
+    inlineCard: removeNonAnnotationMarks
   });
   return sanitizedJSON;
 }

package/dist/types/sanitize/remove-marks.d.ts

@@ -6,3 +6,10 @@ export declare function removeMarks(node: JSONNode): {
     marks?: any[] | undefined;
     text?: string | undefined;
 };
+export declare function removeNonAnnotationMarks(node: JSONNode): {
+    type: string;
+    attrs?: object | undefined;
+    content?: (JSONNode | undefined)[] | undefined;
+    marks?: any[] | undefined;
+    text?: string | undefined;
+};

package/dist/types/sanitize/sanitize-node.d.ts

@@ -1,2 +1,2 @@
-import { JSONNode } from '../types';
+import { type JSONNode } from '../types';
 export declare function sanitizeNode(json: JSONNode): JSONNode;

package/dist/types-ts4.5/sanitize/remove-marks.d.ts

@@ -6,3 +6,10 @@ export declare function removeMarks(node: JSONNode): {
     marks?: any[] | undefined;
     text?: string | undefined;
 };
+export declare function removeNonAnnotationMarks(node: JSONNode): {
+    type: string;
+    attrs?: object | undefined;
+    content?: (JSONNode | undefined)[] | undefined;
+    marks?: any[] | undefined;
+    text?: string | undefined;
+};

package/dist/types-ts4.5/sanitize/sanitize-node.d.ts

@@ -1,2 +1,2 @@
-import { JSONNode } from '../types';
+import { type JSONNode } from '../types';
 export declare function sanitizeNode(json: JSONNode): JSONNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-json-transformer",
-  "version": "8.13.0",
+  "version": "8.13.1",
   "description": "JSON transformer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,14 +41,14 @@
     "./types": "./src/types.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^36.3.0",
+    "@atlaskit/adf-schema": "^36.8.0",
     "@atlaskit/adf-utils": "^19.2.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@babel/runtime": "^7.0.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@atlaskit/editor-plugin-highlight": "1.2.0",
+    "@atlaskit/editor-plugin-highlight": "1.4.1",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "react": "^16.8.0",
     "typescript": "~5.4.2"