Upgrade to Prettier 3.3 (#260)

ParkingReformNetwork · Jul 27, 2024 · 5c28488 · 5c28488
1 parent df7c316
commit 5c28488
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 91 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Parking Lot Map - Parking Reform Network</title>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "http-server": "^14.1.1",
     "parcel": "^2.10.3",
     "playwright": "^1.34.3",
-    "prettier": "^2.8.7",
+    "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },

diff --git a/scripts/add-city.ts b/scripts/add-city.ts
@@ -5,7 +5,7 @@ import { CityId } from "../src/js/types.ts";
 
 const addScoreCard = async (
   cityId: CityId,
-  cityName: string
+  cityName: string,
 ): Promise<results.Result<void, string>> => {
   const newEntry = {
     name: cityName,
@@ -27,7 +27,7 @@ const addScoreCard = async (
   } catch (err: unknown) {
     const { message } = err as Error;
     return results.Err(
-      `Issue reading the score card file path ${originalFilePath}: ${message}`
+      `Issue reading the score card file path ${originalFilePath}: ${message}`,
     );
   }
 
@@ -54,7 +54,7 @@ const main = async () => {
       cityId,
       true,
       "data/city-boundaries.geojson",
-      "city-update.geojson"
+      "city-update.geojson",
     )
   ).unwrap();
 
@@ -63,7 +63,7 @@ const main = async () => {
       cityId,
       true,
       "parking-lots-update.geojson",
-      `data/parking-lots/${cityId}.geojson`
+      `data/parking-lots/${cityId}.geojson`,
     )
   ).unwrap();
 
@@ -73,7 +73,7 @@ const main = async () => {
   console.log(
     `Almost done! Now, fill in the score card values in data/score-cards.json. Then,
     run 'npm run fmt'. Then, 'npm start' and see if the site is what you expect.
-    `
+    `,
   );
 };
 

diff --git a/scripts/base.ts b/scripts/base.ts
@@ -11,13 +11,13 @@ import { CityId } from "../src/js/types";
 
 const determineArgs = (
   scriptCommand: string,
-  processArgv: string[]
+  processArgv: string[],
 ): results.Result<{ cityName: string; cityId: CityId }, string> => {
   if (processArgv.length !== 1) {
     return new results.Err(
       `Must provide exactly one argument (the city/state name). For example,
        npm run ${scriptCommand} -- 'Columbus, OH'
-       `
+       `,
     );
   }
   const cityName = processArgv[0];
@@ -30,7 +30,7 @@ const updateCoordinates = async (
   cityId: CityId,
   addCity: boolean,
   originalFilePath: string,
-  updateFilePath: string
+  updateFilePath: string,
 ): Promise<results.Result<string, string>> => {
   let newData: FeatureCollection<Polygon, GeoJsonProperties>;
   try {
@@ -39,13 +39,13 @@ const updateCoordinates = async (
   } catch (err: unknown) {
     const { message } = err as Error;
     return results.Err(
-      `Issue reading the update file path ${updateFilePath}: ${message}`
+      `Issue reading the update file path ${updateFilePath}: ${message}`,
     );
   }
 
   if (!Array.isArray(newData.features) || newData.features.length !== 1) {
     return results.Err(
-      "The script expects exactly one entry in `features` because you can only update one city at a time."
+      "The script expects exactly one entry in `features` because you can only update one city at a time.",
     );
   }
 
@@ -60,7 +60,7 @@ const updateCoordinates = async (
   } catch (err: unknown) {
     const { message } = err as Error;
     return results.Err(
-      `Issue reading the original data file path ${originalFilePath}: ${message}`
+      `Issue reading the original data file path ${originalFilePath}: ${message}`,
     );
   }
 
@@ -73,11 +73,11 @@ const updateCoordinates = async (
     originalData.features.push(newEntry);
   } else {
     const cityOriginalData = originalData.features.find(
-      (feature) => feature?.properties?.id === cityId
+      (feature) => feature?.properties?.id === cityId,
     );
     if (!cityOriginalData) {
       return results.Err(
-        `City not found in ${originalFilePath}. To add a new city, run again with the '--add' flag, e.g. npm run ${scriptCommand} -- 'My City, AZ' --add`
+        `City not found in ${originalFilePath}. To add a new city, run again with the '--add' flag, e.g. npm run ${scriptCommand} -- 'My City, AZ' --add`,
       );
     }
     cityOriginalData.geometry.coordinates = newCoordinates;
@@ -102,7 +102,7 @@ const updateParkingLots = async (
   cityId: CityId,
   addCity: boolean,
   originalFilePath: string,
-  updateFilePath: string
+  updateFilePath: string,
 ): Promise<results.Result<string, string>> => {
   let newData;
   try {
@@ -111,13 +111,13 @@ const updateParkingLots = async (
   } catch (err: unknown) {
     const { message } = err as Error;
     return results.Err(
-      `Issue reading the update file path parking-lots-update.geojson: ${message}`
+      `Issue reading the update file path parking-lots-update.geojson: ${message}`,
     );
   }
 
   if (!Array.isArray(newData.features) || newData.features.length !== 1) {
     return results.Err(
-      "The script expects exactly one entry in `features` because you can only update one city at a time."
+      "The script expects exactly one entry in `features` because you can only update one city at a time.",
     );
   }
 
@@ -132,7 +132,7 @@ const updateParkingLots = async (
     } catch (err: unknown) {
       const { message } = err as Error;
       return results.Err(
-        `Issue reading the original data file path ${updateFilePath}: ${message}`
+        `Issue reading the original data file path ${updateFilePath}: ${message}`,
       );
     }
     originalData.geometry.coordinates = newCoordinates;

diff --git a/scripts/update-city-boundaries.ts b/scripts/update-city-boundaries.ts
@@ -3,7 +3,7 @@ import { determineArgs, updateCoordinates } from "./base.js";
 const main = async (): Promise<void> => {
   const { cityId } = determineArgs(
     "update-city-boundaries",
-    process.argv.slice(2)
+    process.argv.slice(2),
   )
     .mapErr((err) => new Error(`Argument error: ${err}`))
     .unwrap();
@@ -13,15 +13,15 @@ const main = async (): Promise<void> => {
       cityId,
       false,
       "data/city-boundaries.geojson",
-      "city-update.geojson"
+      "city-update.geojson",
     )
   ).unwrap();
 
   /* eslint-disable-next-line no-console */
   console.log(
     `${value} Now, run 'npm run fmt'. Then, 'npm start' and
       see if the site is what you expect.
-    `
+    `,
   );
 };
 

diff --git a/scripts/update-lots.ts b/scripts/update-lots.ts
@@ -9,15 +9,15 @@ const main = async (): Promise<void> => {
       cityId,
       false,
       "parking-lots-update.geojson",
-      `data/parking-lots/${cityId}.geojson`
+      `data/parking-lots/${cityId}.geojson`,
     )
   ).unwrap();
 
   /* eslint-disable-next-line no-console */
   console.log(
     `${value} Now, run 'npm run fmt'. Then, 'npm start' and
       see if the site is what you expect.
-    `
+    `,
   );
 };
 

diff --git a/src/js/CitySelectionState.ts b/src/js/CitySelectionState.ts
@@ -12,7 +12,7 @@ type CitySelectionObservable = Observable<CitySelectionState>;
 
 function initCitySelectionState(
   initialCityId: CityId | null,
-  fallBackCityId: CityId
+  fallBackCityId: CityId,
 ): CitySelectionObservable {
   const startingCity =
     initialCityId && Object.keys(scoreCardsData).includes(initialCityId)

diff --git a/src/js/about.ts b/src/js/about.ts
@@ -17,7 +17,7 @@ function setUpAbout(): void {
   const closeIcon = document.querySelector(".about-popup-close-icon-container");
 
   headerIcon?.addEventListener("click", () =>
-    isVisible.setValue(!isVisible.getValue())
+    isVisible.setValue(!isVisible.getValue()),
   );
   closeIcon?.addEventListener("click", () => isVisible.setValue(false));
 

diff --git a/src/js/dropdown.ts b/src/js/dropdown.ts
@@ -35,7 +35,7 @@ function createDropdown(): Choices {
       } else {
         officialCities.push(entry);
       }
-    }
+    },
   );
 
   dropdown.setChoices([

diff --git a/src/js/fontAwesome.ts b/src/js/fontAwesome.ts
@@ -24,7 +24,7 @@ function setUpIcons(): void {
     faLink,
     faUpRightFromSquare,
     faCheck,
-    faTriangleExclamation
+    faTriangleExclamation,
   );
   dom.watch();
 }

diff --git a/src/js/iframe.ts b/src/js/iframe.ts
@@ -16,7 +16,7 @@ function isIFrame(): boolean {
 function maybeDisableFullScreenIcon(): void {
   if (isIFrame()) return;
   const iconContainer = document.querySelector<HTMLAnchorElement>(
-    ".header-full-screen-icon-container"
+    ".header-full-screen-icon-container",
   );
   if (!iconContainer) return;
   iconContainer.style.display = "none";

diff --git a/src/js/map.ts b/src/js/map.ts
@@ -13,14 +13,14 @@ const BASE_LAYERS = {
       subdomains: "abcd",
       minZoom: 0,
       maxZoom: MAX_ZOOM,
-    }
+    },
   ),
   "Google Maps": new TileLayer(
     "https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}",
     {
       attribution: `&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> &copy; Google Maps`,
       maxZoom: MAX_ZOOM,
-    }
+    },
   ),
 };
 
@@ -49,7 +49,7 @@ export function createMap(): Map {
     layers: [BASE_LAYERS["High contrast"]],
   });
   map.attributionControl.setPrefix(
-    '<a href="https://parkingreform.org/support/">Parking Reform Network</a>'
+    '<a href="https://parkingreform.org/support/">Parking Reform Network</a>',
   );
 
   new Control.Layers(BASE_LAYERS).addTo(map);

diff --git a/src/js/scorecard.ts b/src/js/scorecard.ts
@@ -18,13 +18,13 @@ function generateScorecard(entry: ScoreCardDetails): string {
   const listEntries = [];
   if (entry.parkingScore) {
     listEntries.push(
-      `${entry.parkingScore}/100 parking score (lower is better)`
+      `${entry.parkingScore}/100 parking score (lower is better)`,
     );
   }
   listEntries.push(`City type: ${entry.cityType}`);
   listEntries.push(`${entry.population} residents - city proper`);
   listEntries.push(
-    `${entry.urbanizedAreaPopulation} residents - urbanized area`
+    `${entry.urbanizedAreaPopulation} residents - urbanized area`,
   );
 
   let reformsLine = `Parking reforms ${entry.reforms}`;
@@ -35,7 +35,7 @@ function generateScorecard(entry: ScoreCardDetails): string {
 
   if ("contribution" in entry) {
     listEntries.push(
-      `<a href="mailto:${entry.contribution}">Email data maintainer</a>`
+      `<a href="mailto:${entry.contribution}">Email data maintainer</a>`,
     );
   }
 
@@ -70,7 +70,7 @@ function generateScorecard(entry: ScoreCardDetails): string {
 function updateScorecardAccordionUI(expanded: boolean): void {
   const toggle = document.querySelector(".scorecard-accordion-toggle");
   const content = document.querySelector<HTMLElement>(
-    "#scorecard-accordion-content"
+    "#scorecard-accordion-content",
   );
   const upIcon = toggle?.querySelector<SVGElement>(".fa-chevron-up");
   const downIcon = toggle?.querySelector<SVGElement>(".fa-chevron-down");
@@ -104,7 +104,7 @@ function setUpScorecardAccordion(): void {
 
 export default function addScorecardSubscriber(
   observable: CitySelectionObservable,
-  cities: ScoreCards
+  cities: ScoreCards,
 ): void {
   observable.subscribe(({ cityId }) => {
     const scorecardContainer = document.querySelector(".scorecard-container");

diff --git a/src/js/setUpSite.ts b/src/js/setUpSite.ts
@@ -36,7 +36,7 @@ function snapToCity(map: Map, layer: ImageOverlay): void {
 function addSnapToCitySubscriber(
   observable: CitySelectionObservable,
   map: Map,
-  cities: ScoreCards
+  cities: ScoreCards,
 ): void {
   observable.subscribe((state) => {
     if (!state.shouldSnapMap) return;
@@ -53,7 +53,7 @@ function setCityByMapPosition(
   observable: CitySelectionObservable,
   map: Map,
   cities: ScoreCards,
-  parkingLotLoader: ParkingLotLoader
+  parkingLotLoader: ParkingLotLoader,
 ): void {
   map.on("moveend", () => {
     let centralCityDistance: number | null = null;
@@ -106,7 +106,7 @@ function createCitiesLayer(map: Map): [GeoJSON, ScoreCards] {
 function setCityOnBoundaryClick(
   observable: CitySelectionObservable,
   map: Map,
-  cityBoundaries: GeoJSON
+  cityBoundaries: GeoJSON,
 ): void {
   cityBoundaries.addEventListener("click", (e) => {
     const currentZoom = map.getZoom();
@@ -130,7 +130,7 @@ async function setUpSite(): Promise<void> {
   const initialCityId = extractCityIdFromUrl(window.location.href);
   const citySelectionObservable = initCitySelectionState(
     initialCityId,
-    "atlanta-ga"
+    "atlanta-ga",
   );
 
   setUpDropdown(citySelectionObservable);