grafast 0.1.1-beta.20 → 0.1.1-beta.21

package/dist/args.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hookArgs = void 0;
+exports.hookArgs = hookArgs;
 const interfaces_js_1 = require("./interfaces.js");
 const middleware_js_1 = require("./middleware.js");
 const utils_js_1 = require("./utils.js");
@@ -29,7 +29,7 @@ function hookArgs(rawArgs, legacyResolvedPreset, legacyCtx) {
     }
     const middleware = rawMiddleware === undefined && resolvedPreset != null
         ? (0, middleware_js_1.getGrafastMiddleware)(resolvedPreset)
-        : rawMiddleware ?? null;
+        : (rawMiddleware ?? null);
     if (rawMiddleware === undefined) {
         rawArgs.middleware = middleware;
     }
@@ -46,7 +46,6 @@ function hookArgs(rawArgs, legacyResolvedPreset, legacyCtx) {
         return finalize(args);
     }
 }
-exports.hookArgs = hookArgs;
 function finalize(args) {
     const userContext = args.resolvedPreset?.grafast?.context;
     const contextValue = args.contextValue;

package/dist/assert.js

@@ -6,19 +6,18 @@
  * https://github.com/facebook/jest/issues/2549
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strictEqual = exports.ok = void 0;
+exports.ok = ok;
+exports.strictEqual = strictEqual;
 /** Equivalent to `assert.ok(...)` */
 function ok(val, message) {
     if (!val) {
         throw new Error(message);
     }
 }
-exports.ok = ok;
 /** Equivalent to `assert.strictEqual(...)` */
 function strictEqual(actual, expected, message) {
     if (actual !== expected) {
         throw new Error(message + ` (${actual} !== ${expected})`);
     }
 }
-exports.strictEqual = strictEqual;
 //# sourceMappingURL=assert.js.map

package/dist/constraints.js

@@ -3,7 +3,7 @@
 // and then compiling (JIT-style) remaining constraints into a function using
 // tamedevil
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchesConstraints = void 0;
+exports.matchesConstraints = matchesConstraints;
 function valueAtPath(object, path) {
     let value = object;
     for (let i = 0, l = path.length; i < l; i++) {
@@ -107,5 +107,4 @@ function matchesConstraints(constraints, object) {
     }
     return true;
 }
-exports.matchesConstraints = matchesConstraints;
 //# sourceMappingURL=constraints.js.map

package/dist/deferred.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defer = void 0;
+exports.defer = defer;
 function NOOP() { }
 /**
  * Returns a promise that can be `.resolve()`-ed or `.reject()`-ed at a later
@@ -21,5 +21,4 @@ function defer() {
     promise.then(null, NOOP);
     return promise;
 }
-exports.defer = defer;
 //# sourceMappingURL=deferred.js.map

package/dist/dev.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noop = exports.isTest = exports.isDev = void 0;
+exports.isTest = exports.isDev = void 0;
+exports.noop = noop;
 /**
  * @internal
  */
@@ -13,7 +14,6 @@ const mode = graphileEnv !== undefined ? graphileEnv : nodeEnv;
 exports.isDev = mode === "development" || mode === "test";
 exports.isTest = mode === "test";
 function noop() { }
-exports.noop = noop;
 if (typeof process !== "undefined" &&
     typeof graphileEnv === "undefined" &&
     typeof nodeEnv === "undefined") {

package/dist/engine/LayerPlan.d.ts

@@ -1,5 +1,5 @@
 import type { Bucket } from "../bucket.js";
-import type { ExecutableStep } from "../step";
+import type { Step } from "../step";
 import type { OperationPlan } from "./OperationPlan";
 /** Non-branching, non-deferred */
 export interface LayerPlanReasonRoot {
@@ -15,7 +15,12 @@ export interface LayerPlanReasonNullableField {
      *
      * Also needed for execution (see `executeBucket`).
      */
-    parentStep: ExecutableStep;
+    parentStep: Step;
+}
+export interface LayerPlanReasonListItemStream {
+    initialCountStepId?: number;
+    ifStepId?: number;
+    labelStepId?: number;
 }
 /** Non-branching, non-deferred */
 export interface LayerPlanReasonListItem {
@@ -27,12 +32,11 @@ export interface LayerPlanReasonListItem {
      *
      * Also needed for execution (see `executeBucket`).
      */
-    parentStep: ExecutableStep;
-    /** If this listItem is to be streamed, the configuration for that streaming */
-    stream?: {
-        initialCount: number;
-        label?: string;
-    };
+    parentStep: Step;
+    /**
+     * If this listItem is to be streamed, the configuration for that streaming.
+     */
+    stream?: LayerPlanReasonListItemStream;
 }
 /** Non-branching, deferred */
 export interface LayerPlanReasonSubscription {
@@ -55,20 +59,20 @@ export interface LayerPlanReasonPolymorphic {
     /**
      * Needed for execution (see `executeBucket`).
      */
-    parentStep: ExecutableStep;
+    parentStep: Step;
     polymorphicPaths: Set<string>;
 }
 /** Non-branching, non-deferred */
 export interface LayerPlanReasonSubroutine {
     type: "subroutine";
-    parentStep: ExecutableStep;
+    parentStep: Step;
 }
-export declare function isBranchingLayerPlan(layerPlan: LayerPlan<any>): boolean;
-export declare function isDeferredLayerPlan(layerPlan: LayerPlan<any>): boolean;
-export declare function isPolymorphicLayerPlan(layerPlan: LayerPlan<any>): boolean;
+export declare function isBranchingLayerPlan(layerPlan: LayerPlan): boolean;
+export declare function isDeferredLayerPlan(layerPlan: LayerPlan): boolean;
+export declare function isPolymorphicLayerPlan(layerPlan: LayerPlan): boolean;
 export type LayerPlanReason = LayerPlanReasonRoot | LayerPlanReasonNullableField | LayerPlanReasonListItem | LayerPlanReasonSubscription | LayerPlanReasonMutationField | LayerPlanReasonDefer | LayerPlanReasonPolymorphic | LayerPlanReasonSubroutine;
 export type HasParent<A extends LayerPlanReason> = A extends any ? A extends {
-    parentStep: ExecutableStep;
+    parentStep: Step;
 } ? A : never : never;
 export type LayerPlanReasonsWithParentStep = HasParent<LayerPlanReason>;
 /**
@@ -109,12 +113,12 @@ export declare class LayerPlan<TReason extends LayerPlanReason = LayerPlanReason
      * An optimization for OperationPlan.getPeers; this tracks the steps in this
      * layer plan, grouped by their step class.
      */
-    stepsByConstructor: Map<Function, Set<ExecutableStep>>;
+    stepsByConstructor: Map<Function, Set<Step>>;
     constructor(operationPlan: OperationPlan, parentLayerPlan: LayerPlan | null, reason: TReason);
     toString(): string;
     print(depth?: number): string;
     _hasSetRootStep: boolean;
-    setRootStep($root: ExecutableStep): void;
+    setRootStep($root: Step): void;
     finalize(): void;
     newBucket(parentBucket: Bucket): Bucket | null;
 }

package/dist/engine/LayerPlan.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayerPlan = exports.isPolymorphicLayerPlan = exports.isDeferredLayerPlan = exports.isBranchingLayerPlan = void 0;
+exports.LayerPlan = void 0;
+exports.isBranchingLayerPlan = isBranchingLayerPlan;
+exports.isDeferredLayerPlan = isDeferredLayerPlan;
+exports.isPolymorphicLayerPlan = isPolymorphicLayerPlan;
 const tslib_1 = require("tslib");
 const lru_1 = tslib_1.__importDefault(require("@graphile/lru"));
 const tamedevil_1 = tslib_1.__importDefault(require("tamedevil"));
@@ -12,20 +15,17 @@ const executeBucket_js_1 = require("./executeBucket.js");
 function isBranchingLayerPlan(layerPlan) {
     return layerPlan.reason.type === "polymorphic";
 }
-exports.isBranchingLayerPlan = isBranchingLayerPlan;
 function isDeferredLayerPlan(layerPlan) {
     const t = layerPlan.reason.type;
-    return (t === "stream" ||
+    return ((t === "listItem" && layerPlan.reason.stream != null) ||
         t === "subscription" ||
         t === "mutationField" ||
         t === "defer");
 }
-exports.isDeferredLayerPlan = isDeferredLayerPlan;
 function isPolymorphicLayerPlan(layerPlan) {
     const t = layerPlan.reason.type;
     return t === "polymorphic";
 }
-exports.isPolymorphicLayerPlan = isPolymorphicLayerPlan;
 /**
  * A LayerPlan represents (via "reason") either the root (root), when something
  * happens at a later time (mutationField, defer), when plurality changes
@@ -65,7 +65,6 @@ class LayerPlan {
          *
          * - root: the `operationPlan.rootValue`
          * - listItem: the `__ItemStep`
-         * - stream: also the `__ItemStep`
          * - subscription: also the `__ItemStep`
          * - mutationField: the result plan of the mutation field
          * - defer: the parent layer's rootStep (defer always results in an object, unless an error occurs)
@@ -185,10 +184,6 @@ class LayerPlan {
     _addStep(step) {
         return this.operationPlan._addStep(step);
     }
-    /** @internal */
-    _addModifierStep(step) {
-        return this.operationPlan._addModifierStep(step);
-    }
     finalize() {
         if (
         // this.reason.type === "nullableBoundary" ||

package/dist/engine/OperationPlan.d.ts

@@ -2,7 +2,7 @@ import type { FragmentDefinitionNode, GraphQLFieldMap, GraphQLObjectType, GraphQ
 import type { Constraint } from "../constraints.js";
 import type { SelectionSetDigest } from "../graphqlCollectFields.js";
 import type { GrafastPlanJSON } from "../index.js";
-import { ExecutableStep } from "../index.js";
+import { Step } from "../index.js";
 import { $$timeout, $$ts } from "../interfaces.js";
 import type { LayerPlanReasonSubroutine } from "./LayerPlan.js";
 import { LayerPlan } from "./LayerPlan.js";
@@ -54,11 +54,6 @@ export declare class OperationPlan {
      * Gets updated as we work our way through the plan, useful for making errors more helpful.
      */
     loc: string[] | null;
-    private modifierStepCount;
-    private modifierDepthCount;
-    private modifierSteps;
-    private maxDeduplicatedStepId;
-    private maxValidatedStepId;
     /**
      * If true, then this operation doesn't use (custom) resolvers.
      */
@@ -95,7 +90,7 @@ export declare class OperationPlan {
      * create one item plan per parent plan.
      */
     private itemStepForListStep;
-    processGroupedFieldSet(outputPlan: OutputPlan, path: readonly string[], polymorphicPath: string | null, polymorphicPaths: ReadonlySet<string> | null, parentStep: ExecutableStep, objectType: GraphQLObjectType, objectTypeFields: GraphQLFieldMap<any, any>, isMutation: boolean, groupedFieldSet: SelectionSetDigest): void;
+    processGroupedFieldSet(outputPlan: OutputPlan, path: readonly string[], polymorphicPath: string | null, polymorphicPaths: ReadonlySet<string> | null, parentStep: Step, objectType: GraphQLObjectType, objectTypeFields: GraphQLFieldMap<any, any>, isMutation: boolean, groupedFieldSet: SelectionSetDigest): void;
     /**
      *
      * @param outputPlan - The output plan that this selection set is being added to
@@ -106,6 +101,7 @@ export declare class OperationPlan {
      * @param isMutation - If true this selection set should be executed serially rather than in parallel (each field gets its own LayerPlan)
      */
     private planSelectionSet;
+    private internalDependency;
     private planIntoOutputPlan;
     private polymorphicLayerPlanByPathByLayerPlan;
     private getPolymorphicLayerPlan;
@@ -117,7 +113,6 @@ export declare class OperationPlan {
      * @see https://spec.graphql.org/draft/#CoerceArgumentValues()
      */
     private getTrackedArguments;
-    withModifiers<T>(cb: () => T): T;
     /**
      * Sets up tracking for the given value (variableValues, context, rootValue).
      */
@@ -164,7 +159,6 @@ export declare class OperationPlan {
     private hoistAndDeduplicate;
     private hoistSteps;
     private pushDownSteps;
-    private getStepOptionsForStep;
     /**
      * Calls the 'optimize' method on a plan, which may cause the plan to
      * communicate with its (deep) dependencies, and even to replace itself with
@@ -186,9 +180,9 @@ export declare class OperationPlan {
     private finalizeOutputPlans;
     private walkOutputPlans;
     generatePlanJSON(): GrafastPlanJSON;
-    finishSubroutine(subroutineStep: ExecutableStep, layerPlan: LayerPlan<LayerPlanReasonSubroutine>): void;
-    getStepsByMetaKey(metaKey: string | number | symbol): ExecutableStep[];
-    getStepsByStepClass<TClass extends ExecutableStep>(klass: {
+    finishSubroutine(subroutineStep: Step, layerPlan: LayerPlan<LayerPlanReasonSubroutine>): void;
+    getStepsByMetaKey(metaKey: string | number | symbol): Step[];
+    getStepsByStepClass<TClass extends Step>(klass: {
         new (...args: any[]): TClass;
     }): TClass[];
     private _cacheStepStoreByLayerPlanAndActionKey;
@@ -197,13 +191,18 @@ export declare class OperationPlan {
      * need to regenerate it on future calls, significantly reducing the load on
      * deduplication later.
      *
+     * Note: automatically extends the cached step into other (relevant)
+     * polymorphic paths; if this shouldn't be the case then don't use cacheStep
+     * and instead rely on deduplication as usual.
+     *
      * @experimental
      */
-    cacheStep<T extends ExecutableStep>(ownerStep: ExecutableStep, actionKey: string, cacheKey: symbol | string | number | boolean | null | undefined, cb: () => T): T;
+    cacheStep<T extends Step>(ownerStep: Step, actionKey: string, cacheKey: symbol | string | number | boolean | null | undefined, cb: () => T): T;
     /**
      * Clears the cache, typically due to side effects having taken place. Called
      * from setting hasSideEffects on an ExecutableStep, among other places.
      */
     resetCache(): void;
+    withRootLayerPlan<T>(cb: () => T): T;
 }
 //# sourceMappingURL=OperationPlan.d.ts.map