@atlaskit/editor-json-transformer 8.8.2 → 8.8.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-json-transformer
 
+## 8.8.4
+
+### Patch Changes
+
+- [`2e01c9c74b5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2e01c9c74b5) - DUMMY remove before merging to master; dupe adf-schema via adf-utils
+- Updated dependencies
+
+## 8.8.3
+
+### Patch Changes
+
+- [`43cb4da169a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/43cb4da169a) - Refactored filterNull to use a for loop rather than reduce
+- [`3e03d26ca36`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3e03d26ca36) - [ESS-3031] Added the capability to parse ADF documents for the stage-0 schema
+- Updated dependencies
+
 ## 8.8.2
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -1,40 +1,36 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JSONTransformer = void 0;
-
+exports.SchemaStage = exports.JSONTransformer = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-
 var _adfSchema = require("@atlaskit/adf-schema");
-
 var _schemaDefault = require("@atlaskit/adf-schema/schema-default");
-
 var _markOverrideRules = require("./markOverrideRules");
-
 var _sanitizeNode = require("./sanitize/sanitize-node");
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof3(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof3(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof3(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 SchemaStage;
+exports.SchemaStage = SchemaStage;
+(function (SchemaStage) {
+  SchemaStage["FINAL"] = "final";
+  SchemaStage["STAGE_0"] = "stage0";
+})(SchemaStage || (exports.SchemaStage = SchemaStage = {}));
 var isType = function isType(type) {
   return function (node) {
     return node.type.name === type;
   };
 };
-
 var isCodeBlock = isType('codeBlock');
 var isMediaNode = isType('media');
 var isMediaInline = isType('mediaInline');
@@ -50,30 +46,26 @@ var isUnsupportedMark = isType('unsupportedMark');
 var isUnsupportedNodeAttributeMark = isType('unsupportedNodeAttribute');
 var isExpand = isType('expand');
 var isNestedExpand = isType('nestedExpand');
-
 var isUnsupportedNode = function isUnsupportedNode(node) {
   return isType('unsupportedBlock')(node) || isType('unsupportedInline')(node);
 };
-
 var isDataConsumer = isType('dataConsumer');
 var isFragmentMark = isType('fragment');
-
 var filterNull = function filterNull(subject) {
-  return Object.keys(subject).reduce(function (acc, key) {
-    var current = subject[key];
-
+  var output = _objectSpread({}, subject);
+  for (var key in output) {
+    var current = output[key];
     if (current === null) {
-      return acc;
-    }
-
-    if ((0, _typeof2.default)(current) === 'object' && !Array.isArray(current)) {
-      current = filterNull(current);
+      var _output = output,
+        unusedKey = _output[key],
+        filteredObj = (0, _objectWithoutProperties2.default)(_output, [key].map(_toPropertyKey));
+      output = filteredObj;
+    } else if ((0, _typeof2.default)(current) === 'object' && !Array.isArray(current)) {
+      output[key] = filterNull(current);
     }
-
-    return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, key, current));
-  }, {});
+  }
+  return output;
 };
-
 var createDocFromContent = function createDocFromContent(content) {
   return {
     version: 1,
@@ -81,17 +73,14 @@ var createDocFromContent = function createDocFromContent(content) {
     content: content || []
   };
 };
-
 var emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-
 var toJSON = function toJSON(node) {
   var obj = {
     type: node.type.name
   };
-
   if (isUnsupportedNode(node)) {
     return node.attrs.originalValue;
   } else if (isMediaNode(node)) {
@@ -115,11 +104,9 @@ var toJSON = function toJSON(node) {
   } else if (node.attrs && Object.keys(node.attrs).length) {
     obj.attrs = node.attrs;
   }
-
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
-
   if (node.isText) {
     obj.text = node.textContent;
   } else {
@@ -128,11 +115,9 @@ var toJSON = function toJSON(node) {
       obj.content.push(toJSON(child));
     });
   }
-
   if (isParagraph(node) || isHeading(node)) {
     obj.content = obj.content || [];
   }
-
   if (node.marks.length) {
     // Run any custom mark serialisers
     var parsedMarks = node.marks.map(function (mark) {
@@ -144,54 +129,44 @@ var toJSON = function toJSON(node) {
         return (0, _adfSchema.linkToJSON)(mark);
       } else if (isDataConsumer(mark)) {
         var _serialised$attrs$sou;
-
         var serialised = (0, _adfSchema.dataConsumerToJSON)(mark);
         return !serialised.attrs.sources || ((_serialised$attrs$sou = serialised.attrs.sources) === null || _serialised$attrs$sou === void 0 ? void 0 : _serialised$attrs$sou.length) === 0 ? null : serialised;
       } else if (isFragmentMark(mark)) {
         var fragmentMark = (0, _adfSchema.fragmentToJSON)(mark);
-
         if (!fragmentMark.attrs.localId) {
           return null;
         }
-
         return fragmentMark;
       } else {
         return mark.toJSON();
       }
     }).filter(function (maybeMark) {
       return maybeMark !== null;
-    }); // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
+    });
 
+    // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
     obj.marks = (parsedMarks === null || parsedMarks === void 0 ? void 0 : parsedMarks.length) > 0 ? parsedMarks : undefined;
     var nodeAttributeMark = node.marks.find(isUnsupportedNodeAttributeMark);
-
     if (nodeAttributeMark && nodeAttributeMark.attrs.type.nodeType === obj.type) {
       obj.attrs = _objectSpread({}, getUnwrappedNodeAttributes(node, nodeAttributeMark, obj));
     }
   }
-
   return obj;
 };
