Merge b7cd119 into eb253cb

.changeset/selfish-dots-marry.md

@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Fixed test case for setStore 7 parameter overload by fixing KeyOf giving number for KeyOf<never>

packages/solid/store/src/store.ts

@@ -367,13 +367,13 @@ export type Part<T, K extends KeyOf<T> = KeyOf<T>> =
 type W<T> = Exclude<T, NotWrappable>;
 
 // specially handle keyof to avoid errors with arrays and any
-type KeyOf<T> = number extends keyof T // have to check this otherwise ts won't allow KeyOf<T> to index T
+type KeyOf<T> = [T] extends [never]
+  ? never // handle never first
+  : number extends keyof T // have to check this otherwise ts won't allow KeyOf<T> to index T
   ? 0 extends 1 & T // if it's any just return keyof T
     ? keyof T
     : [T] extends [readonly unknown[]]
     ? number // it's an array or tuple; exclude the non-number properties
-    : [T] extends [never]
-    ? never // keyof never is PropertyKey which number extends; return never
     : keyof T // it's something which contains an index signature for strings or numbers
   : keyof T;
 

packages/solid/store/test/store.spec.ts

@@ -759,7 +759,7 @@ describe("Nested Classes", () => {
   // @ts-expect-error m is readonly
   setK5("i", "j", "k", "l", "m", 6);
   const [, setK6] = createStore({} as { i: { j: { k: { l: { m: { readonly n: number } } } } } });
-  // TODO @ts-expect-error n is readonly, but has unreadable error due to method overloading
+  // @ts-expect-error n is readonly, but has unreadable error due to method overloading
   setK6("i", "j", "k", "l", "m", "n", 7);
   const [, setK7] = createStore(
     {} as { i: { j: { k: { l: { m: { n: { readonly o: number } } } } } } }