@atlaskit/adf-utils 19.15.0 → 19.17.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/adf-utils
 
+## 19.17.0
+
+### Minor Changes
+
+- [#102696](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102696)
+  [`68e5aef5beb02`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/68e5aef5beb02) -
+  Validate Forge macro paramters to the rules of Confluence parameter processing
+
+## 19.16.0
+
+### Minor Changes
+
+- [#101826](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101826)
+  [`efd5cf5ab0eb2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/efd5cf5ab0eb2) -
+  ED-26205 Prevent transform of nested tables inside bodied macros for renderer only
+
 ## 19.15.0
 
 ### Minor Changes

package/dist/cjs/transforms/nested-table-transform.js

@@ -34,11 +34,32 @@ var transformNestedTableExtension = function transformNestedTableExtension(neste
     throw new _errors.NodeNestingTransformError('Failed to parse nested table content');
   }
 };
+function isInsideBodiedExtension(parent) {
+  var _parent$parent;
+  if (parent.node === undefined) {
+    return false;
+  }
+  if (parent.node.type === 'bodiedExtension') {
+    return true;
+  }
+  if (parent !== null && parent !== void 0 && (_parent$parent = parent.parent) !== null && _parent$parent !== void 0 && _parent$parent.node) {
+    return isInsideBodiedExtension(parent.parent);
+  }
+  return false;
+}
 var transformNestedTablesIncomingDocument = exports.transformNestedTablesIncomingDocument = function transformNestedTablesIncomingDocument(adf) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTransformed = false;
   var transformedAdf = (0, _traverse.traverse)(adf, {
-    extension: function extension(node) {
+    extension: function extension(node, parent) {
       if (isNestedTableExtension(node)) {
+        // Bodied extensions in renderer use their own nested renderer to render the content.
+        // This results in the document being validated/transformed twice, once with untransformed content and again with transformed content.
+        // Since the untransformed content is valid ADF (table as extension in table) but the transformed content is not valid ADF, (table in table)
+        // we need to skip transforming nested tables inside bodied extensions in renderer on the first pass or else it will fail validation and render an unsupported block.
+        if (options.environment === 'renderer' && isInsideBodiedExtension(parent)) {
+          return undefined;
+        }
         isTransformed = true;
         return transformNestedTableExtension(node);
       }

package/dist/cjs/validator/validator.js

@@ -58,7 +58,7 @@ var partitionObject = function partitionObject(obj, predicate) {
 };
 
 /**
- * Normalizes the structure of files imported form './specs'.
+ * Normalizes the structure of files imported from './specs'.
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {

package/dist/es2019/transforms/nested-table-transform.js

@@ -24,11 +24,31 @@ const transformNestedTableExtension = nestedTableExtension => {
     throw new NodeNestingTransformError('Failed to parse nested table content');
   }
 };
-export const transformNestedTablesIncomingDocument = adf => {
+function isInsideBodiedExtension(parent) {
+  var _parent$parent;
+  if (parent.node === undefined) {
+    return false;
+  }
+  if (parent.node.type === 'bodiedExtension') {
+    return true;
+  }
+  if (parent !== null && parent !== void 0 && (_parent$parent = parent.parent) !== null && _parent$parent !== void 0 && _parent$parent.node) {
+    return isInsideBodiedExtension(parent.parent);
+  }
+  return false;
+}
+export const transformNestedTablesIncomingDocument = (adf, options = {}) => {
   let isTransformed = false;
   const transformedAdf = traverse(adf, {
-    extension: node => {
+    extension: (node, parent) => {
       if (isNestedTableExtension(node)) {
+        // Bodied extensions in renderer use their own nested renderer to render the content.
+        // This results in the document being validated/transformed twice, once with untransformed content and again with transformed content.
+        // Since the untransformed content is valid ADF (table as extension in table) but the transformed content is not valid ADF, (table in table)
+        // we need to skip transforming nested tables inside bodied extensions in renderer on the first pass or else it will fail validation and render an unsupported block.
+        if (options.environment === 'renderer' && isInsideBodiedExtension(parent)) {
+          return undefined;
+        }
         isTransformed = true;
         return transformNestedTableExtension(node);
       }

package/dist/es2019/validator/validator.js

@@ -42,7 +42,7 @@ const partitionObject = (obj, predicate) => Object.keys(obj).reduce((acc, key) =
 }, [[], []]);
 
 /**
- * Normalizes the structure of files imported form './specs'.
+ * Normalizes the structure of files imported from './specs'.
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {

package/dist/esm/transforms/nested-table-transform.js

@@ -27,11 +27,32 @@ var transformNestedTableExtension = function transformNestedTableExtension(neste
     throw new NodeNestingTransformError('Failed to parse nested table content');
   }
 };
+function isInsideBodiedExtension(parent) {
+  var _parent$parent;
+  if (parent.node === undefined) {
+    return false;
+  }
+  if (parent.node.type === 'bodiedExtension') {
+    return true;
+  }
+  if (parent !== null && parent !== void 0 && (_parent$parent = parent.parent) !== null && _parent$parent !== void 0 && _parent$parent.node) {
+    return isInsideBodiedExtension(parent.parent);
+  }
+  return false;
+}
 export var transformNestedTablesIncomingDocument = function transformNestedTablesIncomingDocument(adf) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTransformed = false;
   var transformedAdf = traverse(adf, {
-    extension: function extension(node) {
+    extension: function extension(node, parent) {
       if (isNestedTableExtension(node)) {
+        // Bodied extensions in renderer use their own nested renderer to render the content.
+        // This results in the document being validated/transformed twice, once with untransformed content and again with transformed content.
+        // Since the untransformed content is valid ADF (table as extension in table) but the transformed content is not valid ADF, (table in table)
+        // we need to skip transforming nested tables inside bodied extensions in renderer on the first pass or else it will fail validation and render an unsupported block.
+        if (options.environment === 'renderer' && isInsideBodiedExtension(parent)) {
+          return undefined;
+        }
         isTransformed = true;
         return transformNestedTableExtension(node);
       }

package/dist/esm/validator/validator.js

@@ -49,7 +49,7 @@ var partitionObject = function partitionObject(obj, predicate) {
 };
 
 /**
- * Normalizes the structure of files imported form './specs'.
+ * Normalizes the structure of files imported from './specs'.
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {

package/dist/types/transforms/nested-table-transform.d.ts

@@ -1,6 +1,8 @@
 import type { ADFEntity } from '../types';
 export declare const isNestedTableExtension: (extensionNode: ADFEntity) => boolean;
-export declare const transformNestedTablesIncomingDocument: (adf: ADFEntity) => {
+export declare const transformNestedTablesIncomingDocument: (adf: ADFEntity, options?: {
+    environment?: 'renderer' | 'editor';
+}) => {
     transformedAdf: ADFEntity;
     isTransformed: boolean;
 };

package/dist/types/transforms.d.ts

@@ -4,6 +4,6 @@ export { transformDedupeMarks } from './transforms/dedupe-marks-transform';
 export { transformNodesMissingContent } from './transforms/nodes-missing-content-transform';
 export { transformIndentationMarks } from './transforms/indentation-marks-transform';
 export { transformInvalidMediaContent } from './transforms/invalid-media-content-transform';
-export { transformNestedTablesIncomingDocument, isNestedTableExtension } from './transforms/nested-table-transform';
+export { transformNestedTablesIncomingDocument, isNestedTableExtension, } from './transforms/nested-table-transform';
 export { transformNestedTableNodeOutgoingDocument } from './transforms/nested-table-transform';
 export { NodeNestingTransformError } from './transforms/errors';

package/dist/types-ts4.5/transforms/nested-table-transform.d.ts

@@ -1,6 +1,8 @@
 import type { ADFEntity } from '../types';
 export declare const isNestedTableExtension: (extensionNode: ADFEntity) => boolean;
-export declare const transformNestedTablesIncomingDocument: (adf: ADFEntity) => {
+export declare const transformNestedTablesIncomingDocument: (adf: ADFEntity, options?: {
+    environment?: 'renderer' | 'editor';
+}) => {
     transformedAdf: ADFEntity;
     isTransformed: boolean;
 };

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

@@ -4,6 +4,6 @@ export { transformDedupeMarks } from './transforms/dedupe-marks-transform';
 export { transformNodesMissingContent } from './transforms/nodes-missing-content-transform';
 export { transformIndentationMarks } from './transforms/indentation-marks-transform';
 export { transformInvalidMediaContent } from './transforms/invalid-media-content-transform';
-export { transformNestedTablesIncomingDocument, isNestedTableExtension } from './transforms/nested-table-transform';
+export { transformNestedTablesIncomingDocument, isNestedTableExtension, } from './transforms/nested-table-transform';
 export { transformNestedTableNodeOutgoingDocument } from './transforms/nested-table-transform';
 export { NodeNestingTransformError } from './transforms/errors';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "19.15.0",
+	"version": "19.17.0",
 	"description": "Set of utilities to traverse, modify and create ADF documents.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"