formatting updates

Author: ryansolid

packages/solid/src/reactive/signal.ts

@@ -909,8 +909,8 @@ export function untrack<T>(fn: Accessor<T>): T {
 export type ReturnTypes<T> = T extends readonly Accessor<unknown>[]
   ? { [K in keyof T]: T[K] extends Accessor<infer I> ? I : never }
   : T extends Accessor<infer I>
-  ? I
-  : never;
+    ? I
+    : never;
 
 // transforms a tuple to a tuple of accessors in a way that allows generics to be inferred
 export type AccessorArray<T> = [...Extract<{ [K in keyof T]: Accessor<T[K]> }, readonly unknown[]>];

packages/solid/src/render/component.ts

@@ -79,11 +79,12 @@ export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (str
  * ComponentProps<typeof Portal> // { mount?: Node; useShadow?: boolean; children: JSX.Element }
  * ComponentProps<'div'> // JSX.HTMLAttributes<HTMLDivElement>
  */
-export type ComponentProps<T extends ValidComponent> = T extends Component<infer P>
-  ? P
-  : T extends keyof JSX.IntrinsicElements
-  ? JSX.IntrinsicElements[T]
-  : Record<string, unknown>;
+export type ComponentProps<T extends ValidComponent> =
+  T extends Component<infer P>
+    ? P
+    : T extends keyof JSX.IntrinsicElements
+      ? JSX.IntrinsicElements[T]
+      : Record<string, unknown>;
 
 /**
  * Type of `props.ref`, for use in `Component` or `props` typing.
@@ -163,8 +164,8 @@ type OverrideSpread<T, U> = T extends any
       })]: K extends keyof T
         ? Exclude<U extends any ? U[K & keyof U] : never, undefined> | T[K]
         : U extends any
-        ? U[K & keyof U]
-        : never;
+          ? U[K & keyof U]
+          : never;
     }
   : T & U;
 type Simplify<T> = T extends any ? { [K in keyof T]: T[K] } : T;
@@ -174,12 +175,12 @@ type _MergeProps<T extends unknown[], Curr = {}> = T extends [
 ]
   ? _MergeProps<Rest, Override<Curr, Next>>
   : T extends [...infer Rest, infer Next | (() => infer Next)]
-  ? Override<_MergeProps<Rest, Curr>, Next>
-  : T extends []
-  ? Curr
-  : T extends (infer I | (() => infer I))[]
-  ? OverrideSpread<Curr, I>
-  : Curr;
+    ? Override<_MergeProps<Rest, Curr>, Next>
+    : T extends []
+      ? Curr
+      : T extends (infer I | (() => infer I))[]
+        ? OverrideSpread<Curr, I>
+        : Curr;
 
 export type MergeProps<T extends unknown[]> = Simplify<_MergeProps<T>>;
 
@@ -250,8 +251,8 @@ export function mergeProps<T extends unknown[]>(...sources: T): MergeProps<T> {
               get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
             }
           : desc.value !== undefined
-          ? desc
-          : undefined;
+            ? desc
+            : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {

packages/solid/src/server/rendering.ts

@@ -23,11 +23,12 @@ export type FlowProps<P = {}, C = JSX.Element> = P & { children: C };
 export type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
 export type Ref<T> = T | ((val: T) => void);
 export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
-export type ComponentProps<T extends ValidComponent> = T extends Component<infer P>
-  ? P
-  : T extends keyof JSX.IntrinsicElements
-  ? JSX.IntrinsicElements[T]
-  : Record<string, unknown>;
+export type ComponentProps<T extends ValidComponent> =
+  T extends Component<infer P>
+    ? P
+    : T extends keyof JSX.IntrinsicElements
+      ? JSX.IntrinsicElements[T]
+      : Record<string, unknown>;
 
 // these methods are duplicates from solid-js/web
 // we need a better solution for this in the future

packages/solid/store/src/store.ts

@@ -316,18 +316,18 @@ export function updatePath(current: StoreNode, path: any[], traversed: PropertyK
 export type DeepReadonly<T> = 0 extends 1 & T
   ? T
   : T extends NotWrappable
-  ? T
-  : {
-      readonly [K in keyof T]: DeepReadonly<T[K]>;
-    };
+    ? T
+    : {
+        readonly [K in keyof T]: DeepReadonly<T[K]>;
+      };
 /** @deprecated */
 export type DeepMutable<T> = 0 extends 1 & T
   ? T
   : T extends NotWrappable
-  ? T
-  : {
-      -readonly [K in keyof T]: DeepMutable<T[K]>;
-    };
+    ? T
+    : {
+        -readonly [K in keyof T]: DeepMutable<T[K]>;
+      };
 
 export type CustomPartial<T> = T extends readonly unknown[]
   ? "0" extends keyof T
@@ -367,11 +367,11 @@ type KeyOf<T> = number extends keyof T // have to check this otherwise ts won't
   ? 0 extends 1 & T // if it's any just return keyof T
     ? keyof T
     : [T] extends [never]
-    ? never // keyof never is PropertyKey, which number extends. this must go before
-    : // checking [T] extends [readonly unknown[]] because never extends everything
-    [T] extends [readonly unknown[]]
-    ? number // it's an array or tuple; exclude the non-number properties
-    : keyof T // it's something which contains an index signature for strings or numbers
+      ? never // keyof never is PropertyKey, which number extends. this must go before
+      : // checking [T] extends [readonly unknown[]] because never extends everything
+        [T] extends [readonly unknown[]]
+        ? number // it's an array or tuple; exclude the non-number properties
+        : keyof T // it's something which contains an index signature for strings or numbers
   : keyof T;
 
 type MutableKeyOf<T> = KeyOf<T> & keyof PickMutable<T>;
@@ -380,10 +380,10 @@ type MutableKeyOf<T> = KeyOf<T> & keyof PickMutable<T>;
 type Rest<T, U extends PropertyKey[], K extends KeyOf<T> = KeyOf<T>> = [T] extends [never]
   ? never
   : K extends MutableKeyOf<T>
-  ? [Part<T, K>, ...RestSetterOrContinue<T[K], [K, ...U]>]
-  : K extends KeyOf<T>
-  ? [Part<T, K>, ...RestContinue<T[K], [K, ...U]>]
-  : never;
+    ? [Part<T, K>, ...RestSetterOrContinue<T[K], [K, ...U]>]
+    : K extends KeyOf<T>
+      ? [Part<T, K>, ...RestContinue<T[K], [K, ...U]>]
+      : never;
 
 type RestContinue<T, U extends PropertyKey[]> = 0 extends 1 & T
   ? [...Part<any>[], StoreSetter<any, PropertyKey[]>]

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

@@ -217,7 +217,7 @@ describe("Setting state from Effects", () => {
     let state: { data: string };
     let getData: Accessor<string>, setData: Setter<string>;
     createRoot(() => {
-      ([getData, setData] = createSignal("init")), (state = createMutable({ data: "" }));
+      (([getData, setData] = createSignal("init")), (state = createMutable({ data: "" })));
       // don't do this often
       createEffect(() => (state.data = getData()));
     });

packages/solid/test/component.type-tests.ts

@@ -2,11 +2,8 @@ import { mergeProps, splitProps } from "../src/index.js";
 
 type Assert<T extends true> = never;
 // from: https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650
-type IsExact<T, U, I = never> = (<G>() => G extends T | I ? 1 : 2) extends <G>() => G extends U | I
-  ? 1
-  : 2
-  ? true
-  : false;
+type IsExact<T, U, I = never> =
+  (<G>() => G extends T | I ? 1 : 2) extends <G>() => G extends U | I ? 1 : 2 ? true : false;
 
 // m1: mergeProps multiple property case
 const m1 = mergeProps(

packages/solid/test/resource.type-tests.ts

@@ -3,9 +3,8 @@ import { InitializedResource, InitializedResourceReturn } from "../src/reactive/
 
 type Assert<T extends true> = T;
 // https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650
-type Equals<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
-  ? true
-  : false;
+type Equals<X, Y> =
+  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 
 /* createResource inference tests */
 

packages/solid/test/signals.memo.spec.ts

@@ -34,7 +34,7 @@ describe("createMemo", () => {
           ),
           c1 = createMemo(
             () => {
-              b1(), b2();
+              (b1(), b2());
               seq += "c1";
             },
             undefined,