[O] Lint

AquaNet/src/libs/generalTypes.ts

@@ -1,5 +1,5 @@
 export interface TrendEntry {
-    date: string
+  date: string
-    rating: number
+  rating: number
-    plays: number
+  plays: number
 }

AquaNet/src/libs/maimai.ts

@@ -1,51 +1,51 @@
-import {aqua_host, data_host} from "./config";
+import { aqua_host, data_host } from './config'
-import type {TrendEntry} from "./generalTypes";
+import type { TrendEntry } from './generalTypes'
-import type {MaimaiUserSummaryEntry} from "./maimaiTypes";
+import type { MaimaiUserSummaryEntry } from './maimaiTypes'
 
 
 const multTable = [
-    [100.5, 22.4, "SSSp"],
+  [ 100.5, 22.4, 'SSSp' ],
-    [100, 21.6, "SSS"],
+  [ 100, 21.6, 'SSS' ],
-    [99.5, 21.1, "SSp"],
+  [ 99.5, 21.1, 'SSp' ],
-    [99, 20.8, "SS"],
+  [ 99, 20.8, 'SS' ],
-    [98, 20.3, "Sp"],
+  [ 98, 20.3, 'Sp' ],
-    [97, 20, "S"],
+  [ 97, 20, 'S' ],
-    [94, 16.8, "AAA"],
+  [ 94, 16.8, 'AAA' ],
-    [90, 15.2, "AA"],
+  [ 90, 15.2, 'AA' ],
-    [80, 13.6, "A"]
+  [ 80, 13.6, 'A' ]
 ]
 
 
 export function getMult(achievement: number) {
-    achievement /= 10000
+  achievement /= 10000
-    for (let i = 0; i < multTable.length; i++) {
+  for (let i = 0; i < multTable.length; i++) {
-        if (achievement >= (multTable[i][0] as number)) return multTable[i]
+    if (achievement >= (multTable[i][0] as number)) return multTable[i]
-    }
+  }
-    return [0, 0, 0]
+  return [ 0, 0, 0 ]
 }
 
 
 export async function getMaimai(endpoint: string, params: any) {
-    return await fetch(`${aqua_host}/Maimai2Servlet/${endpoint}`, {
+  return await fetch(`${aqua_host}/Maimai2Servlet/${endpoint}`, {
-        method: "POST",
+    method: 'POST',
-        body: JSON.stringify(params)
+    body: JSON.stringify(params)
-    }).then(res => res.json())
+  }).then(res => res.json())
 }
 
 export async function getMaimaiAllMusic(): Promise<{ [key: string]: any }> {
-    return fetch(`${data_host}/maimai/meta/00/all-music.json`).then(it => it.json())
+  return fetch(`${data_host}/maimai/meta/00/all-music.json`).then(it => it.json())
 }
 
 export async function getMaimaiApi(endpoint: string, params: any) {
-    let url = new URL(`${aqua_host}/api/game/maimai2new/${endpoint}`)
+  const url = new URL(`${aqua_host}/api/game/maimai2new/${endpoint}`)
-    Object.keys(params).forEach(key => url.searchParams.append(key, params[key]))
+  Object.keys(params).forEach(key => url.searchParams.append(key, params[key]))
-    return await fetch(url).then(res => res.json())
+  return await fetch(url).then(res => res.json())
 }
 
 export async function getMaimaiTrend(userId: number): Promise<TrendEntry[]> {
-    return await getMaimaiApi("trend", {userId})
+  return await getMaimaiApi('trend', { userId })
 }
 
 export async function getMaimaiUser(userId: number): Promise<MaimaiUserSummaryEntry> {
-    return await getMaimaiApi("user-summary", {userId})
+  return await getMaimaiApi('user-summary', { userId })
 }

AquaNet/src/libs/ui.ts

