@symbo.ls/fetch 2.4.1 → 2.6.0

package/index.js

@@ -1,45 +1,58 @@
 'use strict'
 
 import { client, fetch } from '@symbo.ls/based'
+import { deepMerge } from '@domql/utils'
+
+import TMP_DATA from '@symbo.ls/temp-db'
+import CONFIG_DEFAULT from '@symbo.ls/config-default'
 
 export const fetchIcon = async (el, s, { icon }) => {
   await client.observe({
     $id: icon,
     $all: true
-  }, (data) => {
+  }, 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 fetchProject = (el, s, { userName, projectId }) => {
+export const fetchProject = (el, s, { userName, projectId, ...options }) => {
   fetch({
     $id: projectId,
     $all: true
   }, async data => {
-    console.log(data)
     const { key, name, state, icon, system } = data
 
-    if (system) s.SYSTEM = { ...system }
-    if (state) s.STATE = { ...state }
+    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)
 
     s.update({
       appKey: key,
       projectName: name,
       userName,
       projectId
-    })
+    }, options)
 
-    fetchIcon(el, s, { icon })
+    console.log(icon)
+    await fetchIcon(el, s, { icon })
   })
 }
 
-export const fetchUser = (el, s) => {
+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 })
+      fetchProject(el, s, { userName, projectId, ...options })
     }
   })
 }

package/package.json

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