@atlaskit/editor-json-transformer 8.24.4 → 8.24.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-json-transformer
 
+## 8.24.5
+
+### Patch Changes
+
+- [#191913](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/191913)
+  [`6d1e56695e91d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d1e56695e91d) -
+  EDITOR-1131 Bump adf-schema package to 50.0.0
+- Updated dependencies
+
 ## 8.24.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

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

package/afm-townsquare/tsconfig.json

@@ -0,0 +1,24 @@
+{
+	"extends": "../../../../tsconfig.entry-points.townsquare.json",
+	"compilerOptions": {
+		"declaration": true,
+		"target": "es5",
+		"outDir": "../../../../../townsquare/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-townsquare/tsconfig.json"
+		}
+	]
+}

package/dist/cjs/index.js

@@ -31,6 +31,9 @@ var isType = function isType(type) {
     return node.type.name === type;
   };
 };
+
+// Create a Set of node types that should have empty attrs removed
+var NODES_WITH_EMPTY_ATTRS_REMOVAL = new Set(['paragraph', 'layoutSection', 'blockquote', 'nestedExpand', 'bulletList', 'listItem', 'orderedList', 'rule', 'caption', 'tableRow', 'media', 'mediaSingle', 'mediaInline']);
 var isCodeBlock = isType('codeBlock');
 var isMediaNode = isType('media');
 var isMediaInline = isType('mediaInline');
@@ -123,15 +126,7 @@ var _toJSON = function toJSON(node, mentionMap) {
       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)) {
+  if (NODES_WITH_EMPTY_ATTRS_REMOVAL.has(node.type.name) && obj.attrs && !Object.keys(obj.attrs).length || isHardBreak(node)) {
     delete obj.attrs;
   }
   if (node.isText) {

package/dist/es2019/index.js

@@ -12,6 +12,9 @@ export let SchemaStage = /*#__PURE__*/function (SchemaStage) {
   return SchemaStage;
 }({});
 const isType = type => node => node.type.name === type;
+
+// Create a Set of node types that should have empty attrs removed
+const NODES_WITH_EMPTY_ATTRS_REMOVAL = new Set(['paragraph', 'layoutSection', 'blockquote', 'nestedExpand', 'bulletList', 'listItem', 'orderedList', 'rule', 'caption', 'tableRow', 'media', 'mediaSingle', 'mediaInline']);
 const isCodeBlock = isType('codeBlock');
 const isMediaNode = isType('media');
 const isMediaInline = isType('mediaInline');
@@ -106,15 +109,7 @@ const toJSON = (node, mentionMap) => {
       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)) {
+  if (NODES_WITH_EMPTY_ATTRS_REMOVAL.has(node.type.name) && obj.attrs && !Object.keys(obj.attrs).length || isHardBreak(node)) {
     delete obj.attrs;
   }
   if (node.isText) {

package/dist/esm/index.js

@@ -25,6 +25,9 @@ var isType = function isType(type) {
     return node.type.name === type;
   };
 };
+
+// Create a Set of node types that should have empty attrs removed
+var NODES_WITH_EMPTY_ATTRS_REMOVAL = new Set(['paragraph', 'layoutSection', 'blockquote', 'nestedExpand', 'bulletList', 'listItem', 'orderedList', 'rule', 'caption', 'tableRow', 'media', 'mediaSingle', 'mediaInline']);
 var isCodeBlock = isType('codeBlock');
 var isMediaNode = isType('media');
 var isMediaInline = isType('mediaInline');
@@ -117,15 +120,7 @@ var _toJSON = function toJSON(node, mentionMap) {
       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)) {
+  if (NODES_WITH_EMPTY_ATTRS_REMOVAL.has(node.type.name) && obj.attrs && !Object.keys(obj.attrs).length || isHardBreak(node)) {
     delete obj.attrs;
   }
   if (node.isText) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.24.4",
+	"version": "8.24.5",
 	"description": "JSON transformer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 		"./types": "./src/types.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^49.0.6",
+		"@atlaskit/adf-schema": "^50.0.1",
 		"@atlaskit/adf-utils": "^19.20.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@babel/runtime": "^7.0.0",