Upgrade prettier (#23)

Author: andrewiggins

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{package.json,package-lock.json,.*rc,*.yml,*.yaml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

index.ts

@@ -60,15 +60,15 @@ const airtableBase = Airtable.base(airtableMetadata.baseId);
 // load the airtable data we'll need
 const airtableEvents = await getAirtableEvents(
   airtableBase,
-  airtableMetadata.eventsId
+  airtableMetadata.eventsId,
 );
 const airtableSpeakers = await getAirtableSpeakers(
   airtableBase,
-  airtableMetadata.speakersId
+  airtableMetadata.speakersId,
 );
 const airtableSponsors = await getAirtableSponsors(
   airtableBase,
-  airtableMetadata.sponsorsId
+  airtableMetadata.sponsorsId,
 );
 
 console.log("gathering existing website data...");
@@ -84,7 +84,7 @@ const websiteSponsors = await getWebsiteSponsors(config.seattlejsProjectPath);
 // only used to prompt the user for which event they want to modify
 const eventMap = mapAirtableEventsToWebsiteEvents(
   airtableEvents,
-  websiteEvents
+  websiteEvents,
 );
 
 const targetEvent = await getTargetEvent(eventMap);
@@ -95,19 +95,19 @@ if (!targetEvent.website) {
 const { newPhotos, updatedSpeakers } = reconcileSpeakers(
   targetEvent,
   airtableSpeakers,
-  websiteSpeakers
+  websiteSpeakers,
 );
 
 const { updatedTalks, removedTalks } = reconcileTalks(
   targetEvent,
   airtableSpeakers,
-  websiteTalks
+  websiteTalks,
 );
 
 const { newLogos, updatedSponsors } = reconcileSponsors(
   targetEvent,
   airtableSponsors,
-  websiteSponsors
+  websiteSponsors,
 );
 
 reconcileEvents(targetEvent, websiteEvents);
@@ -116,14 +116,14 @@ const confirmation = await confirmUpdate(
   updatedSpeakers,
   updatedTalks,
   removedTalks,
-  updatedSponsors
+  updatedSponsors,
 );
 if (confirmation) {
   await exportData(websiteSpeakers, "speakers", config.seattlejsProjectPath);
   const existingPhotos = await exportImages(
     newPhotos,
     "speakers",
-    config.seattlejsProjectPath
+    config.seattlejsProjectPath,
   );
   await exportData(websiteTalks, "talks", config.seattlejsProjectPath);
 

package-lock.json

@@ -39,7 +39,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "prettier": "2.8.3",
+    "prettier": "^3.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.3"
   },

package.json

@@ -9,10 +9,10 @@ import {
 /** mutates the events json data to include any event updates */
 export const reconcileEvents = (
   event: WebsiteAirtablePair,
-  websiteEvents: WebsiteEvent[]
+  websiteEvents: WebsiteEvent[],
 ): void => {
   const existingEventIndex = websiteEvents.findIndex(
-    (webEvent) => webEvent.id == event.website.id
+    (webEvent) => webEvent.id == event.website.id,
   );
   if (existingEventIndex > 0) {
     // the event exists, need to replace it with the updated one,
@@ -24,14 +24,14 @@ export const reconcileEvents = (
 };
 
 export const makeWebsiteEvent = (
-  airtableEvent: Record<FieldSet>
+  airtableEvent: Record<FieldSet>,
 ): WebsiteEvent => {
   const name = (airtableEvent.get("Name") as string) || "";
   const date = (airtableEvent.get("Date") as string) || "";
   const description = (airtableEvent.get("Description") as string) || "";
   const id = makeEventId(name);
   const link = (airtableEvent.get("Link") as string) || "";
-  console.log("makeWebsiteEvent", {id, link});
+  console.log("makeWebsiteEvent", { id, link });
   const event: WebsiteEvent = {
     id: id,
     link,
@@ -48,7 +48,7 @@ export const makeWebsiteEvent = (
  * and the value is an object with the corresponding airtable and website events */
 export const mapAirtableEventsToWebsiteEvents = (
   airtableEvents: Record<FieldSet>[],
-  websiteEvents: WebsiteEvent[]
+  websiteEvents: WebsiteEvent[],
 ): WebsiteAirtableMap => {
   const result: WebsiteAirtableMap = {};
   for (const event of airtableEvents) {

src/events.ts

@@ -62,7 +62,7 @@ export const getFileExtension = (fileName) => {
 };
 
 export const normalizeTalkType = (
-  talkType: string
+  talkType: string,
 ): "regular" | "lightning" => {
   if (talkType.toLowerCase().includes("regular")) {
     return "regular";
@@ -71,7 +71,7 @@ export const normalizeTalkType = (
 };
 
 export const handleTalkTopics = (
-  talkTopics: string | undefined | ""
+  talkTopics: string | undefined | "",
 ): string[] => {
   if (talkTopics === "") {
     return [];

src/normalizers.ts

@@ -54,16 +54,16 @@ const getSeattleJsBaseId = async (token: string): Promise<string> => {
 };
 
 export const getAirtableMetadata = async (
-  token: string
+  token: string,
 ): Promise<AirtableMetadata> => {
   const baseId = await getSeattleJsBaseId(token);
   const tables = await getAirtableTables(baseId, token);
   const eventsTable = tables.find((table) => table.name === EVENTS_TABLE_NAME);
   const speakersTable = tables.find(
-    (table) => table.name === SPEAKERS_TABLE_NAME
+    (table) => table.name === SPEAKERS_TABLE_NAME,
   );
   const sponsorsTable = tables.find(
-    (table) => table.name === SPONSORS_TABLE_NAME
+    (table) => table.name === SPONSORS_TABLE_NAME,
   );
   const ids: AirtableMetadata = {
     baseId: baseId,

src/repos/airtable-metadata.ts

@@ -27,7 +27,7 @@ const getDateMonthsInFuture = (monthsInFuture: number): Date => {
 };
 
 export const getTargetEvent = async (
-  events: WebsiteAirtableMap
+  events: WebsiteAirtableMap,
 ): Promise<WebsiteAirtablePair> => {
   // reduce number of events to limit, taking most recent
   const someMonthsAgo = getDateMonthsAgo(MONTHS_PRIOR_LIMIT);
@@ -57,14 +57,14 @@ export const confirmUpdate = async (
   updatedSpeakers: WebsiteSpeaker[],
   updatedTalks: WebsiteTalk[],
   removedTalks: string[],
-  updatedSponsors: WebsiteSponsor[]
+  updatedSponsors: WebsiteSponsor[],
 ): Promise<boolean> => {
   const confirmMessage = [
     "Confirm update:\n",
     `${updatedTalks.length} new talks\n`,
-    `${removedTalks.length} removed talks ${ removedTalks.length ? `(${removedTalks})` : ''}\n`,
+    `${removedTalks.length} removed talks ${removedTalks.length ? `(${removedTalks})` : ""}\n`,
     `${updatedSponsors.length} new sponsors\n`,
-    `${updatedSpeakers.length} new speakers\n`
+    `${updatedSpeakers.length} new speakers\n`,
   ];
   const res = await prompts({
     type: "confirm",
@@ -109,7 +109,7 @@ export const promptForApiToken = async (retries = 1): Promise<string> => {
 };
 
 export const promptForSeattlejsProjectPath = async (
-  retries = 1
+  retries = 1,
 ): Promise<string> => {
   while (retries >= 0) {
     retries--;
@@ -124,6 +124,6 @@ export const promptForSeattlejsProjectPath = async (
     }
   }
   throw new Error(
-    "please provide a path to a valid seattlejs.com repo or fork"
+    "please provide a path to a valid seattlejs.com repo or fork",
   );
 };

src/repos/user-input.ts

@@ -23,7 +23,7 @@ const JSON_FILES = {
 };
 
 export const validateSeattleJsProjectPath = async (
-  projectPath: string
+  projectPath: string,
 ): Promise<boolean> => {
   for (const [type, file] of Object.entries(JSON_FILES)) {
     const fullPath = path.join(projectPath, file);
@@ -40,23 +40,23 @@ const parseJSONFile = async (filePath: string): Promise<any> => {
 };
 
 export const getWebsiteEvents = async (
-  projectPath: string
+  projectPath: string,
 ): Promise<WebsiteEvent[]> => {
   return parseJSONFile(path.join(projectPath, JSON_FILES["events"]));
 };
 
 export const getWebsiteSpeakers = async (
-  projectPath: string
+  projectPath: string,
 ): Promise<WebsiteSpeaker[]> => {
   return parseJSONFile(path.join(projectPath, JSON_FILES["speakers"]));
 };
 export const getWebsiteTalks = async (
-  projectPath: string
+  projectPath: string,
 ): Promise<WebsiteTalk[]> => {
   return parseJSONFile(path.join(projectPath, JSON_FILES["talks"]));
 };
 export const getWebsiteSponsors = async (
-  projectPath: string
+  projectPath: string,
 ): Promise<WebsiteSponsor[]> => {
   return parseJSONFile(path.join(projectPath, JSON_FILES["sponsors"]));
 };
@@ -84,7 +84,7 @@ export const exportImages = async (imageObjects, type, projectPath) => {
       const filePath = path.join(
         projectPath,
         IMAGE_DIRS[type],
-        imageObj.filename
+        imageObj.filename,
       );
       const imageExists = await exists(filePath);
       if (!imageExists) {

src/repos/website.ts

@@ -16,7 +16,7 @@ import {
 export const reconcileSpeakers = (
   event: WebsiteAirtablePair,
   airtableSpeakers: Record<FieldSet>[],
-  websiteSpeakers: WebsiteSpeaker[]
+  websiteSpeakers: WebsiteSpeaker[],
 ): {
   updatedSpeakers: WebsiteSpeaker[];
   newPhotos: AirtablePhoto[];
@@ -26,7 +26,7 @@ export const reconcileSpeakers = (
   // get the speakers for the passed event
   const airtableEventSpeakers = getEventSpeakers(
     event.airtable,
-    airtableSpeakers
+    airtableSpeakers,
   );
   for (const speaker of airtableEventSpeakers) {
     // make speaker object and get photo uri
@@ -49,7 +49,7 @@ export const reconcileSpeakers = (
 
 /** make a website speaker from an airtable speaker */
 const makeWebsiteSpeaker = (
-  airtableSpeaker: Record<FieldSet>
+  airtableSpeaker: Record<FieldSet>,
 ): { speaker: WebsiteSpeaker; speakerPhoto: AirtablePhoto } => {
   const speaker = {} as WebsiteSpeaker;
   const name = airtableSpeaker.get("Full Name");
@@ -79,7 +79,7 @@ const makeWebsiteSpeaker = (
  */
 export const getEventSpeakers = (
   airtableEvent,
-  airtableSpeakers
+  airtableSpeakers,
 ): Record<FieldSet>[] => {
   const speakerRecords = [];
   const speakerIds = (airtableEvent.get("Speakers") as string[]) || [];