@lighthouse/common 6.2.0-canary.42 → 6.2.0-canary.44

package/dist/helpers/fetch-image-for-pdf-generator-service/index.js

@@ -29,12 +29,10 @@ const fetchImageForPdfGeneratorService = async function (url) {
   }
   const {
     path,
-    queryString
+    queryString,
+    fullPath
   } = parseUrlString(url);
   const transformedBucketImagePath = path + (queryString ? `/${queryString}` : '');
-  console.debug("", {
-    transformedBucketImagePath
-  });
   const alreadyTransformedImage = await fetchResourceFromS3({
     bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,
     key: transformedBucketImagePath
@@ -46,7 +44,7 @@ const fetchImageForPdfGeneratorService = async function (url) {
     });
     return fullDataUrl;
   }
-  const transformerResponse = await requestImageTransformation(url);
+  const transformerResponse = await requestImageTransformation(fullPath);
   const statusCode = transformerResponse.statusCode;
   switch (statusCode) {
     case 200:
@@ -190,15 +188,13 @@ function parseUrlString(urlString) {
   // Get everything after the domain (path + query)
   const fullPath = pathWithoutLeadingSlash + url.search;
   let [path, queryString] = fullPath.split('?');
-
-  // change query string to ve seperated by commas instead of &
-
   queryString = queryString ? queryString.replace(/&/g, ',') : '';
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
   return {
     path,
-    queryString
+    queryString,
+    fullPath
   };
 }

package/dist/pdf/helpers/build-audit-content/index.js

@@ -17,10 +17,8 @@ const buildAuditContent = exports.buildAuditContent = _bluebird.default.method((
         assetUrl,
         link
       }) => {
-        const url = settings.shouldUseCloudfront ? `${settings.cloudfrontBaseUrl}${assetUrl}` : assetUrl;
-
         // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context
-        return (0, _helpers.fetchImage)(url, settings).then(base64String => ({
+        return (0, _helpers.fetchImage)(assetUrl, settings).then(base64String => ({
           alignment: 'center',
           fit: [210, 210],
           image: base64String,

package/lib/helpers/fetch-image-for-pdf-generator-service/index.js

@@ -12,7 +12,7 @@ var s3 = new AWS.S3({
 });
 export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(url) {
-    var urlMatch, applicationId, _parseUrlString, path, queryString, transformedBucketImagePath, alreadyTransformedImage, fullDataUrl, transformerResponse, statusCode, _fullDataUrl, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
+    var urlMatch, applicationId, _parseUrlString, path, queryString, fullPath, transformedBucketImagePath, alreadyTransformedImage, fullDataUrl, transformerResponse, statusCode, _fullDataUrl, redirectLocation, newlyTransformedImage, _fullDataUrl2, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -31,11 +31,8 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           }
           throw new Error('Requestor has insufficient permissions');
         case 2:
-          _parseUrlString = parseUrlString(url), path = _parseUrlString.path, queryString = _parseUrlString.queryString;
+          _parseUrlString = parseUrlString(url), path = _parseUrlString.path, queryString = _parseUrlString.queryString, fullPath = _parseUrlString.fullPath;
           transformedBucketImagePath = path + (queryString ? "/".concat(queryString) : '');
-          console.debug("", {
-            transformedBucketImagePath: transformedBucketImagePath
-          });
           _context.next = 3;
           return fetchResourceFromS3({
             bucketName: "".concat(process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE),
@@ -54,7 +51,7 @@ export var fetchImageForPdfGeneratorService = /*#__PURE__*/function () {
           return _context.abrupt("return", fullDataUrl);
         case 4:
           _context.next = 5;
-          return requestImageTransformation(url);
+          return requestImageTransformation(fullPath);
         case 5:
           transformerResponse = _context.sent;
           statusCode = transformerResponse.statusCode;
@@ -258,16 +255,14 @@ function parseUrlString(urlString) {
     _fullPath$split2 = _slicedToArray(_fullPath$split, 2),
     path = _fullPath$split2[0],
     queryString = _fullPath$split2[1];
-
-  // change query string to ve seperated by commas instead of &
-
   queryString = queryString ? queryString.replace(/&/g, ',') : '';
   if (!path) {
     throw new Error('Invalid URL string: missing path component');
   }
   return {
     path: path,
-    queryString: queryString
+    queryString: queryString,
+    fullPath: fullPath
   };
 }
 //# sourceMappingURL=index.js.map

package/lib/helpers/fetch-image-for-pdf-generator-service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["validateBase64Image","AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","urlMatch","applicationId","_parseUrlString","path","queryString","transformedBucketImagePath","alreadyTransformedImage","fullDataUrl","transformerResponse","statusCode","_fullDataUrl","redirectLocation","newlyTransformedImage","_fullDataUrl2","_t","wrap","_context","prev","next","console","debug","Error","match","parseUrlString","concat","fetchResourceFromS3","bucketName","S3_BUCKET_IMAGE_TRANSFORMER_CACHE","key","sent","body","formatBase64Image","base64String","toString","abrupt","requestImageTransformation","headers","Location","stop","_x","apply","arguments","_x2","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","requestContext","http","method","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x3","_fetchResourceFromS","_callee3","_ref2","_t3","_context3","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code","_ref3","imageType","toLowerCase","includes","base64Flag","isValid","urlString","URL","pathname","pathWithoutLeadingSlash","startsWith","slice","fullPath","search","_fullPath$split","split","_fullPath$split2","_slicedToArray","replace"],"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"sourcesContent":["import { validateBase64Image } from '../image-validators'\nimport AWS from 'aws-sdk'\nconst REGION = process.env.AWS_REGION\n\nconst lambda = new AWS.Lambda({\n  region: REGION,\n})\nconst s3 = new AWS.S3({\n  region: REGION,\n})\n\nexport const fetchImageForPdfGeneratorService = async function (url) {\n  console.debug(\n    'Fetching image via CloudFront For Serverless Pdf Generator Service'\n  )\n  \n  if (!url) {\n    throw new Error('URL is required to fetch image for PDF generator service')\n  }\n\n  const urlMatch = url && url.match(/([a-f0-9]{24})\\//)\n  const applicationId = urlMatch && urlMatch[1]\n\n  if (!applicationId) {\n    throw new Error('Requestor has insufficient permissions')\n  }\n\n  const { path, queryString } = parseUrlString(url)\n\n  const transformedBucketImagePath =\n    path + (queryString ? `/${queryString}` : '')\n  console.debug(\"\",{\n    transformedBucketImagePath,\n  })\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: transformedBucketImagePath,\n  })\n    \n  if (alreadyTransformedImage?.body) {\n    const fullDataUrl = formatBase64Image({\n      base64String: alreadyTransformedImage.body.toString('base64'),\n      key: transformedBucketImagePath,\n    })\n    return fullDataUrl\n  }\n\n  const transformerResponse = await requestImageTransformation(url)\n\n  const statusCode = transformerResponse.statusCode\n\n  switch (statusCode) {\n    case 200: {\n      console.debug('Image transformation successful')\n\n      const fullDataUrl = formatBase64Image({\n        base64String: transformerResponse.body.toString('base64'),\n        key: url,\n      })\n\n      return fullDataUrl\n    }\n    case 302: {\n      console.debug(\n        'Image transformation successful but image is too big for lambda delivery, fetching directly from S3'\n      )\n      const redirectLocation = transformerResponse.headers.Location\n\n      if (!redirectLocation) {\n        throw new Error('Redirect response received but no location provided')\n      }\n\n      const newlyTransformedImage = await fetchResourceFromS3({\n        bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n        key: transformedBucketImagePath,\n      })\n      console.debug('Image successfully fetched from S3 at:', redirectLocation)\n\n      const fullDataUrl = formatBase64Image({\n        base64String: newlyTransformedImage.body.toString('base64'),\n        key: transformedBucketImagePath,\n      })\n\n      return fullDataUrl\n    }\n    case 400:\n      throw new Error(\n        `Bad request to image transformer: ${transformerResponse.body}`\n      )\n    case 403:\n      throw new Error('Requested transformed image is too big')\n    case 404:\n      throw new Error('The requested image does not exist')\n    case 500:\n      throw new Error(\n        `Image transformation failed: ${transformerResponse.body}`\n      )\n    default:\n      throw new Error(\n        `Unexpected response from image transformer: ${statusCode} - ${transformerResponse.body}`\n      )\n  }\n}\n\nexport async function requestImageTransformation(key) {\n  if (!key) {\n    throw new Error('Image Path is required for image transformation')\n  }\n\n  console.debug(\n    'ImageTransformation: Invoking image transformer lambda for path:',\n    key\n  )\n\n  const lambdaEvent = {\n    requestContext: {\n      http: {\n        method: 'GET',\n        path: key,\n      },\n    },\n  }\n\n  const params = {\n    FunctionName: process.env.IMAGE_TRANSFORMER_ARN,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify(lambdaEvent),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    const response = JSON.parse(result.Payload)\n\n    return response\n  } catch (error) {\n    const errorMessage = `Failed to invoke image transformer lambda: ${error.message}`\n    console.error(errorMessage, error)\n    throw new Error(errorMessage)\n  }\n}\n\nexport async function fetchResourceFromS3({ bucketName, key }) {\n  console.debug(\n    `Fetching resource from S3 Bucket: '${bucketName}' at path: '${key}'`\n  )\n  if (!bucketName || !key) {\n    throw new Error(\n      'bucketName and key are required for S3 resource fetch ' +\n        JSON.stringify({ bucketName, key })\n    )\n  }\n\n  const params = {\n    Bucket: bucketName,\n    Key: key,\n  }\n\n  try {\n    const result = await s3.getObject(params).promise()\n\n    return {\n      body: result.Body,\n      contentType: result.ContentType,\n      contentLength: result.ContentLength,\n      lastModified: result.LastModified,\n      etag: result.ETag,\n    }\n  } catch (error) {\n    if (error.code !== 'NoSuchKey') {\n      console.error('Failed to fetch image:', error)\n      throw new Error(`Failed to fetch image: ${bucketName}/${key}`)\n    }\n\n    console.debug('Image not found in transformed bucket, invoking transformer')\n  }\n}\n\nexport function formatBase64Image({ base64String, key }) {\n  if (!key) {\n    throw new Error('Key is required for image formatting')\n  }\n\n  const imageType = key.toLowerCase().includes('.png') ? 'png' : 'jpeg'\n  const base64Flag = `data:image/${imageType};base64,`\n  const fullDataUrl = `${base64Flag}${base64String}`\n\n  // Validate the formatted data URL\n  const isValid = validateBase64Image(fullDataUrl)\n  if (!isValid) {\n    throw new Error('InvalidImageError')\n  }\n\n  return fullDataUrl\n}\n\n/**\n * Parses a URL-like string into path and query parameters\n * @param {string} urlString - String like \"https://example.cloudfront.net/<applicationId>/<path>/filename.jpeg?width=100&height=100\"\n * @returns {Object} - Object with { path: string, queryString: string }\n * @example\n * parseUrlString(\"https://example.cloudfront.net/abc123/folder/image.jpeg?width=100&height=100\")\n * // Returns: { path: \"abc123/folder/image.jpeg\", queryString: \"width=100&t=456\" }\n */\nfunction parseUrlString(urlString) {\n  if (!urlString || typeof urlString !== 'string') {\n    throw new Error('URL string is required and must be a string')\n  }\n\n  // Extract the path after the domain\n  const url = new URL(urlString)\n  const pathname = url.pathname\n  // Remove leading slash if present\n  const pathWithoutLeadingSlash = pathname.startsWith('/')\n    ? pathname.slice(1)\n    : pathname\n\n  // Get everything after the domain (path + query)\n  const fullPath = pathWithoutLeadingSlash + url.search\n\n  let [path, queryString] = fullPath.split('?')\n\n  // change query string to ve seperated by commas instead of &\n\n  queryString = queryString ? queryString.replace(/&/g, ',') : ''\n\n  if (!path) {\n    throw new Error('Invalid URL string: missing path component')\n  }\n\n  return {\n    path,\n    queryString,\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["validateBase64Image","AWS","REGION","process","env","AWS_REGION","lambda","Lambda","region","s3","S3","fetchImageForPdfGeneratorService","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","url","urlMatch","applicationId","_parseUrlString","path","queryString","fullPath","transformedBucketImagePath","alreadyTransformedImage","fullDataUrl","transformerResponse","statusCode","_fullDataUrl","redirectLocation","newlyTransformedImage","_fullDataUrl2","_t","wrap","_context","prev","next","console","debug","Error","match","parseUrlString","concat","fetchResourceFromS3","bucketName","S3_BUCKET_IMAGE_TRANSFORMER_CACHE","key","sent","body","formatBase64Image","base64String","toString","abrupt","requestImageTransformation","headers","Location","stop","_x","apply","arguments","_x2","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","requestContext","http","method","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x3","_fetchResourceFromS","_callee3","_ref2","_t3","_context3","Bucket","Key","getObject","Body","contentType","ContentType","contentLength","ContentLength","lastModified","LastModified","etag","ETag","code","_ref3","imageType","toLowerCase","includes","base64Flag","isValid","urlString","URL","pathname","pathWithoutLeadingSlash","startsWith","slice","search","_fullPath$split","split","_fullPath$split2","_slicedToArray","replace"],"sources":["../../../src/helpers/fetch-image-for-pdf-generator-service/index.js"],"sourcesContent":["import { validateBase64Image } from '../image-validators'\nimport AWS from 'aws-sdk'\nconst REGION = process.env.AWS_REGION\n\nconst lambda = new AWS.Lambda({\n  region: REGION,\n})\nconst s3 = new AWS.S3({\n  region: REGION,\n})\n\nexport const fetchImageForPdfGeneratorService = async function (url) {\n  console.debug(\n    'Fetching image via CloudFront For Serverless Pdf Generator Service'\n  )\n  \n  if (!url) {\n    throw new Error('URL is required to fetch image for PDF generator service')\n  }\n\n  const urlMatch = url && url.match(/([a-f0-9]{24})\\//)\n  const applicationId = urlMatch && urlMatch[1]\n\n  if (!applicationId) {\n    throw new Error('Requestor has insufficient permissions')\n  }\n\n  const { path, queryString, fullPath } = parseUrlString(url)\n\n  const transformedBucketImagePath =\n    path + (queryString ? `/${queryString}` : '')\n\n  const alreadyTransformedImage = await fetchResourceFromS3({\n    bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n    key: transformedBucketImagePath,\n  })\n    \n  if (alreadyTransformedImage?.body) {\n    const fullDataUrl = formatBase64Image({\n      base64String: alreadyTransformedImage.body.toString('base64'),\n      key: transformedBucketImagePath,\n    })\n    return fullDataUrl\n  }\n\n  const transformerResponse = await requestImageTransformation(fullPath)\n\n  const statusCode = transformerResponse.statusCode\n\n  switch (statusCode) {\n    case 200: {\n      console.debug('Image transformation successful')\n\n      const fullDataUrl = formatBase64Image({\n        base64String: transformerResponse.body.toString('base64'),\n        key: url,\n      })\n\n      return fullDataUrl\n    }\n    case 302: {\n      console.debug(\n        'Image transformation successful but image is too big for lambda delivery, fetching directly from S3'\n      )\n      const redirectLocation = transformerResponse.headers.Location\n\n      if (!redirectLocation) {\n        throw new Error('Redirect response received but no location provided')\n      }\n\n      const newlyTransformedImage = await fetchResourceFromS3({\n        bucketName: `${process.env.S3_BUCKET_IMAGE_TRANSFORMER_CACHE}`,\n        key: transformedBucketImagePath,\n      })\n      console.debug('Image successfully fetched from S3 at:', redirectLocation)\n\n      const fullDataUrl = formatBase64Image({\n        base64String: newlyTransformedImage.body.toString('base64'),\n        key: transformedBucketImagePath,\n      })\n\n      return fullDataUrl\n    }\n    case 400:\n      throw new Error(\n        `Bad request to image transformer: ${transformerResponse.body}`\n      )\n    case 403:\n      throw new Error('Requested transformed image is too big')\n    case 404:\n      throw new Error('The requested image does not exist')\n    case 500:\n      throw new Error(\n        `Image transformation failed: ${transformerResponse.body}`\n      )\n    default:\n      throw new Error(\n        `Unexpected response from image transformer: ${statusCode} - ${transformerResponse.body}`\n      )\n  }\n}\n\nexport async function requestImageTransformation(key) {\n  if (!key) {\n    throw new Error('Image Path is required for image transformation')\n  }\n\n  console.debug(\n    'ImageTransformation: Invoking image transformer lambda for path:',\n    key\n  )\n\n  const lambdaEvent = {\n    requestContext: {\n      http: {\n        method: 'GET',\n        path: key,\n      },\n    },\n  }\n\n  const params = {\n    FunctionName: process.env.IMAGE_TRANSFORMER_ARN,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify(lambdaEvent),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    const response = JSON.parse(result.Payload)\n\n    return response\n  } catch (error) {\n    const errorMessage = `Failed to invoke image transformer lambda: ${error.message}`\n    console.error(errorMessage, error)\n    throw new Error(errorMessage)\n  }\n}\n\nexport async function fetchResourceFromS3({ bucketName, key }) {\n  console.debug(\n    `Fetching resource from S3 Bucket: '${bucketName}' at path: '${key}'`\n  )\n  if (!bucketName || !key) {\n    throw new Error(\n      'bucketName and key are required for S3 resource fetch ' +\n        JSON.stringify({ bucketName, key })\n    )\n  }\n\n  const params = {\n    Bucket: bucketName,\n    Key: key,\n  }\n\n  try {\n    const result = await s3.getObject(params).promise()\n\n    return {\n      body: result.Body,\n      contentType: result.ContentType,\n      contentLength: result.ContentLength,\n      lastModified: result.LastModified,\n      etag: result.ETag,\n    }\n  } catch (error) {\n    if (error.code !== 'NoSuchKey') {\n      console.error('Failed to fetch image:', error)\n      throw new Error(`Failed to fetch image: ${bucketName}/${key}`)\n    }\n\n    console.debug('Image not found in transformed bucket, invoking transformer')\n  }\n}\n\nexport function formatBase64Image({ base64String, key }) {\n  if (!key) {\n    throw new Error('Key is required for image formatting')\n  }\n\n  const imageType = key.toLowerCase().includes('.png') ? 'png' : 'jpeg'\n  const base64Flag = `data:image/${imageType};base64,`\n  const fullDataUrl = `${base64Flag}${base64String}`\n\n  // Validate the formatted data URL\n  const isValid = validateBase64Image(fullDataUrl)\n  if (!isValid) {\n    throw new Error('InvalidImageError')\n  }\n\n  return fullDataUrl\n}\n\n/**\n * Parses a URL-like string into path and query parameters\n * @param {string} urlString - String like \"https://example.cloudfront.net/<applicationId>/<path>/filename.jpeg?width=100&height=100\"\n * @returns {Object} - Object with { path: string, queryString: string }\n * @example\n * parseUrlString(\"https://example.cloudfront.net/abc123/folder/image.jpeg?width=100&height=100\")\n * // Returns: { path: \"abc123/folder/image.jpeg\", queryString: \"width=100&t=456\" }\n */\nfunction parseUrlString(urlString) {\n  if (!urlString || typeof urlString !== 'string') {\n    throw new Error('URL string is required and must be a string')\n  }\n\n  // Extract the path after the domain\n  const url = new URL(urlString)\n  const pathname = url.pathname\n  // Remove leading slash if present\n  const pathWithoutLeadingSlash = pathname.startsWith('/')\n    ? pathname.slice(1)\n    : pathname\n\n  // Get everything after the domain (path + query)\n  const fullPath = pathWithoutLeadingSlash + url.search\n\n  let [path, queryString] = fullPath.split('?')\n\n  queryString = queryString ? queryString.replace(/&/g, ',') : ''\n\n  if (!path) {\n    throw new Error('Invalid URL string: missing path component')\n  }\n\n  return {\n    path,\n    queryString,\n    fullPath\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/pdf/helpers/build-audit-content/index.js

@@ -11,10 +11,8 @@ export var buildAuditContent = Promise.method(function (items) {
       return Promise.map(item.assets, function (_ref) {
         var assetUrl = _ref.assetUrl,
           link = _ref.link;
-        var url = settings.shouldUseCloudfront ? "".concat(settings.cloudfrontBaseUrl).concat(assetUrl) : assetUrl;
-
         // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context
-        return fetchImage(url, settings).then(function (base64String) {
+        return fetchImage(assetUrl, settings).then(function (base64String) {
           return {
             alignment: 'center',
             fit: [210, 210],

package/lib/pdf/helpers/build-audit-content/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["flatten","isEmpty","round","Promise","fetchImage","fourColumnTable","horizontalLine","imageTables","table","text","LIGHT_BLUE","WHITE","buildAuditContent","method","items","settings","arguments","length","undefined","map","group","item","index","assets","_ref","assetUrl","link","url","shouldUseCloudfront","concat","cloudfrontBaseUrl","then","base64String","alignment","fit","image","rowImages","rows","fillColor","hasImages","hasComments","comments","label","id","questionId","push","scoreLabel","weight","scoreWeight","imageRow","colSpan","stack","commentsRow","margin","style","catch","err","console","log","groupTableRows","actual","groupActualScore","max","groupMaximumScore","resultText","groupPercentageResultScore","skipped","groupScoreText","bold","headerText","title","groupHeaderTable","body","layout","widths","groupTableHeader","groupTable","headerRows","_toConsumableArray","hLine"],"sources":["../../../../src/pdf/helpers/build-audit-content/index.js"],"sourcesContent":["import { flatten, isEmpty, round } from 'lodash'\nimport Promise from 'bluebird'\n\nimport { fetchImage } from '../../../helpers'\nimport { fourColumnTable, horizontalLine, imageTables, table, text } from '../'\nimport { LIGHT_BLUE, WHITE } from '../table'\n\nexport const buildAuditContent = Promise.method((items, settings = {}) => {\n  return Promise.map(items, group => {\n    return Promise.map(group.items, (item, index) => {\n      return Promise.map(item.assets, ({ assetUrl, link }) => {\n        \n        const url = settings.shouldUseCloudfront ? `${settings.cloudfrontBaseUrl}${assetUrl}` : assetUrl\n\n        // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context\n        return fetchImage(url, settings).then(base64String => ({\n          alignment: 'center',\n          fit: [210, 210],\n          image: base64String,\n          link,\n        }))\n      }).then(rowImages => {\n        const rows = []\n\n        const fillColor = index % 2 === 0 ? WHITE : LIGHT_BLUE\n        const hasImages = !isEmpty(rowImages)\n        const hasComments = !isEmpty(item.comments)\n\n        // Some audits use questionId to link a follow-up issue and its question\n        const label = { text: item.label, fillColor, id: item.questionId }\n\n        rows.push([\n          label,\n          { text: item.scoreLabel, fillColor },\n          { alignment: 'center', text: item.weight, fillColor },\n          { alignment: 'right', text: item.scoreWeight, fillColor },\n        ])\n\n        if (hasImages) {\n          const imageRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              stack: imageTables(rowImages),\n            },\n          ]\n\n          rows.push(imageRow)\n        }\n\n        if (hasComments) {\n          const commentsRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              margin: [0, -10, 0, 0],\n              stack: [\n                { text: 'Comments:', style: 'commentsHeader' },\n                { text: item.comments },\n              ],\n            },\n          ]\n\n          rows.push(commentsRow)\n        }\n\n        return rows\n      }).catch(err=> {\n          console.log(\"ERROR FETCHING IMAGE FOR AUDIT CONTENT\", {err, item, assetUrl: item.assetUrl})\n          throw err\n        })\n    }).then(groupTableRows => {\n      const actual = round(group.groupActualScore, 2)\n      const max = round(group.groupMaximumScore, 2)\n      const resultText = `${group.groupPercentageResultScore}%`\n\n      const { skipped } = group\n\n      const groupScoreText = skipped\n        ? null\n        : text(`${actual} / ${max} (${resultText})`, {\n            alignment: 'right',\n            bold: true,\n          })\n      const headerText = text(group.title)\n\n      const groupHeaderTable = table({\n        body: [[headerText, groupScoreText]],\n        layout: 'noBorders',\n        style: 'groupHeaderTable',\n        widths: ['*', '*'],\n      })\n\n      const groupTableHeader = [\n        text('Question', { bold: true }),\n        text('Answer', { bold: true }),\n        text('Weight', { alignment: 'center', bold: true }),\n        text('Score', { alignment: 'right', bold: true }),\n      ]\n\n      const groupTable = fourColumnTable({\n        headerRows: 0,\n        // NOTE: must flatten here as we have arrays of rows\n        body: [groupTableHeader, ...flatten(groupTableRows)],\n        widths: ['60%', '24%', '8%', '8%'],\n      })\n\n      const hLine = horizontalLine()\n\n      return [groupHeaderTable, hLine, groupTable]\n    })\n  })\n})\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["flatten","isEmpty","round","Promise","fetchImage","fourColumnTable","horizontalLine","imageTables","table","text","LIGHT_BLUE","WHITE","buildAuditContent","method","items","settings","arguments","length","undefined","map","group","item","index","assets","_ref","assetUrl","link","then","base64String","alignment","fit","image","rowImages","rows","fillColor","hasImages","hasComments","comments","label","id","questionId","push","scoreLabel","weight","scoreWeight","imageRow","colSpan","stack","commentsRow","margin","style","catch","err","console","log","groupTableRows","actual","groupActualScore","max","groupMaximumScore","resultText","concat","groupPercentageResultScore","skipped","groupScoreText","bold","headerText","title","groupHeaderTable","body","layout","widths","groupTableHeader","groupTable","headerRows","_toConsumableArray","hLine"],"sources":["../../../../src/pdf/helpers/build-audit-content/index.js"],"sourcesContent":["import { flatten, isEmpty, round } from 'lodash'\nimport Promise from 'bluebird'\n\nimport { fetchImage } from '../../../helpers'\nimport { fourColumnTable, horizontalLine, imageTables, table, text } from '../'\nimport { LIGHT_BLUE, WHITE } from '../table'\n\nexport const buildAuditContent = Promise.method((items, settings = {}) => {\n  return Promise.map(items, group => {\n    return Promise.map(group.items, (item, index) => {\n      return Promise.map(item.assets, ({ assetUrl, link }) => {\n        \n        // NOTE: Signature, Policy and KeyPairId are the only used values from settings in this context\n        return fetchImage(assetUrl, settings).then(base64String => ({\n          alignment: 'center',\n          fit: [210, 210],\n          image: base64String,\n          link,\n        }))\n      }).then(rowImages => {\n        const rows = []\n\n        const fillColor = index % 2 === 0 ? WHITE : LIGHT_BLUE\n        const hasImages = !isEmpty(rowImages)\n        const hasComments = !isEmpty(item.comments)\n\n        // Some audits use questionId to link a follow-up issue and its question\n        const label = { text: item.label, fillColor, id: item.questionId }\n\n        rows.push([\n          label,\n          { text: item.scoreLabel, fillColor },\n          { alignment: 'center', text: item.weight, fillColor },\n          { alignment: 'right', text: item.scoreWeight, fillColor },\n        ])\n\n        if (hasImages) {\n          const imageRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              stack: imageTables(rowImages),\n            },\n          ]\n\n          rows.push(imageRow)\n        }\n\n        if (hasComments) {\n          const commentsRow = [\n            {\n              colSpan: 4,\n              fillColor,\n              margin: [0, -10, 0, 0],\n              stack: [\n                { text: 'Comments:', style: 'commentsHeader' },\n                { text: item.comments },\n              ],\n            },\n          ]\n\n          rows.push(commentsRow)\n        }\n\n        return rows\n      }).catch(err=> {\n          console.log(\"ERROR FETCHING IMAGE FOR AUDIT CONTENT\", {err, item, assetUrl: item.assetUrl})\n          throw err\n        })\n    }).then(groupTableRows => {\n      const actual = round(group.groupActualScore, 2)\n      const max = round(group.groupMaximumScore, 2)\n      const resultText = `${group.groupPercentageResultScore}%`\n\n      const { skipped } = group\n\n      const groupScoreText = skipped\n        ? null\n        : text(`${actual} / ${max} (${resultText})`, {\n            alignment: 'right',\n            bold: true,\n          })\n      const headerText = text(group.title)\n\n      const groupHeaderTable = table({\n        body: [[headerText, groupScoreText]],\n        layout: 'noBorders',\n        style: 'groupHeaderTable',\n        widths: ['*', '*'],\n      })\n\n      const groupTableHeader = [\n        text('Question', { bold: true }),\n        text('Answer', { bold: true }),\n        text('Weight', { alignment: 'center', bold: true }),\n        text('Score', { alignment: 'right', bold: true }),\n      ]\n\n      const groupTable = fourColumnTable({\n        headerRows: 0,\n        // NOTE: must flatten here as we have arrays of rows\n        body: [groupTableHeader, ...flatten(groupTableRows)],\n        widths: ['60%', '24%', '8%', '8%'],\n      })\n\n      const hLine = horizontalLine()\n\n      return [groupHeaderTable, hLine, groupTable]\n    })\n  })\n})\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "6.2.0-canary.42",
+  "version": "6.2.0-canary.44",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",