@symbo.ls/fetch 2.6.0 → 2.6.3

package/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { client, fetch } from '@symbo.ls/based'
+import { client, fetch, set } from '@symbo.ls/based'
 import { deepMerge } from '@domql/utils'
 
 import TMP_DATA from '@symbo.ls/temp-db'
@@ -11,28 +11,36 @@ export const fetchIcon = async (el, s, { icon }) => {
     $id: icon,
     $all: true
   }, async (data) => {
-    console.log(data)
     await client.set({
       $id: s.projectId,
       icon
     }, d => console.log('d', d))
-    console.log('data', data)
     s.update({ icon: data })
   })
 }
 
+export const syncSystem = (data, el, s) => {
+  const { SYSTEM, STATE } = TMP_DATA[s.appKey]
+  const { system, state } = data
+
+  const defObjs = {
+    system: SYSTEM || CONFIG_DEFAULT,
+    state: STATE || {}
+  }
+
+  if (system) deepMerge(s.CLIENT_SYSTEM, system)
+  else set({ $id: s.projectId, system: defObjs.system })
+
+  if (state) deepMerge(s.CLIENT_STATE, state)
+  else set({ $id: s.projectId, state: defObjs.state })
+}
+
 export const fetchProject = (el, s, { userName, projectId, ...options }) => {
   fetch({
     $id: projectId,
     $all: true
   }, async data => {
-    const { key, name, state, icon, system } = data
-
-    const { SYSTEM, STATE } = TMP_DATA[key]
-    deepMerge(s.SYSTEM, system || SYSTEM || CONFIG_DEFAULT)
-    deepMerge(s.STATE, state || STATE || {})
-    console.log(data)
-    console.log(s.SYSTEM, s.STATE)
+    const { key, name, icon } = data
 
     s.update({
       appKey: key,
@@ -41,18 +49,27 @@ export const fetchProject = (el, s, { userName, projectId, ...options }) => {
       projectId
     }, options)
 
-    console.log(icon)
+    syncSystem(data, el, s)
+
     await fetchIcon(el, s, { icon })
   })
 }
 
 export const fetchUser = (el, s, options) => {
-  fetch({ $id: s.userId, name: true, projects: true }, data => {
-    const { projects } = data
-    const userName = data.name
-    if (projects) {
-      const projectId = projects[0]
-      fetchProject(el, s, { userName, projectId, ...options })
-    }
-  })
+  if (!s.projectId) {
+    fetch({ $id: s.userId, name: true, projects: true }, data => {
+      const { projects } = data
+      const userName = data.name
+      if (projects) {
+        const projectId = projects[0]
+        fetchProject(el, s, { userName, projectId, ...options })
+      }
+    })
+  } else {
+    fetchProject(el, s, {
+      userName: s.userName,
+      projectId: s.projectId,
+      ...options
+    })
+  }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@symbo.ls/fetch",
-  "version": "2.6.0",
+  "version": "2.6.3",
   "main": "index.js",
   "dependencies": {
     "@symbo.ls/based": "latest",
     "@symbo.ls/config-default": "latest",
     "@symbo.ls/temp-db": "latest"
   },
-  "gitHead": "41981d1b4f550992e08104002a6ca83398c03084"
+  "gitHead": "60bd577f711919070e28d2fdfdabeaf9fd2e2069"
 }