@takeshape/ssg 9.7.1 → 9.9.0

package/dist/graphql/analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/graphql/analyze.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAEZ,aAAa,EASd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,MAAM,EAAE,UAAU,EAAqB,SAAS,EAAa,MAAM,WAAW,CAAC;AAGvF,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AACD,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED,aAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAI9D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,CAqC7G;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAiCtF;AAED,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AAEpD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,wBAAsB,YAAY,CAAC,EAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqBvG"}
+{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/graphql/analyze.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAEZ,aAAa,EASd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,MAAM,EAAE,UAAU,EAAqB,SAAS,EAAa,MAAM,WAAW,CAAC;AAGvF,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AACD,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED,aAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAI9D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,CA0C7G;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAoCtF;AAED,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AAEpD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,wBAAsB,YAAY,CAAC,EAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqBvG"}

package/dist/graphql/analyze.js

@@ -20,8 +20,8 @@ var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const startLocation = {
-  line: 0,
-  column: 0
+  line: 1,
+  column: 1
 };
 
 function getFieldUsage(queryAst, schema, fileInfo) {
@@ -30,7 +30,13 @@ function getFieldUsage(queryAst, schema, fileInfo) {
   const visitor = {
     Field: {
       enter(node) {
-        const type = (0, _query.getItemType)(typeInfo.getFieldDef().type);
+        const field = typeInfo.getFieldDef();
+
+        if (!field) {
+          return;
+        }
+
+        const type = (0, _query.getItemType)(field.type);
         const fields = (0, _query.getFields)(type);
         const fieldInfo = result[type.toString()] || {};
 
@@ -39,11 +45,7 @@ function getFieldUsage(queryAst, schema, fileInfo) {
             if (selection.kind === 'Field' || selection.kind === 'FragmentSpread') {
               const name = selection.name.value;
               const usage = fieldInfo[name] ? fieldInfo[name].usage : [];
-              const source = {
-                body: fileInfo.body,
-                name: fileInfo.name,
-                locationOffset: startLocation
-              };
+              const source = new _graphql.Source(fileInfo.body, fileInfo.name, startLocation);
               fieldInfo[name] = {
                 type: fields[name].type.toString(),
                 usage: usage.concat({
@@ -77,15 +79,19 @@ function detectTypes(queryAst, schema) {
     Field: {
       enter(node) {
         if (topLevelQueries.has(node.name.value)) {
-          const fieldType = typeInfo.getFieldDef().type;
+          const field = typeInfo.getFieldDef();
+
+          if (field) {
+            const fieldType = field.type;
 
-          if ((0, _graphql.isObjectType)(fieldType)) {
-            const fields = fieldType.getFields();
+            if ((0, _graphql.isObjectType)(fieldType)) {
+              const fields = fieldType.getFields();
 
-            if (fields.items && (0, _graphql.isListType)(fields.items.type)) {
-              result.add(fields.items.type.ofType.toString());
-            } else {
-              result.add(fieldType.toString());
+              if (fields.items && (0, _graphql.isListType)(fields.items.type)) {
+                result.add(fields.items.type.ofType.toString());
+              } else {
+                result.add(fieldType.toString());
+              }
             }
           }
         }

package/dist/graphql/ast.d.ts

@@ -1,4 +1,4 @@
-import { DocumentNode, OperationDefinitionNode, DefinitionNode, FieldNode, SelectionSetNode, SelectionNode, ArgumentNode, VariableDefinitionNode } from 'graphql/language/ast';
+import { ArgumentNode, DefinitionNode, DocumentNode, FieldNode, OperationDefinitionNode, SelectionNode, SelectionSetNode, VariableDefinitionNode } from 'graphql/language/ast';
 export interface Arg {
     name: string;
     value: string;

package/dist/graphql/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/graphql/ast.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,sBAAsB,EAGvB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE,GAAG,GAAG,YAAY,CAe/D;AAsBD,wBAAgB,wBAAwB,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,GAAG,GAAG,sBAAsB,CAalF;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAKhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAUnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,IAAI,uBAAuB,CAEjF;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS,CAEhF;AAED,wBAAgB,WAAW,CACzB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,uBAAuB,GAClE,YAAY,CAUd;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAcnF;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,YAAY,EAAO,GACxB,gBAAgB,CAgBlB;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAKpF"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/graphql/ast.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,SAAS,EAET,uBAAuB,EACvB,aAAa,EACb,gBAAgB,EAEhB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAG9B,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE,GAAG,GAAG,YAAY,CAe/D;AAsBD,wBAAgB,wBAAwB,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,GAAG,GAAG,sBAAsB,CAalF;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAKhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAUnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,IAAI,uBAAuB,CAEjF;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS,CAEhF;AAED,wBAAgB,WAAW,CACzB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,uBAAuB,GAClE,YAAY,CAUd;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAcnF;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,YAAY,EAAO,GACxB,gBAAgB,CAgBlB;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAKpF"}

package/dist/graphql/ast.js

@@ -14,20 +14,22 @@ exports.updateQuery = updateQuery;
 exports.wrapQuery = wrapQuery;
 exports.wrapSelectionSet = wrapSelectionSet;
 
+var _language = require("graphql/language");
+
 function createArgument({
   name,
   value
 }) {
   return {
-    kind: 'Argument',
+    kind: _language.Kind.ARGUMENT,
     name: {
-      kind: 'Name',
+      kind: _language.Kind.NAME,
       value: name
     },
     value: {
-      kind: 'Variable',
+      kind: _language.Kind.VARIABLE,
       name: {
-        kind: 'Name',
+        kind: _language.Kind.NAME,
         value
       }
     }
@@ -36,7 +38,7 @@ function createArgument({
 
 function notNull(type) {
   return {
-    kind: 'NonNullType',
+    kind: _language.Kind.NON_NULL_TYPE,
     type
   };
 }
@@ -45,9 +47,9 @@ function createType(typeString) {
   const isNotNull = typeString.endsWith('!');
   const value = isNotNull ? typeString.slice(0, typeString.length - 1) : typeString;
   const namedType = {
-    kind: 'NamedType',
+    kind: _language.Kind.NAMED_TYPE,
     name: {
-      kind: 'Name',
+      kind: _language.Kind.NAME,
       value
     }
   };
@@ -59,12 +61,12 @@ function createVariableDefinition({
   type
 }) {
   return {
-    kind: 'VariableDefinition',
+    kind: _language.Kind.VARIABLE_DEFINITION,
     directives: [],
     variable: {
-      kind: 'Variable',
+      kind: _language.Kind.VARIABLE,
       name: {
-        kind: 'Name',
+        kind: _language.Kind.NAME,
         value: name
       }
     },
@@ -74,16 +76,16 @@ function createVariableDefinition({
 
 function createSelectionSet(selections) {
   return {
-    kind: 'SelectionSet',
+    kind: _language.Kind.SELECTION_SET,
     selections
   };
 }
 
 function createField(name) {
   return {
-    kind: 'Field',
+    kind: _language.Kind.FIELD,
     name: {
-      kind: 'Name',
+      kind: _language.Kind.NAME,
       value: name
     },
     arguments: [],
@@ -133,11 +135,11 @@ function addQueryVariables(variables, ast) {
 
 function wrapSelectionSet(selectionSet, name, args = []) {
   return {
-    kind: 'SelectionSet',
+    kind: _language.Kind.SELECTION_SET,
     selections: [{
-      kind: 'Field',
+      kind: _language.Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: _language.Kind.NAME,
         value: name
       },
       arguments: args,

package/dist/graphql/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/graphql/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAC,gBAAgB,EAAmD,aAAa,EAAC,MAAM,UAAU,CAAC;AAE1G,OAAO,EAAC,YAAY,EAAoD,MAAM,SAAS,CAAC;AA+CxF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAUvG;AAED,oBAAY,kBAAkB,GAAG,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;AAEvE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAalE;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,YAAY,CAAC;IAClB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACxC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,wBAAwB,CA8BlH;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,gBAAgB,CAuBrF"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/graphql/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAS,cAAc,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAC,gBAAgB,EAAmD,aAAa,EAAC,MAAM,UAAU,CAAC;AAE1G,OAAO,EAAC,YAAY,EAA4D,MAAM,SAAS,CAAC;AA+ChG,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAUvG;AAED,oBAAY,kBAAkB,GAAG,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;AAEvE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAalE;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,YAAY,CAAC;IAClB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACxC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,wBAAwB,CA8BlH;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,gBAAgB,CAuBrF"}

package/dist/graphql/migrate.js

@@ -16,20 +16,20 @@ var _graphql = require("graphql");
 
 function wrapListQuerySelection(selectionSet) {
   return {
-    kind: 'SelectionSet',
+    kind: _language.Kind.SELECTION_SET,
     selections: [{
-      kind: 'Field',
+      kind: _language.Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: _language.Kind.NAME,
         value: 'items'
       },
       arguments: [],
       directives: [],
       selectionSet
     }, {
-      kind: 'Field',
+      kind: _language.Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: _language.Kind.NAME,
         value: 'total'
       },
       arguments: [],
@@ -51,18 +51,14 @@ function isOldListQuery(selection) {
 }
 
 const startLocation = {
-  line: 0,
-  column: 0
+  line: 1,
+  column: 1
 };
 
 function formatWarning(name, loc, queryStr, source) {
-  const location = queryStr && loc && source ? (0, _language.getLocation)({
-    body: queryStr,
-    name: source,
-    locationOffset: startLocation
-  }, loc.start) : {
-    line: 0,
-    column: 0
+  const location = queryStr && loc && source ? (0, _language.getLocation)(new _graphql.Source(queryStr, source, startLocation), loc.start) : {
+    line: 1,
+    column: 1
   };
   return {
     message: `Using old format of ${name} Line ${location.line} Column ${location.column}`,

package/dist/graphql/pagination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../src/graphql/pagination.ts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAMpC,OAAO,EAML,aAAa,EAGb,YAAY,EAKb,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,IAAI,EAAE,gBAAgB,EAAiB,KAAK,EAAC,MAAM,UAAU,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AA4CD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,cAAc,EAAE,CAkC9F;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,YAAY,CAerG;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,YAAY,CAmDzG;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAkB/E;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAuBvE;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,YAAY,EACjB,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,SAAK,GACV,YAAY,CAoBd;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBhG;AAkBD,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,gBAAgB,EAC3B,EAAC,SAAS,EAAE,QAAc,EAAE,MAAM,EAAE,KAAK,EAAC,GAAE,uBAA4B,GACvE,OAAO,CAAC,mBAAmB,CAAC,CA2D9B"}
+{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../src/graphql/pagination.ts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAMpC,OAAO,EAML,aAAa,EAGb,YAAY,EAKb,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,IAAI,EAAE,gBAAgB,EAAiB,KAAK,EAAC,MAAM,UAAU,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AA4CD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,cAAc,EAAE,CAoC9F;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,YAAY,CAerG;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,YAAY,CAmDzG;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAkB/E;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAuBvE;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,YAAY,EACjB,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,SAAK,GACV,YAAY,CAoBd;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBhG;AAkBD,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,gBAAgB,EAC3B,EAAC,SAAS,EAAE,QAAc,EAAE,MAAM,EAAE,KAAK,EAAC,GAAE,uBAA4B,GACvE,OAAO,CAAC,mBAAmB,CAAC,CA2D9B"}

package/dist/graphql/pagination.js

@@ -83,19 +83,22 @@ function findPaginatedFields(ast, schema) {
       enter(node, _, __, path) {
         queryPath.push(node.alias ? node.alias.value : node.name.value);
         const fieldDef = typeInfo.getFieldDef();
-        const strategy = getPaginationStrategy(fieldDef);
-
-        if (strategy) {
-          result.push({
-            strategy,
-            fromVarName: getVariableName(queryPath, strategy.fromName),
-            sizeVarName: getVariableName(queryPath, strategy.sizeName),
-            astPath: path.map(String),
-            queryPath: queryPath.slice()
-          }); // Skip child nodes
-
-          queryPath.pop();
-          return false;
+
+        if (fieldDef) {
+          const strategy = getPaginationStrategy(fieldDef);
+
+          if (strategy) {
+            result.push({
+              strategy,
+              fromVarName: getVariableName(queryPath, strategy.fromName),
+              sizeVarName: getVariableName(queryPath, strategy.sizeName),
+              astPath: path.map(String),
+              queryPath: queryPath.slice()
+            }); // Skip child nodes
+
+            queryPath.pop();
+            return false;
+          }
         }
       },
 

package/dist/graphql/query.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLSchema, GraphQLOutputType, DocumentNode } from 'graphql';
+import { DocumentNode, GraphQLOutputType, GraphQLSchema } from 'graphql';
 import { GraphQLFieldMap } from 'graphql/type/definition';
 import { GraphQLConnector } from '../types';
 export declare function getItemType(fieldType: GraphQLOutputType): GraphQLOutputType;

package/dist/graphql/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/graphql/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,aAAa,EACb,iBAAiB,EAGjB,YAAY,EAEb,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAC,gBAAgB,EAAuE,MAAM,UAAU,CAAC;AAEhH,wBAAgB,WAAW,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAE3E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAExF;AAuBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,YAAY,CAmBrF;AAKD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,YAAY,CAErE;AASD,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,YAAY,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,wBAAwB,CAyDrG;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,aAAa,EACrB,EAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAC,GAAE,yBAA8B,GACzD,gBAAgB,CA6BlB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/graphql/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAEZ,iBAAiB,EACjB,aAAa,EAQd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAO,gBAAgB,EAAiE,MAAM,UAAU,CAAC;AAEhH,wBAAgB,WAAW,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAE3E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAExF;AAuBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,YAAY,CAmBrF;AAKD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,YAAY,CAErE;AASD,eAAO,MAAM,eAAe,aAAa,CAAC;AAE1C,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,YAAY,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAG,wBAAwB,CA2DrG;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,aAAa,EACrB,EAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAC,GAAE,yBAA8B,GACzD,gBAAgB,CA6BlB"}

package/dist/graphql/query.js

@@ -28,9 +28,9 @@ function addId(node) {
 
   if (selections && !selections.find(selection => (selection.kind === 'Field' || selection.kind === 'FragmentSpread') && selection.name.value === '_id')) {
     selections.push({
-      kind: 'Field',
+      kind: _graphql.Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: _graphql.Kind.NAME,
         value: '_id'
       },
       arguments: [],
@@ -96,24 +96,27 @@ function addContentIdFilter(ast, schema) {
 
         if (matches) {
           const fieldDef = typeInfo.getFieldDef();
-          const filterArgType = fieldDef.args.find(arg => arg.name === 'filter');
-
-          if (filterArgType) {
-            filterType = filterArgType.type.toString();
-            const filterArgAst = (0, _ast.createArgument)({
-              name: 'filter',
-              value: FILTER_VAR_NAME
-            });
-            return { ...node,
-              arguments: node.arguments ? node.arguments.filter(arg => {
-                if (arg.name.value === 'filter' && arg.value.kind === 'Variable') {
-                  varsToRemove.add(arg.value.name.value);
-                  return false;
-                }
-
-                return true;
-              }).concat(filterArgAst) : [filterArgAst]
-            };
+
+          if (fieldDef) {
+            const filterArgType = fieldDef.args.find(arg => arg.name === 'filter');
+
+            if (filterArgType) {
+              filterType = filterArgType.type.toString();
+              const filterArgAst = (0, _ast.createArgument)({
+                name: 'filter',
+                value: FILTER_VAR_NAME
+              });
+              return { ...node,
+                arguments: node.arguments ? node.arguments.filter(arg => {
+                  if (arg.name.value === 'filter' && arg.value.kind === 'Variable') {
+                    varsToRemove.add(arg.value.name.value);
+                    return false;
+                  }
+
+                  return true;
+                }).concat(filterArgAst) : [filterArgAst]
+              };
+            }
           }
         }
       }

package/dist/graphql/schema-connector-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-connector-factory.d.ts","sourceRoot":"","sources":["../../../src/graphql/schema-connector-factory.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,gBAAgB,EAAgB,MAAM,UAAU,CAAC;AAEzD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAsB1E;AAqCD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,gBAAgB,CAyB5F"}
+{"version":3,"file":"schema-connector-factory.d.ts","sourceRoot":"","sources":["../../../src/graphql/schema-connector-factory.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,gBAAgB,EAAgB,MAAM,UAAU,CAAC;AAEzD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAsB1E;AAqCD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,gBAAgB,CA+B5F"}

package/dist/graphql/schema-connector-factory.js

@@ -93,7 +93,13 @@ function schemaConnectorFactory(cwd, config) {
     connector = async params => {
       var _res$errors;
 
-      const res = await (0, _graphql.graphql)(schema.default || schema, params.query, null, {}, params.variables);
+      const res = await (0, _graphql.graphql)({
+        schema: schema.default || schema,
+        source: params.query,
+        rootValue: null,
+        contextValue: {},
+        variableValues: params.variables
+      });
       return {
         data: res.data,
         errors: (_res$errors = res.errors) === null || _res$errors === void 0 ? void 0 : _res$errors.map(_graphql.formatError)

package/es/graphql/analyze.js

@@ -1,11 +1,11 @@
 import BbPromise from 'bluebird';
-import { TypeInfo, parse, visit, visitWithTypeInfo, isObjectType, isListType, getLocation } from 'graphql';
+import { TypeInfo, parse, visit, visitWithTypeInfo, isObjectType, isListType, Source, getLocation } from 'graphql';
 import { getFields, getItemType } from './query';
 import { getGraphQLQueries } from '../config';
 import path from 'path';
 const startLocation = {
-  line: 0,
-  column: 0
+  line: 1,
+  column: 1
 };
 export function getFieldUsage(queryAst, schema, fileInfo) {
   const typeInfo = new TypeInfo(schema);
@@ -13,7 +13,13 @@ export function getFieldUsage(queryAst, schema, fileInfo) {
   const visitor = {
     Field: {
       enter(node) {
-        const type = getItemType(typeInfo.getFieldDef().type);
+        const field = typeInfo.getFieldDef();
+
+        if (!field) {
+          return;
+        }
+
+        const type = getItemType(field.type);
         const fields = getFields(type);
         const fieldInfo = result[type.toString()] || {};
 
@@ -22,11 +28,7 @@ export function getFieldUsage(queryAst, schema, fileInfo) {
             if (selection.kind === 'Field' || selection.kind === 'FragmentSpread') {
               const name = selection.name.value;
               const usage = fieldInfo[name] ? fieldInfo[name].usage : [];
-              const source = {
-                body: fileInfo.body,
-                name: fileInfo.name,
-                locationOffset: startLocation
-              };
+              const source = new Source(fileInfo.body, fileInfo.name, startLocation);
               fieldInfo[name] = {
                 type: fields[name].type.toString(),
                 usage: usage.concat({
@@ -59,15 +61,19 @@ export function detectTypes(queryAst, schema) {
     Field: {
       enter(node) {
         if (topLevelQueries.has(node.name.value)) {
-          const fieldType = typeInfo.getFieldDef().type;
+          const field = typeInfo.getFieldDef();
+
+          if (field) {
+            const fieldType = field.type;
 
-          if (isObjectType(fieldType)) {
-            const fields = fieldType.getFields();
+            if (isObjectType(fieldType)) {
+              const fields = fieldType.getFields();
 
-            if (fields.items && isListType(fields.items.type)) {
-              result.add(fields.items.type.ofType.toString());
-            } else {
-              result.add(fieldType.toString());
+              if (fields.items && isListType(fields.items.type)) {
+                result.add(fields.items.type.ofType.toString());
+              } else {
+                result.add(fieldType.toString());
+              }
             }
           }
         }

package/es/graphql/ast.js

@@ -1,17 +1,18 @@
+import { Kind } from 'graphql/language';
 export function createArgument({
   name,
   value
 }) {
   return {
-    kind: 'Argument',
+    kind: Kind.ARGUMENT,
     name: {
-      kind: 'Name',
+      kind: Kind.NAME,
       value: name
     },
     value: {
-      kind: 'Variable',
+      kind: Kind.VARIABLE,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value
       }
     }
@@ -20,7 +21,7 @@ export function createArgument({
 
 function notNull(type) {
   return {
-    kind: 'NonNullType',
+    kind: Kind.NON_NULL_TYPE,
     type
   };
 }
@@ -29,9 +30,9 @@ function createType(typeString) {
   const isNotNull = typeString.endsWith('!');
   const value = isNotNull ? typeString.slice(0, typeString.length - 1) : typeString;
   const namedType = {
-    kind: 'NamedType',
+    kind: Kind.NAMED_TYPE,
     name: {
-      kind: 'Name',
+      kind: Kind.NAME,
       value
     }
   };
@@ -43,12 +44,12 @@ export function createVariableDefinition({
   type
 }) {
   return {
-    kind: 'VariableDefinition',
+    kind: Kind.VARIABLE_DEFINITION,
     directives: [],
     variable: {
-      kind: 'Variable',
+      kind: Kind.VARIABLE,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value: name
       }
     },
@@ -57,15 +58,15 @@ export function createVariableDefinition({
 }
 export function createSelectionSet(selections) {
   return {
-    kind: 'SelectionSet',
+    kind: Kind.SELECTION_SET,
     selections
   };
 }
 export function createField(name) {
   return {
-    kind: 'Field',
+    kind: Kind.FIELD,
     name: {
-      kind: 'Name',
+      kind: Kind.NAME,
       value: name
     },
     arguments: [],
@@ -110,11 +111,11 @@ export function addQueryVariables(variables, ast) {
 }
 export function wrapSelectionSet(selectionSet, name, args = []) {
   return {
-    kind: 'SelectionSet',
+    kind: Kind.SELECTION_SET,
     selections: [{
-      kind: 'Field',
+      kind: Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value: name
       },
       arguments: args,

package/es/graphql/migrate.js

@@ -1,23 +1,23 @@
-import { getLocation, print } from 'graphql/language';
+import { getLocation, Kind, print } from 'graphql/language';
 import { updateQuery } from './ast';
-import { parse } from 'graphql';
+import { parse, Source } from 'graphql';
 
 function wrapListQuerySelection(selectionSet) {
   return {
-    kind: 'SelectionSet',
+    kind: Kind.SELECTION_SET,
     selections: [{
-      kind: 'Field',
+      kind: Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value: 'items'
       },
       arguments: [],
       directives: [],
       selectionSet
     }, {
-      kind: 'Field',
+      kind: Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value: 'total'
       },
       arguments: [],
@@ -39,17 +39,13 @@ function isOldListQuery(selection) {
 }
 
 const startLocation = {
-  line: 0,
-  column: 0
+  line: 1,
+  column: 1
 };
 export function formatWarning(name, loc, queryStr, source) {
-  const location = queryStr && loc && source ? getLocation({
-    body: queryStr,
-    name: source,
-    locationOffset: startLocation
-  }, loc.start) : {
-    line: 0,
-    column: 0
+  const location = queryStr && loc && source ? getLocation(new Source(queryStr, source, startLocation), loc.start) : {
+    line: 1,
+    column: 1
   };
   return {
     message: `Using old format of ${name} Line ${location.line} Column ${location.column}`,

package/es/graphql/pagination.js

@@ -59,19 +59,22 @@ export function findPaginatedFields(ast, schema) {
       enter(node, _, __, path) {
         queryPath.push(node.alias ? node.alias.value : node.name.value);
         const fieldDef = typeInfo.getFieldDef();
-        const strategy = getPaginationStrategy(fieldDef);
-
-        if (strategy) {
-          result.push({
-            strategy,
-            fromVarName: getVariableName(queryPath, strategy.fromName),
-            sizeVarName: getVariableName(queryPath, strategy.sizeName),
-            astPath: path.map(String),
-            queryPath: queryPath.slice()
-          }); // Skip child nodes
-
-          queryPath.pop();
-          return false;
+
+        if (fieldDef) {
+          const strategy = getPaginationStrategy(fieldDef);
+
+          if (strategy) {
+            result.push({
+              strategy,
+              fromVarName: getVariableName(queryPath, strategy.fromName),
+              sizeVarName: getVariableName(queryPath, strategy.sizeName),
+              astPath: path.map(String),
+              queryPath: queryPath.slice()
+            }); // Skip child nodes
+
+            queryPath.pop();
+            return false;
+          }
         }
       },
 

package/es/graphql/query.js

@@ -1,5 +1,5 @@
-import { print, TypeInfo, visit, visitWithTypeInfo, parse } from 'graphql';
-import { addQueryVariables, wrapQuery, createArgument, createVariableDefinition, updateQuery } from './ast';
+import { Kind, parse, print, TypeInfo, visit, visitWithTypeInfo } from 'graphql';
+import { addQueryVariables, createArgument, createVariableDefinition, updateQuery, wrapQuery } from './ast';
 export function getItemType(fieldType) {
   return 'ofType' in fieldType ? fieldType.ofType : fieldType;
 }
@@ -12,9 +12,9 @@ function addId(node) {
 
   if (selections && !selections.find(selection => (selection.kind === 'Field' || selection.kind === 'FragmentSpread') && selection.name.value === '_id')) {
     selections.push({
-      kind: 'Field',
+      kind: Kind.FIELD,
       name: {
-        kind: 'Name',
+        kind: Kind.NAME,
         value: '_id'
       },
       arguments: [],
@@ -75,24 +75,27 @@ export function addContentIdFilter(ast, schema) {
 
         if (matches) {
           const fieldDef = typeInfo.getFieldDef();
-          const filterArgType = fieldDef.args.find(arg => arg.name === 'filter');
-
-          if (filterArgType) {
-            filterType = filterArgType.type.toString();
-            const filterArgAst = createArgument({
-              name: 'filter',
-              value: FILTER_VAR_NAME
-            });
-            return { ...node,
-              arguments: node.arguments ? node.arguments.filter(arg => {
-                if (arg.name.value === 'filter' && arg.value.kind === 'Variable') {
-                  varsToRemove.add(arg.value.name.value);
-                  return false;
-                }
-
-                return true;
-              }).concat(filterArgAst) : [filterArgAst]
-            };
+
+          if (fieldDef) {
+            const filterArgType = fieldDef.args.find(arg => arg.name === 'filter');
+
+            if (filterArgType) {
+              filterType = filterArgType.type.toString();
+              const filterArgAst = createArgument({
+                name: 'filter',
+                value: FILTER_VAR_NAME
+              });
+              return { ...node,
+                arguments: node.arguments ? node.arguments.filter(arg => {
+                  if (arg.name.value === 'filter' && arg.value.kind === 'Variable') {
+                    varsToRemove.add(arg.value.name.value);
+                    return false;
+                  }
+
+                  return true;
+                }).concat(filterArgAst) : [filterArgAst]
+              };
+            }
           }
         }
       }

package/es/graphql/schema-connector-factory.js

@@ -78,7 +78,13 @@ export function schemaConnectorFactory(cwd, config) {
     connector = async params => {
       var _res$errors;
 
-      const res = await graphql(schema.default || schema, params.query, null, {}, params.variables);
+      const res = await graphql({
+        schema: schema.default || schema,
+        source: params.query,
+        rootValue: null,
+        contextValue: {},
+        variableValues: params.variables
+      });
       return {
         data: res.data,
         errors: (_res$errors = res.errors) === null || _res$errors === void 0 ? void 0 : _res$errors.map(formatError)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/ssg",
-  "version": "9.7.1",
+  "version": "9.9.0",
   "description": "Static Site Generator",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -27,7 +27,7 @@
     "d3-format": "^1.3.2",
     "es6-error": "^4.1.1",
     "fs-extra": "^9.0.1",
-    "graphql": "15.6.0",
+    "graphql": "16.6.0",
     "js-yaml": "^3.14.1",
     "json-variables": "^10.0.5",
     "lodash": "^4.17.20",
@@ -39,9 +39,9 @@
     "prismjs": "^1.22.0",
     "pumpify": "^2.0.1",
     "resolve": "^1.19.0",
-    "@takeshape/util": "9.7.1",
-    "@takeshape/routing": "9.7.1",
-    "@takeshape/streams": "9.7.1"
+    "@takeshape/routing": "9.9.0",
+    "@takeshape/streams": "9.9.0",
+    "@takeshape/util": "9.9.0"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.33",