grafast 0.1.1-beta.2 → 0.1.1-beta.21

package/dist/prepare.d.ts

@@ -1,7 +1,5 @@
-import type { ExecutionArgs } from "graphql";
-import type { AsyncExecutionResult, ExecutionResult } from "graphql/execution/execute";
 import type { GrafastPlanJSON } from "./index.js";
-import type { GrafastTimeouts, PromiseOrDirect } from "./interfaces.js";
+import type { GrafastTimeouts } from "./interfaces.js";
 declare const $$contextPlanCache: unique symbol;
 export interface GrafastPrepareOptions {
     /**
@@ -26,9 +24,5 @@ declare module "./engine/OperationPlan.js" {
         [$$contextPlanCache]?: GrafastPlanJSON;
     }
 }
-/**
- * @internal
- */
-export declare function grafastPrepare(args: ExecutionArgs, options?: GrafastPrepareOptions): PromiseOrDirect<ExecutionResult | AsyncGenerator<AsyncExecutionResult, void, void>>;
 export {};
 //# sourceMappingURL=prepare.d.ts.map

package/dist/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grafastPrepare = void 0;
+exports.grafastPrepare = grafastPrepare;
 const tslib_1 = require("tslib");
 const graphql = tslib_1.__importStar(require("graphql"));
 const execute_1 = require("graphql/execution/execute");
@@ -12,7 +12,6 @@ const executeBucket_js_1 = require("./engine/executeBucket.js");
 const executeOutputPlan_js_1 = require("./engine/executeOutputPlan.js");
 const OperationPlan_js_1 = require("./engine/OperationPlan.js");
 const OutputPlan_js_1 = require("./engine/OutputPlan.js");
-const error_js_1 = require("./error.js");
 const establishOperationPlan_js_1 = require("./establishOperationPlan.js");
 const interfaces_js_1 = require("./interfaces.js");
 const timeSource_js_1 = require("./timeSource.js");
@@ -153,7 +152,7 @@ function outputBucket(outputPlan, rootBucket, rootBucketIndex, requestContext, p
         childBucketIndex = rootBucketIndex;
     }
     else {
-        const c = (0, OutputPlan_js_1.getChildBucketAndIndex)(outputPlan, null, rootBucket, rootBucketIndex, null);
+        const c = (0, OutputPlan_js_1.getChildBucketAndIndex)(outputPlan.layerPlan, null, rootBucket, rootBucketIndex, null);
         if (!c) {
             throw new Error(`GrafastInternalError<8bbf56c1-8e2a-4ee9-b5fc-724fd0ee222b>: could not find relevant bucket for output plan`);
         }
@@ -172,34 +171,27 @@ function outputBucket(outputPlan, rootBucket, rootBucketIndex, requestContext, p
         releaseUnusedIterators(rootBucket, rootBucketIndex, ctx.root.streams);
     }
 }
-function executePreemptive(operationPlan, variableValues, context, rootValue, outputDataAsString, executionTimeout) {
-    // PERF: batch this method so it can process multiple GraphQL requests in parallel
-    // TODO: when we batch, we need to change `rootBucketIndex` and `size`, and make sure that we only batch where `executionTimeout` is the same.
+function executePreemptive(args, operationPlan, variableValues, context, rootValue, outputDataAsString, executionTimeout) {
     const rootBucketIndex = 0;
     const size = 1;
-    const requestIndex = [0];
-    const vars = [variableValues];
-    const ctxs = [context];
-    const rvs = [rootValue];
     const polymorphicPathList = [OperationPlan_js_1.POLYMORPHIC_ROOT_PATH];
     const iterators = [new Set()];
     const store = new Map();
-    store.set(-1, requestIndex);
-    store.set(operationPlan.rootLayerPlan.rootStep.id, requestIndex);
-    store.set(operationPlan.variableValuesStep.id, vars);
-    store.set(operationPlan.contextStep.id, ctxs);
-    store.set(operationPlan.rootValueStep.id, rvs);
+    store.set(operationPlan.variableValuesStep.id, (0, executeBucket_js_1.unaryExecutionValue)(variableValues));
+    store.set(operationPlan.contextStep.id, (0, executeBucket_js_1.unaryExecutionValue)(context));
+    store.set(operationPlan.rootValueStep.id, (0, executeBucket_js_1.unaryExecutionValue)(rootValue));
     const rootBucket = (0, executeBucket_js_1.newBucket)({
         layerPlan: operationPlan.rootLayerPlan,
         size,
         store,
-        hasErrors: false,
+        flagUnion: 0,
         polymorphicPathList,
         iterators,
     }, null);
     const startTime = timeSource_js_1.timeSource.now();
     const stopTime = executionTimeout !== null ? startTime + executionTimeout : null;
     const requestContext = {
+        args,
         startTime,
         stopTime,
         // toSerialize: [],
@@ -210,29 +202,33 @@ function executePreemptive(operationPlan, variableValues, context, rootValue, ou
     const subscriptionLayerPlan = rootBucket.layerPlan.children.find((c) => c.reason.type === "subscription");
     function executeStreamPayload(payload, index) {
         const layerPlan = subscriptionLayerPlan;
+        const { rootStep } = layerPlan;
         // PERF: we could consider batching this.
         const store = new Map();
-        const subscriptionBucketIndex = 0;
-        for (const depId of layerPlan.copyStepIds) {
-            store.set(depId, []);
-        }
-        store.set(layerPlan.rootStep.id, [payload]);
+        const ZERO = 0;
         for (const depId of layerPlan.copyStepIds) {
-            store.get(depId)[subscriptionBucketIndex] =
-                rootBucket.store.get(depId)[rootBucketIndex];
-        }
+            const executionVal = rootBucket.store.get(depId);
+            // Normally this would need scaling, but not this time since we know it only represents a single entry
+            store.set(depId, executionVal);
+        }
+        const rootExecutionValue = rootStep._isUnary
+            ? (0, executeBucket_js_1.unaryExecutionValue)(payload)
+            : (0, executeBucket_js_1.batchExecutionValue)([payload]);
+        store.set(rootStep.id, rootExecutionValue);
         const subscriptionBucket = (0, executeBucket_js_1.newBucket)({
             layerPlan,
             store,
-            hasErrors: rootBucket.hasErrors,
+            flagUnion: rootBucket.flagUnion,
             polymorphicPathList: [OperationPlan_js_1.POLYMORPHIC_ROOT_PATH],
             iterators: [new Set()],
             size: 1, //store.size
         }, rootBucket.metaByMetaKey);
         const bucketPromise = (0, executeBucket_js_1.executeBucket)(subscriptionBucket, requestContext);
         function outputStreamBucket() {
-            const [ctx, result] = outputBucket(operationPlan.rootOutputPlan, subscriptionBucket, subscriptionBucketIndex, requestContext, [], rootBucket.store.get(operationPlan.variableValuesStep.id)[rootBucketIndex], outputDataAsString);
-            return finalize(result, ctx, index === 0 ? rootValue[interfaces_js_1.$$extensions] ?? undefined : undefined, outputDataAsString);
+            const [ctx, result] = outputBucket(operationPlan.rootOutputPlan, subscriptionBucket, ZERO, requestContext, [], rootBucket.store
+                .get(operationPlan.variableValuesStep.id)
+                .at(rootBucketIndex), outputDataAsString);
+            return finalize(result, ctx, index === 0 ? (rootValue[interfaces_js_1.$$extensions] ?? undefined) : undefined, outputDataAsString);
         }
         if ((0, utils_js_1.isPromiseLike)(bucketPromise)) {
             return bucketPromise.then(outputStreamBucket);
@@ -244,19 +240,21 @@ function executePreemptive(operationPlan, variableValues, context, rootValue, ou
     function output() {
         // Later we'll need to loop
         // If it's a subscription we need to use the stream
-        const rootValueList = rootBucket.layerPlan.rootStep.id != null
+        const bucketRootEValue = rootBucket.layerPlan.rootStep != null &&
+            rootBucket.layerPlan.rootStep.id != null
             ? rootBucket.store.get(rootBucket.layerPlan.rootStep.id)
             : null;
-        const bucketRootValue = rootValueList?.[rootBucketIndex];
-        if ((0, error_js_1.isGrafastError)(bucketRootValue)) {
+        const bucketRootValue = bucketRootEValue?.at(rootBucketIndex);
+        const bucketRootFlags = bucketRootEValue?._flagsAt(rootBucketIndex) ?? interfaces_js_1.NO_FLAGS;
+        if (bucketRootFlags & interfaces_js_1.FLAG_ERROR) {
             releaseUnusedIterators(rootBucket, rootBucketIndex, null);
             // Something major went wrong!
             const errors = [
-                new GraphQLError(bucketRootValue.originalError.message, operationPlan.rootOutputPlan.locationDetails.node, // node
+                new GraphQLError(bucketRootValue.message, operationPlan.rootOutputPlan.locationDetails.node, // node
                 undefined, // source
                 null, // positions
                 null, // path
-                bucketRootValue.originalError, // originalError
+                bucketRootValue, // originalError
                 null),
             ];
             const payload = Object.create(null);
@@ -267,6 +265,7 @@ function executePreemptive(operationPlan, variableValues, context, rootValue, ou
             }
             return payload;
         }
+        // NOTE: this is where we determine whether to stream or not
         if (bucketRootValue != null &&
             subscriptionLayerPlan != null &&
             Array.isArray(bucketRootValue) &&
@@ -331,7 +330,7 @@ function executePreemptive(operationPlan, variableValues, context, rootValue, ou
             });
             return iterator;
         }
-        const [ctx, result] = outputBucket(operationPlan.rootOutputPlan, rootBucket, rootBucketIndex, requestContext, [], rootBucket.store.get(operationPlan.variableValuesStep.id)[rootBucketIndex], outputDataAsString);
+        const [ctx, result] = outputBucket(operationPlan.rootOutputPlan, rootBucket, rootBucketIndex, requestContext, [], rootBucket.store.get(operationPlan.variableValuesStep.id).at(0), outputDataAsString);
         return finalize(result, ctx, rootValue[interfaces_js_1.$$extensions] ?? undefined, outputDataAsString);
     }
     if ((0, utils_js_1.isPromiseLike)(bucketPromise)) {
@@ -341,14 +340,17 @@ function executePreemptive(operationPlan, variableValues, context, rootValue, ou
         return output();
     }
 }
+function establishOperationPlanFromEvent(event) {
+    return (0, establishOperationPlan_js_1.establishOperationPlan)(event.schema, event.operation, event.fragments, event.variableValues, event.context, event.rootValue, event.planningTimeout);
+}
 /**
  * @internal
  */
 function grafastPrepare(args, options = {}) {
-    const { schema, contextValue: context, rootValue = Object.create(null),
+    const { schema, contextValue: context, rootValue = Object.create(null), 
     // operationName,
     // document,
-     } = args;
+    middleware, } = args;
     const exeContext = (0, execute_1.buildExecutionContext)(args);
     // If a list of errors was returned, abort
     if (Array.isArray(exeContext) || "length" in exeContext) {
@@ -361,7 +363,21 @@ function grafastPrepare(args, options = {}) {
     const planningTimeout = options.timeouts?.planning;
     let operationPlan;
     try {
-        operationPlan = (0, establishOperationPlan_js_1.establishOperationPlan)(schema, operation, fragments, variableValues, context, rootValue, planningTimeout);
+        if (middleware != null) {
+            operationPlan = middleware.runSync("establishOperationPlan", {
+                schema,
+                operation,
+                fragments,
+                variableValues,
+                context: context,
+                rootValue,
+                planningTimeout,
+                args,
+            }, establishOperationPlanFromEvent);
+        }
+        else {
+            operationPlan = (0, establishOperationPlan_js_1.establishOperationPlan)(schema, operation, fragments, variableValues, context, rootValue, planningTimeout);
+        }
     }
     catch (error) {
         const graphqlError = error instanceof GraphQLError
@@ -382,9 +398,8 @@ function grafastPrepare(args, options = {}) {
         });
     }
     const executionTimeout = options.timeouts?.execution ?? null;
-    return executePreemptive(operationPlan, variableValues, context, rootValue, options.outputDataAsString ?? false, executionTimeout);
+    return executePreemptive(args, operationPlan, variableValues, context, rootValue, options.outputDataAsString ?? false, executionTimeout);
 }
-exports.grafastPrepare = grafastPrepare;
 function newIterator(abort) {
     const valueQueue = [];
     const pullQueue = [];
@@ -402,7 +417,7 @@ function newIterator(abort) {
             const cbs = pullQueue.shift();
             if (cbs !== undefined) {
                 if ((0, utils_js_1.isPromiseLike)(v)) {
-                    v.then((v) => cbs[0]({ done, value: v }), (e) => {
+                    v.then((v) => cbs[0]({ done: false, value: v }), (e) => {
                         try {
                             const r = cbs[1](e);
                             if ((0, utils_js_1.isPromiseLike)(r)) {
@@ -416,7 +431,7 @@ function newIterator(abort) {
                     });
                 }
                 else {
-                    cbs[0]({ done, value: v });
+                    cbs[0]({ done: false, value: v });
                 }
             }
             else {
@@ -448,7 +463,7 @@ function newIterator(abort) {
                 abort();
                 for (const entry of pullQueue) {
                     try {
-                        entry[0]({ done, value: undefined });
+                        entry[0]({ done: true, value: undefined });
                     }
                     catch (e) {
                         // ignore
@@ -493,38 +508,40 @@ async function processStream(requestContext, iterator, spec, outputDataAsString)
             }
             directLayerPlanChild = parent;
         }
-        const listItemStepId = directLayerPlanChild.rootStep.id;
-        const listItemStepIdList = [];
-        store.set(listItemStepId, listItemStepIdList);
-        for (const copyPlanId of directLayerPlanChild.copyStepIds) {
-            store.set(copyPlanId, []);
+        const { id: listItemStepId, _isUnary: isUnary } = directLayerPlanChild.rootStep;
+        for (const copyStepId of directLayerPlanChild.copyStepIds) {
+            const executionValue = spec.bucket.store.get(copyStepId);
+            if (!executionValue) {
+                throw new Error(`GrafastInternalError<2db7b749-399f-486b-bd12-7ca337b937e4>: ${spec.bucket.layerPlan} doesn't seem to include ${copyStepId} (required by ${directLayerPlanChild} via ${spec.outputPlan})`);
+            }
+            if (executionValue.isBatch) {
+                const values = (0, utils_js_1.arrayOfLength)(size, executionValue.at(spec.bucketIndex));
+                store.set(copyStepId, (0, executeBucket_js_1.batchExecutionValue)(values));
+            }
+            else {
+                store.set(copyStepId, executionValue);
+            }
+        }
+        if (isUnary) {
+            assert.ok(entries.length === 0, "Unary step should only have one index");
+            store.set(listItemStepId, (0, executeBucket_js_1.unaryExecutionValue)(entries[0][0]));
+        }
+        else {
+            const listItemStepIdList = entries.map((e) => e[0]);
+            store.set(listItemStepId, (0, executeBucket_js_1.batchExecutionValue)(listItemStepIdList));
         }
-        let bucketIndex = 0;
-        for (const entry of entries) {
-            const [result] = entry;
-            listItemStepIdList[bucketIndex] = result;
+        for (let bucketIndex = 0; bucketIndex < size; bucketIndex++) {
             polymorphicPathList[bucketIndex] =
                 spec.bucket.polymorphicPathList[spec.bucketIndex];
             iterators[bucketIndex] = new Set();
-            for (const copyPlanId of directLayerPlanChild.copyStepIds) {
-                const list = spec.bucket.store.get(copyPlanId);
-                if (!list) {
-                    throw new Error(`GrafastInternalError<2db7b749-399f-486b-bd12-7ca337b937e4>: ${spec.bucket.layerPlan} doesn't seem to include ${copyPlanId} (required by ${directLayerPlanChild} via ${spec.outputPlan})`);
-                }
-                // PERF: optimize away these .get calls
-                store.get(copyPlanId)[bucketIndex] = list[spec.bucketIndex];
-            }
-            // PERF: we should be able to optimize this
-            bucketIndex++;
         }
-        assert.strictEqual(bucketIndex, size, "GrafastInternalError<7c8deab0-8dfa-40f2-b625-97026f8fedcc>: expected bucket size does not match");
         // const childBucket = newBucket(directLayerPlanChild, noDepsList, store);
         // const childBucketIndex = 0;
         const rootBucket = (0, executeBucket_js_1.newBucket)({
             layerPlan: directLayerPlanChild,
             size,
             store,
-            hasErrors: false,
+            flagUnion: 0,
             polymorphicPathList,
             iterators,
         }, spec.bucket.metaByMetaKey);
@@ -631,29 +648,38 @@ function processSingleDeferred(requestContext, outputPlan, specs, asString) {
     const store = new Map();
     const polymorphicPathList = [];
     const iterators = [];
-    for (const copyPlanId of outputPlan.layerPlan.copyStepIds) {
-        store.set(copyPlanId, []);
+    // HACK: when we re-write stream/defer this needs fixing.
+    const firstBucket = specs[0][1].bucket;
+    if (dev_js_1.isDev) {
+        for (const spec of specs) {
+            if (spec[1].bucket !== firstBucket) {
+                throw new Error(`GrafastInternalError<c277422e-adb7-4b07-861e-acab931fc01a>: sorry, it seems the unary dependencies feature broke our incremental delivery support. This incremental delivery is going to be fully rewritten at some point anyway, so we recommend you avoid using it for now (the spec itself has changed since we implemented it).`);
+            }
+        }
     }
-    let bucketIndex = 0;
-    for (const [, spec] of specs) {
+    for (const copyStepId of outputPlan.layerPlan.copyStepIds) {
+        const executionValue = firstBucket.store.get(copyStepId);
+        if (executionValue.isBatch) {
+            const values = specs.map(([, spec]) => executionValue.at(spec.bucketIndex));
+            store.set(copyStepId, (0, executeBucket_js_1.batchExecutionValue)(values));
+        }
+        else {
+            store.set(copyStepId, executionValue);
+        }
+    }
+    for (let bucketIndex = 0; bucketIndex < size; bucketIndex++) {
+        const spec = specs[bucketIndex][1];
         polymorphicPathList[bucketIndex] =
             spec.bucket.polymorphicPathList[spec.bucketIndex];
         iterators[bucketIndex] = new Set();
-        for (const copyPlanId of outputPlan.layerPlan.copyStepIds) {
-            store.get(copyPlanId)[bucketIndex] =
-                spec.bucket.store.get(copyPlanId)[spec.bucketIndex];
-        }
-        // PERF: we should be able to optimize this
-        bucketIndex++;
     }
-    assert.strictEqual(bucketIndex, size, "GrafastInternalError<4e88c671-f65b-42a6-8756-61247b188093>: expected bucket size does not match");
     // const childBucket = newBucket(spec.outputPlan.layerPlan, noDepsList, store);
     // const childBucketIndex = 0;
     const rootBucket = (0, executeBucket_js_1.newBucket)({
         layerPlan: outputPlan.layerPlan,
         size,
         store,
-        hasErrors: false,
+        flagUnion: 0,
         polymorphicPathList,
         iterators,
     }, null);