@pdfme/generator 1.0.0-beta.9 → 1.0.2

package/dist/types/helper.d.ts

@@ -1,7 +1,7 @@
 import { PDFPage, PDFFont, PDFDocument, PDFImage, PDFEmbeddedPage } from 'pdf-lib';
 import { Schema, Font, BasePdf, BarCodeType } from '@pdfme/common';
 export interface InputImageCache {
-    [key: string]: PDFImage;
+    [key: string]: PDFImage | undefined;
 }
 export declare const createBarCode: (arg: {
     type: BarCodeType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdfme/generator",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.2",
   "author": "hand-dot",
   "license": "MIT",
   "description": "TypeScript base PDF generator and React base UI. Open source, developed by the community, and completely free to use under the MIT license!",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@pdf-lib/fontkit": "^1.1.1",
-    "@pdfme/common": "^1.0.0-beta.7",
+    "@pdfme/common": "^1.0.0",
     "bwip-js": "^2.1.3",
     "pdf-lib": "^1.17.1"
   },

package/src/helper.ts

@@ -9,7 +9,7 @@ import {
   setCharacterSpacing,
   TransformationMatrix,
 } from 'pdf-lib';
-import { ToBufferOptions } from "bwip-js";
+import { ToBufferOptions } from 'bwip-js';
 import bwipjsNode from 'bwip-js/dist/node-bwipjs';
 import bwipjsBrowser from 'bwip-js/dist/bwip-js';
 import {
@@ -35,7 +35,7 @@ import {
 } from '@pdfme/common';
 
 export interface InputImageCache {
-  [key: string]: PDFImage;
+  [key: string]: PDFImage | undefined;
 }
 
 const barCodeType2Bcid = (type: BarCodeType) => (type === 'nw7' ? 'rationalizedCodabar' : type);
@@ -366,6 +366,7 @@ const drawInputByBarcodeSchema = async (arg: {
   inputImageCache: InputImageCache;
 }) => {
   const { input, templateSchema, pageHeight, pdfDoc, page, inputImageCache } = arg;
+  if (!validateBarcodeInput(templateSchema.type as BarCodeType, input)) return;
 
   const { width, height, rotate } = getSchemaSizeAndRotate(templateSchema);
   const opt = {
@@ -377,14 +378,11 @@ const drawInputByBarcodeSchema = async (arg: {
   };
   const inputBarcodeCacheKey = getCacheKey(templateSchema, input);
   let image = inputImageCache[inputBarcodeCacheKey];
-  if (!image && validateBarcodeInput(templateSchema.type as BarCodeType, input)) {
-    const imageBuf = await createBarCode({
-      ...{ ...templateSchema, type: templateSchema.type as BarCodeType },
-      input,
-    });
-    if (imageBuf) {
-      image = await pdfDoc.embedPng(imageBuf);
-    }
+  if (!image) {
+    const imageBuf = await createBarCode(
+      Object.assign(templateSchema, { type: templateSchema.type as BarCodeType, input })
+    );
+    image = await pdfDoc.embedPng(imageBuf);
   }
   inputImageCache[inputBarcodeCacheKey] = image;
   page.drawImage(image, opt);