chore(all): improve type recognition; more robust multi relations; placeholder assignment

Author: singerla

__tests__/read-shape-type.test.ts

@@ -0,0 +1,68 @@
+import Automizer, { XmlElement, XmlHelper } from '../src/index';
+import { ModifyShapeHelper } from '../src';
+
+test('read shape type info', async () => {
+  const automizer = new Automizer({
+    templateDir: `${__dirname}/pptx-templates`,
+    outputDir: `${__dirname}/pptx-output`,
+  });
+
+  const pres = automizer
+    .loadRoot(`RootTemplate.pptx`)
+    .load(`EmptySlide.pptx`, 'empty')
+    .load(`ShapeTypesCollection.pptx`, 'collection');
+
+  pres.addSlide('collection', 1, async (slide) => {
+    slide.modifyElement(
+      'VecorShape (Box with arrow)',
+      (element: XmlElement) => {
+        const type = ModifyShapeHelper.getElementVisualType(element);
+        expect(type).toBe('vectorShape');
+      },
+    );
+
+    slide.modifyElement('Line (Arrow)', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('vectorLine');
+    });
+
+    slide.modifyElement('Table', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('table');
+    });
+
+    slide.modifyElement('Textfield', (element: XmlElement) => {
+      // XmlHelper.dump(element)
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('textField');
+    });
+
+    slide.modifyElement('SmartArt (Diagram)', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('smartArt');
+    });
+
+    slide.modifyElement('Image', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('picture');
+    });
+
+    slide.modifyElement('Chart', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('chart');
+    });
+
+    slide.modifyElement('Pictogram', (element: XmlElement) => {
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('svgImage');
+    });
+
+    slide.modifyElement('SVG Image', (element: XmlElement) => {
+      // XmlHelper.dump(element);
+      const type = ModifyShapeHelper.getElementVisualType(element);
+      expect(type).toBe('svgImage');
+    });
+  });
+
+  await pres.write(`read-shape-type.test.pptx`);
+});

src/classes/has-shapes.ts

@@ -485,6 +485,13 @@ export default class HasShapes {
             this.targetType,
           );
           break;
+        case ElementType.Diagram:
+          await new Diagram(info, this.targetType)[info.mode](
+            this.targetTemplate,
+            this.targetNumber,
+            this.targetType,
+          );
+          break;
         case ElementType.OLEObject:
           await new OLEObject(info, this.targetType, this.sourceArchive)[
             info.mode

src/classes/shape.ts

@@ -178,7 +178,6 @@ export class Shape {
       this.targetSlideFile,
     );
 
-
     const targetElements = await this.getElementsByRid(
       targetSlideXml,
       this.sourceRid,
@@ -194,6 +193,10 @@ export class Shape {
       }
     });
 
+    // if(cb && typeof cb === 'function') {
+    //   XmlHelper.dump(targetSlideXml)
+    // }
+
     XmlHelper.writeXmlToArchive(
       this.targetArchive,
       this.targetSlideFile,