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

package/dist/steps/__trackedValue.js

@@ -39,7 +39,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
         this.isSyncAndSafe = true;
         this._isImmutable = isImmutable;
         this.addDependency(valuePlan);
-        this.value = value;
+        this._initialValue = value;
         this.constraints = constraints;
         this.path = path;
         this.nullableGraphQLType =
@@ -97,7 +97,15 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * Get the named property of an object.
      */
     get(attrName) {
-        const { value, path, constraints } = this;
+        if (this._isImmutable) {
+            return this.operationPlan.cacheImmutableStep(`__TrackedValue${this.id}.get`, attrName, () => this._get(attrName));
+        }
+        else {
+            return this._get(attrName);
+        }
+    }
+    _get(attrName) {
+        const { _initialValue: value, path, constraints } = this;
         const newValue = value?.[attrName];
         const newValuePlan = this.getValuePlan().get(attrName);
         const newPath = [...path, attrName];
@@ -145,7 +153,15 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * Get the entry at the given index in an array.
      */
     at(index) {
-        const { value, path, constraints } = this;
+        if (this._isImmutable) {
+            return this.operationPlan.cacheImmutableStep(`__TrackedValue${this.id}.at`, index, () => this._at(index));
+        }
+        else {
+            return this._at(index);
+        }
+    }
+    _at(index) {
+        const { _initialValue: value, path, constraints } = this;
         const newValue = value?.[index];
         const newValuePlan = this.getValuePlan().at(index);
         const newPath = [...path, index];
@@ -176,7 +192,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * @internal
      */
     eval() {
-        const { path, value } = this;
+        const { path, _initialValue: value } = this;
         this.constraints.push({
             type: "value",
             path,
@@ -196,7 +212,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * @internal
      */
     evalIs(expectedValue) {
-        const { value, path } = this;
+        const { _initialValue: value, path } = this;
         const pass = value === expectedValue;
         this.constraints.push({
             type: "equal",
@@ -208,7 +224,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
     }
     /** @internal */
     evalIsEmpty() {
-        const { value, path } = this;
+        const { _initialValue: value, path } = this;
         const isEmpty = typeof value === "object" &&
             value !== null &&
             Object.keys(value).length === 0;
@@ -229,7 +245,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * @internal
      */
     evalHas(key) {
-        const { value, path } = this;
+        const { _initialValue: value, path } = this;
         const newPath = [...path, key];
         // NOTE: `key in value` would be more performant here, but we cannot trust
         // users not to pass `{foo: undefined}` so we must do the more expensive
@@ -255,7 +271,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * @internal
      */
     evalKeys() {
-        const { value, path } = this;
+        const { _initialValue: value, path } = this;
         if (!(0, graphql_1.isInputObjectType)(this.nullableGraphQLType)) {
             throw new Error("evalKeys must only be called for object types");
         }
@@ -297,7 +313,7 @@ class __TrackedValueStep extends step_js_1.UnbatchedStep {
      * @internal
      */
     evalLength() {
-        const { value, path } = this;
+        const { _initialValue: value, path } = this;
         const length = Array.isArray(value) ? value.length : null;
         this.constraints.push({
             type: "length",

package/dist/steps/__value.d.ts

@@ -1,4 +1,4 @@
-import type { GrafastResultsList } from "../index.js";
+import type { GrafastResultsList, JSONValue } from "../interfaces.js";
 import { $$noExec, Step } from "../step.js";
 import type { AccessStep } from "./access.js";
 /**
@@ -14,6 +14,7 @@ export declare class __ValueStep<TData> extends Step<TData> {
     isSyncAndSafe: boolean;
     [$$noExec]: boolean;
     constructor(isImmutable: boolean);
+    planJSONExtra(): undefined | Record<string, JSONValue>;
     toStringMeta(): string | null;
     execute(): GrafastResultsList<TData>;
     get<TAttr extends keyof TData>(attrName: TAttr): AccessStep<TData[TAttr]>;

package/dist/steps/__value.js

@@ -21,6 +21,11 @@ class __ValueStep extends step_js_1.Step {
         this[_a] = true;
         this._isImmutable = isImmutable;
     }
+    planJSONExtra() {
+        if (this.layerPlan.reason.type === "combined") {
+            return { combined: true };
+        }
+    }
     toStringMeta() {
         switch (this) {
             case this.operationPlan.rootValueStep:

package/dist/steps/access.d.ts

@@ -30,7 +30,7 @@ export declare class AccessStep<TData> extends UnbatchedStep<TData> {
      * Get the entry at the given index in an array.
      */
     at<TIndex extends keyof TData>(index: TIndex): AccessStep<TData[TIndex]>;
-    optimize(): AccessStep<TData>;
+    optimize(): Step<TData>;
     finalize(): void;
     unbatchedExecute(_extra: UnbatchedExecutionExtra, ..._values: any[]): any;
     deduplicate(peers: AccessStep<unknown>[]): AccessStep<TData>[];
@@ -40,4 +40,20 @@ export declare class AccessStep<TData> extends UnbatchedStep<TData> {
  * falling back to `fallback` if it were null-ish.
  */
 export declare function access<TData>(parentPlan: Step<unknown>, rawPath?: (string | number | symbol)[] | string | number | symbol, fallback?: any): AccessStep<TData>;
+type StepGetReturn<TStep, TAttr extends string> = TStep extends {
+    get: (attr: TAttr) => infer U;
+} ? U : TStep extends {
+    get: (attr: string) => infer U;
+} ? U : never;
+type StepGetKeys<TStep extends Step> = TStep extends {
+    get(attr: infer U): any;
+} ? U : TStep extends Step<infer UData> ? UData extends Record<string, any> ? keyof UData : string : never;
+type StepAccessKey<TStep extends Step, TAttr extends StepGetKeys<TStep> & string> = TStep extends {
+    get(attr: any): any;
+} ? StepGetReturn<TStep, TAttr> : TStep extends Step<infer UData> ? UData extends Record<string, any> ? Step<UData[TAttr]> : Step<any> : never;
+/**
+ * Call `$step.get(attr)` if possible, falling back to `access($step, attr)`.
+ */
+export declare function get<TStep extends Step, TAttr extends StepGetKeys<TStep> & string>($step: TStep, attr: TAttr): StepAccessKey<TStep, TAttr>;
+export {};
 //# sourceMappingURL=access.d.ts.map

package/dist/steps/access.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessStep = exports.expressionSymbol = void 0;
 exports.access = access;
+exports.get = get;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const tamedevil_1 = tslib_1.__importDefault(require("tamedevil"));
@@ -126,7 +127,7 @@ class AccessStep extends step_js_1.UnbatchedStep {
             (this.fallback === "undefined" ? "U" : "D") +
                 (this.hasSymbols ? "§" : ".") +
                 (0, utils_js_1.digestKeys)(this.path);
-        this.addDependency(parentPlan);
+        this.addStrongDependency(parentPlan);
     }
     toStringMeta() {
         return `${chalk_1.default.bold.yellow(String(this.getDepOptions(0).step.id))}.${this.path.map((p) => String(p)).join(".")}`;
@@ -155,6 +156,10 @@ class AccessStep extends step_js_1.UnbatchedStep {
     // An access of an access can become a single access
     optimize() {
         const $dep = this.getDep(0);
+        if (this.fallback === undefined && this.path.length === 0) {
+            // I don't do anything
+            return $dep;
+        }
         if ($dep instanceof AccessStep && $dep.fallback === undefined) {
             return access($dep.getDep(0), [...$dep.path, ...this.path], this.fallback);
         }
@@ -213,4 +218,12 @@ function access(parentPlan, rawPath, fallback) {
     }
     return new AccessStep(parentPlan, path, fallback);
 }
+/**
+ * Call `$step.get(attr)` if possible, falling back to `access($step, attr)`.
+ */
+function get($step, attr) {
+    return "get" in $step && typeof $step.get === "function"
+        ? $step.get(attr)
+        : access($step, attr);
+}
 //# sourceMappingURL=access.js.map

package/dist/steps/applyInput.d.ts

@@ -2,7 +2,7 @@ import type { GraphQLInputType, GraphQLSchema } from "graphql";
 import type { AnyInputStep, UnbatchedExecutionExtra } from "../interfaces.js";
 import type { Step } from "../step.js";
 import { UnbatchedStep } from "../step.js";
-import { ConstantStep } from "./index.js";
+import { ConstantStep } from "./constant.js";
 export declare class ApplyInputStep<TParent extends object = any, TTarget extends object = TParent> extends UnbatchedStep<(arg: TParent) => void> {
     private inputType;
     private getTargetFromParent;

package/dist/steps/applyInput.js

@@ -7,8 +7,9 @@ exports.isModifier = isModifier;
 exports.assertModifier = assertModifier;
 exports.isApplyableStep = isApplyableStep;
 const graphql_1 = require("graphql");
+const global_js_1 = require("../global.js");
 const step_js_1 = require("../step.js");
-const index_js_1 = require("./index.js");
+const constant_js_1 = require("./constant.js");
 let currentModifiers = [];
 let applyingModifiers = false;
 let inputArgsApplyDepth = 0;
@@ -35,11 +36,11 @@ class ApplyInputStep extends step_js_1.UnbatchedStep {
     }
     optimize() {
         const $value = this.getDep(this.valueDepId);
-        if ($value instanceof index_js_1.ConstantStep) {
+        if ($value instanceof constant_js_1.ConstantStep) {
             // Replace myself with a constant!
             const { operationPlan: { schema }, inputType, getTargetFromParent, } = this;
             const { data } = $value;
-            return (0, index_js_1.constant)(function applyInputConstant(parent) {
+            return (0, constant_js_1.constant)(function applyInputConstant(parent) {
                 inputArgsApply(schema, inputType, parent, data, getTargetFromParent);
             }, false);
         }
@@ -79,13 +80,13 @@ function inputArgsApply(schema, inputType, parent, inputValue, getTargetFromPare
     }
 }
 function applyInput(inputType, $value, getTargetFromParent) {
-    const opPlan = (0, index_js_1.operationPlan)();
+    const opPlan = (0, global_js_1.operationPlan)();
     const { schema } = opPlan;
     return opPlan.withRootLayerPlan(() => {
-        if ($value instanceof index_js_1.ConstantStep) {
+        if ($value instanceof constant_js_1.ConstantStep) {
             // Replace us with a constant
             const { data } = $value;
-            return (0, index_js_1.constant)(function applyInputConstant(parent) {
+            return (0, constant_js_1.constant)(function applyInputConstant(parent) {
                 inputArgsApply(schema, inputType, parent, data, getTargetFromParent);
             }, false);
         }

package/dist/steps/applyTransforms.js

@@ -4,12 +4,12 @@ exports.ApplyTransformsStep = void 0;
 exports.applyTransforms = applyTransforms;
 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 error_js_1 = require("../error.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");
@@ -26,13 +26,14 @@ class ApplyTransformsStep extends step_js_1.Step {
         // OPTIMIZE: if all the steps in the inner bucket are synchronous then theoretically we can be synchronous too
         this.isSyncAndSafe = false;
         const listPlan = (0, connection_js_1.itemsOrStep)($step);
-        this.addDependency(listPlan);
+        this.addDataDependency(listPlan);
         // 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, listPlan.polymorphicPaths, () => {
+        const itemPlan = (0, withGlobalLayerPlan_js_1.withGlobalLayerPlan)(this.subroutineLayer, listPlan.polymorphicPaths, null, () => {
             // This does NOT use `itemPlanFor` because __ListTransformPlans are special.
             const $__listItem = new __item_js_1.__ItemStep(listPlan);
             $__listItem.transformStepId = this.id;
@@ -117,14 +118,15 @@ class ApplyTransformsStep 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);
@@ -140,7 +142,7 @@ class ApplyTransformsStep extends step_js_1.Step {
             }
             const values = indexes.map((idx) => {
                 const val = depResults.at(idx);
-                if (depResults._flagsAt(idx) & interfaces_js_1.FLAG_ERROR) {
+                if (depResults._flagsAt(idx) & constants_js_1.FLAG_ERROR) {
                     return (0, error_js_1.flagError)(val);
                 }
                 return val;

package/dist/steps/bakedInput.js

@@ -4,9 +4,9 @@ exports.BakedInputStep = void 0;
 exports.bakedInput = bakedInput;
 exports.bakedInputRuntime = bakedInputRuntime;
 const graphql_1 = require("graphql");
+const global_js_1 = require("../global.js");
 const step_js_1 = require("../step.js");
 const applyInput_js_1 = require("./applyInput.js");
-const index_js_1 = require("./index.js");
 class BakedInputStep extends step_js_1.UnbatchedStep {
     static { this.$$export = {
         moduleName: "grafast",
@@ -43,7 +43,7 @@ function bakedInput(inputType, $value) {
         ((0, graphql_1.isInputObjectType)(nullableInputType) &&
             typeof nullableInputType.extensions?.grafast?.baked === "function")) {
         // Ooo, we're fancy! Do the thing!
-        return (0, index_js_1.operationPlan)().withRootLayerPlan(() => new BakedInputStep(nullableInputType, $value));
+        return (0, global_js_1.operationPlan)().withRootLayerPlan(() => new BakedInputStep(nullableInputType, $value));
     }
     else {
         // Nothing special, we just return the input.

package/dist/steps/coalesce.d.ts

@@ -0,0 +1,15 @@
+import type { Maybe, UnbatchedExecutionExtra } from "../interfaces.js";
+import type { Step } from "../step.js";
+import { UnbatchedStep } from "../step.js";
+export declare class CoalesceStep<T> extends UnbatchedStep<T | null> {
+    static $$export: {
+        moduleName: string;
+        exportName: string;
+    };
+    isSyncAndSafe: boolean;
+    constructor(steps: ReadonlyArray<Step<Maybe<T>>>);
+    unbatchedExecute(_info: UnbatchedExecutionExtra, ...values: ReadonlyArray<T | null>): NonNullable<T> | null;
+}
+export declare function coalesce<T>(steps: ReadonlyArray<Step<Maybe<T>>>): CoalesceStep<T>;
+export declare function coalesce<T>(...steps: ReadonlyArray<Step<Maybe<T>>>): CoalesceStep<T>;
+//# sourceMappingURL=coalesce.d.ts.map

package/dist/steps/coalesce.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoalesceStep = void 0;
+exports.coalesce = coalesce;
+const constants_js_1 = require("../constants.js");
+const step_js_1 = require("../step.js");
+class CoalesceStep extends step_js_1.UnbatchedStep {
+    static { this.$$export = {
+        moduleName: "grafast",
+        exportName: "CoalesceStep",
+    }; }
+    constructor(steps) {
+        super();
+        this.isSyncAndSafe = true;
+        this.allowMultipleOptimizations = true;
+        for (const step of steps) {
+            this.addDataDependency({
+                step,
+                acceptFlags: constants_js_1.FLAG_INHIBITED | constants_js_1.FLAG_NULL,
+            });
+        }
+    }
+    unbatchedExecute(_info, ...values) {
+        return values.find((v) => v != null) ?? null;
+    }
+}
+exports.CoalesceStep = CoalesceStep;
+function coalesce(...input) {
+    if (Array.isArray(input[0])) {
+        return new CoalesceStep(input[0]);
+    }
+    else {
+        return new CoalesceStep(input);
+    }
+}
+//# sourceMappingURL=coalesce.js.map

package/dist/steps/constant.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstantStep = void 0;
 exports.constant = constant;
+const global_js_1 = require("../global.js");
 const inspect_js_1 = require("../inspect.js");
 const step_js_1 = require("../step.js");
 const utils_js_1 = require("../utils.js");
-const index_js_1 = require("./index.js");
 /**
  * Converts a constant value (e.g. a string/number/etc) into a plan
  */
@@ -130,19 +130,21 @@ function constant(data, isSecret) {
         }
         return constant(data[0], false);
     }
-    const opPlan = (0, index_js_1.operationPlan)();
-    const makeConst = () => (0, index_js_1.operationPlan)().withRootLayerPlan(() => new ConstantStep(data, isSecret));
-    const t = typeof data;
-    if (data == null ||
-        t === "boolean" ||
-        t === "string" ||
-        t === "number" ||
-        t === "symbol") {
-        return opPlan.cacheStep(opPlan.contextStep, isSecret ? `constant-secret` : `constant`, data, makeConst);
-    }
-    else {
-        return makeConst();
-    }
+    return (0, global_js_1.operationPlan)().withRootLayerPlan(() => {
+        const opPlan = (0, global_js_1.operationPlan)();
+        const makeConst = () => new ConstantStep(data, isSecret);
+        const t = typeof data;
+        if (data == null ||
+            t === "boolean" ||
+            t === "string" ||
+            t === "number" ||
+            t === "symbol") {
+            return opPlan.cacheImmutableStep(isSecret ? `constant-secret` : `constant`, data, makeConst);
+        }
+        else {
+            return makeConst();
+        }
+    });
 }
 // Have to overwrite the getDepOrConstant method due to circular dependency
 step_js_1.Step.prototype.getDepOrConstant = function (depId, fallback) {

package/dist/steps/each.d.ts

@@ -1,9 +1,9 @@
+import type { Maybe } from "../index.js";
 import type { ListCapableStep, Step } from "../step.js";
-import { __ItemStep } from "./__item.js";
 import type { ConnectionCapableStep, ItemsStep } from "./connection.js";
 import type { __ListTransformStep } from "./listTransform.js";
 /**
  * Transforms a list by wrapping each element in the list with the given mapper.
  */
-export declare function each<TListStep extends (Step<readonly any[]> & Partial<ConnectionCapableStep<any, any>>) | ConnectionCapableStep<any, any>, TResultItemStep extends Step>(listStep: TListStep, mapper: (itemPlan: ItemsStep<TListStep> extends ListCapableStep<any, any> ? ReturnType<ItemsStep<TListStep>["listItem"]> : __ItemStep<any>) => TResultItemStep): __ListTransformStep<any, any, any, any>;
+export declare function each<TListStep extends (Step<readonly any[]> & Partial<ConnectionCapableStep<any, any>>) | ConnectionCapableStep<any, any>, TResultItemStep extends Step>(listStep: TListStep, mapper: (itemPlan: ItemsStep<TListStep> extends ListCapableStep<any, any> ? ReturnType<ItemsStep<TListStep>["listItem"]> : Step<TListStep extends Step<Maybe<ReadonlyArray<infer U>>> ? U : any>) => TResultItemStep): __ListTransformStep<any, any, any, any>;
 //# sourceMappingURL=each.d.ts.map

package/dist/steps/first.d.ts

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

package/dist/steps/first.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirstStep = void 0;
 exports.first = first;
+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");
@@ -14,7 +15,10 @@ class FirstStep extends step_js_1.UnbatchedStep {
         super();
         this.isSyncAndSafe = true;
         this.allowMultipleOptimizations = true;
-        this.addDependency((0, connection_js_1.itemsOrStep)(parentPlan));
+        this.addStrongDependency((0, connection_js_1.itemsOrStep)(parentPlan));
+    }
+    [constants_js_1.$$deepDepSkip]() {
+        return this.getDepOptions(0).step;
     }
     execute({ indexMap, values: [values0], }) {
         return indexMap((i) => values0.at(i)?.[0]);

package/dist/steps/graphqlResolver.d.ts

@@ -1,4 +1,4 @@
-import type { GraphQLNullableType, GraphQLOutputType } from "graphql";
+import type { PlanTypeInfo } from "../interfaces.js";
 import { Step } from "../step.js";
-export declare function graphqlItemHandler($item: Step, nullableType: GraphQLNullableType & GraphQLOutputType): GraphQLItemHandler;
+export declare function graphqlResolveType($stepOrSpecifier: Step, info: PlanTypeInfo): GraphQLResolveTypeStep;
 //# sourceMappingURL=graphqlResolver.d.ts.map