houdini 0.13.3-alpha.0 → 0.13.6

package/build/cmd/generate.js

@@ -102,10 +102,14 @@ exports.runPipeline = function (config, docs) { return __awaiter(void 0, void 0,
         switch (_a.label) {
             case 0: 
             // we need to create the runtime folder structure
-            return [4 /*yield*/, config.createDirectories()];
+            return [4 /*yield*/, config.createDirectories()
+                // reset the newSchema accumulator
+            ];
             case 1:
                 // we need to create the runtime folder structure
                 _a.sent();
+                // reset the newSchema accumulator
+                config.newSchema = '';
                 return [4 /*yield*/, houdini_common_1.runPipeline(config, [
                         validators.typeCheck,
                         validators.uniqueNames,
@@ -125,6 +129,7 @@ exports.runPipeline = function (config, docs) { return __awaiter(void 0, void 0,
                         generators.runtime,
                         generators.typescript,
                         generators.persistOutput,
+                        generators.schema,
                     ], docs)];
             case 2:
                 _a.sent();

package/build/cmd/generators/index.d.ts

@@ -2,3 +2,4 @@ export { default as artifacts } from './artifacts';
 export { default as runtime } from './runtime';
 export { default as typescript } from './typescript';
 export { default as persistOutput } from './persistedQueries';
+export { default as schema } from './schema';

package/build/cmd/generators/index.js

@@ -8,3 +8,5 @@ var typescript_1 = require("./typescript");
 Object.defineProperty(exports, "typescript", { enumerable: true, get: function () { return typescript_1.default; } });
 var persistedQueries_1 = require("./persistedQueries");
 Object.defineProperty(exports, "persistOutput", { enumerable: true, get: function () { return persistedQueries_1.default; } });
+var schema_1 = require("./schema");
+Object.defineProperty(exports, "schema", { enumerable: true, get: function () { return schema_1.default; } });

package/build/cmd/generators/schema/index.d.ts

@@ -0,0 +1,3 @@
+import { Config } from 'houdini-common';
+import { CollectedGraphQLDocument } from '../../types';
+export default function schemaGenerator(config: Config, docs: CollectedGraphQLDocument[]): Promise<void>;

package/build/cmd/generators/schema/index.js

@@ -0,0 +1,63 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var promises_1 = __importDefault(require("fs/promises"));
+// schemaGenerator updates the schema file to contain all of the generated
+// definitions
+function schemaGenerator(config, docs) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!config.newSchema) {
+                        return [2 /*return*/];
+                    }
+                    // print the updated version of the schema over the existing one
+                    return [4 /*yield*/, promises_1.default.writeFile(config.definitionsPath, config.newSchema, 'utf-8')];
+                case 1:
+                    // print the updated version of the schema over the existing one
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.default = schemaGenerator;

package/build/cmd/generators/typescript/index.js

@@ -166,11 +166,12 @@ function typescriptGenerator(config, docs) {
 exports.default = typescriptGenerator;
 function generateOperationTypeDefs(config, body, definition, selections, visitedTypes) {
     return __awaiter(this, void 0, void 0, function () {
-        var inputTypeName, shapeTypeName, type, hasInputs, _a, _b, variableDefinition;
+        var inputTypeName, shapeTypeName, afterLoadTypeName, type, hasInputs, _a, _b, variableDefinition;
         var e_1, _c;
         return __generator(this, function (_d) {
             inputTypeName = definition.name.value + "$input";
             shapeTypeName = definition.name.value + "$result";
+            afterLoadTypeName = definition.name.value + "$afterLoad";
             if (definition.operation === 'query') {
                 type = config.schema.getQueryType();
             }
@@ -206,6 +207,12 @@ function generateOperationTypeDefs(config, body, definition, selections, visited
                 visitedTypes: visitedTypes,
                 body: body,
             }))));
+            // generate type for the afterload function
+            body.push(AST.exportNamedDeclaration(AST.tsTypeAliasDeclaration(AST.identifier(afterLoadTypeName), AST.tsTypeLiteral([
+                types_1.readonlyProperty(AST.tsPropertySignature(AST.stringLiteral('data'), AST.tsTypeAnnotation(AST.tsTypeLiteral([
+                    types_1.readonlyProperty(AST.tsPropertySignature(AST.stringLiteral(definition.name.value), AST.tsTypeAnnotation(AST.tsTypeReference(AST.identifier(shapeTypeName))))),
+                ])))),
+            ]))));
             // if there are variables in this query
             if (hasInputs && definition.variableDefinitions && definition.variableDefinitions.length > 0) {
                 try {

package/build/cmd/transforms/list.js

@@ -110,8 +110,8 @@ var paginate_1 = require("./paginate");
 function addListFragments(config, documents) {
     return __awaiter(this, void 0, void 0, function () {
         var lists, errors, _loop_1, documents_1, documents_1_1, doc, listTargets, generatedDoc;
-        var e_1, _a;
-        return __generator(this, function (_b) {
+        var e_1, _a, _b;
+        return __generator(this, function (_c) {
             lists = {};
             errors = [];
             _loop_1 = function (doc) {
@@ -231,7 +231,9 @@ function addListFragments(config, documents) {
             if (Object.keys(lists).length === 0) {
                 return [2 /*return*/];
             }
-            generatedDoc = __assign({ kind: 'Document', definitions: Object.entries(lists).flatMap(function (_a) {
+            generatedDoc = {
+                kind: 'Document',
+                definitions: (_b = Object.entries(lists).flatMap(function (_a) {
                     var _b = __read(_a, 2), name = _b[0], _c = _b[1], selection = _c.selection, type = _c.type;
                     // look up the type
                     var schemaType = config.schema.getType(type.name);
@@ -334,8 +336,7 @@ function addListFragments(config, documents) {
                             },
                         },
                     ];
-                }) }, listTargets.flatMap(function (typeName) { return [
-                {
+                })).concat.apply(_b, __spread(listTargets.map(function (typeName) { return ({
                     kind: 'DirectiveDefinition',
                     name: {
                         kind: 'Name',
@@ -350,8 +351,9 @@ function addListFragments(config, documents) {
                         },
                     ],
                     repeatable: true,
-                },
-            ]; }));
+                }); }))),
+            };
+            config.newSchema += '\n' + generatedDoc.definitions.map(graphql.print).join('\n');
             documents.push({
                 name: 'generated::lists',
                 kind: types_2.ArtifactKind.Fragment,

package/build/cmd/transforms/schema.js

@@ -61,13 +61,13 @@ var types_1 = require("../../runtime/types");
 // graphqlExtensions adds a few different things to the graphql schema
 function graphqlExtensions(config, documents) {
     return __awaiter(this, void 0, void 0, function () {
+        var internalSchema;
         return __generator(this, function (_a) {
+            internalSchema = "\nenum CachePolicy {\n\t" + types_1.CachePolicy.CacheAndNetwork + "\n\t" + types_1.CachePolicy.CacheOnly + "\n\t" + types_1.CachePolicy.CacheOrNetwork + "\n\t" + types_1.CachePolicy.NetworkOnly + "\n}\n\n\"\"\"\n\t@" + config.listDirective + " is used to mark a field for the runtime as a place to add or remove\n\tentities in mutations\n\"\"\"\ndirective @" + config.listDirective + "(" + config.listNameArg + ": String!, connection: Boolean) on FIELD\n\n\"\"\"\n\t@" + config.listPrependDirective + " is used to tell the runtime to add the result to the end of the list\n\"\"\"\ndirective @" + config.listPrependDirective + "(\n\t" + config.listDirectiveParentIDArg + ": ID\n) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.listAppendDirective + " is used to tell the runtime to add the result to the start of the list\n\"\"\"\ndirective @" + config.listAppendDirective + "(" + config.listDirectiveParentIDArg + ": ID) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.listParentDirective + " is used to provide a parentID without specifying position or in situations\n\twhere it doesn't make sense (eg when deleting a node.)\n\"\"\"\ndirective @" + config.listParentDirective + "(value: ID!) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.whenDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\"\"\"\ndirective @" + config.whenDirective + " on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.whenNotDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\"\"\"\ndirective @" + config.whenNotDirective + " on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.argumentsDirective + " is used to define the arguments of a fragment\n\"\"\"\ndirective @" + config.argumentsDirective + " on FRAGMENT_DEFINITION\n\n\"\"\"\n\t@" + config.cacheDirective + " is used to specify cache rules for a query\n\"\"\"\ndirective @" + config.cacheDirective + "(" + config.cachePolicyArg + ": CachePolicy, " + config.cachePartialArg + ": Boolean) on QUERY\n";
+            config.newSchema += internalSchema;
             // add the static extra bits that will be used by other transforms
             config.schema = merge_1.mergeSchemas({
-                schemas: [
-                    config.schema,
-                    graphql.buildSchema("\n\t\t\tenum CachePolicy {\n\t\t\t\t" + types_1.CachePolicy.CacheAndNetwork + "\n\t\t\t\t" + types_1.CachePolicy.CacheOnly + "\n\t\t\t\t" + types_1.CachePolicy.CacheOrNetwork + "\n\t\t\t\t" + types_1.CachePolicy.NetworkOnly + "\n\t\t\t}\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listDirective + " is used to mark a field for the runtime as a place to add or remove\n\t\t\t\tentities in mutations\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listDirective + "(" + config.listNameArg + ": String!, connection: Boolean) on FIELD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listPrependDirective + " is used to tell the runtime to add the result to the end of the list\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listPrependDirective + "(\n\t\t\t\t" + config.listDirectiveParentIDArg + ": ID\n\t\t\t) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listAppendDirective + " is used to tell the runtime to add the result to the start of the list\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listAppendDirective + "(" + config.listDirectiveParentIDArg + ": ID) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listParentDirective + " is used to provide a parentID without specifying position or in situations\n\t\t\t\twhere it doesn't make sense (eg when deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listParentDirective + "(value: ID!) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.whenDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.whenDirective + " on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.whenNotDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.whenNotDirective + " on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.argumentsDirective + " is used to define the arguments of a fragment\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.argumentsDirective + " on FRAGMENT_DEFINITION\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.cacheDirective + " is used to specify cache rules for a query\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.cacheDirective + "(" + config.cachePolicyArg + ": CachePolicy, " + config.cachePartialArg + ": Boolean) on QUERY\n\n\t\t"),
-                ],
+                schemas: [config.schema, graphql.buildSchema(internalSchema)],
             });
             return [2 /*return*/];
         });

package/build/cmd.js

@@ -665,9 +665,10 @@ var CachePolicy$1;
 // a place to hold conventions and magic strings
 var Config = /** @class */ (function () {
     function Config(_a) {
-        var schema = _a.schema, schemaPath = _a.schemaPath, sourceGlob = _a.sourceGlob, apiUrl = _a.apiUrl, _b = _a.quiet, quiet = _b === void 0 ? false : _b, filepath = _a.filepath, _c = _a.framework, framework = _c === void 0 ? 'sapper' : _c, _d = _a.module, module = _d === void 0 ? 'commonjs' : _d, staticSite = _a.static, mode = _a.mode, scalars = _a.scalars, cacheBufferSize = _a.cacheBufferSize, _e = _a.defaultCachePolicy, defaultCachePolicy = _e === void 0 ? CachePolicy$1.NetworkOnly : _e, _f = _a.defaultPartial, defaultPartial = _f === void 0 ? false : _f;
+        var schema = _a.schema, schemaPath = _a.schemaPath, sourceGlob = _a.sourceGlob, apiUrl = _a.apiUrl, _b = _a.quiet, quiet = _b === void 0 ? false : _b, filepath = _a.filepath, _c = _a.framework, framework = _c === void 0 ? 'sapper' : _c, _d = _a.module, module = _d === void 0 ? 'commonjs' : _d, staticSite = _a.static, scalars = _a.scalars, cacheBufferSize = _a.cacheBufferSize, definitionsPath = _a.definitionsPath, _e = _a.defaultCachePolicy, defaultCachePolicy = _e === void 0 ? CachePolicy$1.NetworkOnly : _e, _f = _a.defaultPartial, defaultPartial = _f === void 0 ? false : _f;
         this.framework = 'sapper';
         this.module = 'commonjs';
+        this.newSchema = '';
         // make sure we got some kind of schema
         if (!schema && !schemaPath) {
             throw new Error('Please provide one of schema or schema path');
@@ -704,29 +705,6 @@ var Config = /** @class */ (function () {
                 this.schema = graphql.buildClientSchema(JSON.parse(fs$2$1.readFileSync(localSchemaPath, 'utf-8')));
             }
         }
-        // if we were given a mode instead of framework/module
-        if (mode) {
-            if (!quiet) {
-                // warn the user
-                console.warn('Encountered deprecated config value: mode');
-                console.warn('This parameter will be removed in a future version. Please update your config with the ' +
-                    'following values:');
-            }
-            if (mode === 'sapper') {
-                if (!quiet) {
-                    console.warn(JSON.stringify({ framework: 'sapper', module: 'commonjs' }));
-                }
-                framework = 'sapper';
-                module = 'commonjs';
-            }
-            else {
-                if (!quiet) {
-                    console.warn(JSON.stringify({ framework: 'kit', module: 'esm' }));
-                }
-                framework = 'kit';
-                module = 'esm';
-            }
-        }
         // save the values we were given
         this.schemaPath = schemaPath;
         this.apiUrl = apiUrl;
@@ -741,6 +719,7 @@ var Config = /** @class */ (function () {
         this.cacheBufferSize = cacheBufferSize;
         this.defaultCachePolicy = defaultCachePolicy;
         this.defaultPartial = defaultPartial;
+        this.definitionsFile = definitionsPath;
         // if we are building a sapper project, we want to put the runtime in
         // src/node_modules so that we can access @sapper/app and interact
         // with the application stores directly
@@ -785,6 +764,15 @@ var Config = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Config.prototype, "definitionsPath", {
+        get: function () {
+            return this.definitionsFile
+                ? path$6.join(this.projectRoot, this.definitionsFile)
+                : path$6.join(this.rootDir, 'definitions.gql');
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(Config.prototype, "typeIndexPath", {
         get: function () {
             return path$6.join(this.rootDir, 'index.d.ts');
@@ -54464,13 +54452,13 @@ function makeSchema({ resolvers, typeDefs, extensions, }, config) {
 // graphqlExtensions adds a few different things to the graphql schema
 function graphqlExtensions(config, documents) {
     return __awaiter$1(this, void 0, void 0, function () {
+        var internalSchema;
         return __generator$1(this, function (_a) {
+            internalSchema = "\nenum CachePolicy {\n\t" + CachePolicy.CacheAndNetwork + "\n\t" + CachePolicy.CacheOnly + "\n\t" + CachePolicy.CacheOrNetwork + "\n\t" + CachePolicy.NetworkOnly + "\n}\n\n\"\"\"\n\t@" + config.listDirective + " is used to mark a field for the runtime as a place to add or remove\n\tentities in mutations\n\"\"\"\ndirective @" + config.listDirective + "(" + config.listNameArg + ": String!, connection: Boolean) on FIELD\n\n\"\"\"\n\t@" + config.listPrependDirective + " is used to tell the runtime to add the result to the end of the list\n\"\"\"\ndirective @" + config.listPrependDirective + "(\n\t" + config.listDirectiveParentIDArg + ": ID\n) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.listAppendDirective + " is used to tell the runtime to add the result to the start of the list\n\"\"\"\ndirective @" + config.listAppendDirective + "(" + config.listDirectiveParentIDArg + ": ID) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.listParentDirective + " is used to provide a parentID without specifying position or in situations\n\twhere it doesn't make sense (eg when deleting a node.)\n\"\"\"\ndirective @" + config.listParentDirective + "(value: ID!) on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.whenDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\"\"\"\ndirective @" + config.whenDirective + " on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.whenNotDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\"\"\"\ndirective @" + config.whenNotDirective + " on FRAGMENT_SPREAD\n\n\"\"\"\n\t@" + config.argumentsDirective + " is used to define the arguments of a fragment\n\"\"\"\ndirective @" + config.argumentsDirective + " on FRAGMENT_DEFINITION\n\n\"\"\"\n\t@" + config.cacheDirective + " is used to specify cache rules for a query\n\"\"\"\ndirective @" + config.cacheDirective + "(" + config.cachePolicyArg + ": CachePolicy, " + config.cachePartialArg + ": Boolean) on QUERY\n";
+            config.newSchema += internalSchema;
             // add the static extra bits that will be used by other transforms
             config.schema = mergeSchemas({
-                schemas: [
-                    config.schema,
-                    graphql.buildSchema("\n\t\t\tenum CachePolicy {\n\t\t\t\t" + CachePolicy.CacheAndNetwork + "\n\t\t\t\t" + CachePolicy.CacheOnly + "\n\t\t\t\t" + CachePolicy.CacheOrNetwork + "\n\t\t\t\t" + CachePolicy.NetworkOnly + "\n\t\t\t}\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listDirective + " is used to mark a field for the runtime as a place to add or remove\n\t\t\t\tentities in mutations\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listDirective + "(" + config.listNameArg + ": String!, connection: Boolean) on FIELD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listPrependDirective + " is used to tell the runtime to add the result to the end of the list\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listPrependDirective + "(\n\t\t\t\t" + config.listDirectiveParentIDArg + ": ID\n\t\t\t) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listAppendDirective + " is used to tell the runtime to add the result to the start of the list\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listAppendDirective + "(" + config.listDirectiveParentIDArg + ": ID) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.listParentDirective + " is used to provide a parentID without specifying position or in situations\n\t\t\t\twhere it doesn't make sense (eg when deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.listParentDirective + "(value: ID!) on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.whenDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.whenDirective + " on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.whenNotDirective + " is used to provide a conditional or in situations where it doesn't make sense (eg when removing or deleting a node.)\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.whenNotDirective + " on FRAGMENT_SPREAD\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.argumentsDirective + " is used to define the arguments of a fragment\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.argumentsDirective + " on FRAGMENT_DEFINITION\n\n\t\t\t\"\"\"\n\t\t\t\t@" + config.cacheDirective + " is used to specify cache rules for a query\n\t\t\t\"\"\"\n\t\t\tdirective @" + config.cacheDirective + "(" + config.cachePolicyArg + ": CachePolicy, " + config.cachePartialArg + ": Boolean) on QUERY\n\n\t\t"),
-                ],
+                schemas: [config.schema, graphql.buildSchema(internalSchema)],
             });
             return [2 /*return*/];
         });
@@ -76289,8 +76277,8 @@ var pageInfoSelection = [
 function addListFragments(config, documents) {
     return __awaiter$1(this, void 0, void 0, function () {
         var lists, errors, _loop_1, documents_1, documents_1_1, doc, listTargets, generatedDoc;
-        var e_1, _a;
-        return __generator$1(this, function (_b) {
+        var e_1, _a, _b;
+        return __generator$1(this, function (_c) {
             lists = {};
             errors = [];
             _loop_1 = function (doc) {
@@ -76410,7 +76398,9 @@ function addListFragments(config, documents) {
             if (Object.keys(lists).length === 0) {
                 return [2 /*return*/];
             }
-            generatedDoc = __assign$1({ kind: 'Document', definitions: Object.entries(lists).flatMap(function (_a) {
+            generatedDoc = {
+                kind: 'Document',
+                definitions: (_b = Object.entries(lists).flatMap(function (_a) {
                     var _b = __read$1(_a, 2), name = _b[0], _c = _b[1], selection = _c.selection, type = _c.type;
                     // look up the type
                     var schemaType = config.schema.getType(type.name);
@@ -76513,8 +76503,7 @@ function addListFragments(config, documents) {
                             },
                         },
                     ];
-                }) }, listTargets.flatMap(function (typeName) { return [
-                {
+                })).concat.apply(_b, __spread$1(listTargets.map(function (typeName) { return ({
                     kind: 'DirectiveDefinition',
                     name: {
                         kind: 'Name',
@@ -76529,8 +76518,9 @@ function addListFragments(config, documents) {
                         },
                     ],
                     repeatable: true,
-                },
-            ]; }));
+                }); }))),
+            };
+            config.newSchema += '\n' + generatedDoc.definitions.map(graphql.print).join('\n');
             documents.push({
                 name: 'generated::lists',
                 kind: ArtifactKind.Fragment,
@@ -78528,11 +78518,12 @@ function typescriptGenerator(config, docs) {
 }
 function generateOperationTypeDefs(config, body, definition, selections, visitedTypes) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var inputTypeName, shapeTypeName, type, hasInputs, _a, _b, variableDefinition;
+        var inputTypeName, shapeTypeName, afterLoadTypeName, type, hasInputs, _a, _b, variableDefinition;
         var e_1, _c;
         return __generator$1(this, function (_d) {
             inputTypeName = definition.name.value + "$input";
             shapeTypeName = definition.name.value + "$result";
+            afterLoadTypeName = definition.name.value + "$afterLoad";
             if (definition.operation === 'query') {
                 type = config.schema.getQueryType();
             }
@@ -78568,6 +78559,12 @@ function generateOperationTypeDefs(config, body, definition, selections, visited
                 visitedTypes: visitedTypes,
                 body: body,
             }))));
+            // generate type for the afterload function
+            body.push(AST.exportNamedDeclaration(AST.tsTypeAliasDeclaration(AST.identifier(afterLoadTypeName), AST.tsTypeLiteral([
+                readonlyProperty(AST.tsPropertySignature(AST.stringLiteral('data'), AST.tsTypeAnnotation(AST.tsTypeLiteral([
+                    readonlyProperty(AST.tsPropertySignature(AST.stringLiteral(definition.name.value), AST.tsTypeAnnotation(AST.tsTypeReference(AST.identifier(shapeTypeName))))),
+                ])))),
+            ]))));
             // if there are variables in this query
             if (hasInputs && definition.variableDefinitions && definition.variableDefinitions.length > 0) {
                 try {
@@ -78699,6 +78696,27 @@ function persistOutputGenerator(config, docs) {
     });
 }
 
+// schemaGenerator updates the schema file to contain all of the generated
+// definitions
+function schemaGenerator(config, docs) {
+    return __awaiter$1(this, void 0, void 0, function () {
+        return __generator$1(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!config.newSchema) {
+                        return [2 /*return*/];
+                    }
+                    // print the updated version of the schema over the existing one
+                    return [4 /*yield*/, fs$7.writeFile(config.definitionsPath, config.newSchema, 'utf-8')];
+                case 1:
+                    // print the updated version of the schema over the existing one
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+
 // typeCheck verifies that the documents are valid instead of waiting
 // for the compiler to fail later down the line.
 function typeCheck(config, docs) {
@@ -79493,10 +79511,14 @@ var runPipeline = function (config, docs) { return __awaiter$1(void 0, void 0, v
         switch (_a.label) {
             case 0: 
             // we need to create the runtime folder structure
-            return [4 /*yield*/, config.createDirectories()];
+            return [4 /*yield*/, config.createDirectories()
+                // reset the newSchema accumulator
+            ];
             case 1:
                 // we need to create the runtime folder structure
                 _a.sent();
+                // reset the newSchema accumulator
+                config.newSchema = '';
                 return [4 /*yield*/, runPipeline$1(config, [
                         typeCheck,
                         uniqueDocumentNames,
@@ -79516,6 +79538,7 @@ var runPipeline = function (config, docs) { return __awaiter$1(void 0, void 0, v
                         runtimeGenerator,
                         typescriptGenerator,
                         persistOutputGenerator,
+                        schemaGenerator,
                     ], docs)];
             case 2:
                 _a.sent();

package/build/runtime/network.d.ts

@@ -75,6 +75,11 @@ export declare type FetchQueryResult<_Data> = {
     source: DataSource | null;
     partial: boolean;
 };
+export declare type QueryInputs<_Data> = FetchQueryResult<_Data> & {
+    variables: {
+        [key: string]: any;
+    };
+};
 export declare function fetchQuery<_Data extends GraphQLObject>({ context, artifact, variables, session, cached, }: {
     context: FetchContext;
     artifact: QueryArtifact | MutationArtifact;
@@ -93,14 +98,14 @@ export declare class RequestContext {
     graphqlErrors(payload: {
         errors?: GraphQLError[];
     }): any;
-    invokeLoadHook({ variant, mode, hookFn, data, }: {
+    invokeLoadHook({ variant, framework, hookFn, data, }: {
         variant: 'before' | 'after';
-        mode: 'kit' | 'sapper';
+        framework: 'kit' | 'sapper';
         hookFn: KitBeforeLoad | KitAfterLoad | SapperBeforeLoad | SapperAfterLoad;
         data: Record<string, any>;
     }): Promise<void>;
-    computeInput({ config, mode, variableFunction, artifact, }: {
-        mode: 'kit' | 'sapper';
+    computeInput({ config, framework, variableFunction, artifact, }: {
+        framework: 'kit' | 'sapper';
         variableFunction: SapperBeforeLoad | KitBeforeLoad;
         artifact: QueryArtifact | MutationArtifact | SubscriptionArtifact;
         config: Config;

package/build/runtime/network.js

@@ -265,13 +265,13 @@ var RequestContext = /** @class */ (function () {
     // This hook fires before executing any queries, it allows to redirect/error based on session state for example
     // It also allows to return custom props that should be returned from the corresponding load function.
     RequestContext.prototype.invokeLoadHook = function (_a) {
-        var variant = _a.variant, mode = _a.mode, hookFn = _a.hookFn, data = _a.data;
+        var variant = _a.variant, framework = _a.framework, hookFn = _a.hookFn, data = _a.data;
         return __awaiter(this, void 0, void 0, function () {
             var hookCall, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (mode === 'kit') {
+                        if (framework === 'kit') {
                             if (variant === 'before') {
                                 hookCall = hookFn.call(this, this.context);
                             }
@@ -311,9 +311,9 @@ var RequestContext = /** @class */ (function () {
     // in sapper, this means preparing a `this` for the function. for kit, we can just pass
     // the context
     RequestContext.prototype.computeInput = function (_a) {
-        var config = _a.config, mode = _a.mode, variableFunction = _a.variableFunction, artifact = _a.artifact;
+        var config = _a.config, framework = _a.framework, variableFunction = _a.variableFunction, artifact = _a.artifact;
         // call the variable function to match the framework
-        var input = mode === 'kit'
+        var input = framework === 'kit'
             ? // in kit just pass the context directly
                 variableFunction.call(this, this.context)
             : // we are in sapper mode, so we need to prepare the function context

package/build/runtime/pagination.js

@@ -105,13 +105,16 @@ function paginatedQuery(document) {
         throw new Error('paginatedQuery must be passed a query with @paginate.');
     }
     // pass the artifact to the base query operation
-    var _a = query_1.query(document), data = _a.data, loading = _a.loading, refetch = _a.refetch, partial = _a.partial, restOfQueryResponse = __rest(_a, ["data", "loading", "refetch", "partial"]);
+    var _a = query_1.query(document), data = _a.data, loading = _a.loading, refetch = _a.refetch, partial = _a.partial, onLoad = _a.onLoad, restOfQueryResponse = __rest(_a, ["data", "loading", "refetch", "partial", "onLoad"]);
     var paginationPartial = store_1.writable(false);
-    var partialStore = store_1.derived([partial, paginationPartial], function (_a) {
-        var _b = __read(_a, 2), $partial = _b[0], $paginationPartial = _b[1];
-        return $partial || $paginationPartial;
+    partial.subscribe(function (val) {
+        paginationPartial.set(val);
     });
-    return __assign(__assign({ data: data, partial: partialStore }, paginationHandlers({
+    return __assign(__assign({ data: data, partial: { subscribe: paginationPartial.subscribe }, onLoad: function (newValue) {
+            onLoad.call(this, newValue);
+            // keep the partial store in sync
+            paginationPartial.set(newValue.partial);
+        } }, paginationHandlers({
         initialValue: document.initialValue.data,
         store: data,
         artifact: artifact,
@@ -216,19 +219,18 @@ function paginationHandlers(_a) {
 }
 function cursorHandlers(_a) {
     var _this = this;
+    var _b;
     var initialValue = _a.initialValue, artifact = _a.artifact, store = _a.store, extraVariables = _a.queryVariables, loading = _a.loading, refetch = _a.refetch, partial = _a.partial;
     // pull out the context accessors
     var variables = context_1.getVariables();
     var sessionStore = adapter_mjs_1.getSession();
     // track the current page info in an easy-to-reach store
-    var initialPageInfo = initialValue
-        ? utils_1.extractPageInfo(initialValue, artifact.refetch.path)
-        : {
-            startCursor: null,
-            endCursor: null,
-            hasNextPage: false,
-            hasPreviousPage: false,
-        };
+    var initialPageInfo = (_b = utils_1.extractPageInfo(initialValue, artifact.refetch.path)) !== null && _b !== void 0 ? _b : {
+        startCursor: null,
+        endCursor: null,
+        hasNextPage: false,
+        hasPreviousPage: false,
+    };
     var pageInfo = store_1.writable(initialPageInfo);
     // hold onto the current value
     var value = initialValue;
@@ -347,7 +349,8 @@ function cursorHandlers(_a) {
                             if (input && JSON.stringify(variables()) !== JSON.stringify(input)) {
                                 return [2 /*return*/, refetch(input)];
                             }
-                            count = utils_1.countPage(artifact.refetch.path.concat('edges'), value);
+                            count = utils_1.countPage(artifact.refetch.path.concat('edges'), value) ||
+                                artifact.refetch.pageSize;
                             queryVariables = __assign(__assign(__assign({}, variables()), extraVariables), (_b = {}, _b[artifact.refetch.update === 'prepend' ? 'last' : 'first'] = count, _b));
                             // set the loading state to true
                             loading.set(true);

package/build/runtime/query.js

@@ -188,6 +188,8 @@ function query(document) {
         onLoad: function (newValue) {
             // we got new data from mounting, write it
             writeData(newValue.result, newValue.variables);
+            // keep the partial store in sync
+            partial.set(newValue.partial);
             // if we are mounting on a browser we might need to perform an additional network request
             if (adapter_mjs_1.isBrowser) {
                 // if the data was loaded from a cached value, and the document cache policy wants a

package/build/runtime/utils.js

@@ -33,13 +33,30 @@ var __values = (this && this.__values) || function(o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.countPage = exports.extractPageInfo = void 0;
 function extractPageInfo(data, path) {
+    var _a;
+    if (data === null) {
+        return {
+            startCursor: null,
+            endCursor: null,
+            hasNextPage: false,
+            hasPreviousPage: false,
+        };
+    }
     var localPath = __spread(path);
     // walk down the object until we get to the end
     var current = data;
     while (localPath.length > 0) {
+        if (current === null) {
+            break;
+        }
         current = current[localPath.shift()];
     }
-    return current.pageInfo;
+    return ((_a = current === null || current === void 0 ? void 0 : current.pageInfo) !== null && _a !== void 0 ? _a : {
+        startCursor: null,
+        endCursor: null,
+        hasNextPage: false,
+        hasPreviousPage: false,
+    });
 }
 exports.extractPageInfo = extractPageInfo;
 function countPage(source, value) {

package/build/runtime-cjs/network.d.ts

@@ -75,6 +75,11 @@ export declare type FetchQueryResult<_Data> = {
     source: DataSource | null;
     partial: boolean;
 };
+export declare type QueryInputs<_Data> = FetchQueryResult<_Data> & {
+    variables: {
+        [key: string]: any;
+    };
+};
 export declare function fetchQuery<_Data extends GraphQLObject>({ context, artifact, variables, session, cached, }: {
     context: FetchContext;
     artifact: QueryArtifact | MutationArtifact;
@@ -93,14 +98,14 @@ export declare class RequestContext {
     graphqlErrors(payload: {
         errors?: GraphQLError[];
     }): any;
-    invokeLoadHook({ variant, mode, hookFn, data, }: {
+    invokeLoadHook({ variant, framework, hookFn, data, }: {
         variant: 'before' | 'after';
-        mode: 'kit' | 'sapper';
+        framework: 'kit' | 'sapper';
         hookFn: KitBeforeLoad | KitAfterLoad | SapperBeforeLoad | SapperAfterLoad;
         data: Record<string, any>;
     }): Promise<void>;
-    computeInput({ config, mode, variableFunction, artifact, }: {
-        mode: 'kit' | 'sapper';
+    computeInput({ config, framework, variableFunction, artifact, }: {
+        framework: 'kit' | 'sapper';
         variableFunction: SapperBeforeLoad | KitBeforeLoad;
         artifact: QueryArtifact | MutationArtifact | SubscriptionArtifact;
         config: Config;