apify-client 3.0.0-beta.85 → 3.0.0-beta.87

package/dist/resource_clients/dataset.js

@@ -4,7 +4,7 @@ import { ResourceClient } from '../base/resource_client.js';
 import * as schemas from '../schemas.js';
 import { timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
 import { runtime } from '#runtime';
-import { anyObjectSchema, applyQueryParamsToUrl, cast, isNonArrayObject, paginationOptionsShape, parseArgument, parseResponse, SCANNED_COUNT, } from '../utils.js';
+import { anyObjectSchema, applyQueryParamsToUrl, cast, isNonArrayObject, paginationOptionsShape, parseArgument, parseResponse, } from '../utils.js';
 /**
  * Supported formats for downloading dataset items.
  */
@@ -356,21 +356,17 @@ export class DatasetClient extends ResourceClient {
     }
     #createPaginationList(response, userProvidedDesc) {
         const descHeader = response.headers['x-apify-pagination-desc'];
-        const page = {
+        return {
             items: response.data,
             total: Number(response.headers['x-apify-pagination-total']),
             offset: Number(response.headers['x-apify-pagination-offset']),
             // `x-apify-pagination-count` reports the rows scanned, which filters and `unwind` can leave above or below
-            // the items returned.
-            count: response.data.length,
+            // the items returned. It is derived from the dataset's item count, which lags a fresh push, so it can also
+            // fall below the items returned on an unfiltered page.
+            count: Math.max(Number(response.headers['x-apify-pagination-count'] ?? 0), response.data.length),
             limit: Number(response.headers['x-apify-pagination-limit']), // API returns 999999999999 when no limit is used
             // TODO: Replace this once https://github.com/apify/apify-core/issues/3503 is solved
             desc: typeof descHeader === 'string' ? JSON.parse(descHeader) : userProvidedDesc,
         };
-        const scannedCount = response.headers['x-apify-pagination-count'];
-        if (scannedCount === undefined)
-            return page;
-        // The offset iterator paginates by the scanned number, so it travels with the page outside its public shape.
-        return Object.defineProperty(page, SCANNED_COUNT, { value: Number(scannedCount) });
     }
 }

package/dist/resource_clients/run.js

@@ -5,7 +5,7 @@ import { ResourceClient } from '../base/resource_client.js';
 import * as schemas from '../schemas.js';
 import { optionalSignalSchema, optionalTimeoutSchema, timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
 import { runtime } from '#runtime';
-import { anyObjectSchema, paginationOptionsShape, parseArgument, parseResponse, SCANNED_COUNT } from '../utils.js';
+import { anyObjectSchema, paginationOptionsShape, parseArgument, parseResponse } from '../utils.js';
 import { DatasetClient } from './dataset.js';
 import { KeyValueStoreClient } from './key_value_store.js';
 import { LogClient, LoggerActorRedirect, StreamedLog } from './log.js';
@@ -537,7 +537,7 @@ export class RunClient extends ResourceClient {
             yield* page.items;
             // Only an empty page marks the end, as filters can shorten a full one. A page that `clean`, `skipEmpty` or
             // `unwind` emptied past a lagging `itemCount` reports no scanned rows either, so a plain read checks.
-            const isEmpty = page.items.length === 0 && !page[SCANNED_COUNT];
+            const isEmpty = page.count === 0;
             if (isEmpty &&
                 (!(clean || skipEmpty || unwind?.length) ||
                     (await datasetClient.listItems({ offset: position, limit: 1, timeoutSecs, signal })).items

package/dist/utils.d.ts

@@ -177,7 +177,12 @@ export interface PaginatedResponse<Data> {
  * @template Data - The type of items in the list
  */
 export interface PaginatedList<Data> extends PaginatedResponse<Data> {
-    /** Count of dataset entries returned in this set. */
+    /**
+     * Number of entries on this page. On a page from {@link DatasetClient.listItems}, the number of dataset rows the
+     * API scanned for it, or the number of items returned when that is larger. Filters (`clean`, `skipEmpty`) can
+     * leave it above `items.length`. The next page starts at `offset + Math.min(count, limit)`; the cap matters only
+     * with `unwind`, which can return more items than the rows scanned.
+     */
     count: number;
     /** Position of the first returned entry in the dataset. */
     offset: number;
@@ -186,16 +191,6 @@ export interface PaginatedList<Data> extends PaginatedResponse<Data> {
     /** Should the results be in descending order. */
     desc: boolean;
 }
-/**
- * Key under which a page of dataset items carries the number of rows the API scanned to produce it, as a
- * non-enumerable property that stays out of the page's public shape. The API applies `offset` and `limit` to the
- * dataset's rows first and shapes the result afterwards: filters (`clean`, `skipEmpty`, `skipHidden`) drop items and
- * `unwind` splits or drops them, so `items.length` can land on either side of the rows scanned. The
- * `x-apify-pagination-count` header reports the scanned number, and the offset iterator advances and terminates by it
- * alone. A page without the property falls back to `items.length`.
- * @internal
- */
-export declare const SCANNED_COUNT: unique symbol;
 /**
  * Type representing both a Promise of a paginated list and an async iterable.
  *

package/dist/utils.js

@@ -315,16 +315,6 @@ export const paginationOptionsShape = {
     offset: z.number().min(0).optional(),
     chunkSize: z.number().positive().optional(),
 };
-/**
- * Key under which a page of dataset items carries the number of rows the API scanned to produce it, as a
- * non-enumerable property that stays out of the page's public shape. The API applies `offset` and `limit` to the
- * dataset's rows first and shapes the result afterwards: filters (`clean`, `skipEmpty`, `skipHidden`) drop items and
- * `unwind` splits or drops them, so `items.length` can land on either side of the rows scanned. The
- * `x-apify-pagination-count` header reports the scanned number, and the offset iterator advances and terminates by it
- * alone. A page without the property falls back to `items.length`.
- * @internal
- */
-export const SCANNED_COUNT = Symbol('scannedCount');
 export function cast(input) {
     return input;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-client",
-  "version": "3.0.0-beta.85",
+  "version": "3.0.0-beta.87",
   "description": "Apify API client for JavaScript",
   "engines": {
     "node": ">=22.13.0"