grafast 1.0.0-rc.6 → 1.0.0-rc.8

package/dist/engine/LayerPlan.js

@@ -16,12 +16,17 @@ const executeBucket_ts_1 = require("./executeBucket.js");
  * If any of these flags exist on a value then it isn't the value we want to
  * include for the combo step.
  */
-const SKIP_FLAGS = constants_ts_1.FLAG_ERROR | constants_ts_1.FLAG_STOPPED | constants_ts_1.FLAG_POLY_SKIPPED | constants_ts_1.FLAG_INHIBITED;
+const SKIP_FLAGS = constants_ts_1.FLAG_ERROR | constants_ts_1.FLAG_STOPPED | constants_ts_1.FLAG_POLY_SKIPPED | constants_ts_1.FLAG_INHIBITED | constants_ts_1.FLAG_NULL;
 /**
  * If any of these flags exist on the "$__typename" step, then the value
  * should resolve to null
  */
 const NO_TYPENAME_FLAGS = constants_ts_1.FLAG_ERROR | constants_ts_1.FLAG_STOPPED | constants_ts_1.FLAG_POLY_SKIPPED | constants_ts_1.FLAG_INHIBITED | constants_ts_1.FLAG_NULL;
+/**
+ * Used to determine if we should copy the error. Should only be copied if it's
+ * NOT polymorphic skipped; so we check the result `=== FLAG_ERROR`
+ */
+const ERROR_OR_POLY_SKIPPED_FLAGS = constants_ts_1.FLAG_ERROR | constants_ts_1.FLAG_POLY_SKIPPED;
 function hasParentLayerPlan(reason) {
     return reason.type !== "root" && reason.type !== "combined";
 }
