refactor: fix type errors

uhyo · Jul 6, 2022 · 6adbf4b · 6adbf4b
1 parent b36ebad
commit 6adbf4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/builder/composers/StateLocationComposer/index.ts b/src/builder/composers/StateLocationComposer/index.ts
@@ -10,7 +10,8 @@ export class StateLocationComposer<
   Key extends string,
   StateValue,
   IsOptional extends boolean
-> implements LocationComposer<OptionalIf<IsOptional, StateValue>> {
+> implements LocationComposer<OptionalIf<IsOptional, StateValue>>
+{
   readonly key: Key;
   readonly optional: IsOptional;
   readonly validator: Validator<OptionalIf<IsOptional, StateValue>>;
@@ -32,11 +33,10 @@ export class StateLocationComposer<
     base: Readonly<Location<S>>,
     segment: OptionalIf<IsOptional, StateValue>
   ): Location<S> {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const newState = {
-      ...base.state,
+      ...(base.state as {}),
       [this.key]: segment,
-    };
+    } as S;
 
     return {
       ...base,
@@ -66,11 +66,10 @@ export class StateLocationComposer<
       return [];
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { [this.key]: _, ...rest } = state;
+    const { [this.key]: _, ...rest } = state as Record<string, unknown>;
     const nextLocation = {
       ...location,
-      state: rest,
+      state: rest as Omit<S, Key>,
     };
     return [
       {

diff --git a/src/util/path/locationDiff.ts b/src/util/path/locationDiff.ts
@@ -48,7 +48,9 @@ export function locationDiff<
 
   const diffState: Record<string, unknown> = {};
   const baseState = (base.state ?? {}) as Record<string, unknown>;
-  for (const [key, value] of Object.entries(location.state ?? {})) {
+  for (const [key, value] of Object.entries(
+    (location.state ?? {}) as Record<string, unknown>
+  )) {
     if (baseState[key] !== undefined) {
       if (baseState[key] !== value) {
         return undefined;