apify-client 2.25.1-beta.7 → 3.0.0-beta.0

package/dist/resource_clients/request_queue.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestQueueClient = void 0;
 const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
+const zod_1 = require("zod");
 const consts_1 = require("@apify/consts");
 const log_1 = tslib_1.__importDefault(require("@apify/log"));
 const resource_client_1 = require("../base/resource_client");
@@ -12,6 +12,48 @@ const DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS = 3;
 const DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS = 500;
 const DEFAULT_REQUEST_QUEUE_REQUEST_PAGE_LIMIT = 1000;
 const SAFETY_BUFFER_PERCENT = 0.01 / 100; // 0.01%
+const listHeadOptionsSchema = zod_1.z.strictObject({ limit: zod_1.z.number().min(0).optional() });
+const listAndLockHeadOptionsSchema = zod_1.z.strictObject({
+    lockSecs: zod_1.z.number(),
+    limit: zod_1.z.number().min(0).optional(),
+});
+// Predicates, not `z.looseObject` arms: these run over a whole batch, and an object arm would copy
+// every key of every request. `id` is assigned by the API, so a new request must not carry one.
+const newRequestSchema = zod_1.z.custom((value) => (0, utils_1.isNonArrayObject)(value) && value.id === undefined, 'Expected a request object without an `id`');
+const forefrontOptionsSchema = zod_1.z.strictObject({ forefront: zod_1.z.boolean().optional() });
+const batchAddRequestsSchema = zod_1.z.array(newRequestSchema).min(1).max(consts_1.REQUEST_QUEUE_MAX_REQUESTS_PER_BATCH_OPERATION);
+const batchAddRequestsWithRetriesSchema = zod_1.z.array(newRequestSchema).min(1);
+const optionalBooleanSchema = zod_1.z.boolean().optional();
+const optionalNumberSchema = zod_1.z.number().optional();
+const requestToDeleteSchema = zod_1.z.custom((value) => (0, utils_1.isNonArrayObject)(value) && (typeof value.id === 'string' || typeof value.uniqueKey === 'string'), 'Expected a request object with an `id` or a `uniqueKey`');
+const batchDeleteRequestsSchema = zod_1.z
+    .array(requestToDeleteSchema)
+    .min(1)
+    .max(consts_1.REQUEST_QUEUE_MAX_REQUESTS_PER_BATCH_OPERATION);
+const requestIdSchema = zod_1.z.string();
+const existingRequestSchema = zod_1.z.custom((value) => (0, utils_1.isNonArrayObject)(value) && typeof value.id === 'string', 'Expected a request object with an `id`');
+const prolongRequestLockOptionsSchema = zod_1.z.strictObject({
+    lockSecs: zod_1.z.number(),
+    forefront: zod_1.z.boolean().optional(),
+});
+const requestFilterSchema = zod_1.z.array(zod_1.z.enum(['locked', 'pending'])).min(1);
+const listRequestsOptionsSchema = zod_1.z
+    .strictObject({
+    limit: zod_1.z.number().min(0).optional(),
+    exclusiveStartId: zod_1.z.string().optional(),
+    cursor: zod_1.z.string().optional(),
+    filter: requestFilterSchema.optional(),
+})
+    .refine(...(0, utils_1.mutuallyExclusive)('exclusiveStartId', 'cursor'));
+const paginateRequestsOptionsSchema = zod_1.z
+    .strictObject({
+    limit: zod_1.z.number().min(0).optional(),
+    maxPageLimit: zod_1.z.number().default(DEFAULT_REQUEST_QUEUE_REQUEST_PAGE_LIMIT),
+    exclusiveStartId: zod_1.z.string().optional(),
+    cursor: zod_1.z.string().optional(),
+    filter: requestFilterSchema.optional(),
+})
+    .refine(...(0, utils_1.mutuallyExclusive)('exclusiveStartId', 'cursor'));
 /**
  * Client for managing a specific Request queue.
  *
@@ -73,7 +115,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-put
      */
     async update(newFields) {
-        (0, ow_1.default)(newFields, ow_1.default.object);
+        (0, utils_1.parseArgument)(newFields, utils_1.anyObjectSchema);
         return this._update(newFields, resource_client_1.SMALL_TIMEOUT_MILLIS);
     }
     /**
@@ -95,15 +137,13 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-head-get
      */
     async listHead(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            limit: ow_1.default.optional.number.not.negative,
-        }));
+        const parsed = (0, utils_1.parseArgument)(options, listHeadOptionsSchema, 'RequestQueueClientListHeadOptions');
         const response = await this.httpClient.call({
             url: this._url('head'),
             method: 'GET',
             timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
-                limit: options.limit,
+                limit: parsed.limit,
                 clientKey: this.clientKey,
             }),
         });