-
 var canOverrideMark = function canOverrideMark(mark, existingMarks) {
   if (existingMarks.some(function (e) {
     return mark.attrs.originalValue.type === e.type.name;
   })) {
     return (0, _markOverrideRules.markOverrideRuleFor)(mark.attrs.originalValue.type).canOverrideUnsupportedMark();
   }
-
   return false;
 };
-
 var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark, obj) {
   var nodeAttributes = node.type.spec.attrs;
-
   var attributes = _objectSpread(_objectSpread({}, mark.attrs.unsupported), obj.attrs);
-
   for (var key in obj.attrs) {
     if (obj.attrs.hasOwnProperty(key)) {
       var attribute = nodeAttributes ? nodeAttributes[key] : null;
-
       if (attribute) {
         if (attribute.default === node.attrs[key] && mark.attrs.unsupported[key]) {
           return _objectSpread(_objectSpread({}, attributes), {}, (0, _defineProperty2.default)({}, key, mark.attrs.unsupported[key]));
@@ -199,15 +174,12 @@ var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark,
       }
     }
   }
-
   return attributes;
 };
-
 var JSONTransformer = /*#__PURE__*/function () {
   function JSONTransformer() {
     (0, _classCallCheck2.default)(this, JSONTransformer);
   }
-
   (0, _createClass2.default)(JSONTransformer, [{
     key: "encode",
     value: function encode(node) {
@@ -215,38 +187,35 @@ var JSONTransformer = /*#__PURE__*/function () {
       node.content.forEach(function (child) {
         content.push((0, _sanitizeNode.sanitizeNode)(toJSON(child)));
       });
-
       if (!content || (0, _isEqual.default)(content, emptyDoc.content)) {
         return createDocFromContent([]);
       }
-
       return createDocFromContent(content);
     }
   }, {
     key: "internalParse",
     value: function internalParse(content) {
-      var doc = _schemaDefault.defaultSchema.nodeFromJSON(content);
-
+      var stage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SchemaStage.FINAL;
+      var schema = (0, _schemaDefault.getSchemaBasedOnStage)(stage);
+      var doc = schema.nodeFromJSON(content);
       doc.check();
       return doc;
     }
   }, {
     key: "parse",
-    value: function parse(content) {
+    value: function parse(content, stage) {
       if (content.type !== 'doc') {
         throw new Error('Expected content format to be ADF');
       }
-
       if (!content.content || content.content.length === 0) {
-        return this.internalParse(emptyDoc);
+        return this.internalParse(emptyDoc, stage);
       }
-
-      return this.internalParse(content);
+      return this.internalParse(content, stage);
     }
+
     /**
      * This method is used to encode a single node
      */
-
   }, {
     key: "encodeNode",
     value: function encodeNode(node) {
@@ -255,5 +224,4 @@ var JSONTransformer = /*#__PURE__*/function () {
   }]);
   return JSONTransformer;
 }();
-
 exports.JSONTransformer = JSONTransformer;

package/dist/cjs/markOverrideRules.js

@@ -14,7 +14,6 @@ var defaultDoNotAllowOverrideBehaviour = {
     return false;
   }
 };
-
 var markOverrideRuleFor = function markOverrideRuleFor(type) {
   switch (type) {
     case 'link':
@@ -30,10 +29,8 @@ var markOverrideRuleFor = function markOverrideRuleFor(type) {
     case 'alignment':
     case 'indentation':
       return defaultAllowOverrideBehaviour;
-
     default:
       return defaultDoNotAllowOverrideBehaviour;
   }
 };
-
 exports.markOverrideRuleFor = markOverrideRuleFor;

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

@@ -1,21 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removeMarks = removeMarks;
-
 var _defineProperty2 = _interopRequireDefault(require("@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) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function removeMarks(node) {
   var newNode = _objectSpread({}, node);
-
   delete newNode.marks;
   return newNode;
 }

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

@@ -1,29 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sanitizeNode = sanitizeNode;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _traverse = require("@atlaskit/adf-utils/traverse");
-
 var _removeMarks = require("./remove-marks");
-
 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; }
-
 function sanitizeNode(json) {
   var sanitizedJSON = (0, _traverse.traverse)(json, {
     text: function text(node) {
       if (!node || !Array.isArray(node.marks)) {
         return node;
       }
-
       return _objectSpread(_objectSpread({}, node), {}, {
         marks: node.marks.filter(function (mark) {
           return mark.type !== 'typeAheadQuery';
@@ -34,16 +26,16 @@ function sanitizeNode(json) {
       if (node.attrs && !!node.attrs.text) {
         return (0, _removeMarks.removeMarks)(node);
       }
-
       return false; // empty status
     },
+
     caption: function caption(node) {
       if (node.content) {
         return node;
       }
-
       return false; // empty caption
     },
+
     emoji: _removeMarks.removeMarks,
     mention: _removeMarks.removeMarks,
     date: _removeMarks.removeMarks,

package/dist/cjs/sanitize.js

@@ -15,7 +15,5 @@ Object.defineProperty(exports, "sanitizeNode", {
     return _sanitizeNode.sanitizeNode;
   }
 });
-
 var _sanitizeNode = require("./sanitize/sanitize-node");
-
 var _removeMarks = require("./sanitize/remove-marks");

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.8.2",
+	"version": "8.8.4",
 	"sideEffects": false
 }

package/dist/es2019/index.js

@@ -1,11 +1,14 @@
 import isEqual from 'lodash/isEqual';
 import { codeBlockToJSON, dataConsumerToJSON, expandToJSON, fragmentToJSON, linkToJSON, mediaSingleToJSON, mediaToJSON, mentionToJSON, tableToJSON, toJSONTableCell, toJSONTableHeader } from '@atlaskit/adf-schema';
-import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
+import { getSchemaBasedOnStage } from '@atlaskit/adf-schema/schema-default';
 import { markOverrideRuleFor } from './markOverrideRules';
 import { sanitizeNode } from './sanitize/sanitize-node';
-
+export let SchemaStage;
+(function (SchemaStage) {
+  SchemaStage["FINAL"] = "final";
+  SchemaStage["STAGE_0"] = "stage0";
+})(SchemaStage || (SchemaStage = {}));
 const isType = type => node => node.type.name === type;
-
 const isCodeBlock = isType('codeBlock');
 const isMediaNode = isType('media');
 const isMediaInline = isType('mediaInline');
@@ -21,30 +24,27 @@ const isUnsupportedMark = isType('unsupportedMark');
 const isUnsupportedNodeAttributeMark = isType('unsupportedNodeAttribute');
 const isExpand = isType('expand');
 const isNestedExpand = isType('nestedExpand');
-
 const isUnsupportedNode = node => isType('unsupportedBlock')(node) || isType('unsupportedInline')(node);
-
 const isDataConsumer = isType('dataConsumer');
 const isFragmentMark = isType('fragment');
-
 const filterNull = subject => {
-  return Object.keys(subject).reduce((acc, key) => {
-    let current = subject[key];
-
+  let output = {
+    ...subject
+  };
+  for (const key in output) {
+    const current = output[key];
     if (current === null) {
-      return acc;
-    }
-
-    if (typeof current === 'object' && !Array.isArray(current)) {
-      current = filterNull(current);
+      const {
+        [key]: unusedKey,
+        ...filteredObj
+      } = output;
+      output = filteredObj;
+    } else if (typeof current === 'object' && !Array.isArray(current)) {
+      output[key] = filterNull(current);
     }
-
-    return { ...acc,
-      [key]: current
-    };
-  }, {});
+  }
+  return output;
 };
-
 const createDocFromContent = content => {
   return {
     version: 1,
@@ -52,17 +52,14 @@ const createDocFromContent = content => {
     content: content || []
   };
 };
-
 const emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-
 const toJSON = node => {
   const obj = {
     type: node.type.name
   };
-
   if (isUnsupportedNode(node)) {
     return node.attrs.originalValue;
   } else if (isMediaNode(node)) {
@@ -86,11 +83,9 @@ const toJSON = node => {
   } else if (node.attrs && Object.keys(node.attrs).length) {
     obj.attrs = node.attrs;
   }
-
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
-
   if (node.isText) {
     obj.text = node.textContent;
   } else {
@@ -99,11 +94,9 @@ const toJSON = node => {
       obj.content.push(toJSON(child));
     });
   }
-
   if (isParagraph(node) || isHeading(node)) {
     obj.content = obj.content || [];
   }
-
   if (node.marks.length) {
     // Run any custom mark serialisers
     const parsedMarks = node.marks.map(mark => {
@@ -115,103 +108,88 @@ const toJSON = node => {
         return linkToJSON(mark);
       } else if (isDataConsumer(mark)) {
         var _serialised$attrs$sou;
-
         const serialised = dataConsumerToJSON(mark);
         return !serialised.attrs.sources || ((_serialised$attrs$sou = serialised.attrs.sources) === null || _serialised$attrs$sou === void 0 ? void 0 : _serialised$attrs$sou.length) === 0 ? null : serialised;
       } else if (isFragmentMark(mark)) {
         const fragmentMark = fragmentToJSON(mark);
-
         if (!fragmentMark.attrs.localId) {
           return null;
         }
-
         return fragmentMark;
       } else {
         return mark.toJSON();
       }
-    }).filter(maybeMark => maybeMark !== null); // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
+    }).filter(maybeMark => maybeMark !== null);
 
+    // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
     obj.marks = (parsedMarks === null || parsedMarks === void 0 ? void 0 : parsedMarks.length) > 0 ? parsedMarks : undefined;
     const nodeAttributeMark = node.marks.find(isUnsupportedNodeAttributeMark);
-
     if (nodeAttributeMark && nodeAttributeMark.attrs.type.nodeType === obj.type) {
-      obj.attrs = { ...getUnwrappedNodeAttributes(node, nodeAttributeMark, obj)
+      obj.attrs = {
+        ...getUnwrappedNodeAttributes(node, nodeAttributeMark, obj)
       };
     }
   }
-
   return obj;
 };
-
 const canOverrideMark = (mark, existingMarks) => {
   if (existingMarks.some(e => mark.attrs.originalValue.type === e.type.name)) {
     return markOverrideRuleFor(mark.attrs.originalValue.type).canOverrideUnsupportedMark();
   }
-
   return false;
 };
-
 const getUnwrappedNodeAttributes = (node, mark, obj) => {
   const nodeAttributes = node.type.spec.attrs;
-  const attributes = { ...mark.attrs.unsupported,
+  const attributes = {
+    ...mark.attrs.unsupported,
     ...obj.attrs
   };
-
   for (var key in obj.attrs) {
     if (obj.attrs.hasOwnProperty(key)) {
       const attribute = nodeAttributes ? nodeAttributes[key] : null;
-
       if (attribute) {
         if (attribute.default === node.attrs[key] && mark.attrs.unsupported[key]) {
-          return { ...attributes,
+          return {
+            ...attributes,
             [key]: mark.attrs.unsupported[key]
           };
         }
       }
     }
   }
-
   return attributes;
 };
-
 export class JSONTransformer {
   encode(node) {
     const content = [];
     node.content.forEach(child => {
       content.push(sanitizeNode(toJSON(child)));
     });
-
     if (!content || isEqual(content, emptyDoc.content)) {
       return createDocFromContent([]);
     }
-
     return createDocFromContent(content);
   }
-
-  internalParse(content) {
-    const doc = defaultSchema.nodeFromJSON(content);
+  internalParse(content, stage = SchemaStage.FINAL) {
+    const schema = getSchemaBasedOnStage(stage);
+    const doc = schema.nodeFromJSON(content);
     doc.check();
     return doc;
   }
-
-  parse(content) {
+  parse(content, stage) {
     if (content.type !== 'doc') {
       throw new Error('Expected content format to be ADF');
     }
-
     if (!content.content || content.content.length === 0) {
-      return this.internalParse(emptyDoc);
+      return this.internalParse(emptyDoc, stage);
     }
-
-    return this.internalParse(content);
+    return this.internalParse(content, stage);
   }
+
   /**
    * This method is used to encode a single node
    */
-
-
   encodeNode(node) {
     return sanitizeNode(toJSON(node));
   }
-
 }

package/dist/es2019/markOverrideRules.js

@@ -23,7 +23,6 @@ export const markOverrideRuleFor = type => {
     case 'alignment':
     case 'indentation':
       return defaultAllowOverrideBehaviour;
-
     default:
       return defaultDoNotAllowOverrideBehaviour;
   }

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

@@ -1,5 +1,6 @@
 export function removeMarks(node) {
-  let newNode = { ...node
+  let newNode = {
+    ...node
   };
   delete newNode.marks;
   return newNode;

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

@@ -6,8 +6,8 @@ export function sanitizeNode(json) {
       if (!node || !Array.isArray(node.marks)) {
         return node;
       }
-
-      return { ...node,
+      return {
+        ...node,
         marks: node.marks.filter(mark => mark.type !== 'typeAheadQuery')
       };
     },
@@ -15,16 +15,16 @@ export function sanitizeNode(json) {
       if (node.attrs && !!node.attrs.text) {
         return removeMarks(node);
       }
-
       return false; // empty status
     },
+
     caption: node => {
       if (node.content) {
         return node;
       }
-
       return false; // empty caption
     },
+
     emoji: removeMarks,
     mention: removeMarks,
     date: removeMarks,

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.8.2",
+	"version": "8.8.4",
 	"sideEffects": false
 }

package/dist/esm/index.js

@@ -1,24 +1,27 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
-
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 isEqual from 'lodash/isEqual';
 import { codeBlockToJSON, dataConsumerToJSON, expandToJSON, fragmentToJSON, linkToJSON, mediaSingleToJSON, mediaToJSON, mentionToJSON, tableToJSON, toJSONTableCell, toJSONTableHeader } from '@atlaskit/adf-schema';
-import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
+import { getSchemaBasedOnStage } from '@atlaskit/adf-schema/schema-default';
 import { markOverrideRuleFor } from './markOverrideRules';
 import { sanitizeNode } from './sanitize/sanitize-node';
-
+export var SchemaStage;
+(function (SchemaStage) {
+  SchemaStage["FINAL"] = "final";
+  SchemaStage["STAGE_0"] = "stage0";
+})(SchemaStage || (SchemaStage = {}));
 var isType = function isType(type) {
   return function (node) {
     return node.type.name === type;
   };
 };
-
 var isCodeBlock = isType('codeBlock');
 var isMediaNode = isType('media');
 var isMediaInline = isType('mediaInline');
@@ -34,30 +37,26 @@ var isUnsupportedMark = isType('unsupportedMark');
 var isUnsupportedNodeAttributeMark = isType('unsupportedNodeAttribute');
 var isExpand = isType('expand');
 var isNestedExpand = isType('nestedExpand');
-
 var isUnsupportedNode = function isUnsupportedNode(node) {
   return isType('unsupportedBlock')(node) || isType('unsupportedInline')(node);
 };
-
 var isDataConsumer = isType('dataConsumer');
 var isFragmentMark = isType('fragment');
-
 var filterNull = function filterNull(subject) {
-  return Object.keys(subject).reduce(function (acc, key) {
-    var current = subject[key];
-
+  var output = _objectSpread({}, subject);
+  for (var key in output) {
+    var current = output[key];
     if (current === null) {
-      return acc;
+      var _output = output,
+        unusedKey = _output[key],
+        filteredObj = _objectWithoutProperties(_output, [key].map(_toPropertyKey));
+      output = filteredObj;
+    } else if (_typeof(current) === 'object' && !Array.isArray(current)) {
+      output[key] = filterNull(current);
     }
-
-    if (_typeof(current) === 'object' && !Array.isArray(current)) {
-      current = filterNull(current);
-    }
-
-    return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, current));
-  }, {});
+  }
+  return output;
 };
-
 var createDocFromContent = function createDocFromContent(content) {
   return {
     version: 1,
@@ -65,17 +64,14 @@ var createDocFromContent = function createDocFromContent(content) {
     content: content || []
   };
 };
-
 var emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-
 var toJSON = function toJSON(node) {
   var obj = {
     type: node.type.name
   };
-
   if (isUnsupportedNode(node)) {
     return node.attrs.originalValue;
   } else if (isMediaNode(node)) {
@@ -99,11 +95,9 @@ var toJSON = function toJSON(node) {
   } else if (node.attrs && Object.keys(node.attrs).length) {
     obj.attrs = node.attrs;
   }
-
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
-
   if (node.isText) {
     obj.text = node.textContent;
   } else {
@@ -112,11 +106,9 @@ var toJSON = function toJSON(node) {
       obj.content.push(toJSON(child));
     });
   }
-
   if (isParagraph(node) || isHeading(node)) {
     obj.content = obj.content || [];
   }
-
   if (node.marks.length) {
     // Run any custom mark serialisers
     var parsedMarks = node.marks.map(function (mark) {
@@ -128,54 +120,44 @@ var toJSON = function toJSON(node) {
         return linkToJSON(mark);
       } else if (isDataConsumer(mark)) {
         var _serialised$attrs$sou;
-
         var serialised = dataConsumerToJSON(mark);
         return !serialised.attrs.sources || ((_serialised$attrs$sou = serialised.attrs.sources) === null || _serialised$attrs$sou === void 0 ? void 0 : _serialised$attrs$sou.length) === 0 ? null : serialised;
       } else if (isFragmentMark(mark)) {
         var fragmentMark = fragmentToJSON(mark);
-
         if (!fragmentMark.attrs.localId) {
           return null;
         }
-
         return fragmentMark;
       } else {
         return mark.toJSON();
       }
     }).filter(function (maybeMark) {
       return maybeMark !== null;
-    }); // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
+    });
 
+    // Only set if we have a non-empty array, otherwise explicitly undefine it (as we only run this path if `node.marks.length`)
     obj.marks = (parsedMarks === null || parsedMarks === void 0 ? void 0 : parsedMarks.length) > 0 ? parsedMarks : undefined;
     var nodeAttributeMark = node.marks.find(isUnsupportedNodeAttributeMark);
-
     if (nodeAttributeMark && nodeAttributeMark.attrs.type.nodeType === obj.type) {
       obj.attrs = _objectSpread({}, getUnwrappedNodeAttributes(node, nodeAttributeMark, obj));
     }
   }
-
   return obj;
 };
-
 var canOverrideMark = function canOverrideMark(mark, existingMarks) {
   if (existingMarks.some(function (e) {
     return mark.attrs.originalValue.type === e.type.name;
   })) {
     return markOverrideRuleFor(mark.attrs.originalValue.type).canOverrideUnsupportedMark();
   }
-
   return false;
 };
-
 var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark, obj) {
   var nodeAttributes = node.type.spec.attrs;
-
   var attributes = _objectSpread(_objectSpread({}, mark.attrs.unsupported), obj.attrs);
-
   for (var key in obj.attrs) {
     if (obj.attrs.hasOwnProperty(key)) {
       var attribute = nodeAttributes ? nodeAttributes[key] : null;
-
       if (attribute) {
         if (attribute.default === node.attrs[key] && mark.attrs.unsupported[key]) {
           return _objectSpread(_objectSpread({}, attributes), {}, _defineProperty({}, key, mark.attrs.unsupported[key]));
@@ -183,15 +165,12 @@ var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark,
       }
     }
   }
-
   return attributes;
 };
-
 export var JSONTransformer = /*#__PURE__*/function () {
   function JSONTransformer() {
     _classCallCheck(this, JSONTransformer);
   }
-
   _createClass(JSONTransformer, [{
     key: "encode",
     value: function encode(node) {
@@ -199,43 +178,40 @@ export var JSONTransformer = /*#__PURE__*/function () {
       node.content.forEach(function (child) {
         content.push(sanitizeNode(toJSON(child)));
       });
-
       if (!content || isEqual(content, emptyDoc.content)) {
         return createDocFromContent([]);
       }
-
       return createDocFromContent(content);
     }
   }, {
     key: "internalParse",
     value: function internalParse(content) {
-      var doc = defaultSchema.nodeFromJSON(content);
+      var stage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SchemaStage.FINAL;
+      var schema = getSchemaBasedOnStage(stage);
+      var doc = schema.nodeFromJSON(content);
       doc.check();
       return doc;
     }
   }, {
     key: "parse",
-    value: function parse(content) {
+    value: function parse(content, stage) {
       if (content.type !== 'doc') {
         throw new Error('Expected content format to be ADF');
       }
-
       if (!content.content || content.content.length === 0) {
-        return this.internalParse(emptyDoc);
+        return this.internalParse(emptyDoc, stage);
       }
-
-      return this.internalParse(content);
+      return this.internalParse(content, stage);
     }
+
     /**
      * This method is used to encode a single node
      */
-
   }, {
     key: "encodeNode",
     value: function encodeNode(node) {
       return sanitizeNode(toJSON(node));
     }
   }]);
-
   return JSONTransformer;
 }();

package/dist/esm/markOverrideRules.js

@@ -23,7 +23,6 @@ export var markOverrideRuleFor = function markOverrideRuleFor(type) {
     case 'alignment':
     case 'indentation':
       return defaultAllowOverrideBehaviour;
-
     default:
       return defaultDoNotAllowOverrideBehaviour;
   }

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

@@ -1,12 +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); 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; }
-
 export function removeMarks(node) {
   var newNode = _objectSpread({}, node);
-
   delete newNode.marks;
   return newNode;
 }

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

@@ -1,9 +1,6 @@
 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 '@atlaskit/adf-utils/traverse';
 import { removeMarks } from './remove-marks';
 export function sanitizeNode(json) {
@@ -12,7 +9,6 @@ export function sanitizeNode(json) {
       if (!node || !Array.isArray(node.marks)) {
         return node;
       }
-
       return _objectSpread(_objectSpread({}, node), {}, {
         marks: node.marks.filter(function (mark) {
           return mark.type !== 'typeAheadQuery';
@@ -23,16 +19,16 @@ export function sanitizeNode(json) {
       if (node.attrs && !!node.attrs.text) {
         return removeMarks(node);
       }
-
       return false; // empty status
     },
+
     caption: function caption(node) {
       if (node.content) {
         return node;
       }
-
       return false; // empty caption
     },
+
     emoji: removeMarks,
     mention: removeMarks,
     date: removeMarks,

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.8.2",
+	"version": "8.8.4",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -5,10 +5,14 @@ interface Transformer<T> {
     encode(node: PMNode): T;
     parse(content: T): PMNode;
 }
+export declare enum SchemaStage {
+    FINAL = "final",
+    STAGE_0 = "stage0"
+}
 export declare class JSONTransformer implements Transformer<JSONDocNode> {
     encode(node: PMNode): JSONDocNode;
     private internalParse;
-    parse(content: JSONDocNode): PMNode;
+    parse(content: JSONDocNode, stage?: SchemaStage): PMNode;
     /**
      * This method is used to encode a single node
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-json-transformer",
-  "version": "8.8.2",
+  "version": "8.8.4",
   "description": "JSON transformer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -12,14 +12,6 @@
   "module": "dist/esm/index.js",
   "module:es2019": "dist/es2019/index.js",
   "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.0 <4.5": {
-      "*": [
-        "dist/types-ts4.0/*",
-        "dist/types-ts4.0/index.d.ts"
-      ]
-    }
-  },
   "sideEffects": false,
   "atlaskit:src": "src/index.ts",
   "atlassian": {
@@ -37,29 +29,28 @@
     "./types": "./src/types.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^24.0.0",
-    "@atlaskit/adf-utils": "^17.1.0",
+    "@atlaskit/adf-schema": "^25.5.0",
+    "@atlaskit/adf-utils": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "lodash": "^4.17.21",
     "prosemirror-model": "1.14.3"
   },
   "devDependencies": {
     "@atlaskit/docs": "*",
-    "@atlaskit/editor-bitbucket-transformer": "^7.2.0",
-    "@atlaskit/editor-common": "^70.2.0",
+    "@atlaskit/editor-bitbucket-transformer": "^8.0.0",
+    "@atlaskit/editor-common": "^72.8.0",
     "@atlaskit/editor-confluence-transformer": "^8.1.0",
-    "@atlaskit/editor-core": "^175.0.0",
+    "@atlaskit/editor-core": "^182.1.0",
     "@atlaskit/editor-jira-transformer": "^8.2.0",
-    "@atlaskit/editor-markdown-transformer": "^4.1.0",
-    "@atlaskit/editor-test-helpers": "^17.2.0",
+    "@atlaskit/editor-markdown-transformer": "^5.0.0",
+    "@atlaskit/editor-test-helpers": "^18.2.0",
     "@atlaskit/editor-wikimarkup-transformer": "^11.1.0",
-    "@atlaskit/util-data-test": "^17.5.0",
+    "@atlaskit/util-data-test": "^17.7.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@emotion/react": "^11.7.1",
     "@types/prosemirror-model": "^1.11.0",
     "prosemirror-view": "1.23.2",
     "react": "^16.8.0",
-    "styled-components": "^3.2.6",
     "typescript": "4.5.5"
   },
   "techstack": {
@@ -68,7 +59,9 @@
     },
     "@repo/internal": {
       "deprecation": "no-deprecated-imports",
-      "theming": "tokens",
+      "design-tokens": [
+        "color"
+      ],
       "styling": [
         "emotion"
       ]

package/report.api.md

@@ -1,12 +1,18 @@
+<!-- API Report Version: 2.3 -->
+
 ## API Report File for "@atlaskit/editor-json-transformer"
 
-> 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
 
-<!--
-	Generated API Report version: 2.0
--->
+- [Main Entry Types](#main-entry-types)
+- [Peer Dependencies](#peer-dependencies)
 
-[Learn more about API reports](https://hello.atlassian.net/wiki/spaces/UR/pages/1825484529/Package+API+Reports)
+### Main Entry Types
+
+<!--SECTION START: Main Entry Types-->
 
 ```ts
 import { Node as Node_2 } from 'prosemirror-model';
@@ -33,7 +39,15 @@ export class JSONTransformer implements Transformer_2<JSONDocNode> {
   encode(node: Node_2): JSONDocNode;
   encodeNode(node: Node_2): JSONNode;
   // (undocumented)
-  parse(content: JSONDocNode): Node_2;
+  parse(content: JSONDocNode, stage?: SchemaStage): Node_2;
+}
+
+// @public (undocumented)
+export enum SchemaStage {
+  // (undocumented)
+  FINAL = 'final',
+  // (undocumented)
+  STAGE_0 = 'stage0',
 }
 
 // @public (undocumented)
@@ -46,3 +60,15 @@ interface Transformer_2<T> {
 
 // (No @packageDocumentation comment for this package)
 ```
+
+<!--SECTION END: Main Entry Types-->
+
+### Peer Dependencies
+
+<!--SECTION START: Peer Dependencies-->
+
+```json
+{}
+```
+
+<!--SECTION END: Peer Dependencies-->

package/dist/types-ts4.0/index.d.ts

@@ -1,16 +0,0 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { JSONDocNode, JSONNode } from './types';
-export type { JSONDocNode, JSONNode } from './types';
-interface Transformer<T> {
-    encode(node: PMNode): T;
-    parse(content: T): PMNode;
-}
-export declare class JSONTransformer implements Transformer<JSONDocNode> {
-    encode(node: PMNode): JSONDocNode;
-    private internalParse;
-    parse(content: JSONDocNode): PMNode;
-    /**
-     * This method is used to encode a single node
-     */
-    encodeNode(node: PMNode): JSONNode;
-}

package/dist/types-ts4.0/markOverrideRules.d.ts

@@ -1,13 +0,0 @@
-interface MarkJson {
-    type: string;
-    attrs: {
-        [key: string]: any;
-    };
-}
-declare type CanOverrideUnsupportedMark = (markJson?: MarkJson) => boolean;
-interface MarkOverrideRule {
-    canOverrideUnsupportedMark: CanOverrideUnsupportedMark;
-}
-declare type MarkOverrideRules = (type: string) => MarkOverrideRule;
-export declare const markOverrideRuleFor: MarkOverrideRules;
-export {};

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

@@ -1,8 +0,0 @@
-import { JSONNode } from '../index';
-export declare function removeMarks(node: JSONNode): {
-    type: string;
-    attrs?: object | undefined;
-    content?: (JSONNode | undefined)[] | undefined;
-    marks?: any[] | undefined;
-    text?: string | undefined;
-};

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

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

package/dist/types-ts4.0/sanitize.d.ts

@@ -1,2 +0,0 @@
-export { sanitizeNode } from './sanitize/sanitize-node';
-export { removeMarks } from './sanitize/remove-marks';

package/dist/types-ts4.0/types.d.ts

@@ -1,12 +0,0 @@
-export declare type JSONNode = {
-    type: string;
-    attrs?: object;
-    content?: Array<JSONNode | undefined>;
-    marks?: any[];
-    text?: string;
-};
-export declare type JSONDocNode = {
-    version: number;
-    type: 'doc';
-    content: JSONNode[];
-};