typeWeigthsObject is correctly processing non-null types

Author: evanmcneely

src/analysis/buildTypeWeights.ts

@@ -79,10 +79,10 @@ function parseObjectFields(
     // Iterate through the fields and add the required data to the result
     Object.keys(fields).forEach((field: string) => {
         // The GraphQL type that this field represents
-        const fieldType: GraphQLOutputType = fields[field].type;
+        let fieldType: GraphQLOutputType = fields[field].type;
+        if (isNonNullType(fieldType)) fieldType = fieldType.ofType;
         if (
-            isScalarType(fieldType) ||
-            (isNonNullType(fieldType) && isScalarType(fieldType.ofType))
+            isScalarType(fieldType) // ||
         ) {
             result.fields[field] = {
                 weight: typeWeights.scalar,
@@ -91,14 +91,15 @@ function parseObjectFields(
             isInterfaceType(fieldType) ||
             isUnionType(fieldType) ||
             isEnumType(fieldType) ||
-            isObjectType(fieldType)
+            isObjectType(fieldType) // ||
         ) {
             result.fields[field] = {
                 resolveTo: fieldType.name.toLocaleLowerCase(),
             };
         } else if (isListType(fieldType)) {
             // 'listType' is the GraphQL type that the list resolves to
-            const listType = fieldType.ofType;
+            let listType = fieldType.ofType;
+            if (isNonNullType(listType)) listType = listType.ofType;
             if (isScalarType(listType) && typeWeights.scalar === 0) {
                 // list won't compound if weight is zero
                 result.fields[field] = {

test/analysis/buildTypeWeights.test.ts

@@ -489,7 +489,7 @@ describe('Test buildTypeWeightsFromSchema function', () => {
             });
         });
 
-        xdescribe('Not null operator (!) is used', () => {
+        describe('Not null operator (!) is used', () => {
             test('on a scalar, enum or object type', () => {
                 schema = buildSchema(`
                 type Human{
@@ -641,7 +641,7 @@ describe('Test buildTypeWeightsFromSchema function', () => {
         });
 
         // this is only if we choose to have 'query' as its own property (seperate from object types) in the user configuration options
-        xtest('query parameter', () => {
+        test('query parameter', () => {
             const typeWeightObject = buildTypeWeightsFromSchema(schema, {
                 query: 2,
             });

test/analysis/weightFunction.test.ts

@@ -84,7 +84,7 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         });
     });
 
-    xtest('the list is defined with non-null operators (!)', () => {
+    test('the list is defined with non-null operators (!)', () => {
         const villainsQuery = `query { villains(episode: NEWHOPE, limit: 3) { stars, episode } }`;
         const willainsQueryAST: DocumentNode = parse(villainsQuery);
         expect(getQueryTypeComplexity(willainsQueryAST, {}, typeWeights)).toBe(4);
@@ -93,7 +93,7 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         const charQueryAST: DocumentNode = parse(charQuery);
         expect(getQueryTypeComplexity(charQueryAST, {}, typeWeights)).toBe(4);
 
-        const droidsQuery = `droidsQuery { droids(episode: NEWHOPE, limit: 3) { stars, episode } }`;
+        const droidsQuery = `query droidsQuery { droids(episode: NEWHOPE, limit: 3) { stars, episode } }`;
         const droidsQueryAST: DocumentNode = parse(droidsQuery);
         expect(getQueryTypeComplexity(droidsQueryAST, {}, typeWeights)).toBe(4);
     });