Merge branch 'refactor-re-import-output'

# Conflicts:
#	src/helper/xml-slide-helper.ts

Author: singerla

src/dev.ts

@@ -1,39 +1,96 @@
 import Automizer, { modify } from './index';
 import { vd } from './helper/general-helper';
+import * as fs from 'fs';
 
 const run = async () => {
   const outputDir = `${__dirname}/../__tests__/pptx-output`;
   const templateDir = `${__dirname}/../__tests__/pptx-templates`;
 
-  const automizer = new Automizer({
+  // Step 1: Create a pptx with images and a chart inside.
+  // The chart is modified by pptx-automizer
+
+  const writer = new Automizer({
     templateDir,
-    outputDir
+    outputDir,
+    verbosity: 0,
+    removeExistingSlides: true
   });
 
-  const pres = automizer
+  const pres = writer
     .loadRoot(`RootTemplate.pptx`)
+    .load(`EmptySlide.pptx`, 'empty')
+    .load(`SlideWithImages.pptx`, 'images')
     .load(`ChartBarsStacked.pptx`, 'charts');
 
   const dataSmaller = {
-    series: [
-      { label: 'series s1' },
-      { label: 'series s2' }
-    ],
+    series: [{ label: 'series s1' }, { label: 'series s2' }],
     categories: [
-      { label: 'item test r1', values: [ 10, null ] },
-      { label: 'item test r2', values: [ 12, 18 ] },
+      { label: 'item test r1', values: [10, null] },
+      { label: 'item test r2', values: [12, 18] },
     ],
-  }
+  };
 
-  const result = await pres
+  await pres
+    .addSlide('empty', 1, (slide) => {
+      slide.addElement('images', 1, 'Grafik 5');
+    })
     .addSlide('charts', 1, (slide) => {
-      slide.modifyElement('BarsStacked', [
-        modify.setChartData(dataSmaller),
-      ]);
+      slide.modifyElement('BarsStacked', [modify.setChartData(dataSmaller)]);
     })
-    .write(`modify-chart-stacked-bars.test.pptx`)
+    .write(`modify-automizer-generated-file.tmp.test.pptx`);
+
+  // Step 2: Create a copy of the generated file in templateDir
+  // and load it as a normal template
+
+  await fs.promises.copyFile(
+    `${outputDir}/modify-automizer-generated-file.tmp.test.pptx`,
+    `${templateDir}/PptxAutomizerGeneratedFile.pptx`,
+  );
+
+  const reader = new Automizer({
+    templateDir,
+    outputDir,
+    // This will display all log() output
+    verbosity: 2
+  });
+
+
+  const dataSmallerMod = {
+    series: [{ label: 'series s3' }, { label: 'series s4' }],
+    categories: [
+      { label: 'item test r3', values: [22, 45] },
+      { label: 'item test r4', values: [23, 46] },
+      { label: 'item test r5', values: [24, 47] },
+    ],
+  };
+
+  const pres2 = reader
+    .loadRoot(`RootTemplate.pptx`)
+    .load(`EmptySlide.pptx`, 'empty')
+    .load(`SlideWithImages.pptx`, 'images')
+    .load(`PptxAutomizerGeneratedFile.pptx`, 'generated')
+
+  const presInfo = await pres2.getInfo();
+  const slides = presInfo
+    .slidesByTemplate(`generated`)
+
+  console.log(`The re-imported file PptxAutomizerGeneratedFile.pptx seems to have ${slides.length} slides`)
+  // But only 2 slides were expected with removeExistingSlides: true
+
+  const result2 = await pres2
+    .addSlide('empty', 1, (slide) => {
+      slide.addElement('images', 1, 'Grafik 5');
+    })
+    .addSlide('generated', 2, (slide) => {
+      slide.addElement('images', 1, 'Grafik 5');
+    })
+    .addSlide('generated', 3, (slide) => {
+      slide.modifyElement('BarsStacked', [modify.setChartData(dataSmallerMod)]);
+    })
+    .write(`modify-automizer-generated-file.test.pptx`);
+
+  vd(result2)
 
-  vd(result)
 };
 
 run().catch((error) => {

src/helper/general-helper.ts

@@ -31,7 +31,7 @@ export interface Logger {
   verbosity: 0 | 1 | 2;
   target: 'console' | 'file';
   log: (
-    message: string,
+    message: string | number | object,
     verbosity: Logger['verbosity'],
     showStack?: boolean,
     target?: Logger['target'],
@@ -58,7 +58,7 @@ export const Logger = <Logger>{
   },
 };
 
-export const log = (message: string, verbosity: Logger['verbosity']) => {
+export const log = (message: string | number | object, verbosity: Logger['verbosity']) => {
   Logger.log(message, verbosity);
 };
 

src/helper/modify-xml-helper.ts

@@ -151,6 +151,10 @@ export default class ModifyXmlHelper {
         throw 'Unable to set value @index: ' + index;
       }
 
+      if(!valueElement[0].firstChild) {
+        return
+      }
+
       valueElement[0].firstChild.textContent = String(value);
       if (index !== undefined) {
         element.setAttribute('idx', String(index));

src/helper/xml-template-helper.ts

@@ -38,6 +38,14 @@ export class XmlTemplateHelper {
       this.relType,
     );
 
+    // ToDo: The slide list is based on the relations from this.path
+    // which contains non-visible slides, too.
+    // Should be either:
+    //  a.) remove unused slides on generation
+    //  b.) use slides list from 'p:sldIdLst' in `ppt/presentation.xml`
+    vd(this.relType)
+    vd(this.path)
+
     const creationIds: SlideInfo[] = [];
     for (const slideRel of relationships) {
       try {

src/shapes/chart.ts

@@ -20,7 +20,7 @@ import { RootPresTemplate } from '../interfaces/root-pres-template';
 import { contentTracker } from '../helper/content-tracker';
 import IArchive from '../interfaces/iarchive';
 import { ContentTypeExtension } from '../enums/content-type-map';
-import { log } from '../helper/general-helper';
+import { log, vd } from '../helper/general-helper';
 
 export class Chart extends Shape implements IChart {
   sourceWorksheet: number | string;
@@ -499,13 +499,17 @@ export class Chart extends Shape implements IChart {
   }
 
   async copyWorksheetFile(): Promise<void> {
+    const sourceFile = `ppt/embeddings/${this.worksheetFilePrefix}${this.sourceWorksheet}${this.wbExtension}`;
     const targetFile = `ppt/embeddings/${this.worksheetFilePrefix}${this.targetWorksheet}${this.wbExtension}`;
+
     await FileHelper.zipCopy(
       this.sourceArchive,
-      `ppt/embeddings/${this.worksheetFilePrefix}${this.sourceWorksheet}${this.wbExtension}`,
+      sourceFile,
       this.targetArchive,
       targetFile,
-    );
+    ).catch((e) => {
+      log(e, 2);
+    });
   }
 
   appendChartExtensionToContentType(): Promise<XmlElement | boolean> {