From 059b61dfd66016b0582c3e5712d59407e001b142 Mon Sep 17 00:00:00 2001
From: zxg <50405001+shwin0901@users.noreply.github.com>
Date: Sun, 4 Aug 2024 17:20:44 +0800
Subject: [PATCH] Migrate momentjs to dayjs (#14)

---
 package.json                         |  3 +--
 src/routes/stats/+page.svelte        | 14 +++++++-------
 src/routes/stats/HeatMapChart.svelte |  4 ++--
 src/routes/stats/stats.js            | 14 +++++++-------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 1b441da..a96232c 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,8 @@
         "lint": "eslint ."
     },
     "dependencies": {
+        "dayjs": "^1.11.12",
         "echarts": "^5.5.1",
-        "moment": "^2.30.1",
-        "momentjs": "^2.0.0",
         "querylib": "./lib",
         "svelte-french-toast": "^1.2.0"
     },
diff --git a/src/routes/stats/+page.svelte b/src/routes/stats/+page.svelte
index d18c6c0..344e0c5 100644
--- a/src/routes/stats/+page.svelte
+++ b/src/routes/stats/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import moment from "moment";
+  import dayjs from "dayjs";
   import {
     getSearchStats,
     getHistogramEchartDatas,
@@ -33,7 +33,7 @@
    */
   let yearList = [];
 
-  let currentYear = moment().year();
+  let currentYear = dayjs().year();
 
   /**
    * @type {{name:string; value: number}[]}
@@ -91,7 +91,7 @@
   function handleChangeYear(y) {
     currentYear = y;
     searchTime = String(y);
-    const year = moment(searchTime);
+    const year = dayjs(searchTime);
     const now = year.endOf("year").valueOf();
     const yearAgo = year.startOf("year").valueOf();
     getEchartData(now, yearAgo);
@@ -126,17 +126,17 @@
     const { timeline } = await Statistics.load();
     const min = timeline.reduce((pre, current) => {
       return Math.min(pre, current[0]);
-    }, moment().valueOf());
+    }, dayjs().valueOf());
     const list = [];
-    for (let i = y; i >= moment(min).year(); i--) {
+    for (let i = y; i >= dayjs(min).year(); i--) {
       list.push(i);
     }
     return list;
   }
 
   onMount(async () => {
-    const now = moment().valueOf();
-    const yearAgo = moment().startOf("day").subtract(1, "year").valueOf();
+    const now = dayjs().valueOf();
+    const yearAgo = dayjs().startOf("day").subtract(1, "year").valueOf();
     dateRange = [now, yearAgo];
     yearList = await getYearList(currentYear);
     getEchartData(now, yearAgo);
diff --git a/src/routes/stats/HeatMapChart.svelte b/src/routes/stats/HeatMapChart.svelte
index b8eda8e..ed8845c 100644
--- a/src/routes/stats/HeatMapChart.svelte
+++ b/src/routes/stats/HeatMapChart.svelte
@@ -1,7 +1,7 @@
 <script>
   import {onMount} from 'svelte';
   import { init } from "echarts";
-  import moment from 'moment';
+  import dayjs from 'dayjs';
   /**
    * @type {number[]}
   */
@@ -28,7 +28,7 @@
       confine: true,
       formatter: (/** @type {{ color:string; data: any }} */ params) => {
         return `<div><strong>${params.data[1]}</strong> searches on 
-          ${moment(params.data[0]).format('ddd, MMM Do YYYY')}</div>`
+          ${dayjs(params.data[0]).format('ddd, MMM D YYYY')}</div>`
       }
     },
     visualMap: {
diff --git a/src/routes/stats/stats.js b/src/routes/stats/stats.js
index 00bd24c..e599bc4 100644
--- a/src/routes/stats/stats.js
+++ b/src/routes/stats/stats.js
@@ -1,5 +1,5 @@
 import { STATS_PATTERNS } from "querylib";
-import moment from "moment";
+import dayjs from "dayjs";
 
 const TOP_CRATE_LENGTH = 15;
 const TYPE_OTHER = "other";
@@ -72,7 +72,7 @@ export function getSearchStats(data) {
     const weeksObj = WEEKS_LABEL.reduce((obj, week) => {
         obj[week] = 0;
         return obj;
-    }, {});
+    }, Object.create(null));
     const datesObj = makeNumericKeyObject(1, 31);
     const hoursObj = makeNumericKeyObject(1, 23);
 
@@ -80,10 +80,10 @@ export function getSearchStats(data) {
     const typeDataObj = Object.create(null);
 
     data.forEach(([t, content]) => {
-        const time = moment(t);
+        const time = dayjs(t);
         const hour = time.hour();
 
-        weeksObj[WEEKS_LABEL[time.weekday()]] += 1;
+        weeksObj[WEEKS_LABEL[time.day()]] += 1;
         datesObj[time.date()] += 1;
         if (hour !== 0) {
             hoursObj[hour] += 1;
@@ -131,16 +131,16 @@ export function getHistogramEchartDatas(data) {
     const topCratesObj = Object.create(null);
 
     const heatMapArr = data.reduce((pre, [t]) => {
-        const time = moment(t).format("YYYY-MM-DD");
+        const time = dayjs(t).format("YYYY-MM-DD");
         pre[time] = (pre[time] || 0) + 1;
         return pre;
     }, {});
 
     for (const [t, , type] of data) {
-        const time = moment(t);
+        const time = dayjs(t);
         const hour = time.hour();
 
-        weeksArr[time.weekday()] += 1;
+        weeksArr[time.day()] += 1;
         dateArr[time.date() - 1] += 1;
         if (hour !== 0) {
             hourArr[hour - 1] += 1;