Skip to content

Commit

Permalink
Add in prettier (#1377)
Browse files Browse the repository at this point in the history
* Add in prettier

* Add back swagger packages
  • Loading branch information
joelgriffith committed Mar 26, 2021
1 parent 4f953d3 commit 4fd92f2
Show file tree
Hide file tree
Showing 40 changed files with 2,869 additions and 2,148 deletions.
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 80
}
32 changes: 21 additions & 11 deletions functions/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @param args.page - object - Puppeteer's page object (from await browser.newPage)
* @param args.context - object - An object of parameters that the function is called with. See src/schemas.ts
*/
module.exports = async function content ({ page, context }) {
module.exports = async function content({ page, context }) {
const {
addScriptTag = [],
addStyleTag = [],
Expand Down Expand Up @@ -44,7 +44,11 @@ module.exports = async function content ({ page, context }) {
await page.setJavaScriptEnabled(setJavaScriptEnabled);
}

if (rejectRequestPattern.length || requestInterceptors.length || rejectResourceTypes.length) {
if (
rejectRequestPattern.length ||
requestInterceptors.length ||
rejectResourceTypes.length
) {
await page.setRequestInterception(true);

page.on('request', (req) => {
Expand All @@ -54,8 +58,9 @@ module.exports = async function content ({ page, context }) {
) {
return req.abort();
}
const interceptor = requestInterceptors
.find(r => req.url().match(r.pattern));
const interceptor = requestInterceptors.find((r) =>
req.url().match(r.pattern),
);
if (interceptor) {
return req.respond(interceptor.response);
}
Expand All @@ -81,9 +86,9 @@ module.exports = async function content ({ page, context }) {
// see issue for more details: https://github.com/GoogleChrome/puppeteer/issues/728

await page.setRequestInterception(true);
page.once('request', request => {
page.once('request', (request) => {
request.respond({ body: html });
page.on('request', request => request.continue());
page.on('request', (request) => request.continue());
});

response = await page.goto('http://localhost', gotoOptions);
Expand All @@ -104,14 +109,19 @@ module.exports = async function content ({ page, context }) {
if (waitFor) {
if (typeof waitFor === 'string') {
const isSelector = await page.evaluate((s) => {
try { document.createDocumentFragment().querySelector(s); }
catch (e) { return false; }
try {
document.createDocumentFragment().querySelector(s);
} catch (e) {
return false;
}
return true;
}, waitFor);

await (isSelector ? page.waitForSelector(waitFor) : page.evaluate(`(${waitFor})()`));
await (isSelector
? page.waitForSelector(waitFor)
: page.evaluate(`(${waitFor})()`));
} else {
await new Promise(r => setTimeout(r, waitFor));
await new Promise((r) => setTimeout(r, waitFor));
}
}

Expand All @@ -128,6 +138,6 @@ module.exports = async function content ({ page, context }) {
return {
data,
headers,
type: 'html'
type: 'html',
};
};
73 changes: 41 additions & 32 deletions functions/pdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,19 @@ const buildPages = async (page, opts = {}) => {
});
pageBuffers.push(buffer);
pageCount = pageCount + 1;
} catch(error) {
if (error.message && error.message.includes('Page range exceeds page count')) {
} catch (error) {
if (
error.message &&
error.message.includes('Page range exceeds page count')
) {
complete = true;
} else {
throw error;
}
}
}

return pdftk
.input(pageBuffers)
.cat()
.compress()
.output();
return pdftk.input(pageBuffers).cat().compress().output();
};

module.exports = async function pdf({ page, context }) {
Expand Down Expand Up @@ -89,7 +88,11 @@ module.exports = async function pdf({ page, context }) {
await page.setJavaScriptEnabled(setJavaScriptEnabled);
}

if (rejectRequestPattern.length || requestInterceptors.length || rejectResourceTypes.length) {
if (
rejectRequestPattern.length ||
requestInterceptors.length ||
rejectResourceTypes.length
) {
await page.setRequestInterception(true);

page.on('request', (req) => {
Expand All @@ -99,8 +102,9 @@ module.exports = async function pdf({ page, context }) {
) {
return req.abort();
}
const interceptor = requestInterceptors
.find(r => req.url().match(r.pattern));
const interceptor = requestInterceptors.find((r) =>
req.url().match(r.pattern),
);
if (interceptor) {
return req.respond(interceptor.response);
}
Expand All @@ -111,7 +115,9 @@ module.exports = async function pdf({ page, context }) {
if (emulateMedia) {
// Run the appropriate emulateMedia method, making sure it's bound properly to the page object
// @todo remove when support drops for 3.x.x
const emulateMediaFn = (page.emulateMedia || page.emulateMediaType).bind(page);
const emulateMediaFn = (page.emulateMedia || page.emulateMediaType).bind(
page,
);
await emulateMediaFn(emulateMedia);
}

Expand All @@ -137,9 +143,9 @@ module.exports = async function pdf({ page, context }) {
// see issue for more details: https://github.com/GoogleChrome/puppeteer/issues/728

await page.setRequestInterception(true);
page.once('request', request => {
page.once('request', (request) => {
request.respond({ body: html });
page.on('request', request => request.continue());
page.on('request', (request) => request.continue());
});

response = await page.goto('http://localhost', gotoOptions);
Expand All @@ -160,35 +166,38 @@ module.exports = async function pdf({ page, context }) {
if (waitFor) {
if (typeof waitFor === 'string') {
const isSelector = await page.evaluate((s) => {
try { document.createDocumentFragment().querySelector(s); }
catch (e) { return false; }
try {
document.createDocumentFragment().querySelector(s);
} catch (e) {
return false;
}
return true;
}, waitFor);

await (isSelector ? page.waitForSelector(waitFor) : page.evaluate(`(${waitFor})()`));
await (isSelector
? page.waitForSelector(waitFor)
: page.evaluate(`(${waitFor})()`));
} else {
await new Promise(r => setTimeout(r, waitFor));
await new Promise((r) => setTimeout(r, waitFor));
}
}

let data = safeMode ?
await buildPages(page, options) :
await page.pdf(options);
let data = safeMode
? await buildPages(page, options)
: await page.pdf(options);

if (rotate) {
const pdftk = require('node-pdftk');
const rotateValue = rotate === 90 ?
'1-endright' :
rotate === -90 ?
'1-endleft' :
rotate === 180 ?
'1-enddown' :
'';

data = await pdftk
.input(data)
.rotate(rotateValue)
.output();
const rotateValue =
rotate === 90
? '1-endright'
: rotate === -90
? '1-endleft'
: rotate === 180
? '1-enddown'
: '';

data = await pdftk.input(data).rotate(rotateValue).output();
}

const headers = {
Expand Down
Loading

0 comments on commit 4fd92f2

Please sign in to comment.