fix: lint and file structure

Author: reconbot

.eslintrc.js

@@ -16,26 +16,22 @@ module.exports = {
     '@typescript-eslint',
   ],
   rules: {
-    indent: [
-      'error',
-      2,
-    ],
-    'linebreak-style': [
-      'error',
-      'unix',
-    ],
-    quotes: [
-      'error',
-      'single',
-    ],
-    semi: [
-      'error',
-      'never',
-    ],
+    indent: [ 'error', 2 ],
+    'linebreak-style': [ 'error', 'unix' ],
+    quotes: [ 'error', 'single' ],
+    semi: 'off',
+    '@typescript-eslint/semi': ['error', 'never'],
     'quote-props': ['error', 'as-needed'],
     'no-param-reassign': 'error',
     'comma-dangle': ['error', 'always-multiline'],
     'space-infix-ops': ['error'],
     'no-multi-spaces': ['error'],
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    '@typescript-eslint/member-delimiter-style': ['error', {
+      multiline: { delimiter: 'none' },
+      singleline: { delimiter: 'comma', requireLast: false },
+      multilineDetection: 'last-member',
+    }],
   },
 }

lib/gateway.ts

@@ -5,13 +5,11 @@ import {
   ServerClosure,
   WebsocketResponse,
 } from './types'
-import {
-  complete,
-  connection_init,
-  subscribe,
-  disconnect,
-  ping,
-} from './messages'
+import { disconnect } from './messages/disconnect'
+import { ping } from './messages/ping'
+import { complete } from './messages/complete'
+import { subscribe } from './messages/subscribe'
+import { connection_init } from './messages/connection_init'
 import { pong } from './messages/pong'
 
 export const handleGatewayEvent =

lib/index.ts

@@ -1,9 +1,11 @@
 import { DataMapper } from '@aws/dynamodb-data-mapper'
 import { ServerArgs } from './types'
 import { publish } from './pubsub/publish'
-import { createModel, Connection, Subscription } from './model'
+import { createModel } from './model/createModel'
+import { Subscription } from './model/Subscription'
 import { handleGatewayEvent } from './gateway'
 import { handleStateMachineEvent } from './stepFunctionHandler'
+import { Connection } from './model/Connection'
 
 export const createInstance = (opts: ServerArgs) => {
   const closure = {
@@ -29,8 +31,9 @@ export const createInstance = (opts: ServerArgs) => {
   }
 }
 
-export { prepareResolvers } from './utils'
+export { prepareResolvers } from './utils/graphql'
 export * from './pubsub/subscribe'
 
 export * from './types'
-export { Subscription, Connection } from './model'
+export { Subscription } from './model/Subscription'
+export { Connection } from './model/Connection'

lib/messages/complete.ts

@@ -1,20 +1,16 @@
 import { parse } from 'graphql'
 import { CompleteMessage } from 'graphql-ws'
 import { buildExecutionContext } from 'graphql/execution/execute'
-import {
-  constructContext,
-  deleteConnection,
-  getResolverAndArgs,
-  promisify,
-} from '../utils'
+import { deleteConnection } from '../utils/aws'
+import { constructContext, getResolverAndArgs } from '../utils/graphql'
 import { MessageHandler } from './types'
 
 /** Handler function for 'complete' message. */
 export const complete: MessageHandler<CompleteMessage> =
   (c) =>
     async ({ event, message }) => {
       try {
-        await promisify(() => c.onComplete?.({ event, message }))
+        await c.onComplete?.({ event, message })
 
         const topicSubscriptions = await c.mapper.query(c.model.Subscription, {
           id: `${event.requestContext.connectionId!}|${message.id}`,
@@ -57,7 +53,7 @@ export const complete: MessageHandler<CompleteMessage> =
 
         await Promise.all(deletions)
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event, message }))
+        await c.onError?.(err, { event, message })
         await deleteConnection(c)(event.requestContext)
       }
     }

lib/messages/connection_init.ts

@@ -1,8 +1,7 @@
 import { StepFunctions } from 'aws-sdk'
 import { ConnectionInitMessage, MessageType } from 'graphql-ws'
-import { assign } from '../model'
 import { StateFunctionInput } from '../types'
-import { sendMessage, deleteConnection, promisify } from '../utils'
+import { deleteConnection, sendMessage } from '../utils/aws'
 import { MessageHandler } from './types'
 
 /** Handler function for 'connection_init' message. */
@@ -11,7 +10,7 @@ export const connection_init: MessageHandler<ConnectionInitMessage> =
     async ({ event, message }) => {
       try {
         const res = c.onConnectionInit
-          ? await promisify(() => c.onConnectionInit!({ event, message }))
+          ? await c.onConnectionInit({ event, message })
           : message.payload
 
         if (c.pingpong) {
@@ -32,7 +31,7 @@ export const connection_init: MessageHandler<ConnectionInitMessage> =
         }
 
         // Write to persistence
-        const connection = assign(new c.model.Connection(), {
+        const connection = Object.assign(new c.model.Connection(), {
           id: event.requestContext.connectionId!,
           requestContext: event.requestContext,
           payload: res,
@@ -43,7 +42,7 @@ export const connection_init: MessageHandler<ConnectionInitMessage> =
           message: { type: MessageType.ConnectionAck },
         })
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event, message }))
+        await c.onError?.(err, { event, message })
         await deleteConnection(c)(event.requestContext)
       }
     }

