chore: move types to @roleypoly/types package

packages/api/handlers/create-roleypoly-data.ts

@@ -1,9 +1,5 @@
+import { CategoryType, Features, GuildData as GuildDataT } from '@roleypoly/types';
 import KSUID from 'ksuid';
-import {
-    CategoryType,
-    Features,
-    GuildData as GuildDataT,
-} from '../../../src/common/types';
 import { onlyRootUsers, respond } from '../utils/api-tools';
 import { GuildData } from '../utils/kv';
 

packages/api/handlers/get-picker-data.ts

@@ -1,9 +1,4 @@
-import {
-    DiscordUser,
-    GuildSlug,
-    PresentableGuild,
-    SessionData,
-} from '../../../src/common/types';
+import { DiscordUser, GuildSlug, PresentableGuild, SessionData } from '@roleypoly/types';
 import { respond, withSession } from '../utils/api-tools';
 import { getGuild, getGuildData, getGuildMemberRoles } from '../utils/guild';
 

packages/api/handlers/get-session.ts

@@ -1,4 +1,4 @@
-import { SessionData } from '../../../src/common/types';
+import { SessionData } from '@roleypoly/types';
 import { respond, withSession } from '../utils/api-tools';
 
 export const GetSession = withSession((session?: SessionData) => (): Response => {

packages/api/handlers/get-slug.ts

@@ -1,4 +1,4 @@
-import { GuildSlug } from '../../../src/common/types';
+import { GuildSlug } from '@roleypoly/types';
 import { respond } from '../utils/api-tools';
 import { getGuild } from '../utils/guild';
 

packages/api/handlers/login-callback.ts

@@ -1,10 +1,5 @@
+import { AuthTokenResponse, DiscordUser, GuildSlug, SessionData } from '@roleypoly/types';
 import KSUID from 'ksuid';
-import {
-    AuthTokenResponse,
-    DiscordUser,
-    GuildSlug,
-    SessionData,
-} from '../../../src/common/types';
 import {
     AuthType,
     discordFetch,

packages/api/handlers/revoke-session.ts

@@ -1,4 +1,4 @@
-import { SessionData } from '../../../src/common/types';
+import { SessionData } from '@roleypoly/types';
 import { formData, respond, userAgent, withSession } from '../utils/api-tools';
 import { botClientID, botClientSecret } from '../utils/config';
 import { Sessions } from '../utils/kv';

packages/api/handlers/update-roles.ts

@@ -1,4 +1,3 @@
-import { difference, groupBy, keyBy, union } from 'lodash';
 import {
     GuildData,
     Member,
@@ -8,7 +7,8 @@ import {
     RoleUpdate,
     SessionData,
     TransactionType,
-} from '../../../src/common/types';
+} from '@roleypoly/types';
+import { difference, groupBy, keyBy, union } from 'lodash';
 import { AuthType, discordFetch, respond, withSession } from '../utils/api-tools';
 import { botToken } from '../utils/config';
 import {

packages/api/package.json

@@ -6,6 +6,7 @@
         "start": "yarn workspace @roleypoly/worker-emulator start --basePath `pwd`"
     },
     "devDependencies": {
+        "@roleypoly/types": "*",
         "@roleypoly/worker-emulator": "*",
         "ksuid": "^2.0.0",
         "lodash": "^4.17.21",

packages/api/utils/api-tools.ts

@@ -1,4 +1,4 @@
-import { SessionData, UserGuildPermissions } from '../../../src/common/types';
+import { SessionData, UserGuildPermissions } from '@roleypoly/types';
 import {
     evaluatePermission,
     permissions as Permissions,

packages/api/utils/guild.ts

@@ -5,7 +5,7 @@ import {
     OwnRoleInfo,
     Role,
     RoleSafety,
-} from '../../../src/common/types';
+} from '@roleypoly/types';
 import { evaluatePermission, permissions } from '../../../src/common/utils/hasPermission';
 import { AuthType, cacheLayer, discordFetch } from './api-tools';
 import { botClientID, botToken } from './config';

packages/design-system/atoms/role/Role.tsx

@@ -1,8 +1,8 @@
 import { numberToChroma } from '@roleypoly/design-system/atoms/colors';
+import { Role as RPCRole, RoleSafety } from '@roleypoly/types';
 import chroma from 'chroma-js';
 import * as React from 'react';
 import { FaCheck, FaTimes } from 'react-icons/fa';
-import { Role as RPCRole, RoleSafety } from '../../../../src/common/types';
 import {
     evaluatePermission,
     permissions,

packages/design-system/fixtures/storyData.ts

@@ -11,7 +11,7 @@ import {
     Role,
     RoleSafety,
     RoleypolyUser,
-} from '../../../src/common/types';
+} from '@roleypoly/types';
 
 export const roleCategory: Role[] = [
     {

packages/design-system/molecules/demo-discord/DemoDiscord.tsx

@@ -1,6 +1,6 @@
 import { Typist } from '@roleypoly/design-system/atoms/typist';
+import { demoData } from '@roleypoly/types/demoData';
 import * as React from 'react';
-import { demoData } from '../../../../src/common/types/demoData';
 import {
     Base,
     InputBox,

packages/design-system/molecules/demo-picker/DemoPicker.tsx

@@ -1,8 +1,8 @@
 import { Role } from '@roleypoly/design-system/atoms/role';
+import { Role as RPCRole } from '@roleypoly/types';
+import { demoData } from '@roleypoly/types/demoData';
 import * as React from 'react';
 import styled from 'styled-components';
-import { Role as RPCRole } from '../../../../src/common/types';
-import { demoData } from '../../../../src/common/types/demoData';
 
 const Container = styled.div`
     display: flex;

packages/design-system/molecules/editor-category/EditorCategory.tsx

@@ -6,9 +6,9 @@ import { Space } from '@roleypoly/design-system/atoms/space';
 import { TextInput, TextInputWithIcon } from '@roleypoly/design-system/atoms/text-input';
 import { Text } from '@roleypoly/design-system/atoms/typography';
 import { RoleSearch } from '@roleypoly/design-system/molecules/role-search';
+import { Category, CategoryType, Role as RoleType } from '@roleypoly/types';
 import * as React from 'react';
 import { GoSearch } from 'react-icons/go';
-import { Category, CategoryType, Role as RoleType } from '../../../../src/common/types';
 import { RoleContainer } from './EditorCategory.styled';
 
 type Props = {

packages/design-system/molecules/guild-nav/GuildNav.tsx

@@ -1,9 +1,9 @@
 import { NavSlug } from '@roleypoly/design-system/molecules/nav-slug';
+import { GuildSlug, UserGuildPermissions } from '@roleypoly/types';
 import * as React from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { GoStar, GoZap } from 'react-icons/go';
 import ReactTooltip from 'react-tooltip';
-import { GuildSlug, UserGuildPermissions } from '../../../../src/common/types';
 import { sortBy } from '../../../../src/common/utils/sortBy';
 import { GuildNavItem } from './GuildNav.styled';
 

packages/design-system/molecules/nav-slug/NavSlug.tsx

@@ -1,7 +1,7 @@
 import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { GoOrganization } from 'react-icons/go';
-import { GuildSlug } from '../../../../src/common/types';
 import { SlugContainer, SlugName } from './NavSlug.styled';
 
 type Props = {

packages/design-system/molecules/picker-category/PickerCategory.tsx

@@ -1,13 +1,9 @@
 import { Role } from '@roleypoly/design-system/atoms/role';
 import { AmbientLarge, LargeText } from '@roleypoly/design-system/atoms/typography';
+import { Category as RPCCategory, Role as RPCRole, RoleSafety } from '@roleypoly/types';
 import * as React from 'react';
 import ReactTooltip from 'react-tooltip';
 import styled from 'styled-components';
-import {
-    Category as RPCCategory,
-    Role as RPCRole,
-    RoleSafety,
-} from '../../../../src/common/types';
 import { sortBy } from '../../../../src/common/utils/sortBy';
 import { Head, HeadSub, HeadTitle } from './PickerCategory.styled';
 

packages/design-system/molecules/preauth-greeting/PreauthGreeting.tsx

@@ -1,9 +1,9 @@
 import { Avatar, utils as avatarUtils } from '@roleypoly/design-system/atoms/avatar';
 import { Space } from '@roleypoly/design-system/atoms/space';
 import { AccentTitle } from '@roleypoly/design-system/atoms/typography';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import styled from 'styled-components';
-import { GuildSlug } from '../../../../src/common/types';
 
 type GreetingProps = {
     guildSlug: GuildSlug;

packages/design-system/molecules/role-search/RoleSearch.tsx

@@ -1,11 +1,11 @@
 import { Role } from '@roleypoly/design-system/atoms/role';
 import { Space } from '@roleypoly/design-system/atoms/space';
 import { TextInputWithIcon } from '@roleypoly/design-system/atoms/text-input';
+import { Role as RoleType } from '@roleypoly/types';
 import Fuse from 'fuse.js';
 import * as React from 'react';
 import { GoSearch } from 'react-icons/go';
 import styled from 'styled-components';
-import { Role as RoleType } from '../../../../src/common/types';
 
 type Props = {
     roles: RoleType[];

packages/design-system/molecules/server-listing-card/ServerListingCard.tsx

@@ -1,8 +1,8 @@
 import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
 import { Collapse } from '@roleypoly/design-system/atoms/collapse';
+import { GuildSlug, UserGuildPermissions } from '@roleypoly/types';
 import * as React from 'react';
 import { GoPerson, GoStar, GoZap } from 'react-icons/go';
-import { GuildSlug, UserGuildPermissions } from '../../../../src/common/types';
 import {
     CardBase,
     CardLine,

packages/design-system/molecules/server-masthead/ServerMasthead.tsx

@@ -1,8 +1,8 @@
 import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
 import { AccentTitle, AmbientLarge } from '@roleypoly/design-system/atoms/typography';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { GoPencil } from 'react-icons/go';
-import { GuildSlug } from '../../../../src/common/types';
 import { Editable, Icon, Name, Wrapper } from './ServerMasthead.styled';
 
 export type ServerMastheadProps = {

packages/design-system/molecules/user-avatar-group/UserAvatarGroup.tsx

@@ -1,6 +1,6 @@
 import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
+import { DiscordUser } from '@roleypoly/types';
 import * as React from 'react';
-import { DiscordUser } from '../../../../src/common/types';
 import { Collapse, Discriminator, Group, GroupText } from './UserAvatarGroup.styled';
 
 type Props = {

packages/design-system/molecules/user-popover/UserPopover.tsx

@@ -1,8 +1,8 @@
 import { CompletelyStylelessLink } from '@roleypoly/design-system/atoms/typography';
 import { UserAvatarGroup } from '@roleypoly/design-system/molecules/user-avatar-group';
+import { DiscordUser } from '@roleypoly/types';
 import * as React from 'react';
 import { GoGear, GoSignOut } from 'react-icons/go';
-import { DiscordUser } from '../../../../src/common/types';
 import { Base, NavAction } from './UserPopover.styled';
 
 type UserPopoverProps = {

packages/design-system/organisms/app-shell/AppShell.tsx

@@ -1,9 +1,9 @@
 import { GlobalStyleColors } from '@roleypoly/design-system/atoms/colors';
 import { Footer } from '@roleypoly/design-system/molecules/footer';
 import * as Masthead from '@roleypoly/design-system/organisms/masthead';
+import { DiscordUser, GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { Scrollbars } from 'react-custom-scrollbars';
-import { DiscordUser, GuildSlug } from '../../../../src/common/types';
 import { Content, GlobalStyles } from './AppShell.styled';
 
 export type AppShellProps = {

packages/design-system/organisms/editor/EditorShell.tsx

@@ -1,6 +1,6 @@
 import { Tab, TabView } from '@roleypoly/design-system/atoms/tab-view';
+import { PresentableGuild } from '@roleypoly/types';
 import * as React from 'react';
-import { PresentableGuild } from '../../../../src/common/types';
 import { EditorCategory } from '../../molecules/editor-category';
 import { CategoryContainer } from './EditorShell.styled';
 

packages/design-system/organisms/help-why-no-roles/WhyNoRoles.styled.ts

@@ -1,6 +1,6 @@
 import { numberToChroma, palette } from '@roleypoly/design-system/atoms/colors';
+import { Role } from '@roleypoly/types';
 import styled, { css } from 'styled-components';
-import { Role } from '../../../../src/common/types';
 
 export const DiscordBase = styled.div`
     background-color: ${palette.discord100};

packages/design-system/organisms/help-why-no-roles/WhyNoRoles.tsx

@@ -1,11 +1,11 @@
 import { palette } from '@roleypoly/design-system/atoms/colors';
 import { HalfsiesContainer, HalfsiesItem } from '@roleypoly/design-system/atoms/halfsies';
 import { SparkleOverlay } from '@roleypoly/design-system/atoms/sparkle';
+import { Role } from '@roleypoly/types';
+import { demoData } from '@roleypoly/types/demoData';
 import chroma from 'chroma-js';
 import * as React from 'react';
 import { FaCheck, FaTimes } from 'react-icons/fa';
-import { Role } from '../../../../src/common/types';
-import { demoData } from '../../../../src/common/types/demoData';
 import { DiscordBase, DiscordRole } from './WhyNoRoles.styled';
 
 const adminRoles: Role[] = [

packages/design-system/organisms/masthead/Authed.tsx

@@ -4,9 +4,9 @@ import { GuildNav } from '@roleypoly/design-system/molecules/guild-nav';
 import { NavSlug } from '@roleypoly/design-system/molecules/nav-slug';
 import { UserAvatarGroup } from '@roleypoly/design-system/molecules/user-avatar-group';
 import { UserPopover } from '@roleypoly/design-system/molecules/user-popover';
+import { DiscordUser, GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { GoOrganization } from 'react-icons/go';
-import { DiscordUser, GuildSlug } from '../../../../src/common/types';
 import {
     GuildPopoverHead,
     InteractionBase,

packages/design-system/organisms/preauth/Preauth.tsx

@@ -1,9 +1,9 @@
 import { Button } from '@roleypoly/design-system/atoms/button';
 import { PreauthGreeting } from '@roleypoly/design-system/molecules/preauth-greeting';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { FaDiscord } from 'react-icons/fa';
 import styled from 'styled-components';
-import { GuildSlug } from '../../../../src/common/types';
 
 export type PreauthProps = {
     guildSlug?: GuildSlug;

packages/design-system/organisms/role-picker/RolePicker.tsx

@@ -4,9 +4,6 @@ import { Link } from '@roleypoly/design-system/atoms/typography';
 import { PickerCategory } from '@roleypoly/design-system/molecules/picker-category';
 import { ResetSubmit } from '@roleypoly/design-system/molecules/reset-submit';
 import { ServerMasthead } from '@roleypoly/design-system/molecules/server-masthead';
-import { isEqual, xor } from 'lodash';
-import * as React from 'react';
-import { GoInfo } from 'react-icons/go';
 import {
     Category,
     CategoryType,
@@ -14,7 +11,10 @@ import {
     GuildSlug,
     Member,
     Role,
-} from '../../../../src/common/types';
+} from '@roleypoly/types';
+import { isEqual, xor } from 'lodash';
+import * as React from 'react';
+import { GoInfo } from 'react-icons/go';
 import { ReactifyNewlines } from '../../../../src/common/utils/ReactifyNewlines';
 import { sortBy } from '../../../../src/common/utils/sortBy';
 import {

packages/design-system/organisms/server-setup/ServerSetup.stories.tsx

@@ -1,4 +1,4 @@
-import { UserGuildPermissions } from '../../../../src/common/types';
+import { UserGuildPermissions } from '@roleypoly/types';
 import { mastheadSlugs } from '../../fixtures/storyData';
 import { ServerSetup } from './ServerSetup';
 

packages/design-system/organisms/server-setup/ServerSetup.tsx

@@ -3,10 +3,10 @@ import { Button } from '@roleypoly/design-system/atoms/button';
 import { DotOverlay } from '@roleypoly/design-system/atoms/dot-overlay';
 import { Hero } from '@roleypoly/design-system/atoms/hero';
 import { AccentTitle, SmallTitle } from '@roleypoly/design-system/atoms/typography';
+import { GuildSlug, UserGuildPermissions } from '@roleypoly/types';
 import * as React from 'react';
 import { FaDiscord } from 'react-icons/fa';
 import { GoArrowLeft } from 'react-icons/go';
-import { GuildSlug, UserGuildPermissions } from '../../../../src/common/types';
 import { evaluatePermission } from '../../../../src/common/utils/hasPermission';
 import { FlexLine, FlexWrap } from './ServerSetup.styled';
 

packages/design-system/organisms/servers-listing/ServersListing.tsx

@@ -1,7 +1,7 @@
 import { CompletelyStylelessLink } from '@roleypoly/design-system/atoms/typography';
 import { ServerListingCard } from '@roleypoly/design-system/molecules/server-listing-card';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
-import { GuildSlug } from '../../../../src/common/types';
 import { sortBy } from '../../../../src/common/utils/sortBy';
 import { CardContainer, ContentContainer } from './ServersListing.styled';
 

packages/design-system/package.json

@@ -6,6 +6,7 @@
         "start": "start-storybook -p 6006"
     },
     "dependencies": {
+        "@roleypoly/types": "*",
         "chroma-js": "^2.1.0",
         "isomorphic-unfetch": "^3.1.0",
         "ksuid": "^2.0.0",

packages/design-system/templates/errors/Errors.tsx

@@ -5,8 +5,8 @@ import {
     ErrorMessage,
 } from '@roleypoly/design-system/molecules/error-banner';
 import { AppShell } from '@roleypoly/design-system/organisms/app-shell';
+import { DiscordUser } from '@roleypoly/types';
 import * as React from 'react';
-import { DiscordUser } from '../../../../src/common/types';
 import { getMessageFromCode } from './errorStrings';
 
 export type ErrorProps = {

packages/design-system/templates/servers/Servers.tsx

@@ -1,7 +1,7 @@
 import { AppShell, AppShellProps } from '@roleypoly/design-system/organisms/app-shell';
 import { ServersListing } from '@roleypoly/design-system/organisms/servers-listing/ServersListing';
+import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
-import { GuildSlug } from '../../../../src/common/types';
 
 type ServerTemplateProps = Omit<AppShellProps, 'children'> & {
     guilds: GuildSlug[];

packages/types/Category.ts

@@ -0,0 +1,13 @@
+export enum CategoryType {
+    Single = 0,
+    Multi,
+}
+
+export type Category = {
+    id: string;
+    name: string;
+    roles: string[];
+    hidden: boolean;
+    type: CategoryType;
+    position: number;
+};

packages/types/Guild.ts

@@ -0,0 +1,47 @@
+import { Category } from './Category';
+import { Role } from './Role';
+import { Member } from './User';
+
+export type Guild = {
+    id: string;
+    name: string;
+    icon: string;
+    roles: Role[];
+};
+
+export enum Features {
+    None,
+    Preview = None,
+}
+
+export type GuildData = {
+    id: string;
+    message: string;
+    categories: Category[];
+    features: Features;
+};
+
+export type PresentableGuild = {
+    id: string;
+    guild: GuildSlug;
+    member: Member;
+    data: GuildData;
+    roles: Role[];
+};
+
+export type GuildEnumeration = {
+    guilds: PresentableGuild[];
+};
+
+export enum UserGuildPermissions {
+    User,
+    Manager = 1 << 1,
+    Admin = 1 << 2,
+}
+
+export type GuildSlug = {
+    id: string;
+    name: string;
+    icon: string;
+    permissionLevel: UserGuildPermissions;
+};

packages/types/Role.ts

@@ -0,0 +1,37 @@
+export enum RoleSafety {
+    Safe = 0,
+    HigherThanBot = 1 << 1,
+    DangerousPermissions = 1 << 2,
+    ManagedRole = 1 << 3,
+}
+
+export type Role = {
+    id: string;
+    name: string;
+    color: number;
+    managed: boolean;
+    position: number;
+    safety: RoleSafety;
+    /** Permissions is should be used as a BigInt, NOT a number. */
+    permissions: string;
+};
+
+export type OwnRoleInfo = {
+    highestRolePosition: number;
+};
+
+export enum TransactionType {
+    None = 0,
+    Remove = 1 << 1,
+    Add = 1 << 2,
+}
+
+export type RoleTransaction = {
+    id: string;
+    action: TransactionType;
+};
+
+export type RoleUpdate = {
+    knownState: Role['id'][];
+    transactions: RoleTransaction[];
+};

packages/types/Session.ts

@@ -0,0 +1,18 @@
+import { GuildSlug } from './Guild';
+import { DiscordUser } from './User';
+
+export type AuthTokenResponse = {
+    access_token: string;
+    token_type: 'Bearer';
+    expires_in: number;
+    refresh_token: string;
+    scope: string;
+};
+
+export type SessionData = {
+    /** sessionID is a KSUID */
+    sessionID: string;
+    tokens: AuthTokenResponse;
+    user: DiscordUser;
+    guilds: GuildSlug[];
+};

packages/types/User.ts

@@ -0,0 +1,18 @@
+export type DiscordUser = {
+    id: string;
+    username: string;
+    discriminator: string;
+    avatar: string;
+    bot: boolean;
+};
+
+export type Member = {
+    guildid?: string;
+    roles: string[];
+    nick?: string;
+    user?: DiscordUser;
+};
+
+export type RoleypolyUser = {
+    discorduser: DiscordUser;
+};

packages/types/demoData.ts

@@ -0,0 +1,58 @@
+import { Role } from '.';
+
+export const demoData: Role[] = [
+    {
+        id: '557812805546541066',
+        name: 'a cute role ♡',
+        color: 0xd19494,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+    {
+        id: '557812901717737472',
+        name: 'a vanity role ♡',
+        color: 0xd1d194,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+    {
+        id: '557812915386843170',
+        name: 'a brave role ♡',
+        color: 0x94d194,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+    {
+        id: '557824893241131029',
+        name: 'a proud role ♡',
+        color: 0x94d1d1,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+    {
+        id: '557824994269200384',
+        name: 'a wonderful role ♡',
+        color: 0x9494d1,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+    {
+        id: '557825026406088717',
+        name: 'a 日本語 role ♡',
+        color: 0xd194d1,
+        permissions: '0',
+        safety: 0,
+        managed: false,
+        position: 0,
+    },
+];

packages/types/index.ts

@@ -0,0 +1,5 @@
+export * from './Category';
+export * from './Guild';
+export * from './Role';
+export * from './Session';
+export * from './User';

packages/types/package.json

@@ -0,0 +1,4 @@
+{
+    "name": "@roleypoly/types",
+    "version": "0.1.0"
+}

packages/web/package.json

@@ -10,6 +10,7 @@
     "dependencies": {
         "@reach/router": "^1.3.4",
         "@roleypoly/design-system": "*",
+        "@roleypoly/types": "*",
         "@testing-library/jest-dom": "^5.11.9",
         "@testing-library/react": "^11.2.5",
         "@testing-library/user-event": "^12.8.3",