@@ -1,94 +1,93 @@
 import {
-    Chart as ChartJS,
+  Chart as ChartJS,
+  Title,
+  Tooltip,
+  Legend,
+  LineElement,
+  LinearScale,
+  PointElement,
+  CategoryScale, TimeScale, type ChartOptions, type LineOptions,
+} from 'chart.js'
+import moment from 'moment/moment'
+// @ts-expect-error Cal-heatmap does not have proper types
+import CalHeatmap from 'cal-heatmap'
+// @ts-expect-error Cal-heatmap does not have proper types
+import CalTooltip from 'cal-heatmap/plugins/Tooltip'
+
+export function title(t: string) {
+  document.title = `AquaNet - ${t}`
+}
+
+export function registerChart() {
+  ChartJS.register(
     Title,
     Tooltip,
     Legend,
     LineElement,
     LinearScale,
     PointElement,
-    CategoryScale, TimeScale, type ChartOptions, type LineOptions,
+    CategoryScale,
-} from 'chart.js';
+    TimeScale
-import moment from "moment/moment";
+  )
-// @ts-ignore
-import CalHeatmap from "cal-heatmap";
-// @ts-ignore
-import CalTooltip from 'cal-heatmap/plugins/Tooltip';
-import type {Line} from "svelte-chartjs";
-
-export function title(t: string) {
-    document.title = `AquaNet - ${t}`
-}
-
-export function registerChart() {
-    ChartJS.register(
-        Title,
-        Tooltip,
-        Legend,
-        LineElement,
-        LinearScale,
-        PointElement,
-        CategoryScale,
-        TimeScale
-    );
 }
 
 export function renderCal(el: HTMLElement, d: {date: any, value: any}[]) {
-    const cal = new CalHeatmap();
+  const cal = new CalHeatmap()
-    return cal.paint({
+  return cal.paint({
-        itemSelector: el,
+    itemSelector: el,
-        domain: {
+    domain: {
-            type: 'month',
+      type: 'month',
-            label: { text: 'MMM', textAlign: 'start', position: 'top' },
+      label: { text: 'MMM', textAlign: 'start', position: 'top' },
-        },
+    },
-        subDomain: {
+    subDomain: {
-            type: 'ghDay',
+      type: 'ghDay',
-            radius: 2, width: 11, height: 11, gutter: 4
+      radius: 2, width: 11, height: 11, gutter: 4
-        },
+    },
-        range: 12,
+    range: 12,
-        data: {source: d, x: 'date', y: 'value'},
+    data: { source: d, x: 'date', y: 'value' },
-        scale: {
+    scale: {
-            color: {
+      color: {
-                type: 'linear',
+        type: 'linear',
-                range: ['#14432a', '#4dd05a'],
+        range: [ '#14432a', '#4dd05a' ],
-                domain: [0, d.reduce((a, b) => Math.max(a, b.value), 0)]
+        domain: [ 0, d.reduce((a, b) => Math.max(a, b.value), 0) ]
-            },
+      },
-        },
+    },
-        date: {start: moment().subtract(1, 'year').add(1, 'month').toDate()},
+    date: { start: moment().subtract(1, 'year').add(1, 'month').toDate() },
-        theme: "dark",
+    theme: 'dark',
-    }, [
+  }, [
-        [CalTooltip, {text: (_: Date, v: number, d: any) =>
+    [ CalTooltip, { text: (_: Date, v: number, d: any) =>
-                `${v ?? "No"} songs played on ${d.format('MMMM D, YYYY')}`}]
+      `${v ?? 'No'} songs played on ${d.format('MMMM D, YYYY')}` }]
-    ]);
+  ])
 }
 
 
-export const CHARTJS_OPT: ChartOptions<"line"> = {
+export const CHARTJS_OPT: ChartOptions<'line'> = {
-    responsive: true,
+  responsive: true,
-    maintainAspectRatio: false,
+  maintainAspectRatio: false,
-    // TODO: Show point on hover
+  // TODO: Show point on hover
-    elements: {
+  elements: {
-        point: {
+    point: {
-            radius: 0
+      radius: 0
-        }
+    }
+  },
+  scales: {
+    xAxis: {
+      type: 'time',
+      display: false
     },
-    scales: {
+    y: {
-        xAxis: {
+      display: false,
-            type: 'time',
+    }
-            display: false
+  },
-        },
+  plugins: {
-        y: {
+    legend: {
-            display: false,
+      display: false
-        }
-    },
-    plugins: {
-        legend: {
-            display: false
-        },
-        tooltip: {
-            mode: "index",
-            intersect: false
-        }
     },
+    tooltip: {
+      mode: 'index',
+      intersect: false
+    }
+  },
 }
 
 /**
@@ -97,5 +96,5 @@ export const CHARTJS_OPT: ChartOptions<"line"> = {
  * @param obj HashMap<string, boolean>
  */
 export function clazz(obj: { [key: string]: boolean }) {
-    return Object.keys(obj).filter(k => obj[k]).join(" ")
+  return Object.keys(obj).filter(k => obj[k]).join(' ')
 }

AquaNet/src/main.ts

@@ -1,7 +1,6 @@
 import './app.sass'
 import App from './App.svelte'
 
-// @ts-ignore
+const app = new App({ target: document.getElementById('app')! })
-const app = new App({target: document.getElementById('app')})
 
 export default app