Merge branch 'feature-add-media-files' into main

Author: singerla

__tests__/add-media.test.ts

@@ -0,0 +1,31 @@
+import Automizer from '../src/automizer';
+
+test('create presentation and add media shapes', async () => {
+  const automizer = new Automizer({
+    templateDir: `${__dirname}/pptx-templates`,
+    outputDir: `${__dirname}/pptx-output`,
+  });
+
+  const pres = automizer
+    .loadRoot(`RootTemplate.pptx`)
+    .load(`EmptySlide.pptx`, 'emptySlide')
+    .load(`SlideWithMedia.pptx`, 'media');
+
+  pres.addSlide('emptySlide', 1, (slide) => {
+    slide.addElement('media', 1, 'audio');
+  });
+
+  pres.addSlide('emptySlide', 1, (slide) => {
+    slide.addElement('media', 2, 'video');
+    slide.addElement('media', 1, 'audio');
+  });
+
+  // TODO: Process related media content on added slides
+  // pres.addSlide('media', 1, (slide) => {
+  //   slide.addElement('media', 2, 'video');
+  // });
+
+  const result = await pres.write(`add-media.test.pptx`);
+
+  // expect(result.images).toBe(6);
+});

__tests__/add-svg-images.test.ts

@@ -16,7 +16,10 @@ test('create presentation and append slides with images', async () => {
     slide.addElement('images', 1, 'Leaf');
   });
 
+  // TODO: Process related svg content on added slides
+  // pres.addSlide('images', 1);
+
   const result = await pres.write(`add-svg-images.test.pptx`);
 
-  expect(result.images).toBe(4);
+  expect(result.images).toBe(10);
 });

__tests__/pptx-templates/SlideWithMedia.pptx

