grafast 0.1.1-beta.21 → 0.1.1-beta.22

package/dist/steps/graphqlResolver.js

@@ -1,39 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLItemHandler = exports.GraphQLResolverStep = void 0;
-exports.graphqlItemHandler = graphqlItemHandler;
+exports.GraphQLResolveTypeStep = exports.GraphQLResolverStep = void 0;
+exports.graphqlResolveType = graphqlResolveType;
 exports.graphqlResolver = graphqlResolver;
 const tslib_1 = require("tslib");
 const graphql = tslib_1.__importStar(require("graphql"));
-const iterall_1 = require("iterall");
 const index_js_1 = require("../index.js");
-const polymorphic_js_1 = require("../polymorphic.js");
 const step_js_1 = require("../step.js");
 const utils_js_1 = require("../utils.js");
-const { defaultTypeResolver, getNamedType, getNullableType, isAbstractType, isListType, isNonNullType, } = graphql;
-function dcr(data, // but not a promise
-context, resolveInfo) {
-    if (data == null) {
-        return data;
-    }
-    else if (data instanceof Error) {
-        return (0, index_js_1.flagError)(data);
-    }
-    else if ((0, utils_js_1.isPromiseLike)(data)) {
-        return data.then((data) => dcr(data, context, resolveInfo));
-    }
-    if ((0, iterall_1.isIterable)(data)) {
-        const list = Array.isArray(data) ? data : [...data];
-        if (list.some(utils_js_1.isPromiseLike)) {
-            const resolved = Promise.all(list.map((entry) => (0, utils_js_1.isPromiseLike)(entry) ? entry.then(null, index_js_1.flagError) : entry));
-            // TODO: this does recursion which is inefficient and also incorrect. We
-            // should only traverse as deep as the GraphQL type has lists.
-            return dcr(resolved, context, resolveInfo);
-        }
-    }
-    // TODO: support async iterables
-    return { data, context, resolveInfo };
-}
+const { defaultTypeResolver } = graphql;
 /**
  * Calls the given GraphQL resolver for each input - emulates GraphQL
  * resolution.
@@ -45,19 +20,18 @@ class GraphQLResolverStep extends step_js_1.UnbatchedStep {
         moduleName: "grafast",
         exportName: "GraphQLResolverStep",
     }; }
-    constructor(resolver, subscriber, $plan, $args, resolveInfoBase, returnContextAndResolveInfo = false) {
+    constructor(resolver, subscriber, $plan, $args, resolveInfoBase) {
         super();
         this.resolver = resolver;
         this.subscriber = subscriber;
         this.resolveInfoBase = resolveInfoBase;
-        this.returnContextAndResolveInfo = returnContextAndResolveInfo;
         this.isSyncAndSafe = false;
         this.allowMultipleOptimizations = false;
-        this.planDep = this.addDependency($plan);
-        this.argsDep = this.addDependency($args);
-        this.contextDep = this.addDependency((0, index_js_1.context)());
-        this.variableValuesDep = this.addDependency(this.operationPlan.variableValuesStep);
-        this.rootValueDep = this.addDependency(this.operationPlan.rootValueStep);
+        this.addDependency($plan);
+        this.addDependency($args);
+        this.addDependency((0, index_js_1.context)());
+        this.addDependency(this.operationPlan.variableValuesStep);
+        this.addDependency(this.operationPlan.rootValueStep);
         this.isNotRoot = ![
             this.operationPlan.queryType,
             this.operationPlan.mutationType,
@@ -65,11 +39,12 @@ class GraphQLResolverStep extends step_js_1.UnbatchedStep {
         ].includes(resolveInfoBase.parentType);
     }
     toStringMeta() {
-        return (this.resolver?.displayName ||
+        const resolverName = this.resolver?.displayName ||
             this.resolver?.name ||
             this.subscriber?.displayName ||
             this.subscriber?.name ||
-            null);
+            null;
+        return `${this.resolveInfoBase.parentType.name}.${this.resolveInfoBase.fieldName}${resolverName && resolverName !== "resolve" ? `:${resolverName}` : ""}`;
     }
     unbatchedExecute(extra, source, args, context, variableValues, rootValue) {
         if (!extra.stream) {
@@ -87,12 +62,7 @@ class GraphQLResolverStep extends step_js_1.UnbatchedStep {
                 },
             });
             const data = this.resolver?.(source, args, context, resolveInfo);
-            if (this.returnContextAndResolveInfo) {
-                return dcr(data, context, resolveInfo);
-            }
-            else {
-                return flagErrorIfErrorAsync(data);
-            }
+            return flagErrorIfErrorAsync(data);
         }
         else {
             if (this.isNotRoot) {
@@ -101,9 +71,6 @@ class GraphQLResolverStep extends step_js_1.UnbatchedStep {
             if (this.subscriber == null) {
                 return Promise.reject(new Error(`Cannot subscribe to field`));
             }
-            if (this.returnContextAndResolveInfo) {
-                return Promise.reject(new Error(`Subscription with returnContextAndResolveInfo is not supported`));
-            }
             const resolveInfo = Object.assign(Object.create(this.resolveInfoBase), {
                 // ENHANCE: add support for path
                 variableValues,
@@ -118,40 +85,36 @@ class GraphQLResolverStep extends step_js_1.UnbatchedStep {
 }
 exports.GraphQLResolverStep = GraphQLResolverStep;
 /** @internal */