lib/messages/disconnect.ts

@@ -1,16 +1,15 @@
 import { parse } from 'graphql'
 import { equals } from '@aws/dynamodb-expressions'
 import { buildExecutionContext } from 'graphql/execution/execute'
-import { constructContext, getResolverAndArgs, promisify } from '../utils'
 import { MessageHandler } from './types'
-import { assign } from '../model'
+import { constructContext, getResolverAndArgs } from '../utils/graphql'
 
 /** Handler function for 'disconnect' message. */
 export const disconnect: MessageHandler<null> =
   (c) =>
     async ({ event }) => {
       try {
-        await promisify(() => c.onDisconnect?.({ event }))
+        await c.onDisconnect?.({ event })
 
         const entities = await c.mapper.query(
           c.model.Subscription,
@@ -63,12 +62,12 @@ export const disconnect: MessageHandler<null> =
           ...deletions,
           // Delete connection
           c.mapper.delete(
-            assign(new c.model.Connection(), {
+            Object.assign(new c.model.Connection(), {
               id: event.requestContext.connectionId!,
             }),
           ),
         ])
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event }))
+        await c.onError?.(err, { event })
       }
     }

lib/messages/index.ts

@@ -1,19 +1,19 @@
 import { PingMessage, MessageType } from 'graphql-ws'
-import { sendMessage, deleteConnection, promisify } from '../utils'
+import { deleteConnection, sendMessage } from '../utils/aws'
 import { MessageHandler } from './types'
 
 /** Handler function for 'ping' message. */
 export const ping: MessageHandler<PingMessage> =
   (c) =>
     async ({ event, message }) => {
       try {
-        await promisify(() => c.onPing?.({ event, message }))
+        await c.onPing?.({ event, message })
         return sendMessage(c)({
           ...event.requestContext,
           message: { type: MessageType.Pong },
         })
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event, message }))
+        await c.onError?.(err, { event, message })
         await deleteConnection(c)(event.requestContext)
       }
     }

lib/messages/ping.ts

@@ -1,16 +1,15 @@
-import { MessageType, PongMessage } from 'graphql-ws'
-import { assign } from '../model'
-import { sendMessage, deleteConnection, promisify } from '../utils'
+import { PongMessage } from 'graphql-ws'
+import { deleteConnection } from '../utils/aws'
 import { MessageHandler } from './types'
 
 /** Handler function for 'pong' message. */
 export const pong: MessageHandler<PongMessage> =
   (c) =>
     async ({ event, message }) => {
       try {
-        await promisify(() => c.onPong?.({ event, message }))
+        await c.onPong?.({ event, message })
         await c.mapper.update(
-          assign(new c.model.Connection(), {
+          Object.assign(new c.model.Connection(), {
             id: event.requestContext.connectionId!,
             hasPonged: true,
           }),
@@ -19,7 +18,7 @@ export const pong: MessageHandler<PongMessage> =
           },
         )
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event, message }))
+        await c.onError?.(err, { event, message })
         await deleteConnection(c)(event.requestContext)
       }
     }

lib/messages/pong.ts

@@ -6,15 +6,9 @@ import {
   execute,
 } from 'graphql/execution/execute'
 import { MessageHandler } from './types'
-import {
-  constructContext,
-  deleteConnection,
-  getResolverAndArgs,
-  promisify,
-  sendMessage,
-} from '../utils'
-import { assign } from '../model'
 import { ServerClosure, SubscribeHandler } from '../types'
+import { constructContext, getResolverAndArgs } from '../utils/graphql'
+import { deleteConnection, sendMessage } from '../utils/aws'
 
 /** Handler function for 'subscribe' message. */
 export const subscribe: MessageHandler<SubscribeMessage> =
@@ -23,11 +17,11 @@ export const subscribe: MessageHandler<SubscribeMessage> =
       try {
         const [connection] = await Promise.all([
           await c.mapper.get(
-            assign(new c.model.Connection(), {
+            Object.assign(new c.model.Connection(), {
               id: event.requestContext.connectionId!,
             }),
           ),
-          await promisify(() => c.onSubscribe?.({ event, message })),
+          await c.onSubscribe?.({ event, message }),
         ])
         const connectionParams = connection.payload || {}
 
@@ -112,7 +106,7 @@ export const subscribe: MessageHandler<SubscribeMessage> =
         ).definitions // Access subscribe instance
         await Promise.all(
           topicDefinitions.map(async ({ topic, filter }) => {
-            const subscription = assign(new c.model.Subscription(), {
+            const subscription = Object.assign(new c.model.Subscription(), {
               id: `${event.requestContext.connectionId}|${message.id}`,
               topic,
               filter: filter || {},
@@ -130,7 +124,7 @@ export const subscribe: MessageHandler<SubscribeMessage> =
           }),
         )
       } catch (err) {
-        await promisify(() => c.onError?.(err, { event, message }))
+        await c.onError?.(err, { event, message })
         await deleteConnection(c)(event.requestContext)
       }
     }