Add Prettier to package.json to pin version & rewrite files

app/analytics/collect.test.ts

@@ -89,7 +89,7 @@ describe("collectRequestHandler", () => {
             [
                 1, // new visitor
                 1, // new session
-            ]
+            ],
         );
     });
 
@@ -104,9 +104,9 @@ describe("collectRequestHandler", () => {
             // @ts-expect-error - we're mocking the request object
             generateRequestParams({
                 "if-modified-since": new Date(
-                    Date.now() - 5 * 60 * 1000
+                    Date.now() - 5 * 60 * 1000,
                 ).toUTCString(),
-            })
+            }),
         );
 
         collectRequestHandler(request, env);
@@ -117,7 +117,7 @@ describe("collectRequestHandler", () => {
             [
                 0, // new visitor
                 0, // new session
-            ]
+            ],
         );
     });
 
@@ -132,9 +132,9 @@ describe("collectRequestHandler", () => {
             // @ts-expect-error - we're mocking the request object
             generateRequestParams({
                 "if-modified-since": new Date(
-                    Date.now() - 31 * 60 * 1000
+                    Date.now() - 31 * 60 * 1000,
                 ).toUTCString(),
-            })
+            }),
         );
 
         collectRequestHandler(request, env);
@@ -145,7 +145,7 @@ describe("collectRequestHandler", () => {
             [
                 0, // new visitor
                 1, // new session
-            ]
+            ],
         );
     });
 
@@ -160,9 +160,9 @@ describe("collectRequestHandler", () => {
             // @ts-expect-error - we're mocking the request object
             generateRequestParams({
                 "if-modified-since": new Date(
-                    Date.now() - 60 * 24 * 60 * 1000
+                    Date.now() - 60 * 24 * 60 * 1000,
                 ).toUTCString(),
-            })
+            }),
         );
 
         collectRequestHandler(request, env);
@@ -173,7 +173,7 @@ describe("collectRequestHandler", () => {
             [
                 1, // new visitor
                 1, // new session
-            ]
+            ],
         );
     });
 });

app/analytics/query.ts

@@ -61,7 +61,7 @@ function formatDateString(d: Date) {
 function generateEmptyRowsOverInterval(
     intervalType: string,
     daysAgo: number,
-    tz?: string
+    tz?: string,
 ): [Date, { [key: string]: number }] {
     if (!tz) {
         tz = "Etc/UTC";
@@ -96,7 +96,7 @@ function generateEmptyRowsOverInterval(
         const rowDate = new Date(i);
         // convert to UTC
         const utcDateTime = new Date(
-            rowDate.getTime() + rowDate.getTimezoneOffset() * 60_000
+            rowDate.getTime() + rowDate.getTimezoneOffset() * 60_000,
         );
 
         const key = formatDateString(utcDateTime);
@@ -151,7 +151,7 @@ export class AnalyticsEngineAPI {
         siteId: string,
         intervalType: string,
         sinceDays: number,
-        tz?: string
+        tz?: string,
     ) {
         let intervalCount = 1;
 
@@ -167,7 +167,7 @@ export class AnalyticsEngineAPI {
         const [startDateTime, initialRows] = generateEmptyRowsOverInterval(
             intervalType,
             sinceDays,
-            tz
+            tz,
         );
 
         // NOTE: when using toStartOfInterval, cannot group by other columns
@@ -217,7 +217,7 @@ export class AnalyticsEngineAPI {
                             accum[key] = row["count"];
                             return accum;
                         },
-                        initialRows
+                        initialRows,
                     );
 
                     // return as sorted array of tuples (i.e. [datetime, count])
@@ -226,11 +226,11 @@ export class AnalyticsEngineAPI {
                             if (a[0] < b[0]) return -1;
                             else if (a[0] > b[0]) return 1;
                             else return 0;
-                        }
+                        },
                     );
 
                     resolve(sortedRows);
-                })()
+                })(),
         );
         return returnPromise;
     }
@@ -287,7 +287,7 @@ export class AnalyticsEngineAPI {
                         counts.views += Number(row.count);
                     });
                     resolve(counts);
-                })()
+                })(),
         );
 
         return returnPromise;
@@ -297,7 +297,7 @@ export class AnalyticsEngineAPI {
         siteId: string,
         column: T,
         sinceDays: number,
-        limit?: number
+        limit?: number,
     ) {
         // defaults to 1 day if not specified
         const interval = sinceDays || 1;
@@ -339,9 +339,9 @@ export class AnalyticsEngineAPI {
                         const key =
                             row[_column] === "" ? "(none)" : row[_column];
                         return [key, row["count"]] as const;
-                    })
+                    }),
                 );
-            })()
+            })(),
         );
         return returnPromise;
     }
@@ -370,7 +370,6 @@ export class AnalyticsEngineAPI {
         return this.getVisitorCountByColumn(siteId, "deviceModel", sinceDays);
     }
 
-
     async getSitesOrderedByHits(sinceDays: number, limit?: number) {
         // defaults to 1 day if not specified
         const interval = sinceDays || 1;
@@ -404,13 +403,16 @@ export class AnalyticsEngineAPI {
 
                     const responseData =
                         (await response.json()) as AnalyticsQueryResult<SelectionSet>;
-                    const result = responseData.data.reduce((acc, cur) => {
-                        acc.push([cur["siteId"], cur["count"]]);
-                        return acc;
-                    }, [] as [string, number][]);
+                    const result = responseData.data.reduce(
+                        (acc, cur) => {
+                            acc.push([cur["siteId"], cur["count"]]);
+                            return acc;
+                        },
+                        [] as [string, number][],
+                    );
 
                     resolve(result);
-                })()
+                })(),
         );
         return returnPromise;
     }

app/analytics/schema.ts

@@ -1,10 +1,10 @@
 export type ColumnMappingToType<
-    T extends (typeof ColumnMappings)[keyof typeof ColumnMappings]
+    T extends (typeof ColumnMappings)[keyof typeof ColumnMappings],
 > = T extends `blob${number}`
     ? string
     : T extends `double${number}`
-    ? number
-    : never;
+      ? number
+      : never;
 
 /**
  * This maps logical column names to the actual column names in the data store.

app/entry.server.tsx

@@ -19,7 +19,7 @@ export default async function handleRequest(
     // free to delete this parameter in your app if you're not using it!
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    loadContext: AppLoadContext
+    loadContext: AppLoadContext,
 ) {
     const body = await renderToReadableStream(
         // @ts-expect-error This is a mistake in the package types, resolved in @remix-run/[email protected]
@@ -31,7 +31,7 @@ export default async function handleRequest(
                 console.error(error);
                 responseStatusCode = 500;
             },
-        }
+        },
     );
 
     if (isbot(request.headers.get("user-agent"))) {