Refactor + Travis CI + Coveralls + Tests

Author: jpmonette

.jestrc

@@ -0,0 +1,7 @@
+{
+  "transform": {
+    "^.+\\.tsx?$": "ts-jest"
+  },
+  "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
+  "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$"
+}

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+node_js: "node"
+cache:
+  yarn: true
+  directories:
+    - node_modules
+after_success:
+  - npm run coveralls

README.md

@@ -1,7 +1,7 @@
 <p align="center">
   <img src="./assets/title.png" alt="salesforce graphql" width="326">
   <br>
-  <a href="https://travis-ci.org/jpmonette/salesforce-graphql"><img src="https://travis-ci.org/jpmonette/salesforce-graphql.svg?branch=master" alt="Build Status"></a>
+  <a href="https://travis-ci.org/jpmonette/salesforce-graphql"><img src="https://travis-ci.org/jpmonette/salesforce-graphql.svg?branch=master" alt="Build Status"></a> <a href='https://coveralls.io/github/jpmonette/salesforce-graphql?branch=master'><img src='https://coveralls.io/repos/github/jpmonette/salesforce-graphql/badge.svg?branch=master' alt='Coverage Status' /></a>
 </p>
 
 <p align="center"><code>salesforce-graphql</code> - Bringing the <strong>GraphQL</strong> query language to <strong>Salesforce</strong></p>
@@ -42,6 +42,14 @@ const resolvers = {
     Contact: (parentobj, args, context, info) =>
       context.db.query({}, info).then(res => res.records[0]),
   },
+  Account: {
+    Contacts: (parent, args, context, info) =>
+      context.db.query({ AccountId: parent.Id }, info).then(res => res.records),
+  },
+  Contact: {
+    Account: (parent, args, context, info) =>
+      context.db.query({ Id: parent.AccountId }, info).then(res => res.records[0]),
+  },
 };
 
 const conn = new jsforce.Connection({});
