fix(*): Account for TableCell content potentially being undefined

stencila · Jun 18, 2021 · 758b6ea · 758b6ea
1 parent 712d2f5
commit 758b6ea
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/src/__tests__/issues/188-type-coercion.ts b/src/__tests__/issues/188-type-coercion.ts
@@ -55,8 +55,8 @@ test('188-type-coercion-weirdness', async () => {
 }`
   const table = (await jsonCodec.load(json)) as schema.Table
 
-  expect(table?.rows?.[0].cells?.[0].content[0]).toBe(true)
-  expect(table?.rows?.[0].cells?.[1].content[0]).toBe(2)
+  expect(table?.rows?.[0].cells?.[0].content?.[0]).toBe(true)
+  expect(table?.rows?.[0].cells?.[1].content?.[0]).toBe(2)
 
   expect(await mdCodec.dump(table)).toMatchFile(
     snapshot('188-type-coercion.md')

diff --git a/src/codecs/html/index.ts b/src/codecs/html/index.ts
@@ -2267,7 +2267,11 @@ function encodeTableCell(
   state: EncodeState,
   tag: 'td' | 'th' = 'td'
 ): HTMLTableDataCellElement {
-  return h(tag, { attrs: microdata(cell) }, encodeNodes(cell.content, state))
+  return h(
+    tag,
+    { attrs: microdata(cell) },
+    encodeNodes(cell.content ?? [], state)
+  )
 }
 
 /**

diff --git a/src/codecs/jats/index.ts b/src/codecs/jats/index.ts
@@ -1981,7 +1981,7 @@ function encodeTable(table: stencila.Table, state: EncodeState): [xml.Element] {
             return elem(
               'th',
               ...row.cells.map((cell) => {
-                return encodeDefault('th', cell.content, state)
+                return encodeDefault('th', cell.content ?? [], state)
               })
             )
           })
@@ -1992,7 +1992,7 @@ function encodeTable(table: stencila.Table, state: EncodeState): [xml.Element] {
             return elem(
               'tr',
               ...row.cells.map((cell) => {
-                return encodeDefault('td', cell.content, state)
+                return encodeDefault('td', cell.content ?? [], state)
               })
             )
           })

diff --git a/src/codecs/md/index.ts b/src/codecs/md/index.ts
@@ -1253,7 +1253,7 @@ function encodeTable(table: stencila.Table): MDAST.Table | Extension {
           type: 'tableRow',
           children: row.cells.map(
             (cell: stencila.TableCell): MDAST.TableCell => {
-              const content = ensureInlineContentArray(cell.content)
+              const content = ensureInlineContentArray(cell.content ?? [])
               // If there is only one node in the table cell and it is
               // a primitive e.g. a number, or boolean then encode it
               // as a string rather than as the special `!number` etc inline

diff --git a/src/codecs/pandoc/index.ts b/src/codecs/pandoc/index.ts
@@ -858,15 +858,15 @@ function encodeTable(table: stencila.Table): Pandoc.Table {
   let head: Pandoc.TableCell[] = []
   if (table.rows.length > 0) {
     head = table.rows[0].cells.map((cell) =>
-      encodeBlocks(ensureBlockContentArray(cell.content))
+      encodeBlocks(ensureBlockContentArray(cell.content ?? []))
     )
   }
 
   let rows: Pandoc.TableCell[][] = []
   if (table.rows.length > 1) {
     rows = table.rows.slice(1).map((row: stencila.TableRow) => {
       return row.cells.map((cell) =>
-        encodeBlocks(ensureBlockContentArray(cell.content))
+        encodeBlocks(ensureBlockContentArray(cell.content ?? []))
       )
     })
   }

diff --git a/src/codecs/xlsx/index.ts b/src/codecs/xlsx/index.ts
@@ -198,7 +198,7 @@ const encodeTable = (table: stencila.Table): xlsx.WorkSheet =>
   table.rows.reduce(
     (sheet: xlsx.WorkSheet, row) => {
       row.cells.forEach((cell: stencila.TableCell) => {
-        if (cell.name) {
+        if (cell.name && cell.content !== undefined) {
           sheet[cell.name] = encodeCell(cell.content[0])
         }
       })