diff --git a/src/file/drawing/drawing.ts b/src/file/drawing/drawing.ts index fe79f86673..a514442fb1 100644 --- a/src/file/drawing/drawing.ts +++ b/src/file/drawing/drawing.ts @@ -1,10 +1,10 @@ -import { IData } from "file/media"; +import { IMediaData } from "file/media"; import { XmlComponent } from "file/xml-components"; import { Inline } from "./inline"; export class Drawing extends XmlComponent { - constructor(imageData: IData) { + constructor(imageData: IMediaData) { super("w:drawing"); if (imageData === undefined) { diff --git a/src/file/media/data.ts b/src/file/media/data.ts index ada1231659..6d90e260a2 100644 --- a/src/file/media/data.ts +++ b/src/file/media/data.ts @@ -1,6 +1,6 @@ import * as fs from "fs"; -export interface IData { +export interface IMediaData { referenceId: number; stream: fs.ReadStream; path: string; diff --git a/src/file/media/media.ts b/src/file/media/media.ts index 66cddca4ad..1e2e354298 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -1,15 +1,15 @@ import * as fs from "fs"; import * as path from "path"; -import { IData } from "./data"; +import { IMediaData } from "./data"; export class Media { - private map: Map; + private map: Map; constructor() { - this.map = new Map(); + this.map = new Map(); } - public getMedia(key: string): IData { + public getMedia(key: string): IMediaData { const data = this.map.get(key); if (data === undefined) { @@ -28,8 +28,8 @@ export class Media { }); } - public get array(): IData[] { - const array = new Array(); + public get array(): IMediaData[] { + const array = new Array(); this.map.forEach((data) => { array.push(data); diff --git a/src/file/paragraph/paragraph.ts b/src/file/paragraph/paragraph.ts index 766b7d7d14..0bf128acd3 100644 --- a/src/file/paragraph/paragraph.ts +++ b/src/file/paragraph/paragraph.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPparagraph.php -import { IData } from "file/media"; +import { IMediaData } from "file/media"; import { Num } from "file/numbering/num"; import { XmlComponent } from "file/xml-components"; import { PictureRun, Run, TextRun } from "./run"; @@ -38,7 +38,7 @@ export class Paragraph extends XmlComponent { return run; } - public createPictureRun(imageData: IData): PictureRun { + public createPictureRun(imageData: IMediaData): PictureRun { const run = new PictureRun(imageData); this.addRun(run); return run; diff --git a/src/file/paragraph/run/picture-run.ts b/src/file/paragraph/run/picture-run.ts index f5d7f4e763..c211adcaeb 100644 --- a/src/file/paragraph/run/picture-run.ts +++ b/src/file/paragraph/run/picture-run.ts @@ -1,10 +1,10 @@ import { Drawing } from "../../drawing"; -import { IData } from "../../media/data"; +import { IMediaData } from "../../media/data"; import { Run } from "../run"; export class PictureRun extends Run { - constructor(imageData: IData) { + constructor(imageData: IMediaData) { super(); if (imageData === undefined) {