Merge pull request #39 from tomyitav/more-resolvers-checks

More resolvers checks, some fixes for resolver generation

Author: tomyitav

src/commands/resolver/resolver-constants.ts

@@ -2,9 +2,9 @@ export const resolverPrefix = 'const resolveFunctions = {\n'
 export const resolverSuffix = '};\n'
 export const operationPrefix = ': {\n'
 export const operationSuffix = '\t},\n'
-export const operationFuntionsSuffix = '\t\t},\n'
-export const functionOperationPrefix = '=> {\n'
+export const operationFuntionsSuffix = '\t},\n'
+export const functionOperationPrefix = ' => {},\n'
 export const gqlMethodSignature = '(rootObj: any, args: any, context: any)'
-export const gqlMethodSuffix = ' {\n'
+export const gqlMethodSuffix = ' {},\n'
 export const subscriptionSubscribeDefinition = '\t\t\tsubscribe: '
 export const keysToGenerate = ['Query', 'Mutation', 'Subscription']

src/commands/resolver/resolver.ts

@@ -9,7 +9,6 @@ import {
   keysToGenerate,
   operationFuntionsSuffix,
   operationPrefix,
-  operationSuffix,
   resolverPrefix,
   resolverSuffix,
   subscriptionSubscribeDefinition
@@ -61,7 +60,7 @@ export class Resolver extends AbstractCommand {
     let resolverContent = resolverPrefix
     Object.entries(schemaDefinitions).forEach(([key, operation]: [string, Operation]) => {
       if (keysToGenerate.includes(key)) {
-        resolverContent += this.getTypeOperationContent(operation) + operationSuffix
+        resolverContent += this.getTypeOperationContent(operation)
       }
     })
     resolverContent += resolverSuffix

test/commands/resolver/illegal-schemas/illegal-schema1.ts

@@ -0,0 +1,3 @@
+const schema = 'abc'
+
+export default schema

test/commands/resolver/test-schema.ts renamed to test/commands/resolver/legal-schemas/test-schema1.ts

@@ -0,0 +1,62 @@
+const schema = `
+type Tweet {
+    id: ID!
+    # The tweet text. No more than 140 characters!
+    body: String
+    # When the tweet was published
+    date: Date
+    # Who published the tweet
+    Author: User
+    # Views, retweets, likes, etc
+    Stats: Stat
+}
+
+type User {
+    id: ID!
+    username: String
+    first_name: String
+    last_name: String
+    full_name: String
+    name: String @deprecated
+    avatar_url: Url
+}
+
+type Stat {
+    views: Int
+    likes: Int
+    retweets: Int
+    responses: Int
+}
+
+type Notification {
+    id: ID
+    date: Date
+    type: String
+}
+
+type Meta {
+    count: Int
+}
+
+scalar Url
+scalar Date
+
+type Query {
+    Tweet(id: ID!): Tweet
+    Tweets(limit: Int, skip: Int, sort_field: String, sort_order: String): [Tweet]
+    TweetsMeta: Meta
+    User(id: ID!): User
+    Notifications(limit: Int): [Notification]
+    NotificationsMeta: Meta
+}
+
+type Mutation {
+    createTweet (
+        body: String
+    ): Tweet
+    deleteTweet(id: ID!): Tweet
+    markTweetRead(id: ID!): Boolean
+}
+`
+
+export default schema

test/commands/resolver/legal-schemas/tweet-test-schema.ts

@@ -5,11 +5,16 @@ import * as fse from 'fs-extra'
 
 describe('Resolver command test', () => {
   let res: AbstractCommand
-  const pathToType = './test/commands/resolver/test-schema.ts'
-  const pathToActualResolver = './test/output/actual/test-resolver.ts'
+  const pathToType1 = './test/commands/resolver/legal-schemas/test-schema1.ts'
+  const pathToTypeTweets = './test/commands/resolver/legal-schemas/tweet-test-schema.ts'
+  const pathToIllegalSchema1 = './test/commands/resolver/illegal-schemas/illegal-schema1.ts'
+  const pathToActualResolver1 = './test/output/actual/test-resolver.ts'
+  const pathToActualResolverTweets = './test/output/actual/tweets-test-resolver.ts'
   const pathToDirectoryActualResolver = './test/output/actual/non/existing/dir/test-resolver.ts'
   const resolverDirLocation = './test/output/actual/non'
-  const pathToExpectedResolver = './test/output/expected/commands/resolver/test-resolver.ts'
+  const pathToExpectedResolver1 = './test/output/expected/commands/resolver/test-resolver.ts'
+  const pathToExpectedResolverTweets =
+    './test/output/expected/commands/resolver/tweets-test-resolver.ts'
   const pathToNonOverridenFile =
     './test/output/expected/commands/resolver/test-not-overriden-by-resolver.ts'
 
@@ -18,8 +23,11 @@ describe('Resolver command test', () => {
   })
 
   afterEach(() => {
-    if (fs.existsSync(pathToActualResolver)) {
-      fs.unlinkSync(pathToActualResolver)
+    if (fs.existsSync(pathToActualResolver1)) {
+      fs.unlinkSync(pathToActualResolver1)
+    }
+    if (fs.existsSync(pathToActualResolverTweets)) {
+      fs.unlinkSync(pathToActualResolverTweets)
     }
     fs.stat(resolverDirLocation, (err, stats) => {
       if (!err) {
@@ -40,39 +48,67 @@ describe('Resolver command test', () => {
     expect(act).toBeInstanceOf(Function)
   })
 
-  it('works if resolver file was generated', async () => {
+  it('works if resolver file was not generated for illegal schema 1', async () => {
     const actFunction = res.getAction()
-    await actFunction(pathToType, pathToActualResolver)
-    const resolverFileExist: boolean = fs.existsSync(pathToActualResolver)
+    await actFunction(pathToIllegalSchema1, pathToActualResolver1)
+    const resolverFileExist: boolean = fs.existsSync(pathToActualResolver1)
+    expect(resolverFileExist).not.toBeTruthy()
+  })
+
+  it('works if resolver file was generated for test-schema-1', async () => {
+    const actFunction = res.getAction()
+    await actFunction(pathToType1, pathToActualResolver1)
+    const resolverFileExist: boolean = fs.existsSync(pathToActualResolver1)
+    expect(resolverFileExist).toBeTruthy()
+  })
+
+  it('works if resolver file was generated for tweet-test-schema', async () => {
+    const actFunction = res.getAction()
+    await actFunction(pathToTypeTweets, pathToActualResolverTweets)
+    const resolverFileExist: boolean = fs.existsSync(pathToActualResolverTweets)
     expect(resolverFileExist).toBeTruthy()
   })
 
   it('works if resolver file was generated in directory structure', async () => {
     const actFunction = res.getAction()
-    await actFunction(pathToType, pathToDirectoryActualResolver)
+    await actFunction(pathToType1, pathToDirectoryActualResolver)
     const resolverFileExist: boolean = fs.existsSync(pathToDirectoryActualResolver)
     expect(resolverFileExist).toBeTruthy()
   })
 
-  it('works if resolver file is identical to expected file', async () => {
+  it('works if resolver file is identical to expected file for test-schema1', async () => {
+    const actFunction = res.getAction()
+    await actFunction(pathToType1, pathToActualResolver1)
+    const expectedContent = fs
+      .readFileSync(pathToExpectedResolver1)
+      .toString()
+      .replace(/\s/g, '')
+    const actualContent = fs
+      .readFileSync(pathToActualResolver1)
+      .toString()
+      .replace(/\s/g, '')
+    expect(actualContent).toEqual(expectedContent)
+  })
+
+  it('works if resolver file is identical to expected file for tweets-test-schema', async () => {
     const actFunction = res.getAction()
-    await actFunction(pathToType, pathToActualResolver)
+    await actFunction(pathToTypeTweets, pathToActualResolverTweets)
     const expectedContent = fs
-      .readFileSync(pathToExpectedResolver)
+      .readFileSync(pathToExpectedResolverTweets)
       .toString()
       .replace(/\s/g, '')
     const actualContent = fs
-      .readFileSync(pathToActualResolver)
+      .readFileSync(pathToActualResolverTweets)
       .toString()
       .replace(/\s/g, '')
     expect(actualContent).toEqual(expectedContent)
   })
 
   it('works if resolver command does not override existing file', async () => {
     const actFunction = res.getAction()
-    await actFunction(pathToType, pathToNonOverridenFile)
+    await actFunction(pathToType1, pathToNonOverridenFile)
     const expectedContent = fs
-      .readFileSync(pathToExpectedResolver)
+      .readFileSync(pathToExpectedResolver1)
       .toString()
       .replace(/\s/g, '')
     const actualContent = fs

test/commands/resolver/resolver.test.ts

@@ -1,16 +1,13 @@
 const resolveFunctions = {
   Query: {
-    car(rootObj: any, args: any, context: any) {
-    },
+    car(rootObj: any, args: any, context: any) {},
   },
   Mutation: {
-    updateCarName(rootObj: any, args: any, context: any) {
-    },
+    updateCarName(rootObj: any, args: any, context: any) {},
   },
   Subscription: {
     carChanged: {
-      subscribe: (rootObj: any, args: any, context: any)=> {
-      },
+      subscribe: (rootObj: any, args: any, context: any) => {},
     },
   },
 };

test/output/expected/commands/resolver/test-resolver.ts

@@ -0,0 +1,15 @@
+const resolveFunctions = {
+	Query: {
+		Tweet(rootObj: any, args: any, context: any) {},
+		Tweets(rootObj: any, args: any, context: any) {},
+		TweetsMeta(rootObj: any, args: any, context: any) {},
+		User(rootObj: any, args: any, context: any) {},
+		Notifications(rootObj: any, args: any, context: any) {},
+		NotificationsMeta(rootObj: any, args: any, context: any) {},
+	},
+	Mutation: {
+		createTweet(rootObj: any, args: any, context: any) {},
+		deleteTweet(rootObj: any, args: any, context: any) {},
+		markTweetRead(rootObj: any, args: any, context: any) {},
+	},
+};

test/output/expected/commands/resolver/tweets-test-resolver.ts

@@ -1,6 +1,9 @@
 {
+  "rules": {
+    "no-empty": false
+  },
   "extends": [
     "tslint-config-standard",
     "tslint-config-prettier"
   ]
-}
+}