@@ -143,17 +183,14 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.4.1
      */
     async listAndLockHead(options) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            lockSecs: ow_1.default.number,
-            limit: ow_1.default.optional.number.not.negative,
-        }));
+        const parsed = (0, utils_1.parseArgument)(options, listAndLockHeadOptionsSchema, 'RequestQueueClientListAndLockHeadOptions');
         const response = await this.httpClient.call({
             url: this._url('head/lock'),
             method: 'POST',
             timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
-                limit: options.limit,
-                lockSecs: options.lockSecs,
+                limit: parsed.limit,
+                lockSecs: parsed.lockSecs,
                 clientKey: this.clientKey,
             }),
         });
@@ -198,19 +235,15 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * ```
      */
     async addRequest(request, options = {}) {
-        (0, ow_1.default)(request, ow_1.default.object.partialShape({
-            id: ow_1.default.undefined,
-        }));
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forefront: ow_1.default.optional.boolean,
-        }));
+        (0, utils_1.parseArgument)(request, newRequestSchema);
+        const parsed = (0, utils_1.parseArgument)(options, forefrontOptionsSchema, 'RequestQueueClientAddRequestOptions');
         const response = await this.httpClient.call({
             url: this._url('requests'),
             method: 'POST',
             timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
-                forefront: options.forefront,
+                forefront: parsed.forefront,
                 clientKey: this.clientKey,
             }),
         });
@@ -222,22 +255,15 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @private
      */
     async _batchAddRequests(requests, options = {}) {
-        (0, ow_1.default)(requests, ow_1.default.array
-            .ofType(ow_1.default.object.partialShape({
-            id: ow_1.default.undefined,
-        }))
-            .minLength(1)
-            .maxLength(consts_1.REQUEST_QUEUE_MAX_REQUESTS_PER_BATCH_OPERATION));
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forefront: ow_1.default.optional.boolean,
-        }));
+        (0, utils_1.parseArgument)(requests, batchAddRequestsSchema);
+        const parsed = (0, utils_1.parseArgument)(options, forefrontOptionsSchema, 'RequestQueueClientAddRequestOptions');
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'POST',
             timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: requests,
             params: this._params({
-                forefront: options.forefront,
+                forefront: parsed.forefront,
                 clientKey: this.clientKey,
             }),
         });
@@ -332,15 +358,11 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      */
     async batchAddRequests(requests, options = {}) {
         const { forefront, maxUnprocessedRequestsRetries = DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS, maxParallel = DEFAULT_PARALLEL_BATCH_ADD_REQUESTS, minDelayBetweenUnprocessedRequestsRetriesMillis = DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS, } = options;
-        (0, ow_1.default)(requests, ow_1.default.array
-            .ofType(ow_1.default.object.partialShape({
-            id: ow_1.default.undefined,
-        }))
-            .minLength(1));
-        (0, ow_1.default)(forefront, ow_1.default.optional.boolean);
-        (0, ow_1.default)(maxUnprocessedRequestsRetries, ow_1.default.optional.number);
-        (0, ow_1.default)(maxParallel, ow_1.default.optional.number);
-        (0, ow_1.default)(minDelayBetweenUnprocessedRequestsRetriesMillis, ow_1.default.optional.number);
+        (0, utils_1.parseArgument)(requests, batchAddRequestsWithRetriesSchema);
+        (0, utils_1.parseArgument)(forefront, optionalBooleanSchema);
+        (0, utils_1.parseArgument)(maxUnprocessedRequestsRetries, optionalNumberSchema);
+        (0, utils_1.parseArgument)(maxParallel, optionalNumberSchema);
+        (0, utils_1.parseArgument)(minDelayBetweenUnprocessedRequestsRetriesMillis, optionalNumberSchema);
         const executingRequests = new Set();
         const individualResults = [];
         const payloadSizeLimitBytes = consts_1.MAX_PAYLOAD_SIZE_BYTES - Math.ceil(consts_1.MAX_PAYLOAD_SIZE_BYTES * SAFETY_BUFFER_PERCENT);
@@ -384,10 +406,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.3.0
      */
     async batchDeleteRequests(requests) {
-        (0, ow_1.default)(requests, ow_1.default.array
-            .ofType(ow_1.default.any(ow_1.default.object.partialShape({ id: ow_1.default.string }), ow_1.default.object.partialShape({ uniqueKey: ow_1.default.string })))
-            .minLength(1)
-            .maxLength(consts_1.REQUEST_QUEUE_MAX_REQUESTS_PER_BATCH_OPERATION));
+        (0, utils_1.parseArgument)(requests, batchDeleteRequestsSchema);
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'DELETE',
@@ -407,9 +426,9 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-request-get
      */
     async getRequest(id) {
-        (0, ow_1.default)(id, ow_1.default.string);
+        (0, utils_1.parseArgument)(id, requestIdSchema);
         const requestOpts = {
-            url: this._url(`requests/${id}`),
+            url: this._url(['requests', id]),
             method: 'GET',
             timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params(),
@@ -432,19 +451,15 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-request-put
      */
     async updateRequest(request, options = {}) {
-        (0, ow_1.default)(request, ow_1.default.object.partialShape({
-            id: ow_1.default.string,
-        }));
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forefront: ow_1.default.optional.boolean,
-        }));
+        (0, utils_1.parseArgument)(request, existingRequestSchema);
+        const parsed = (0, utils_1.parseArgument)(options, forefrontOptionsSchema, 'RequestQueueClientAddRequestOptions');
         const response = await this.httpClient.call({
-            url: this._url(`requests/${request.id}`),
+            url: this._url(['requests', request.id]),
             method: 'PUT',
             timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
-                forefront: options.forefront,
+                forefront: parsed.forefront,
                 clientKey: this.clientKey,
             }),
         });
@@ -456,9 +471,9 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @param id - Request ID
      */
     async deleteRequest(id) {
-        (0, ow_1.default)(id, ow_1.default.string);
+        (0, utils_1.parseArgument)(id, requestIdSchema);
         await this.httpClient.call({
-            url: this._url(`requests/${id}`),
+            url: this._url(['requests', id]),
             method: 'DELETE',
             timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
@@ -492,18 +507,15 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.4.1
      */
     async prolongRequestLock(id, options) {
-        (0, ow_1.default)(id, ow_1.default.string);
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            lockSecs: ow_1.default.number,
-            forefront: ow_1.default.optional.boolean,
-        }));
+        (0, utils_1.parseArgument)(id, requestIdSchema);
+        const parsed = (0, utils_1.parseArgument)(options, prolongRequestLockOptionsSchema, 'RequestQueueClientProlongRequestLockOptions');
         const response = await this.httpClient.call({
-            url: this._url(`requests/${id}/lock`),
+            url: this._url(['requests', id, 'lock']),
             method: 'PUT',
             timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
-                forefront: options.forefront,
-                lockSecs: options.lockSecs,
+                forefront: parsed.forefront,
+                lockSecs: parsed.lockSecs,
                 clientKey: this.clientKey,
             }),
         });
@@ -521,16 +533,14 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.4.1
      */
     async deleteRequestLock(id, options = {}) {
-        (0, ow_1.default)(id, ow_1.default.string);
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forefront: ow_1.default.optional.boolean,
-        }));
+        (0, utils_1.parseArgument)(id, requestIdSchema);
+        const parsed = (0, utils_1.parseArgument)(options, forefrontOptionsSchema, 'RequestQueueClientDeleteRequestLockOptions');
         await this.httpClient.call({
-            url: this._url(`requests/${id}/lock`),
+            url: this._url(['requests', id, 'lock']),
             method: 'DELETE',
             timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
-                forefront: options.forefront,
+                forefront: parsed.forefront,
                 clientKey: this.clientKey,
             }),
         });
@@ -547,14 +557,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.5.1
      */
     listRequests(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object
-            .exactShape({
-            limit: ow_1.default.optional.number.not.negative,
-            exclusiveStartId: ow_1.default.optional.string,
-            cursor: ow_1.default.optional.string,
-            filter: ow_1.default.optional.array.ofType(ow_1.default.string.oneOf(['locked', 'pending'])).minLength(1),
-        })
-            .validate((0, utils_1.mutuallyExclusive)('exclusiveStartId', 'cursor')));
+        const parsed = (0, utils_1.parseArgument)(options, listRequestsOptionsSchema, 'RequestQueueClientListRequestsOptions');
         const getPaginatedList = async (rqListOptions = {}) => {
             const response = await this.httpClient.call({
                 url: this._url('requests'),
@@ -568,11 +571,11 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
             });
             return (0, utils_1.cast)((0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data)));
         };
-        const paginatedListPromise = getPaginatedList(options);
+        const paginatedListPromise = getPaginatedList(parsed);
         async function* asyncGenerator() {
             let currentPage = await paginatedListPromise;
             yield* currentPage.items;
-            let remainingItems = options.limit ? options.limit - currentPage.items.length : undefined;
+            let remainingItems = parsed.limit ? parsed.limit - currentPage.items.length : undefined;
             // RQ API response does not indicate whether there are more requests left, so we have to try and in case
             // of exhausting all requests we get response with empty items which ends the loop.
             while (currentPage.items.length > 0 && // Continue only if at least some items were returned in the last page.
@@ -580,7 +583,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
                 (remainingItems === undefined || remainingItems > 0) // Continue only if the limit was not exceeded.
             ) {
                 const newOptions = {
-                    ...options,
+                    ...parsed,
                     limit: remainingItems,
                     // remove original exclusiveStartId, if there was any, and use cursor-based pagination
                     exclusiveStartId: undefined,
@@ -637,16 +640,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @since Added in 2.5.1
      */
     paginateRequests(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object
-            .exactShape({
-            limit: ow_1.default.optional.number.not.negative,
-            maxPageLimit: ow_1.default.optional.number,
-            exclusiveStartId: ow_1.default.optional.string,
-            cursor: ow_1.default.optional.string,
-            filter: ow_1.default.optional.array.ofType(ow_1.default.string.oneOf(['locked', 'pending'])).minLength(1),
-        })
-            .validate((0, utils_1.mutuallyExclusive)('exclusiveStartId', 'cursor')));
-        const { limit, exclusiveStartId, cursor, filter, maxPageLimit = DEFAULT_REQUEST_QUEUE_REQUEST_PAGE_LIMIT, } = options;
+        const { limit, exclusiveStartId, cursor, filter, maxPageLimit } = (0, utils_1.parseArgument)(options, paginateRequestsOptionsSchema, 'RequestQueueClientPaginateRequestsOptions');
         return new utils_1.RequestQueuePaginationIterator({
             getPage: async (pageOptions) => this.listRequests({ ...pageOptions, filter }),
             limit,

package/dist/resource_clients/request_queue_collection.js

@@ -1,10 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestQueueCollectionClient = void 0;
-const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
+const zod_1 = require("zod");
 const consts_1 = require("@apify/consts");
 const resource_collection_client_1 = require("../base/resource_collection_client");
+const utils_1 = require("../utils");
+const listOptionsSchema = zod_1.z.strictObject({
+    unnamed: zod_1.z.boolean().optional(),
+    ...utils_1.paginationOptionsShape,
+    desc: zod_1.z.boolean().optional(),
+    ownership: zod_1.z.enum(consts_1.STORAGE_OWNERSHIP_FILTER).optional(),
+});
+const nameSchema = zod_1.z.string().optional();
 /**
  * Client for managing the collection of Request queues in your account.
  *
@@ -56,14 +63,8 @@ class RequestQueueCollectionClient extends resource_collection_client_1.Resource
      * @see https://docs.apify.com/api/v2/request-queues-get
      */
     list(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            unnamed: ow_1.default.optional.boolean,
-            limit: ow_1.default.optional.number.not.negative,
-            offset: ow_1.default.optional.number.not.negative,
-            desc: ow_1.default.optional.boolean,
-            ownership: ow_1.default.optional.string.oneOf(Object.values(consts_1.STORAGE_OWNERSHIP_FILTER)),
-        }));
-        return this._listPaginated(options);
+        const parsed = (0, utils_1.parseArgument)(options, listOptionsSchema, 'RequestQueueCollectionListOptions');
+        return this._listPaginated(parsed);
     }
     /**
      * Gets or creates a Request queue with the specified name.
@@ -73,7 +74,7 @@ class RequestQueueCollectionClient extends resource_collection_client_1.Resource
      * @see https://docs.apify.com/api/v2/request-queues-post
      */
     async getOrCreate(name) {
-        (0, ow_1.default)(name, ow_1.default.optional.string);
+        (0, utils_1.parseArgument)(name, nameSchema);
         return this._getOrCreate(name);
     }
 }

package/dist/resource_clients/run.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunClient = void 0;
-const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
+const zod_1 = require("zod");
 const log_1 = require("@apify/log");
 const resource_client_1 = require("../base/resource_client");
 const utils_1 = require("../utils");
@@ -11,6 +10,27 @@ const key_value_store_1 = require("./key_value_store");
 const log_2 = require("./log");
 const request_queue_1 = require("./request_queue");
 const RUN_CHARGE_IDEMPOTENCY_HEADER = 'idempotency-key';
+const getOptionsSchema = zod_1.z.strictObject({ waitForFinish: zod_1.z.number().optional() });
+const abortOptionsSchema = zod_1.z.strictObject({ gracefully: zod_1.z.boolean().optional() });
+const targetActorIdSchema = zod_1.z.string();
+const metamorphOptionsSchema = zod_1.z.strictObject({
+    contentType: zod_1.z.string().optional(),
+    build: zod_1.z.string().optional(),
+});
+const resurrectOptionsSchema = zod_1.z.strictObject({
+    build: zod_1.z.string().optional(),
+    memory: zod_1.z.number().optional(),
+    timeout: zod_1.z.number().optional(),
+    maxItems: zod_1.z.number().optional(),
+    maxTotalChargeUsd: zod_1.z.number().optional(),
+    restartOnError: zod_1.z.boolean().optional(),
+});
+const chargeOptionsSchema = zod_1.z.strictObject({
+    eventName: zod_1.z.string(),
+    count: zod_1.z.number().default(1),
+    idempotencyKey: zod_1.z.string().optional(),
+});
+const waitForFinishOptionsSchema = zod_1.z.strictObject({ waitSecs: zod_1.z.number().optional() });
 /**
  * Client for managing a specific Actor run.
  *
@@ -63,10 +83,8 @@ class RunClient extends resource_client_1.ResourceClient {
      * ```
      */
     async get(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            waitForFinish: ow_1.default.optional.number,
-        }));
-        return this._get(options);
+        const parsed = (0, utils_1.parseArgument)(options, getOptionsSchema, 'RunGetOptions');
+        return this._get(parsed);
     }
     /**
      * Aborts the Actor run.
@@ -86,13 +104,11 @@ class RunClient extends resource_client_1.ResourceClient {
      * ```
      */
     async abort(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            gracefully: ow_1.default.optional.boolean,
-        }));
+        const parsed = (0, utils_1.parseArgument)(options, abortOptionsSchema, 'RunAbortOptions');
         const response = await this.httpClient.call({
             url: this._url('abort'),
             method: 'POST',
-            params: this._params(options),
+            params: this._params(parsed),
         });
         return (0, utils_1.cast)((0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data)));
     }
