@zapier/kitcore 0.6.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @zapier/kitcore
 
+## 0.8.0
+
+### Minor Changes
+
+- cec12cd: Added `concatLists`, which lists one page of several paginated lists joined end to end, returning a plain promise of `{ data, nextCursor }`. Pass a page's `nextCursor` to a fresh call to resume the concatenation.
+
+  Deprecated `concatPaginated` in favor of `concatLists`. It now delegates to `concatLists` and logs a deprecation warning; awaiting it yields the same page, but the page-iterable half of its old return shape is removed.
+
+- 769751e: Paginated list results now expose `.pages()`, a plain async iterable over pages. Unlike iterating the result directly (which still works but is deprecated), `.pages()` is not also a promise, so returning it from an `async` function no longer silently collapses it to the first page. `.items()` is unchanged and remains the way to iterate individual items across pages. The `toIterable()` helper is deprecated in favor of `.pages()` and now logs a deprecation warning.
+
+## 0.7.0
+
+### Minor Changes
+
+- 615fda9: The resolution controller now paginates dynamic selects as a page window: each `select` ask carries ONE page of choices plus a `page: { generation, index }` descriptor, so payloads stay proportional to a page.
+  - `next_page` and `previous_page` actions replace `more`.
+  - State carries coordinates only: `ControllerPagination` holds the cursor trail, never items, so the host carries cursors back between steps instead of the items it was just sent. An accumulating host appends pages client-side keyed on the question's `path` + `generation`, which increments whenever a `search` restarts the listing.
+  - Every question carries `path` (which field it is for), so hosts never read the state.
+  - Resolver `validate` is now a top-level callback (`validate({ imports, value, input, context })`), async and able to verify against the source; a thrown validate surfaces as a `failed` result with retry, not a rejection. A `validate` inside the prompt config is a type error (`ResolverPromptConfig` omits it), so it can't silently never run.
+  - The `exhausted` flag is removed; end-of-list is the absence of `next_page`.
+  - A failed fetch records its position so `retry` replays exactly the page that failed.
+
+- e6b22fb: `concatPaginated` now paginates with stateless cursors: each source is called with its own cursor per page (`({ cursor }) => ...`), outgoing cursors encode the source index plus that source's cursor, and a new `cursor` option resumes the stream from a previous page's cursor with no shared in-memory state. The `dedupe` option is removed; sources must be disjoint by construction.
+
 ## 0.6.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -31,6 +31,7 @@ __export(index_exports, {
   CoreSignal: () => CoreSignal,
   addPlugin: () => addPlugin,
   composePlugins: () => composePlugins,
+  concatLists: () => concatLists,
   concatPaginated: () => concatPaginated,
   coreOptionsPluginRef: () => coreOptionsPluginRef,
   createAsyncContext: () => createAsyncContext,