@@ -78,10 +86,13 @@ type Account {
   IsDeleted: Boolean
   Name: String
   Type: String
+
+  Contacts(limit: Int): [Contact]
 }
 
 type Contact {
   Id: ID!
+  Account: Account
   AccountId: String
   LastName: String
   FirstName: String
@@ -100,10 +111,16 @@ Head over to `http://localhost:4000/playground` to test with the following query
 
 ```graphql
 {
-  Contacts(limit: 2) {
+  Account(Id: "001E000001KnMkTIAV") {
     Id
     Name
-    Salutation
+    Contacts(limit: 1) {
+      Name
+      AccountId
+      Account {
+        Name
+      }
+    }
   }
 }
 ```
@@ -120,4 +137,8 @@ Head over to `http://localhost:4000/playground` to test with the following query
 
 - [`salesforce-graphql` on NPM](https://www.npmjs.com/package/salesforce-graphql)
 - Learn more about [GraphQL](http://graphql.org/)
-- [Salesforce REST API](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_what_is_rest_api.htm) documentation
+- [Salesforce REST API](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_what_is_rest_api.htm) documentation
+
+## Extra
+
+- Looking for [new opportunities](https://mavens.com/careers/)? Have a look at [Mavens](https://mavens.com/) website!

assets/output.png

@@ -8,7 +8,17 @@
   "main": "build/index.js",
   "license": "MIT",
   "scripts": {
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
     "build": "rm -rf build && tsc",
-    "prepare": "yarn build"
+    "prepare": "yarn build",
+    "test": "jest --coverage"
+  },
+  "devDependencies": {
+    "@types/graphql": "^0.13.0",
+    "@types/jest": "^22.2.3",
+    "coveralls": "^3.0.0",
+    "jest": "^22.4.3",
+    "ts-jest": "^22.4.2",
+    "typescript": "^2.8.1"
   }
 }

package.json

@@ -0,0 +1,23 @@
+import Q from '../q';
+
+describe('Query generator', () => {
+  it('should generate simple query', () => {
+    const query = new Q('Account').build();
+    expect(query).toBe(`SELECT Id FROM Account`);
+  });
+
+  it('should add fields', () => {
+    const query = new Q('Account').select(['Id', 'Name', 'BillingCountry']).build();
+    expect(query).toBe(`SELECT Id, Name, BillingCountry FROM Account`);
+  });
+
+  it('should add limit', () => {
+    const query = new Q('Account').limit(10).build();
+    expect(query).toBe(`SELECT Id FROM Account LIMIT 10`);
+  });
+
+  it('should add where condition', () => {
+    const query = new Q('Account').where('Id', '=', '001E000001KnMkTIAV').build();
+    expect(query).toBe(`SELECT Id FROM Account WHERE Id = '001E000001KnMkTIAV'`);
+  });
+});

src/__tests__/q.spec.ts

@@ -1,43 +1,53 @@
 import Q from './q';
 
 function getFields(info) {
-  const fields = [];
-  info.fieldNodes[0].selectionSet.selections.map((value, key) => {
-    if (!value.selectionSet) fields.push(value.name.value);
+  const fields: string[] = [];
+  info.fieldNodes.map(fieldNode => {
+    if (fieldNode.selectionSet) {
+      fieldNode.selectionSet.selections.map(value => {
+        if (!value.selectionSet) fields.push(value.name.value);
+      });
+    }
   });
   return fields;
 }
 
-function getWheres(info: any): any[] {
-  const wheres = [];
-  info.fieldNodes[0].arguments.map((val, key) => {
-    const field = val.name.value;
-    const value = val.value.value;
-    if (field !== 'limit') {
-      wheres.push({ field, value, operator: '=' });
-    }
+function getWheres(info): any[] {
+  const wheres: { field: string; value: string; operator: string }[] = [];
+  info.fieldNodes.map(fieldNode => {
+    fieldNode.arguments.map(val => {
+      const field = val.name.value;
+      const value = val.value.value;
+      if (field !== 'limit') {
+        wheres.push({ field, value, operator: '=' });
+      }
+    });
   });
   return wheres;
 }
 
-function getLimit(info: any): number | void {
+function getLimit(info): number | void {
   let limit;
-  info.fieldNodes[0].arguments.map((value, key) => {
-    if (value.name.value === 'limit') {
-      limit = value.value.value;
-    }
+  info.fieldNodes.map(fieldNode => {
+    fieldNode.arguments.map(value => {
+      if (value.name.value === 'limit') {
+        limit = value.value.value;
+      }
+    });
   });
   return limit;
 }
 
-export class Salesforce {
-  public conn;
+class Salesforce {
+  conn: any;
 
   constructor(props) {
+    console.log('CONSTRUCTOR')
     this.conn = props.conn;
   }
 
-  query = (parent, info) => {
+  public query = (parent: { key: string }, info) => {
+    console.log('BEFORE')
     const queryBuilder = new Q(info.returnType.ofType || info.returnType).select(getFields(info));
     const limit = getLimit(info);
 
@@ -54,3 +64,5 @@ export class Salesforce {
     return this.conn.query(query);
   };
 }
+
+export { Salesforce };

src/index.ts

@@ -1,9 +1,9 @@
 export default class Q {
   fromText: string;
   fieldList: string[];
-  numberOfRows: number;
+  numberOfRows: number | undefined;
   conditions: { field: string; operator: string; value: string }[];
-  numberOfRowsToSkip: number;
+  numberOfRowsToSkip: number | undefined;
 
   constructor(sobject: string) {
     this.fromText = sobject;
@@ -48,7 +48,7 @@ export default class Q {
     if (this.conditions.length !== 0) {
       return 'WHERE ' + condList.join(' AND ');
     } else {
-      return null;
+      return '';
     }
   };
 

src/q.ts

@@ -3,7 +3,7 @@
     "module": "commonjs",
     "outDir": "build",
     "target": "es2016",
-    "skipLibCheck": true
+    "lib": ["esnext","dom"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/node_modules/*"]