grafast 0.1.1-beta.12 → 0.1.1-beta.14

package/dist/engine/OperationPlan.js

@@ -1118,6 +1118,7 @@ class OperationPlan {
         // PERF: this should be handled in the parent?
         const parentStep = this.stepTracker.getStepById(rawParentStep.id);
         const previousStepCount = this.stepTracker.stepCount;
+        const previousSideEffectStep = layerPlan.latestSideEffectStep;
         if (this.loc !== null)
             this.loc.push(`planField(${path.join(".")})`);
         try {
@@ -1185,6 +1186,7 @@ class OperationPlan {
             }
             try {
                 this.stepTracker.purgeBackTo(previousStepCount);
+                layerPlan.latestSideEffectStep = previousSideEffectStep;
             }
             catch (e2) {
                 console.error(`Cleanup error occurred whilst trying to recover from field planning error: ${e2.stack}`);

package/dist/engine/executeBucket.js

@@ -432,7 +432,7 @@ function executeBucket(bucket, requestContext) {
                                 }
                                 // End "f2b3b1b3" block
                             }
-                            else {
+                            else if (forceIndexValue === undefined) {
                                 const depVal = depExecutionVal.at(dataIndex);
                                 let depFlags;
                                 if ((bucket.flagUnion & interfaces_js_1.FLAG_ERROR) === interfaces_js_1.FLAG_ERROR &&
@@ -768,7 +768,7 @@ function executeBucket(bucket, requestContext) {
             }
             const result = needsFiltering
                 ? reallyExecuteStepWithFiltering(step, dependencies, _rawForbiddenFlags, _rawOnReject, bucket.polymorphicPathList, extra)
-                : reallyExecuteStepWithoutFiltering(step._isUnary ? 1 : size, step, dependencies, extra);
+                : reallyExecuteStepWithoutFiltering(step._isUnary ? 1 : size, step, $sideEffect ? dependencies.slice(0, depCount) : dependencies, extra);
             if ((0, utils_js_1.isPromiseLike)(result)) {
                 return result.then(null, (error) => {
                     // Don't need to do this here, it will be done where the

package/dist/operationPlan-input.js

@@ -7,6 +7,11 @@ const constant_js_1 = require("./steps/constant.js");
 const list_js_1 = require("./steps/list.js");
 const object_js_1 = require("./steps/object.js");
 const { getNullableType, isEnumType, isInputObjectType, isListType, isScalarType, } = graphql;
+function assertNotRuntime(operationPlan, description) {
+    if (operationPlan.phase === "ready") {
+        throw new Error(`${description} may only be called at planning time; however you have code that has attempted to call it during execution time. Please revisit your plan resolvers to locate the issue.`);
+    }
+}
 function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAfterMode, callback) {
     if (operationPlan.loc !== null)
         operationPlan.loc.push(`withFieldArgsForArguments(${field.name})`);
@@ -20,6 +25,7 @@ function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAft
     let explicitlyApplied = false;
     const fieldArgs = {
         getRaw(path) {
+            assertNotRuntime(operationPlan, `fieldArgs.getRaw()`);
             if (typeof path === "string") {
                 return $all.get(path);
             }
@@ -47,6 +53,7 @@ function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAft
             }
         },
         get(inPath) {
+            assertNotRuntime(operationPlan, `fieldArgs.get()`);
             const path = Array.isArray(inPath)
                 ? inPath
                 : inPath
@@ -136,6 +143,7 @@ function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAft
             }
         },
         apply(targetStepOrCallback, inPath) {
+            assertNotRuntime(operationPlan, `fieldArgs.apply()`);
             const path = Array.isArray(inPath) ? inPath : inPath ? [inPath] : [];
             const pathString = path.join(".");
             const $existing = applied.get(pathString);
@@ -243,9 +251,11 @@ function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAft
         const nullableEntityType = getNullableType(entityType);
         const localFieldArgs = {
             getRaw(subpath) {
+                assertNotRuntime(operationPlan, `fieldArgs.getRaw()`);
                 return fieldArgs.getRaw(concatPath(path, subpath));
             },
             get(subpath) {
+                assertNotRuntime(operationPlan, `fieldArgs.get()`);
                 if (!subpath || (Array.isArray(subpath) && subpath.length === 0)) {
                     if (isListType(nullableEntityType)) {
                         if (!("evalLength" in $input)) {
@@ -307,6 +317,7 @@ function withFieldArgsForArguments(operationPlan, $parent, $all, field, applyAft
                 return fieldArgs.get(concatPath(path, subpath));
             },
             apply(targetStepOrCallback, subpath) {
+                assertNotRuntime(operationPlan, `fieldArgs.apply()`);
                 if (mode === "apply" &&
                     (!subpath || (Array.isArray(subpath) && subpath.length === 0))) {
                     if (isInputObjectType(nullableEntityType)) {

package/dist/step.js

@@ -110,23 +110,49 @@ class ExecutableStep extends BaseStep {
         this.implicitSideEffectStep = null;
         this.hasSideEffects ??= false;
         let hasSideEffects = false;
+        const stepTracker = this.layerPlan.operationPlan.stepTracker;
         Object.defineProperty(this, "hasSideEffects", {
             get() {
                 return hasSideEffects;
             },
             set(value) {
-                if (this.id ===
-                    this.layerPlan.operationPlan.stepTracker.stepCount - 1) {
+                /**
+                 * If steps were created after this step, an this step doesn't depend
+                 * on them, then it's no longer safe to change hasSideEffects.
+                 */
+                let nonDependentSteps = null;
+                const maxStepId = stepTracker.stepCount - 1;
+                if (this.id === maxStepId) {
+                    // All good - no more steps were created
+                }
+                else {
+                    // If the step created them during initialization and is dependent on
+                    // them, that's fine too.
+                    for (let id = this.id + 1; id <= maxStepId; id++) {
+                        const step = stepTracker.getStepById(id);
+                        if ((0, utils_js_1.stepADependsOnStepB)(this, step))
+                            continue;
+                        if (nonDependentSteps === null) {
+                            nonDependentSteps = [step];
+                        }
+                        else {
+                            nonDependentSteps.push(step);
+                        }
+                    }
+                }
+                if (nonDependentSteps === null) {
                     hasSideEffects = value;
                     if (value === true) {
                         this.layerPlan.latestSideEffectStep = this;
                     }
                     else if (value !== true && hasSideEffects === true) {
-                        throw new Error(`Cannot mark a step has having no side effects after having set it to have side effects.`);
+                        throw new Error(`Cannot mark ${this} as having no side effects after having set it to have side effects.`);
                     }
                 }
                 else {
-                    throw new Error("You must mark a step as having side effects immediately after creating it, before any other steps are created.");
+                    throw new Error(`Attempted to mark ${this} as having side effects, but other non-dependent steps (${nonDependentSteps
+                        .map(String)
+                        .join(", ")}) have already been created.`);
                 }
             },
             enumerable: true,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.1.1-beta.12";
+export declare const version = "0.1.1-beta.14";
 //# 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 = "0.1.1-beta.12";
+exports.version = "0.1.1-beta.14";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grafast",
-  "version": "0.1.1-beta.12",
+  "version": "0.1.1-beta.14",
   "description": "Cutting edge GraphQL planning and execution engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -59,6 +59,7 @@
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1",
+    "graphile-config": "^0.0.1-beta.9",
     "graphql": "^16.1.0-experimental-stream-defer.6",
     "iterall": "^1.3.0",
     "tamedevil": "^0.0.0-beta.7",
@@ -66,16 +67,12 @@
   },
   "peerDependencies": {
     "@envelop/core": "^5.0.0",
-    "graphile-config": "^0.0.1-beta.9",
     "graphql": "^16.1.0-experimental-stream-defer.6",
     "tamedevil": "^0.0.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@envelop/core": {
       "optional": true
-    },
-    "graphile-config": {
-      "optional": true
     }
   },
   "files": [