From e3a3ca3f25bf8a55af6474638a77c9c353887999 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Wed, 14 Apr 2021 23:56:58 +0200
Subject: [PATCH] Inline GraphData/GraphPreferences getters/setters into
 WithGraphData

---
 ts/graphs/WithGraphData.svelte | 33 +++++++++++++++++++++++++++------
 ts/graphs/graph-helpers.ts     | 28 +---------------------------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/ts/graphs/WithGraphData.svelte b/ts/graphs/WithGraphData.svelte
index 1f9413330..82e209fe6 100644
--- a/ts/graphs/WithGraphData.svelte
+++ b/ts/graphs/WithGraphData.svelte
@@ -4,23 +4,44 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Writable } from "svelte/store";
+    import type { PreferencePayload } from "sveltelib/preferences";
 
     import pb from "anki/backend_proto";
+    import { postRequest } from "anki/postrequest";
 
     import useAsync from "sveltelib/async";
     import useAsyncReactive from "sveltelib/asyncReactive";
     import { getPreferences } from "sveltelib/preferences";
 
-    import {
-        getGraphData,
-        getGraphPreferences,
-        setGraphPreferences,
-        daysToRevlogRange,
-    } from "./graph-helpers";
+    import { daysToRevlogRange } from "./graph-helpers";
 
     export let search: Writable<string>;
     export let days: Writable<number>;
 
+    async function getGraphData(
+        search: string,
+        days: number
+    ): Promise<pb.BackendProto.GraphsOut> {
+        return pb.BackendProto.GraphsOut.decode(
+            await postRequest("/_anki/graphData", JSON.stringify({ search, days }))
+        );
+    }
+
+    async function getGraphPreferences(): Promise<pb.BackendProto.GraphPreferences> {
+        return pb.BackendProto.GraphPreferences.decode(
+            await postRequest("/_anki/graphPreferences", JSON.stringify({}))
+        );
+    }
+
+    async function setGraphPreferences(
+        prefs: PreferencePayload<pb.BackendProto.GraphPreferences>
+    ): Promise<void> {
+        await postRequest(
+            "/_anki/setGraphPreferences",
+            pb.BackendProto.GraphPreferences.encode(prefs).finish()
+        );
+    }
+
     const {
         loading: graphLoading,
         error: graphError,
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index 5126ce5b6..a17e7495f 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -6,34 +6,8 @@
 @typescript-eslint/no-explicit-any: "off",
 @typescript-eslint/ban-ts-ignore: "off" */
 
-import pb from "anki/backend_proto";
+import type pb from "anki/backend_proto";
 import type { Selection } from "d3";
-import type { PreferencePayload } from "sveltelib/preferences";
-import { postRequest } from "anki/postrequest";
-
-export async function getGraphData(
-    search: string,
-    days: number
-): Promise<pb.BackendProto.GraphsOut> {
-    return pb.BackendProto.GraphsOut.decode(
-        await postRequest("/_anki/graphData", JSON.stringify({ search, days }))
-    );
-}
-
-export async function getGraphPreferences(): Promise<pb.BackendProto.GraphPreferences> {
-    return pb.BackendProto.GraphPreferences.decode(
-        await postRequest("/_anki/graphPreferences", JSON.stringify({}))
-    );
-}
-
-export async function setGraphPreferences(
-    prefs: PreferencePayload<pb.BackendProto.GraphPreferences>
-): Promise<void> {
-    await postRequest(
-        "/_anki/setGraphPreferences",
-        pb.BackendProto.GraphPreferences.encode(prefs).finish()
-    );
-}
 
 // amount of data to fetch from backend
 export enum RevlogRange {