@atlaskit/editor-json-transformer 8.20.4 → 8.21.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-json-transformer
 
+## 8.21.1
+
+### Patch Changes
+
+- [#165765](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165765)
+  [`3f441f30e6507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f441f30e6507) -
+  Bump adf-schema to 46.0.0
+
+## 8.21.0
+
+### Minor Changes
+
+- [#156454](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156454)
+  [`8dfa896f600a2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8dfa896f600a2) -
+  [ED-25499] this change adds a transformer for converting nested tables to extensions in outgoing
+  documents
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.20.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -19,6 +19,9 @@
     "references": [
         {
             "path": "../../adf-utils/afm-cc/tsconfig.json"
+        },
+        {
+            "path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
         }
     ]
 }

package/afm-jira/tsconfig.json

@@ -19,6 +19,9 @@
 	"references": [
 		{
 			"path": "../../adf-utils/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
 		}
 	]
 }

package/afm-post-office/tsconfig.json

@@ -3,7 +3,7 @@
 	"compilerOptions": {
 		"declaration": true,
 		"target": "es5",
-		"outDir": "../../../../../tsDist/@atlaskit__editor-json-transformer/app",
+		"outDir": "../../../../../post-office/tsDist/@atlaskit__editor-json-transformer/app",
 		"rootDir": "../",
 		"composite": true
 	},
@@ -19,6 +19,9 @@
 	"references": [
 		{
 			"path": "../../adf-utils/afm-post-office/tsconfig.json"
+		},
+		{
+			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
 		}
 	]
 }

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

@@ -6,10 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sanitizeNode = sanitizeNode;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _transforms = require("@atlaskit/adf-utils/transforms");
 var _traverse = require("@atlaskit/adf-utils/traverse");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _removeMarks = require("./remove-marks");
 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; }
+var hasNestedTable = function hasNestedTable(tableCellNode) {
+  var _tableCellNode$conten;
+  return (_tableCellNode$conten = tableCellNode.content) === null || _tableCellNode$conten === void 0 ? void 0 : _tableCellNode$conten.some(function (node) {
+    return (node === null || node === void 0 ? void 0 : node.type) === 'table';
+  });
+};
 function sanitizeNode(json) {
   var sanitizedJSON = (0, _traverse.traverse)(json, {
     text: function text(node) {
@@ -34,6 +42,16 @@ function sanitizeNode(json) {
       }
       return false; // empty caption
     },
+    tableCell: function tableCell(node) {
+      if (hasNestedTable(node) && (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
+        return (0, _transforms.transformNestedTableNodeOutgoingDocument)(node);
+      }
+    },
+    tableHeader: function tableHeader(node) {
+      if (hasNestedTable(node) && (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
+        return (0, _transforms.transformNestedTableNodeOutgoingDocument)(node);
+      }
+    },
     emoji: _removeMarks.removeNonAnnotationMarks,
     mention: _removeMarks.removeNonAnnotationMarks,
     date: _removeMarks.removeNonAnnotationMarks,

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

@@ -1,5 +1,11 @@
+import { transformNestedTableNodeOutgoingDocument } from '@atlaskit/adf-utils/transforms';
 import { traverse } from '@atlaskit/adf-utils/traverse';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeMarks, removeNonAnnotationMarks } from './remove-marks';
+const hasNestedTable = tableCellNode => {
+  var _tableCellNode$conten;
+  return (_tableCellNode$conten = tableCellNode.content) === null || _tableCellNode$conten === void 0 ? void 0 : _tableCellNode$conten.some(node => (node === null || node === void 0 ? void 0 : node.type) === 'table');
+};
 export function sanitizeNode(json) {
   const sanitizedJSON = traverse(json, {
     text: node => {
@@ -23,6 +29,16 @@ export function sanitizeNode(json) {
       }
       return false; // empty caption
     },
+    tableCell: node => {
+      if (hasNestedTable(node) && fg('platform_editor_use_nested_table_pm_nodes')) {
+        return transformNestedTableNodeOutgoingDocument(node);
+      }
+    },
+    tableHeader: node => {
+      if (hasNestedTable(node) && fg('platform_editor_use_nested_table_pm_nodes')) {
+        return transformNestedTableNodeOutgoingDocument(node);
+      }
+    },
     emoji: removeNonAnnotationMarks,
     mention: removeNonAnnotationMarks,
     date: removeNonAnnotationMarks,

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

@@ -1,8 +1,16 @@
 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 { transformNestedTableNodeOutgoingDocument } from '@atlaskit/adf-utils/transforms';
 import { traverse } from '@atlaskit/adf-utils/traverse';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeMarks, removeNonAnnotationMarks } from './remove-marks';
+var hasNestedTable = function hasNestedTable(tableCellNode) {
+  var _tableCellNode$conten;
+  return (_tableCellNode$conten = tableCellNode.content) === null || _tableCellNode$conten === void 0 ? void 0 : _tableCellNode$conten.some(function (node) {
+    return (node === null || node === void 0 ? void 0 : node.type) === 'table';
+  });
+};
 export function sanitizeNode(json) {
   var sanitizedJSON = traverse(json, {
     text: function text(node) {
@@ -27,6 +35,16 @@ export function sanitizeNode(json) {
       }
       return false; // empty caption
     },
+    tableCell: function tableCell(node) {
+      if (hasNestedTable(node) && fg('platform_editor_use_nested_table_pm_nodes')) {
+        return transformNestedTableNodeOutgoingDocument(node);
+      }
+    },
+    tableHeader: function tableHeader(node) {
+      if (hasNestedTable(node) && fg('platform_editor_use_nested_table_pm_nodes')) {
+        return transformNestedTableNodeOutgoingDocument(node);
+      }
+    },
     emoji: removeNonAnnotationMarks,
     mention: removeNonAnnotationMarks,
     date: removeNonAnnotationMarks,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-json-transformer",
-	"version": "8.20.4",
+	"version": "8.21.1",
 	"description": "JSON transformer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,15 +36,15 @@
 		"./types": "./src/types.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^44.2.0",
-		"@atlaskit/adf-utils": "^19.11.0",
+		"@atlaskit/adf-schema": "^46.1.0",
+		"@atlaskit/adf-utils": "^19.13.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21"
 	},
 	"devDependencies": {
-		"@atlaskit/editor-plugin-highlight": "1.18.6",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/editor-plugin-highlight": "1.18.8",
 		"react": "^16.8.0",
 		"typescript": "~5.4.2"
 	},
@@ -61,5 +61,10 @@
 				"emotion"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
+		}
 	}
 }