@symbo.ls/fetch 2.6.4 → 2.6.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +27 -9
  2. package/package.json +2 -2
package/index.js CHANGED
@@ -20,7 +20,9 @@ export const fetchIcon = async (el, s, { icon }) => {
20
20
  }
21
21
 
22
22
  export const syncSystem = (data, el, s) => {
23
- const { SYSTEM, STATE } = TMP_DATA[s.appKey]
23
+ let temporaryProject = TMP_DATA[s.appKey]
24
+ if (!temporaryProject) temporaryProject = {}
25
+ const { SYSTEM, STATE } = temporaryProject
24
26
  const { system, state } = data
25
27
 
26
28
  const defObjs = {
@@ -28,11 +30,28 @@ export const syncSystem = (data, el, s) => {
28
30
  state: STATE || {}
29
31
  }
30
32
 
31
- if (isObject(system)) deepMerge(s.CLIENT_SYSTEM, system)
32
- else set({ $id: s.projectId, system: defObjs.system })
33
+ if (isObject(system)) {
34
+ deepMerge(system, defObjs.system)
35
+ } else {
36
+ set({ $id: s.projectId, system: defObjs.system })
37
+ }
38
+
39
+ if (isObject(state)) {
40
+ deepMerge(state, defObjs.state)
41
+ } else {
42
+ set({ $id: s.projectId, state: defObjs.state })
43
+ }
33
44
 
34
- if (isObject(state)) deepMerge(s.CLIENT_STATE, state)
35
- else set({ $id: s.projectId, state: defObjs.state })
45
+ deepMerge(s.PROJECT_SYSTEM, system)
46
+ deepMerge(s.PROJECT_STATE, state)
47
+ }
48
+
49
+ export const publishSystem = (data, el, s) => {
50
+ set({
51
+ $id: s.projectId,
52
+ system: s.PROJECT_SYSTEM,
53
+ state: s.PROJECT_STATE
54
+ })
36
55
  }
37
56
 
38
57
  export const fetchProject = (el, s, { userName, projectId, ...options }) => {
@@ -46,12 +65,11 @@ export const fetchProject = (el, s, { userName, projectId, ...options }) => {
46
65
  appKey: key,
47
66
  projectName: name,
48
67
  userName,
49
- projectId
68
+ projectId,
69
+ icon
50
70
  }, options)
51
71
 
52
72
  syncSystem(data, el, s)
53
-
54
- await fetchIcon(el, s, { icon })
55
73
  })
56
74
  }
57
75
 
@@ -61,7 +79,7 @@ export const fetchUser = (el, s, options) => {
61
79
  const { projects } = data
62
80
  const userName = data.name
63
81
  if (projects) {
64
- const projectId = projects[0]
82
+ const projectId = projects[1]
65
83
  fetchProject(el, s, { userName, projectId, ...options })
66
84
  }
67
85
  })
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@symbo.ls/fetch",
3
- "version": "2.6.4",
3
+ "version": "2.6.9",
4
4
  "main": "index.js",
5
5
  "dependencies": {
6
6
  "@symbo.ls/based": "latest",
7
7
  "@symbo.ls/config-default": "latest",
8
8
  "@symbo.ls/temp-db": "latest"
9
9
  },
10
- "gitHead": "3f98ee5306b85ff22816d2bdb2d7cef1bfb3e188"
10
+ "gitHead": "6d4670854bf83e406dc0488c3de3ae7c9054aa04"
11
11
  }