@takeshape/ssg 7.209.0 → 7.211.1

package/es/generate/generate.js

@@ -157,7 +157,7 @@ function renderTemplates(generateContext) {
     globalContext,
     pathPrefix
   } = generateContext;
-  return async (routes) => BbPromise.map(routes, async route => {
+  return async routes => BbPromise.map(routes, async route => {
     const routeContext = await resolveRouteContext(generateContext, route);
     const context = combineContext(config.env, globalContext, route, routeContext);
     const path = joinPath(pathPrefix, route.path);

package/es/generate/types.js

@@ -0,0 +1 @@
+export {};

package/es/graphql/analyze.js

@@ -1,6 +1,5 @@
 import BbPromise from 'bluebird';
-import { TypeInfo, visit, visitWithTypeInfo, isObjectType, isListType, getLocation } from 'graphql';
-import { parse } from './ast';
+import { TypeInfo, parse, visit, visitWithTypeInfo, isObjectType, isListType, getLocation } from 'graphql';
 import { getFields, getItemType } from './query';
 import { getGraphQLQueries } from '../config';
 import path from 'path';

package/es/graphql/ast.js

@@ -1,7 +1,3 @@
-import { parse as baseParse } from 'graphql';
-export function parse(source, options) {
-  return baseParse(source, options);
-}
 export function createArgument({
   name,
   value
@@ -82,18 +78,35 @@ export function isQueryNode(node) {
 export function findQuery(ast) {
   return ast.definitions.find(isQueryNode);
 }
-export function addQueryVariables(variables, ast) {
-  const query = findQuery(ast);
+export function updateQuery(ast, update) {
+  const index = ast.definitions.findIndex(isQueryNode);
+
+  if (index !== -1) {
+    const {
+      definitions,
+      ...rest
+    } = ast;
+    const updatedDefinitions = [...definitions];
+    updatedDefinitions[index] = update(definitions[index]);
+    return { ...rest,
+      definitions: updatedDefinitions
+    };
+  }
 
-  if (query) {
+  return ast;
+}
+export function addQueryVariables(variables, ast) {
+  return updateQuery(ast, query => {
     const variableNames = new Set(variables.map(variable => variable.name));
 
     if (query.variableDefinitions) {
-      query.variableDefinitions = query.variableDefinitions.filter(def => !variableNames.has(def.variable.name.value)).concat(variables.map(createVariableDefinition));
+      return { ...query,
+        variableDefinitions: query.variableDefinitions.filter(def => !variableNames.has(def.variable.name.value)).concat(variables.map(createVariableDefinition))
+      };
     }
-  }
 
-  return ast;
+    return query;
+  });
 }
 export function wrapSelectionSet(selectionSet, name, args = []) {
   return {
@@ -111,12 +124,10 @@ export function wrapSelectionSet(selectionSet, name, args = []) {
   };
 }
 export function wrapQuery(name, args, ast) {
-  const query = findQuery(ast);
-
-  if (query) {
+  return updateQuery(ast, query => {
     const argsAst = args.map(createArgument);
-    query.selectionSet = wrapSelectionSet(query.selectionSet, name, argsAst);
-  }
-
-  return ast;
+    return { ...query,
+      selectionSet: wrapSelectionSet(query.selectionSet, name, argsAst)
+    };
+  });
 }

package/es/graphql/client-schema.js

@@ -1,7 +1,7 @@
-import { introspectionQuery, buildClientSchema } from 'graphql';
+import { getIntrospectionQuery, buildClientSchema } from 'graphql';
 export async function getClientSchema(connector) {
   const res = await connector({
-    query: introspectionQuery
+    query: getIntrospectionQuery()
   }, {
     applyMigrations: false
   });

package/es/graphql/migrate.js

@@ -1,5 +1,6 @@
 import { getLocation, print } from 'graphql/language';
-import { isQueryNode, parse } from './ast';
+import { updateQuery } from './ast';
+import { parse } from 'graphql';
 
 function wrapListQuerySelection(selectionSet) {
   return {
@@ -79,21 +80,26 @@ export function migrateListQueries(ast, queryStr, source) {
   let migrated = false;
   const migratedProps = [];
   const warnings = [];
-  const queryDef = ast.definitions.find(isQueryNode);
+  const updatedAst = updateQuery(ast, queryDef => {
+    return { ...queryDef,
+      selectionSet: { ...queryDef.selectionSet,
+        selections: queryDef.selectionSet.selections.map(selection => {
+          if (isOldListQuery(selection) && selection.selectionSet) {
+            migratedProps.push(selection.alias ? selection.alias.value : selection.name.value);
+            migrated = true;
+            warnings.push(formatWarning(selection.name.value, selection.loc, queryStr, source));
+            return { ...selection,
+              selectionSet: wrapListQuerySelection(selection.selectionSet)
+            };
+          }
 
-  if (queryDef) {
-    for (const selection of queryDef.selectionSet.selections) {
-      if (isOldListQuery(selection) && selection.selectionSet) {
-        migratedProps.push(selection.alias ? selection.alias.value : selection.name.value);
-        migrated = true;
-        selection.selectionSet = wrapListQuerySelection(selection.selectionSet);
-        warnings.push(formatWarning(selection.name.value, selection.loc, queryStr, source));
+          return selection;
+        })
       }
-    }
-  }
-
+    };
+  });
   return {
-    ast,
+    ast: updatedAst,
     warnings,
     migrated,
     mapResponse: migrated ? getMapResponse(migratedProps) : null

package/es/graphql/pagination.js

@@ -116,11 +116,10 @@ export function addPaginationVariables(ast, paginatedFields) {
       fromName
     } = strategy;
     updateIn(ast, paginatedField.astPath, field => {
-      const newField = { ...field
-      };
+      let args;
 
       if (field.arguments) {
-        newField.arguments = field.arguments.filter(arg => {
+        args = field.arguments.filter(arg => {
           const name = arg.name.value;
 
           if (name === sizeName || name === fromName) {
@@ -133,11 +132,11 @@ export function addPaginationVariables(ast, paginatedFields) {
 
           return true;
         });
-        newField.arguments.push(createArgument({
+        args.push(createArgument({
           name: fromName,
           value: fromVarName
         }));
-        newField.arguments.push(createArgument({
+        args.push(createArgument({
           name: sizeName,
           value: sizeVarName
         }));
@@ -151,14 +150,18 @@ export function addPaginationVariables(ast, paginatedFields) {
         name: sizeVarName,
         type: 'Int'
       });
-      return newField;
+      return args ? { ...field,
+        arguments: args
+      } : field;
     });
   }
 
   const queryPath = paginatedFields[0].astPath.slice(0, 2);
   updateIn(ast, queryPath, query => {
     if (query.variableDefinitions) {
-      query.variableDefinitions = query.variableDefinitions.filter(def => !variablesToReplace[def.variable.name.value]).concat(variables.map(createVariableDefinition));
+      return { ...query,
+        variableDefinitions: query.variableDefinitions.filter(def => !variablesToReplace[def.variable.name.value]).concat(variables.map(createVariableDefinition))
+      };
     }
 
     return query;

package/es/graphql/query.js

@@ -1,5 +1,5 @@
-import { print, TypeInfo, visit, visitWithTypeInfo } from 'graphql';
-import { addQueryVariables, wrapQuery, parse, createArgument, findQuery, createVariableDefinition } from './ast';
+import { print, TypeInfo, visit, visitWithTypeInfo, parse } from 'graphql';
+import { addQueryVariables, wrapQuery, createArgument, createVariableDefinition, updateQuery } from './ast';
 export function getItemType(fieldType) {
   return 'ofType' in fieldType ? fieldType.ofType : fieldType;
 }
@@ -99,18 +99,19 @@ export function addContentIdFilter(ast, schema) {
 
     }
   };
-  const updatedAst = visit(ast, visitWithTypeInfo(typeInfo, visitor));
+  let updatedAst = visit(ast, visitWithTypeInfo(typeInfo, visitor));
 
   if (filterType) {
-    const query = findQuery(updatedAst);
-
-    if (query) {
+    const type = filterType;
+    updatedAst = updateQuery(updatedAst, query => {
       const variableDef = createVariableDefinition({
         name: FILTER_VAR_NAME,
-        type: filterType
+        type
       });
-      query.variableDefinitions = query.variableDefinitions ? query.variableDefinitions.filter(def => !varsToRemove.has(def.variable.name.value)).concat(variableDef) : [variableDef];
-    }
+      return { ...query,
+        variableDefinitions: query.variableDefinitions ? query.variableDefinitions.filter(def => !varsToRemove.has(def.variable.name.value)).concat(variableDef) : [variableDef]
+      };
+    });
   }
 
   return {

package/es/types.js

@@ -0,0 +1 @@
+export {};

package/lib/generate/generate.js

@@ -50,9 +50,9 @@ var _compose = _interopRequireDefault(require("lodash/fp/compose"));
 
 var _gzip = _interopRequireDefault(require("../gzip"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -199,7 +199,7 @@ function renderTemplates(generateContext) {
     globalContext,
     pathPrefix
   } = generateContext;
-  return async (routes) => _bluebird.default.map(routes, async route => {
+  return async routes => _bluebird.default.map(routes, async route => {
     const routeContext = await resolveRouteContext(generateContext, route);
     const context = (0, _context.combineContext)(config.env, globalContext, route, routeContext);
     const path = (0, _paths.joinPath)(pathPrefix, route.path);

package/lib/generate/index.js

@@ -18,6 +18,6 @@ Object.defineProperty(exports, "generateRoute", {
 
 var _generate = _interopRequireWildcard(require("./generate"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/generate/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/graphql/analyze.d.ts

@@ -1,5 +1,4 @@
-import { GraphQLSchema } from 'graphql';
-import { DocumentNode } from './ast';
+import { DocumentNode, GraphQLSchema } from 'graphql';
 import { Config, FileLoader, RouteInfo } from '../config';
 interface FileInfo {
     body: string;

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

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/graphql/analyze.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EAQd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,YAAY,EAAQ,MAAM,OAAO,CAAC;AAE1C,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,CAoBvG"}
+{"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,CAoBvG"}

package/lib/graphql/analyze.js

@@ -11,8 +11,6 @@ var _bluebird = _interopRequireDefault(require("bluebird"));
 
 var _graphql = require("graphql");
 
-var _ast = require("./ast");
-
 var _query = require("./query");
 
 var _config = require("../config");
@@ -111,7 +109,7 @@ async function getTypeUsage({
       ...info
     } = routeQuery;
     const queryString = await fileLoader(_path.default.join(config.templatePath, filePath));
-    const types = detectTypes((0, _ast.parse)(queryString), schema);
+    const types = detectTypes((0, _graphql.parse)(queryString), schema);
 
     for (const type of types) {
       if (!result[type]) {

package/lib/graphql/ast.d.ts

@@ -1,7 +1,4 @@
-import { DocumentNode as ReadOnlyDocumentNode, OperationDefinitionNode as ReadOnlyOperationDefinitionNode, DefinitionNode as ReadOnlyDefinitionNode, FieldNode as ReadOnlyFieldNode, SelectionSetNode as ReadOnlySelectionSetNode, SelectionNode as ReadOnlySelectionNode, ArgumentNode as ReadOnlyArgumentNode, VariableDefinitionNode as ReadOnlyVariableDefinitionNode } from 'graphql/language/ast';
-import { WritableProps } from '../types';
-import { Source } from 'graphql/language/source';
-import { ParseOptions } from 'graphql/language/parser';
+import { DocumentNode, OperationDefinitionNode, DefinitionNode, FieldNode, SelectionSetNode, SelectionNode, ArgumentNode, VariableDefinitionNode } from 'graphql/language/ast';
 export interface Arg {
     name: string;
     value: string;
@@ -10,21 +7,13 @@ export interface Var {
     name: string;
     type: string;
 }
-export declare type DocumentNode = WritableProps<ReadOnlyDocumentNode>;
-export declare type OperationDefinitionNode = WritableProps<ReadOnlyOperationDefinitionNode>;
-export declare type SelectionSetNode = WritableProps<ReadOnlySelectionSetNode>;
-export declare type FieldNode = WritableProps<ReadOnlyFieldNode>;
-export declare type ArgumentNode = WritableProps<ReadOnlyArgumentNode>;
-export declare type DefinitionNode = WritableProps<ReadOnlyDefinitionNode>;
-export declare type SelectionNode = WritableProps<ReadOnlySelectionNode>;
-export declare type VariableDefinitionNode = WritableProps<ReadOnlyVariableDefinitionNode>;
-export declare function parse(source: string | Source, options?: ParseOptions): DocumentNode;
 export declare function createArgument({ name, value }: Arg): ArgumentNode;
 export declare function createVariableDefinition({ name, type }: Var): VariableDefinitionNode;
 export declare function createSelectionSet(selections: SelectionNode[]): SelectionSetNode;
 export declare function createField(name: string): FieldNode;
 export declare function isQueryNode(node: DefinitionNode): node is OperationDefinitionNode;
 export declare function findQuery(ast: DocumentNode): OperationDefinitionNode | undefined;
+export declare function updateQuery(ast: DocumentNode, update: (query: OperationDefinitionNode) => OperationDefinitionNode): DocumentNode;
 export declare function addQueryVariables(variables: Var[], ast: DocumentNode): DocumentNode;
 export declare function wrapSelectionSet(selectionSet: SelectionSetNode, name: string, args?: ArgumentNode[]): SelectionSetNode;
 export declare function wrapQuery(name: string, args: Arg[], ast: DocumentNode): DocumentNode;

package/lib/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,IAAI,oBAAoB,EACpC,uBAAuB,IAAI,+BAA+B,EAC1D,cAAc,IAAI,sBAAsB,EACxC,SAAS,IAAI,iBAAiB,EAC9B,gBAAgB,IAAI,wBAAwB,EAC5C,aAAa,IAAI,qBAAqB,EACtC,YAAY,IAAI,oBAAoB,EACpC,sBAAsB,IAAI,8BAA8B,EAGzD,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,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,oBAAY,YAAY,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AAC/D,oBAAY,uBAAuB,GAAG,aAAa,CAAC,+BAA+B,CAAC,CAAC;AACrF,oBAAY,gBAAgB,GAAG,aAAa,CAAC,wBAAwB,CAAC,CAAC;AACvE,oBAAY,SAAS,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACzD,oBAAY,YAAY,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AAC/D,oBAAY,cAAc,GAAG,aAAa,CAAC,sBAAsB,CAAC,CAAC;AACnE,oBAAY,aAAa,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;AACjE,oBAAY,sBAAsB,GAAG,aAAa,CAAC,8BAA8B,CAAC,CAAC;AAEnF,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,YAAY,CAEnF;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;AACD,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,iBAAiB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAanF;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,CAOpF"}
+{"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;AACD,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,CASd;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,CAanF;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/lib/graphql/ast.js

@@ -3,23 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parse = parse;
 exports.createArgument = createArgument;
 exports.createVariableDefinition = createVariableDefinition;
 exports.createSelectionSet = createSelectionSet;
 exports.createField = createField;
 exports.isQueryNode = isQueryNode;
 exports.findQuery = findQuery;
+exports.updateQuery = updateQuery;
 exports.addQueryVariables = addQueryVariables;
 exports.wrapSelectionSet = wrapSelectionSet;
 exports.wrapQuery = wrapQuery;
 
-var _graphql = require("graphql");
-
-function parse(source, options) {
-  return (0, _graphql.parse)(source, options);
-}
-
 function createArgument({
   name,
   value
@@ -105,18 +99,36 @@ function findQuery(ast) {
   return ast.definitions.find(isQueryNode);
 }
 
-function addQueryVariables(variables, ast) {
-  const query = findQuery(ast);
+function updateQuery(ast, update) {
+  const index = ast.definitions.findIndex(isQueryNode);
+
+  if (index !== -1) {
+    const {
+      definitions,
+      ...rest
+    } = ast;
+    const updatedDefinitions = [...definitions];
+    updatedDefinitions[index] = update(definitions[index]);
+    return { ...rest,
+      definitions: updatedDefinitions
+    };
+  }
+
+  return ast;
+}
 
-  if (query) {
+function addQueryVariables(variables, ast) {
+  return updateQuery(ast, query => {
     const variableNames = new Set(variables.map(variable => variable.name));
 
     if (query.variableDefinitions) {
-      query.variableDefinitions = query.variableDefinitions.filter(def => !variableNames.has(def.variable.name.value)).concat(variables.map(createVariableDefinition));
+      return { ...query,
+        variableDefinitions: query.variableDefinitions.filter(def => !variableNames.has(def.variable.name.value)).concat(variables.map(createVariableDefinition))
+      };
     }
-  }
 
-  return ast;
+    return query;
+  });
 }
 
 function wrapSelectionSet(selectionSet, name, args = []) {
@@ -136,12 +148,10 @@ function wrapSelectionSet(selectionSet, name, args = []) {
 }
 
 function wrapQuery(name, args, ast) {
-  const query = findQuery(ast);
-
-  if (query) {
+  return updateQuery(ast, query => {
     const argsAst = args.map(createArgument);
-    query.selectionSet = wrapSelectionSet(query.selectionSet, name, argsAst);
-  }
-
-  return ast;
+    return { ...query,
+      selectionSet: wrapSelectionSet(query.selectionSet, name, argsAst)
+    };
+  });
 }

package/lib/graphql/client-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-schema.d.ts","sourceRoot":"","sources":["../../../src/graphql/client-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,aAAa,EAAqB,MAAM,SAAS,CAAC;AACjG,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE1C,wBAAsB,eAAe,CAAC,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAOzF"}
+{"version":3,"file":"client-schema.d.ts","sourceRoot":"","sources":["../../../src/graphql/client-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,aAAa,EAAqB,MAAM,SAAS,CAAC;AACpG,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE1C,wBAAsB,eAAe,CAAC,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAOzF"}

package/lib/graphql/client-schema.js

@@ -9,7 +9,7 @@ var _graphql = require("graphql");
 
 async function getClientSchema(connector) {
   const res = await connector({
-    query: _graphql.introspectionQuery
+    query: (0, _graphql.getIntrospectionQuery)()
   }, {
     applyMigrations: false
   });

package/lib/graphql/migrate.d.ts

@@ -1,6 +1,6 @@
 import { Location, SourceLocation } from 'graphql/language';
 import { GraphQLConnector, GraphQLResult } from '../types';
-import { DocumentNode } from './ast';
+import { DocumentNode } from 'graphql';
 export declare function formatWarning(name: string, loc?: Location, queryStr?: string, source?: string): Warning;
 export declare type MapGraphQLResponse = (res: GraphQLResult) => GraphQLResult;
 export declare function getMapResponse(props: string[]): MapGraphQLResponse;

package/lib/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;AAC1G,OAAO,EAML,YAAY,EAEb,MAAM,OAAO,CAAC;AA8Cf,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,CAYlE;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,CAuBlH;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,gBAAgB,CAsBrF"}
+{"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;AA8CxF,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,CAYlE;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,CA6BlH;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,gBAAgB,CAsBrF"}

package/lib/graphql/migrate.js

@@ -12,6 +12,8 @@ var _language = require("graphql/language");
 
 var _ast = require("./ast");
 
+var _graphql = require("graphql");
+
 function wrapListQuerySelection(selectionSet) {
   return {
     kind: 'SelectionSet',
@@ -93,21 +95,26 @@ function migrateListQueries(ast, queryStr, source) {
   let migrated = false;
   const migratedProps = [];
   const warnings = [];
-  const queryDef = ast.definitions.find(_ast.isQueryNode);
-
-  if (queryDef) {
-    for (const selection of queryDef.selectionSet.selections) {
-      if (isOldListQuery(selection) && selection.selectionSet) {
-        migratedProps.push(selection.alias ? selection.alias.value : selection.name.value);
-        migrated = true;
-        selection.selectionSet = wrapListQuerySelection(selection.selectionSet);
-        warnings.push(formatWarning(selection.name.value, selection.loc, queryStr, source));
+  const updatedAst = (0, _ast.updateQuery)(ast, queryDef => {
+    return { ...queryDef,
+      selectionSet: { ...queryDef.selectionSet,
+        selections: queryDef.selectionSet.selections.map(selection => {
+          if (isOldListQuery(selection) && selection.selectionSet) {
+            migratedProps.push(selection.alias ? selection.alias.value : selection.name.value);
+            migrated = true;
+            warnings.push(formatWarning(selection.name.value, selection.loc, queryStr, source));
+            return { ...selection,
+              selectionSet: wrapListQuerySelection(selection.selectionSet)
+            };
+          }
+
+          return selection;
+        })
       }
-    }
-  }
-
+    };
+  });
   return {
-    ast,
+    ast: updatedAst,
     warnings,
     migrated,
     mapResponse: migrated ? getMapResponse(migratedProps) : null
@@ -127,7 +134,7 @@ function connectorWithMigrations(connector) {
     let {
       query
     } = gqlParams;
-    const queryAst = (0, _ast.parse)(query);
+    const queryAst = (0, _graphql.parse)(query);
     const {
       migrated,
       warnings,

package/lib/graphql/pagination.d.ts

@@ -1,6 +1,5 @@
 import '../async-iterator-polyfill';
-import { DocumentNode } from './ast';
-import { GraphQLSchema } from 'graphql';
+import { GraphQLSchema, DocumentNode } from 'graphql';
 import { Data, GraphQLConnector, Stats } from '../types';
 export interface PaginationStrategy {
     type: string;

package/lib/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;AACpC,OAAO,EAKL,YAAY,EAKb,MAAM,OAAO,CAAC;AAKf,OAAO,EAAmD,aAAa,EAA2B,MAAM,SAAS,CAAC;AAGlH,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,CAgDzG;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,CA0D9B"}
+{"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,CA0D9B"}

package/lib/graphql/pagination.js

@@ -142,11 +142,10 @@ function addPaginationVariables(ast, paginatedFields) {
       fromName
     } = strategy;
     (0, _util.updateIn)(ast, paginatedField.astPath, field => {
-      const newField = { ...field
-      };
+      let args;
 
       if (field.arguments) {
-        newField.arguments = field.arguments.filter(arg => {
+        args = field.arguments.filter(arg => {
           const name = arg.name.value;
 
           if (name === sizeName || name === fromName) {
@@ -159,11 +158,11 @@ function addPaginationVariables(ast, paginatedFields) {
 
           return true;
         });
-        newField.arguments.push((0, _ast.createArgument)({
+        args.push((0, _ast.createArgument)({
           name: fromName,
           value: fromVarName
         }));
-        newField.arguments.push((0, _ast.createArgument)({
+        args.push((0, _ast.createArgument)({
           name: sizeName,
           value: sizeVarName
         }));
@@ -177,14 +176,18 @@ function addPaginationVariables(ast, paginatedFields) {
         name: sizeVarName,
         type: 'Int'
       });
-      return newField;
+      return args ? { ...field,
+        arguments: args
+      } : field;
     });
   }
 
   const queryPath = paginatedFields[0].astPath.slice(0, 2);
   (0, _util.updateIn)(ast, queryPath, query => {
     if (query.variableDefinitions) {
-      query.variableDefinitions = query.variableDefinitions.filter(def => !variablesToReplace[def.variable.name.value]).concat(variables.map(_ast.createVariableDefinition));
+      return { ...query,
+        variableDefinitions: query.variableDefinitions.filter(def => !variablesToReplace[def.variable.name.value]).concat(variables.map(_ast.createVariableDefinition))
+      };
     }
 
     return query;

package/lib/graphql/query.d.ts

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

package/lib/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,EAGlB,MAAM,SAAS,CAAC;AACjB,OAAO,EAGL,YAAY,EAKb,MAAM,OAAO,CAAC;AACf,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,CAqDrG;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,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,CAwDrG;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/lib/graphql/query.js

@@ -120,18 +120,19 @@ function addContentIdFilter(ast, schema) {
 
     }
   };
-  const updatedAst = (0, _graphql.visit)(ast, (0, _graphql.visitWithTypeInfo)(typeInfo, visitor));
+  let updatedAst = (0, _graphql.visit)(ast, (0, _graphql.visitWithTypeInfo)(typeInfo, visitor));
 
   if (filterType) {
-    const query = (0, _ast.findQuery)(updatedAst);
-
-    if (query) {
+    const type = filterType;
+    updatedAst = (0, _ast.updateQuery)(updatedAst, query => {
       const variableDef = (0, _ast.createVariableDefinition)({
         name: FILTER_VAR_NAME,
-        type: filterType
+        type
       });
-      query.variableDefinitions = query.variableDefinitions ? query.variableDefinitions.filter(def => !varsToRemove.has(def.variable.name.value)).concat(variableDef) : [variableDef];
-    }
+      return { ...query,
+        variableDefinitions: query.variableDefinitions ? query.variableDefinitions.filter(def => !varsToRemove.has(def.variable.name.value)).concat(variableDef) : [variableDef]
+      };
+    });
   }
 
   return {
@@ -149,7 +150,7 @@ function withQueryTransforms(connector, schema, {
   return async (gqlParams, context) => {
     const variables = { ...gqlParams.variables
     };
-    let queryAst = (0, _ast.parse)(gqlParams.query);
+    let queryAst = (0, _graphql.parse)(gqlParams.query);
 
     if (usage) {
       queryAst = ensureIds(queryAst, schema);

package/lib/index.js

@@ -78,6 +78,6 @@ Object.keys(_errors).forEach(function (key) {
   });
 });
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/ssg",
-  "version": "7.209.0",
+  "version": "7.211.1",
   "description": "Static Site Generator",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -20,9 +20,9 @@
     "es"
   ],
   "dependencies": {
-    "@takeshape/routing": "7.209.0",
-    "@takeshape/streams": "7.209.0",
-    "@takeshape/util": "7.209.0",
+    "@takeshape/routing": "7.211.1",
+    "@takeshape/streams": "7.211.1",
+    "@takeshape/util": "7.211.1",
     "@takeshape/vm-nunjucks": "^0.3.0",
     "async-iterator-to-stream": "^1.2.0",
     "bluebird": "^3.7.2",
@@ -30,7 +30,7 @@
     "d3-format": "^1.3.2",
     "es6-error": "^4.1.1",
     "fs-extra": "^9.0.1",
-    "graphql": "14.7.0",
+    "graphql": "15.6.0",
     "js-yaml": "^3.14.1",
     "json-variables": "^10.0.5",
     "lodash": "^4.17.20",