chore(xml): add info keys to Target; fix return value for fileExistsInArchive

Author: singerla

src/constants/constants.ts

@@ -15,12 +15,10 @@ export const TargetByRelIdMap = {
     relRootTag: 'a:blip',
     relAttribute: 'r:embed',
     prefix: '../media/image',
-    expression: /\..+?$/,
   } as TargetByRelIdMapParam,
   'image:svg': {
     relRootTag: 'asvg:svgBlip',
     relAttribute: 'r:embed',
     prefix: '../media/image',
-    expression: /\..+?$/,
   } as TargetByRelIdMapParam,
 };

src/dev.ts

@@ -15,7 +15,31 @@ const automizer = new Automizer({
 });
 
 const run = async () => {
-  const ppt = automizer
+  // const pres = automizer
+  //   .loadRoot(`RootTemplate.pptx`)
+  //   .load(`SlideWithCharts.pptx`, 'charts');
+  //
+  // const result = await pres
+  //   .addSlide('charts', 2, (slide) => {
+  //     slide.modifyElement('ColumnChart', [
+  //       modify.setChartData(<ChartData>{
+  //         series: [
+  //           { label: 'series 1' },
+  //           { label: 'series 2' },
+  //           { label: 'series 3' },
+  //         ],
+  //         categories: [
+  //           { label: 'cat 2-1', values: [50, 50, 20] },
+  //           { label: 'cat 2-2', values: [14, 50, 20] },
+  //           { label: 'cat 2-3', values: [15, 50, 20] },
+  //           { label: 'cat 2-4', values: [26, 50, 20] },
+  //         ],
+  //       }),
+  //     ]);
+  //   })
+  //   .write(`modify-existing-chart.test.pptx`);
+
+  const pres = automizer
     .loadRoot(`RootTemplate.pptx`)
     .load(`EmptySlide.pptx`, 'EmptySlide')
     .load(`ChartWaterfall.pptx`, 'ChartWaterfall')

src/helper/file-helper.ts

@@ -33,6 +33,7 @@ export class FileHelper {
     if (archive === undefined || archive.files[file] === undefined) {
       return false;
     }
+    return true;
   }
 
   static extractFileContent(file: Buffer): Promise<JSZip> {

src/helper/xml-helper.ts

@@ -138,40 +138,10 @@ export class XmlHelper {
     return max;
   }
 
-  static pushRelTargets(element: Element, prefix: string, targets: Target[]) {
-    const type = element.getAttribute('Type');
-    const target = element.getAttribute('Target');
-    const rId = element.getAttribute('Id');
-
-    const subtype = _.last(prefix.split('/'));
-    const relType = _.last(type.split('/'));
-
-    const matchNumber = target.match(/(\d+)/);
-    const stripNumber =
-      matchNumber && matchNumber[1] ? Number(matchNumber[1]) : 0;
-
-    if (XmlHelper.targetMatchesRelationship(relType, subtype, target, prefix)) {
-      targets.push({
-        file: target,
-        rId: rId,
-        number: stripNumber,
-        type: type,
-        subtype: subtype,
-      } as Target);
-    }
-  }
-
-  static targetMatchesRelationship(relType, subtype, target, prefix) {
-    if (relType === 'package') return true;
-
-    return relType === subtype && target.indexOf(prefix) === 0;
-  }
-
   static async getTargetsFromRelationships(
     archive: JSZip,
     path: string,
     prefix: string | string[],
-    suffix?: string | RegExp,
   ): Promise<Target[]> {
     const prefixes = typeof prefix === 'string' ? [prefix] : prefix;
 
@@ -186,6 +156,45 @@ export class XmlHelper {
     );
   }
 
+  static pushRelTargets(element: Element, prefix: string, targets: Target[]) {
+    const type = element.getAttribute('Type');
+    const file = element.getAttribute('Target');
+    const rId = element.getAttribute('Id');
+
+    const subtype = _.last(prefix.split('/'));
+    const relType = _.last(type.split('/'));
+    const filename = _.last(file.split('/'));
+    const filenameExt = _.last(filename.split('.'));
+    const filenameMatch = filename
+      .replace('.' + filenameExt, '')
+      .match(/^(.+?)(\d+)*$/);
+
+    const number =
+      filenameMatch && filenameMatch[2] ? Number(filenameMatch[2]) : 0;
+    const filenameBase =
+      filenameMatch && filenameMatch[1] ? filenameMatch[1] : filename;
+
+    if (XmlHelper.targetMatchesRelationship(relType, subtype, file, prefix)) {
+      targets.push({
+        file,
+        rId,
+        number,
+        type,
+        subtype,
+        prefix,
+        filename,
+        filenameExt,
+        filenameBase,
+      } as Target);
+    }
+  }
+
+  static targetMatchesRelationship(relType, subtype, target, prefix) {
+    if (relType === 'package') return true;
+
+    return relType === subtype && target.indexOf(prefix) === 0;
+  }
+
   static async getTargetsByRelationshipType(
     archive: JSZip,
     path: string,
@@ -278,7 +287,6 @@ export class XmlHelper {
       archive,
       relsPath,
       params.prefix,
-      params.expression,
     );
     const target = imageRels.find((rel) => rel.rId === sourceRid);
 

src/modify/modify-chart.ts

@@ -47,10 +47,9 @@ export class ModifyChart {
 
     this.chart = new ModifyXmlHelper(chart);
     this.workbook = new ModifyXmlHelper(workbook.sheet);
-
-    if (workbook.table) {
-      this.workbookTable = new ModifyXmlHelper(workbook.table);
-    }
+    this.workbookTable = workbook.table
+      ? new ModifyXmlHelper(workbook.table)
+      : null;
 
     this.sharedStrings = workbook.sharedStrings;
 
@@ -65,7 +64,6 @@ export class ModifyChart {
     this.setSeriesDataLabels();
     this.setPointStyles();
     this.sliceChartSpace();
-
     this.modifyWorkbook();
 
     // XmlHelper.dump(this.chart.root as XMLDocument)
@@ -75,7 +73,6 @@ export class ModifyChart {
     this.setExtData();
     this.setExtSeries();
     this.sliceExtChartSpace();
-
     this.modifyWorkbook();
   }
 

src/shapes/chart.ts

@@ -199,7 +199,6 @@ export class Chart extends Shape implements IChart {
       this.sourceArchive,
       this.wbRelsPath,
       `${this.wbEmbeddingsPath}${this.worksheetFilePrefix}`,
-      this.wbExtension,
     );
 
     const worksheet = worksheets[0];
@@ -216,16 +215,9 @@ export class Chart extends Shape implements IChart {
       this.sourceArchive,
       targetRelFile,
       this.wbEmbeddingsPath,
-      this.wbExtension,
     );
 
-    const wbPath = relationTargets[0].file
-      .replace(this.wbEmbeddingsPath, '')
-      .replace(this.wbExtension, '');
-
-    const wbTitle = wbPath.match(/^(.+?)(\d+)*$/);
-
-    return wbTitle[0];
+    return relationTargets[0].filenameBase;
   }
 
   async appendTypes(): Promise<void> {

src/types/types.ts

@@ -71,6 +71,10 @@ export type Target = {
   rId?: string;
   prefix?: string;
   subtype?: ElementSubtype;
+  type: string;
+  filename: string;
+  filenameExt: string;
+  filenameBase: string;
 };
 export type ImportElement = {
   presName: string;