grafast 0.1.1-beta.24 → 0.1.1-beta.26

package/dist/engine/LayerPlan.d.ts

@@ -153,6 +153,9 @@ export declare class LayerPlan<TReason extends LayerPlanReason = LayerPlanReason
     readonly operationPlan: OperationPlan;
     readonly reason: TReason;
     id: number;
+    distributorDependencies: null | {
+        [distributorStepId: number]: number[];
+    };
     /** How "deep" this layer plan is (how many ancestors it has). The root layer plan has a depth of 0. */
     depth: number;
     /** The depth at which a "defer boundary" occurs (OperationPlan.getPeers cannot pass a defer boundary), or 0. */
@@ -172,6 +175,7 @@ export declare class LayerPlan<TReason extends LayerPlanReason = LayerPlanReason
      * complete otherwise nothing will happen).
      */
     outOfBoundsLayerPlanIds: Set<number>;
+    private sideEffectRootLayerPlan;
     constructor(operationPlan: OperationPlan, reason: TReason);
     toString(): string;
     print(depth?: number): string;

package/dist/engine/LayerPlan.js

@@ -6,9 +6,11 @@ exports.isDeferredLayerPlan = isDeferredLayerPlan;
 const tslib_1 = require("tslib");
 const assert = tslib_1.__importStar(require("../assert.js"));
 const constants_js_1 = require("../constants.js");
+const dev_js_1 = require("../dev.js");
 const error_js_1 = require("../error.js");
 const inspect_js_1 = require("../inspect.js");
 const utils_js_1 = require("../utils.js");
+const distributor_js_1 = require("./distributor.js");
 const executeBucket_js_1 = require("./executeBucket.js");
 /**
  * If any of these flags exist on a value then it isn't the value we want to
@@ -90,6 +92,7 @@ class LayerPlan {
         this.copyStepIds = [];
         /** @internal */
         this.children = [];
+        this.distributorDependencies = null;
         /** @internal */
         this.steps = [];
         /** @internal */
