chore(test): addElement / modifyElement / duotone for images

Author: singerla

__tests__/add-external-image.test.ts

@@ -2,12 +2,13 @@ import Automizer from '../src/automizer';
 import { ModifyImageHelper, ModifyShapeHelper } from '../src';
 import { CmToDxa } from '../src/helper/modify-helper';
 
-test('Load external media, add image and set image target', async () => {
+test('Load external media, add/modify image and set image target', async () => {
   const automizer = new Automizer({
     templateDir: `${__dirname}/../__tests__/pptx-templates`,
     outputDir: `${__dirname}/../__tests__/pptx-output`,
     mediaDir: `${__dirname}/../__tests__/media`,
     removeExistingSlides: true,
+    cleanup: true,
   });
 
   const pres = automizer
@@ -17,16 +18,25 @@ test('Load external media, add image and set image target', async () => {
     .load(`SlideWithImages.pptx`, 'images');
 
   pres.addSlide('shapes', 1, (slide) => {
-    slide.addElement('images', 2, 'imagePNG', [
+    slide.addElement('images', 2, 'imagePNGduotone', [
       ModifyShapeHelper.setPosition({
         w: CmToDxa(5),
-        h: CmToDxa(5),
+        h: CmToDxa(3),
       }),
+      ModifyImageHelper.setRelationTarget('feather.png'),
+    ]);
+  });
+
+  pres.addSlide('images', 1, (slide) => {
+    slide.modifyElement('Grafik 5', [
       ModifyImageHelper.setRelationTarget('test.png'),
     ]);
   });
 
   const result = await pres.write(`add-external-image.test.pptx`);
 
-  // expect(result.images).toBe(5);
+  // expect a 5x3cm light-blue duotone feather instead of imagePNG cord loop on page 1
+  // expect imagePNG cord loop on page 2 instead of cut tree jpg
+
+  expect(result.images).toBe(3);
 });

__tests__/modify-image-duotone.test.ts

@@ -17,16 +17,18 @@ test('Add image and set duotone fill', async () => {
   pres.addSlide('shapes', 1, (slide) => {
     slide.addElement('images', 2, 'imagePNGduotone', [
       ModifyImageHelper.setDuotoneFill({
-        tint: 10000,
+        tint: 100000,
         color: {
           type: 'srgbClr',
-          value: 'ffffff',
+          value: 'ff0000',
         },
       }),
     ]);
   });
 
   const result = await pres.write(`modify-image-duotone.test.pptx`);
 
-  // expect(result.images).toBe(5);
+  // Expect cord loop to turn red by duotone overlay
+
+  expect(result.images).toBe(1);
 });

src/dev.ts

@@ -30,38 +30,7 @@ const run = async () => {
           },
         }),
       ]);
-
-      slide.modifyElement('Textfeld 1', [
-        ModifyShapeHelper.setPosition({
-          w: CmToDxa(5),
-          h: CmToDxa(5),
-        }),
-        // ModifyImageHelper.setRelationTarget('feather.png'),
-        // ModifyImageHelper.setDuotoneFill({
-        //   tint: 100000,
-        //   color: {
-        //     type: 'srgbClr',
-        //     value: 'ff850c',
-        //   },
-        // }),
-      ]);
     })
-    // .addSlide('shapes', 1, (slide) => {
-    //   slide.addElement('images', 2, 'imagePNGduotone', [
-    //     ModifyShapeHelper.setPosition({
-    //       w: CmToDxa(5),
-    //       h: CmToDxa(5),
-    //     }),
-    //     ModifyImageHelper.setRelationTarget('feather.png'),
-    //     ModifyImageHelper.setDuotoneFill({
-    //       tint: 100000,
-    //       color: {
-    //         type: 'srgbClr',
-    //         value: 'ff850c',
-    //       },
-    //     }),
-    //   ]);
-    // })
     .write(`modify-shapes.test.pptx`);
 };
 

src/shapes/image.ts

@@ -1,17 +1,12 @@
 import { FileHelper } from '../helper/file-helper';
 import { XmlHelper } from '../helper/xml-helper';
 import { Shape } from '../classes/shape';
-import {
-  HelperElement,
-  RelationshipAttribute,
-  XmlElement,
-} from '../types/xml-types';
+import { RelationshipAttribute, XmlElement } from '../types/xml-types';
 import { ImportedElement, ShapeTargetType, Target } from '../types/types';
 import { IImage } from '../interfaces/iimage';
 import { RootPresTemplate } from '../interfaces/root-pres-template';
 import { ElementType } from '../enums/element-type';
 import IArchive from '../interfaces/iarchive';
-import { vd } from '../helper/general-helper';
 import { ContentTypeExtension } from '../enums/content-type-map';
 
 export class Image extends Shape implements IImage {
@@ -136,7 +131,7 @@ export class Image extends Shape implements IImage {
 
     await this.copyFiles();
     await this.appendTypes();
-    this.createdRelation = await this.appendToSlideRels();
+    await this.appendToSlideRels();
   }
 
   async copyFiles(): Promise<void> {
@@ -158,33 +153,26 @@ export class Image extends Shape implements IImage {
    * remain existing in the .xml.rels file. PowerPoint will not complain, but
    * integrity checks will not be valid by this.
    */
-  async appendToSlideRels(): Promise<XmlElement> {
+  async appendToSlideRels(): Promise<void> {
     const targetRelFile = `ppt/${this.targetType}s/_rels/${this.targetType}${this.targetSlideNumber}.xml.rels`;
     this.createdRid = await XmlHelper.getNextRelId(
       this.targetArchive,
       targetRelFile,
     );
 
-    // this.target.element.setAttribute('Id', this.createdRid);
-    // this.target.element.setAttribute(
-    //   'Target',
-    //   `../media/image${this.targetNumber}.${this.extension}`,
-    // );
-
     const attributes = {
       Id: this.createdRid,
       Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
       Target: `../media/image${this.targetNumber}.${this.extension}`,
     } as RelationshipAttribute;
 
-    const newRelation = (await XmlHelper.append(
+    this.createdRelation = await XmlHelper.append(
       XmlHelper.createRelationshipChild(
         this.targetArchive,
         targetRelFile,
         attributes,
       ),
-    )) as unknown as XmlElement;
-    return newRelation;
+    );
   }
 
   hasSvgRelation(): boolean {