refactor store

src/api/auth.js

@@ -1,5 +1,5 @@
 import { request } from '../service/request';
-import { useUserStore } from '../stores';
+import { handleConfig } from '../coordinators/userCoordinator';
 
 const loginReq = {
     /**
@@ -63,7 +63,7 @@ const loginReq = {
             const args = {
                 json
             };
-            useUserStore().handleConfig(args);
+            handleConfig(args);
             return args;
         });
     }

src/api/avatar.js

@@ -1,6 +1,7 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
 import { request } from '../service/request';
 import { useUserStore } from '../stores';
+import { applyCurrentUser } from '../coordinators/userCoordinator';
 
 const avatarReq = {
     /**
@@ -65,7 +66,7 @@ const avatarReq = {
      * @returns {Promise<{json: any, params}>}
      */
     selectAvatar(params) {
-        const userStore = useUserStore();
+
         return request(`avatars/${params.avatarId}/select`, {
             method: 'PUT',
             params
@@ -74,7 +75,7 @@ const avatarReq = {
                 json,
                 params
             };
-            const ref = userStore.applyCurrentUser(json);
+            const ref = applyCurrentUser(json);
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.user(ref.id),
                 nextData: {
@@ -97,7 +98,7 @@ const avatarReq = {
      * @returns { Promise<{json: any, params}> }
      */
     selectFallbackAvatar(params) {
-        const userStore = useUserStore();
+
         return request(`avatars/${params.avatarId}/selectfallback`, {
             method: 'PUT',
             params
@@ -106,7 +107,7 @@ const avatarReq = {
                 json,
                 params
             };
-            const ref = userStore.applyCurrentUser(json);
+            const ref = applyCurrentUser(json);
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.user(ref.id),
                 nextData: {

src/api/friend.js

@@ -1,6 +1,7 @@
 import { queryClient } from '../queries';
 import { request } from '../service/request';
 import { useUserStore } from '../stores/user';
+import { applyUser } from '../coordinators/userCoordinator';
 
 /**
  *
@@ -22,7 +23,7 @@ const friendReq = {
      * @type {import('../types/api/friend').GetFriends}
      */
     getFriends(params) {
-        const userStore = useUserStore();
+
         return request('auth/user/friends', {
             method: 'GET',
             params
@@ -36,7 +37,7 @@ const friendReq = {
                     console.error('/friends gave us garbage', user);
                     continue;
                 }
-                userStore.applyUser(user);
+                applyUser(user);
             }
             return args;
         });

src/api/group.js

@@ -1,4 +1,5 @@
-import { useGroupStore, useUserStore } from '../stores';
+import { useUserStore } from '../stores';
+import { applyGroup } from '../coordinators/groupCoordinator';
 import { queryClient } from '../queries';
 import { request } from '../service/request';
 
@@ -89,12 +90,11 @@ const groupReq = {
                 includeRoles: params.includeRoles || false
             }
         }).then((json) => {
-            const groupStore = useGroupStore();
             const args = {
                 json,
                 params
             };
-            args.ref = groupStore.applyGroup(json);
+            args.ref = applyGroup(json);
             return args;
         });
     },

src/api/image.js

@@ -1,4 +1,5 @@
 import { useAvatarStore, useWorldStore } from '../stores';
+import { applyWorld } from '../coordinators/worldCoordinator';
 import { request } from '../service/request';
 
 const imageReq = {
@@ -267,7 +268,7 @@ const imageReq = {
                 json,
                 params
             };
-            args.ref = worldStore.applyWorld(json);
+            args.ref = applyWorld(json);
             return args;
         });
     },

src/api/user.js

@@ -1,6 +1,7 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
 import { request } from '../service/request';
 import { useUserStore } from '../stores';
+import { applyUser, applyCurrentUser } from '../coordinators/userCoordinator';
 
 /**
  * @returns {string}
@@ -16,7 +17,7 @@ const userReq = {
      * @type {import('../types/api/user').GetUser}
      */
     getUser(params) {
-        const userStore = useUserStore();
+
         return request(`users/${params.userId}`, {
             method: 'GET'
         }).then((json) => {
@@ -29,7 +30,7 @@ const userReq = {
             const args = {
                 json,
                 params,
-                ref: userStore.applyUser(json)
+                ref: applyUser(json)
             };
             return args;
         });
@@ -56,7 +57,7 @@ const userReq = {
      * @returns {Promise<{json: any, params: {tags: string[]}}>}
      */
     addUserTags(params) {
-        const userStore = useUserStore();
+
         return request(`users/${getCurrentUserId()}/addTags`, {
             method: 'POST',
             params
@@ -65,7 +66,7 @@ const userReq = {
                 json,
                 params
             };
-            userStore.applyCurrentUser(json);
+            applyCurrentUser(json);
             return args;
         });
     },
@@ -75,7 +76,7 @@ const userReq = {
      * @returns {Promise<{json: any, params: {tags: string[]}}>}
      */
     removeUserTags(params) {
-        const userStore = useUserStore();
+
         return request(`users/${getCurrentUserId()}/removeTags`, {
             method: 'POST',
             params
@@ -84,7 +85,7 @@ const userReq = {
                 json,
                 params
             };
-            userStore.applyCurrentUser(json);
+            applyCurrentUser(json);
             return args;
         });
     },
@@ -113,7 +114,7 @@ const userReq = {
      * @type {import('../types/api/user').GetCurrentUser}
      */
     saveCurrentUser(params) {
-        const userStore = useUserStore();
+
         return request(`users/${getCurrentUserId()}`, {
             method: 'PUT',
             params
@@ -121,7 +122,7 @@ const userReq = {
             const args = {
                 json,
                 params,
-                ref: userStore.applyCurrentUser(json)
+                ref: applyCurrentUser(json)
             };
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.user(args.ref.id),

src/api/world.js

@@ -1,13 +1,12 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
 import { request } from '../service/request';
-import { useWorldStore } from '../stores';
+import { applyWorld } from '../coordinators/worldCoordinator';
 
 const worldReq = {
     /**
      * @type {import('../types/api/world').GetWorld}
      */
     getWorld(params) {
-        const worldStore = useWorldStore();
         return request(`worlds/${params.worldId}`, {
             method: 'GET'
         }).then((json) => {
@@ -15,7 +14,7 @@ const worldReq = {
                 json,
                 params
             };
-            args.ref = worldStore.applyWorld(json);
+            args.ref = applyWorld(json);
             return args;
         });
     },
@@ -24,7 +23,6 @@ const worldReq = {
      * @type {import('../types/api/world').GetWorlds}
      */
     getWorlds(params, option) {
-        const worldStore = useWorldStore();
         let endpoint = 'worlds';
         if (typeof option !== 'undefined') {
             endpoint = `worlds/${option}`;
@@ -39,7 +37,7 @@ const worldReq = {
                 option
             };
             for (const json of args.json) {
-                worldStore.applyWorld(json);
+                applyWorld(json);
             }
             return args;
         });
@@ -64,7 +62,6 @@ const worldReq = {
      * @type {import('../types/api/world').SaveWorld}
      */
     saveWorld(params) {
-        const worldStore = useWorldStore();
         return request(`worlds/${params.id}`, {
             method: 'PUT',
             params
@@ -73,7 +70,7 @@ const worldReq = {
                 json,
                 params
             };
-            args.ref = worldStore.applyWorld(json);
+            args.ref = applyWorld(json);
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.world(args.ref.id),
                 nextData: args
@@ -92,7 +89,6 @@ const worldReq = {
      * @returns {Promise<{json: any, params}>}
      */
     publishWorld(params) {
-        const worldStore = useWorldStore();
         return request(`worlds/${params.worldId}/publish`, {
             method: 'PUT',
             params
@@ -101,7 +97,7 @@ const worldReq = {
                 json,
                 params
             };
-            args.ref = worldStore.applyWorld(json);
+            args.ref = applyWorld(json);
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.world(args.ref.id),
                 nextData: args
@@ -120,7 +116,6 @@ const worldReq = {
      * @returns {Promise<{json: any, params}>}
      */
     unpublishWorld(params) {
-        const worldStore = useWorldStore();
         return request(`worlds/${params.worldId}/publish`, {
             method: 'DELETE',
             params
@@ -129,7 +124,7 @@ const worldReq = {
                 json,
                 params
             };
-            args.ref = worldStore.applyWorld(json);
+            args.ref = applyWorld(json);
             patchAndRefetchActiveQuery({
                 queryKey: queryKeys.world(args.ref.id),
                 nextData: args