fix(model-api): update to model API

README.md

@@ -33,10 +33,10 @@ to see how to use Warthog in a project or check out the
 Create an entity:
 
 ```typescript
-import { BaseObject, EntityObject, StringField } from 'warthog';
+import { BaseModel, Model, StringField } from 'warthog';
 
-@EntityObject()
-export class User extends BaseObject {
+@Model()
+export class User extends BaseModel {
   @StringField()
   name?: string;
 }

examples/1-simple-seed/src/modules/user/user.entity.ts

@@ -1,9 +1,9 @@
 import { Authorized } from 'type-graphql';
 
-import { BaseObject, EmailField, EntityObject, StringField } from '../../../../../src';
+import { BaseModel, EmailField, Model, StringField } from '../../../../../src';
 
-@EntityObject()
-export class User extends BaseObject {
+@Model()
+export class User extends BaseModel {
   @StringField({ maxLength: 30 })
   firstName?: string;
 

src/core/BaseObject.ts → src/core/BaseModel.ts

@@ -31,7 +31,7 @@ export abstract class BaseGraphQLObject {
 
 // This class adds all of the TypeORM decorators needed to create the DB table
 @ObjectType({ implements: BaseGraphQLObject })
-export abstract class BaseObject implements BaseGraphQLObject {
+export abstract class BaseModel implements BaseGraphQLObject {
   @PrimaryColumn({ type: String })
   id!: ID;
 

src/core/app.ts

@@ -83,7 +83,6 @@ export class App {
   }
 
   async buildGraphQLSchema(): Promise<GraphQLSchema> {
-    console.log('buildGraphQLSchema start ');
     if (!this.schema) {
       this.schema = await buildSchema({
         authChecker,
@@ -94,13 +93,10 @@ export class App {
       });
     }
 
-    console.log('this.schema', this.schema);
-
     return this.schema;
   }
 
   async writeSchemaFile() {
-    console.log('got to writeSchemaFile', this.schema);
     // Write schema to dist folder so that it's available in package
     return writeFileSync(path.join(this.generatedFolder, 'schema.graphql'), printSchema(this.schema as GraphQLSchema), {
       encoding: 'utf8',

src/core/index.ts

@@ -1,5 +1,5 @@
 export * from './app';
-export * from './BaseObject';
+export * from './BaseModel';
 export * from './binding';
 export { Context } from './Context';
 export * from './types';

src/decorators/EntityObject.ts → src/decorators/Model.ts

@@ -3,11 +3,11 @@ import { Entity } from 'typeorm';
 
 import { composeClassDecorators, ClassDecoratorFactory } from '../utils/';
 
-interface EntityObjectOptions {
+interface ModelOptions {
   auditTableName?: string;
 }
 
-export function EntityObject(this: any, args: EntityObjectOptions = {}): any {
+export function Model(this: any, args: ModelOptions = {}): any {
   const factories = [Entity() as ClassDecoratorFactory, ObjectType() as ClassDecoratorFactory];
 
   return composeClassDecorators(...factories);

src/decorators/index.ts

@@ -1,4 +1,4 @@
 export * from './EmailField';
-export * from './EntityObject';
+export * from './Model';
 export * from './StringField';
 export * from './ForeignKeyField';

src/tgql/BaseResolver.ts

@@ -15,10 +15,10 @@ import {
   Repository
 } from 'typeorm';
 
-import { BaseObject, WhereInput } from '../core';
+import { BaseModel, WhereInput } from '../core';
 import { StandardDeleteResponse } from './DeleteResponse';
 
-export class BaseResolver<E extends BaseObject> {
+export class BaseResolver<E extends BaseModel> {
   // TODO: need to figure out why we couldn't type this as Repository<E>
   constructor(protected entityClass: any, protected repository: Repository<any>) {
     if (!entityClass) {

src/tgql/index.ts

@@ -1,5 +1,5 @@
 export { authChecker } from './authChecker';
-export { BaseObject } from '../core/BaseObject';
+export { BaseModel } from '../core/BaseModel';
 export * from './BaseResolver';
 export * from './BaseWhereInput';
 export * from './DeleteResponse';