#113 Fixed regression introduced by relying on incorrect/incomplete t…

…ype annotations of jsZip (zip.file() can return null)

src/__tests__/images.test.ts

@@ -4,7 +4,6 @@ import path from 'path';
 import fs from 'fs';
 import { createReport } from '../index';
 import { Image } from '../types';
-import QR from 'qrcode';
 
 it('001: Issue #61 Correctly renders an SVG image', async () => {
   const template = await fs.promises.readFile(
@@ -144,3 +143,33 @@ it('003: can inject an svg without a thumbnail', async () => {
   const result = await createReport(opts, 'JS');
   expect(result).toMatchSnapshot();
 });
+
+it('004: can inject an image in the document header (regression test for #113)', async () => {
+  const template = await fs.promises.readFile(
+    path.join(__dirname, 'fixtures', 'imageHeader.docx')
+  );
+
+  const opts = {
+    template,
+    data: {},
+    additionalJsContext: {
+      image: async () => {
+        const data = await fs.promises.readFile(
+          path.join(__dirname, 'fixtures', 'sample.png')
+        );
+        return {
+          width: 6,
+          height: 6,
+          data,
+          extension: '.png',
+        };
+      },
+    },
+  };
+
+  // NOTE: bug does not happen when using debug probe arguments ('JS' or 'XML'),
+  // as these exit before the headers are parsed.
+  // TODO: build a snapshot test once _probe === 'XML' properly includes all document XMLs, not just
+  // the main document
+  return expect(createReport(opts)).resolves.toBeInstanceOf(Uint8Array);
+});

src/zip.ts

@@ -1,8 +1,12 @@
 import JSZip from 'jszip';
 
 const zipLoad = (inputFile: ArrayBuffer) => JSZip.loadAsync(inputFile);
-const zipGetText = (zip: JSZip, filename: string) =>
-  zip.file(filename).async('text');
+const zipGetText = (zip: JSZip, filename: string) => {
+  const file_in_zip = zip.file(filename);
+  if (!file_in_zip) return null;
+  return file_in_zip.async('text');
+};
+
 const zipSetText = (zip: JSZip, filename: string, data: string) =>
   zip.file(filename, data);
 const zipSetBinary = (zip: JSZip, filename: string, data: ArrayBuffer) =>