Merge pull request #72 from contentstack/next

Fix: Empty string in case td or th node had void:true

Author: nadeem-cs

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## [1.3.4](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.5) (2024-05-31)
+## [1.3.6](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.6) (2024-05-31)
+ - Fix: handle case of td or th nodes with attr void:true
+
+## [1.3.5](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.5) (2024-05-31)
  - Feat: updateAssetURLForGQL added
+ - Fix: add rowspan and colspan attribute to td and th nodes
 
 ## [1.3.4](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.4) (2024-05-13)
  - Fixes for vulnerability issues related to regular expression and options

__test__/default-node-options.test.ts

@@ -71,6 +71,18 @@ const tableHeadNode: Node = {
     children: []
 }
 
+const tableDataNodeWithVoid: Node = {
+    type: NodeType.TABLE_DATA,
+    attrs: { void: true },
+    children: []
+}
+
+const tableHeadNodeWithVoid: Node = {
+    type: NodeType.TABLE_HEAD,
+    attrs: { void: true },
+    children: []
+}
+
 describe('Default node render options', () => {
     it('Should return document string', done => {
         const renderString = (defaultNodeOption[NodeType.DOCUMENT] as RenderNode)(node, next)
@@ -160,6 +172,12 @@ describe('Default node render options', () => {
         renderString = (defaultNodeOption[NodeType.TABLE_DATA] as RenderNode)(tableDataNode, next)
         expect(renderString).toEqual('<td rowspan=\"2\" colspan=\"2\">text</td>')
 
+        renderString = (defaultNodeOption[NodeType.TABLE_HEAD] as RenderNode)(tableHeadNodeWithVoid, next)
+        expect(renderString).toEqual('')
+
+        renderString = (defaultNodeOption[NodeType.TABLE_DATA] as RenderNode)(tableDataNodeWithVoid, next)
+        expect(renderString).toEqual('')
+
         done()
     })
     it('Should return block quote string', done => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/utils",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Contentstack utilities for Javascript",
   "main": "dist/index.es.js",
   "types": "dist/types/index.d.ts",

src/options/default-node-options.ts

@@ -75,6 +75,8 @@ export const defaultNodeOption: RenderOption = {
         return `<tr${node.attrs.style ? ` style="${node.attrs.style}"` : ``}${node.attrs['class-name'] ? ` class="${node.attrs['class-name']}"` : ``}${node.attrs.id ? ` id="${node.attrs.id}"` : ``}>${next(node.children)}</tr>`
     },
     [NodeType.TABLE_HEAD]:(node: Node, next: Next) => {
+        if (node.attrs.void) return '';
+
         return `<th` +
                 `${node.attrs.rowSpan ? ` rowspan="${node.attrs.rowSpan}"` : ``}` +
                 `${node.attrs.colSpan ? ` colspan="${node.attrs.colSpan}"` : ``}` +
@@ -84,6 +86,8 @@ export const defaultNodeOption: RenderOption = {
                 `</th>`
     },
     [NodeType.TABLE_DATA]:(node: Node, next: Next) => {
+        if (node.attrs.void) return '';
+
         return `<td` +
                 `${node.attrs.rowSpan ? ` rowspan="${node.attrs.rowSpan}"` : ``}` +
                 `${node.attrs.colSpan ? ` colspan="${node.attrs.colSpan}"` : ``}` +