Fix TypeScript issues

Author: mpoc

src/apiUtils.ts

@@ -1,7 +1,7 @@
 import { ApiError } from './error'
-import type { ApiResponse } from "./types";
+import type { ApiResponse, SuccessResponseData } from "./types";
 
-export const successResponse = (data: object, message: string) => {
+export const successResponse = (data: SuccessResponseData, message: string) => {
   const response: ApiResponse = {
     success: true,
     data,

src/controller.ts

@@ -54,7 +54,7 @@ export const logSleepRoute = async (req: BunRequest) => {
 export const getSleepRoute = async (req: BunRequest) => {
   const sheetsObj = await getSheetsObj()
 
-  const result = await getObjectArray(
+  const result: SheetsSleepEntry[] = await getObjectArray(
     sheetsObj,
     process.env.SPREADSHEET_ID!,
     process.env.SPREADSHEET_RANGE!,

src/views/js/api.ts

@@ -1,3 +1,4 @@
+import type { ApiResponse, GetLastSleepRouteResponse } from '../../types.js';
 import { getApiKey } from './params.js'
 
 export const getSleepEntries = async () => {
@@ -13,12 +14,14 @@ export const getLastSleepEntry = async () => {
   const apiKey = getApiKey();
   const url = getEndpointUrl("api/sleep/last", apiKey);
 
-  return await fetch(url)
+  const response = await fetch(url)
     .then(res => res.json())
     .catch(err => console.error(err));
+
+  return response as ApiResponse<GetLastSleepRouteResponse>;
 };
 
-export const submitSleepEntry = async (position) => {
+export const submitSleepEntry = async (position: GeolocationPosition) => {
   const json = {
     coords: {
       latitude: position.coords.latitude,
@@ -48,7 +51,7 @@ export const submitSleepEntry = async (position) => {
     .catch(err => console.error(err));
 };
 
-export const replaceLastSleepEntry = async (position) => {
+export const replaceLastSleepEntry = async (position: GeolocationPosition) => {
   const json = {
     coords: {
       latitude: position.coords.latitude,
@@ -78,7 +81,7 @@ export const replaceLastSleepEntry = async (position) => {
     .catch(err => console.error(err));
 }
 
-const getEndpointUrl = (endpoint, apiKey) => {
+const getEndpointUrl = (endpoint: string, apiKey?: string) => {
   const url = new URL(endpoint, window.location.href);
   if (apiKey) {
     url.searchParams.append('apiKey', apiKey);

src/views/js/params.ts

@@ -1,11 +1,14 @@
 export const getApiKey = () => {
   const searchParams = new URLSearchParams(window.location.search);
   if (!searchParams.has('apiKey')) {
-    document.getElementById('text').innerHTML = 'No API key provided';
-    return null;
+    const textElement = document.getElementById('text');
+    if (textElement) {
+      textElement.innerHTML = 'No API key provided';
+    }
+    return;
   }
   const apiKey = searchParams.get('apiKey');
-  return apiKey;
+  return apiKey ?? undefined;
 }
 
 export const getAutoLog = () => {

src/views/js/utils.ts

@@ -1,9 +1,9 @@
-export const formatDuration = duration => {
+export const formatDuration = (duration: number) => {
   const secondsDiff = duration / 1000;
 
-  const hours = parseInt(secondsDiff / 3600);
-  const minutes = parseInt((secondsDiff / 60) % 60);
-  const seconds = parseInt(secondsDiff % 60);
+  const hours = Math.floor(secondsDiff / 3600);
+  const minutes = Math.floor((secondsDiff / 60) % 60);
+  const seconds = Math.floor(secondsDiff % 60);
 
   // const hour = { singular: ' hour', plural: ' hours' };
   // const minute = { singular: ' minute', plural: ' minutes' };
@@ -20,15 +20,15 @@ export const formatDuration = duration => {
   // return hoursString + " " + minutesString + " " + secondsString;
 
   return (hours == 0 ? "" : hoursString) + " " +
-    ((hours == 0 & minutes == 0) ? "" : minutesString) + " " +
+    ((hours == 0 && minutes == 0) ? "" : minutesString) + " " +
     secondsString;
 }
 
-export const prettyObjectString = object => Object.entries(object)
+export const prettyObjectString = (object: Record<string, any>) => Object.entries(object)
   .map(([key, value]) => `${key}: ${value}`)
   .join(",<br>");
 
-export const printPosition = position => {
+export const printPosition = (position: GeolocationPosition) => {
   console.log(`Timestamp: ${new Date(position.timestamp)} (${position.timestamp})`);
   console.log('Your current position is:');
   console.log(`Latitude: ${position.coords.latitude}`);

tsconfig.json

@@ -1,3 +1,6 @@
 {
- "extends": "@tsconfig/bun/tsconfig.json"
+  "extends": "@tsconfig/bun/tsconfig.json",
+  "compilerOptions": {
+    "lib": ["ESNext", "DOM"]
+  }
 }