Fix table issue

Author: grigorii-horos

index.js

@@ -1,14 +1,14 @@
 import { parse } from 'parse5';
 
-import { indentify } from './lib/utils.js';
+import { filterAst, indentify } from './lib/utils.js';
 import { getGlobalConfig } from './lib/utils/get-clobal-config.js';
 import { renderTag } from './lib/utils/render-tag.js';
 
 const htmlToCli = (rawHTML, theme = {}) => {
   const document = parse(rawHTML);
 
   // console.dir(
-  //   filterAst(document),
+  //   filterAst(document).childNodes[0].childNodes[1].childNodes,
   //   { depth: null },
   // );
 

lib/tag-helpers/block-tag.js

@@ -76,11 +76,11 @@ export function blockTag(wrapper, localContext) {
       return null;
     }
 
-    let topBlock = (localContext && localContext.marginTop) || 0;
+    let topBlock = (localContext?.marginTop) || 0;
 
     topBlock = !context || !context.pre ? topBlock + 1 : topBlock;
 
-    let bottomBlock = (localContext && localContext.marginBottom) || 0;
+    let bottomBlock = (localContext?.marginBottom) || 0;
 
     bottomBlock = !context || !context.pre ? bottomBlock + 1 : bottomBlock;
 

lib/tags/table.js

@@ -19,13 +19,13 @@ export const caption = blockTag();
 
 const captions = (tag, context) => blockTag((value) => bold.blue(value))(tag, context);
 
-const trVals = (tr) => {
+const trVals = (context) => (tr) => {
   const theadTds = !tr || !tr.childNodes
     ? null
     : tr.childNodes.filter((tag) => ['td', 'th'].includes(tag.nodeName));
 
   const theadTdsValue = theadTds
-    ? theadTds.map((tag, context) => {
+    ? theadTds.map((tag) => {
       const det = tag.nodeName === 'td' ? td(tag, context) : th(tag, context);
 
       const parsedStyle = styleParser(getAttribute(tag, 'style', ''));
@@ -50,12 +50,12 @@ const trVals = (tr) => {
   return theadTdsValue;
 };
 
-const tbodyVals = (tbody) => {
+const tbodyVals = (context) => (tbody) => {
   const theadTrs = tbody
     ? tbody.childNodes.filter((tag) => ['tr'].includes(tag.nodeName))
     : null;
 
-  const theadTrsVals = theadTrs.map(trVals);
+  const theadTrsVals = theadTrs.map(trVals(context));
   return theadTrsVals;
 };
 
@@ -79,23 +79,23 @@ export const table = (tag, context) => {
     ? null
     : thead.childNodes.find((child) => child.nodeName === 'tr');
 
-  const theadsValue = theadTr ? trVals(theadTr) : null;
+  const theadsValue = theadTr ? trVals(context)(theadTr) : null;
 
   if (theadsValue && theadsValue[0]) {
     tableArray.push(theadsValue);
   }
 
   const trs = tag.childNodes.filter((child) => ['tbody'].includes(child.nodeName));
 
-  trs.map(tbodyVals).map((value) => tableArray.push(...value));
+  trs.map(tbodyVals(context)).map((value) => tableArray.push(...value));
 
   const tfoot = tag.childNodes.find((child) => child.nodeName === 'tfoot');
 
   const tfootTr = !tfoot || !tfoot.childNodes
     ? null
     : tfoot.childNodes.find((child) => child.nodeName === 'tr');
 
-  const tfootdsValue = tfootTr ? trVals(tfootTr) : null;
+  const tfootdsValue = tfootTr ? trVals(context)(tfootTr) : null;
 
   if (tfootdsValue && tfootdsValue[0]) {
     tableArray.push(tfootdsValue);

lib/tags/text-styles.js

@@ -20,10 +20,10 @@ export const b = bold;
 export const s = strikethrough;
 export const strike = strikethrough;
 
-export const em = italic;
 // eslint-disable-next-line unicorn/prevent-abbreviations
-export const i = italic;
-export const cite = italic;
+export const i = inlineTag((value, tag, context) => context.theme.italic(value));
+export const em = inlineTag((value, tag, context) => context.theme.italic(value));
+export const cite = inlineTag((value, tag, context) => context.theme.italic(value));
 
 export const strong = bold;
 

lib/utils/get-theme.js

@@ -21,6 +21,9 @@ export const getTheme = (customTheme) => ({
   del: (value) => style(customTheme.del || 'bgRed black', value),
   ins: (value) => style(customTheme.ins || 'bgGreen black', value),
   italic: (value) => style(customTheme.italic || 'italic', value),
+  i: (value) => style(customTheme.i || 'italic', value),
+  em: (value) => style(customTheme.em || 'italic', value),
+  cite: (value) => style(customTheme.cite || 'italic', value),
   strike: (value) => style(customTheme.strikethrough || 'strikethrough', value),
   underline: (value) => style(customTheme.underline || 'underline', value),
   bold: (value) => style(customTheme.bold || 'bold', value),