@@ -298,6 +303,7 @@ class LayerPlan {
         const polymorphicType = this.reason.type === "polymorphic" ? [] : null;
         const iterators = this.reason.type === "mutationField" ? parentBucket.iterators : [];
         const map = new Map();
+        let flagUnion = parentBucket.flagUnion;
         const $parentSideEffect = this.parentSideEffectStep;
         let parentSideEffectValue;
         if ($parentSideEffect) {
@@ -476,6 +482,7 @@ class LayerPlan {
                                     flags = flags | constants_ts_1.FLAG_NULL;
                                 }
                             }
+                            flagUnion |= flags;
                             ev._setResult(newIndex, val, flags);
                             polymorphicPathList[newIndex] =
                                 parentBucket.polymorphicPathList[originalIndex];
@@ -640,7 +647,7 @@ class LayerPlan {
                 size,
                 store,
                 // PERF: not necessarily, if we don't copy the errors, we don't have the errors.
-                flagUnion: parentBucket.flagUnion,
+                flagUnion,
                 polymorphicPathList,
                 polymorphicType,
                 iterators,
@@ -669,6 +676,8 @@ class LayerPlan {
             return null;
         }
     }
+    // TODO: currently we copy nulls and errors through. Ideally we wouldn't,
+    // thereby shrinking the size of the bucket.
     newCombinedBucket(finalParentBucket) {
         const t = this.reason.type;
         if (t !== "combined") {
@@ -753,6 +762,7 @@ class LayerPlan {
                     continue;
                 for (let originalIndex = 0; originalIndex < parentBucket.size; originalIndex++) {
                     const newIndex = originalIndex + offset;
+                    let fallbackErrorSource = null;
                     if (sourceStepsByLayerPlanId[plp.id]) {
                         for (const stepId of sourceStepsByLayerPlanId[plp.id]) {
                             const sourceStore = parentBucket.store.get(stepId);
@@ -760,12 +770,29 @@ class LayerPlan {
                                 const step = this.operationPlan.stepTracker.getStepById(stepId);
                                 throw new Error(`GrafastInternalError<a48ca88c-e4b9-4a4f-9a38-846fa067f143>: missing source store for ${step} (${stepId}) in ${this}`);
                             }
-                            if ((sourceStore._flagsAt(originalIndex) & SKIP_FLAGS) == 0) {
+                            const sourceFlags = sourceStore._flagsAt(originalIndex);
+                            if ((sourceFlags & SKIP_FLAGS) === 0) {
                                 ev._copyResult(newIndex, sourceStore, originalIndex);
+                                fallbackErrorSource = null;
                                 break;
                             }
+                            else if (fallbackErrorSource === null &&
+                                (sourceFlags & ERROR_OR_POLY_SKIPPED_FLAGS) === constants_ts_1.FLAG_ERROR) {
+                                fallbackErrorSource = sourceStore;
+                            } // If no matches, it retains `FLAG_NULL | FLAG_STOPPED` from above
                         }
                     }
+                    if (fallbackErrorSource !== null) {
+                        // No non-skipped source existed for this index; preserve the first
+                        // available error instead of silently converting to stopped/null.
+                        //
+                        // Normally we'd do:
+                        //
+                        //     ev._copyResult(newIndex, fallbackErrorSource, originalIndex);
+                        //
+                        // However, we want to add FLAG_STOPPED, so we do this manually:
+                        ev._setResult(newIndex, fallbackErrorSource.at(originalIndex), fallbackErrorSource._flagsAt(originalIndex) | constants_ts_1.FLAG_STOPPED);
+                    }
                     iterators[newIndex] = parentBucket.iterators[originalIndex];
                 }
                 offset += parentBucket.size;

package/dist/engine/OperationPlan.js

@@ -1220,6 +1220,9 @@ class OperationPlan {
                             : (0, step_ts_1.stepHasToRecord)($original)
                                 ? (0, withGlobalLayerPlan_ts_1.withGlobalLayerPlan)(commonLayerPlan, polymorphicPaths, planningPath, null, $original.toRecord, $original)
                                 : $original;
+                    // Combo layer plan filters nulls for us; since we're skipping that
+                    // we need to explicitly inhibit nulls
+                    commonStep = (0, withGlobalLayerPlan_ts_1.withGlobalLayerPlan)(commonLayerPlan, polymorphicPaths, planningPath, null, index_ts_1.inhibitOnNull, null, commonStep);
                     for (const detailsRecord of detailsRecordList) {
                         detailsRecord.layerPlan = commonLayerPlan;
                         const polymorphicPaths = detailsRecord.polymorphicPaths;
@@ -1947,7 +1950,7 @@ class OperationPlan {
                         (0, withGlobalLayerPlan_ts_1.withGlobalLayerPlan)(layerPlan, polymorphicPaths, planningPath, null, constant_ts_1.constant, null, null);
                 haltTree = true;
             }
-            (0, step_ts_1.assertExecutableStep)(step);
+            (0, step_ts_1.assertStep)(step);
             // `undefined` for non-lists (?)
             if (stepStreamOptions !== undefined) {
                 // `null` is fine! `undefined` is not.

package/dist/engine/distributor.js

@@ -147,7 +147,7 @@ function distributor(sourceIterable, dependentSteps, abortSignal, distributorOpt
             let advanced = false;
             while (smallest >= lowWaterMark) {
                 advanced = true;
-                buffer.shift();
+                void buffer.shift();
                 lowWaterMark++;
             }
             // Announce that the lowWaterMark advanced
@@ -342,14 +342,14 @@ function distributor(sourceIterable, dependentSteps, abortSignal, distributorOpt
             const stepIndex = getStepIndex(stepId);
             if (!hasIterator[stepIndex]) {
                 hasIterator[stepIndex] = true;
-                stop(stepIndex);
+                void stop(stepIndex);
             }
         },
     };
     abortSignal.addEventListener("abort", () => {
         for (let stepIndex = 0, l = dependentSteps.length; stepIndex < l; stepIndex++) {
             hasIterator[stepIndex] = true;
-            stop(stepIndex, undefined, false);
+            void stop(stepIndex, undefined, false);
         }
         maybeAdvanceLowWaterMark();
     });

package/dist/engine/executeBucket.js

@@ -181,9 +181,7 @@ function executeBucket(bucket, requestContext) {
             // **DO NOT THROW, DO NOT ALLOW AN ERROR TO BE RAISED!**
             // **USE DEFENSIVE PROGRAMMING HERE!**
             /** PROMISES ADDED HERE MUST NOT REJECT */
-            let promises;
-            let pendingPromises;
-            let pendingPromiseIndexes;
+            let promises = undefined;
             // TODO: it seems that if this throws an error it results in a permanent
             // hang of defers? In the mean time... Don't throw any errors here!
             const success = (finishedStep, bucket, resultIndex, rawValue, flags) => {
@@ -234,8 +232,9 @@ function executeBucket(bucket, requestContext) {
                             }
                             replacement[i] = null;
                             const index = i;
+                            // Must not reject
                             const promise = item.then((v) => void (replacement[index] = v), (e) => void (replacement[index] = (0, error_ts_1.flagError)(e)));
-                            if (!promises) {
+                            if (promises === undefined) {
                                 promises = [promise];
                             }
                             else {
@@ -343,7 +342,7 @@ function executeBucket(bucket, requestContext) {
                                 bucket.setResult(finishedStep, resultIndex, e, flags | constants_ts_1.FLAG_ERROR);
                             }
                         })();
-                        if (!promises) {
+                        if (promises === undefined) {
                             promises = [promise];
                         }
                         else {
@@ -365,56 +364,26 @@ function executeBucket(bucket, requestContext) {
                 const count = step._isUnary ? 1 : size;
                 for (let dataIndex = 0; dataIndex < count; dataIndex++) {
                     const val = results[dataIndex];
+                    const valFlags = flags[dataIndex];
+                    if (valFlags == null) {
+                        throw new Error(`GraphileInternalError<75df71bb-0f76-4a98-9664-9167d502296a>: result for ${step} has no flag at index ${dataIndex} (value = ${(0, inspect_ts_1.inspect)(val)})`);
+                    }
                     if (step.isSyncAndSafe || !(0, utils_ts_1.isPromiseLike)(val)) {
-                        if (flags[dataIndex] == null) {
-                            throw new Error(`GraphileInternalError<75df71bb-0f76-4a98-9664-9167d502296a>: result for ${step} has no flag at index ${dataIndex} (value = ${(0, inspect_ts_1.inspect)(val)})`);
-                        }
-                        success(step, bucket, dataIndex, val, flags[dataIndex]);
+                        success(step, bucket, dataIndex, val, valFlags);
                     }
                     else {
-                        if (!pendingPromises) {
-                            pendingPromises = [val];
-                            pendingPromiseIndexes = [{ s: allStepsIndex, i: dataIndex }];
+                        // Must not reject!
+                        const valSuccess = val.then((val) => success(step, bucket, dataIndex, val, valFlags), (error) => bucket.setResult(step, dataIndex, error, constants_ts_1.FLAG_ERROR));
+                        if (promises === undefined) {
+                            promises = [valSuccess];
                         }
                         else {
-                            pendingPromises.push(val);
-                            pendingPromiseIndexes.push({ s: allStepsIndex, i: dataIndex });
+                            promises.push(valSuccess);
                         }
                     }
                 }
             }
-            if (pendingPromises !== undefined) {
-                return Promise.allSettled(pendingPromises)
-                    .then((resultSettledResult) => {
-                    for (let i = 0, pendingPromisesLength = resultSettledResult.length; i < pendingPromisesLength; i++) {
-                        const settledResult = resultSettledResult[i];
-                        const { s: allStepsIndex, i: dataIndex } = pendingPromiseIndexes[i];
-                        const finishedStep = _allSteps[allStepsIndex];
-                        if (settledResult.status === "fulfilled") {
-                            success(finishedStep, bucket, dataIndex, settledResult.value, constants_ts_1.NO_FLAGS);
-                        }
-                        else {
-                            const error = settledResult.reason;
-                            bucket.setResult(finishedStep, dataIndex, error, constants_ts_1.FLAG_ERROR);
-                        }
-                    }
-                    return promises ? Promise.all(promises) : undefined;
-                })
-                    .then(null, (e) => {
-                    // THIS SHOULD NEVER HAPPEN!
-                    console.error(`GrafastInternalError<1e9731b4-005e-4b0e-bc61-43baa62e6444>: this error should never occur! Please file an issue against grafast. Details: ${e}`);
-                    bucket.flagUnion |= constants_ts_1.FLAG_ERROR;
-                    for (let i = 0, pendingPromisesLength = pendingPromises.length; i < pendingPromisesLength; i++) {
-                        const { s: allStepsIndex, i: dataIndex } = pendingPromiseIndexes[i];
-                        const finishedStep = _allSteps[allStepsIndex];
-                        const error = new Error(`GrafastInternalError<1e9731b4-005e-4b0e-bc61-43baa62e6444>: error occurred whilst performing completedStep(${finishedStep.id})`);
-                        bucket.setResult(finishedStep, dataIndex, error, constants_ts_1.FLAG_ERROR);
-                    }
-                });
-            }
-            else {
-                return promises ? Promise.all(promises) : undefined;
-            }
+            return promises === undefined ? undefined : Promise.all(promises);
         };
         const runSyncSteps = () => {
             const executedLength = resultList.length;
@@ -1046,14 +1015,22 @@ function markLayerPlanAsDone(requestContext, sharedState, layerPlan, bucket) {
                 if (!allParentLayerPlansAreReady) {
                     // The last parent layer plan to complete will handle it.
                     // Make sure we're retained so it can use our data!
-                    // Will be released inside the "combined" branch in childLayerPlan.newBucket
+                    // Released below.
                     if (bucket != null) {
                         bucket.sharedState.retain(bucket);
                     }
-                    // TODO: MAKE SURE CANCELLED BUCKETS ARE HANDLED!
                     continue loop;
                 }
                 const childBucket = childLayerPlan.newCombinedBucket({ sharedState });
+                // Every parent except the final parent was retained while waiting for all
+                // parents to complete; release those temporary retains now.
+                for (const plp of childLayerPlan.reason.parentLayerPlans) {
+                    if (plp === layerPlan)
+                        continue; // Was never retained
+                    const otherBucket = sharedState._retainedBuckets.get(plp.id);
+                    if (otherBucket !== undefined)
+                        sharedState.release(otherBucket);
+                }
                 if (childBucket !== null) {
                     // Execute
                     const result = executeBucket(childBucket, requestContext);
@@ -1174,9 +1151,7 @@ function newBucket(parent, spec) {
             if (index >= size) {
                 throw new Error(`GrafastInternalError<9465db89-cc9d-415c-97e7-57bb19ddebe0>: attempt to write to out of bounds index ${index} for bucket of size ${size} for step ${step}`);
             }
-            if (flags !== constants_ts_1.NO_FLAGS) {
-                this.flagUnion |= flags;
-            }
+            this.flagUnion |= flags;
             if (step._isUnary) {
                 if (dev_ts_1.isDev && store.has(stepId)) {
                     const ev = store.get(stepId);

package/dist/index.d.ts

@@ -34,11 +34,11 @@ import { stringifyPayload } from "./stringifyPayload.ts";
 import { stripAnsi } from "./stripAnsi.ts";
 import { subscribe } from "./subscribe.ts";
 import type { GrafastInputFieldConfigMap, GrafastInputObjectType, GrafastObjectType, InputObjectTypeSpec, ObjectTypeFields, ObjectTypeSpec } from "./utils.ts";
-import { arrayOfLength, arraysMatch, asyncIteratorWithCleanup, getEnumValueConfig, getEnumValueConfigs, GraphQLSpecifiedErrorBehaviors, inputObjectFieldSpec, isPromiseLike, mapsMatch, maybeArraysMatch, newGrafastFieldConfigBuilder, newInputObjectTypeBuilder, newObjectTypeBuilder, objectFieldSpec, objectSpec, recordsMatch, setsMatch, stepADependsOnStepB, stepAMayDependOnStepB, stepAShouldTryAndInlineIntoStepB, stepsAreInSamePhase } from "./utils.ts";
+import { arrayOfLength, arraysMatch, asyncIteratorWithCleanup, getEnumValueConfig, getEnumValueConfigs, GraphQLSpecifiedErrorBehaviors, inputObjectFieldSpec, isPromiseLike, mapsMatch, markSyncAndSafe, maybeArraysMatch, newGrafastFieldConfigBuilder, newInputObjectTypeBuilder, newObjectTypeBuilder, objectFieldSpec, objectSpec, recordsMatch, setsMatch, stepADependsOnStepB, stepAMayDependOnStepB, stepAShouldTryAndInlineIntoStepB, stepsAreInSamePhase } from "./utils.ts";
 export { GraphQLDeferDirective, graphqlHasStreamDefer, GraphQLStreamDirective, } from "./incremental.ts";
 export { isAsyncIterable } from "iterall";
 export type { __InputObjectStepWithDollars, __TrackedValueStepWithDollars, AbstractTypePlan, AbstractTypePlanner, ActualKeyByDesiredKey, BaseEventMap, BaseGraphQLArguments, BaseGraphQLRootValue, BaseGraphQLVariables, BatchExecutionValue, ConnectionHandlingResult, ConnectionHandlingStep, ConnectionOptimizedStep, DataFromObjectSteps, DataFromStep, DeprecatedInputObjectPlan, DeprecatedObjectPlan, EnumPlan, EnumValueConfig, EnumValueInput, ErrorBehavior, EventCallback, EventMapKey, ExecutionDetails, ExecutionDetailsStream, ExecutionEventEmitter, ExecutionEventMap, ExecutionExtra, ExecutionResults, ExecutionResultValue, ExecutionValue, FieldArg, FieldArgs, FieldInfo, FieldPlan, FieldPlanResolver, FilterPlanMemo, GrafastArgumentConfig, GrafastExecutionArgs, GrafastFieldConfig, GrafastFieldConfigArgumentMap, GrafastInputFieldConfig, GrafastInputFieldConfigMap, GrafastInputObjectType, GrafastObjectType, GrafastPlanJSON, GrafastResultsList, GrafastResultStreamList, GrafastSchemaConfig, GrafastSubscriber, GrafastValuesList, GroupByPlanMemo, InputFieldPlan, InputObjectFieldApplyResolver, InputObjectFieldConfig, InputObjectPlan, InputObjectTypeBakedInfo, InputObjectTypeBakedResolver, InputObjectTypeSpec, InterfacePlan, JSONArray, JSONObject, JSONValue, ListCapableStep, ListLikeStep, ListTransformItemPlanCallback, ListTransformOptions, ListTransformReduce, LoadManyCallback, LoadManyInfo, LoadManyLoader, LoadOneCallback, LoadOneInfo, LoadOneLoader, Maybe, Multistep, NodeIdCodec, NodeIdHandler, ObjectFieldConfig, ObjectLikeStep, ObjectPlan, ObjectPlanMeta, ObjectTypeFields, ObjectTypeSpec, PaginationFeatures, PaginationParams, PlanTypeInfo, PromiseOrDirect, ScalarPlan, ScalarPlanResolver, SetterCapable, StepOptimizeOptions, StepRepresentingList, StepStreamOptions, Thunk, TypedEventEmitter, UnaryExecutionValue, UnbatchedExecutionExtra, UnionPlan, UnwrapMultistep, };
-export { __FlagStep, __InputListStep, __InputObjectStep, __InputStaticLeafStep, __ItemStep, __ListTransformStep, __TrackedValueStep, __ValueStep, $$bypassGraphQL, $$eventEmitter, $$extensions, $$idempotent, $$inhibit, $$verbatim, access, AccessStep, applyInput, ApplyInputStep, applyTransforms, ApplyTransformsStep, arrayOfLength, arraysMatch, assertExecutableStep, assertListCapableStep, assertModifier, assertNotNull, assertStep, asyncIteratorWithCleanup, bakedInput, bakedInputRuntime, BakedInputStep, coalesce, CoalesceStep, condition, ConditionStep, connection, ConnectionStep, constant, ConstantStep, context, createObjectAndApplyChildren, currentFieldStreamDetails, debugPlans, DEFAULT_ACCEPT_FLAGS, defaultPlanResolver, each, EdgeStep, error, ErrorStep, Step as ExecutableStep, execute, exportAs, exportAsMany, filter, first, FirstStep, flagError, get, getEnumValueConfig, getEnumValueConfigs, getGrafastMiddleware, getNullableInputTypeAtPath, grafast, grafast as grafastGraphql, grafastSync as grafastGraphqlSync, grafastPrint, grafastSync, graphqlResolver, GraphQLResolverStep, GraphQLSpecifiedErrorBehaviors, groupBy, inhibitOnNull, inputObjectFieldSpec, inspect, isDev, isExecutableStep, isListCapableStep, isListLikeStep, isModifier, isObjectLikeStep, isPromiseLike, isSafeError, isStep, isUnaryStep, lambda, LambdaStep, last, LastStep, list, listen, ListenStep, ListStep, listTransform, LoadedRecordStep, loadMany, loadManyCallback, loadManyLoader, LoadManyStep, loadOne, loadOneCallback, loadOneLoader, LoadOneStep, makeDecodeNodeId, makeDecodeNodeIdRuntime, makeGrafastSchema, mapsMatch, maybeArraysMatch, Modifier, multistep, newGrafastFieldConfigBuilder, newInputObjectTypeBuilder, newObjectTypeBuilder, nodeIdFromNode, noop, object, objectFieldSpec, objectSpec, ObjectStep, OperationPlan, operationPlan, partitionByIndex, promiseWithResolve, proxy, ProxyStep, recordsMatch, remapKeys, RemapKeysStep, reverse, reverseArray, ReverseStep, rootValue, SafeError, setsMatch, Setter, setter, sideEffect, SideEffectStep, specFromNodeId, Step, stepADependsOnStepB, stepAMayDependOnStepB, stepAShouldTryAndInlineIntoStepB, stepsAreInSamePhase, stringifyPayload, stripAnsi, subscribe, trap, TRAP_ERROR, TRAP_ERROR_OR_INHIBITED, TRAP_INHIBITED, UnbatchedStep as UnbatchedExecutableStep, UnbatchedStep, };
+export { __FlagStep, __InputListStep, __InputObjectStep, __InputStaticLeafStep, __ItemStep, __ListTransformStep, __TrackedValueStep, __ValueStep, $$bypassGraphQL, $$eventEmitter, $$extensions, $$idempotent, $$inhibit, $$verbatim, access, AccessStep, applyInput, ApplyInputStep, applyTransforms, ApplyTransformsStep, arrayOfLength, arraysMatch, assertExecutableStep, assertListCapableStep, assertModifier, assertNotNull, assertStep, asyncIteratorWithCleanup, bakedInput, bakedInputRuntime, BakedInputStep, coalesce, CoalesceStep, condition, ConditionStep, connection, ConnectionStep, constant, ConstantStep, context, createObjectAndApplyChildren, currentFieldStreamDetails, debugPlans, DEFAULT_ACCEPT_FLAGS, defaultPlanResolver, each, EdgeStep, error, ErrorStep, Step as ExecutableStep, execute, exportAs, exportAsMany, filter, first, FirstStep, flagError, get, getEnumValueConfig, getEnumValueConfigs, getGrafastMiddleware, getNullableInputTypeAtPath, grafast, grafast as grafastGraphql, grafastSync as grafastGraphqlSync, grafastPrint, grafastSync, graphqlResolver, GraphQLResolverStep, GraphQLSpecifiedErrorBehaviors, groupBy, inhibitOnNull, inputObjectFieldSpec, inspect, isDev, isExecutableStep, isListCapableStep, isListLikeStep, isModifier, isObjectLikeStep, isPromiseLike, isSafeError, isStep, isUnaryStep, lambda, LambdaStep, last, LastStep, list, listen, ListenStep, ListStep, listTransform, LoadedRecordStep, loadMany, loadManyCallback, loadManyLoader, LoadManyStep, loadOne, loadOneCallback, loadOneLoader, LoadOneStep, makeDecodeNodeId, makeDecodeNodeIdRuntime, makeGrafastSchema, mapsMatch, markSyncAndSafe, maybeArraysMatch, Modifier, multistep, newGrafastFieldConfigBuilder, newInputObjectTypeBuilder, newObjectTypeBuilder, nodeIdFromNode, noop, object, objectFieldSpec, objectSpec, ObjectStep, OperationPlan, operationPlan, partitionByIndex, promiseWithResolve, proxy, ProxyStep, recordsMatch, remapKeys, RemapKeysStep, reverse, reverseArray, ReverseStep, rootValue, SafeError, setsMatch, Setter, setter, sideEffect, SideEffectStep, specFromNodeId, Step, stepADependsOnStepB, stepAMayDependOnStepB, stepAShouldTryAndInlineIntoStepB, stepsAreInSamePhase, stringifyPayload, stripAnsi, subscribe, trap, TRAP_ERROR, TRAP_ERROR_OR_INHIBITED, TRAP_INHIBITED, UnbatchedStep as UnbatchedExecutableStep, UnbatchedStep, };
 export type { PromiseWithResolve } from "./promiseWithResolve.ts";
 export { hookArgs } from "./args.ts";
 export { version } from "./version.ts";

package/dist/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.each = exports.defaultPlanResolver = exports.DEFAULT_ACCEPT_FLAGS = exports.debugPlans = exports.currentFieldStreamDetails = exports.createObjectAndApplyChildren = exports.context = exports.ConstantStep = exports.constant = exports.ConnectionStep = exports.connection = exports.ConditionStep = exports.condition = exports.CoalesceStep = exports.coalesce = exports.BakedInputStep = exports.bakedInputRuntime = exports.bakedInput = exports.asyncIteratorWithCleanup = exports.assertStep = exports.assertNotNull = exports.assertModifier = exports.assertListCapableStep = exports.assertExecutableStep = exports.arraysMatch = exports.arrayOfLength = exports.ApplyTransformsStep = exports.applyTransforms = exports.ApplyInputStep = exports.applyInput = exports.AccessStep = exports.access = exports.$$verbatim = exports.$$inhibit = exports.$$idempotent = exports.$$extensions = exports.$$eventEmitter = exports.$$bypassGraphQL = exports.__ValueStep = exports.__TrackedValueStep = exports.__ListTransformStep = exports.__ItemStep = exports.__InputStaticLeafStep = exports.__InputObjectStep = exports.__InputListStep = exports.__FlagStep = exports.isAsyncIterable = exports.GraphQLStreamDirective = exports.graphqlHasStreamDefer = exports.GraphQLDeferDirective = void 0;
 exports.loadManyCallback = exports.loadMany = exports.LoadedRecordStep = exports.listTransform = exports.ListStep = exports.ListenStep = exports.listen = exports.list = exports.LastStep = exports.last = exports.LambdaStep = exports.lambda = exports.isUnaryStep = exports.isStep = exports.isSafeError = exports.isPromiseLike = exports.isObjectLikeStep = exports.isModifier = exports.isListLikeStep = exports.isListCapableStep = exports.isExecutableStep = exports.isDev = exports.inspect = exports.inputObjectFieldSpec = exports.inhibitOnNull = exports.groupBy = exports.GraphQLSpecifiedErrorBehaviors = exports.GraphQLResolverStep = exports.graphqlResolver = exports.grafastSync = exports.grafastPrint = exports.grafastGraphqlSync = exports.grafastGraphql = exports.grafast = exports.getNullableInputTypeAtPath = exports.getGrafastMiddleware = exports.getEnumValueConfigs = exports.getEnumValueConfig = exports.get = exports.flagError = exports.FirstStep = exports.first = exports.filter = exports.exportAsMany = exports.exportAs = exports.execute = exports.ExecutableStep = exports.ErrorStep = exports.error = exports.EdgeStep = void 0;
-exports.subscribe = exports.stripAnsi = exports.stringifyPayload = exports.stepsAreInSamePhase = exports.stepAShouldTryAndInlineIntoStepB = exports.stepAMayDependOnStepB = exports.stepADependsOnStepB = exports.Step = exports.specFromNodeId = exports.SideEffectStep = exports.sideEffect = exports.setter = exports.Setter = exports.setsMatch = exports.SafeError = exports.rootValue = exports.ReverseStep = exports.reverseArray = exports.reverse = exports.RemapKeysStep = exports.remapKeys = exports.recordsMatch = exports.ProxyStep = exports.proxy = exports.promiseWithResolve = exports.partitionByIndex = exports.operationPlan = exports.OperationPlan = exports.ObjectStep = exports.objectSpec = exports.objectFieldSpec = exports.object = exports.noop = exports.nodeIdFromNode = exports.newObjectTypeBuilder = exports.newInputObjectTypeBuilder = exports.newGrafastFieldConfigBuilder = exports.multistep = exports.Modifier = exports.maybeArraysMatch = exports.mapsMatch = exports.makeGrafastSchema = exports.makeDecodeNodeIdRuntime = exports.makeDecodeNodeId = exports.LoadOneStep = exports.loadOneLoader = exports.loadOneCallback = exports.loadOne = exports.LoadManyStep = exports.loadManyLoader = void 0;
-exports.version = exports.hookArgs = exports.UnbatchedStep = exports.UnbatchedExecutableStep = exports.TRAP_INHIBITED = exports.TRAP_ERROR_OR_INHIBITED = exports.TRAP_ERROR = exports.trap = void 0;
+exports.stripAnsi = exports.stringifyPayload = exports.stepsAreInSamePhase = exports.stepAShouldTryAndInlineIntoStepB = exports.stepAMayDependOnStepB = exports.stepADependsOnStepB = exports.Step = exports.specFromNodeId = exports.SideEffectStep = exports.sideEffect = exports.setter = exports.Setter = exports.setsMatch = exports.SafeError = exports.rootValue = exports.ReverseStep = exports.reverseArray = exports.reverse = exports.RemapKeysStep = exports.remapKeys = exports.recordsMatch = exports.ProxyStep = exports.proxy = exports.promiseWithResolve = exports.partitionByIndex = exports.operationPlan = exports.OperationPlan = exports.ObjectStep = exports.objectSpec = exports.objectFieldSpec = exports.object = exports.noop = exports.nodeIdFromNode = exports.newObjectTypeBuilder = exports.newInputObjectTypeBuilder = exports.newGrafastFieldConfigBuilder = exports.multistep = exports.Modifier = exports.maybeArraysMatch = exports.markSyncAndSafe = exports.mapsMatch = exports.makeGrafastSchema = exports.makeDecodeNodeIdRuntime = exports.makeDecodeNodeId = exports.LoadOneStep = exports.loadOneLoader = exports.loadOneCallback = exports.loadOne = exports.LoadManyStep = exports.loadManyLoader = void 0;
+exports.version = exports.hookArgs = exports.UnbatchedStep = exports.UnbatchedExecutableStep = exports.TRAP_INHIBITED = exports.TRAP_ERROR_OR_INHIBITED = exports.TRAP_ERROR = exports.trap = exports.subscribe = void 0;
 const tslib_1 = require("tslib");
 require("./thereCanBeOnlyOne.js");
 const debug_1 = tslib_1.__importDefault(require("debug"));
@@ -173,6 +173,7 @@ Object.defineProperty(exports, "GraphQLSpecifiedErrorBehaviors", { enumerable: t
 Object.defineProperty(exports, "inputObjectFieldSpec", { enumerable: true, get: function () { return utils_ts_1.inputObjectFieldSpec; } });
 Object.defineProperty(exports, "isPromiseLike", { enumerable: true, get: function () { return utils_ts_1.isPromiseLike; } });
 Object.defineProperty(exports, "mapsMatch", { enumerable: true, get: function () { return utils_ts_1.mapsMatch; } });
+Object.defineProperty(exports, "markSyncAndSafe", { enumerable: true, get: function () { return utils_ts_1.markSyncAndSafe; } });
 Object.defineProperty(exports, "maybeArraysMatch", { enumerable: true, get: function () { return utils_ts_1.maybeArraysMatch; } });
 Object.defineProperty(exports, "newGrafastFieldConfigBuilder", { enumerable: true, get: function () { return utils_ts_1.newGrafastFieldConfigBuilder; } });
 Object.defineProperty(exports, "newInputObjectTypeBuilder", { enumerable: true, get: function () { return utils_ts_1.newInputObjectTypeBuilder; } });
@@ -208,7 +209,6 @@ Object.defineProperty(exports, "isAsyncIterable", { enumerable: true, get: funct
     stringifyPayload: stringifyPayload_ts_1.stringifyPayload,
     __InputObjectStep: index_ts_1.__InputObjectStep,
     __InputStaticLeafStep: index_ts_1.__InputStaticLeafStep,
-    assertExecutableStep: step_ts_1.assertExecutableStep,
     assertStep: step_ts_1.assertStep,
     assertListCapableStep: step_ts_1.assertListCapableStep,
     assertModifier: index_ts_1.assertModifier,
@@ -305,6 +305,7 @@ Object.defineProperty(exports, "isAsyncIterable", { enumerable: true, get: funct
     stepADependsOnStepB: utils_ts_1.stepADependsOnStepB,
     stepAMayDependOnStepB: utils_ts_1.stepAMayDependOnStepB,
     stepsAreInSamePhase: utils_ts_1.stepsAreInSamePhase,
+    markSyncAndSafe: utils_ts_1.markSyncAndSafe,
     asyncIteratorWithCleanup: utils_ts_1.asyncIteratorWithCleanup,
     stepAShouldTryAndInlineIntoStepB: utils_ts_1.stepAShouldTryAndInlineIntoStepB,
     isPromiseLike: utils_ts_1.isPromiseLike,

package/dist/step.d.ts

@@ -293,7 +293,7 @@ Step as ExecutableStep,
 /** @deprecated Use UnbatchedStep instead */
 UnbatchedStep as UnbatchedExecutableStep, };
 /** @deprecated Use isStep instead */
-export declare const isExecutableStep: typeof isStep;
-/** @deprecated Use isStep instead */
+export declare function isExecutableStep<TData = any>(step: unknown): step is Step<TData>;
+/** @deprecated Use assertStep instead */
 export declare function assertExecutableStep<TData>(step: unknown): asserts step is Step<TData>;
 //# sourceMappingURL=step.d.ts.map

package/dist/step.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExecutableStep = exports.UnbatchedExecutableStep = exports.ExecutableStep = exports.UnbatchedStep = exports.Step = exports.assertFinalized = exports.$$noExec = void 0;
+exports.UnbatchedExecutableStep = exports.ExecutableStep = exports.UnbatchedStep = exports.Step = exports.assertFinalized = exports.$$noExec = void 0;
 exports.isStep = isStep;
 exports.assertStep = assertStep;
 exports.isUnbatchedStep = isUnbatchedStep;
@@ -11,6 +11,7 @@ exports.isListCapableStep = isListCapableStep;
 exports.assertListCapableStep = assertListCapableStep;
 exports.stepHasToSpecifier = stepHasToSpecifier;
 exports.stepHasToRecord = stepHasToRecord;
+exports.isExecutableStep = isExecutableStep;
 exports.assertExecutableStep = assertExecutableStep;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -547,9 +548,11 @@ function stepHasToRecord($step) {
     return typeof $step.toRecord === "function";
 }
 /** @deprecated Use isStep instead */
-exports.isExecutableStep = isStep;
-/** @deprecated Use isStep instead */
+function isExecutableStep(step) {
+    return isStep(step);
+}
+/** @deprecated Use assertStep instead */
 function assertExecutableStep(step) {
-    return assertStep(step);
+    assertStep(step);
 }
 //# sourceMappingURL=step.js.map

package/dist/steps/_loadCommon.js

@@ -171,7 +171,7 @@ function executeLoad(details, sharedDepId, paramDepIdByKey, baseLoadInfo, load)
             (0, exports.nextTick)(() => {
                 // Don't allow adding anything else to the batch
                 meta.loadBatchesByLoad.delete(load);
-                executeBatches(loadBatches, loadInfo, load);
+                void executeBatches(loadBatches, loadInfo, load);
             });
         }
         return (async () => {

package/dist/steps/graphqlResolver.js

@@ -66,10 +66,10 @@ class GraphQLResolverStep extends step_ts_1.UnbatchedStep {
         }
         else {
             if (this.isNotRoot) {
-                return Promise.reject(new Error(`Invalid non-root subscribe`));
+                return (0, index_ts_1.flagError)(new Error(`Invalid non-root subscribe`));
             }
             if (this.subscriber == null) {
-                return Promise.reject(new Error(`Cannot subscribe to field`));
+                return (0, index_ts_1.flagError)(new Error(`Cannot subscribe to field`));
             }
             const resolveInfo = Object.assign(Object.create(this.resolveInfoBase), {
                 // ENHANCE: add support for path
@@ -119,6 +119,8 @@ class GraphQLResolveTypeStep extends step_ts_1.Step {
      * resolution part.
      */
     figureOutTheTypeOf(data, context, resolveInfo) {
+        if (data == null)
+            return data;
         const abstractType = this.abstractType;
         if (abstractType.resolveType != null) {
             return abstractType.resolveType(data, context, resolveInfo, abstractType);

package/dist/steps/listen.js

@@ -22,7 +22,7 @@ class ListenStep extends step_ts_1.Step {
         this.initialEventDep = null;
         this.itemPlan = itemPlan;
         const $topic = typeof topicOrPlan === "string" ? (0, constant_ts_1.constant)(topicOrPlan) : topicOrPlan;
-        const $pubsub = (0, step_ts_1.isExecutableStep)(pubsubOrPlan)
+        const $pubsub = (0, step_ts_1.isStep)(pubsubOrPlan)
             ? pubsubOrPlan
             : (0, constant_ts_1.constant)(pubsubOrPlan, false);
         this.pubsubDep = this.addDependency($pubsub);

package/dist/steps/node.d.ts

@@ -14,12 +14,9 @@ import type { Step } from "../step.ts";
  */
 export declare function specFromNodeId<THandler extends NodeIdHandler<any> = NodeIdHandler<any>>(handler: THandler, $id: Step<Maybe<string>>): ReturnType<THandler["getSpec"]>;
 export declare function nodeIdFromNode(handler: NodeIdHandler<any>, $node: Step): import("./lambda.ts").LambdaStep<any, string | null>;
-export declare function makeDecodeNodeIdRuntime(handlers: readonly NodeIdHandler[]): {
-    (raw: string | null | undefined): {
-        [codecName: string]: any;
-    } | null;
-    isSyncAndSafe: boolean;
-};
+export declare function makeDecodeNodeIdRuntime(handlers: readonly NodeIdHandler[]): (raw: string | null | undefined) => {
+    [codecName: string]: any;
+} | null;
 export declare function makeDecodeNodeId(handlers: readonly NodeIdHandler[]): ($id: Step<string | null | undefined>) => import("./lambda.ts").LambdaStep<string | null | undefined, {
     [codecName: string]: any;
 } | null>;

package/dist/steps/node.js

@@ -4,6 +4,7 @@ exports.specFromNodeId = specFromNodeId;
 exports.nodeIdFromNode = nodeIdFromNode;
 exports.makeDecodeNodeIdRuntime = makeDecodeNodeIdRuntime;
 exports.makeDecodeNodeId = makeDecodeNodeId;
+const utils_ts_1 = require("../utils.js");
 const constant_ts_1 = require("./constant.js");
 const lambda_ts_1 = require("./lambda.js");
 /**
@@ -37,14 +38,14 @@ function decodeNodeIdWithHandler(details) {
         return null;
     }
 }
-decodeNodeIdWithHandler.isSyncAndSafe = true; // Optimization
+(0, utils_ts_1.markSyncAndSafe)(decodeNodeIdWithHandler);
 function nodeIdFromNode(handler, $node) {
     const specifier = handler.plan($node);
     return (0, lambda_ts_1.lambda)(specifier, handler.codec.encode);
 }
 function makeDecodeNodeIdRuntime(handlers) {
     const codecs = [...new Set(handlers.map((h) => h.codec))];
-    function decodeNodeIdWithCodecs(raw) {
+    return (0, utils_ts_1.markSyncAndSafe)(function decodeNodeIdWithCodecs(raw) {
         if (raw == null)
             return null;
         return codecs.reduce((memo, codec) => {
@@ -56,9 +57,7 @@ function makeDecodeNodeIdRuntime(handlers) {
             }
             return memo;
         }, { raw });
-    }
-    decodeNodeIdWithCodecs.isSyncAndSafe = true; // Optimization
-    return decodeNodeIdWithCodecs;
+    });
 }
 function makeDecodeNodeId(handlers) {
     const decodeNodeIdWithCodecs = makeDecodeNodeIdRuntime(handlers);

package/dist/utils.d.ts

@@ -203,5 +203,8 @@ export declare const sleep: (ms: number) => Promise<unknown>;
 export declare function asyncIteratorWithCleanup<T>(iterable: AsyncIterable<T, void, never>, callback: (error?: unknown) => void): AsyncGenerator<T, void, never> & AsyncIteratorObject<T, void, never>;
 export declare function terminateIterable(iterable: readonly any[] | Iterable<any> | AsyncIterable<any>): void;
 export declare const GraphQLSpecifiedErrorBehaviors: readonly ["PROPAGATE", "NULL", "HALT"];
+export declare function markSyncAndSafe<T extends ((...args: any) => any) & {
+    displayName?: string;
+}>(fn: T, displayName?: string): T;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -44,6 +44,7 @@ exports.stableStringSort = stableStringSort;
 exports.stableStringSortFirstTupleEntry = stableStringSortFirstTupleEntry;
 exports.asyncIteratorWithCleanup = asyncIteratorWithCleanup;
 exports.terminateIterable = terminateIterable;
+exports.markSyncAndSafe = markSyncAndSafe;
 const tslib_1 = require("tslib");
 const graphql = tslib_1.__importStar(require("graphql"));
 const assert = tslib_1.__importStar(require("./assert.js"));
@@ -1147,4 +1148,14 @@ exports.GraphQLSpecifiedErrorBehaviors = Object.freeze([
     "NULL",
     "HALT",
 ]);
+const IS_SYNC_AND_SAFE = Object.freeze({
+    isSyncAndSafe: true,
+});
+function markSyncAndSafe(fn, displayName) {
+    Object.assign(fn, IS_SYNC_AND_SAFE);
+    if (displayName) {
+        fn.displayName = displayName;
+    }
+    return fn;
+}
 //# sourceMappingURL=utils.js.map

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.0.0-rc.6";
+export declare const version = "1.0.0-rc.8";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // This file is autogenerated by /scripts/postversion.mjs
-exports.version = "1.0.0-rc.6";
+exports.version = "1.0.0-rc.8";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grafast",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "description": "Cutting edge GraphQL planning and execution engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "chalk": "^4.1.2",
     "debug": "^4.4.3",
     "eventemitter3": "^5.0.1",
-    "graphile-config": "^1.0.0-rc.4",
+    "graphile-config": "^1.0.0-rc.5",
     "graphql": "^16.9.0",
     "iterall": "^1.3.0",
     "tslib": "^2.8.1"