@pdfme/generator 4.5.2-dev.3 → 4.5.2-dev.5
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.
- package/dist/cjs/__tests__/integration3.test.js +1 -2
- package/dist/cjs/__tests__/integration3.test.js.map +1 -1
- package/dist/cjs/src/generate.js +11 -6
- package/dist/cjs/src/generate.js.map +1 -1
- package/dist/esm/__tests__/integration3.test.js +2 -3
- package/dist/esm/__tests__/integration3.test.js.map +1 -1
- package/dist/esm/src/generate.js +11 -6
- package/dist/esm/src/generate.js.map +1 -1
- package/package.json +4 -1
- package/src/generate.ts +11 -5
- package/tsconfig.json +3 -0
|
@@ -42,13 +42,12 @@ describe('generate integration test(other, shape)', () => {
|
|
|
42
42
|
plugins: {
|
|
43
43
|
text: schemas_1.text,
|
|
44
44
|
image: schemas_1.image,
|
|
45
|
+
svg: schemas_1.svg,
|
|
45
46
|
line: schemas_1.line,
|
|
46
47
|
rectangle: schemas_1.rectangle,
|
|
47
48
|
ellipse: schemas_1.ellipse,
|
|
48
49
|
signature,
|
|
49
50
|
qrcode: schemas_1.barcodes.qrcode,
|
|
50
|
-
readOnlyText: schemas_1.readOnlyText,
|
|
51
|
-
readOnlySvg: schemas_1.readOnlySvg,
|
|
52
51
|
},
|
|
53
52
|
options: { font },
|
|
54
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration3.test.js","sourceRoot":"","sources":["../../../__tests__/integration3.test.ts"],"names":[],"mappings":";;;;;AAAA,2BAAmC;AACnC,+DAAuC;AACvC,kDAAkD;AAClD,0CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"integration3.test.js","sourceRoot":"","sources":["../../../__tests__/integration3.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/src/generate.js
CHANGED
|
@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const pdfLib = __importStar(require("@pdfme/pdf-lib"));
|
|
27
27
|
const common_1 = require("@pdfme/common");
|
|
28
|
-
const
|
|
28
|
+
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);
|
|
@@ -45,16 +45,21 @@ const generate = async (props) => {
|
|
|
45
45
|
options,
|
|
46
46
|
_cache,
|
|
47
47
|
getDynamicHeights: (value, args) => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
switch (args.schema.type) {
|
|
49
|
+
case 'table':
|
|
50
|
+
return (0, utils_1.getDynamicHeightsForTable)(value, args);
|
|
51
|
+
default:
|
|
52
|
+
return Promise.resolve([args.schema.height]);
|
|
53
|
+
}
|
|
51
54
|
},
|
|
52
55
|
});
|
|
53
56
|
const { basePages, embedPdfBoxes } = await (0, helper_js_1.getEmbedPdfPages)({
|
|
54
57
|
template: dynamicTemplate,
|
|
55
58
|
pdfDoc,
|
|
56
59
|
});
|
|
57
|
-
const schemaNames = [
|
|
60
|
+
const schemaNames = [
|
|
61
|
+
...new Set(dynamicTemplate.schemas.flatMap((page) => page.map((schema) => schema.name))),
|
|
62
|
+
];
|
|
58
63
|
for (let j = 0; j < basePages.length; j += 1) {
|
|
59
64
|
const basePage = basePages[j];
|
|
60
65
|
const embedPdfBox = embedPdfBoxes[j];
|
|
@@ -62,7 +67,7 @@ const generate = async (props) => {
|
|
|
62
67
|
for (let l = 0; l < schemaNames.length; l += 1) {
|
|
63
68
|
const name = schemaNames[l];
|
|
64
69
|
const schemaPage = dynamicTemplate.schemas[j] || [];
|
|
65
|
-
const schema = schemaPage.find(s => s.name == name);
|
|
70
|
+
const schema = schemaPage.find((s) => s.name == name);
|
|
66
71
|
if (!schema) {
|
|
67
72
|
continue;
|
|
68
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AAEzC,0CAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { writeFileSync } from 'fs';
|
|
|
2
2
|
import generate from '../src/generate';
|
|
3
3
|
import { other, shape } from './assets/templates';
|
|
4
4
|
import { getInputFromTemplate } from '@pdfme/common';
|
|
5
|
-
import { text, image, line, rectangle, ellipse,
|
|
5
|
+
import { text, image, svg, line, rectangle, ellipse, barcodes, } from '@pdfme/schemas';
|
|
6
6
|
import { getFont, getPdf, getPdfTmpPath, getPdfAssertPath } from './utils';
|
|
7
7
|
const signature = {
|
|
8
8
|
pdf: image.pdf,
|
|
@@ -37,13 +37,12 @@ describe('generate integration test(other, shape)', () => {
|
|
|
37
37
|
plugins: {
|
|
38
38
|
text,
|
|
39
39
|
image,
|
|
40
|
+
svg,
|
|
40
41
|
line,
|
|
41
42
|
rectangle,
|
|
42
43
|
ellipse,
|
|
43
44
|
signature,
|
|
44
45
|
qrcode: barcodes.qrcode,
|
|
45
|
-
readOnlyText,
|
|
46
|
-
readOnlySvg,
|
|
47
46
|
},
|
|
48
47
|
options: { font },
|
|
49
48
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration3.test.js","sourceRoot":"","sources":["../../../__tests__/integration3.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EACL,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,SAAS,EACT,OAAO,EACP,
|
|
1
|
+
{"version":3,"file":"integration3.test.js","sourceRoot":"","sources":["../../../__tests__/integration3.test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/src/generate.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pdfLib from '@pdfme/pdf-lib';
|
|
2
2
|
import { checkGenerateProps, getDynamicTemplate } from '@pdfme/common';
|
|
3
|
-
import { getDynamicHeightsForTable } from '@pdfme/schemas';
|
|
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);
|
|
@@ -20,16 +20,21 @@ const generate = async (props) => {
|
|
|
20
20
|
options,
|
|
21
21
|
_cache,
|
|
22
22
|
getDynamicHeights: (value, args) => {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
switch (args.schema.type) {
|
|
24
|
+
case 'table':
|
|
25
|
+
return getDynamicHeightsForTable(value, args);
|
|
26
|
+
default:
|
|
27
|
+
return Promise.resolve([args.schema.height]);
|
|
28
|
+
}
|
|
26
29
|
},
|
|
27
30
|
});
|
|
28
31
|
const { basePages, embedPdfBoxes } = await getEmbedPdfPages({
|
|
29
32
|
template: dynamicTemplate,
|
|
30
33
|
pdfDoc,
|
|
31
34
|
});
|
|
32
|
-
const schemaNames = [
|
|
35
|
+
const schemaNames = [
|
|
36
|
+
...new Set(dynamicTemplate.schemas.flatMap((page) => page.map((schema) => schema.name))),
|
|
37
|
+
];
|
|
33
38
|
for (let j = 0; j < basePages.length; j += 1) {
|
|
34
39
|
const basePage = basePages[j];
|
|
35
40
|
const embedPdfBox = embedPdfBoxes[j];
|
|
@@ -37,7 +42,7 @@ const generate = async (props) => {
|
|
|
37
42
|
for (let l = 0; l < schemaNames.length; l += 1) {
|
|
38
43
|
const name = schemaNames[l];
|
|
39
44
|
const schemaPage = dynamicTemplate.schemas[j] || [];
|
|
40
|
-
const schema = schemaPage.find(s => s.name == name);
|
|
45
|
+
const schema = schemaPage.find((s) => s.name == name);
|
|
41
46
|
if (!schema) {
|
|
42
47
|
continue;
|
|
43
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,
|
|
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": "4.5.2-dev.
|
|
3
|
+
"version": "4.5.2-dev.5",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"author": "hand-dot",
|
|
6
6
|
"license": "MIT",
|
|
@@ -59,6 +59,9 @@
|
|
|
59
59
|
"jest": {
|
|
60
60
|
"resolver": "ts-jest-resolver",
|
|
61
61
|
"globalTeardown": "<rootDir>/teardown.mjs",
|
|
62
|
+
"moduleNameMapper": {
|
|
63
|
+
"^@pdfme/schemas/utils$": "<rootDir>/../schemas/src/utils.ts"
|
|
64
|
+
},
|
|
62
65
|
"moduleFileExtensions": [
|
|
63
66
|
"js",
|
|
64
67
|
"ts"
|
package/src/generate.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as pdfLib from '@pdfme/pdf-lib';
|
|
2
2
|
import type { GenerateProps } from '@pdfme/common';
|
|
3
3
|
import { checkGenerateProps, getDynamicTemplate } from '@pdfme/common';
|
|
4
|
-
import { getDynamicHeightsForTable } from '@pdfme/schemas';
|
|
4
|
+
import { getDynamicHeightsForTable } from '@pdfme/schemas/utils';
|
|
5
5
|
import {
|
|
6
6
|
insertPage,
|
|
7
7
|
preprocessing,
|
|
@@ -36,15 +36,21 @@ const generate = async (props: GenerateProps) => {
|
|
|
36
36
|
options,
|
|
37
37
|
_cache,
|
|
38
38
|
getDynamicHeights: (value, args) => {
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
switch (args.schema.type) {
|
|
40
|
+
case 'table':
|
|
41
|
+
return getDynamicHeightsForTable(value, args);
|
|
42
|
+
default:
|
|
43
|
+
return Promise.resolve([args.schema.height]);
|
|
44
|
+
}
|
|
41
45
|
},
|
|
42
46
|
});
|
|
43
47
|
const { basePages, embedPdfBoxes } = await getEmbedPdfPages({
|
|
44
48
|
template: dynamicTemplate,
|
|
45
49
|
pdfDoc,
|
|
46
50
|
});
|
|
47
|
-
const schemaNames = [
|
|
51
|
+
const schemaNames = [
|
|
52
|
+
...new Set(dynamicTemplate.schemas.flatMap((page) => page.map((schema) => schema.name))),
|
|
53
|
+
];
|
|
48
54
|
|
|
49
55
|
for (let j = 0; j < basePages.length; j += 1) {
|
|
50
56
|
const basePage = basePages[j];
|
|
@@ -53,7 +59,7 @@ const generate = async (props: GenerateProps) => {
|
|
|
53
59
|
for (let l = 0; l < schemaNames.length; l += 1) {
|
|
54
60
|
const name = schemaNames[l];
|
|
55
61
|
const schemaPage = dynamicTemplate.schemas[j] || [];
|
|
56
|
-
const schema = schemaPage.find(s => s.name == name);
|
|
62
|
+
const schema = schemaPage.find((s) => s.name == name);
|
|
57
63
|
if (!schema) {
|
|
58
64
|
continue;
|
|
59
65
|
}
|