@@ -301,7 +302,8 @@ function getCoreErrorCause(value) {
 var CURSOR_VERSION = 1;
 var CURSOR_SOURCE = {
   API: "api",
-  SDK: "sdk"
+  SDK: "sdk",
+  CONCAT: "concat"
 };
 function encodeBase64(str) {
   return btoa(
@@ -521,69 +523,71 @@ async function* paginateBuffered(pageFunction, pageOptions) {
   }
 }
 var paginate = paginateBuffered;
-function concatPaginated({
+function encodeConcatCursor(index, cursor) {
+  const envelope = {
+    v: CURSOR_VERSION,
+    source: CURSOR_SOURCE.CONCAT,
+    index,
+    cursor
+  };
+  return encodeBase64(JSON.stringify(envelope));
+}
+function decodeConcatCursor(incoming) {
+  if (!incoming) {
+    return { index: 0, cursor: void 0 };
+  }
+  try {
+    const envelope = JSON.parse(decodeBase64(incoming));
+    if (envelope.v === CURSOR_VERSION && envelope.source === CURSOR_SOURCE.CONCAT && typeof envelope.index === "number") {
+      return { index: envelope.index, cursor: envelope.cursor };
+    }
+  } catch {
+  }
+  return { index: 0, cursor: incoming };
+}
+async function concatLists({
   sources,
-  dedupe,
-  pageSize = 100
+  pageSize = 100,
+  cursor
 }) {
   if (sources.length === 0) {
-    const empty = { data: [] };
-    return Object.assign(Promise.resolve(empty), {
-      [Symbol.asyncIterator]: async function* () {
-        yield empty;
-      }
-    });
+    return { data: [] };
   }
-  let sourceIndex = 0;
-  let currentIterator = null;
-  const seen = /* @__PURE__ */ new Set();
-  const pageFunction = async (_options) => {
-    while (sourceIndex < sources.length) {
-      if (!currentIterator) {
-        const result = sources[sourceIndex]();
-        currentIterator = result[Symbol.asyncIterator]();
-      }
-      const next = await currentIterator.next();
-      if (next.done) {
-        sourceIndex++;
-        currentIterator = null;
+  const pageFunction = async (options) => {
+    let { index, cursor: listCursor } = decodeConcatCursor(options.cursor);
+    while (index < sources.length) {
+      const page = await sources[index]({ cursor: listCursor });
+      const hasMoreInList = page.nextCursor != null;
+      if (page.data.length === 0 && !hasMoreInList) {
+        index++;
+        listCursor = void 0;
         continue;
       }
-      let items = next.value.data;
-      if (dedupe) {
-        if (sourceIndex > 0) {
-          items = items.filter((item) => !seen.has(dedupe(item)));
-        }
-        for (const item of items) {
-          seen.add(dedupe(item));
-        }
-      }
-      const hasMoreInSource = next.value.nextCursor != null;
-      const hasMoreSources = sourceIndex < sources.length - 1;
       return {
-        data: items,
-        nextCursor: hasMoreInSource || hasMoreSources ? "__has_more__" : void 0
+        data: page.data,
+        nextCursor: hasMoreInList ? encodeConcatCursor(index, page.nextCursor) : index < sources.length - 1 ? encodeConcatCursor(index + 1, void 0) : void 0
       };
     }
     return { data: [] };
   };
-  const iterator = paginateBuffered(pageFunction, { pageSize });
-  const firstPagePromise = iterator.next().then((result) => {
-    if (result.done) {
-      return { data: [] };
-    }
-    return result.value;
-  });
-  return Object.assign(firstPagePromise, {
-    [Symbol.asyncIterator]: async function* () {
-      yield await firstPagePromise;
-      for await (const page of { [Symbol.asyncIterator]: () => iterator }) {
-        yield page;
-      }
-    }
-  });
+  const result = await paginateBuffered(pageFunction, {
+    pageSize,
+    cursor
+  }).next();
+  return result.done ? { data: [] } : result.value;
+}
+function concatPaginated({
+  sources,
+  pageSize,
+  cursor
+}) {
+  logDeprecation("concatPaginated() is deprecated. Use concatLists() instead.");
+  return concatLists({ sources, pageSize, cursor });
 }
 function toIterable(source) {
+  logDeprecation(
+    "toIterable() is deprecated. Call .pages() on the paginated result instead."
+  );
   return { [Symbol.asyncIterator]: () => source[Symbol.asyncIterator]() };
 }
 
@@ -936,6 +940,13 @@ function createPaginatedFunction(coreFn, options) {
             [Symbol.asyncIterator]() {
               return pageStream;
             },
+            pages: function() {
+              return {
+                [Symbol.asyncIterator]() {
+                  return pageStream;
+                }
+              };
+            },
             items: function() {
               return {
                 [Symbol.asyncIterator]: async function* () {
@@ -1448,6 +1459,7 @@ function defineResolver(config) {
         getContext: config.getContext,
         listItems: config.listItems,
         prompt: config.prompt,
+        validate: config.validate,
         tryResolveWithoutPrompt: config.tryResolveWithoutPrompt,
         tryResolveFromSearch: config.tryResolveFromSearch
       };
@@ -2106,6 +2118,7 @@ function bindResolver(resolver, plugins) {
       const {
         getContext: getContext2,
         listItems,
+        validate,
         tryResolveWithoutPrompt,
         tryResolveFromSearch
       } = resolver;
@@ -2119,6 +2132,9 @@ function bindResolver(resolver, plugins) {
       };
       if (getContext2)
         bound.getContext = ({ input }) => getContext2({ imports, input });
+      if (validate) {
+        bound.validate = ({ value, input, context }) => validate({ imports, value, input, context });
+      }
       if (tryResolveWithoutPrompt) {
         bound.tryResolveWithoutPrompt = ({ input }) => tryResolveWithoutPrompt({ imports, input });
       }
@@ -2798,14 +2814,14 @@ function coerce(leaf, raw) {
 }
 async function validationError(leaf, value, state) {
   if (leaf.resolver?.type !== "dynamic") return null;
+  const validate = leaf.resolver.validate;
+  if (!validate) return null;
   const context = await resolveContext(leaf, state.resolved);
-  const config = leaf.resolver.prompt?.({
-    items: state.listing?.items ?? [],
+  const verdict = await validate({
+    value,
     input: mergeInput(state.resolved, leaf.extraInput),
     context
   });
-  if (!config?.validate) return null;
-  const verdict = config.validate(value);
   if (verdict === true) return null;
   return typeof verdict === "string" ? verdict : `${leaf.name}: invalid value`;
 }
@@ -2931,20 +2947,36 @@ async function resolveContext(leaf, input) {
     input: mergeInput(input, leaf.extraInput)
   });
 }
-async function fetchListing(leaf, input, opts = {}) {
+function firstPagePosition(opts = {}) {
+  return {
+    ...opts.search !== void 0 ? { search: opts.search } : {},
+    pageCursor: null,
+    previousCursors: [],
+    generation: opts.generation ?? 0
+  };
+}
+async function fetchListing(leaf, input, position, context) {
+  if (leaf.resolver?.type === "dynamic" && leaf.resolver.inputType === "search" && position.search === void 0) {
+    return { position, items: [] };
+  }
   const page = await firstPage(
     leaf.resolver?.type === "dynamic" ? leaf.resolver.listItems({
       input: mergeInput(input, leaf.extraInput),
-      context: opts.context,
-      search: opts.search,
-      cursor: opts.cursor
+      context,
+      search: position.search,
+      cursor: position.pageCursor ?? void 0
     }) : void 0
   );
   return {
-    items: [...opts.priorItems ?? [], ...page.data],
-    cursor: page.nextCursor,
-    search: opts.search,
-    exhausted: page.nextCursor == null
+    position,
+    items: page.data,
+    ...page.nextCursor != null ? { nextCursor: page.nextCursor } : {}
+  };
+}
+function toPagination(page) {
+  return {
+    position: page.position,
+    ...page.nextCursor !== void 0 ? { nextCursor: page.nextCursor } : {}
   };
 }
 
@@ -2966,23 +2998,32 @@ var AFFORDANCE = {
     description: "Filter the options by a search term",
     supply: "term"
   },
-  more: { action: "more", description: "Load more options" },
+  nextPage: {
+    action: "next_page",
+    description: "Fetch the next page of options"
+  },
+  previousPage: {
+    action: "previous_page",
+    description: "Return to the previous page of options"
+  },
   skip: { action: "skip", description: "Omit this optional parameter" },
   add: { action: "add", description: "Add another item" },
   done: { action: "done", description: "Finish the list" },
   retry: { action: "retry", description: "Retry loading the options" },
   cancel: { action: "cancel", description: "Cancel resolution" }
 };
-function selectActions(leaf, listing, multiple) {
+function selectActions(leaf, page, multiple) {
   const searchMode = leaf.resolver?.type === "dynamic" && leaf.resolver.inputType === "search";
-  if (searchMode && listing.search === void 0 && listing.items.length === 0) {
+  if (searchMode && page.position.search === void 0 && page.items.length === 0) {
     const actions2 = multiple ? [AFFORDANCE.search] : [AFFORDANCE.search, AFFORDANCE.custom];
     if (!leaf.required) actions2.push(AFFORDANCE.skip);
     return actions2;
   }
   const actions = multiple ? [AFFORDANCE.choose] : [AFFORDANCE.choose, AFFORDANCE.custom];
   if (searchMode) actions.push(AFFORDANCE.search);
-  if (listing.cursor) actions.push(AFFORDANCE.more);
+  if (page.nextCursor) actions.push(AFFORDANCE.nextPage);
+  if (page.position.previousCursors.length > 0)
+    actions.push(AFFORDANCE.previousPage);
   if (!leaf.required) actions.push(AFFORDANCE.skip);
   return actions;
 }
@@ -2990,16 +3031,17 @@ function labeledMessage(leaf) {
   if (!leaf.label) return void 0;
   return `${leaf.label} (${leaf.required ? "required" : "optional"}):`;
 }
-function selectQuestion(leaf, input, listing, context) {
+function selectQuestion(leaf, path, input, page, context) {
   const resolver = leaf.resolver?.type === "dynamic" ? leaf.resolver : void 0;
   const config = resolver?.prompt?.({
-    items: listing.items,
+    items: page.items,
     input: mergeInput(input, leaf.extraInput),
     context
   });
   const multiple = config?.type === "checkbox";
   return {
     type: "select",
+    path,
     // A labeled field's title beats the resolver's message: per-field
     // resolvers are shared across fields (one choices-fetcher for every
     // field), so only the leaf knows which field is being asked.
@@ -3007,9 +3049,13 @@ function selectQuestion(leaf, input, listing, context) {
     choices: (config?.choices ?? []).map(toChoice),
     ...multiple ? { multiple: true } : {},
     ...config?.notes?.length ? { notes: config.notes } : {},
-    ...listing.search !== void 0 ? { search: listing.search } : {},
+    ...page.position.search !== void 0 ? { search: page.position.search } : {},
     ...resolver?.placeholder ? { placeholder: resolver.placeholder } : {},
-    actions: selectActions(leaf, listing, multiple)
+    page: {
+      generation: page.position.generation,
+      index: page.position.previousCursors.length
+    },
+    actions: selectActions(leaf, page, multiple)
   };
 }
 function toControllerError(error) {
@@ -3031,6 +3077,7 @@ function failedResult(state, name, error) {
       error: toControllerError(error),
       question: {
         type: "select",
+        path: state.current ?? [],
         message: `Could not load options for ${name}.`,
         choices: [],
         actions: [AFFORDANCE.retry, AFFORDANCE.cancel]
@@ -3038,27 +3085,15 @@ function failedResult(state, name, error) {
     }
   };
 }
-async function buildQuestion(leaf, input) {
+async function buildQuestion(leaf, path, input) {
   const optional = !leaf.required;
   const resolver = leaf.resolver;
   if (resolver?.type === "dynamic") {
     const context = await resolveContext(leaf, input);
-    if (resolver.inputType === "search") {
-      const listing2 = {
-        items: [],
-        cursor: void 0,
-        search: void 0,
-        exhausted: true
-      };
-      return {
-        question: selectQuestion(leaf, input, listing2, context),
-        listing: listing2
-      };
-    }
-    const listing = await fetchListing(leaf, input, { context });
+    const page = await fetchListing(leaf, input, firstPagePosition(), context);
     return {
-      question: selectQuestion(leaf, input, listing, context),
-      listing
+      question: selectQuestion(leaf, path, input, page, context),
+      pagination: toPagination(page)
     };
   }
   if (leaf.staticChoices) {
@@ -3067,6 +3102,7 @@ async function buildQuestion(leaf, input) {
     return {
       question: {
         type: "select",
+        path,
         message: `Select ${leaf.name}:`,
         choices: leaf.staticChoices,
         actions: actions2
@@ -3080,6 +3116,7 @@ async function buildQuestion(leaf, input) {
   return {
     question: {
       type: "input",
+      path,
       // The optional marker makes Enter-to-pass discoverable on a bare
       // parameter; a labeled field carries its marker via labeledMessage.
       message: labeledMessage(leaf) ?? `Enter ${leaf.name}${optional ? " (optional)" : ""}:`,
@@ -3094,6 +3131,7 @@ function collectionQuestion(t) {
   if (t.count >= t.min) actions.push(AFFORDANCE.done);
   return {
     type: "collection",
+    path: t.path,
     message: `Add ${t.path[t.path.length - 1]}[${t.count}]?`,
     container: "array",
     count: t.count,
@@ -3107,6 +3145,7 @@ function collectionQuestion(t) {
 function objectGateQuestion(path) {
   return {
     type: "collection",
+    path,
     message: `Add ${path[path.length - 1]}?`,
     container: "object",
     actions: [
@@ -3118,9 +3157,10 @@ function objectGateQuestion(path) {
     ]
   };
 }
-function optionalsGateQuestion(pending) {
+function optionalsGateQuestion(path, pending) {
   return {
     type: "collection",
+    path,
     // The prompt and its context ride separately so a host renders the info
     // line above the confirm without composing any text of its own.
     message: "Would you like to configure optional fields?",
@@ -3270,8 +3310,12 @@ async function askLeaf(state, path, leaf, opts = {}) {
   state.current = path;
   delete state.gate;
   try {
-    const { question, listing } = await buildQuestion(leaf, state.resolved);
-    state.listing = listing;
+    const { question, pagination } = await buildQuestion(
+      leaf,
+      path,
+      state.resolved
+    );
+    state.pagination = pagination;
     return {
       state,
       result: {
@@ -3281,7 +3325,7 @@ async function askLeaf(state, path, leaf, opts = {}) {
       }
     };
   } catch (error) {
-    state.listing = { items: [], exhausted: false };
+    state.pagination = failedPagination(void 0, firstPagePosition());
     return failedResult(state, leaf.name, error);
   }
 }
@@ -3291,13 +3335,13 @@ async function advance(ctx, state) {
     if (!target) {
       delete state.current;
       delete state.gate;
-      delete state.listing;
+      delete state.pagination;
       return { state, result: finalize(ctx, state.resolved) };
     }
     if (target.kind === "array") {
       state.current = target.path;
       state.gate = "array";
-      delete state.listing;
+      delete state.pagination;
       return {
         state,
         result: { status: "ask", question: collectionQuestion(target) }
@@ -3306,7 +3350,7 @@ async function advance(ctx, state) {
     if (target.kind === "object") {
       state.current = target.path;
       state.gate = "entry";
-      delete state.listing;
+      delete state.pagination;
       return {
         state,
         result: { status: "ask", question: objectGateQuestion(target.path) }
@@ -3315,12 +3359,12 @@ async function advance(ctx, state) {
     if (target.kind === "optionals") {
       state.current = target.path;
       state.gate = "optionals";
-      delete state.listing;
+      delete state.pagination;
       return {
         state,
         result: {
           status: "ask",
-          question: optionalsGateQuestion(target.pending)
+          question: optionalsGateQuestion(target.path, target.pending)
         }
       };
     }
@@ -3371,13 +3415,13 @@ async function step(ctx, prior, action) {
   if (action.type === "cancel") {
     delete state.current;
     delete state.gate;
-    delete state.listing;
+    delete state.pagination;
     return { state, result: { status: "cancelled" } };
   }
   const path = state.current;
   if (!path) throw new Error("step called with no outstanding question");
   const leaf = await leafAt(ctx, path, state.resolved);
-  if (leaf && (action.type === "search" || action.type === "more" || action.type === "retry")) {
+  if (leaf && (action.type === "search" || action.type === "next_page" || action.type === "previous_page" || action.type === "retry")) {
     return refine(ctx, state, leaf, path, action);
   }
   if (action.type === "add" || action.type === "done") {
@@ -3389,7 +3433,7 @@ async function step(ctx, prior, action) {
     }
     delete state.current;
     delete state.gate;
-    delete state.listing;
+    delete state.pagination;
     if (action.type === "done") {
       settle(state, path);
       return advance(ctx, state);
@@ -3418,23 +3462,44 @@ async function step(ctx, prior, action) {
     case "choose":
     case "custom": {
       if (leaf) {
-        const error = await validationError(leaf, action.value, state);
+        let error;
+        try {
+          error = await validationError(leaf, action.value, state);
+        } catch (thrown) {
+          return failedResult(state, leaf.name, thrown);
+        }
         if (error) {
-          if (state.listing && leaf.resolver?.type === "dynamic") {
-            const context = await resolveContext(leaf, state.resolved);
-            return {
-              state,
-              result: {
-                status: "ask",
-                question: selectQuestion(
-                  leaf,
-                  state.resolved,
-                  state.listing,
-                  context
-                ),
-                error
-              }
-            };
+          if (state.pagination && leaf.resolver?.type === "dynamic") {
+            try {
+              const context = await resolveContext(leaf, state.resolved);
+              const page = await fetchListing(
+                leaf,
+                state.resolved,
+                state.pagination.position,
+                context
+              );
+              state.pagination = toPagination(page);
+              return {
+                state,
+                result: {
+                  status: "ask",
+                  question: selectQuestion(
+                    leaf,
+                    path,
+                    state.resolved,
+                    page,
+                    context
+                  ),
+                  error
+                }
+              };
+            } catch (fetchError) {
+              state.pagination = failedPagination(
+                state.pagination,
+                state.pagination.position
+              );
+              return failedResult(state, leaf.name, fetchError);
+            }
           }
           return askLeaf(state, path, leaf, { error });
         }
@@ -3453,15 +3518,11 @@ async function step(ctx, prior, action) {
       throw new Error(`action "${action.type}" is not supported here`);
   }
   delete state.current;
-  delete state.listing;
+  delete state.pagination;
   return advance(ctx, state);
 }
 async function refine(ctx, state, leaf, path, action) {
-  const attempt = action.type === "search" ? { search: action.term, cursor: void 0, priorItems: [] } : {
-    search: state.listing?.search,
-    cursor: state.listing?.cursor,
-    priorItems: state.listing?.items ?? []
-  };
+  const position = positionAfter(state.pagination, action);
   try {
     if (action.type === "search") {
       const exact = leaf.resolver?.type === "dynamic" ? await leaf.resolver.tryResolveFromSearch?.({
@@ -3471,32 +3532,62 @@ async function refine(ctx, state, leaf, path, action) {
       if (exact) {
         setAtPath(state.resolved, path, coerce(leaf, exact.resolvedValue));
         delete state.current;
-        delete state.listing;
+        delete state.pagination;
         return advance(ctx, state);
       }
     }
     const context = await resolveContext(leaf, state.resolved);
-    state.listing = await fetchListing(leaf, state.resolved, {
-      ...attempt,
-      context
-    });
+    const page = await fetchListing(leaf, state.resolved, position, context);
+    state.pagination = toPagination(page);
     return {
       state,
       result: {
         status: "ask",
-        question: selectQuestion(leaf, state.resolved, state.listing, context)
+        question: selectQuestion(leaf, path, state.resolved, page, context)
       }
     };
   } catch (error) {
-    state.listing = {
-      items: attempt.priorItems,
-      search: attempt.search,
-      cursor: attempt.cursor,
-      exhausted: false
-    };
+    state.pagination = failedPagination(state.pagination, position);
     return failedResult(state, leaf.name, error);
   }
 }
+function failedPagination(pagination, retryPosition) {
+  return {
+    position: pagination?.position ?? firstPagePosition(),
+    ...pagination?.nextCursor !== void 0 ? { nextCursor: pagination.nextCursor } : {},
+    retryPosition
+  };
+}
+function positionAfter(pagination, action) {
+  const current = pagination?.position ?? firstPagePosition();
+  switch (action.type) {
+    case "search":
+      return firstPagePosition({
+        search: action.term,
+        generation: current.generation + 1
+      });
+    case "next_page": {
+      if (pagination?.nextCursor == null) return current;
+      return {
+        ...current.search !== void 0 ? { search: current.search } : {},
+        pageCursor: pagination.nextCursor,
+        previousCursors: [...current.previousCursors, current.pageCursor],
+        generation: current.generation
+      };
+    }
+    case "previous_page": {
+      if (current.previousCursors.length === 0) return current;
+      return {
+        ...current.search !== void 0 ? { search: current.search } : {},
+        pageCursor: current.previousCursors[current.previousCursors.length - 1],
+        previousCursors: current.previousCursors.slice(0, -1),
+        generation: current.generation
+      };
+    }
+    case "retry":
+      return pagination?.retryPosition ?? current;
+  }
+}
 
 // src/model/resolution/controller.ts
 function toJsonSchema(schema) {
@@ -3679,6 +3770,7 @@ function openEnum(values, description) {
   CoreSignal,
   addPlugin,
   composePlugins,
+  concatLists,
   concatPaginated,
   coreOptionsPluginRef,
   createAsyncContext,