@@ -131,16 +147,13 @@ class RunClient extends resource_client_1.ResourceClient {
      * ```
      */
     async metamorph(targetActorId, input, options = {}) {
-        (0, ow_1.default)(targetActorId, ow_1.default.string);
+        (0, utils_1.parseArgument)(targetActorId, targetActorIdSchema);
         // input can be anything, pointless to validate
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            contentType: ow_1.default.optional.string,
-            build: ow_1.default.optional.string,
-        }));
+        const parsed = (0, utils_1.parseArgument)(options, metamorphOptionsSchema, 'RunMetamorphOptions');
         const safeTargetActorId = this._toSafeId(targetActorId);
         const params = {
             targetActorId: safeTargetActorId,
-            build: options.build,
+            build: parsed.build,
         };
         const request = {
             url: this._url('metamorph'),
@@ -153,9 +166,9 @@ class RunClient extends resource_client_1.ResourceClient {
             // @ts-expect-error Custom Apify property
             stringifyFunctions: true,
         };
-        if (options.contentType) {
+        if (parsed.contentType) {
             request.headers = {
-                'content-type': options.contentType,
+                'content-type': parsed.contentType,
             };
         }
         const response = await this.httpClient.call(request);
@@ -204,7 +217,7 @@ class RunClient extends resource_client_1.ResourceClient {
      * @since Added in 2.6.0
      */
     async update(newFields) {
-        (0, ow_1.default)(newFields, ow_1.default.object);
+        (0, utils_1.parseArgument)(newFields, utils_1.anyObjectSchema);
         return this._update(newFields);
     }
     /**
@@ -231,18 +244,11 @@ class RunClient extends resource_client_1.ResourceClient {
      * ```
      */
     async resurrect(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            build: ow_1.default.optional.string,
-            memory: ow_1.default.optional.number,
-            timeout: ow_1.default.optional.number,
-            maxItems: ow_1.default.optional.number,
-            maxTotalChargeUsd: ow_1.default.optional.number,
-            restartOnError: ow_1.default.optional.boolean,
-        }));
+        const parsed = (0, utils_1.parseArgument)(options, resurrectOptionsSchema, 'RunResurrectOptions');
         const response = await this.httpClient.call({
             url: this._url('resurrect'),
             method: 'POST',
-            params: this._params(options),
+            params: this._params(parsed),
         });
         return (0, utils_1.cast)((0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data)));
     }
