diff --git a/package.json b/package.json index 74d1f96..7124bcb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdf2pic", - "version": "2.0.0", + "version": "2.1.0", "description": "A utility for converting pdf to image and base64 format.", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/src/graphics.ts b/src/graphics.ts index 50011c2..6261f30 100644 --- a/src/graphics.ts +++ b/src/graphics.ts @@ -82,7 +82,8 @@ export class Graphics { return resolve({ name: path.basename(output), - size: fs.statSync(output).size / 1000.0, + size: `${this.width}x${this.height}`, + fileSize: fs.statSync(output).size / 1000.0, path: output, page: page + 1 }); diff --git a/src/types/convert.ts b/src/types/convert.ts index fbb5378..9fe1549 100644 --- a/src/types/convert.ts +++ b/src/types/convert.ts @@ -3,7 +3,7 @@ import { ToBase64Response } from "@module/types/toBase64Response"; export type Convert = { - bulk?: (pages?: number | number[], toBase64?: boolean) => Promise<(Promise | Promise)[]>; + bulk?: (pages?: number | number[], toBase64?: boolean) => Promise; setOptions?: () => void; diff --git a/src/types/writeImageResponse.ts b/src/types/writeImageResponse.ts index 880c731..e4d61f4 100644 --- a/src/types/writeImageResponse.ts +++ b/src/types/writeImageResponse.ts @@ -1,6 +1,7 @@ export type WriteImageResponse = { name?: string; - size?: number; + size?: string; + fileSize?: number; path?: string; page?: number; } diff --git a/src/utils/bulk/bulkConvert.ts b/src/utils/bulk/bulkConvert.ts index 597d0ab..3307b76 100644 --- a/src/utils/bulk/bulkConvert.ts +++ b/src/utils/bulk/bulkConvert.ts @@ -4,7 +4,7 @@ import { convertToStream } from "@module/utils/converters/convertToStream"; import { WriteImageResponse } from "@module/types/writeImageResponse"; import { ToBase64Response } from "@module/types/toBase64Response"; -export async function bulkConvert(gm: Graphics, source: string, filePath: string | Buffer, pageNumber: number | number[] = 1, toBase64 = false): Promise<(Promise | Promise)[]> { +export async function bulkConvert(gm: Graphics, source: string, filePath: string | Buffer, pageNumber: number | number[] = 1, toBase64 = false): Promise { if (pageNumber !== -1 && pageNumber < 1) { throw new Error("Page number should be more than or equal 1"); } @@ -27,5 +27,5 @@ export async function bulkConvert(gm: Graphics, source: string, filePath: string return gm.writeImage(stream, (page - 1)); }); - return pages; + return Promise.all(pages); } diff --git a/src/utils/pdf2picCore.ts b/src/utils/pdf2picCore.ts index 4ae5aeb..44c1593 100644 --- a/src/utils/pdf2picCore.ts +++ b/src/utils/pdf2picCore.ts @@ -26,7 +26,7 @@ export function pdf2picCore(source: string, filePath: string | Buffer, options = return gm.writeImage(stream, (page - 1)); }; - convert.bulk = (pages: number | number[], toBase64 = false): Promise<(Promise | Promise)[]> => { + convert.bulk = (pages: number | number[], toBase64 = false): Promise => { return bulkConvert(gm, source, filePath, pages, toBase64); } diff --git a/test/index.test.ts b/test/index.test.ts index 24322cb..3208750 100644 --- a/test/index.test.ts +++ b/test/index.test.ts @@ -72,7 +72,7 @@ describe("PDF2Pic Core", () => { expect(info.size.height).to.be.equal(512); }); - it.skip("should convert pdf to pic (file input, bulk all pages)", async () => { + it("should convert pdf to pic (file input, bulk all pages)", async () => { const gm = new Graphics(); const options = { ...baseOptions,