Upgrade Grats and adopt new patterns

Summary:

Test Plan:

packages/skin-database/api/graphql/ModernSkinsConnection.ts

@@ -3,7 +3,6 @@ import SkinModel from "../../data/SkinModel";
 import { knex } from "../../db";
 import ModernSkinResolver from "./resolvers/ModernSkinResolver";
 import { Ctx } from ".";
-import { Query } from "./resolvers/QueryResolver";
 
 /**
  * A collection of "modern" Winamp skins
@@ -44,16 +43,10 @@ export default class ModernSkinsConnection {
 
 /**
  * All modern skins in the database
- * @gqlField */
+ * @gqlQueryField */
 export async function modern_skins(
-  _: Query,
-  {
-    first = 10,
-    offset = 0,
-  }: {
-    first?: Int;
-    offset?: Int;
-  }
+  first: Int = 10,
+  offset: Int = 0
 ): Promise<ModernSkinsConnection> {
   if (first > 1000) {
     throw new Error("Maximum limit is 1000");

packages/skin-database/api/graphql/SkinsConnection.ts

@@ -6,7 +6,6 @@ import LRU from "lru-cache";
 import { Int } from "grats";
 import { ISkin } from "./resolvers/CommonSkinResolver";
 import { Ctx } from ".";
-import { Query } from "./resolvers/QueryResolver";
 
 const options = {
   max: 100,
@@ -171,21 +170,18 @@ Only the skins that have been tweeted
  * All classic skins in the database
  *
  * **Note:** We don't currently support combining sorting and filtering.
- * @gqlField */
-export function skins(
-  _: Query,
-  {
-    first = 10,
-    offset = 0,
-    sort,
-    filter,
-  }: {
-    first?: Int;
-    offset?: Int;
-    sort?: SkinsSortOption | null;
-    filter?: SkinsFilterOption | null;
-  }
-): SkinsConnection {
+ * @gqlQueryField */
+export function skins({
+  first = 10,
+  offset = 0,
+  sort,
+  filter,
+}: {
+  first?: Int;
+  offset?: Int;
+  sort?: SkinsSortOption | null;
+  filter?: SkinsFilterOption | null;
+}): SkinsConnection {
   if (first > 1000) {
     throw new Error("Maximum limit is 1000");
   }

packages/skin-database/api/graphql/TweetsConnection.ts

@@ -1,7 +1,6 @@
 import { Int } from "grats";
 import TweetModel from "../../data/TweetModel";
 import { knex } from "../../db";
-import { Query } from "./resolvers/QueryResolver";
 
 /** @gqlEnum */
 export type TweetsSortOption = "LIKES" | "RETWEETS";
@@ -51,20 +50,17 @@ export default class TweetsConnection {
 
 /**
  * Tweets tweeted by @winampskins
- * @gqlField
+ * @gqlQueryField
  */
-export async function tweets(
-  _: Query,
-  {
-    first = 10,
-    offset = 0,
-    sort,
-  }: {
-    first?: Int;
-    offset?: Int;
-    sort?: TweetsSortOption | null;
-  }
-): Promise<TweetsConnection> {
+export async function tweets({
+  first = 10,
+  offset = 0,
+  sort,
+}: {
+  first?: Int;
+  offset?: Int;
+  sort?: TweetsSortOption | null;
+}): Promise<TweetsConnection> {
   if (first > 1000) {
     throw new Error("Maximum limit is 1000");
   }

packages/skin-database/api/graphql/resolvers/DatabaseStatisticsResolver.ts

@@ -1,6 +1,5 @@
 import { Int } from "grats";
 import * as Skins from "../../../data/skins";
-import { Query } from "./QueryResolver";
 
 /**
  * Statistics about the contents of the Museum's database.
@@ -92,7 +91,7 @@ export default class DatabaseStatisticsResolver {
 
 /**
  * A namespace for statistics about the database
- * @gqlField */
-export function statistics(_: Query): DatabaseStatisticsResolver {
+ * @gqlQueryField */
+export function statistics(): DatabaseStatisticsResolver {
   return new DatabaseStatisticsResolver();
 }

packages/skin-database/api/graphql/resolvers/FeedbackMutation.ts

@@ -1,17 +1,13 @@
 import { Ctx } from "..";
-import { Mutation } from "./MutationResolver";
 
 /**
  * Send a message to the admin of the site. Currently this appears in Discord.
- * @gqlField */
+ * @gqlMutationField */
 export async function send_feedback(
-  _: Mutation,
-  {
-    message,
-    email,
-    url,
-  }: { message: string; email?: string | null; url?: string | null },
-  req: Ctx
+  req: Ctx,
+  message: string,
+  email?: string | null,
+  url?: string | null
 ): Promise<boolean> {
   req.notify({
     type: "GOT_FEEDBACK",

packages/skin-database/api/graphql/resolvers/NodeResolver.ts

@@ -34,13 +34,9 @@ export function fromId(base64Id: string): { graphqlType: string; id: string } {
  * Get a globally unique object by its ID.
  *
  * https://graphql.org/learn/global-object-identification/
- * @gqlField
+ * @gqlQueryField
  */
-export async function node(
-  _: Query,
-  { id }: { id: ID },
-  { ctx }: Ctx
-): Promise<NodeResolver | null> {
+export async function node(id: ID, { ctx }: Ctx): Promise<NodeResolver | null> {
   const { graphqlType, id: localId } = fromId(id);
   // TODO Use typeResolver
   switch (graphqlType) {

packages/skin-database/api/graphql/resolvers/ReviewMutations.ts

@@ -1,7 +1,6 @@
 import SkinModel from "../../../data/SkinModel";
 import * as Skins from "../../../data/skins";
 import { Ctx } from "..";
-import { Mutation } from "./MutationResolver";
 
 function requireAuthed(handler) {
   return (args, req: Ctx) => {
@@ -17,12 +16,8 @@ function requireAuthed(handler) {
  * Reject skin for tweeting
  *
  * **Note:** Requires being logged in
- * @gqlField */
-export function reject_skin(
-  _: Mutation,
-  md5: string,
-  req: Ctx
-): Promise<boolean> {
+ * @gqlMutationField */
+export function reject_skin(md5: string, req: Ctx): Promise<boolean> {
   return _reject_skin(md5, req);
 }
 
@@ -41,12 +36,8 @@ const _reject_skin = requireAuthed(async (md5: string, req: Ctx) => {
  * Approve skin for tweeting
  *
  * **Note:** Requires being logged in
- * @gqlField */
-export function approve_skin(
-  _: Mutation,
-  md5: string,
-  req: Ctx
-): Promise<boolean> {
+ * @gqlMutationField */
+export function approve_skin(md5: string, req: Ctx): Promise<boolean> {
   return _approve_skin(md5, req);
 }
 
@@ -65,12 +56,8 @@ const _approve_skin = requireAuthed(async (md5: string, req: Ctx) => {
  * Mark a skin as NSFW
  *
  * **Note:** Requires being logged in
- * @gqlField */
-export function mark_skin_nsfw(
-  _: Mutation,
-  md5: string,
-  req: Ctx
-): Promise<boolean> {
+ * @gqlMutationField */
+export function mark_skin_nsfw(md5: string, req: Ctx): Promise<boolean> {
   return _mark_skin_nsfw(md5, req);
 }
 
@@ -89,10 +76,9 @@ const _mark_skin_nsfw = requireAuthed(async (md5: string, req: Ctx) => {
  * Request that an admin check if this skin is NSFW.
  * Unlike other review mutation endpoints, this one does not require being logged
  * in.
- * @gqlField */
+ * @gqlMutationField */
 export async function request_nsfw_review_for_skin(
-  _: Mutation,
-  { md5 }: { md5: string },
+  md5: string,
   req: Ctx
 ): Promise<boolean> {
   req.log(`Reporting skin with hash "${md5}"`);

packages/skin-database/api/graphql/resolvers/SkinResolver.ts

@@ -5,7 +5,6 @@ import UserContext from "../../../data/UserContext";
 import ClassicSkinResolver from "./ClassicSkinResolver";
 import { ISkin } from "./CommonSkinResolver";
 import ModernSkinResolver from "./ModernSkinResolver";
-import { Query } from "./QueryResolver";
 import algoliasearch from "algoliasearch";
 import * as Skins from "../../../data/skins";
 
@@ -35,11 +34,10 @@ export default class SkinResolver {
 
 /**
  * Get a skin by its MD5 hash
- * @gqlField
+ * @gqlQueryField
  */
 export async function fetch_skin_by_md5(
-  _: Query,
-  { md5 }: { md5: string },
+  md5: string,
   { ctx }: Ctx
 ): Promise<ISkin | null> {
   const skin = await SkinModel.fromMd5(ctx, md5);
@@ -53,10 +51,9 @@ export async function fetch_skin_by_md5(
  * Search the database using the Algolia search index used by the Museum.
  *
  * Useful for locating a particular skin.
- * @gqlField
+ * @gqlQueryField
  */
 export async function search_skins(
-  _: Query,
   {
     query,
     first = 10,
@@ -83,11 +80,8 @@ export async function search_skins(
 }
 /**
  * A random skin that needs to be reviewed
- * @gqlField */
-export async function skin_to_review(
-  _: Query,
-  { ctx }: Ctx
-): Promise<ISkin | null> {
+ * @gqlQueryField */
+export async function skin_to_review({ ctx }: Ctx): Promise<ISkin | null> {
   if (!ctx.authed()) {
     return null;
   }

packages/skin-database/api/graphql/resolvers/SkinUpload.ts

@@ -3,16 +3,14 @@ import SkinModel from "../../../data/SkinModel";
 import UserContext from "../../../data/UserContext";
 import { knex } from "../../../db";
 import { ISkin } from "./CommonSkinResolver";
-import { Query } from "./QueryResolver";
 import SkinResolver from "./SkinResolver";
 
 /**
  * Get the status of a batch of uploads by md5s
- * @gqlField
+ * @gqlQueryField
  * @deprecated Prefer `upload_statuses` instead, were we operate on ids.
  */
 export async function upload_statuses_by_md5(
-  _: Query,
   { md5s }: { md5s: string[] },
   { ctx }: Ctx
 ): Promise<Array<SkinUpload | null>> {
@@ -21,10 +19,9 @@ export async function upload_statuses_by_md5(
 
 /**
  * Get the status of a batch of uploads by ids
- * @gqlField */
+ * @gqlQueryField */
 export async function upload_statuses(
-  _: Query,
-  { ids }: { ids: string[] },
+  ids: string[],
   { ctx }: Ctx
 ): Promise<Array<SkinUpload | null>> {
   return _upload_statuses({ keyName: "id", keys: ids }, ctx);

packages/skin-database/api/graphql/resolvers/UploadMutation.ts

@@ -4,7 +4,6 @@ import * as S3 from "../../../s3";
 import * as Skins from "../../../data/skins";
 import { processUserUploads } from "../../processUserUploads";
 import { Ctx } from "..";
-import { Mutation } from "./MutationResolver";
 
 // We don't use a resolver here, just return the value directly.
 /**
@@ -83,7 +82,7 @@ class UploadMutationResolver {
 
 /**
  * Mutations for the upload flow
- * @gqlField */
-export async function upload(_: Mutation): Promise<UploadMutationResolver> {
+ * @gqlMutationField */
+export async function upload(): Promise<UploadMutationResolver> {
   return new UploadMutationResolver();
 }

packages/skin-database/api/graphql/resolvers/UserResolver.ts

@@ -1,5 +1,4 @@
 import { Ctx } from "..";
-import { Query } from "./QueryResolver";
 
 /** @gqlType User */
 export default class UserResolver {
@@ -11,8 +10,8 @@ export default class UserResolver {
 
 /**
  * The currently authenticated user, if any.
- * @gqlField
+ * @gqlQueryField
  */
-export function me(_: Query): UserResolver | null {
+export function me(): UserResolver | null {
   return new UserResolver();
 }