@lighthouse/common 6.3.0 → 6.4.0-canary.1

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

@@ -182,6 +182,9 @@ function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
+  if (!urlString.includes('://')) {
+    urlString = `https://domain.com/${urlString}`;
+  }
 
   // Extract the path after the domain
   const url = new URL(urlString);

package/dist/helpers/get-audit-items-data/index.js

@@ -67,7 +67,7 @@ function getAuditItemsData(items, data) {
           KeyPairId,
           Signature
         });
-        const link = `${awsS3BaseUrl}/${asset}`;
+        const link = shouldUseCloudfront ? `${cloudfrontBaseUrl}/${item.signedAssets[assetIndex]}` : `${awsS3BaseUrl}/${asset}`;
         const thumbnailUrl = (0, _.buildFetchUrl)(asset, {
           awsS3BaseUrl,
           cloudfrontBaseUrl,

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

@@ -245,6 +245,9 @@ function parseUrlString(urlString) {
   if (!urlString || typeof urlString !== 'string') {
     throw new Error('URL string is required and must be a string');
   }
+  if (!urlString.includes('://')) {
+    urlString = "https://domain.com/".concat(urlString);
+  }
 
   // Extract the path after the domain
   var url = new URL(urlString);

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","searchParamsObject","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","_x3","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","queryStringParameters","requestContext","http","method","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x4","_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","searchParams","forEach","value","replace","pathname","substring"],"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, searchParamsObject } = 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(\n    `/${path}`,\n    searchParamsObject\n  )\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      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(path, searchParamsObject) {\n  if (!path) {\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    { path, searchParamsObject }\n  )\n\n  const lambdaEvent = {\n    queryStringParameters: searchParamsObject,\n    requestContext: {\n      http: {\n        method: 'GET',\n        path,\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, searchParamsObject: Object }\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\", searchParamsObject: { width: \"100\", height: \"100\" } }\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\n  let searchParamsObject = {}\n  url.searchParams.forEach((value, key) => {\n    searchParamsObject[key] = value\n  })\n\n  let queryString = url.searchParams.toString()\n  queryString = queryString ? queryString.replace(/&/g, ',') : ''\n\n  return {\n    path: url.pathname.substring(1), // Remove leading '/'\n    queryString,\n    searchParamsObject,\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","searchParamsObject","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","_x3","_requestImageTransformation","_callee2","lambdaEvent","params","result","response","errorMessage","_t2","_context2","queryStringParameters","requestContext","http","method","FunctionName","IMAGE_TRANSFORMER_ARN","InvocationType","Payload","JSON","stringify","invoke","promise","parse","message","error","_x4","_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","searchParams","forEach","value","replace","pathname","substring"],"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, searchParamsObject } = 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(\n    `/${path}`,\n    searchParamsObject\n  )\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      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(path, searchParamsObject) {\n  if (!path) {\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    { path, searchParamsObject }\n  )\n\n  const lambdaEvent = {\n    queryStringParameters: searchParamsObject,\n    requestContext: {\n      http: {\n        method: 'GET',\n        path,\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, searchParamsObject: Object }\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\", searchParamsObject: { width: \"100\", height: \"100\" } }\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  if (!urlString.includes('://')) {\n    urlString = `https://domain.com/${urlString}`\n  }\n\n  // Extract the path after the domain\n  const url = new URL(urlString)\n\n  let searchParamsObject = {}\n  url.searchParams.forEach((value, key) => {\n    searchParamsObject[key] = value\n  })\n\n  let queryString = url.searchParams.toString()\n  queryString = queryString ? queryString.replace(/&/g, ',') : ''\n\n  return {\n    path: url.pathname.substring(1), // Remove leading '/'\n    queryString,\n    searchParamsObject,\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/helpers/get-audit-items-data/index.js

@@ -60,7 +60,7 @@ export function getAuditItemsData(items, data) {
           KeyPairId: KeyPairId,
           Signature: Signature
         });
-        var link = "".concat(awsS3BaseUrl, "/").concat(asset);
+        var link = shouldUseCloudfront ? "".concat(cloudfrontBaseUrl, "/").concat(item.signedAssets[assetIndex]) : "".concat(awsS3BaseUrl, "/").concat(asset);
         var thumbnailUrl = buildFetchUrl(asset, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
           awsS3BaseUrl: awsS3BaseUrl,
           cloudfrontBaseUrl: cloudfrontBaseUrl,

package/lib/helpers/get-audit-items-data/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["find","groupBy","map","get","round","buildFetchUrl","getAuditItemsData","items","data","_data$settings","settings","_data$settings2","awsS3BaseUrl","cloudinaryBaseUrl","cloudfrontBaseUrl","Policy","KeyPairId","Signature","shouldUseCloudfront","_data$entity","entity","_data$entity2","groupScores","groupedItems","auditData","overallActualScore","overallMaximumScore","groupIndex","key","skipped","group","title","label","groupData","groupMaximumScore","groupActualScore","groupResultScore","groupPercentageResultScore","currentGroupScores","max","actual","result","percentageResult","item","itemIndex","hasScore","score","rawAssets","assets","assetCount","length","asset","assetIndex","assetUrl","height","width","quality","fit","link","concat","thumbnailUrl","_defineProperty","comments","matchingScore","scores","value","scoreLabel","scoreWeight","weight","questionId","_id"],"sources":["../../../src/helpers/get-audit-items-data/index.js"],"sourcesContent":["import { find, groupBy, map, get, round } from 'lodash'\n\nimport { buildFetchUrl } from '../'\n\nexport function getAuditItemsData(items, data) {\n  const {\n    settings: {\n      awsS3BaseUrl,\n      cloudinaryBaseUrl,\n      cloudfrontBaseUrl,\n      Policy,\n      KeyPairId,\n      Signature,\n      shouldUseCloudfront,\n    } = {},\n    entity: { groupScores } = {},\n  } = data\n\n  const groupedItems = groupBy(items, 'group.id')\n\n  const auditData = {\n    overallActualScore: 0,\n    overallMaximumScore: 0,\n  }\n\n  auditData.items = map(groupedItems, (items, groupIndex) => {\n    const key = groupIndex\n    const skipped = !!items[0].group.skipped\n    const title = items[0].group.label\n\n    const groupData = {\n      key,\n      groupMaximumScore: 0,\n      groupActualScore: 0,\n      groupResultScore: 0,\n      groupPercentageResultScore: 0,\n      skipped,\n      title,\n    }\n\n    const currentGroupScores = get(groupScores, key)\n\n    if (currentGroupScores) {\n      groupData.groupMaximumScore = round(currentGroupScores.max, 2)\n      groupData.groupActualScore = round(currentGroupScores.actual, 2)\n      groupData.groupResultScore = currentGroupScores.result\n      groupData.groupPercentageResultScore = currentGroupScores.percentageResult\n    }\n\n    groupData.items = items.map((item, itemIndex) => {\n      // NOTE: we handle scores of -1, 0 and 1\n      // -1 scores are skipped from group max and actual score\n      // 0 and 1 must be included in the final scores\n      const hasScore = item.score !== null && item.score !== -1\n      const rawAssets = item.assets || []\n      const assetCount = rawAssets.length\n\n      const assets = rawAssets.map((asset, assetIndex) => {\n        const assetUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          height: 400,\n          width: 600,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const link = `${awsS3BaseUrl}/${asset}`\n\n        const thumbnailUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          shouldUseCloudfront,\n          width: 100,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const key = `${groupIndex}-item-asset-${assetIndex}`\n\n        return {\n          assetUrl,\n          key,\n          link,\n          thumbnailUrl,\n        }\n      })\n\n      const comments = item.comments\n      const label = item.label\n      const score = item.score\n      const key = `${groupIndex}-item-${itemIndex}`\n      const matchingScore = find(item.scores, { value: score })\n\n      // NOTE: ensure we have a score otherwise fallback to - value\n      const scoreLabel =\n        hasScore && matchingScore && !skipped ? matchingScore.label : '-'\n      const scoreWeight = hasScore && !skipped ? item.scoreWeight : '-'\n      const weight = hasScore ? item.weight : '-'\n\n      return {\n        assetCount,\n        assets,\n        comments,\n        key,\n        label,\n        questionId: item._id,\n        score,\n        scoreLabel,\n        scoreWeight,\n        weight,\n      }\n    })\n\n    return groupData\n  })\n\n  return auditData\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["find","groupBy","map","get","round","buildFetchUrl","getAuditItemsData","items","data","_data$settings","settings","_data$settings2","awsS3BaseUrl","cloudinaryBaseUrl","cloudfrontBaseUrl","Policy","KeyPairId","Signature","shouldUseCloudfront","_data$entity","entity","_data$entity2","groupScores","groupedItems","auditData","overallActualScore","overallMaximumScore","groupIndex","key","skipped","group","title","label","groupData","groupMaximumScore","groupActualScore","groupResultScore","groupPercentageResultScore","currentGroupScores","max","actual","result","percentageResult","item","itemIndex","hasScore","score","rawAssets","assets","assetCount","length","asset","assetIndex","assetUrl","height","width","quality","fit","link","concat","signedAssets","thumbnailUrl","_defineProperty","comments","matchingScore","scores","value","scoreLabel","scoreWeight","weight","questionId","_id"],"sources":["../../../src/helpers/get-audit-items-data/index.js"],"sourcesContent":["import { find, groupBy, map, get, round } from 'lodash'\n\nimport { buildFetchUrl } from '../'\n\nexport function getAuditItemsData(items, data) {\n  const {\n    settings: {\n      awsS3BaseUrl,\n      cloudinaryBaseUrl,\n      cloudfrontBaseUrl,\n      Policy,\n      KeyPairId,\n      Signature,\n      shouldUseCloudfront,\n    } = {},\n    entity: { groupScores } = {},\n  } = data\n\n  const groupedItems = groupBy(items, 'group.id')\n\n  const auditData = {\n    overallActualScore: 0,\n    overallMaximumScore: 0,\n  }\n\n  auditData.items = map(groupedItems, (items, groupIndex) => {\n    const key = groupIndex\n    const skipped = !!items[0].group.skipped\n    const title = items[0].group.label\n\n    const groupData = {\n      key,\n      groupMaximumScore: 0,\n      groupActualScore: 0,\n      groupResultScore: 0,\n      groupPercentageResultScore: 0,\n      skipped,\n      title,\n    }\n\n    const currentGroupScores = get(groupScores, key)\n\n    if (currentGroupScores) {\n      groupData.groupMaximumScore = round(currentGroupScores.max, 2)\n      groupData.groupActualScore = round(currentGroupScores.actual, 2)\n      groupData.groupResultScore = currentGroupScores.result\n      groupData.groupPercentageResultScore = currentGroupScores.percentageResult\n    }\n\n    groupData.items = items.map((item, itemIndex) => {\n      // NOTE: we handle scores of -1, 0 and 1\n      // -1 scores are skipped from group max and actual score\n      // 0 and 1 must be included in the final scores\n      const hasScore = item.score !== null && item.score !== -1\n      const rawAssets = item.assets || []\n      const assetCount = rawAssets.length\n\n      const assets = rawAssets.map((asset, assetIndex) => {\n        const assetUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          height: 400,\n          width: 600,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const link = shouldUseCloudfront\n          ? `${cloudfrontBaseUrl}/${item.signedAssets[assetIndex]}`\n          : `${awsS3BaseUrl}/${asset}`\n\n        const thumbnailUrl = buildFetchUrl(asset, {\n          awsS3BaseUrl,\n          cloudfrontBaseUrl,\n          cloudinaryBaseUrl,\n          shouldUseCloudfront,\n          width: 100,\n          quality: 50,\n          fit: true,\n          shouldUseCloudfront,\n          Policy,\n          KeyPairId,\n          Signature,\n        })\n\n        const key = `${groupIndex}-item-asset-${assetIndex}`\n\n        return {\n          assetUrl,\n          key,\n          link,\n          thumbnailUrl,\n        }\n      })\n\n      const comments = item.comments\n      const label = item.label\n      const score = item.score\n      const key = `${groupIndex}-item-${itemIndex}`\n      const matchingScore = find(item.scores, { value: score })\n\n      // NOTE: ensure we have a score otherwise fallback to - value\n      const scoreLabel =\n        hasScore && matchingScore && !skipped ? matchingScore.label : '-'\n      const scoreWeight = hasScore && !skipped ? item.scoreWeight : '-'\n      const weight = hasScore ? item.weight : '-'\n\n      return {\n        assetCount,\n        assets,\n        comments,\n        key,\n        label,\n        questionId: item._id,\n        score,\n        scoreLabel,\n        scoreWeight,\n        weight,\n      }\n    })\n\n    return groupData\n  })\n\n  return auditData\n}\n"],"mappings":";AAAA,SAASA,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAEC,KAAK,QAAQ,QAAQ;AAEvD,SAASC,aAAa,QAAQ,KAAK;AAEnC,OAAO,SAASC,iBAAiBA,CAACC,KAAK,EAAEC,IAAI,EAAE;EAC7C,IAAAC,cAAA,GAWID,IAAI,CAVNE,QAAQ;IAAAC,eAAA,GAAAF,cAAA,cAQJ,CAAC,CAAC,GAAAA,cAAA;IAPJG,YAAY,GAAAD,eAAA,CAAZC,YAAY;IACZC,iBAAiB,GAAAF,eAAA,CAAjBE,iBAAiB;IACjBC,iBAAiB,GAAAH,eAAA,CAAjBG,iBAAiB;IACjBC,MAAM,GAAAJ,eAAA,CAANI,MAAM;IACNC,SAAS,GAAAL,eAAA,CAATK,SAAS;IACTC,SAAS,GAAAN,eAAA,CAATM,SAAS;IACTC,mBAAmB,GAAAP,eAAA,CAAnBO,mBAAmB;IAAAC,YAAA,GAGnBX,IAAI,CADNY,MAAM;IAAAC,aAAA,GAAAF,YAAA,cAAoB,CAAC,CAAC,GAAAA,YAAA;IAAlBG,WAAW,GAAAD,aAAA,CAAXC,WAAW;EAGvB,IAAMC,YAAY,GAAGtB,OAAO,CAACM,KAAK,EAAE,UAAU,CAAC;EAE/C,IAAMiB,SAAS,GAAG;IAChBC,kBAAkB,EAAE,CAAC;IACrBC,mBAAmB,EAAE;EACvB,CAAC;EAEDF,SAAS,CAACjB,KAAK,GAAGL,GAAG,CAACqB,YAAY,EAAE,UAAChB,KAAK,EAAEoB,UAAU,EAAK;IACzD,IAAMC,GAAG,GAAGD,UAAU;IACtB,IAAME,OAAO,GAAG,CAAC,CAACtB,KAAK,CAAC,CAAC,CAAC,CAACuB,KAAK,CAACD,OAAO;IACxC,IAAME,KAAK,GAAGxB,KAAK,CAAC,CAAC,CAAC,CAACuB,KAAK,CAACE,KAAK;IAElC,IAAMC,SAAS,GAAG;MAChBL,GAAG,EAAHA,GAAG;MACHM,iBAAiB,EAAE,CAAC;MACpBC,gBAAgB,EAAE,CAAC;MACnBC,gBAAgB,EAAE,CAAC;MACnBC,0BAA0B,EAAE,CAAC;MAC7BR,OAAO,EAAPA,OAAO;MACPE,KAAK,EAALA;IACF,CAAC;IAED,IAAMO,kBAAkB,GAAGnC,GAAG,CAACmB,WAAW,EAAEM,GAAG,CAAC;IAEhD,IAAIU,kBAAkB,EAAE;MACtBL,SAAS,CAACC,iBAAiB,GAAG9B,KAAK,CAACkC,kBAAkB,CAACC,GAAG,EAAE,CAAC,CAAC;MAC9DN,SAAS,CAACE,gBAAgB,GAAG/B,KAAK,CAACkC,kBAAkB,CAACE,MAAM,EAAE,CAAC,CAAC;MAChEP,SAAS,CAACG,gBAAgB,GAAGE,kBAAkB,CAACG,MAAM;MACtDR,SAAS,CAACI,0BAA0B,GAAGC,kBAAkB,CAACI,gBAAgB;IAC5E;IAEAT,SAAS,CAAC1B,KAAK,GAAGA,KAAK,CAACL,GAAG,CAAC,UAACyC,IAAI,EAAEC,SAAS,EAAK;MAC/C;MACA;MACA;MACA,IAAMC,QAAQ,GAAGF,IAAI,CAACG,KAAK,KAAK,IAAI,IAAIH,IAAI,CAACG,KAAK,KAAK,CAAC,CAAC;MACzD,IAAMC,SAAS,GAAGJ,IAAI,CAACK,MAAM,IAAI,EAAE;MACnC,IAAMC,UAAU,GAAGF,SAAS,CAACG,MAAM;MAEnC,IAAMF,MAAM,GAAGD,SAAS,CAAC7C,GAAG,CAAC,UAACiD,KAAK,EAAEC,UAAU,EAAK;QAClD,IAAMC,QAAQ,GAAGhD,aAAa,CAAC8C,KAAK,EAAE;UACpCvC,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjByC,MAAM,EAAE,GAAG;UACXC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE,EAAE;UACXC,GAAG,EAAE,IAAI;UACTvC,mBAAmB,EAAnBA,mBAAmB;UACnBH,MAAM,EAANA,MAAM;UACNC,SAAS,EAATA,SAAS;UACTC,SAAS,EAATA;QACF,CAAC,CAAC;QAEF,IAAMyC,IAAI,GAAGxC,mBAAmB,MAAAyC,MAAA,CACzB7C,iBAAiB,OAAA6C,MAAA,CAAIhB,IAAI,CAACiB,YAAY,CAACR,UAAU,CAAC,OAAAO,MAAA,CAClD/C,YAAY,OAAA+C,MAAA,CAAIR,KAAK,CAAE;QAE9B,IAAMU,YAAY,GAAGxD,aAAa,CAAC8C,KAAK,EAAAW,eAAA,CAAAA,eAAA,CAAAA,eAAA,CAAAA,eAAA;UACtClD,YAAY,EAAZA,YAAY;UACZE,iBAAiB,EAAjBA,iBAAiB;UACjBD,iBAAiB,EAAjBA,iBAAiB;UACjBK,mBAAmB,EAAnBA,mBAAmB;UACnBqC,KAAK,EAAE,GAAG;UACVC,OAAO,EAAE,EAAE;UACXC,GAAG,EAAE;QAAI,0BACTvC,mBAAmB,aACnBH,MAAM,gBACNC,SAAS,gBACTC,SAAS,CACV,CAAC;QAEF,IAAMW,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,kBAAAgC,MAAA,CAAeP,UAAU,CAAE;QAEpD,OAAO;UACLC,QAAQ,EAARA,QAAQ;UACRzB,GAAG,EAAHA,GAAG;UACH8B,IAAI,EAAJA,IAAI;UACJG,YAAY,EAAZA;QACF,CAAC;MACH,CAAC,CAAC;MAEF,IAAME,QAAQ,GAAGpB,IAAI,CAACoB,QAAQ;MAC9B,IAAM/B,KAAK,GAAGW,IAAI,CAACX,KAAK;MACxB,IAAMc,KAAK,GAAGH,IAAI,CAACG,KAAK;MACxB,IAAMlB,GAAG,MAAA+B,MAAA,CAAMhC,UAAU,YAAAgC,MAAA,CAASf,SAAS,CAAE;MAC7C,IAAMoB,aAAa,GAAGhE,IAAI,CAAC2C,IAAI,CAACsB,MAAM,EAAE;QAAEC,KAAK,EAAEpB;MAAM,CAAC,CAAC;;MAEzD;MACA,IAAMqB,UAAU,GACdtB,QAAQ,IAAImB,aAAa,IAAI,CAACnC,OAAO,GAAGmC,aAAa,CAAChC,KAAK,GAAG,GAAG;MACnE,IAAMoC,WAAW,GAAGvB,QAAQ,IAAI,CAAChB,OAAO,GAAGc,IAAI,CAACyB,WAAW,GAAG,GAAG;MACjE,IAAMC,MAAM,GAAGxB,QAAQ,GAAGF,IAAI,CAAC0B,MAAM,GAAG,GAAG;MAE3C,OAAO;QACLpB,UAAU,EAAVA,UAAU;QACVD,MAAM,EAANA,MAAM;QACNe,QAAQ,EAARA,QAAQ;QACRnC,GAAG,EAAHA,GAAG;QACHI,KAAK,EAALA,KAAK;QACLsC,UAAU,EAAE3B,IAAI,CAAC4B,GAAG;QACpBzB,KAAK,EAALA,KAAK;QACLqB,UAAU,EAAVA,UAAU;QACVC,WAAW,EAAXA,WAAW;QACXC,MAAM,EAANA;MACF,CAAC;IACH,CAAC,CAAC;IAEF,OAAOpC,SAAS;EAClB,CAAC,CAAC;EAEF,OAAOT,SAAS;AAClB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "6.3.0",
+  "version": "6.4.0-canary.1",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -17,17 +17,16 @@
     "precommit": "lint-staged",
     "prepublishOnly": "yarn build",
     "preversion": "yarn test",
-    "storybook:html": "sb dev -p 9001 -c .storybook-html",
-    "storybook:react": "sb dev -p 9002 -c .storybook-react",
-    "build-storybook:html": "sb build -c .storybook-html",
-    "build-storybook:react": "sb build -c .storybook-react",
+    "storybook:html": "start-storybook -p 9001 -c .storybook-html -s ./src",
+    "storybook:react": "start-storybook -p 9002 -c .storybook-react -s ./src",
     "test": "TZ=UTC vitest run",
-    "test:watch": "TZ=UTC vitest watch",
     "test:ci": "yarn lint && yarn type-check && yarn test --coverage",
     "type-check": "tsc --noEmit",
     "type-check:watch": "yarn type-check --watch",
     "validate:circleci": "circleci config validate -c .circleci/config.yml",
-    "version": "yarn build"
+    "version": "yarn build",
+    "watch:es": "nodemon --watch src --ext js,ts --exec \"yarn build:es\"",
+    "watch:node": "nodemon --watch src --ext js,ts --exec \"yarn build:node\""
   },
   "repository": {
     "type": "git",
@@ -56,13 +55,11 @@
     "@babel/preset-env": "^7.12.1",
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@storybook/addon-actions": "^7.6.20",
-    "@storybook/addon-essentials": "^7.6.20",
-    "@storybook/cli": "^7.6.20",
-    "@storybook/html": "^7.6.20",
-    "@storybook/html-webpack5": "^7.6.20",
-    "@storybook/react": "^7.6.20",
-    "@storybook/react-webpack5": "^7.6.20",
+    "@storybook/addon-actions": "^5.3.14",
+    "@storybook/addon-knobs": "^5.3.14",
+    "@storybook/addon-notes": "^5.3.14",
+    "@storybook/html": "^5.3.14",
+    "@storybook/react": "^5.3.14",
     "@types/lodash": "^4.14.149",
     "@types/node": "^12.7.5",
     "@types/yup": "^0.26.32",
@@ -75,9 +72,8 @@
     "lint-staged": "^15.2.0",
     "mockdate": "^2.0.2",
     "nock": "^12.0.2",
+    "nodemon": "^3.0.0",
     "prettier": "^3.3.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
     "react-visjs-timeline": "^1.6.0",
     "rimraf": "^2.6.3",
     "typescript": "^3.8.3",