Merge pull request #123 from CIRFMF/release/1.1.16-HF1

release/1.1.16-HF1

Author: MichalChudyAKMF

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@akmf/ksef-fe-invoice-converter",
-  "version": "1.1.16",
+  "version": "1.1.16-HF1",
   "scripts": {
     "dev": "vite --mode public --config vite.config.ts",
     "build": "vite build --mode production",

package.json

@@ -11,18 +11,15 @@ describe('generatePDFUPO', () => {
       field2: 'value2',
     },
   };
+  const mockBlob = new Blob(['pdf content'], { type: 'application/pdf' });
 
   beforeEach(() => {
     vi.spyOn(XMLParser, 'parseXML').mockResolvedValue(dummyUpo);
 
     vi.spyOn(pdfMake, 'createPdf').mockImplementation(
       () =>
         ({
-          getBlob: (callback: (blob: Blob | null) => void) => {
-            const blob = new Blob(['PDF content'], { type: 'application/pdf' });
-
-            callback(blob);
-          },
+          getBlob: vi.fn(() => Promise.resolve(mockBlob)),
         }) as any
     );
   });
@@ -43,17 +40,7 @@ describe('generatePDFUPO', () => {
       reader.readAsText(blob);
     });
 
-    expect(text).toContain('PDF content');
-  });
-
-  it('rejects promise if pdfMake returns null blob', async () => {
-    vi.spyOn(pdfMake, 'createPdf').mockReturnValue({
-      getBlob: (callback: (blob: Blob | null) => void) => {
-        callback(null);
-      },
-    } as any);
-
-    await expect(generatePDFUPO(dummyFile)).rejects.toEqual('Error');
+    expect(text).toContain('pdf content');
   });
 
   it('calls parseXML with the input file', async () => {

src/lib-public/UPO-4_2-generators.spec.ts

@@ -5,7 +5,7 @@ import { generateStyle } from '../shared/PDF-functions';
 import { generateNaglowekUPO } from './generators/UPO4_2/Naglowek';
 import { parseXML } from '../shared/XML-parser';
 import { Position } from '../shared/enums/common.enum';
-import { generateDokumentUPO } from './generators/UPO4_3/Dokumenty';
+import { generateDokumentUPO } from './generators/UPO4_2/Dokumenty';
 
 export async function generatePDFUPO(file: File): Promise<Blob> {
   const upo = (await parseXML(file)) as Upo;
@@ -23,13 +23,5 @@ export async function generatePDFUPO(file: File): Promise<Blob> {
     },
   };
 
-  return new Promise((resolve, reject): void => {
-    pdfMake.createPdf(docDefinition).getBlob((blob: Blob): void => {
-      if (blob) {
-        resolve(blob);
-      } else {
-        reject('Error');
-      }
-    });
-  });
+  return pdfMake.createPdf(docDefinition).getBlob();
 }

src/lib-public/UPO-4_2-generators.ts

@@ -160,6 +160,6 @@ describe('createVersionLabel', () => {
       .pop();
     expect(versionLabel).toContain('Aplikacja Podatnika KSeF');
     expect(versionLabel).toContain('ksef-pdf-generator');
-    expect(version).toMatch(/^(\d+\.)?(\d+\.)?(\*|\d+)$/);
+    expect(version).toMatch(/^\d+\.\d+\.\d+(-[A-Za-z0-9]+)?$/);
   });
 });