remove more return awaits in non ts/ paths (#1608)

examples/ent-rsvp/backend/src/ent/event/actions/create_event_action.ts

@@ -25,7 +25,7 @@ export default class CreateEventAction extends CreateEventActionBase {
             return;
           }
 
-          return await Promise.all(
+          return Promise.all(
             input.activities.map(async (activity) => {
               return CreateEventActivityAction.create(builder.viewer, {
                 eventID: builder,

examples/ent-rsvp/backend/src/ent/event_activity/actions/create_event_activity_action.ts

@@ -25,7 +25,7 @@ export default class CreateEventActivityAction extends CreateEventActivityAction
           if (!this.input.address) {
             return;
           }
-          return await CreateAddressAction.create(builder.viewer, {
+          return CreateAddressAction.create(builder.viewer, {
             ...this.input.address,
             ownerID: builder,
             ownerType: NodeType.EventActivity,

examples/ent-rsvp/backend/src/ent/event_activity/actions/edit_event_activity_rsvp_status_action.ts

@@ -67,7 +67,7 @@ export default class EditEventActivityRsvpStatusAction extends EditEventActivity
             EdgeType.EventActivityToAttending,
             WriteOperation.Insert,
           );
-          return await Promise.all(
+          return Promise.all(
             edges.map(async (edge) => {
               if (edge.isBuilder(edge.id)) {
                 throw new Error("edge should not be a builder");

examples/ent-rsvp/backend/src/ent/guest_group/actions/create_guest_group_action.ts

@@ -42,7 +42,7 @@ export default class CreateGuestGroupAction extends CreateGuestGroupActionBase {
             (activity) => activity.inviteAllGuests,
           );
 
-          return await Promise.all(
+          return Promise.all(
             activities.map((activity) =>
               EventActivityAddInviteAction.create(builder.viewer, activity)
                 .addInviteID(builder)
@@ -57,7 +57,7 @@ export default class CreateGuestGroupAction extends CreateGuestGroupActionBase {
             return;
           }
 
-          return await Promise.all(
+          return Promise.all(
             input.guests.map(async (guest) => {
               return CreateGuestAction.create(builder.viewer, {
                 eventID: input.eventID,

examples/ent-rsvp/backend/src/graphql/resolvers/event.ts

@@ -37,6 +37,6 @@ export class EventResolver {
     ],
   })
   async event(context: RequestContext, slug: string) {
-    return await Event.loadFromSlug(context.getViewer(), slug);
+    return Event.loadFromSlug(context.getViewer(), slug);
   }
 }

examples/ent-rsvp/backend/src/testutils/index.ts

@@ -56,7 +56,7 @@ export async function createActivity(
     eventID = event.id;
   }
 
-  return await CreateEventActivityAction.create(event.viewer, {
+  return CreateEventActivityAction.create(event.viewer, {
     startTime: new Date(),
     location: "fun location",
     name: "welcome dinner",
@@ -142,7 +142,7 @@ export async function createGuests(
   group: GuestGroup,
   idx: number,
 ): Promise<Guest[]> {
-  return await Promise.all(
+  return Promise.all(
     inputs[idx].map(async (input) => {
       return CreateGuestAction.create(group.viewer, {
         ...input,

examples/ent-rsvp/ent-rsvp-web/src/initRelayEnvironment.ts

@@ -61,7 +61,7 @@ async function fetchQuery(operation, variables) {
       process.env.NEXT_PUBLIC_RELAY_ENDPOINT,
       fetchOptions,
     );
-    return await response.json();
+    return response.json();
   } catch (err) {
     console.log("errrrrorrrrr");
     console.error(err);

examples/simple/src/ent/tests/contact.test.ts

@@ -15,7 +15,7 @@ import { Transaction } from "@snowtop/ent/action";
 const loggedOutViewer = new LoggedOutExampleViewer();
 
 async function createUser(): Promise<User> {
-  return await CreateUserAction.create(loggedOutViewer, {
+  return CreateUserAction.create(loggedOutViewer, {
     firstName: "Jon",
     lastName: "Snow",
     emailAddress: randomEmail(),
@@ -29,7 +29,7 @@ async function create(
   firstName: string,
   lastName: string,
 ): Promise<Contact> {
-  return await CreateContactAction.create(new ExampleViewer(user.id), {
+  return CreateContactAction.create(new ExampleViewer(user.id), {
     emails: [
       {
         emailAddress: randomEmail(),

examples/simple/src/ent/tests/event.test.ts

@@ -13,7 +13,7 @@ import { ID, query } from "@snowtop/ent";
 const loggedOutViewer = new LoggedOutExampleViewer();
 
 async function createUser() {
-  return await CreateUserAction.create(loggedOutViewer, {
+  return CreateUserAction.create(loggedOutViewer, {
     firstName: "Jon",
     lastName: "Snow",
     emailAddress: randomEmail(),
@@ -28,7 +28,7 @@ async function create(
 ): Promise<Event> {
   let user = await createUser();
 
-  return await CreateEventAction.create(loggedOutViewer, {
+  return CreateEventAction.create(loggedOutViewer, {
     name: "fun event",
     creatorID: user.id,
     startTime: startTime,

examples/simple/src/ent/tests/user.test.ts

@@ -59,7 +59,7 @@ async function create(opts: Partial<UserCreateInput>): Promise<User> {
     phoneNumber: randomPhoneNumber(),
     ...opts,
   };
-  return await CreateUserAction.create(loggedOutViewer, input).saveX();
+  return CreateUserAction.create(loggedOutViewer, input).saveX();
 }
 
 class OmniViewer extends ExampleViewer {

examples/simple/src/ent/tests/user_full_text.test.ts

@@ -128,7 +128,7 @@ async function create(opts: Partial<UserCreateInput>): Promise<User> {
     phoneNumber: randomPhoneNumber(),
     ...opts,
   };
-  return await CreateUserAction.create(loggedOutViewer, input).saveX();
+  return CreateUserAction.create(loggedOutViewer, input).saveX();
 }
 
 test("baratheon", async () => {

examples/simple/src/ent/tests/user_query.test.ts

@@ -18,7 +18,7 @@ async function create(opts: Partial<UserCreateInput>): Promise<User> {
     password: "pa$$w0rd",
     ...opts,
   };
-  return await CreateUserAction.create(loggedOutViewer, input).saveX();
+  return CreateUserAction.create(loggedOutViewer, input).saveX();
 }
 
 test("self contact query", async () => {

examples/simple/src/ent/user/actions/confirm_edit_email_address_action.ts

@@ -70,7 +70,7 @@ export default class ConfirmEditEmailAddressAction extends ConfirmEditEmailAddre
             );
           }
           // delete the authCode
-          return await DeleteAuthCodeAction.create(
+          return DeleteAuthCodeAction.create(
             builder.viewer,
             authCode,
           ).changeset();

examples/simple/src/ent/user/actions/confirm_edit_phone_number_action.ts

@@ -69,7 +69,7 @@ export default class ConfirmEditPhoneNumberAction extends ConfirmEditPhoneNumber
             );
           }
           // delete the authCode
-          return await DeleteAuthCodeAction.create(
+          return DeleteAuthCodeAction.create(
             builder.viewer,
             authCode,
           ).changeset();

examples/simple/src/graphql/mutations/tests/user_mutations.test.ts

@@ -24,7 +24,7 @@ async function create(opts: Partial<UserCreateInput>): Promise<User> {
     phoneNumber: randomPhoneNumber(),
     ...opts,
   };
-  return await CreateUserAction.create(loggedOutViewer, input).saveX();
+  return CreateUserAction.create(loggedOutViewer, input).saveX();
 }
 
 function getConfig(

examples/simple/src/graphql/tests/contact_type.test.ts

@@ -60,7 +60,7 @@ function getUserConfig(
 }
 
 async function createUser(): Promise<User> {
-  return await CreateUserAction.create(loggedOutViewer, {
+  return CreateUserAction.create(loggedOutViewer, {
     firstName: "Jon",
     lastName: "Snow",
     emailAddress: randomEmail(),
@@ -84,7 +84,7 @@ async function createContact(user?: User): Promise<Contact> {
     userID: user.id,
   }).saveX();
   // reload
-  return await Contact.loadX(contact.viewer, contact.id);
+  return Contact.loadX(contact.viewer, contact.id);
 }
 
 test("query contact", async () => {

examples/simple/src/graphql/tests/event_type.test.ts

@@ -61,7 +61,7 @@ async function createEvent(options: Partial<EventCreateInput>): Promise<Event> {
   const user = await createUser();
 
   let vc = new ExampleViewer(user.id);
-  return await CreateEventAction.create(vc, {
+  return CreateEventAction.create(vc, {
     name: "event",
     creatorID: user.id,
     startTime: new Date(),

examples/simple/src/graphql/tests/user_auth.test.ts

@@ -37,7 +37,7 @@ function getUserRootConfig(
 
 const loggedOutViewer = new LoggedOutExampleViewer();
 async function createUser(input?: Partial<UserCreateInput>): Promise<User> {
-  return await CreateUserAction.create(loggedOutViewer, {
+  return CreateUserAction.create(loggedOutViewer, {
     firstName: "first",
     lastName: "last",
     emailAddress: randomEmail(),

examples/simple/src/graphql/tests/user_auth_jwt.test.ts

@@ -39,7 +39,7 @@ function getUserRootConfig(
 
 const loggedOutViewer = new LoggedOutExampleViewer();
 async function createUser(input?: Partial<UserCreateInput>): Promise<User> {
-  return await CreateUserAction.create(loggedOutViewer, {
+  return CreateUserAction.create(loggedOutViewer, {
     firstName: "first",
     lastName: "last",
     emailAddress: randomEmail(),

examples/simple/src/graphql/tests/user_type.test.ts

@@ -53,7 +53,7 @@ async function create(opts: Partial<UserCreateInput>): Promise<User> {
     password: "pa$$w0rd",
     ...opts,
   };
-  return await CreateUserAction.create(loggedOutViewer, input).saveX();
+  return CreateUserAction.create(loggedOutViewer, input).saveX();
 }
 
 function getNodeConfig(

examples/todo-sqlite/src/graphql/mutations/todo/todo_resolver.ts

@@ -41,7 +41,7 @@ export class TodosResolver {
         ChangeTodoStatusAction.create(vc, todo, { completed: completed }),
       ),
     );
-    return await bulk.saveX();
+    return bulk.saveX();
   }
 
   @gqlMutation({
@@ -72,6 +72,6 @@ export class TodosResolver {
       AccountBuilder,
       ...completedTodos.map((todo) => DeleteTodoAction.create(vc, todo)),
     );
-    return await bulk.saveX();
+    return bulk.saveX();
   }
 }

examples/todo-sqlite/src/graphql/resolvers/todos_resolver.ts

@@ -54,7 +54,7 @@ export class TodoResolver {
   })
   async openTodosPlural(id: ID): Promise<Todo[]> {
     const viewer = new IDViewer(id);
-    return await Todo.loadCustom(
+    return Todo.loadCustom(
       viewer,
       query.And(query.Eq("assignee_id", id), query.Eq("completed", false)),
     );

ts/packages/ent-graphql-tests/src/index.ts

@@ -344,7 +344,7 @@ export async function expectQueryFromRoot(
   config: queryRootConfig,
   ...options: Option[] // TODO queries? expected values
 ): Promise<supertest.SuperTest<supertest.Test>> {
-  return await expectFromRoot(
+  return expectFromRoot(
     {
       ...config,
       queryPrefix: "query",
@@ -375,7 +375,7 @@ export async function expectMutation(
     };
   }
 
-  return await expectFromRoot(
+  return expectFromRoot(
     {
       ...config,
       args: args,

ts/packages/ent-passport/src/passport.test.ts

@@ -124,7 +124,7 @@ let viewerType = new GraphQLObjectType({
       async resolve(_source, args, context) {
         const v = context.getViewer() as IDViewer;
 
-        return await v.viewer();
+        return v.viewer();
       },
     },
   },
@@ -196,7 +196,7 @@ const authUserSessionType: GraphQLFieldConfig<
   },
   type: new GraphQLNonNull(viewerType),
   async resolve(_source, args, context) {
-    return await useAndVerifyAuth(
+    return useAndVerifyAuth(
       context,
       async () => {
         const row = await loadRow({
@@ -263,7 +263,7 @@ interface User {
 }
 
 async function createUser(opts?: Partial<User>) {
-  return await createRowForTest(
+  return createRowForTest(
     {
       tableName: "users",
       fields: {

ts/packages/ent-passport/src/passport.ts

@@ -82,7 +82,7 @@ export class PassportAuthHandler implements AuthHandler {
       return null;
     }
     let userr = await user;
-    return await toViewer(context, userr, this.options?.userToViewer);
+    return toViewer(context, userr, this.options?.userToViewer);
   }
 
   static testInitSessionBasedFunction(
@@ -111,7 +111,7 @@ async function toViewer(
     return obj;
   }
   if (userToViewer) {
-    return await userToViewer(context, obj);
+    return userToViewer(context, obj);
   }
 
   throw new Error("cannot convert to Viewer");
@@ -322,15 +322,11 @@ export async function useAndVerifyAuth(
       if (!viewerMaybe) {
         return null;
       }
-      return await toViewer(
-        context,
-        viewerMaybe,
-        defaultReqToViewer(loadOptions),
-      );
+      return toViewer(context, viewerMaybe, defaultReqToViewer(loadOptions));
     },
   });
 
-  return await useAndAuth(context, strategy, options);
+  return useAndAuth(context, strategy, options);
 }
 
 interface JWTOptions {

ts/packages/ent-password/src/password.ts

@@ -66,7 +66,7 @@ export class Password extends BaseField implements Field {
     val = this.stringType.format(val);
 
     let salt = await bcrypt.genSalt(this._cost);
-    return await bcrypt.hash(val, salt);
+    return bcrypt.hash(val, salt);
   }
 
   valid(val: any): boolean {