fix(reverts): revert a few changes that caused issues (#45)

* Revert "feat(app): rename app to server (#44)"

This reverts commit aa279f4.

* Revert "fix(generated): refactor generated files (#43)"

This reverts commit 533d838.

README.md

@@ -79,11 +79,11 @@ export class UserResolver extends BaseResolver<User> {
 
 import 'reflect-metadata';
 import { Container } from 'typedi';
-import { Server } from 'warthog';
+import { App } from 'warthog';
 
 async function bootstrap() {
-  const server = new Server({ container: Container });
-  return server.start();
+  const app = new App({ container: Container });
+  return app.start();
 }
 
 bootstrap()

examples/1-simple-model/src/index.ts

@@ -4,15 +4,15 @@ import { Container } from 'typedi';
 
 dotenv.config();
 
-import { Server } from '../../../src/';
+import { App } from '../../../src/';
 
 async function bootstrap() {
-  const server = new Server({
+  const app = new App({
     container: Container,
     warthogImportPath: '../../../src' // Path written in generated classes
   });
 
-  return server.start();
+  return app.start();
 }
 
 bootstrap().catch((error: Error) => {

examples/2-complex-example/package.json

@@ -7,7 +7,6 @@
     "db:create": "createdbjs $(dotenv -p TYPEORM_DATABASE) 2>&1 || :",
     "db:drop": "dropdbjs $(dotenv -p TYPEORM_DATABASE) 2>&1 || :",
     "db:seed:dev": "dotenv -- ts-node tools/seed.ts",
-    "generate:code": "dotenv -- ts-node tools/generate.ts",
     "lint": "tslint --fix -c ./tslint.json -p ./tsconfig.json",
     "playground:open": "open http://localhost:$(dotenv -p APP_PORT)/playground",
     "start": "yarn start:ts",

examples/2-complex-example/src/server.ts → examples/2-complex-example/src/app.ts

@@ -2,7 +2,7 @@ import 'reflect-metadata';
 
 import { Container } from 'typedi';
 
-import { BaseContext, Server } from '../../../src/';
+import { App, BaseContext } from '../../../src/';
 
 // import { User } from './modules/user/user.model';
 
@@ -14,8 +14,8 @@ interface Context extends BaseContext {
   };
 }
 
-export function getServer(AppOptions = {}, dbOptions = {}) {
-  return new Server<Context>(
+export function getApp(AppOptions = {}, dbOptions = {}) {
+  return new App<Context>(
     {
       container: Container,
       // Inject a fake user.  In a real app you'd parse a JWT to add the user

examples/2-complex-example/src/index.test.ts

@@ -3,18 +3,18 @@ import 'reflect-metadata';
 
 import { Binding } from '../generated/binding';
 
+import { getApp } from './app';
 import { User } from './modules/user/user.model';
-import { getServer } from './server';
 
-const server = getServer({}, { logging: false });
+const app = getApp({}, { logging: false });
 let binding: Binding;
 let testUser: User;
 
 beforeAll(async done => {
   console.error = jest.fn();
 
-  await server.start();
-  binding = ((await server.getBinding()) as unknown) as Binding; // TODO: clean this up
+  await app.start();
+  binding = ((await app.getBinding()) as unknown) as Binding; // TODO: clean this up
 
   const key = new Date().getTime();
 
@@ -34,7 +34,7 @@ beforeAll(async done => {
 
 afterAll(async done => {
   (console.error as any).mockRestore();
-  await server.stop();
+  await app.stop();
   done();
 });
 

examples/2-complex-example/src/index.ts

@@ -2,13 +2,13 @@ import 'reflect-metadata';
 
 import * as dotenv from 'dotenv';
 
-import { getServer } from './server';
+import { getApp } from './app';
 
 dotenv.config();
 
 async function bootstrap() {
-  const server = getServer();
-  await server.start();
+  const app = getApp();
+  await app.start();
 }
 
 bootstrap().catch((error: Error) => {

examples/2-complex-example/tools/seed.ts

@@ -1,7 +1,7 @@
 import * as Debug from 'debug';
 import * as Faker from 'faker';
 
-import { getServer } from '../src/server';
+import { getApp } from '../src/app';
 
 if (process.env.NODE_ENV !== 'development') {
   throw 'Seeding only available in development environment';
@@ -12,10 +12,10 @@ const logger = Debug('warthog:seed');
 const NUM_USERS = 100;
 
 async function seedDatabase() {
-  const server = getServer();
-  await server.start();
+  const app = getApp();
+  await app.start();
 
-  const binding = await server.getBinding();
+  const binding = await app.getBinding();
 
   for (let index = 0; index < NUM_USERS; index++) {
     const random = new Date()
@@ -24,9 +24,7 @@ async function seedDatabase() {
       .substring(8, 13);
     const firstName = Faker.name.firstName();
     const lastName = Faker.name.lastName();
-    const email = `${firstName
-      .substr(0, 1)
-      .toLowerCase()}${lastName.toLowerCase()}-${random}@fakeemail.com`;
+    const email = `${firstName.substr(0, 1).toLowerCase()}${lastName.toLowerCase()}-${random}@fakeemail.com`;
 
     try {
       const user = await binding.mutation.createUser(
@@ -45,7 +43,7 @@ async function seedDatabase() {
     }
   }
 
-  return server.stop();
+  return app.stop();
 }
 
 seedDatabase()
@@ -54,6 +52,6 @@ seedDatabase()
     return process.exit(0);
   })
   .catch(err => {
-    console.log(err);
+    logger(err);
     return process.exit(1);
   });

examples/3-one-to-many-relationship/src/index.ts

@@ -1,18 +1,18 @@
-import * as dotenv from 'dotenv';
 import 'reflect-metadata';
+import * as dotenv from 'dotenv';
 import { Container } from 'typedi';
 
 dotenv.config();
 
-import { Server } from '../../../src/';
+import { App } from '../../../src/';
 
 async function bootstrap() {
-  const server = new Server({
+  const app = new App({
     container: Container,
     warthogImportPath: '../../../src' // Path written in generated classes
   });
 
-  await server.start();
+  await app.start();
 }
 
 bootstrap().catch((error: Error) => {

examples/4-many-to-many-relationship/src/index.ts

@@ -1,18 +1,18 @@
-import * as dotenv from 'dotenv';
 import 'reflect-metadata';
+import * as dotenv from 'dotenv';
 import { Container } from 'typedi';
 
 dotenv.config();
 
-import { Server } from '../../../src/';
+import { App } from '../../../src/';
 
 async function bootstrap() {
-  const server = new Server({
+  const app = new App({
     container: Container,
     warthogImportPath: '../../../src' // Path written in generated classes
   });
 
-  await server.start();
+  await app.start();
 }
 
 bootstrap().catch((error: Error) => {

package.json

@@ -81,7 +81,6 @@
     "pg": "^7.7.1",
     "reflect-metadata": "^0.1.12",
     "shortid": "^2.2.14",
-    "sqlite3": "^4.0.6",
     "ts-node": "^7.0.1",
     "type-graphql": "^0.16.0",
     "typedi": "^0.8.0",