fix(master): rels path for images coming with autoImportSlideMasters

Author: singerla

__tests__/pptx-templates/SlideMasters.pptx

@@ -28,9 +28,10 @@ import { Chart } from '../shapes/chart';
 import { GenericShape } from '../shapes/generic';
 import { ContentTracker } from '../helper/content-tracker';
 import IArchive from '../interfaces/iarchive';
+
+import { vd } from '../helper/general-helper';
 import { IMaster } from '../interfaces/imaster';
 import { XmlRelationshipHelper } from '../helper/xml-relationship-helper';
-import { vd } from '../helper/general-helper';
 
 export class Master implements IMaster {
   /**

src/classes/master.ts

@@ -28,9 +28,9 @@ import { Chart } from '../shapes/chart';
 import { GenericShape } from '../shapes/generic';
 import { ContentTracker } from '../helper/content-tracker';
 import IArchive from '../interfaces/iarchive';
-import { XmlRelationshipHelper } from '../helper/xml-relationship-helper';
 import { last, vd } from '../helper/general-helper';
 import { Master } from './master';
+import { XmlRelationshipHelper } from '../helper/xml-relationship-helper';
 import { IMaster } from '../interfaces/imaster';
 
 export class Slide implements ISlide {
@@ -270,16 +270,22 @@ export class Slide implements ISlide {
       this.sourceArchive,
       sourceLayoutId,
     );
-
     await this.targetTemplate.automizer.addMaster(templateName, sourceMasterId);
 
     const previouslyAddedMaster = last<IMaster>(this.targetTemplate.masters);
-    await this.targetTemplate.appendMasterSlide(previouslyAddedMaster);
+
+    await this.targetTemplate
+      .appendMasterSlide(previouslyAddedMaster)
+      .catch((e) => {
+        throw e;
+      });
+
     const alreadyImported = this.targetTemplate.getMappedContent(
       'slideLayout',
       templateName,
       sourceLayoutId,
     );
+
     return alreadyImported.targetId;
   }
 

src/classes/slide.ts

@@ -11,8 +11,9 @@ import { XmlHelper } from '../helper/xml-helper';
 import { ContentTracker } from '../helper/content-tracker';
 import IArchive from '../interfaces/iarchive';
 import { ArchiveParams } from '../types/types';
-import { IMaster } from '../interfaces/imaster';
+
 import Automizer from '../automizer';
+import { IMaster } from '../interfaces/imaster';
 
 export class Template implements ITemplate {
   /**
@@ -138,15 +139,19 @@ export class Template implements ITemplate {
       await this.initializeCounter();
     }
 
-    await slideMaster.append(this);
+    await slideMaster.append(this).catch((e) => {
+      throw e;
+    });
   }
 
   async appendSlide(slide: ISlide): Promise<void> {
     if (this.counter[0].get() === undefined) {
       await this.initializeCounter();
     }
 
-    await slide.append(this);
+    await slide.append(this).catch((e) => {
+      throw e;
+    });
   }
 
   async countExistingSlides(): Promise<void> {

src/classes/template.ts

@@ -34,12 +34,13 @@ const run = async () => {
 
   const pres = await automizer
     .loadRoot(`EmptyTemplate.pptx`)
+    .load('SlideMasters.pptx')
     .load('SlidesWithAdditionalMaster.pptx')
 
     // We can disable .addMaster according to "autoImportSlideMasters: true"
     // .addMaster('SlidesWithAdditionalMaster.pptx', 1)
 
-    .addSlide('SlidesWithAdditionalMaster.pptx', 3, (slide) => {
+    .addSlide('SlideMasters.pptx', 3, (slide) => {
       // We can also disable "slide.useSlideLayout()"
       // with "autoImportSlideMasters: true"
       // slide.useSlideLayout();

src/dev.ts

@@ -2,8 +2,8 @@ import { ISlide } from './islide';
 import { ICounter } from './icounter';
 import { ITemplate } from './itemplate';
 import { ContentTracker } from '../helper/content-tracker';
-import { IMaster } from './imaster';
 import Automizer from '../automizer';
+import { IMaster } from './imaster';
 
 export interface RootPresTemplate extends ITemplate {
   slides: ISlide[];

src/interfaces/root-pres-template.ts

@@ -128,7 +128,7 @@ export class Image extends Shape implements IImage {
   }
 
   async appendToSlideRels(): Promise<HelperElement> {
-    const targetRelFile = `ppt/slides/_rels/slide${this.targetSlideNumber}.xml.rels`;
+    const targetRelFile = `ppt/${this.targetType}s/_rels/${this.targetType}${this.targetSlideNumber}.xml.rels`;
     this.createdRid = await XmlHelper.getNextRelId(
       this.targetArchive,
       targetRelFile,