Offload media methods into Media static object

Simplified File handling of images

src/file/document/document.ts

@@ -61,14 +61,14 @@ export class Document extends XmlComponent {
         this.body.push(pictureParagraph);
     }
 
-    public createDrawing(imageData: IMediaData): PictureRun {
+    public createDrawing(imageData: IMediaData): Paragraph {
         const paragraph = new Paragraph();
         const run = new PictureRun(imageData);
 
         paragraph.addRun(run);
         this.addDrawing(paragraph);
 
-        return run;
+        return paragraph;
     }
 
     get Body(): Body {

src/file/file.ts

@@ -10,7 +10,7 @@ import { FootNotes } from "./footnotes";
 import { HeaderWrapper } from "./header-wrapper";
 import { Media } from "./media";
 import { Numbering } from "./numbering";
-import { Bookmark, Hyperlink, Paragraph, PictureRun } from "./paragraph";
+import { Bookmark, Hyperlink, Paragraph } from "./paragraph";
 import { Relationships } from "./relationships";
 import { Styles } from "./styles";
 import { ExternalStylesFactory } from "./styles/external-styles-factory";
@@ -32,7 +32,7 @@ export class File {
     private readonly contentTypes: ContentTypes;
     private readonly appProperties: AppProperties;
 
-    private nextId: number = 1;
+    private currentRelationshipId: number = 1;
 
     constructor(options?: IPropertiesOptions, sectionPropertiesOptions?: SectionPropertiesOptions) {
         if (!options) {
@@ -55,19 +55,19 @@ export class File {
         this.numbering = new Numbering();
         this.docRelationships = new Relationships();
         this.docRelationships.createRelationship(
-            this.nextId++,
+            this.currentRelationshipId++,
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",
             "styles.xml",
         );
         this.docRelationships.createRelationship(
-            this.nextId++,
+            this.currentRelationshipId++,
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering",
             "numbering.xml",
         );
         this.contentTypes = new ContentTypes();
 
         this.docRelationships.createRelationship(
-            this.nextId++,
+            this.currentRelationshipId++,
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes",
             "footnotes.xml",
         );
@@ -125,24 +125,19 @@ export class File {
         return this.document.createTable(rows, cols);
     }
 
-    public createImage(image: string): PictureRun {
-        const mediaData = this.media.addMedia(image, this.nextId++);
-        this.docRelationships.createRelationship(
-            mediaData.referenceId,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            `media/${mediaData.fileName}`,
-        );
+    public createImage(filePath: string): Paragraph {
+        const mediaData = Media.addImage(this, filePath);
         return this.document.createDrawing(mediaData);
     }
 
-    public createImageFromBuffer(key: string, data: Buffer, width?: number, height?: number): IMediaData {
-        const mediaData = this.media.addMediaWithData(key, data, this.nextId++, width, height);
-        this.docRelationships.createRelationship(
-            mediaData.referenceId,
-            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-            `media/${mediaData.fileName}`,
-        );
-        return mediaData;
+    public insertImage(mediaData: IMediaData): File {
+        this.document.createDrawing(mediaData);
+        return this;
+    }
+
+    public createImageFromBuffer(data: Buffer, width?: number, height?: number): Paragraph {
+        const mediaData = Media.addImageFromBuffer(this, data, width, height);
+        return this.document.createDrawing(mediaData);
     }
 
     public createHyperlink(link: string, text?: string): Hyperlink {
@@ -180,7 +175,7 @@ export class File {
     }
 
     public createHeader(): HeaderWrapper {
-        const header = new HeaderWrapper(this.media, this.nextId++);
+        const header = new HeaderWrapper(this.media, this.currentRelationshipId++);
         this.headerWrapper.push(header);
         this.docRelationships.createRelationship(
             header.Header.referenceId,
@@ -192,7 +187,7 @@ export class File {
     }
 
     public createFooter(): FooterWrapper {
-        const footer = new FooterWrapper(this.media, this.nextId++);
+        const footer = new FooterWrapper(this.media, this.currentRelationshipId++);
         this.footerWrapper.push(footer);
         this.docRelationships.createRelationship(
             footer.Footer.referenceId,

src/file/media/media.ts

@@ -2,9 +2,43 @@ import * as fs from "fs";
 import * as sizeOf from "image-size";
 import * as path from "path";
 
+import { File } from "../file";
 import { IMediaData } from "./data";
 
+interface IHackedFile {
+    currentRelationshipId: number;
+}
+
 export class Media {
+    public static addImage(file: File, filePath: string): IMediaData {
+        // Workaround to expose id without exposing to API
+        const exposedFile = (file as {}) as IHackedFile;
+        const mediaData = file.Media.addMedia(filePath, exposedFile.currentRelationshipId++);
+        file.DocumentRelationships.createRelationship(
+            mediaData.referenceId,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+            `media/${mediaData.fileName}`,
+        );
+        return mediaData;
+    }
+
+    public static addImageFromBuffer(file: File, data: Buffer, width?: number, height?: number): IMediaData {
+        // Workaround to expose id without exposing to API
+        const exposedFile = (file as {}) as IHackedFile;
+        const mediaData = file.Media.addMediaWithData(`${Media.generateId()}.png`, data, exposedFile.currentRelationshipId++, width, height);
+        file.DocumentRelationships.createRelationship(
+            mediaData.referenceId,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+            `media/${mediaData.fileName}`,
+        );
+        return mediaData;
+    }
+
+    private static generateId(): string {
+        // https://gist.github.com/6174/6062387
+        return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+    }
+
     private readonly map: Map<string, IMediaData>;
 
     constructor() {
@@ -65,6 +99,7 @@ export class Media {
                 },
             },
         };
+
         this.map.set(key, imageData);
 
         return imageData;