From a1a2b1fa831d972b98160fa41baa0dacc3eb66fd Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Tue, 14 May 2024 15:34:19 +0100
Subject: [PATCH] Fix flags on listItem bucket root step

---
 grafast/grafast/src/engine/LayerPlan.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/grafast/grafast/src/engine/LayerPlan.ts b/grafast/grafast/src/engine/LayerPlan.ts
index f9b1238122..19dba6f29c 100644
--- a/grafast/grafast/src/engine/LayerPlan.ts
+++ b/grafast/grafast/src/engine/LayerPlan.ts
@@ -5,12 +5,13 @@ import te from "tamedevil";
 import * as assert from "../assert.js";
 import type { Bucket } from "../bucket.js";
 import { inspect } from "../inspect.js";
-import type { UnaryExecutionValue } from "../interfaces.js";
+import type { ExecutionValue, UnaryExecutionValue } from "../interfaces.js";
 import {
   FLAG_ERROR,
   FLAG_INHIBITED,
   FLAG_NULL,
   FORBIDDEN_BY_NULLABLE_BOUNDARY_FLAGS,
+  NO_FLAGS,
 } from "../interfaces.js";
 import { resolveType } from "../polymorphic.js";
 import type {
@@ -519,17 +520,15 @@ export class LayerPlan<TReason extends LayerPlanReason = LayerPlanReason> {
         }
         const itemStepId = this.rootStep.id;
         // Item steps are **NOT** unary
-        const itemStepIdList: any[] | null = this.rootStep._isUnary ? null : [];
+        let ev: ExecutionValue;
         if (this.rootStep._isUnary) {
           // handled later
           const list = listStepStore.at(0);
-          store.set(
-            itemStepId,
-            unaryExecutionValue(Array.isArray(list) ? list[0] : list),
-          );
+          ev = unaryExecutionValue(Array.isArray(list) ? list[0] : list);
         } else {
-          store.set(itemStepId, batchExecutionValue(itemStepIdList!));
+          ev = batchExecutionValue([]);
         }
+        store.set(itemStepId, ev);
 
         for (const stepId of copyStepIds) {
           const ev = parentBucket.store.get(stepId)!;
@@ -556,8 +555,10 @@ export class LayerPlan<TReason extends LayerPlanReason = LayerPlanReason> {
             for (let j = 0, l = list.length; j < l; j++) {
               const newIndex = size++;
               newIndexes.push(newIndex);
-              if (itemStepIdList !== null) {
-                itemStepIdList[newIndex] = list[j];
+              if (ev.isBatch) {
+                (ev.entries[newIndex] as any[]) = list[j];
+                // TODO: are these the right flags?
+                ev._flags[newIndex] = list[j] == null ? FLAG_NULL : NO_FLAGS;
               }
 
               polymorphicPathList[newIndex] =