@@ -258,20 +264,15 @@ class RunClient extends resource_client_1.ResourceClient {
      * @since Added in 2.11.0
      */
     async charge(options) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            eventName: ow_1.default.string,
-            count: ow_1.default.optional.number,
-            idempotencyKey: ow_1.default.optional.string,
-        }));
-        const count = options.count ?? 1;
+        const { eventName, count, idempotencyKey: providedIdempotencyKey, } = (0, utils_1.parseArgument)(options, chargeOptionsSchema, 'RunChargeOptions');
         /** To avoid duplicates during the same milisecond, doesn't need to by crypto-secure. */
         const randomSuffix = (Math.random() + 1).toString(36).slice(3, 8);
-        const idempotencyKey = options.idempotencyKey ?? `${this.id}-${options.eventName}-${Date.now()}-${randomSuffix}`;
+        const idempotencyKey = providedIdempotencyKey ?? `${this.id}-${eventName}-${Date.now()}-${randomSuffix}`;
         const request = {
             url: this._url('charge'),
             method: 'POST',
             data: {
-                eventName: options.eventName,
+                eventName,
                 count,
             },
             headers: {
@@ -310,10 +311,8 @@ class RunClient extends resource_client_1.ResourceClient {
      * ```
      */
     async waitForFinish(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            waitSecs: ow_1.default.optional.number,
-        }));
-        return this._waitForFinish(options);
+        const parsed = (0, utils_1.parseArgument)(options, waitForFinishOptionsSchema, 'RunWaitForFinishOptions');
+        return this._waitForFinish(parsed);
     }
     /**
      * Returns a client for the default dataset of this Actor run.

package/dist/resource_clients/run_collection.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunCollectionClient = void 0;
-const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
+const zod_1 = require("zod");
 const consts_1 = require("@apify/consts");
 const resource_collection_client_1 = require("../base/resource_collection_client");
+const utils_1 = require("../utils");
+const jobStatusSchema = zod_1.z.enum(consts_1.ACTOR_JOB_STATUSES);
+const listOptionsSchema = zod_1.z.strictObject({
+    ...utils_1.paginationOptionsShape,
+    desc: zod_1.z.boolean().optional(),
+    status: zod_1.z.union([jobStatusSchema, zod_1.z.array(jobStatusSchema)]).optional(),
+    startedBefore: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).optional(),
+    startedAfter: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).optional(),
+});
 /**
  * Client for managing the collection of Actor runs.
  *
@@ -57,15 +65,8 @@ class RunCollectionClient extends resource_collection_client_1.ResourceCollectio
      * @see https://docs.apify.com/api/v2/actor-runs-get
      */
     list(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            limit: ow_1.default.optional.number.not.negative,
-            offset: ow_1.default.optional.number.not.negative,
-            desc: ow_1.default.optional.boolean,
-            status: ow_1.default.optional.any(ow_1.default.string.oneOf(Object.values(consts_1.ACTOR_JOB_STATUSES)), ow_1.default.array.ofType(ow_1.default.string.oneOf(Object.values(consts_1.ACTOR_JOB_STATUSES)))),
-            startedBefore: ow_1.default.optional.any(ow_1.default.optional.date, ow_1.default.optional.string),
-            startedAfter: ow_1.default.optional.any(ow_1.default.optional.date, ow_1.default.optional.string),
-        }));
-        return this._listPaginated(options);
+        const parsed = (0, utils_1.parseArgument)(options, listOptionsSchema, 'RunCollectionListOptions');
+        return this._listPaginated(parsed);
     }
 }
 exports.RunCollectionClient = RunCollectionClient;

package/dist/resource_clients/schedule.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduleActions = exports.ScheduleClient = void 0;
-const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
 const resource_client_1 = require("../base/resource_client");
 const utils_1 = require("../utils");
 /**
@@ -55,7 +53,7 @@ class ScheduleClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/schedule-put
      */
     async update(newFields) {
-        (0, ow_1.default)(newFields, ow_1.default.object);
+        (0, utils_1.parseArgument)(newFields, utils_1.anyObjectSchema);
         return this._update(newFields);
     }
     /**

package/dist/resource_clients/schedule_collection.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduleCollectionClient = void 0;
-const tslib_1 = require("tslib");
-const ow_1 = tslib_1.__importDefault(require("ow"));
+const zod_1 = require("zod");
 const resource_collection_client_1 = require("../base/resource_collection_client");
+const utils_1 = require("../utils");
+const listOptionsSchema = zod_1.z.strictObject({
+    ...utils_1.paginationOptionsShape,
+    desc: zod_1.z.boolean().optional(),
+});
+const scheduleCreateSchema = utils_1.anyObjectSchema.optional();
 /**
  * Client for managing the collection of Schedules in your account.
  *
@@ -59,12 +64,8 @@ class ScheduleCollectionClient extends resource_collection_client_1.ResourceColl
      * @see https://docs.apify.com/api/v2/schedules-get
      */
     list(options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            limit: ow_1.default.optional.number.not.negative,
-            offset: ow_1.default.optional.number.not.negative,
-            desc: ow_1.default.optional.boolean,
-        }));
-        return this._listPaginated(options);
+        const parsed = (0, utils_1.parseArgument)(options, listOptionsSchema, 'ScheduleCollectionListOptions');
+        return this._listPaginated(parsed);
     }
     /**
      * Creates a new schedule.
@@ -74,7 +75,7 @@ class ScheduleCollectionClient extends resource_collection_client_1.ResourceColl
      * @see https://docs.apify.com/api/v2/schedules-post
      */
     async create(schedule) {
-        (0, ow_1.default)(schedule, ow_1.default.optional.object);
+        (0, utils_1.parseArgument)(schedule, scheduleCreateSchema);
         return this._create(schedule);
     }
 }