diff --git a/src/engines/index.ts b/src/engines/index.ts deleted file mode 100644 index 934962d..0000000 --- a/src/engines/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { local } from './local'; -import { memoryStorage } from './memory'; -import { session } from './session'; - -/** - * @deprecated - */ -export const engines = { - /** - * @deprecated 请直接使用浏览器内置的 localStorage - */ - localStorage: local, - /** - * 适用于测试的memoryStorage存储引擎 - * - * @deprecated 请从foca直接引入 - * ```typescript - * import { memoryStorage } from 'foca'; - * ``` - */ - memoryStorage: memoryStorage, - /** - * @deprecated 请直接使用浏览器内置的 sessionStorage - */ - sessionStorage: session, -} as const; diff --git a/src/engines/local.ts b/src/engines/local.ts deleted file mode 100644 index 1d58c83..0000000 --- a/src/engines/local.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { StorageEngine } from './storage-engine'; - -export const local: StorageEngine = { - getItem(key) { - return localStorage.getItem(key); - }, - setItem(key, value) { - localStorage.setItem(key, value); - }, - removeItem(key) { - localStorage.removeItem(key); - }, - clear() { - localStorage.clear(); - }, -}; diff --git a/src/engines/session.ts b/src/engines/session.ts deleted file mode 100644 index 11b057d..0000000 --- a/src/engines/session.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { StorageEngine } from './storage-engine'; - -export const session: StorageEngine = { - getItem(key) { - return sessionStorage.getItem(key); - }, - setItem(key, value) { - sessionStorage.setItem(key, value); - }, - removeItem(key) { - sessionStorage.removeItem(key); - }, - clear() { - sessionStorage.clear(); - }, -}; diff --git a/src/index.ts b/src/index.ts index abe6b5e..0f40766 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,7 +14,6 @@ export { connect } from './redux/connect'; export { compose } from 'redux'; export { modelStore as store } from './store/model-store'; export { FocaProvider } from './redux/foca-provider'; -export { engines } from './engines'; export { memoryStorage } from './engines/memory'; // 可能用到的TS类型 diff --git a/test/engine.test.ts b/test/engine.test.ts index 98aec59..ae1e3eb 100644 --- a/test/engine.test.ts +++ b/test/engine.test.ts @@ -1,44 +1,34 @@ import 'fake-indexeddb/auto'; import localforage from 'localforage'; import ReactNativeStorage from '@react-native-async-storage/async-storage'; -import { engines } from '../src'; import { toPromise } from '../src/utils/to-promise'; +import { memoryStorage } from '../src'; const storages = [ - [engines.localStorage, localStorage, 'local'], - [engines.sessionStorage, sessionStorage, 'session'], - [engines.memoryStorage, undefined, 'memory'], + [localStorage, 'local'], + [sessionStorage, 'session'], + [memoryStorage, 'memory'], [ localforage.createInstance({ driver: localforage.LOCALSTORAGE }), - undefined, 'localforage local', ], [ localforage.createInstance({ driver: localforage.INDEXEDDB }), - undefined, 'localforage indexedDb', ], - [ReactNativeStorage, undefined, 'react-native'], + [ReactNativeStorage, 'react-native'], ] as const; -describe.each(storages)('storage io', (storage, syncOrigin, name) => { +describe.each(storages)('storage io', (storage, name) => { beforeEach(() => storage.clear()); afterEach(() => storage.clear()); test(`[${name}] Get and set data`, async () => { - if (syncOrigin) { - expect(syncOrigin.getItem('test1')).toBeNull(); - } - await expect(toPromise(() => storage.getItem('test1'))).resolves.toBeNull(); await storage.setItem('test1', 'yes'); await expect(toPromise(() => storage.getItem('test1'))).resolves.toBe( 'yes', ); - - if (syncOrigin) { - expect(syncOrigin.getItem('test1')).toBe('yes'); - } }); test(`[${name}] Update data`, async () => { @@ -48,10 +38,6 @@ describe.each(storages)('storage io', (storage, syncOrigin, name) => { ); await storage.setItem('test2', 'no'); await expect(toPromise(() => storage.getItem('test2'))).resolves.toBe('no'); - - if (syncOrigin) { - expect(syncOrigin.getItem('test2')).toBe('no'); - } }); test(`[${name}] Delete data`, async () => { @@ -61,10 +47,6 @@ describe.each(storages)('storage io', (storage, syncOrigin, name) => { ); await storage.removeItem('test3'); await expect(toPromise(() => storage.getItem('test3'))).resolves.toBeNull(); - - if (syncOrigin) { - expect(syncOrigin.getItem('test3')).toBeNull(); - } }); test(`[${name}] Clear all data`, async () => { @@ -75,10 +57,5 @@ describe.each(storages)('storage io', (storage, syncOrigin, name) => { await expect(toPromise(() => storage.getItem('test4'))).resolves.toBeNull(); await expect(toPromise(() => storage.getItem('test5'))).resolves.toBeNull(); - - if (syncOrigin) { - expect(syncOrigin.getItem('test4')).toBeNull(); - expect(syncOrigin.getItem('test5')).toBeNull(); - } }); });