From 5de2d8c7fb291b8aad1bc9aa18544d514762d578 Mon Sep 17 00:00:00 2001 From: arran Date: Fri, 22 Jan 2021 16:45:39 +1100 Subject: [PATCH 1/3] Minor change --- src/import-dotx/import-dotx.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import-dotx/import-dotx.ts b/src/import-dotx/import-dotx.ts index d8d5d1190c..6c509c6383 100644 --- a/src/import-dotx/import-dotx.ts +++ b/src/import-dotx/import-dotx.ts @@ -46,7 +46,7 @@ export interface IDocumentTemplate { } export class ImportDotx { - public async extract(data: Buffer): Promise { + public async extract(data: string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream): Promise { const zipContent = await JSZip.loadAsync(data); const documentContent = await zipContent.files["word/document.xml"].async("text"); From e93b8032d8b5f8def31e2153dc0e6d125084a70c Mon Sep 17 00:00:00 2001 From: arran Date: Fri, 22 Jan 2021 16:48:41 +1100 Subject: [PATCH 2/3] Buffer is required as it was originally there too --- src/import-dotx/import-dotx.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import-dotx/import-dotx.ts b/src/import-dotx/import-dotx.ts index 6c509c6383..80cd0666dd 100644 --- a/src/import-dotx/import-dotx.ts +++ b/src/import-dotx/import-dotx.ts @@ -46,7 +46,7 @@ export interface IDocumentTemplate { } export class ImportDotx { - public async extract(data: string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream): Promise { + public async extract(data: Buffer | string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream): Promise { const zipContent = await JSZip.loadAsync(data); const documentContent = await zipContent.files["word/document.xml"].async("text"); From 3ccf4bdfe32deb23f2691497bc17aec33e5437b6 Mon Sep 17 00:00:00 2001 From: arran Date: Tue, 26 Jan 2021 15:09:12 +1100 Subject: [PATCH 3/3] Ran npm run style.fix added "line_ending" configuration to .editorconfig to match the results --- .editorconfig | 1 + src/import-dotx/import-dotx.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 9b7352176a..46c1eafce3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,7 @@ indent_style = space indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true +end_of_line = lf [*.md] max_line_length = off diff --git a/src/import-dotx/import-dotx.ts b/src/import-dotx/import-dotx.ts index 80cd0666dd..4c77ea75be 100644 --- a/src/import-dotx/import-dotx.ts +++ b/src/import-dotx/import-dotx.ts @@ -46,7 +46,9 @@ export interface IDocumentTemplate { } export class ImportDotx { - public async extract(data: Buffer | string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream): Promise { + public async extract( + data: Buffer | string | number[] | Uint8Array | ArrayBuffer | Blob | NodeJS.ReadableStream, + ): Promise { const zipContent = await JSZip.loadAsync(data); const documentContent = await zipContent.files["word/document.xml"].async("text");