@@ -41,6 +41,7 @@ export class Shape {
 
   relRootTag: string;
   relAttribute: string;
+  relType: string;
   relParent: (element: XmlElement) => XmlElement;
 
   targetElement: XmlElement;
@@ -93,13 +94,15 @@ export class Shape {
   async setTargetElement(): Promise<void> {
     if (!this.sourceElement) {
       // If we don't have a source element, we might be trying to remove a hyperlink
-      console.log(`Warning: No source element for shape ${this.name}. Creating empty element for operations.`);
+      console.log(
+        `Warning: No source element for shape ${this.name}. Creating empty element for operations.`,
+      );
       if (this.shape && this.shape.mode === 'remove' && this.targetArchive) {
         // For remove operations, we don't need a source element
         // Just continue without setting targetElement
         return;
       }
-      
+
       // For non-remove operations or if other conditions aren't met, throw the error
       console.log(this.shape);
       throw `No source element for shape ${this.name}`;
@@ -133,25 +136,28 @@ export class Shape {
   async processHyperlinks(targetSlideXml: XmlDocument): Promise<void> {
     // Find all text runs in the element
     const runs = this.targetElement.getElementsByTagName('a:r');
-    
+
     for (let i = 0; i < runs.length; i++) {
       const run = runs[i];
       const rPr = run.getElementsByTagName('a:rPr')[0];
-      
+
       if (rPr) {
         // Find hyperlink elements
         const hlinkClicks = rPr.getElementsByTagName('a:hlinkClick');
-        
+
         for (let j = 0; j < hlinkClicks.length; j++) {
           const hlinkClick = hlinkClicks[j];
           const sourceRid = hlinkClick.getAttribute('r:id');
-          
+
           if (sourceRid) {
             // Update the r:id attribute to use the created relationship ID
             hlinkClick.setAttribute('r:id', this.createdRid);
-            
+
             // Ensure the xmlns:r attribute is set
-            hlinkClick.setAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+            hlinkClick.setAttribute(
+              'xmlns:r',
+              'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
+            );
           }
         }
       }
@@ -252,7 +258,8 @@ export class Shape {
 
   async updateTargetElementRelId(): Promise<void> {
     this.targetElement
-      .getElementsByTagName(this.relRootTag)[0]
+      .getElementsByTagName(this.relRootTag)
+      .item(0)
       .setAttribute(this.relAttribute, this.createdRid);
   }
 

src/classes/shape.ts

@@ -111,6 +111,12 @@ export class Slide extends HasShapes implements ISlide {
     return this;
   }
 
+  /**
+   * The current slide will be fully calculated, but removed from slide
+   * sortation.
+   */
+  drop() {}
+
   /**
    * Find another slide layout by name.
    * @param targetLayoutName

src/classes/slide.ts

@@ -4,38 +4,61 @@ import {
   TrackedRelationTag,
 } from '../types/types';
 
-export const TargetByRelIdMap = {
+export const TargetByRelIdMap: Record<string, TargetByRelIdMapParam> = {
   chart: {
     relRootTag: 'c:chart',
     relAttribute: 'r:id',
     prefix: '../charts/chart',
-  } as TargetByRelIdMapParam,
+  },
   chartEx: {
     relRootTag: 'cx:chart',
     relAttribute: 'r:id',
     prefix: '../charts/chartEx',
-  } as TargetByRelIdMapParam,
+  },
   image: {
     relRootTag: 'a:blip',
     relAttribute: 'r:embed',
     prefix: '../media/image',
-  } as TargetByRelIdMapParam,
+  },
   'image:svg': {
     relRootTag: 'asvg:svgBlip',
     relAttribute: 'r:embed',
     prefix: '../media/image',
-  } as TargetByRelIdMapParam,
+  },
+  'image:media': {
+    relRootTag: 'p14:media',
+    relAttribute: 'r:embed',
+    relType: 'http://schemas.microsoft.com/office/2007/relationships/media',
+    prefix: '../media/media',
+    findAll: true,
+  },
+  'image:audioFile': {
+    relRootTag: 'a:audioFile',
+    relAttribute: 'r:link',
+    prefix: '../media/media',
+    relType:
+      'http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio',
+    findAll: true,
+  },
+  'image:videoFile': {
+    relRootTag: 'a:videoFile',
+    relAttribute: 'r:link',
+    prefix: '../media/media',
+    relType:
+      'http://schemas.openxmlformats.org/officeDocument/2006/relationships/video',
+    findAll: true,
+  },
   hyperlink: {
     relRootTag: 'a:hlinkClick',
     relAttribute: 'r:id',
     prefix: '',
     findAll: true,
-  } as TargetByRelIdMapParam,
+  },
   oleObject: {
     relRootTag: 'p:oleObj',
     relAttribute: 'r:id',
     prefix: '../embeddings/oleObject',
-  } as TargetByRelIdMapParam,
+  },
 };
 
 export const imagesTrack: () => TrackedRelation[] = () => [

src/constants/constants.ts

@@ -7,20 +7,26 @@ const run = async () => {
   const automizer = new Automizer({
     templateDir,
     outputDir,
-    autoImportSlideMasters: true,
-    cleanupPlaceholders: true,
   });
 
   let pres = automizer
     .loadRoot(`RootTemplate.pptx`)
-    .load(`EmptySlidePlaceholders.pptx`, 'placeholder')
-    .load(`EmptySlide.pptx`, 'emptySlide');
+    .load(`EmptySlide.pptx`, 'emptySlide')
+    .load(`SlideWithMedia.pptx`, 'media');
 
-  pres.addSlide('emptySlide', 1, (slide) => {
-    slide.addElement('placeholder', 1, 'Titel 4');
+  // pres.addSlide('emptySlide', 1, (slide) => {
+  //   slide.addElement('media', 1, 'audio');
+  // });
+  //
+  // pres.addSlide('emptySlide', 1, (slide) => {
+  //   slide.addElement('media', 2, 'video');
+  // });
+
+  pres.addSlide('media', 1, (slide) => {
+    //slide.addElement('media', 2, 'video');
   });
 
-  pres.write(`myOutputPresentation.pptx`).then((summary) => {
+  pres.write(`testMedia.pptx`).then((summary) => {
     console.log(summary);
   });
 };

src/dev.ts

@@ -4,6 +4,7 @@ export enum ContentTypeMap {
   png = 'image/png',
   gif = 'image/gif',
   svg = 'image/svg+xml',
+  mp3 = 'audio/mp3',
   m4v = 'video/mp4',
   mp4 = 'video/mp4',
   emf = 'image/x-emf',

src/enums/content-type-map.ts

@@ -285,6 +285,7 @@ export class XmlHelper {
     const relationshipItems = xml.getElementsByTagName(tag);
 
     const rels = [];
+
     for (const i in relationshipItems) {
       if (relationshipItems[i].getAttribute) {
         cb(relationshipItems[i], rels);
@@ -353,15 +354,15 @@ export class XmlHelper {
     type: string,
   ): Promise<Target> {
     const params = TargetByRelIdMap[type];
-    
+
     // For elements that need to search all instances (like hyperlinks)
     if (params.findAll) {
       // Find all hyperlink elements
       const hyperlinks = element.getElementsByTagName(params.relRootTag);
       if (hyperlinks.length > 0) {
         // Use the first hyperlink found
         const sourceRid = hyperlinks[0].getAttribute(params.relAttribute);
-        
+
         // Get all relationships
         const allRels = await XmlHelper.getRelationshipItems(
           archive,
@@ -375,25 +376,34 @@ export class XmlHelper {
               element: element,
               isExternal: element.getAttribute('TargetMode') === 'External',
             } as Target);
-          }
+          },
         );
-        
+
         // Find the matching relationship
         const target = allRels.find((rel) => rel.rId === sourceRid);
         return target;
       }
     } else {
       // Standard behavior for other element types
       const sourceRid = element
-        .getElementsByTagName(params.relRootTag)[0]
-        .getAttribute(params.relAttribute);
+        .getElementsByTagName(params.relRootTag)
+        .item(0)
+        ?.getAttribute(params.relAttribute);
+
+      if (!sourceRid) {
+        throw 'No sourceRid for ' + params.relRootTag;
+      }
 
       const shapeRels = await XmlHelper.getRelationshipTargetsByPrefix(
         archive,
         relsPath,
         params.prefix,
       );
-      const target = shapeRels.find((rel) => rel.rId === sourceRid);
+
+      const target = shapeRels.find((rel) => {
+        return rel.rId === sourceRid;
+      });
+
       return target;
     }
   }