@reddoorla/maintenance 0.45.0 → 0.47.0

package/dist/index.d.ts

@@ -287,8 +287,8 @@ type ResolvedCopy = {
     announceCadenceHeading: string;
     announceTestingLabel: string;
     announceMaintenanceLabel: string;
-    announceMonitorItems: string[];
     announcePreviewLabel: string;
+    announceScoreNote: string;
     announceImprovementResend: string;
     announceImprovementSvelte5: string;
     announceCadence: string;

package/dist/index.js

@@ -2769,7 +2769,7 @@ var DEFAULT_COPY = {
     "Links & Navigation",
     "Form Functionality",
     "Interactions & Animations",
-    "Verified After Updates"
+    "Tested After Updates"
   ],
   notesHeader: "NOTES",
   seoCta: "Contact us if you are interested in more in-depth data or have questions about SEO.",
@@ -2788,8 +2788,8 @@ var DEFAULT_COPY = {
   announceCadenceHeading: "WHAT TO EXPECT",
   announceTestingLabel: "Full site testing",
   announceMaintenanceLabel: "Routine maintenance",
-  announceMonitorItems: ["Performance", "Accessibility", "Security", "Uptime"],
   announcePreviewLabel: "From your latest full site test:",
+  announceScoreNote: "These are independent Google Lighthouse scores, each out of 100 \u2014 higher is better.",
   announceImprovementResend: "Your contact forms now deliver straight to your inbox through reliable infrastructure, so no inquiry slips through the cracks.",
   announceImprovementSvelte5: "We've modernized your site to the latest framework \u2014 it's faster, more secure, and built to last.",
   announceCadence: "After each one we'll send you a short report like this \u2014 there's nothing you need to do.",
@@ -3031,7 +3031,7 @@ function buildMjml(data) {
         <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.performance}</mj-text>
         <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">Acceptable 50\u201389 // Ideal 90\u2013100</mj-text>
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
-        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Readability</mj-text>
+        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Readability (A11y)</mj-text>
         <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.accessibility}</mj-text>
         <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">Acceptable 80\u201399 // Ideal 100</mj-text>
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
@@ -3136,9 +3136,26 @@ var FREQ_PHRASE = {
 };
 var RED2 = "#C00";
 var GREY2 = "#757575";
+var CHECK_PNG2 = `cid:${CHECK_CID}`;
+function fmtVisitors(n) {
+  return n.toLocaleString("en-US");
+}
+function visitorTrend(cur, prev) {
+  if (cur === void 0 || prev === void 0 || prev === 0) return null;
+  const pct = Math.round((cur - prev) / prev * 100);
+  if (pct > 0) return `\u25B2 ${pct}% vs the previous month`;
+  if (pct < 0) return `\u25BC ${Math.abs(pct)}% vs the previous month`;
+  return "No change vs the previous month";
+}
+function announcementSiteExtras(site) {
+  return {
+    cadence: { maintenance: site.maintenanceFreq, testing: site.testingFreq },
+    improvements: { resendForms: true, svelte5: true }
+  };
+}
 var SCORE_PREVIEW = [
   { label: "Performance", key: "performance" },
-  { label: "Readability", key: "accessibility" },
+  { label: "Readability (A11y)", key: "accessibility" },
   { label: "Best Practices", key: "bestPractices" },
   { label: "Site Structure", key: "seo" }
 ];
@@ -3159,31 +3176,53 @@ function buildAnnouncementMjml(data) {
       </mj-column>
     </mj-section>` : "";
   const cad = data.cadence;
-  const cadenceLines = [];
+  const cadenceBlocks = [];
   if (cad && cad.testing !== "None")
-    cadenceLines.push(`${copy.announceTestingLabel} \u2014 ${FREQ_PHRASE[cad.testing]}`);
+    cadenceBlocks.push({
+      line: `${copy.announceTestingLabel} \u2014 ${FREQ_PHRASE[cad.testing]}`,
+      checks: copy.testingChecklist
+    });
   if (cad && cad.maintenance !== "None")
-    cadenceLines.push(`${copy.announceMaintenanceLabel} \u2014 ${FREQ_PHRASE[cad.maintenance]}`);
-  const cadenceSection = cadenceLines.length > 0 ? `
+    cadenceBlocks.push({
+      line: `${copy.announceMaintenanceLabel} \u2014 ${FREQ_PHRASE[cad.maintenance]}`,
+      checks: copy.maintenanceChecks
+    });
+  const cadenceSection = cadenceBlocks.length > 0 ? `
     <mj-section background-color="white">
       <mj-column>
         <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">${escapeXml(copy.announceCadenceHeading)}</mj-text>
-        ${cadenceLines.map(
-    (line) => `
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px" padding-bottom="4px">\u2022 ${escapeXml(line)}</mj-text>`
+        ${cadenceBlocks.map(
+    (b) => `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding-top="12px" padding-bottom="2px">\u2022 ${escapeXml(b.line)}</mj-text>${b.checks.map(
+      (c) => `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="14px" font-weight="300" line-height="22px" padding-top="1px" padding-bottom="0px" padding-left="16px">${escapeXml(c)} <img src="${CHECK_PNG2}" alt="\u2713" width="14" height="14" style="vertical-align:middle;display:inline-block;margin-left:2px;" /></mj-text>`
+    ).join("")}`
   ).join("")}
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="12px">${escapeXml(copy.announceCadence)}</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="14px">${escapeXml(copy.announceCadence)}</mj-text>
       </mj-column>
     </mj-section>` : "";
-  const monitorRows = copy.announceMonitorItems.map(
-    (item) => `
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px" padding-bottom="4px">\u2022 ${escapeXml(item)}</mj-text>`
-  ).join("");
   const scoreRows = SCORE_PREVIEW.map(
     ({ label, key }) => `
         <mj-text color="${RED2}" font-size="20px" font-weight="300" padding-top="25px">${label}</mj-text>
         <mj-text color="${RED2}" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse[key]}</mj-text>`
   ).join("");
+  const scoreNote = copy.announceScoreNote ? `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" font-style="italic" line-height="18px" padding-top="16px">${escapeXml(copy.announceScoreNote)}</mj-text>` : "";
+  const trend = visitorTrend(data.gaUsersCurrent, data.gaUsersPrevious);
+  const trafficRows = [];
+  if (data.gaUsersCurrent !== void 0)
+    trafficRows.push(`
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="8px"><span style="color:${RED2};font-size:22px;font-weight:400;">${escapeXml(fmtVisitors(data.gaUsersCurrent))}</span> visitors in the last month${trend ? ` \u2014 ${escapeXml(trend)}` : ""}</mj-text>`);
+  if (data.searchPosition !== void 0)
+    trafficRows.push(`
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px">Page 1 Google result (#${data.searchPosition}) for your brand search</mj-text>`);
+  const trafficSection = trafficRows.length > 0 ? `
+    <mj-section background-color="white">
+      <mj-column>
+        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">TRAFFIC &amp; SEARCH</mj-text>
+        ${trafficRows.join("")}
+      </mj-column>
+    </mj-section>` : "";
   const contactRows = copy.contact.map(
     (line) => `
       <mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml(line)}</mj-text>`
@@ -3215,18 +3254,13 @@ function buildAnnouncementMjml(data) {
     </mj-section>
     ${cadenceSection}
     ${improvementsSection}
-    <mj-section background-color="white">
-      <mj-column>
-        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">WHAT WE MONITOR</mj-text>
-        ${monitorRows}
-      </mj-column>
-    </mj-section>
     <mj-section background-color="#F4F4F4">
       <mj-column>
         <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="55px">${escapeXml(copy.announcePreviewLabel)}</mj-text>
-        ${scoreRows}
+        ${scoreRows}${scoreNote}
       </mj-column>
     </mj-section>
+    ${trafficSection}
     <mj-section background-color="white">
       <mj-column>
         <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="36px">${escapeXml(copy.announceOpenDoor)}</mj-text>
@@ -3274,7 +3308,10 @@ var TESTING_CHECKLIST = [
     label: "Interactions & Animations",
     field: "Test: Interactions & Animations"
   },
-  { key: "updates", label: "Verified After Updates", field: "Test: Verified After Updates" }
+  // `field` keeps its original Airtable column name ("…Verified After Updates") even though
+  // the client-facing label is now "Tested After Updates" — the column holds operator data,
+  // so renaming the label is display-only and avoids a live-base column migration.
+  { key: "updates", label: "Tested After Updates", field: "Test: Verified After Updates" }
 ];
 var ALL_CHECKLIST_FIELDS = [...MAINTENANCE_CHECKLIST, ...TESTING_CHECKLIST].map(
   (i) => i.field
@@ -3515,6 +3552,7 @@ import { JWT as JWT2 } from "google-auth-library";
 var WEBMASTERS_READONLY = "https://www.googleapis.com/auth/webmasters.readonly";
 var SC_BASE = "https://searchconsole.googleapis.com/webmasters/v3";
 var PAGE_1_MAX_POSITION = 10;
+var BRAND_QUERY_ROW_LIMIT = 100;
 function bareHost(s) {
   return s.trim().replace(/^sc-domain:/i, "").replace(/^https?:\/\//i, "").split("/")[0].replace(/^www\./i, "").toLowerCase();
 }
@@ -3528,6 +3566,25 @@ function resolvePropertyCandidates(entries, host) {
 function ymd3(d) {
   return d.toISOString().slice(0, 10);
 }
+function pickBrandQuery(rows) {
+  let best;
+  for (const r of rows) {
+    if (typeof r.position !== "number") continue;
+    const impressions = r.impressions ?? 0;
+    if (best === void 0 || impressions > best.impressions || impressions === best.impressions && r.position < best.position) {
+      best = { position: r.position, impressions };
+    }
+  }
+  return best?.position;
+}
+function selectBrandPosition(rows, exactQuery) {
+  const want = exactQuery.toLowerCase();
+  const exact = rows.find(
+    (r) => typeof r.position === "number" && (r.keys?.[0] ?? "").toLowerCase() === want
+  );
+  if (exact) return exact.position;
+  return pickBrandQuery(rows);
+}
 async function fetchSearchPresence(q, periodStart, periodEnd) {
   const key = JSON.parse(readFileSync4(q.keyPath, "utf8"));
   const jwt = new JWT2({
@@ -3559,14 +3616,14 @@ async function fetchSearchPresence(q, periodStart, periodEnd) {
         dimensionFilterGroups: [
           {
             filters: [
-              { dimension: "query", operator: "equals", expression: q.query.toLowerCase() }
+              { dimension: "query", operator: "contains", expression: q.query.toLowerCase() }
             ]
           }
         ],
-        rowLimit: 1
+        rowLimit: BRAND_QUERY_ROW_LIMIT
       }
     });
-    const pos = res.data.rows?.[0]?.position;
+    const pos = selectBrandPosition(res.data.rows ?? [], q.query.toLowerCase());
     if (typeof pos === "number") {
       return { foundOnPage1: pos <= PAGE_1_MAX_POSITION, position: Math.max(1, Math.round(pos)) };
     }
@@ -3914,7 +3971,12 @@ async function sendOne(client, base, site, report) {
     headerImageCid: cidName,
     headerWidth: header.displayWidth,
     headerHeight: header.displayHeight,
-    headerBgColor: header.placeholderColor
+    headerBgColor: header.placeholderColor,
+    // Announcement-only: re-derive cadence + improvements from the site row so the SENT email
+    // keeps its WHAT TO EXPECT section + improvement callouts. Without this the send-time
+    // re-render drops them entirely (they're not stored on the Reports row). Ignored by the
+    // other report templates.
+    ...report.reportType === "Announcement" ? announcementSiteExtras(site) : {}
   });
   const reportDate = report.completedOn ? new Date(report.completedOn) : /* @__PURE__ */ new Date();
   const subject = report.subjectOverride ?? `${site.name} \u2014 ${monthYear(reportDate)} ${report.reportType} Report`;