@pdfme/generator 5.3.1-dev.15 → 5.3.1-dev.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -29,8 +29,7 @@ const utils_1 = require("@pdfme/schemas/utils");
29
29
  const helper_js_1 = require("./helper.js");
30
30
  const generate = async (props) => {
31
31
  (0, common_1.checkGenerateProps)(props);
32
- const { inputs, template: _template, options = {}, plugins: userPlugins = {} } = props;
33
- const template = (0, common_1.cloneDeep)(_template);
32
+ const { inputs, template, options = {}, plugins: userPlugins = {} } = props;
34
33
  const basePdf = template.basePdf;
35
34
  if (inputs.length === 0) {
36
35
  throw new Error('[@pdfme/generator] inputs should not be empty, pass at least an empty object in the array');
@@ -64,8 +63,6 @@ const generate = async (props) => {
64
63
  for (let j = 0; j < basePages.length; j += 1) {
65
64
  const basePage = basePages[j];
66
65
  const embedPdfBox = embedPdfBoxes[j];
67
- const boundingBoxLeft = basePage instanceof pdfLib.PDFEmbeddedPage ? (0, common_1.pt2mm)(embedPdfBox.mediaBox.x) : 0;
68
- const boundingBoxBottom = basePage instanceof pdfLib.PDFEmbeddedPage ? (0, common_1.pt2mm)(embedPdfBox.mediaBox.y) : 0;
69
66
  const page = (0, helper_js_1.insertPage)({ basePage, embedPdfBox, pdfDoc });
70
67
  if ((0, common_1.isBlankPdf)(basePdf) && basePdf.staticSchema) {
71
68
  for (let k = 0; k < basePdf.staticSchema.length; k += 1) {
@@ -79,10 +76,6 @@ const generate = async (props) => {
79
76
  variables: { ...input, totalPages: basePages.length, currentPage: j + 1 },
80
77
  schemas: dynamicTemplate.schemas,
81
78
  });
82
- staticSchema.position = {
83
- x: staticSchema.position.x + boundingBoxLeft,
84
- y: staticSchema.position.y - boundingBoxBottom,
85
- };
86
79
  await render({
87
80
  value,
88
81
  schema: staticSchema,
@@ -113,20 +106,7 @@ const generate = async (props) => {
113
106
  schemas: dynamicTemplate.schemas,
114
107
  })
115
108
  : input[name] || '';
116
- schema.position = {
117
- x: schema.position.x + boundingBoxLeft,
118
- y: schema.position.y - boundingBoxBottom,
119
- };
120
- await render({
121
- value,
122
- schema,
123
- basePdf,
124
- pdfLib,
125
- pdfDoc,
126
- page,
127
- options,
128
- _cache,
129
- });
109
+ await render({ value, schema, basePdf, pdfLib, pdfDoc, page, options, _cache });
130
110
  }
131
111
  }
132
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,10 @@
1
1
  import * as pdfLib from '@pdfme/pdf-lib';
2
- import { checkGenerateProps, getDynamicTemplate, isBlankPdf, replacePlaceholders, pt2mm, cloneDeep, } from '@pdfme/common';
2
+ import { checkGenerateProps, getDynamicTemplate, isBlankPdf, replacePlaceholders, } from '@pdfme/common';
3
3
  import { getDynamicHeightsForTable } from '@pdfme/schemas/utils';
4
4
  import { insertPage, preprocessing, postProcessing, getEmbedPdfPages, validateRequiredFields, } from './helper.js';
5
5
  const generate = async (props) => {
6
6
  checkGenerateProps(props);
7
- const { inputs, template: _template, options = {}, plugins: userPlugins = {} } = props;
8
- const template = cloneDeep(_template);
7
+ const { inputs, template, options = {}, plugins: userPlugins = {} } = props;
9
8
  const basePdf = template.basePdf;
10
9
  if (inputs.length === 0) {
11
10
  throw new Error('[@pdfme/generator] inputs should not be empty, pass at least an empty object in the array');
@@ -39,8 +38,6 @@ const generate = async (props) => {
39
38
  for (let j = 0; j < basePages.length; j += 1) {
40
39
  const basePage = basePages[j];
41
40
  const embedPdfBox = embedPdfBoxes[j];
42
- const boundingBoxLeft = basePage instanceof pdfLib.PDFEmbeddedPage ? pt2mm(embedPdfBox.mediaBox.x) : 0;
43
- const boundingBoxBottom = basePage instanceof pdfLib.PDFEmbeddedPage ? pt2mm(embedPdfBox.mediaBox.y) : 0;
44
41
  const page = insertPage({ basePage, embedPdfBox, pdfDoc });
45
42
  if (isBlankPdf(basePdf) && basePdf.staticSchema) {
46
43
  for (let k = 0; k < basePdf.staticSchema.length; k += 1) {
@@ -54,10 +51,6 @@ const generate = async (props) => {
54
51
  variables: { ...input, totalPages: basePages.length, currentPage: j + 1 },
55
52
  schemas: dynamicTemplate.schemas,
56
53
  });
57
- staticSchema.position = {
58
- x: staticSchema.position.x + boundingBoxLeft,
59
- y: staticSchema.position.y - boundingBoxBottom,
60
- };
61
54
  await render({
62
55
  value,
63
56
  schema: staticSchema,
@@ -88,20 +81,7 @@ const generate = async (props) => {
88
81
  schemas: dynamicTemplate.schemas,
89
82
  })
90
83
  : input[name] || '';
91
- schema.position = {
92
- x: schema.position.x + boundingBoxLeft,
93
- y: schema.position.y - boundingBoxBottom,
94
- };
95
- await render({
96
- value,
97
- schema,
98
- basePdf,
99
- pdfLib,
100
- pdfDoc,
101
- page,
102
- options,
103
- _cache,
104
- });
84
+ await render({ value, schema, basePdf, pdfLib, pdfDoc, page, options, _cache });
105
85
  }
106
86
  }
107
87
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pdfme/generator",
3
- "version": "5.3.1-dev.15",
3
+ "version": "5.3.1-dev.4",
4
4
  "sideEffects": false,
5
5
  "author": "hand-dot",
6
6
  "license": "MIT",
@@ -58,6 +58,7 @@
58
58
  },
59
59
  "jest": {
60
60
  "resolver": "ts-jest-resolver",
61
+ "globalTeardown": "<rootDir>/teardown.mjs",
61
62
  "moduleNameMapper": {
62
63
  "^@pdfme/schemas/utils$": "<rootDir>/../schemas/src/utils.ts",
63
64
  "^.+\\\\.(css|less|scss)$": "identity-obj-proxy"
package/src/generate.ts CHANGED
@@ -5,8 +5,6 @@ import {
5
5
  getDynamicTemplate,
6
6
  isBlankPdf,
7
7
  replacePlaceholders,
8
- pt2mm,
9
- cloneDeep,
10
8
  } from '@pdfme/common';
11
9
  import { getDynamicHeightsForTable } from '@pdfme/schemas/utils';
12
10
  import {
@@ -19,9 +17,7 @@ import {
19
17
 
20
18
  const generate = async (props: GenerateProps) => {
21
19
  checkGenerateProps(props);
22
- const { inputs, template: _template, options = {}, plugins: userPlugins = {} } = props;
23
- const template = cloneDeep(_template);
24
-
20
+ const { inputs, template, options = {}, plugins: userPlugins = {} } = props;
25
21
  const basePdf = template.basePdf;
26
22
 
27
23
  if (inputs.length === 0) {
@@ -64,12 +60,6 @@ const generate = async (props: GenerateProps) => {
64
60
  for (let j = 0; j < basePages.length; j += 1) {
65
61
  const basePage = basePages[j];
66
62
  const embedPdfBox = embedPdfBoxes[j];
67
-
68
- const boundingBoxLeft =
69
- basePage instanceof pdfLib.PDFEmbeddedPage ? pt2mm(embedPdfBox.mediaBox.x) : 0;
70
- const boundingBoxBottom =
71
- basePage instanceof pdfLib.PDFEmbeddedPage ? pt2mm(embedPdfBox.mediaBox.y) : 0;
72
-
73
63
  const page = insertPage({ basePage, embedPdfBox, pdfDoc });
74
64
 
75
65
  if (isBlankPdf(basePdf) && basePdf.staticSchema) {
@@ -85,11 +75,6 @@ const generate = async (props: GenerateProps) => {
85
75
  schemas: dynamicTemplate.schemas,
86
76
  });
87
77
 
88
- staticSchema.position = {
89
- x: staticSchema.position.x + boundingBoxLeft,
90
- y: staticSchema.position.y - boundingBoxBottom,
91
- };
92
-
93
78
  await render({
94
79
  value,
95
80
  schema: staticSchema,
@@ -123,21 +108,7 @@ const generate = async (props: GenerateProps) => {
123
108
  })
124
109
  : input[name] || '';
125
110
 
126
- schema.position = {
127
- x: schema.position.x + boundingBoxLeft,
128
- y: schema.position.y - boundingBoxBottom,
129
- };
130
-
131
- await render({
132
- value,
133
- schema,
134
- basePdf,
135
- pdfLib,
136
- pdfDoc,
137
- page,
138
- options,
139
- _cache,
140
- });
111
+ await render({ value, schema, basePdf, pdfLib, pdfDoc, page, options, _cache });
141
112
  }
142
113
  }
143
114
  }
package/teardown.mjs ADDED
@@ -0,0 +1,17 @@
1
+ import path from 'path';
2
+ import { readdir, unlink } from 'fs/promises';
3
+
4
+ export default async () => {
5
+ const dir = path.join(path.dirname(''), '__tests__/assets/pdfs/tmp');
6
+ const files = await readdir(dir);
7
+
8
+ for (const file of files) {
9
+ if (file !== '.gitkeep') {
10
+ try {
11
+ await unlink(`${dir}/${file}`);
12
+ } catch (e) {
13
+ throw e;
14
+ }
15
+ }
16
+ }
17
+ };