fix(types): fix slide selector; minor fixes

Author: singerla

src/automizer.ts

@@ -1,6 +1,6 @@
 import { Slide } from './classes/slide';
 import { FileHelper } from './helper/file-helper';
-import { AutomizerParams, AutomizerSummary } from './types/types';
+import {AutomizerParams, AutomizerSummary, SourceSlideIdentifier} from './types/types';
 import { IPresentationProps } from './interfaces/ipresentation-props';
 import { PresTemplate } from './interfaces/pres-template';
 import { RootPresTemplate } from './interfaces/root-pres-template';
@@ -144,15 +144,15 @@ export default class Automizer implements IPresentationProps {
   }
 
   /**
-   * Add a slide from one of the imported templates by slide number.
+   * Add a slide from one of the imported templates by slide number or creationId.
    * @param name - Name or alias of the template; must have been loaded with `Automizer.load()`
-   * @param slideNumber - Number of slide in template presentation
+   * @param slideIdentifier - Number or creationId of slide in template presentation
    * @param callback - Executed after slide was added. The newly created slide will be passed to the callback as first argument.
    * @returns Instance of Automizer
    */
   public addSlide(
     name: string,
-    slideNumber: number,
+    slideIdentifier: SourceSlideIdentifier,
     callback?: (slide: Slide) => void,
   ): this {
     if (this.rootTemplate === undefined) {
@@ -164,7 +164,7 @@ export default class Automizer implements IPresentationProps {
     const newSlide = new Slide({
       presentation: this,
       template,
-      slideNumber,
+      slideIdentifier,
     });
 
     if (callback !== undefined) {

src/classes/slide.ts

@@ -7,7 +7,7 @@ import {
   ImportedElement,
   ImportElement,
   SlideModificationCallback,
-  ShapeModificationCallback,
+  ShapeModificationCallback, SourceSlideIdentifier,
 } from '../types/types';
 import { ISlide } from '../interfaces/islide';
 import { IPresentationProps } from '../interfaces/ipresentation-props';
@@ -99,13 +99,12 @@ export class Slide implements ISlide {
   constructor(params: {
     presentation: IPresentationProps;
     template: PresTemplate;
-    slideNumber: number;
+    slideIdentifier: SourceSlideIdentifier;
   }) {
     this.sourceTemplate = params.template;
-    this.sourceNumber = params.slideNumber;
     this.sourceNumber = this.getSlideNumber(
       params.template,
-      params.slideNumber,
+      params.slideIdentifier,
     );
 
     this.sourcePath = `ppt/slides/slide${this.sourceNumber}.xml`;
@@ -115,13 +114,27 @@ export class Slide implements ISlide {
     this.importElements = [];
   }
 
-  getSlideNumber(template, slideNumber) {
+  /**
+   * Try to convert a given slide's creationId to corresponding slide number.
+   * Used if automizer is run with useCreationIds: true
+   * @internal
+   * @param PresTemplate
+   * @slideNumber SourceSlideIdentifier
+   * @returns number
+   */
+  getSlideNumber(template: PresTemplate, slideIdentifier: SourceSlideIdentifier): number {
     if (template.creationIds !== undefined) {
-      return template.creationIds.find(
-        (slideInfo) => slideInfo.id === slideNumber,
-      ).number;
+      const matchCreationId =  template.creationIds.find(
+        (slideInfo) => slideInfo.id === Number(slideIdentifier),
+      )
+
+      if(matchCreationId) {
+        return matchCreationId.number
+      }
+
+      throw('Could not find slide number for creationId: ' + slideIdentifier + '@' + template.name)
     }
-    return slideNumber;
+    return slideIdentifier as number;
   }
 
   /**

src/helper/modify-color-helper.ts

@@ -33,7 +33,6 @@ export default class ModifyColorHelper {
 
     XmlHelper.sliceCollection(solidFill.childNodes as unknown as HTMLCollectionOf<Element>, 0)
     solidFill.appendChild(colorType)
-
   }
 
   static removeNoFill = () => (element: Element): void => {

src/helper/modify-shape-helper.ts

@@ -60,8 +60,9 @@ export default class ModifyShapeHelper {
     const xfrm = element.getElementsByTagName('a:off')[0].parentNode as Element;
 
     Object.keys(pos).forEach((key) => {
-      const value = Math.round(pos[key]);
+      let value = Math.round(pos[key]);
       if(typeof value !== 'number' || !map[key]) return;
+      value = (value < 0) ? 0 : value
 
       xfrm
         .getElementsByTagName(map[key].tag)[0]

src/helper/xml-helper.ts

@@ -10,7 +10,7 @@ import {
 } from '../types/xml-types';
 import { TargetByRelIdMap } from '../constants/constants';
 import { XmlPrettyPrint } from './xml-pretty-print';
-import { GetRelationshipsCallback, Target } from '../types/types';
+import {GetRelationshipsCallback, SourceSlideIdentifier, Target} from '../types/types';
 import { XmlTemplateHelper } from './xml-template-helper';
 
 export class XmlHelper {

src/interfaces/islide.ts

@@ -1,10 +1,10 @@
 import JSZip from 'jszip';
 import { RootPresTemplate } from './root-pres-template';
-import { SlideModificationCallback } from '../types/types';
+import { SlideModificationCallback, SourceSlideIdentifier } from '../types/types';
 
 export interface ISlide {
   sourceArchive: JSZip;
-  sourceNumber: number;
+  sourceNumber: SourceSlideIdentifier;
   modifications: SlideModificationCallback[];
 
   modify(callback: SlideModificationCallback): void;

src/types/types.ts

@@ -1,6 +1,7 @@
 import JSZip from 'jszip';
 import { ElementType } from '../enums/element-type';
 
+export type SourceSlideIdentifier = number | string
 export type SlideModificationCallback = (document: Document) => void;
 export type ShapeModificationCallback = (
   XMLDocument: XMLDocument | Element,