@pdfme/generator 4.5.2 → 5.0.0-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdfme/generator",
-  "version": "4.5.2",
+  "version": "5.0.0-dev.2",
   "sideEffects": false,
   "author": "hand-dot",
   "license": "MIT",
@@ -59,6 +59,9 @@
   "jest": {
     "resolver": "ts-jest-resolver",
     "globalTeardown": "<rootDir>/teardown.mjs",
+    "moduleNameMapper": {
+      "^@pdfme/schemas/utils$": "<rootDir>/../schemas/src/utils.ts"
+    },
     "moduleFileExtensions": [
       "js",
       "ts"

package/src/generate.ts

@@ -1,7 +1,7 @@
 import * as pdfLib from '@pdfme/pdf-lib';
 import type { GenerateProps } from '@pdfme/common';
 import { checkGenerateProps, getDynamicTemplate } from '@pdfme/common';
-import { getDynamicHeightsForTable } from '@pdfme/schemas';
+import { getDynamicHeightsForTable } from '@pdfme/schemas/utils';
 import {
   insertPage,
   preprocessing,
@@ -36,26 +36,30 @@ const generate = async (props: GenerateProps) => {
       options,
       _cache,
       getDynamicHeights: (value, args) => {
-        if (args.schema.type !== 'table') return Promise.resolve([args.schema.height]);
-        return getDynamicHeightsForTable(value, args);
+        switch (args.schema.type) {
+          case 'table':
+            return getDynamicHeightsForTable(value, args);
+          default:
+            return Promise.resolve([args.schema.height]);
+        }
       },
     });
     const { basePages, embedPdfBoxes } = await getEmbedPdfPages({
       template: dynamicTemplate,
       pdfDoc,
     });
-    const keys = [
-      ...new Set(dynamicTemplate.schemas.flatMap((schemaObj) => Object.keys(schemaObj))),
+    const schemaNames = [
+      ...new Set(dynamicTemplate.schemas.flatMap((page) => page.map((schema) => schema.name))),
     ];
 
     for (let j = 0; j < basePages.length; j += 1) {
       const basePage = basePages[j];
       const embedPdfBox = embedPdfBoxes[j];
       const page = insertPage({ basePage, embedPdfBox, pdfDoc });
-      for (let l = 0; l < keys.length; l += 1) {
-        const key = keys[l];
-        const schemaObj = dynamicTemplate.schemas[j] || {};
-        const schema = schemaObj[key];
+      for (let l = 0; l < schemaNames.length; l += 1) {
+        const name = schemaNames[l];
+        const schemaPage = dynamicTemplate.schemas[j] || [];
+        const schema = schemaPage.find((s) => s.name == name);
         if (!schema) {
           continue;
         }
@@ -64,8 +68,8 @@ const generate = async (props: GenerateProps) => {
         if (!render) {
           continue;
         }
-        const value = schema.readOnly ? schema.content || '' : input[key];
-        await render({ key, value, schema, basePdf, pdfLib, pdfDoc, page, options, _cache });
+        const value = schema.readOnly ? schema.content || '' : input[name];
+        await render({ value, schema, basePdf, pdfLib, pdfDoc, page, options, _cache });
       }
     }
   }

package/src/helper.ts

@@ -59,10 +59,10 @@ export const getEmbedPdfPages = async (arg: { template: Template; pdfDoc: PDFDoc
 };
 
 export const validateRequiredFields = (template: Template, inputs: Record<string, any>[]) => {
-  template.schemas.forEach((schemaObj) =>
-    Object.entries(schemaObj).forEach(([fieldName, schema]) => {
-      if (schema.required && !schema.readOnly && !inputs.some((input) => input[fieldName])) {
-        throw new Error(`[@pdfme/generator] input for '${fieldName}' is required to generate this PDF`);
+  template.schemas.forEach((schemaPage) =>
+    schemaPage.forEach(schema => {
+      if (schema.required && !schema.readOnly && !inputs.some((input) => input[schema.name])) {
+        throw new Error(`[@pdfme/generator] input for '${schema.name}' is required to generate this PDF`);
       }
     })
   );
@@ -82,9 +82,7 @@ export const preprocessing = async (arg: { template: Template; userPlugins: Plug
       : Object.values(builtInPlugins)
   ) as Plugin<Schema>[];
 
-  const schemaTypes = schemas.flatMap((schemaObj) =>
-    Object.values(schemaObj).map((schema) => schema.type)
-  );
+  const schemaTypes = schemas.flatMap(schemaPage => schemaPage.map((schema) => schema.type));
 
   const renderObj = schemaTypes.reduce((acc, type) => {
     const render = pluginValues.find((pv) => pv.propPanel.defaultSchema.type === type);

package/tsconfig.json

@@ -8,6 +8,9 @@
       ],
       "@pdfme/schemas": [
         "packages/schemas/dist/esm/src"
+      ],
+      "@pdfme/schemas/utils": [
+        "packages/schemas/dist/esm/src/utils"
       ]
     }
   },