chore(ts-js): more ts day8 (#1026)

* chore(ts-js): some global store && re-org spec

* chore(ts-js): sharedModeal convert

Author: mydearxym

config/index.ts

@@ -1,13 +1,17 @@
 // export * from './config.json'
 // import * as CONFIG from './config.json'
 
+import type { TThemeName } from '@/spec'
+import { DEFAULT_THEME as DEFAULT_THEME_CONFIG } from './config.json'
+
 export { default as LABEL_POOL } from './label_pool'
 export { default as SEO } from './next_seo'
 
+export const DEFAULT_THEME = DEFAULT_THEME_CONFIG as TThemeName
+
 // explicit export to avoid eslint warning
 export {
   GRAPHQL_ENDPOINT,
-  DEFAULT_THEME,
   SENIOR_AMOUNT_THRESHOLD,
   SPONSOR_AMOUNT_THRESHOLD,
   PAGE_SIZE,

src/spec/account.ts

@@ -0,0 +1,17 @@
+export type TUser = {
+  id: string
+  login: string
+  nickname: string
+  avatar: string
+}
+export type TAccount = TUser & {
+  customization?: {
+    theme: string
+    bannerLayout: string
+  }
+  isLogin?: boolean
+  isValidSession?: boolean
+  // ...
+}
+
+export type TMembership = 'seniorMember' | 'sponsorMember' | 'donateMember'

src/spec/index.ts

@@ -14,6 +14,8 @@ export type {
 export type { TButton } from './comp'
 
 export type { TTheme, TThemeMap, TThemeName } from './theme'
+export type { TAccount, TUser, TMembership } from './account'
+export type { TTestable, TActive, TSpace, TGAEvent, TSEO, TLink } from './utils'
 
 export type TRoute = {
   communityPath?: string
@@ -22,23 +24,6 @@ export type TRoute = {
   subPath?: string
 }
 
-export type TTestable = {
-  testid: string
-}
-
-export type TActive = {
-  active?: boolean
-  show?: boolean
-  visible?: boolean
-}
-
-export type TSpace = {
-  top?: number
-  bottom?: number
-  left?: number
-  right?: number
-}
-
 export type TRootStore = RootStoreType
 
 // c# like
@@ -51,19 +36,6 @@ export type TCommunity = {
   raw: string
 }
 
-export type TUser = {
-  id: string
-  login: string
-  nickname: string
-  avatar: string
-}
-export type TAccount = TUser & {
-  customization?: {
-    theme: string
-    bannerLayout: string
-  }
-  // ...
-}
 export type TArticle = {
   id: string
   title: string
@@ -82,20 +54,4 @@ export type TViewing = {
   post: TArticle
 }
 
-// google analytis format
-export type GA_EVENT = {
-  action: string
-  category: string
-  label: string
-  value: string
-}
-
-export type TSEO = {
-  url: string
-  title: string
-  description: string
-}
-
-export type TLink = {
-  href: string
-}
+export type TThread = string

src/spec/theme.ts

@@ -4,7 +4,7 @@ export type TThemeName =
   | 'purple'
   | 'yellow'
   | 'github'
-  | 'Green'
+  | 'green'
   | 'ironGreen'
   | 'monokai'
 

src/spec/utils.ts

@@ -0,0 +1,34 @@
+export type TTestable = {
+  testid: string
+}
+
+export type TActive = {
+  active?: boolean
+  show?: boolean
+  visible?: boolean
+}
+
+export type TSpace = {
+  top?: number
+  bottom?: number
+  left?: number
+  right?: number
+}
+
+// google analytis format
+export type TGAEvent = {
+  action: string
+  category: string
+  label: string
+  value: string
+}
+
+export type TSEO = {
+  url: string
+  title: string
+  description: string
+}
+
+export type TLink = {
+  href: string
+}

src/stores/AccountStore/index.js renamed to src/stores/AccountStore/index.ts

@@ -3,9 +3,10 @@
  *
  */
 
-import { types as T, getParent } from 'mobx-state-tree'
+import { types as T, getParent, Instance } from 'mobx-state-tree'
 import { merge, clone, remove, insert, findIndex, propEq } from 'ramda'
 
+import type { TRootStore, TCommunity } from '@/spec'
 import { markStates, buildLog, stripMobx, BStore } from '@/utils'
 import { User, EmptyUser, PagedCommunities } from '@/model'
 
@@ -18,9 +19,6 @@ const AccountStore = T.model('AccountStore', {
   userSubscribedCommunities: T.maybeNull(PagedCommunities),
 })
   .views((self) => ({
-    get root() {
-      return getParent(self)
-    },
     get accountInfo() {
       return {
         ...stripMobx(self.user),
@@ -48,72 +46,81 @@ const AccountStore = T.model('AccountStore', {
     },
   }))
   .actions((self) => ({
-    logout() {
-      self.root.drawer.close()
-      self.sessionCleanup()
+    logout(): void {
+      const root = getParent(self) as TRootStore
+      const { sessionCleanup } = self as TStore
+      root.drawer.close()
+      sessionCleanup()
     },
-    isMemberOf(type) {
+    isMemberOf(type): boolean {
       const { achievement } = stripMobx(self.user)
       if (!achievement) return false
       return achievement[type] || false
     },
-    updateAccount(sobj) {
+    updateAccount(sobj): void {
       const user = merge(stripMobx(self.user), { ...sobj })
+      const { mark } = self as TStore
 
-      self.mark({ user })
+      mark({ user })
     },
     updateSession({ isValid, user }) {
       self.isValidSession = isValid
+
+      const { setSession, updateAccount, sessionCleanup } = self as TStore
+
       if (isValid) {
-        self.setSession(user, BStore.get('token'))
-        return self.updateAccount(user || {})
+        setSession(user, BStore.get('token'))
+        return updateAccount(user || {})
       }
-      return self.sessionCleanup()
+      return sessionCleanup()
     },
-    setSession(user, token) {
+    setSession(user: string, token: string): void {
       // log('setSession user: ', user)
       // log('setSession token: ', token)
 
       BStore.set('user', user)
       BStore.set('token', token)
       BStore.cookie.set('jwtToken', token)
     },
-    sessionCleanup() {
+    sessionCleanup(): void {
+      // @ts-ignore
       self.user = EmptyUser
       self.isValidSession = false
       BStore.remove('user')
       BStore.remove('token')
       BStore.cookie.remove('jwtToken')
     },
-    loadSubscribedCommunities(data) {
+    loadSubscribedCommunities(data): void {
       // self.user.subscribedCommunities = data
       self.userSubscribedCommunities = data
     },
-    addSubscribedCommunity(community) {
+    addSubscribedCommunity(community: TCommunity): void {
       const {
         userSubscribedCommunities: { entries },
       } = self
-
+      // @ts-ignore
       self.userSubscribedCommunities.entries = insert(0, community, entries)
       self.userSubscribedCommunities.totalCount += 1
     },
 
-    removeSubscribedCommunity(community) {
+    removeSubscribedCommunity(community: TCommunity): void {
       const {
         userSubscribedCommunities: { entries },
       } = self
 
       const index = findIndex(propEq('id', community.id), entries)
+      // @ts-ignore
       self.userSubscribedCommunities.entries = remove(index, 1, entries)
       self.userSubscribedCommunities.totalCount -= 1
     },
     updateC11N(options) {
       const curCustomization = clone(self.accountInfo.customization)
       self.user.customization = merge(curCustomization, options)
     },
-    mark(sobj) {
+    mark(sobj: Record<string, unknown>): void {
       markStates(sobj, self)
     },
   }))
 
+export type TStore = Instance<typeof AccountStore>
 export default AccountStore