Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ router.get(
basePDFGenerator(Certificate, (req) => ({
name: req.query.name,
age: req.query.age,
}))
})),
);
```

Expand Down Expand Up @@ -70,6 +70,6 @@ export const i18NextPDFMiddleware = pdfMiddlewareBuilder(
I18NextRootContext,
(req) => ({
translate: req.i18n,
})
}),
);
```
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"eslint-plugin-unused-imports": "^2.0.0",
"expect": "^29.2.1",
"lint-staged": "^12.3.4",
"prettier": "2.3.1",
"prettier": "3.3.3",
"typescript": "^4.8.4"
},
"lint-staged": {
Expand Down
16 changes: 8 additions & 8 deletions core/src/builder/pdfMiddlewareBuilder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export type RootDataExtractor<Data> = <
ReqBody,
ResBody,
QueryParams,
Locals extends Record<string, unknown>
Locals extends Record<string, unknown>,
>(
req: Request<Params, ReqBody, ResBody, QueryParams, Locals>
req: Request<Params, ReqBody, ResBody, QueryParams, Locals>,
) => Data & JSX.IntrinsicAttributes;

/**
Expand All @@ -26,21 +26,21 @@ export type PDFGenerator = <
ReqBody,
ResBody,
QueryParams,
Locals extends Record<string, unknown>
Locals extends Record<string, unknown>,
>(
Content: (data: ContentData) => ReactElement,
contentDataExtractor: (
req: Request<Params, ReqBody, ResBody, QueryParams, Locals>
req: Request<Params, ReqBody, ResBody, QueryParams, Locals>,
) => ContentData & JSX.IntrinsicAttributes,
fileName?: string
fileName?: string,
) => RequestHandler<Params, ReqBody, ResBody, QueryParams, Locals>;

/**
* Purpose: build a PDFGenerator middleware from a root node and data extractor
*/
export type PDFMiddlewareBuilder = <RootData>(
Root: (data: RootData) => ReactElement,
rootDataExtractor: RootDataExtractor<RootData>
rootDataExtractor: RootDataExtractor<RootData>,
) => PDFGenerator;

/**
Expand All @@ -52,7 +52,7 @@ export type PDFMiddlewareBuilder = <RootData>(
*/
export const pdfMiddlewareBuilder: PDFMiddlewareBuilder = (
Root,
rootDataExtractor
rootDataExtractor,
) => {
return (Content, contentDataExtractor, fileName = "export.pdf") => {
return async (req, res, next) => {
Expand All @@ -61,7 +61,7 @@ export const pdfMiddlewareBuilder: PDFMiddlewareBuilder = (
{
Root,
rootData: rootDataExtractor(req),
}
},
);

// Setting up the response headers
Expand Down
8 changes: 4 additions & 4 deletions core/src/builder/pdfWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { renderToStream } from "@react-pdf/renderer";

export type PDFWrapperData = <
ContentData extends JSX.IntrinsicAttributes,
RootData
RootData,
>(
content: {
Content: (data: ContentData) => ReactElement;
Expand All @@ -12,7 +12,7 @@ export type PDFWrapperData = <
root: {
Root: (data: RootData) => ReactElement;
rootData: RootData;
}
},
) => Promise<NodeJS.ReadableStream>;

/**
Expand All @@ -23,10 +23,10 @@ export type PDFWrapperData = <
*/
export const pdfWrapper: PDFWrapperData = (
{ Content, contentData },
{ Root, rootData }
{ Root, rootData },
) =>
renderToStream(
<Root {...rootData}>
<Content {...contentData}></Content>
</Root>
</Root>,
);
2 changes: 1 addition & 1 deletion core/src/middleware/basePDFGenerator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import { pdfMiddlewareBuilder } from "../builder/pdfMiddlewareBuilder";

export const basePDFGenerator = pdfMiddlewareBuilder(
BaseRootContext,
() => ({})
() => ({}),
);
12 changes: 6 additions & 6 deletions core/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2431,7 +2431,7 @@ __metadata:
expect: ^29.2.1
express: ^4.18.1
lint-staged: ^12.3.4
prettier: 2.3.1
prettier: 3.3.3
react: ^18.2.0
typescript: ^4.8.4
languageName: unknown
Expand Down Expand Up @@ -4010,12 +4010,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:2.3.1":
version: 2.3.1
resolution: "prettier@npm:2.3.1"
"prettier@npm:3.3.3":
version: 3.3.3
resolution: "prettier@npm:3.3.3"
bin:
prettier: bin-prettier.js
checksum: 3b37731ff7150feecf19736c77c790e7e276b404ac9af81cbaf87cfecefc48ef9a864f34c2a5caf5955378b8f2525984b8611703a0d9c1f052b4cfa6eb35899f
prettier: bin/prettier.cjs
checksum: bc8604354805acfdde6106852d14b045bb20827ad76a5ffc2455b71a8257f94de93f17f14e463fe844808d2ccc87248364a5691488a3304f1031326e62d9276e
languageName: node
linkType: hard

Expand Down