feat: remove deepmerge

ouduidui · Apr 27, 2022 · 342237e · 342237e
1 parent 0950752
commit 342237e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 126 deletions.
diff --git a/__tests__/index.spec.ts b/__tests__/index.spec.ts
@@ -75,20 +75,6 @@ describe('Persist', () => {
     expect(store.test).toBe('bar')
   })
 
-  it('deep merge to sync state', () => {
-    window.localStorage.clear()
-    window.localStorage.setItem('pinia_foo', JSON.stringify({ name: 'dewey', hobbies: ['code', 'movie'] }))
-    const testStore = defineStore('foo', {
-      state: () => ({ age: 24, hobbies: ['code', 'cube'] }),
-    })
-    const pinia = createPinia()
-    pinia.use(persist())
-
-    mount({ template: 'none' }, { global: { plugins: [pinia] } })
-    const store = testStore(pinia)
-    expect(store.$state).toStrictEqual({ name: 'dewey', age: 24, hobbies: ['code', 'cube', 'movie'] })
-  })
-
   it('sync storage data when state change', (done) => {
     window.localStorage.clear()
     const testStore = defineStore('foo', {
@@ -216,69 +202,4 @@ describe('Persist', () => {
       done()
     })
   })
-
-  it('no strict patch', (done) => {
-    window.localStorage.clear()
-    window.localStorage.setItem('pinia_foo', JSON.stringify({
-      test: [
-        { id: 1, name: 'foo' },
-      ],
-    }))
-
-    const testStore = defineStore('foo', {
-      state: () => ({
-        test: [
-          { id: 1, name: 'foo' },
-        ],
-      }),
-      actions: {
-        add(item: { id: number; name: string }) {
-          this.test.push(item)
-        },
-        remove() {
-          this.test = this.test.filter(item => item.id !== 1)
-        },
-      },
-    })
-    const pinia = createPinia()
-    pinia.use(persist())
-
-    mount({ template: 'none' }, { global: { plugins: [pinia] } })
-    const store = testStore(pinia)
-    expect(store.test).toStrictEqual([
-      { id: 1, name: 'foo' },
-    ])
-
-    Promise.resolve().then(() => {
-      expect(window.localStorage.getItem('pinia_foo')).toBe(JSON.stringify({
-        test: [
-          { id: 1, name: 'foo' },
-        ],
-      }))
-      store.add({ id: 2, name: 'bar' })
-    }).then(() => {
-      expect(window.localStorage.getItem('pinia_foo')).toBe(JSON.stringify({
-        test: [
-          { id: 1, name: 'foo' },
-          { id: 2, name: 'bar' },
-        ],
-      }))
-      store.remove()
-    }).then(() => {
-      expect(window.localStorage.getItem('pinia_foo')).toBe(JSON.stringify({
-        test: [
-          { id: 2, name: 'bar' },
-        ],
-      }))
-      store.add({ id: 2, name: 'bar' })
-    }).then(() => {
-      expect(window.localStorage.getItem('pinia_foo')).toBe(JSON.stringify({
-        test: [
-          { id: 2, name: 'bar' },
-          { id: 2, name: 'bar' },
-        ],
-      }))
-      done()
-    })
-  })
 })
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/helper.ts b/src/helper.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,5 @@
 import type { PiniaPluginContext } from 'pinia'
 import { watch } from 'vue'
-import { isObject, mergeArrayWithDedupe } from './helper'
 import type { PersistOptions, Storage } from './types'
 
 export function persist(options: PersistOptions = {}) {
@@ -18,7 +17,7 @@ export function persist(options: PersistOptions = {}) {
     const storageResult = getItem(key, storage as Storage)
     if (!storageResult || overwrite) setItem(key, store.$state, storage)
     else
-      store.$patch(deepMerge(store.$state, storageResult))
+      store.$patch(storageResult)
 
     watch(store.$state, () => {
       setItem(key, store.$state, storage)
@@ -42,25 +41,3 @@ function getItem(key: string, storage: Storage): Record<string, any> | null {
 function setItem(key: string, state: unknown, storage: Storage) {
   return storage.setItem(key, JSON.stringify(state))
 }
-
-function deepMerge(
-  oldObj: Record<string | number | symbol, any>,
-  newObj: Record<string, any>,
-) {
-  const target: any = {}
-  for (const key of Object.keys(newObj)) {
-    const oldVal = oldObj[key]
-    const newVal = newObj[key]
-
-    if (Array.isArray(oldVal) && Array.isArray(newVal))
-      target[key] = mergeArrayWithDedupe(oldVal, newVal)
-
-    else if (isObject(oldVal) && isObject(newVal))
-      target[key] = deepMerge(oldVal, newVal)
-
-    else
-      target[key] = newVal
-  }
-
-  return { ...oldObj, ...target }
-}