refactor: minor refactor

asmyshlyaev177 · Nov 10, 2024 · 5768f61 · 5768f61
1 parent f064586
commit 5768f61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/packages/urlstate/react-router/useUrlState/useUrlState.ts b/packages/urlstate/react-router/useUrlState/useUrlState.ts
@@ -121,7 +121,6 @@ export function useUrlState<T extends JSONCompatible>(
     updateState(
       assignValue(
         _defaultState,
-        state as T,
         filterUnknownParams(
           _defaultState,
           parseSPObj(

diff --git a/packages/urlstate/utils.test.ts b/packages/urlstate/utils.test.ts
@@ -103,27 +103,25 @@ describe('assignValue', () => {
   }
 
   it('should assign a value', () => {
-    expect(clone(assignValue(shape, { a1: 2 }, { ...shape, a1: 3 }))).toStrictEqual(clone({
+    expect(clone(assignValue(shape, { ...shape, a1: 3 }))).toStrictEqual(clone({
         ...shape,
         a1: 3,
       }))
   })
 
   it('should return a new instance of object', () => {
-    const curr = structuredClone(shape)
     const newVal = {}
-    const result = assignValue(shape, curr, newVal)
+    const result = assignValue(shape, newVal)
     expect(result === shape).toBeFalsy()
-    expect(result === curr).toBeFalsy()
     expect(result === newVal).toBeFalsy()
   })
 
   it('should override curr value with newValue', () => {
-      expect(clone(assignValue(shape, { a1: 2 }, { a1: 3 }))).toStrictEqual(clone({ ...shape, a1: 3 }))
+      expect(clone(assignValue(shape, { a1: 3 }))).toStrictEqual(clone({ ...shape, a1: 3 }))
   })
 
   it('should use value from shape as default', () => {
-      expect(clone(assignValue(shape, { a1: 2 }, {}))).toStrictEqual(clone({ ...shape, a1: shape.a1 }))
+      expect(clone(assignValue(shape, {}))).toStrictEqual(clone({ ...shape, a1: shape.a1 }))
   })
 })
 

diff --git a/packages/urlstate/utils.ts b/packages/urlstate/utils.ts
@@ -95,12 +95,8 @@ function filterUnknown<T extends object>(
     .map(([key, val]) => [key.replaceAll("+", " "), val]);
 }
 
-export function assignValue<T extends object>(
-  shape: T,
-  curr: Partial<T>,
-  newVal: Partial<T>,
-) {
-  const result: T = Object.assign({}, shape, curr);
+export function assignValue<T extends object>(shape: T, newVal: Partial<T>) {
+  const result: T = Object.assign({}, shape);
 
   Object.entries(shape).forEach(([key]) => {
     const _key = key as keyof T;