fix: help me typecheck god

solidjs · Sep 27, 2024 · 4e90ad2 · 4e90ad2
1 parent 282a28b
commit 4e90ad2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/src/app.tsx b/src/app.tsx
@@ -20,8 +20,8 @@ export default function App() {
 				createEffect(() => {
 					const html = document.documentElement;
 					html.classList.remove("light", "dark");
-					html.classList.add(ctx.selectedTheme().value);
-					html.dataset.theme = ctx.selectedTheme().theme;
+					html.classList.add(ctx.selectedTheme()!.value);
+					html.dataset.theme = ctx.selectedTheme()!.theme;
 				});
 
 				return (

diff --git a/src/data/page-state.tsx b/src/data/page-state.tsx
@@ -1,17 +1,17 @@
 import { createContext, ParentProps, useContext } from "solid-js";
 import { SetStoreFunction, createStore } from "solid-js/store";
 
-type ChildSection = {
-	text: string | undefined;
+export type ChildSection = {
+	text?: string | null;
 	id: string;
 	level: number;
 };
 
-type ParentSection = {
-	text: string | undefined;
+export type ParentSection = {
+	text?: string | null;
 	id: string;
 	level: number;
-	children: ChildSection[] | [];
+	children: ChildSection[];
 };
 
 type PageStateStore = {

diff --git a/src/data/theme-provider.tsx b/src/data/theme-provider.tsx
@@ -70,7 +70,7 @@ export const ThemeProvider = (props: ParentProps) => {
 	});
 	createEffect(() => {
 		if (selectedTheme()?.value)
-			document.cookie = `theme=${selectedTheme().value};path=/;max-age=${60 * 60 * 24 * 365}`;
+			document.cookie = `theme=${selectedTheme()!.value};path=/;max-age=${60 * 60 * 24 * 365}`;
 	});
 	return (
 		<ThemeCtx.Provider

diff --git a/src/entry-client.tsx b/src/entry-client.tsx
@@ -1,3 +1,3 @@
 import { mount, StartClient } from "@solidjs/start/client";
 
-mount(() => <StartClient />, document.getElementById("app"));
+mount(() => <StartClient />, document.getElementById("app")!);
diff --git a/src/ui/eraser-link/index.tsx b/src/ui/eraser-link/index.tsx
@@ -97,7 +97,7 @@ export default function EraserOrAnchor(props: ParentProps<{ href: string }>) {
 
 	return (
 		<Show
-			when={eraserLinkData !== null}
+			when={eraserLinkData}
 			fallback={
 				<a
 					{...props}
@@ -108,7 +108,9 @@ export default function EraserOrAnchor(props: ParentProps<{ href: string }>) {
 				</a>
 			}
 		>
-			<EraserLink linkData={eraserLinkData}>{props.children}</EraserLink>
+			{(eraserLinkData) => (
+				<EraserLink linkData={eraserLinkData()}>{props.children}</EraserLink>
+			)}
 		</Show>
 	);
 }
diff --git a/src/ui/layout/table-of-contents.tsx b/src/ui/layout/table-of-contents.tsx
@@ -9,7 +9,7 @@ import {
 	type ResolvedChildren,
 } from "solid-js";
 import { useLocation } from "@solidjs/router";
-import { usePageState } from "~/data/page-state";
+import { ParentSection, usePageState } from "~/data/page-state";
 import { useI18n } from "~/i18n/i18n-context";
 
 export const TableOfContents: Component<{ children: ResolvedChildren }> = (
@@ -49,7 +49,7 @@ export const TableOfContents: Component<{ children: ResolvedChildren }> = (
 		}
 
 		const headings = document.querySelectorAll("main h2, main h3");
-		const sections: unknown[] = [];
+		const sections: ParentSection[] = [];
 
 		if (headings) {
 			headings.forEach((heading) => {

diff --git a/src/ui/pagination.tsx b/src/ui/pagination.tsx
@@ -1,13 +1,13 @@
 import { A } from "~/ui/i18n-anchor";
 import { Show, Suspense, createMemo } from "solid-js";
-import flatEntries from "solid:collection/entries";
+import { coreEntries } from "solid:collection";
 import { useI18n } from "~/i18n/i18n-context";
 
 /**
  * temporary until we have proper types inside collections
  */
-type ReferenceCollection = (typeof flatEntries)["references"];
-type LearnCollection = (typeof flatEntries)["learn"];
+type ReferenceCollection = (typeof coreEntries)["reference"];
+type LearnCollection = (typeof coreEntries)["learn"];
 
 type Pagination = {
 	collection: ReferenceCollection | LearnCollection;