fix more lint issues in store and web sections

solidjs · Jan 24, 2025 · 7335fb6 · 7335fb6
1 parent b49a0b9
commit 7335fb6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/packages/solid/store/src/modifiers.ts b/packages/solid/store/src/modifiers.ts
@@ -1,4 +1,4 @@
-import { setProperty, unwrap, isWrappable, StoreNode, $RAW } from "./store.js";
+import { setProperty, unwrap, isWrappable, type StoreNode, $RAW } from "./store.js";
 
 const $ROOT = Symbol("store-root");
 

diff --git a/packages/solid/store/src/mutable.ts b/packages/solid/store/src/mutable.ts
@@ -8,7 +8,7 @@ import {
   $RAW,
   $NODE,
   $HAS,
-  StoreNode,
+  type StoreNode,
   setProperty,
   ownKeys,
   IS_DEV
@@ -50,7 +50,7 @@ const proxyTraps: ProxyHandler<StoreNode> = {
     if (!tracked) {
       const desc = Object.getOwnPropertyDescriptor(target, property);
       const isFunction = typeof value === "function";
-      if (getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc && desc.get))
+      if (getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc?.get))
         value = getNode(nodes, property, value)();
       else if (value != null && isFunction && value === Array.prototype[property as any]) {
         return (...args: unknown[]) =>
@@ -140,7 +140,7 @@ export function createMutable<T extends StoreNode>(state: T, options?: { name?:
     );
 
   const wrappedStore = wrap(unwrappedStore);
-  if (IS_DEV) DEV!.registerGraph({ value: unwrappedStore, name: options && options.name });
+  if (IS_DEV) DEV!.registerGraph({ value: unwrappedStore, name: options?.name });
   return wrappedStore;
 }
 

diff --git a/packages/solid/store/src/server.ts b/packages/solid/store/src/server.ts
@@ -74,20 +74,20 @@ export function updatePath(current: any, path: any[], traversed: PropertyKey[] =
         updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
-    } else if (isArray && partType === "function") {
+    } if (isArray && partType === "function") {
       // Ex. update('data', i => i.id === 42, 'label', l => l + ' !!!');
       for (let i = 0; i < current.length; i++) {
         if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
-    } else if (isArray && partType === "object") {
+    } if (isArray && partType === "object") {
       // Ex. update('data', { from: 3, to: 12, by: 2 }, 'label', l => l + ' !!!');
       const { from = 0, to = current.length - 1, by = 1 } = part;
       for (let i = from; i <= to; i += by) {
         updatePath(current, [i].concat(path), traversed);
       }
       return;
-    } else if (path.length > 1) {
+    } if (path.length > 1) {
       updatePath(current[part], path, [part].concat(traversed));
       return;
     }

diff --git a/packages/solid/store/src/store.ts b/packages/solid/store/src/store.ts
@@ -94,7 +94,7 @@ export function isWrappable(obj: any) {
 export function unwrap<T>(item: T, set?: Set<unknown>): T;
 export function unwrap<T>(item: any, set = new Set()): T {
   let result, unwrapped, v, prop;
-  if ((result = item != null && item[$RAW])) return result;
+  if ((result = item?.[$RAW])) return result;
   if (!isWrappable(item) || set.has(item)) return item;
 
   if (Array.isArray(item)) {
@@ -173,7 +173,7 @@ const proxyTraps: ProxyHandler<StoreNode> = {
       if (
         getListener() &&
         (typeof value !== "function" || target.hasOwnProperty(property)) &&
-        !(desc && desc.get)
+        !(desc?.get)
       )
         value = getNode(nodes, property, value)();
     }
@@ -220,14 +220,14 @@ export function setProperty(
     len = state.length;
 
   if (IS_DEV)
-    DevHooks.onStoreNodeUpdate && DevHooks.onStoreNodeUpdate(state, property, value, prev);
+    DevHooks.onStoreNodeUpdate?.(state, property, value, prev);
 
   if (value === undefined) {
     delete state[property];
-    if (state[$HAS] && state[$HAS][property] && prev !== undefined) state[$HAS][property].$();
+    if (state[$HAS]?.[property] && prev !== undefined) state[$HAS][property].$();
   } else {
     state[property] = value;
-    if (state[$HAS] && state[$HAS][property] && prev === undefined) state[$HAS][property].$();
+    if (state[$HAS]?.[property] && prev === undefined) state[$HAS][property].$();
   }
   let nodes = getNodes(state, $NODE),
     node: DataNode | undefined;
@@ -280,20 +280,20 @@ export function updatePath(current: StoreNode, path: any[], traversed: PropertyK
         updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
-    } else if (isArray && partType === "function") {
+    } if (isArray && partType === "function") {
       // Ex. update('data', i => i.id === 42, 'label', l => l + ' !!!');
       for (let i = 0; i < current.length; i++) {
         if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
-    } else if (isArray && partType === "object") {
+    } if (isArray && partType === "object") {
       // Ex. update('data', { from: 3, to: 12, by: 2 }, 'label', l => l + ' !!!');
       const { from = 0, to = current.length - 1, by = 1 } = part;
       for (let i = from; i <= to; i += by) {
         updatePath(current, [i].concat(path), traversed);
       }
       return;
-    } else if (path.length > 1) {
+    } if (path.length > 1) {
       updatePath(current[part], path, [part].concat(traversed));
       return;
     }
@@ -510,7 +510,7 @@ export function createStore<T extends object = {}>(
       `Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`
     );
   const wrappedStore = wrap(unwrappedStore);
-  if (IS_DEV) DEV!.registerGraph({ value: unwrappedStore, name: options && options.name });
+  if (IS_DEV) DEV!.registerGraph({ value: unwrappedStore, name: options?.name });
   function setStore(...args: any[]): void {
     batch(() => {
       isArray && args.length === 1

diff --git a/packages/solid/web/server/index.ts b/packages/solid/web/server/index.ts
@@ -1,5 +1,5 @@
 import { ssrElement } from "./server.js";
-import { splitProps, Component, JSX } from "solid-js";
+import { splitProps, type Component, type JSX } from "solid-js";
 
 export * from "./server";
 
@@ -28,7 +28,7 @@ export function Dynamic<T>(
 
   if (comp) {
     if (t === "function") return (comp as Function)(others);
-    else if (t === "string") {
+    if (t === "string") {
       return ssrElement(comp as string, others, undefined, true);
     }
   }

diff --git a/packages/solid/web/src/index.ts b/packages/solid/web/src/index.ts
@@ -5,13 +5,13 @@ import {
   onCleanup,
   untrack,
   splitProps,
-  JSX,
+  type JSX,
   createRoot,
   sharedConfig,
   enableHydration,
   $DEVCOMP,
-  ComponentProps,
-  ValidComponent,
+  type ComponentProps,
+  type ValidComponent,
   createEffect,
   getOwner,
   runWithOwner