@atlaskit/editor-json-transformer 8.20.2 → 8.20.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-json-transformer
 
+## 8.20.4
+
+### Patch Changes
+
+- [`9a4a3df453d84`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9a4a3df453d84) -
+  Updated the JSONTransformer to support using an mention mapping. During the encoding of mentions
+  the text names can be pulled from the mention map and encoded.
+- Updated dependencies
+
+## 8.20.3
+
+### Patch Changes
+
+- [#159176](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159176)
+  [`8f1d77592a9dc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8f1d77592a9dc) -
+  Bump adf-schema to 44.2.0
+
 ## 8.20.2
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -5,8 +5,7 @@
         "target": "es5",
         "composite": true,
         "outDir": "../dist",
-        "rootDir": "../",
-        "baseUrl": "../"
+        "rootDir": "../"
     },
     "include": [
         "../src/**/*.ts",

package/afm-jira/tsconfig.json

@@ -1,24 +1,24 @@
 {
-  "extends": "../../../../tsconfig.entry-points.jira.json",
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "outDir": "../../../../../tsDist/@atlaskit__editor-json-transformer/app",
-    "composite": true,
-    "rootDir": "../"
-  },
-  "include": [
-    "../src/**/*.ts",
-    "../src/**/*.tsx"
-  ],
-  "exclude": [
-    "../src/**/__tests__/*",
-    "../src/**/*.test.*",
-    "../src/**/test.*"
-  ],
-  "references": [
-    {
-      "path": "../../adf-utils/afm-jira/tsconfig.json"
-    }
-  ]
-}
+	"extends": "../../../../tsconfig.entry-points.jira.json",
+	"compilerOptions": {
+		"declaration": true,
+		"target": "es5",
+		"outDir": "../../../../../tsDist/@atlaskit__editor-json-transformer/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*"
+	],
+	"references": [
+		{
+			"path": "../../adf-utils/afm-jira/tsconfig.json"
+		}
+	]
+}

package/afm-post-office/tsconfig.json

@@ -1,24 +1,24 @@
 {
-  "extends": "../../../../tsconfig.entry-points.post-office.json",
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "outDir": "../../../../../tsDist/@atlaskit__editor-json-transformer/app",
-    "composite": true,
-    "rootDir": "../"
-  },
-  "include": [
-    "../src/**/*.ts",
-    "../src/**/*.tsx"
-  ],
-  "exclude": [
-    "../src/**/__tests__/*",
-    "../src/**/*.test.*",
-    "../src/**/test.*"
-  ],
-  "references": [
-    {
-      "path": "../../adf-utils/afm-post-office/tsconfig.json"
-    }
-  ]
-}
+	"extends": "../../../../tsconfig.entry-points.post-office.json",
+	"compilerOptions": {
+		"declaration": true,
+		"target": "es5",
+		"outDir": "../../../../../tsDist/@atlaskit__editor-json-transformer/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*"
+	],
+	"references": [
+		{
+			"path": "../../adf-utils/afm-post-office/tsconfig.json"
+		}
+	]
+}

package/dist/cjs/index.js

@@ -50,6 +50,7 @@ var isUnsupportedNode = function isUnsupportedNode(node) {
 };
 var isDataConsumer = isType('dataConsumer');
 var isFragmentMark = isType('fragment');
+var isHardBreak = isType('hardBreak');
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var filterNull = function filterNull(subject) {
@@ -78,7 +79,7 @@ var emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-var toJSON = function toJSON(node) {
+var toJSON = function toJSON(node, mentionMap) {
   var obj = {
     type: node.type.name
   };
@@ -108,17 +109,33 @@ var toJSON = function toJSON(node) {
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
+  if (isMentionNode(node) && mentionMap) {
+    var _text, _obj$attrs;
+    // If the mentionMap exists and has a name defined then we should use it and prepend @ to the begining of it.
+    var name = !!(mentionMap !== null && mentionMap !== void 0 && mentionMap[node.attrs.id]) ? "@".concat(mentionMap[node.attrs.id]) : '';
+    var text = (_text = (_obj$attrs = obj.attrs) === null || _obj$attrs === void 0 ? void 0 : _obj$attrs.text) !== null && _text !== void 0 ? _text : '';
+    obj.attrs = _objectSpread(_objectSpread({}, obj.attrs), {}, {
+      // If an explicit text value is set on the mention then that should take priority over the mentionMap value.
+      text: !!text ? text : name
+    });
+  }
 
   // Remove the attrs property if it's empty, this is currently limited to paragraph nodes.
   if (isParagraph(node) && obj.attrs && !Object.keys(obj.attrs).length) {
     delete obj.attrs;
   }
+
+  // Hard break has optional attr.text which was added for PM <-> ADF compatibility.
+  // No need to preserve it.
+  if (isHardBreak(node)) {
+    delete obj.attrs;
+  }
   if (node.isText) {
     obj.text = node.textContent;
   } else {
     node.content.forEach(function (child) {
       obj.content = obj.content || [];
-      obj.content.push(toJSON(child));
+      obj.content.push(toJSON(child, mentionMap));
     });
   }
   if (isParagraph(node) || isHeading(node)) {
@@ -183,17 +200,25 @@ var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark,
   return attributes;
 };
 var JSONTransformer = exports.JSONTransformer = /*#__PURE__*/function () {
+  /**
+   * @param schema The current editor schema
+   * @param mentionMap An optional mapping of user IDs to mention names. This is used by the encoder to substitute empty
+   * mention node.attr.text values with mapped names.
+   */
   function JSONTransformer() {
     var schema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _schemaDefault.defaultSchema;
+    var mentionMap = arguments.length > 1 ? arguments[1] : undefined;
     (0, _classCallCheck2.default)(this, JSONTransformer);
     this.schema = schema;
+    this.mentionMap = mentionMap;
   }
   (0, _createClass2.default)(JSONTransformer, [{
     key: "encode",
     value: function encode(node) {
+      var _this = this;
       var content = [];
       node.content.forEach(function (child) {
-        content.push((0, _sanitizeNode.sanitizeNode)(toJSON(child)));
+        content.push((0, _sanitizeNode.sanitizeNode)(toJSON(child, _this.mentionMap)));
       });
       if (!content || (0, _isEqual.default)(content, emptyDoc.content)) {
         return createDocFromContent([]);
@@ -226,7 +251,7 @@ var JSONTransformer = exports.JSONTransformer = /*#__PURE__*/function () {
   }, {
     key: "encodeNode",
     value: function encodeNode(node) {
-      return (0, _sanitizeNode.sanitizeNode)(toJSON(node));
+      return (0, _sanitizeNode.sanitizeNode)(toJSON(node, this.mentionMap));
     }
   }]);
   return JSONTransformer;

package/dist/es2019/index.js

@@ -27,6 +27,7 @@ const isNestedExpand = isType('nestedExpand');
 const isUnsupportedNode = node => isType('unsupportedBlock')(node) || isType('unsupportedInline')(node);
 const isDataConsumer = isType('dataConsumer');
 const isFragmentMark = isType('fragment');
+const isHardBreak = isType('hardBreak');
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const filterNull = subject => {
@@ -58,7 +59,7 @@ const emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-const toJSON = node => {
+const toJSON = (node, mentionMap) => {
   const obj = {
     type: node.type.name
   };
@@ -88,17 +89,34 @@ const toJSON = node => {
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
+  if (isMentionNode(node) && mentionMap) {
+    var _text, _obj$attrs;
+    // If the mentionMap exists and has a name defined then we should use it and prepend @ to the begining of it.
+    const name = !!(mentionMap !== null && mentionMap !== void 0 && mentionMap[node.attrs.id]) ? `@${mentionMap[node.attrs.id]}` : '';
+    const text = (_text = (_obj$attrs = obj.attrs) === null || _obj$attrs === void 0 ? void 0 : _obj$attrs.text) !== null && _text !== void 0 ? _text : '';
+    obj.attrs = {
+      ...obj.attrs,
+      // If an explicit text value is set on the mention then that should take priority over the mentionMap value.
+      text: !!text ? text : name
+    };
+  }
 
   // Remove the attrs property if it's empty, this is currently limited to paragraph nodes.
   if (isParagraph(node) && obj.attrs && !Object.keys(obj.attrs).length) {
     delete obj.attrs;
   }
+
+  // Hard break has optional attr.text which was added for PM <-> ADF compatibility.
+  // No need to preserve it.
+  if (isHardBreak(node)) {
+    delete obj.attrs;
+  }
   if (node.isText) {
     obj.text = node.textContent;
   } else {
     node.content.forEach(child => {
       obj.content = obj.content || [];
-      obj.content.push(toJSON(child));
+      obj.content.push(toJSON(child, mentionMap));
     });
   }
   if (isParagraph(node) || isHeading(node)) {
@@ -167,13 +185,19 @@ const getUnwrappedNodeAttributes = (node, mark, obj) => {
   return attributes;
 };
 export class JSONTransformer {
-  constructor(schema = defaultSchema) {
+  /**
+   * @param schema The current editor schema
+   * @param mentionMap An optional mapping of user IDs to mention names. This is used by the encoder to substitute empty
+   * mention node.attr.text values with mapped names.
+   */
+  constructor(schema = defaultSchema, mentionMap) {
     this.schema = schema;
+    this.mentionMap = mentionMap;
   }
   encode(node) {
     const content = [];
     node.content.forEach(child => {
-      content.push(sanitizeNode(toJSON(child)));
+      content.push(sanitizeNode(toJSON(child, this.mentionMap)));
     });
     if (!content || isEqual(content, emptyDoc.content)) {
       return createDocFromContent([]);
@@ -200,6 +224,6 @@ export class JSONTransformer {
    * This method is used to encode a single node
    */
   encodeNode(node) {
-    return sanitizeNode(toJSON(node));
+    return sanitizeNode(toJSON(node, this.mentionMap));
   }
 }

package/dist/esm/index.js

@@ -42,6 +42,7 @@ var isUnsupportedNode = function isUnsupportedNode(node) {
 };
 var isDataConsumer = isType('dataConsumer');
 var isFragmentMark = isType('fragment');
+var isHardBreak = isType('hardBreak');
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var filterNull = function filterNull(subject) {
@@ -70,7 +71,7 @@ var emptyDoc = createDocFromContent([{
   type: 'paragraph',
   content: []
 }]);
-var toJSON = function toJSON(node) {
+var toJSON = function toJSON(node, mentionMap) {
   var obj = {
     type: node.type.name
   };
@@ -100,17 +101,33 @@ var toJSON = function toJSON(node) {
   if (obj.attrs) {
     obj.attrs = filterNull(obj.attrs);
   }
+  if (isMentionNode(node) && mentionMap) {
+    var _text, _obj$attrs;
+    // If the mentionMap exists and has a name defined then we should use it and prepend @ to the begining of it.
+    var name = !!(mentionMap !== null && mentionMap !== void 0 && mentionMap[node.attrs.id]) ? "@".concat(mentionMap[node.attrs.id]) : '';
+    var text = (_text = (_obj$attrs = obj.attrs) === null || _obj$attrs === void 0 ? void 0 : _obj$attrs.text) !== null && _text !== void 0 ? _text : '';
+    obj.attrs = _objectSpread(_objectSpread({}, obj.attrs), {}, {
+      // If an explicit text value is set on the mention then that should take priority over the mentionMap value.
+      text: !!text ? text : name
+    });
+  }
 
   // Remove the attrs property if it's empty, this is currently limited to paragraph nodes.
   if (isParagraph(node) && obj.attrs && !Object.keys(obj.attrs).length) {
     delete obj.attrs;
   }
+
+  // Hard break has optional attr.text which was added for PM <-> ADF compatibility.
+  // No need to preserve it.
+  if (isHardBreak(node)) {
+    delete obj.attrs;
+  }
   if (node.isText) {
     obj.text = node.textContent;
   } else {
     node.content.forEach(function (child) {
       obj.content = obj.content || [];
-      obj.content.push(toJSON(child));
+      obj.content.push(toJSON(child, mentionMap));
     });
   }
   if (isParagraph(node) || isHeading(node)) {
@@ -175,17 +192,25 @@ var getUnwrappedNodeAttributes = function getUnwrappedNodeAttributes(node, mark,
   return attributes;
 };
 export var JSONTransformer = /*#__PURE__*/function () {
+  /**
+   * @param schema The current editor schema
+   * @param mentionMap An optional mapping of user IDs to mention names. This is used by the encoder to substitute empty
+   * mention node.attr.text values with mapped names.
+   */
   function JSONTransformer() {
     var schema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultSchema;
+    var mentionMap = arguments.length > 1 ? arguments[1] : undefined;
     _classCallCheck(this, JSONTransformer);
     this.schema = schema;
+    this.mentionMap = mentionMap;
   }
   _createClass(JSONTransformer, [{
     key: "encode",
     value: function encode(node) {
+      var _this = this;
       var content = [];
       node.content.forEach(function (child) {
-        content.push(sanitizeNode(toJSON(child)));
+        content.push(sanitizeNode(toJSON(child, _this.mentionMap)));
       });
       if (!content || isEqual(content, emptyDoc.content)) {
         return createDocFromContent([]);
@@ -218,7 +243,7 @@ export var JSONTransformer = /*#__PURE__*/function () {
   }, {
     key: "encodeNode",
     value: function encodeNode(node) {
-      return sanitizeNode(toJSON(node));
+      return sanitizeNode(toJSON(node, this.mentionMap));
     }
   }]);
   return JSONTransformer;

package/dist/types/index.d.ts

@@ -11,7 +11,13 @@ export declare enum SchemaStage {
 }
 export declare class JSONTransformer implements Transformer<JSONDocNode> {
     private schema;
-    constructor(schema?: Schema);
+    private mentionMap;
+    /**
+     * @param schema The current editor schema
+     * @param mentionMap An optional mapping of user IDs to mention names. This is used by the encoder to substitute empty
+     * mention node.attr.text values with mapped names.
+     */
+    constructor(schema?: Schema, mentionMap?: Record<string, string | undefined>);
     encode(node: PMNode): JSONDocNode;
     private internalParse;
     parse(content: JSONDocNode, stage?: SchemaStage): PMNode;

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

@@ -11,7 +11,13 @@ export declare enum SchemaStage {
 }
 export declare class JSONTransformer implements Transformer<JSONDocNode> {
     private schema;
-    constructor(schema?: Schema);
+    private mentionMap;
+    /**
+     * @param schema The current editor schema
+     * @param mentionMap An optional mapping of user IDs to mention names. This is used by the encoder to substitute empty
+     * mention node.attr.text values with mapped names.
+     */
+    constructor(schema?: Schema, mentionMap?: Record<string, string | undefined>);
     encode(node: PMNode): JSONDocNode;
     private internalParse;
     parse(content: JSONDocNode, stage?: SchemaStage): PMNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.20.2",
+	"version": "8.20.4",
 	"description": "JSON transformer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,14 +36,14 @@
 		"./types": "./src/types.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^42.3.1",
-		"@atlaskit/adf-utils": "^19.10.0",
+		"@atlaskit/adf-schema": "^44.2.0",
+		"@atlaskit/adf-utils": "^19.11.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21"
 	},
 	"devDependencies": {
-		"@atlaskit/editor-plugin-highlight": "1.18.3",
+		"@atlaskit/editor-plugin-highlight": "1.18.6",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"react": "^16.8.0",
 		"typescript": "~5.4.2"