Types: Consistent type imports

backend/src/data/models/app.ts

@@ -2,7 +2,7 @@ import { Document, model, Schema } from 'mongoose';
 import { generateSnowflake } from '../snowflake-entity';
 
 import { createdAtToDate, generateUsername, useId } from '../../utils/utils';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 
 export interface ApplicationDocument extends Document, Entity.App {
   _id: string | never;

backend/src/data/models/guild-member.ts

@@ -1,5 +1,5 @@
 import { Document, model, Schema } from 'mongoose';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { useId } from '../../utils/utils';
 import validators from '../../utils/validators';
 import { generateSnowflake } from '../snowflake-entity';

backend/src/data/models/guild.ts

@@ -1,6 +1,6 @@
 import { Entity } from '@accord/types';
 import { Document, model, Schema } from 'mongoose';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { createdAtToDate, useId } from '../../utils/utils';
 import validators from '../../utils/validators';
 import { generateSnowflake } from '../snowflake-entity';

backend/src/data/models/invite.ts

@@ -1,5 +1,5 @@
 import { Document, model, Schema } from 'mongoose';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { useId } from '../../utils/utils';
 import generateInvite from '../utils/generate-invite';
 import { Entity, InviteTypes } from '@accord/types';

backend/src/data/models/message.ts

@@ -1,5 +1,5 @@
 import { Document, model, Schema } from 'mongoose';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { createdAtToDate, useId } from '../../utils/utils';
 import { generateSnowflake } from '../snowflake-entity';
 import { Entity, MessageTypes } from '@accord/types';

backend/src/data/models/role.ts

@@ -1,6 +1,6 @@
 import { Document, model, Schema } from 'mongoose';
-import patterns from '@accord/types/patterns';
-import { PermissionTypes } from '@accord/types/permissions';
+import { patterns } from '@accord/types';
+import { PermissionTypes } from '@accord/types';
 import { createdAtToDate, useId } from '../../utils/utils';
 import validators from '../../utils/validators';
 import { generateSnowflake } from '../snowflake-entity';

backend/src/data/models/theme.ts

@@ -1,5 +1,5 @@
 import { Entity } from '@accord/types';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { Document, model, Schema } from 'mongoose';
 import { useId } from '../../utils/utils';
 import { generateSnowflake } from '../snowflake-entity';

backend/src/data/models/user.ts

@@ -1,4 +1,4 @@
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { Entity, UserTypes } from '@accord/types';
 import { Document, model, Schema } from 'mongoose';
 import passportLocalMongoose from 'passport-local-mongoose';

backend/src/data/roles.ts

@@ -1,5 +1,5 @@
 import { UpdateQuery } from 'mongoose';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import DBWrapper from './db-wrapper';
 import { hasPermission, Role, RoleDocument } from './models/role';
 import { generateSnowflake } from './snowflake-entity';

backend/src/data/snowflake-entity.ts

@@ -1,5 +1,5 @@
 import cluster from 'cluster';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 
 let inc = 0;
 let lastSnowflake: string;

backend/src/rest/middleware/validate-has-permission.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import { GuildDocument } from '../../data/models/guild';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import { APIError } from '../modules/api-error';
 
 export default (permission: PermissionTypes.Permission) =>

backend/src/rest/routes/auth-routes.ts

@@ -2,7 +2,7 @@ import { Router } from 'express';
 import { SelfUserDocument, User } from '../../data/models/user';
 import passport from 'passport';
 import { APIError } from '../modules/api-error';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 import { extraRateLimit } from '../modules/rate-limiter';
 import { REST } from '@accord/types';
 

backend/src/rest/routes/guild-routes.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import { Guild } from '../../data/models/guild';
 import updateUser from '../middleware/update-user';
 import validateUser from '../middleware/validate-user';

backend/src/utils/validators.ts

@@ -1,5 +1,5 @@
 import { ChannelDocument } from '../data/models/channel';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 
 export default {
   cannotChangeIfProp: (prop: string, value: any, def?: any) => (val: string) => 

backend/src/ws/modules/session-manager.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 
 export class SessionManager extends Map<string, string> {
   public get(clientId: string): string {

backend/src/ws/modules/ws-guard.ts

@@ -1,6 +1,6 @@
 import { Guild } from '../../data/models/guild';
 import { Socket } from 'socket.io';
-import { PermissionTypes, getPermString } from '@accord/types/permissions';
+import { PermissionTypes, getPermString } from '@accord/types';
 
 export class WSGuard {
   public userId(client: Socket) {

backend/test/unit/models/role.test.ts

@@ -2,7 +2,7 @@ import { generateSnowflake } from '../../../src/data/snowflake-entity';
 import { test, given } from '@accord/ion';
 import { longString, mongooseError } from '../../test-utils';
 import { Role } from '../../../src/data/models/role';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 
 test(createRole, () => {
   given().expect(true);

backend/test/unit/other/snowflake-entity.test.ts

@@ -1,6 +1,6 @@
 import { test, given } from '@accord/ion';
 import { generateSnowflake, snowflakeToDate } from '../../../src/data/snowflake-entity';
-import patterns from '@accord/types/patterns';
+import { patterns } from '@accord/types';
 
 describe('snowflake-entity', () => {
   test(generateSnowflake, () => {

frontend/src/components/modals/channel-settings/perm-overrides.tsx

@@ -1,5 +1,5 @@
 import { ChannelTypes } from '@accord/types';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import usePerms from '../../../hooks/use-perms';

frontend/src/components/modals/channel-settings/perm-toggle.tsx

@@ -1,5 +1,5 @@
 import { ChannelTypes } from '@accord/types';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import { useDispatch, useSelector } from 'react-redux';
 import usePerms from '../../../hooks/use-perms';
 import { openSaveChanges } from '../../../store/ui';

frontend/src/components/modals/guild-settings/role-permissions.tsx

@@ -5,7 +5,7 @@ import { openSaveChanges } from '../../../store/ui';
 import NormalButton from '../../utils/buttons/normal-button';
 import Category from '../../utils/category';
 import Toggle from '../../inputs/toggle';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 
 export interface RolePermissionsProps {
   setRoleValue: UseFormSetValue<FieldValues>;

frontend/src/services/format-service.ts

@@ -1,4 +1,4 @@
-import defaultPatterns from '@accord/types/patterns';
+import { patterns as defaultPatterns } from '@accord/types';
 
 export class FormatService {
   private readonly patterns = {

frontend/src/services/perm-service.ts

@@ -1,5 +1,5 @@
 import { Entity } from '@accord/types';
-import { PermissionTypes } from '@accord/types/permissions';
+import { PermissionTypes } from '@accord/types';
 import { getChannel } from '../store/channels';
 import { getGuild, getGuildRoles } from '../store/guilds';
 import { getMember, getSelfMember } from '../store/members';

frontend/src/types/main.ts

@@ -1,5 +1,7 @@
 export * from './auth.types';
 export * from './entity.types';
+export * from './patterns.types';
+export * from './permissions.types';
 export * from './rest.types';
 export * from './util.types';
 export * from './ws.types';

frontend/src/types/patterns.types.ts

@@ -1,4 +1,4 @@
-export default {
+export const patterns = {
   email: /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/,
   hexColor: /^#(?:[0-9a-fA-F]{3}){1,2}$/,
   password: /(?=.*[a-zA-Z0-9!@#$%^&*])/,