flowtyped everything, some functional, safety, and structural changes

models/Server.js

@@ -1,4 +1,22 @@
-module.exports = (sql, DataTypes) => {
+// @flow
+import type Sequelize, { DataTypes as DT } from 'sequelize'
+
+export type Category = {
+  hidden: boolean,
+  name: string,
+  roles: string[],
+  type: 'single' | 'multi' | string
+}
+
+export type ServerModel = {
+  id: string,
+  categories: {
+    [uuid: string]: Category
+  },
+  message: string
+}
+
+export default (sql: Sequelize, DataTypes: DT) => {
   return sql.define('server', {
     id: { // discord snowflake
       type: DataTypes.TEXT,

models/index.js

@@ -1,10 +1,20 @@
-const log = new (require('../logger'))('models/index')
-const glob = require('glob')
-const path = require('path')
-// const util = require('../util/model-methods')
+// @flow
+import logger from '../logger'
+import glob from 'glob'
+import path from 'path'
+import type Sequelize, { Model } from 'sequelize'
 
-module.exports = (sql) => {
-  const models = {}
+const log = logger(__filename)
+
+export type Models = {
+  [modelName: string]: Model<any> & {
+    __associations: (models: Models) => void,
+    __instanceMethods: (model: Model<any>) => void,
+  }
+}
+
+export default (sql: Sequelize): Models => {
+  const models: Models = {}
   const modelFiles = glob.sync('./models/**/!(index).js')
   log.debug('found models', modelFiles)