chore(read): move table data reader to slide-helper

Author: singerla

__tests__/read-table-data.test.ts

@@ -1,5 +1,4 @@
-import Automizer, { TableData } from '../src/index';
-import { ModifyTableHelper } from '../src';
+import Automizer from '../src/index';
 import { TableInfo } from '../src/types/table-types';
 
 test('read table data from slide', async () => {
@@ -12,18 +11,18 @@ test('read table data from slide', async () => {
     .loadRoot(`RootTemplate.pptx`)
     .load(`SlideWithTables.pptx`, 'tables');
 
-  const data = <TableInfo[]>[];
+  let data = <TableInfo[]>[];
 
   await pres
-    .addSlide('tables', 1, (slide) => {
-      slide.modifyElement('TableWithLabels', [
-        // ToDo: use from ElementInfo
-        // ModifyTableHelper.readTableData(data),
-      ]);
+    .addSlide('tables', 1, async (slide) => {
+      const tableInfo = await slide.getElement('TableWithLabels');
+
+      data = tableInfo.getTableInfo();
     })
     .write(`read-table-data.test.pptx`);
 
   // We have 12 text values in a 3x3 table:
-  // console.log(data);
+  console.log(data.map((data) => data.textContent));
+
   expect(data.length).toBe(12);
 });

src/automizer.ts

@@ -12,12 +12,7 @@ import { IPresentationProps } from './interfaces/ipresentation-props';
 import { PresTemplate } from './interfaces/pres-template';
 import { RootPresTemplate } from './interfaces/root-pres-template';
 import { Template } from './classes/template';
-import {
-  ModifyXmlCallback,
-  SlideInfo,
-  TemplateInfo,
-  XmlElement,
-} from './types/xml-types';
+import { ModifyXmlCallback, TemplateInfo } from './types/xml-types';
 import { GeneralHelper, vd } from './helper/general-helper';
 import { Master } from './classes/master';
 import path from 'path';

src/helper/modify-table-helper.ts

@@ -1,7 +1,7 @@
 import { ModifyTableParams, TableData, TableInfo } from '../types/table-types';
 import { ModifyTable } from '../modify/modify-table';
 import { XmlDocument, XmlElement } from '../types/xml-types';
-import { ShapeModificationCallback } from '../types/types';
+import { XmlSlideHelper } from './xml-slide-helper';
 
 export default class ModifyTableHelper {
   static setTable =
@@ -11,7 +11,7 @@ export default class ModifyTableHelper {
 
       if (params?.expand) {
         params?.expand.forEach((expand) => {
-          const tableInfo = ModifyTableHelper.getTableInfo(element);
+          const tableInfo = XmlSlideHelper.readTableInfo(element);
           const targetCell = tableInfo.find(
             (infoCell) => infoCell.textContent === expand.tag,
           );
@@ -69,48 +69,4 @@ export default class ModifyTableHelper {
       const modTable = new ModifyTable(element, data);
       modTable.adjustWidth();
     };
-
-  static readTableData =
-    (info?: TableInfo[]): ShapeModificationCallback =>
-    (element: XmlElement): void => {
-      if (Array.isArray(info)) {
-        // const infoCells = ModifyTableHelper.getTableInfo(element);
-        // info.push(...infoCells);
-      }
-    };
-
-  static getTableInfo = (element: XmlElement) => {
-    const info = <TableInfo[]>[];
-    const rows = element.getElementsByTagName('a:tr');
-    if (!rows) {
-      console.error("Can't find a table row.");
-      return info;
-    }
-
-    for (let r = 0; r < rows.length; r++) {
-      const row = rows.item(r);
-      const columns = row.getElementsByTagName('a:tc');
-      for (let c = 0; c < columns.length; c++) {
-        const cell = columns.item(c);
-        const gridSpan = cell.getAttribute('gridSpan');
-        const hMerge = cell.getAttribute('hMerge');
-        const texts = cell.getElementsByTagName('a:t');
-        const text: string[] = [];
-        for (let t = 0; t < texts.length; t++) {
-          text.push(texts.item(t).textContent);
-        }
-        info.push({
-          row: r,
-          column: c,
-          rowXml: row,
-          columnXml: cell,
-          text: text,
-          textContent: text.join(''),
-          gridSpan: Number(gridSpan),
-          hMerge: Number(hMerge),
-        });
-      }
-    }
-    return info;
-  };
 }

src/helper/xml-slide-helper.ts

@@ -6,7 +6,7 @@ import {
 } from '../types/xml-types';
 import { XmlHelper } from './xml-helper';
 import HasShapes from '../classes/has-shapes';
-import { FindElementSelector } from '../types/types';
+import { FindElementSelector, ShapeModificationCallback } from '../types/types';
 import ModifyTableHelper from './modify-table-helper';
 import { TableData, TableInfo } from '../types/table-types';
 
@@ -114,13 +114,9 @@ export class XmlSlideHelper {
       type: XmlSlideHelper.getElementType(slideElement),
       position: XmlSlideHelper.parseShapeCoordinates(slideElement),
       hasTextBody: !!XmlSlideHelper.getTextBody(slideElement),
-      getText: () => XmlSlideHelper.parseTextFragments(slideElement),
-      // getTableInfo: () => {
-      //   const data = <TableInfo[]>[];
-      //   ModifyTableHelper.readTableData(data)(slideElement);
-      //   return data;
-      // },
       getXmlElement: () => slideElement,
+      getText: () => XmlSlideHelper.parseTextFragments(slideElement),
+      getTableInfo: () => XmlSlideHelper.readTableInfo(slideElement),
       getAltText: () => XmlSlideHelper.getImageAltText(slideElement),
     };
   }
@@ -293,4 +289,39 @@ export class XmlSlideHelper {
       return null;
     }
   };
+
+  static readTableInfo = (element: XmlElement): TableInfo[] => {
+    const info = <TableInfo[]>[];
+    const rows = element.getElementsByTagName('a:tr');
+    if (!rows) {
+      console.error("Can't find a table row.");
+      return info;
+    }
+
+    for (let r = 0; r < rows.length; r++) {
+      const row = rows.item(r);
+      const columns = row.getElementsByTagName('a:tc');
+      for (let c = 0; c < columns.length; c++) {
+        const cell = columns.item(c);
+        const gridSpan = cell.getAttribute('gridSpan');
+        const hMerge = cell.getAttribute('hMerge');
+        const texts = cell.getElementsByTagName('a:t');
+        const text: string[] = [];
+        for (let t = 0; t < texts.length; t++) {
+          text.push(texts.item(t).textContent);
+        }
+        info.push({
+          row: r,
+          column: c,
+          rowXml: row,
+          columnXml: cell,
+          text: text,
+          textContent: text.join(''),
+          gridSpan: Number(gridSpan),
+          hMerge: Number(hMerge),
+        });
+      }
+    }
+    return info;
+  };
 }

src/types/xml-types.ts

@@ -76,7 +76,7 @@ export type ElementInfo = {
   hasTextBody: boolean;
   getText: () => string[];
   getAltText: () => string;
-  // getTableInfo: () => TableInfo[];
+  getTableInfo: () => TableInfo[];
   getXmlElement: () => XmlElement;
 };