@@ -130,10 +133,9 @@ class LayerPlan {
         this.combinations = [];
         /** @internal */
         this.finalCombinations = [];
-        // There has yet to be any side effects created in this layer.
-        this.latestSideEffectStep = null;
         this.stepsByConstructor = new Map();
         if (reason.type === "root") {
+            this.sideEffectRootLayerPlan = null;
             this.parentSideEffectStep = null;
             this.depth = 0;
             this.ancestry = [this];
@@ -144,6 +146,13 @@ class LayerPlan {
         else if (reason.type === "combined") {
             this.parentSideEffectStep = null;
             const firstParentLayerPlan = reason.parentLayerPlans[0];
+            this.sideEffectRootLayerPlan =
+                firstParentLayerPlan.sideEffectRootLayerPlan;
+            if (dev_js_1.isDev) {
+                for (const plp of reason.parentLayerPlans) {
+                    assert.strictEqual(plp.sideEffectRootLayerPlan, this.sideEffectRootLayerPlan, `Expected all parentLayerPlans to have the same sideEffectRootLayerPlan`);
+                }
+            }
             const rootLp = firstParentLayerPlan.ancestry[0];
             if (rootLp.reason.type !== "root") {
                 throw new Error("GrafastInternalError<e9290db3-9a1b-45af-a50e-baa9e161d7cc>: expected the 0'th entry in ancestry to be the root layer plan");
@@ -188,6 +197,13 @@ class LayerPlan {
         }
         else {
             const parentLayerPlan = reason.parentLayerPlan;
+            if (parentLayerPlan.reason.type === "root" ||
+                parentLayerPlan.reason.type === "mutationField") {
+                this.sideEffectRootLayerPlan = parentLayerPlan;
+            }
+            else {
+                this.sideEffectRootLayerPlan = parentLayerPlan.sideEffectRootLayerPlan;
+            }
             if (reason.type === "polymorphicPartition") {
                 if (parentLayerPlan.reason.type !== "polymorphic") {
                     throw new Error(`GrafastInternalError<ef8fcb9a-5252-4593-915c-b3ebe4aa8eff>: a polymorphicPartition may only be a child of a polymorphic layer plan, but ${this} was created under ${parentLayerPlan}`);
@@ -205,6 +221,8 @@ class LayerPlan {
             this.id = operationPlan.addLayerPlan(this);
             parentLayerPlan.children.push(this);
         }
+        this.latestSideEffectStep =
+            this.sideEffectRootLayerPlan?.latestSideEffectStep ?? null;
     }
     toString() {
         let chain = "";
@@ -288,6 +306,10 @@ class LayerPlan {
         else {
             parentSideEffectValue = null;
         }
+        const skippedIndicies = this.distributorDependencies === null ? null : [];
+        const skipIndex = skippedIndicies === null
+            ? null
+            : skippedIndicies.push.bind(skippedIndicies);
         let size = 0;
         switch (this.reason.type) {
             case "nullableBoundary": {
@@ -307,8 +329,18 @@ class LayerPlan {
                     }
                     else {
                         store.set(itemStepId, fieldValue);
+                        const batchCopy = [];
                         for (const stepId of copyStepIds) {
-                            store.set(stepId, parentBucket.store.get(stepId));
+                            const orig = parentBucket.store.get(stepId);
+                            if (orig.isBatch) {
+                                // Prepare store with an empty list for each copyPlanId
+                                const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
+                                store.set(stepId, ev);
+                                batchCopy.push({ orig, ev });
+                            }
+                            else {
+                                store.set(stepId, orig);
+                            }
                         }
                         const parentBucketSize = parentBucket.size;
                         for (let originalIndex = 0; originalIndex < parentBucketSize; originalIndex++) {
@@ -319,6 +351,12 @@ class LayerPlan {
                                 polymorphicPathList[newIndex] =
                                     parentBucket.polymorphicPathList[originalIndex];
                                 iterators[newIndex] = parentBucket.iterators[originalIndex];
+                                for (const { orig, ev } of batchCopy) {
+                                    ev._copyResult(newIndex, orig, originalIndex);
+                                }
+                            }
+                            else {
+                                skipIndex?.(originalIndex);
                             }
                         }
                     }
@@ -343,14 +381,17 @@ class LayerPlan {
                 else {
                     const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
                     store.set(itemStepId, ev);
+                    const batchCopy = [];
                     for (const stepId of copyStepIds) {
-                        const ev = parentBucket.store.get(stepId);
-                        if (ev.isBatch) {
+                        const orig = parentBucket.store.get(stepId);
+                        if (orig.isBatch) {
                             // Prepare store with an empty list for each copyPlanId
-                            store.set(stepId, (0, executeBucket_js_1.batchExecutionValue)([]));
+                            const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
+                            store.set(stepId, ev);
+                            batchCopy.push({ orig, ev });
                         }
                         else {
-                            store.set(stepId, ev);
+                            store.set(stepId, orig);
                         }
                     }
                     const nullableStepStore = parentBucket.store.get(itemStepId);
@@ -370,14 +411,13 @@ class LayerPlan {
                             polymorphicPathList[newIndex] =
                                 parentBucket.polymorphicPathList[originalIndex];
                             iterators[newIndex] = parentBucket.iterators[originalIndex];
-                            for (const stepId of copyStepIds) {
-                                const ev = store.get(stepId);
-                                if (ev.isBatch) {
-                                    const orig = parentBucket.store.get(stepId);
-                                    ev._copyResult(newIndex, orig, originalIndex);
-                                }
+                            for (const { orig, ev } of batchCopy) {
+                                ev._copyResult(newIndex, orig, originalIndex);
                             }
                         }
+                        else {
+                            skipIndex?.(originalIndex);
+                        }
                     }
                 }
                 break;
@@ -398,15 +438,18 @@ class LayerPlan {
                 }
                 const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
                 store.set(itemStepId, ev);
+                const batchCopy = [];
                 for (const stepId of copyStepIds) {
                     // Deliberate shadowing
-                    const ev = parentBucket.store.get(stepId);
-                    if (ev.isBatch) {
+                    const orig = parentBucket.store.get(stepId);
+                    if (orig.isBatch) {
                         // Prepare store with an empty list for each copyPlanId
-                        store.set(stepId, (0, executeBucket_js_1.batchExecutionValue)([]));
+                        const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
+                        store.set(stepId, ev);
+                        batchCopy.push({ orig, ev });
                     }
                     else {
-                        store.set(stepId, ev);
+                        store.set(stepId, orig);
                     }
                 }
                 // We'll typically be creating more listItem bucket entries than we
@@ -437,15 +480,14 @@ class LayerPlan {
                             polymorphicPathList[newIndex] =
                                 parentBucket.polymorphicPathList[originalIndex];
                             iterators[newIndex] = parentBucket.iterators[originalIndex];
-                            for (const stepId of copyStepIds) {
-                                const ev = store.get(stepId);
-                                if (ev.isBatch) {
-                                    const orig = parentBucket.store.get(stepId);
-                                    ev._copyResult(newIndex, orig, originalIndex);
-                                }
+                            for (const { orig, ev } of batchCopy) {
+                                ev._copyResult(newIndex, orig, originalIndex);
                             }
                         }
                     }
+                    else {
+                        skipIndex?.(originalIndex);
+                    }
                 }
                 break;
             }
@@ -466,32 +508,36 @@ class LayerPlan {
                 if (!typenameEV) {
                     throw new Error(`GrafastInternalError<af1417c6-752b-466e-af7e-cfc35724c3bc>: Entry for '${parentBucket.layerPlan.operationPlan.dangerouslyGetStep(parentStepId)}' not found in bucket for '${parentBucket.layerPlan}'`);
                 }
-                const batchCopyStepIds = [];
+                const batchCopy = [];
                 for (const stepId of copyStepIds) {
-                    const ev = parentBucket.store.get(stepId);
-                    if (!ev) {
+                    const orig = parentBucket.store.get(stepId);
+                    if (!orig) {
                         throw new Error(`GrafastInternalError<548f0d84-4556-4189-8655-fb16aa3345a6>: new bucket for ${this} wants to copy ${this.operationPlan.dangerouslyGetStep(stepId)}, but bucket for ${parentBucket.layerPlan} doesn't contain that plan`);
                     }
-                    if (ev.isBatch) {
-                        batchCopyStepIds.push(stepId);
-                        store.set(stepId, (0, executeBucket_js_1.batchExecutionValue)([]));
+                    if (orig.isBatch) {
+                        const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
+                        store.set(stepId, ev);
+                        batchCopy.push({ orig, ev });
                     }
                     else {
-                        store.set(stepId, ev);
+                        store.set(stepId, orig);
                     }
                 }
                 for (let originalIndex = 0; originalIndex < parentBucket.size; originalIndex++) {
                     const flags = typenameEV._flagsAt(originalIndex);
                     if ((flags & NO_TYPENAME_FLAGS) !== 0) {
+                        skipIndex?.(originalIndex);
                         continue;
                     }
                     if (parentSideEffectValue !== null &&
                         parentSideEffectValue._flagsAt(originalIndex) & constants_js_1.FLAG_ERROR) {
+                        skipIndex?.(originalIndex);
                         continue;
                     }
                     const polymorphicPath = parentBucket.polymorphicPathList.at(originalIndex);
                     const typeName = typenameEV.at(originalIndex);
                     if (!this.reason.typeNames.includes(typeName)) {
+                        skipIndex?.(originalIndex);
                         // Search: InvalidConcreteTypeName
                         // TODO: should we throw an error?
                         // Skip
@@ -503,9 +549,7 @@ class LayerPlan {
                         (polymorphicPath ?? "") + ">" + typeName;
                     polymorphicType[newIndex] = typeName;
                     iterators[newIndex] = parentBucket.iterators[originalIndex];
-                    for (const planId of batchCopyStepIds) {
-                        const ev = store.get(planId);
-                        const orig = parentBucket.store.get(planId);
+                    for (const { orig, ev } of batchCopy) {
                         ev._copyResult(newIndex, orig, originalIndex);
                     }
                 }
@@ -513,27 +557,30 @@ class LayerPlan {
             }
             case "polymorphicPartition": {
                 // Similar to polymorphic
-                const batchCopyStepIds = [];
+                const batchCopy = [];
                 for (const stepId of copyStepIds) {
-                    const ev = parentBucket.store.get(stepId);
-                    if (!ev) {
+                    const orig = parentBucket.store.get(stepId);
+                    if (!orig) {
                         throw new Error(`GrafastInternalError<548f0d84-4556-4189-8655-fb16aa3345a6>: new bucket for ${this} wants to copy ${this.operationPlan.dangerouslyGetStep(stepId)}, but bucket for ${parentBucket.layerPlan} doesn't contain that plan`);
                     }
-                    if (ev.isBatch) {
-                        batchCopyStepIds.push(stepId);
-                        store.set(stepId, (0, executeBucket_js_1.batchExecutionValue)([]));
+                    if (orig.isBatch) {
+                        const ev = (0, executeBucket_js_1.batchExecutionValue)([]);
+                        store.set(stepId, ev);
+                        batchCopy.push({ orig, ev });
                     }
                     else {
-                        store.set(stepId, ev);
+                        store.set(stepId, orig);
                     }
                 }
                 for (let originalIndex = 0; originalIndex < parentBucket.size; originalIndex++) {
                     if (parentSideEffectValue !== null &&
                         parentSideEffectValue._flagsAt(originalIndex) & constants_js_1.FLAG_ERROR) {
+                        skipIndex?.(originalIndex);
                         continue;
                     }
                     const typeName = parentBucket.polymorphicType.at(originalIndex);
                     if (!this.reason.typeNames.includes(typeName)) {
+                        skipIndex?.(originalIndex);
                         continue;
                     }
                     const newIndex = size++;
@@ -541,9 +588,7 @@ class LayerPlan {
                     polymorphicPathList[newIndex] =
                         parentBucket.polymorphicPathList.at(originalIndex);
                     iterators[newIndex] = parentBucket.iterators[originalIndex];
-                    for (const planId of batchCopyStepIds) {
-                        const ev = store.get(planId);
-                        const orig = parentBucket.store.get(planId);
+                    for (const { orig, ev } of batchCopy) {
                         ev._copyResult(newIndex, orig, originalIndex);
                     }
                 }
@@ -569,6 +614,27 @@ class LayerPlan {
             }
         }
         if (size > 0) {
+            if (this.distributorDependencies !== null) {
+                if (dev_js_1.isDev) {
+                    if (this.reason.type === "listItem") {
+                        throw new Error(`distributorDependencies should not be set on ${this}`);
+                    }
+                    assert.strictEqual(skippedIndicies?.length, parentBucket.size - size, "Incorrectly populated skippedIndicies");
+                }
+                if (skippedIndicies !== null && skippedIndicies.length > 0) {
+                    for (const [distributorStepId, consumerStepIds] of Object.entries(this.distributorDependencies)) {
+                        const distribEV = parentBucket.store.get(Number(distributorStepId));
+                        for (const originalIndex of skippedIndicies) {
+                            const v = distribEV.at(originalIndex);
+                            if ((0, distributor_js_1.isDistributor)(v)) {
+                                for (const consumerStepId of consumerStepIds) {
+                                    v.releaseIfUnused(consumerStepId);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             // Reference
             const childBucket = (0, executeBucket_js_1.newBucket)(parentBucket, {
                 layerPlan: this,
@@ -587,6 +653,20 @@ class LayerPlan {
             return childBucket;
         }
         else {
+            if (this.distributorDependencies !== null) {
+                const parentBucketSize = parentBucket.size;
+                for (const [distributorStepId, consumerStepIds] of Object.entries(this.distributorDependencies)) {
+                    const distribEV = parentBucket.store.get(Number(distributorStepId));
+                    for (let originalIndex = 0; originalIndex < parentBucketSize; originalIndex++) {
+                        const v = distribEV.at(originalIndex);
+                        if ((0, distributor_js_1.isDistributor)(v)) {
+                            for (const consumerStepId of consumerStepIds) {
+                                v.releaseIfUnused(consumerStepId);
+                            }
+                        }
+                    }
+                }
+            }
             return null;
         }
     }

package/dist/engine/OperationPlan.d.ts

@@ -1,7 +1,7 @@
 import type { FragmentDefinitionNode, GraphQLField, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, GraphQLUnionType, OperationDefinitionNode } from "graphql";
 import { $$timeout, $$ts } from "../constants.js";
 import type { Constraint } from "../constraints.js";
-import type { GrafastPlanJSON } from "../index.js";
+import type { ErrorBehavior, GrafastPlanJSON } from "../index.js";
 import { Step } from "../index.js";
 import type { FieldPlanResolver, LocationDetails, TrackedArguments } from "../interfaces.js";
 import type { ApplyAfterModeArg } from "../operationPlan-input.js";
@@ -30,6 +30,7 @@ export declare class OperationPlan {
         [key: string]: any;
     };
     readonly rootValue: any;
+    readonly errorBehavior: ErrorBehavior;
     readonly [$$timeout]: undefined;
     readonly [$$ts]: undefined;
     readonly queryType: GraphQLObjectType;
@@ -74,7 +75,7 @@ export declare class OperationPlan {
         [key: string]: any;
     }, contextConstraints: Constraint[], context: {
         [key: string]: any;
-    }, rootValueConstraints: Constraint[], rootValue: any, options: GrafastOperationOptions);
+    }, rootValueConstraints: Constraint[], rootValue: any, errorBehavior: ErrorBehavior, options: GrafastOperationOptions);
     private lap;
     private checkTimeout;
     private planOperation;
@@ -99,9 +100,11 @@ export declare class OperationPlan {
     processGroupedFieldSet(details: ProcessGroupedFieldSetDetails): Generator<() => {
         haltTree: boolean;
         step: Step;
+        latestSideEffectStep: Step | null;
     }, void, {
         step: Step<any>;
         haltTree: boolean;
+        latestSideEffectStep: Step<any> | null;
     }>;
     /**
      *
@@ -138,9 +141,11 @@ export declare class OperationPlan {
     _realPlanField(planFieldDetails: PlanFieldDetails): {
         step: Step<unknown>;
         haltTree: boolean;
+        latestSideEffectStep: Step<any> | null;
     } | {
         step: import("../index.js").ErrorStep<any>;
         haltTree: boolean;
+        latestSideEffectStep: Step<any> | null;
     };
     /**
      * A replacement for GraphQL's
@@ -211,6 +216,7 @@ export declare class OperationPlan {
     /** Finalizes each step */
     private finalizeSteps;
     private finalizeLayerPlans;
+    private finalize;
     /** Optimizes each output plan */
     private optimizeOutputPlans;
     /** Finalizes each output plan */
@@ -261,6 +267,7 @@ type PlanFieldBatchResult = {
     error?: never;
     haltTree: boolean;
     step: Step;
+    latestSideEffectStep: Step | null;
 };
 interface PlanFieldBatch {
     complete: boolean;