fix: close #24, save every responce data from api (#25)

tuax · Apr 23, 2019 · c8d79d7 · c8d79d7
1 parent 02cfd36
commit c8d79d7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tua-storage",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "🏗 A common storage for web(localStorage), for RN(AsyncStorage), for mini-program(wx) or just memory cache(Node.js)",
     "main": "dist/TuaStorage.cjs.js",
     "module": "dist/TuaStorage.esm.js",

diff --git a/src/index.js b/src/index.js
@@ -501,31 +501,27 @@ class TuaStorage {
 
             if (!isPromise) return pRej(Error(ERROR_MSGS.promise))
 
-            // 格式化数据结构
-            const formatDataStructure = (data) => (data.code == null && data.data == null)
-                ? { data }
-                : data
-
-            // 格式化数据类型
-            const formatDataType = ({ code = 0, data }) => ({ code: +code, data })
+            // 格式化数据结构和类型
+            const formatData = (data) => (data.code == null && data.data == null)
+                ? { code: 0, data }
+                : { ...data, code: +data.code || 0 }
 
             const task = originTask
-                .then(formatDataStructure)
-                .then(formatDataType)
-                .then(({ code, data }) => {
+                .then(formatData)
+                .then(({ code, ...rest }) => {
                     // 应该首先删除任务
                     finallyRemoveTask()
 
-                    if (code !== 0 || !isAutoSave) return { code, data }
+                    if (code !== 0 || !isAutoSave) return { code, ...rest }
 
                     this.save({
                         // 防止无限添加前缀
                         key: key.replace(this.storageKeyPrefix, ''),
-                        data: { code, data },
+                        data: { code, ...rest },
                         expires,
                     }).catch(logger.error)
 
-                    return { code, data }
+                    return { code, ...rest }
                 })
                 .catch(finallyRemoveTask)
 
@@ -550,9 +546,9 @@ class TuaStorage {
         // 若数据未过期，则直接用缓存数据，
         // 否则调用同步数据函数，若没有同步函数则返回错误
         return isDataExpired
-            ? !syncFn
-                ? syncRejectFn()
-                : syncResolveFn()
+            ? syncFn
+                ? syncResolveFn()
+                : syncRejectFn()
             : pRes(rawData)
     }
 

diff --git a/test/cache.test.js b/test/cache.test.js
@@ -231,6 +231,16 @@ describe('async methods', () => {
                 expect(stringify(cache[targetKey])).toBeUndefined()
             })
         })
+
+        test('load data except code/data', async () => {
+            const msg = 'this is msg'
+            const syncFn = () => Promise.resolve({ code: 1, data, msg })
+            const loadedData = await tuaStorage.load({ key, syncFn })
+
+            expect(loadedData.code).toBe(1)
+            expect(loadedData.data).toEqual(data)
+            expect(loadedData.msg).toEqual(msg)
+        })
     })
 
     describe('remove and clear only', () => {