-class GraphQLItemHandler extends step_js_1.Step {
+class GraphQLResolveTypeStep extends step_js_1.Step {
     static { this.$$export = {
         moduleName: "grafast",
-        exportName: "GraphQLItemHandler",
+        exportName: "GraphQLResolveTypeStep",
     }; }
-    constructor($parent, nullableType) {
+    constructor($stepOrSpecifier, info) {
         super();
-        this.nullableInnerType = null;
+        // Could be promises
         this.isSyncAndSafe = false;
-        this.addDependency($parent);
-        if (isListType(nullableType)) {
-            const innerType = nullableType.ofType;
-            if (isNonNullType(innerType)) {
-                this.nullableInnerType = innerType.ofType;
-            }
-            else {
-                this.nullableInnerType = innerType;
-            }
-        }
-        else {
-            if (!isAbstractType(nullableType)) {
-                throw new Error(`GrafastInternalError<0a293e88-0f38-43f6-9179-f3ef9a720872>: Expected nullableType to be a list or abstract type, instead found ${nullableType}`);
-            }
-            this.abstractType = nullableType;
-        }
-    }
-    planForType() {
-        return this;
-    }
-    listItem($item) {
-        if (!this.nullableInnerType) {
-            throw new Error(`GrafastInternalError<83f3533a-db8e-4eb9-9251-2a165ae6147b>: did not expect ${this}.listItem() to be called since it wasn't handling a list type`);
-        }
-        return graphqlItemHandler($item, this.nullableInnerType);
+        const { abstractType } = info;
+        this.abstractType = abstractType;
+        this.resolveInfoBase = {
+            ...this.operationPlan.resolveInfoOperationBase,
+            // TODO: this resolveInfo is seriously hacked, we don't know a number of
+            // things that _shouldn't_ be necessary for figuring out the type, so
+            // we'll run in this crippled state.
+            // Really we should inherit the resolveInfo from the field itself, but
+            // currently that doesn't get passed through. Maybe it should have its
+            // own step which we pass through as a dependency?
+            fieldName: null,
+            parentType: null,
+            path: null,
+            fieldNodes: null,
+            // Even this is a lie
+            returnType: abstractType,
+        };
+        this.addDataDependency($stepOrSpecifier);
+        this.addUnaryDependency((0, index_js_1.context)());
+        this.addUnaryDependency(this.operationPlan.variableValuesStep);
+        this.addUnaryDependency(this.operationPlan.rootValueStep);
     }
     /**
      * Akin to graphql-js' completeAbstractValue... but just the typeName
@@ -159,9 +122,6 @@ class GraphQLItemHandler extends step_js_1.Step {
      */
     figureOutTheTypeOf(data, context, resolveInfo) {
         const abstractType = this.abstractType;
-        if (!abstractType) {
-            throw new Error("GrafastInternalError<5ea0892a-e9f6-479c-9b0b-2b09e46eecb6>: No abstract type? How can this be?");
-        }
         if (abstractType.resolveType != null) {
             return abstractType.resolveType(data, context, resolveInfo, abstractType);
         }
@@ -169,77 +129,32 @@ class GraphQLItemHandler extends step_js_1.Step {
             return defaultTypeResolver(data, context, resolveInfo, abstractType);
         }
     }
-    actuallyWrapData(typeName, data) {
-        if (typeName !== undefined) {
-            return (0, polymorphic_js_1.polymorphicWrap)(typeName, data);
-        }
-        else {
-            return new Error("Could not determine type of data");
-        }
-    }
-    polymorphicWrapData(data, // but not a promise
-    context, resolveInfo) {
-        if (data == null) {
-            return null;
-        }
-        const typeName = this.figureOutTheTypeOf(data, context, resolveInfo);
-        if ((0, utils_js_1.isPromiseLike)(typeName)) {
-            return typeName.then((name) => this.actuallyWrapData(name, data));
-        }
-        else {
-            return this.actuallyWrapData(typeName, data);
-        }
-    }
-    wrapListData(data, context, resolveInfo) {
-        if (data == null) {
-            return null;
-        }
-        if (!Array.isArray(data)) {
-            console.warn(`${this}: data wasn't an array, so we're returning null`);
-            return null;
-        }
-        return data.map((data) => dcr(data, context, resolveInfo));
-    }
-    execute({ indexMap, values: [values0], }) {
-        if (this.abstractType !== undefined) {
-            return indexMap((i) => {
-                const data = values0.at(i);
-                if (data == null) {
-                    return data;
-                }
-                else if ((0, utils_js_1.isPromiseLike)(data.data)) {
-                    return data.data.then((resolvedData) => this.polymorphicWrapData(resolvedData, data.context, data.resolveInfo));
-                }
-                else {
-                    return this.polymorphicWrapData(data.data, data.context, data.resolveInfo);
-                }
-            });
-        }
-        else if (this.nullableInnerType != null) {
-            return indexMap((i) => {
-                const d = values0.at(i);
-                if (d == null) {
-                    return null;
-                }
-                else {
-                    const { data, context, resolveInfo } = d;
-                    if ((0, utils_js_1.isPromiseLike)(data)) {
-                        return data.then((data) => this.wrapListData(data, context, resolveInfo));
-                    }
-                    else {
-                        return this.wrapListData(data, context, resolveInfo);
-                    }
-                }
-            });
-        }
-        else {
-            throw new Error(`GrafastInternalError<6a3ed701-6b53-41e6-9a64-fbea57c76ae7>: has to be abstract or list`);
-        }
+    execute({ indexMap, values: [values0, contextVal, variableValuesVal, rootValueVal], }) {
+        const context = contextVal.unaryValue();
+        const variableValues = variableValuesVal.unaryValue();
+        const rootValue = rootValueVal.unaryValue();
+        const resolveInfo = {
+            ...this.resolveInfoBase,
+            rootValue,
+            variableValues,
+        };
+        return indexMap((i) => {
+            const data = values0.at(i);
+            if (data == null) {
+                return data;
+            }
+            else if ((0, utils_js_1.isPromiseLike)(data)) {
+                return data.then((resolvedData) => this.figureOutTheTypeOf(resolvedData, context, resolveInfo));
+            }
+            else {
+                return this.figureOutTheTypeOf(data, context, resolveInfo);
+            }
+        });
     }
 }
-exports.GraphQLItemHandler = GraphQLItemHandler;
-function graphqlItemHandler($item, nullableType) {
-    return new GraphQLItemHandler($item, nullableType);
+exports.GraphQLResolveTypeStep = GraphQLResolveTypeStep;
+function graphqlResolveType($stepOrSpecifier, info) {
+    return new GraphQLResolveTypeStep($stepOrSpecifier, info);
 }
 /**
  * Emulates what GraphQL does when calling a resolver, including handling of
@@ -248,20 +163,7 @@ function graphqlItemHandler($item, nullableType) {
  * @internal
  */
 function graphqlResolver(resolver, subscriber, $step, $args, resolveInfoBase) {
-    const { returnType } = resolveInfoBase;
-    const namedType = getNamedType(returnType);
-    const isAbstract = isAbstractType(namedType);
-    const $resolverResult = new GraphQLResolverStep(resolver, subscriber, $step, $args, resolveInfoBase, isAbstract);
-    if (isAbstract) {
-        if (subscriber != null) {
-            throw new index_js_1.SafeError(`GraphQL subscribe function emulation currently doesn't support polymorphism`);
-        }
-        const nullableType = getNullableType(returnType);
-        return graphqlItemHandler($resolverResult, nullableType);
-    }
-    else {
-        return $resolverResult;
-    }
+    return new GraphQLResolverStep(resolver, subscriber, $step, $args, resolveInfoBase);
 }
 function flagErrorIfError(data) {
     return data instanceof Error ? (0, index_js_1.flagError)(data) : data;

package/dist/steps/index.d.ts

@@ -1,17 +1,6 @@
-import type { __TrackedValueStep, OperationPlan } from "../index.js";
-import type { __ValueStep } from "./__value.js";
-export declare function operationPlan(): OperationPlan;
-export declare function context<TContext extends Grafast.Context = Grafast.Context>(): __ValueStep<TContext>;
-export declare function rootValue(): __ValueStep<Record<string, any>>;
-export declare function trackedContext<TContext extends Grafast.Context = Grafast.Context>(): __TrackedValueStep<TContext>;
-export declare function trackedRootValue(): __TrackedValueStep<Record<string, any>>;
-/**
- * Turns on debug mode, calls the callback, and then turns debug mode back off
- * again.
- */
-export declare function debugPlans<T>(callback: () => T): T;
 export { __FlagStep, assertNotNull, inhibitOnNull, trap, TRAP_ERROR, TRAP_ERROR_OR_INHIBITED, TRAP_INHIBITED, } from "./__flag.js";
-export { access, AccessStep } from "./access.js";
+export { access, AccessStep, get } from "./access.js";
+export { coalesce, CoalesceStep } from "./coalesce.js";
 export { assertEdgeCapableStep, assertPageInfoCapableStep, connection, ConnectionCapableStep, ConnectionStep, EdgeCapableStep, EdgeStep, PageInfoCapableStep, } from "./connection.js";
 export { constant, ConstantStep } from "./constant.js";
 export { each } from "./each.js";
@@ -41,8 +30,7 @@ export { applyInput, ApplyInputStep, assertModifier, isModifier, Modifier, } fro
 export { applyTransforms, ApplyTransformsStep } from "./applyTransforms.js";
 export { bakedInput, bakedInputRuntime, BakedInputStep } from "./bakedInput.js";
 export { condition, ConditionStep } from "./condition.js";
-export { GraphQLItemHandler, graphqlItemHandler, graphqlResolver, GraphQLResolverStep, } from "./graphqlResolver.js";
+export { graphqlResolver, GraphQLResolverStep } from "./graphqlResolver.js";
 export { LoadedRecordStep, loadMany, LoadManyCallback, loadManyCallback, loadOne, LoadOneCallback, loadOneCallback, LoadOptions, LoadStep, } from "./load.js";
-export { polymorphicBranch, PolymorphicBranchMatcher, PolymorphicBranchMatchers, PolymorphicBranchStep, } from "./polymorphicBranch.js";
 export { proxy, ProxyStep } from "./proxy.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/steps/index.js

@@ -1,41 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setter = exports.Setter = exports.createObjectAndApplyChildren = exports.ReverseStep = exports.reverseArray = exports.reverse = exports.RemapKeysStep = exports.remapKeys = exports.partitionByIndex = exports.ObjectStep = exports.object = exports.specFromNodeId = exports.NodeStep = exports.nodeIdFromNode = exports.node = exports.makeDecodeNodeIdRuntime = exports.makeDecodeNodeId = exports.listTransform = exports.__ListTransformStep = exports.ListenStep = exports.listen = exports.ListStep = exports.list = exports.LastStep = exports.last = exports.LambdaStep = exports.lambda = exports.groupBy = exports.FirstStep = exports.first = exports.filter = exports.ErrorStep = exports.error = exports.each = exports.ConstantStep = exports.constant = exports.EdgeStep = exports.ConnectionStep = exports.connection = exports.assertPageInfoCapableStep = exports.assertEdgeCapableStep = exports.AccessStep = exports.access = exports.TRAP_INHIBITED = exports.TRAP_ERROR_OR_INHIBITED = exports.TRAP_ERROR = exports.trap = exports.inhibitOnNull = exports.assertNotNull = exports.__FlagStep = void 0;
-exports.ProxyStep = exports.proxy = exports.PolymorphicBranchStep = exports.polymorphicBranch = exports.LoadStep = exports.loadOneCallback = exports.loadOne = exports.loadManyCallback = exports.loadMany = exports.LoadedRecordStep = exports.GraphQLResolverStep = exports.graphqlResolver = exports.graphqlItemHandler = exports.GraphQLItemHandler = exports.ConditionStep = exports.condition = exports.BakedInputStep = exports.bakedInputRuntime = exports.bakedInput = exports.ApplyTransformsStep = exports.applyTransforms = exports.Modifier = exports.isModifier = exports.assertModifier = exports.ApplyInputStep = exports.applyInput = exports.__ValueStep = exports.__TrackedValueStep = exports.__ItemStep = exports.__InputStaticLeafStep = exports.__InputObjectStep = exports.__InputListStep = exports.SideEffectStep = exports.sideEffect = void 0;
-exports.operationPlan = operationPlan;
-exports.context = context;
-exports.rootValue = rootValue;
-exports.trackedContext = trackedContext;
-exports.trackedRootValue = trackedRootValue;
-exports.debugPlans = debugPlans;
-const withGlobalLayerPlan_js_1 = require("../engine/lib/withGlobalLayerPlan.js");
-const global_js_1 = require("../global.js");
-function operationPlan() {
-    return (0, withGlobalLayerPlan_js_1.currentLayerPlan)().operationPlan;
-}
-function context() {
-    return operationPlan().contextStep;
-}
-function rootValue() {
-    return operationPlan().rootValueStep;
-}
-function trackedContext() {
-    return operationPlan().trackedContextStep;
-}
-function trackedRootValue() {
-    return operationPlan().trackedRootValueStep;
-}
-/**
- * Turns on debug mode, calls the callback, and then turns debug mode back off
- * again.
- */
-function debugPlans(callback) {
-    const oldDebug = (0, global_js_1.getDebug)();
-    (0, global_js_1.setDebug)(true);
-    const result = callback();
-    (0, global_js_1.setDebug)(oldDebug);
-    return result;
-}
+exports.ReverseStep = exports.reverseArray = exports.reverse = exports.RemapKeysStep = exports.remapKeys = exports.partitionByIndex = exports.ObjectStep = exports.object = exports.specFromNodeId = exports.NodeStep = exports.nodeIdFromNode = exports.node = exports.makeDecodeNodeIdRuntime = exports.makeDecodeNodeId = exports.listTransform = exports.__ListTransformStep = exports.ListenStep = exports.listen = exports.ListStep = exports.list = exports.LastStep = exports.last = exports.LambdaStep = exports.lambda = exports.groupBy = exports.FirstStep = exports.first = exports.filter = exports.ErrorStep = exports.error = exports.each = exports.ConstantStep = exports.constant = exports.EdgeStep = exports.ConnectionStep = exports.connection = exports.assertPageInfoCapableStep = exports.assertEdgeCapableStep = exports.CoalesceStep = exports.coalesce = exports.get = exports.AccessStep = exports.access = exports.TRAP_INHIBITED = exports.TRAP_ERROR_OR_INHIBITED = exports.TRAP_ERROR = exports.trap = exports.inhibitOnNull = exports.assertNotNull = exports.__FlagStep = void 0;
+exports.ProxyStep = exports.proxy = exports.LoadStep = exports.loadOneCallback = exports.loadOne = exports.loadManyCallback = exports.loadMany = exports.LoadedRecordStep = exports.GraphQLResolverStep = exports.graphqlResolver = exports.ConditionStep = exports.condition = exports.BakedInputStep = exports.bakedInputRuntime = exports.bakedInput = exports.ApplyTransformsStep = exports.applyTransforms = exports.Modifier = exports.isModifier = exports.assertModifier = exports.ApplyInputStep = exports.applyInput = exports.__ValueStep = exports.__TrackedValueStep = exports.__ItemStep = exports.__InputStaticLeafStep = exports.__InputObjectStep = exports.__InputListStep = exports.SideEffectStep = exports.sideEffect = exports.setter = exports.Setter = exports.createObjectAndApplyChildren = void 0;
 var __flag_js_1 = require("./__flag.js");
 Object.defineProperty(exports, "__FlagStep", { enumerable: true, get: function () { return __flag_js_1.__FlagStep; } });
 Object.defineProperty(exports, "assertNotNull", { enumerable: true, get: function () { return __flag_js_1.assertNotNull; } });
@@ -47,6 +13,10 @@ Object.defineProperty(exports, "TRAP_INHIBITED", { enumerable: true, get: functi
 var access_js_1 = require("./access.js");
 Object.defineProperty(exports, "access", { enumerable: true, get: function () { return access_js_1.access; } });
 Object.defineProperty(exports, "AccessStep", { enumerable: true, get: function () { return access_js_1.AccessStep; } });
+Object.defineProperty(exports, "get", { enumerable: true, get: function () { return access_js_1.get; } });
+var coalesce_js_1 = require("./coalesce.js");
+Object.defineProperty(exports, "coalesce", { enumerable: true, get: function () { return coalesce_js_1.coalesce; } });
+Object.defineProperty(exports, "CoalesceStep", { enumerable: true, get: function () { return coalesce_js_1.CoalesceStep; } });
 var connection_js_1 = require("./connection.js");
 Object.defineProperty(exports, "assertEdgeCapableStep", { enumerable: true, get: function () { return connection_js_1.assertEdgeCapableStep; } });
 Object.defineProperty(exports, "assertPageInfoCapableStep", { enumerable: true, get: function () { return connection_js_1.assertPageInfoCapableStep; } });
@@ -139,8 +109,6 @@ var condition_js_1 = require("./condition.js");
 Object.defineProperty(exports, "condition", { enumerable: true, get: function () { return condition_js_1.condition; } });
 Object.defineProperty(exports, "ConditionStep", { enumerable: true, get: function () { return condition_js_1.ConditionStep; } });
 var graphqlResolver_js_1 = require("./graphqlResolver.js");
-Object.defineProperty(exports, "GraphQLItemHandler", { enumerable: true, get: function () { return graphqlResolver_js_1.GraphQLItemHandler; } });
-Object.defineProperty(exports, "graphqlItemHandler", { enumerable: true, get: function () { return graphqlResolver_js_1.graphqlItemHandler; } });
 Object.defineProperty(exports, "graphqlResolver", { enumerable: true, get: function () { return graphqlResolver_js_1.graphqlResolver; } });
 Object.defineProperty(exports, "GraphQLResolverStep", { enumerable: true, get: function () { return graphqlResolver_js_1.GraphQLResolverStep; } });
 var load_js_1 = require("./load.js");
@@ -150,9 +118,6 @@ Object.defineProperty(exports, "loadManyCallback", { enumerable: true, get: func
 Object.defineProperty(exports, "loadOne", { enumerable: true, get: function () { return load_js_1.loadOne; } });
 Object.defineProperty(exports, "loadOneCallback", { enumerable: true, get: function () { return load_js_1.loadOneCallback; } });
 Object.defineProperty(exports, "LoadStep", { enumerable: true, get: function () { return load_js_1.LoadStep; } });
-var polymorphicBranch_js_1 = require("./polymorphicBranch.js");
-Object.defineProperty(exports, "polymorphicBranch", { enumerable: true, get: function () { return polymorphicBranch_js_1.polymorphicBranch; } });
-Object.defineProperty(exports, "PolymorphicBranchStep", { enumerable: true, get: function () { return polymorphicBranch_js_1.PolymorphicBranchStep; } });
 var proxy_js_1 = require("./proxy.js");
 Object.defineProperty(exports, "proxy", { enumerable: true, get: function () { return proxy_js_1.proxy; } });
 Object.defineProperty(exports, "ProxyStep", { enumerable: true, get: function () { return proxy_js_1.ProxyStep; } });

package/dist/steps/lambda.js

@@ -19,7 +19,7 @@ class LambdaStep extends step_js_1.UnbatchedStep {
         // Lambda is only sync and safe if the callback is; so default to false
         this.isSyncAndSafe = false;
         this.allowMultipleOptimizations = true;
-        this.depId = $plan != null ? this.addDependency($plan) : null;
+        this.depId = $plan != null ? this.addDataDependency($plan) : null;
         if (fn.hasSideEffects) {
             this.hasSideEffects = true;
         }

package/dist/steps/last.d.ts

@@ -1,3 +1,4 @@
+import { $$deepDepSkip } from "../constants.js";
 import type { UnbatchedExecutionExtra } from "../interfaces.js";
 import type { Step } from "../step.js";
 import { UnbatchedStep } from "../step.js";
@@ -10,6 +11,7 @@ export declare class LastStep<TData> extends UnbatchedStep<TData> {
     isSyncAndSafe: boolean;
     allowMultipleOptimizations: boolean;
     constructor(parentPlan: Step<ReadonlyArray<TData>> | ConnectionCapableStep<Step<TData>, any>);
+    [$$deepDepSkip](): Step;
     unbatchedExecute: (_extra: UnbatchedExecutionExtra, list: ReadonlyArray<TData>) => TData;
     deduplicate(peers: LastStep<TData>[]): LastStep<TData>[];
     optimize(): any;

package/dist/steps/last.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LastStep = void 0;
 exports.last = last;
+const constants_js_1 = require("../constants.js");
 const step_js_1 = require("../step.js");
 const connection_js_1 = require("./connection.js");
 const list_js_1 = require("./list.js");
@@ -19,6 +20,9 @@ class LastStep extends step_js_1.UnbatchedStep {
         };
         this.addDependency((0, connection_js_1.itemsOrStep)(parentPlan));
     }
+    [constants_js_1.$$deepDepSkip]() {
+        return this.getDepOptions(0).step;
+    }
     deduplicate(peers) {
         return peers;
     }

package/dist/steps/listTransform.d.ts

@@ -1,6 +1,6 @@
+import { $$deepDepSkip } from "../constants.js";
 import type { ConnectionCapableStep, ExecutionDetails } from "../index.js";
 import type { GrafastResultsList } from "../interfaces.js";
-import { $$deepDepSkip } from "../interfaces.js";
 import type { ListCapableStep } from "../step.js";
 import { Step } from "../step.js";
 import { __ItemStep } from "./__item.js";
@@ -34,7 +34,7 @@ export declare class __ListTransformStep<TListStep extends Step<readonly any[]>
     };
     isSyncAndSafe: boolean;
     private listStepDepId;
-    private rawListStepDepId;
+    private rawListStepRefId;
     itemPlanCallback: ListTransformItemPlanCallback<ItemsStep<TListStep>, TDepsStep>;
     initialState: () => TMemo;
     reduceCallback: ListTransformReduce<TMemo, TDepsStep extends Step<infer U> ? U : never>;

package/dist/steps/listTransform.js

@@ -4,11 +4,11 @@ exports.__ListTransformStep = void 0;
 exports.listTransform = listTransform;
 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 executeBucket_js_1 = require("../engine/executeBucket.js");
 const LayerPlan_js_1 = require("../engine/LayerPlan.js");
 const withGlobalLayerPlan_js_1 = require("../engine/lib/withGlobalLayerPlan.js");
-const interfaces_js_1 = require("../interfaces.js");
 const step_js_1 = require("../step.js");
 const __item_js_1 = require("./__item.js");
 const connection_js_1 = require("./connection.js");
@@ -33,11 +33,7 @@ class __ListTransformStep extends step_js_1.Step {
         const { listStep: rawListStep, itemPlanCallback, initialState, reduceCallback, finalizeCallback, listItem, meta, optimize, connectionClone, } = options;
         const listStep = (0, connection_js_1.itemsOrStep)(rawListStep);
         this.listStepDepId = this.addDependency(listStep);
-        // PERF: This is just so we can populate getListStep() correctly... Ideally we could mark this as a "plan-time-only" dependency.
-        this.rawListStepDepId =
-            rawListStep === listStep
-                ? this.listStepDepId
-                : this.addDependency(rawListStep);
+        this.rawListStepRefId = this.addRef(rawListStep);
         this.itemPlanCallback = itemPlanCallback;
         this.initialState = initialState;
         this.reduceCallback = reduceCallback;
@@ -49,11 +45,12 @@ class __ListTransformStep extends step_js_1.Step {
         }
         this.connectionClone = connectionClone;
         // Plan this subroutine
-        this.subroutineLayer = new LayerPlan_js_1.LayerPlan(this.operationPlan, this.layerPlan, {
+        this.subroutineLayer = new LayerPlan_js_1.LayerPlan(this.operationPlan, {
             type: "subroutine",
+            parentLayerPlan: this.layerPlan,
             parentStep: this,
         });
-        const itemPlan = (0, withGlobalLayerPlan_js_1.withGlobalLayerPlan)(this.subroutineLayer, listStep.polymorphicPaths, () => {
+        const itemPlan = (0, withGlobalLayerPlan_js_1.withGlobalLayerPlan)(this.subroutineLayer, listStep.polymorphicPaths, null, () => {
             // This does NOT use `itemPlanFor` because __ListTransformPlans are special.
             const $__listItem = new __item_js_1.__ItemStep(listStep);
             $__listItem.transformStepId = this.id;
@@ -77,13 +74,13 @@ class __ListTransformStep extends step_js_1.Step {
         return this.meta;
     }
     getListStep() {
-        return this.getDepOptions(this.rawListStepDepId).step;
+        return this.getRef(this.rawListStepRefId);
     }
-    [interfaces_js_1.$$deepDepSkip]() {
+    [constants_js_1.$$deepDepSkip]() {
         return this.getListStep();
     }
     dangerouslyGetListPlan() {
-        return this.dependencies[this.rawListStepDepId];
+        return this.getRef(this.rawListStepRefId);
     }
     deduplicate(peers) {
         return peers.filter((peer) => peer.itemPlanCallback === this.itemPlanCallback &&
@@ -166,14 +163,15 @@ class __ListTransformStep extends step_js_1.Step {
             }
         });
         if (size > 0) {
-            const childBucket = (0, executeBucket_js_1.newBucket)({
+            const childBucket = (0, executeBucket_js_1.newBucket)(bucket, {
                 layerPlan: childLayerPlan,
                 size,
                 store,
                 flagUnion: bucket.flagUnion,
                 polymorphicPathList,
+                polymorphicType: null,
                 iterators,
-            }, bucket.metaByMetaKey);
+            });
             await (0, executeBucket_js_1.executeBucket)(childBucket, extra._requestContext);
         }
         const depResults = store.get(rootStep.id);