apify-client 3.0.0-beta.1 → 3.0.0-beta.3

package/README.md

@@ -26,7 +26,7 @@ automatic retries and convenience functions that improve the experience of using
 ## Quick Start
 
 ```js
-const { ApifyClient } = require('apify-client');
+import { ApifyClient } from 'apify-client';
 
 const client = new ApifyClient({
     token: 'MY-APIFY-TOKEN',
@@ -72,7 +72,7 @@ resources are created. There are two types of those clients. A client for manage
 resource and a client for a collection of resources.
 
 ```js
-const { ApifyClient } = require('apify-client');
+import { ApifyClient } from 'apify-client';
 const apifyClient = new ApifyClient({ token: 'my-token' });
 
 // Collection clients do not require a parameter.

package/dist/apify_api_error.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApifyApiError = void 0;
-const body_parser_1 = require("./body_parser");
-const utils_1 = require("./utils");
+import { isomorphicBufferToString } from './body_parser.js';
+import { isBuffer } from './utils.js';
 /**
  * Examples of capturing groups for "...at ActorCollectionClient._list (/Users/..."
  * 0: "at ActorCollectionClient._list ("
@@ -20,7 +17,7 @@ const CLIENT_METHOD_REGEX = /at( async)? ([A-Za-z]+(Collection)?Client)\._?([A-Z
  * errors, which are thrown immediately, because a correction by the user is
  * needed.
  */
-class ApifyApiError extends Error {
+export class ApifyApiError extends Error {
     name;
     /**
      * The invoked resource client and the method. Known issue: Sometimes it displays
@@ -66,9 +63,9 @@ class ApifyApiError extends Error {
         let errorData;
         // Some methods (e.g. downloadItems) set up forceBuffer on request response. If this request failed
         // the body buffer needs to parse to get the correct error.
-        if ((0, utils_1.isBuffer)(responseData)) {
+        if (isBuffer(responseData)) {
             try {
-                responseData = JSON.parse((0, body_parser_1.isomorphicBufferToString)(response.data, 'utf-8'));
+                responseData = JSON.parse(isomorphicBufferToString(response.data, 'utf-8'));
             }
             catch {
                 // This can happen. The data in the response body are malformed.
@@ -148,4 +145,3 @@ class ApifyApiError extends Error {
         return `${name}: ${this.message}\n${stack}`;
     }
 }
-exports.ApifyApiError = ApifyApiError;

package/dist/apify_client.d.ts

@@ -1,32 +1,32 @@
 import type { SetStatusMessageOptions } from '@crawlee/types';
 import type { Log } from '@apify/log';
-import { HttpClient } from './http_client';
-import type { RequestInterceptorFunction } from './interceptors';
-import { ActorClient } from './resource_clients/actor';
-import { ActorCollectionClient } from './resource_clients/actor_collection';
-import { BuildClient } from './resource_clients/build';
-import { BuildCollectionClient } from './resource_clients/build_collection';
-import { DatasetClient } from './resource_clients/dataset';
-import { DatasetCollectionClient } from './resource_clients/dataset_collection';
-import { KeyValueStoreClient } from './resource_clients/key_value_store';
-import { KeyValueStoreCollectionClient } from './resource_clients/key_value_store_collection';
-import { LogClient } from './resource_clients/log';
-import type { RequestQueueUserOptions } from './resource_clients/request_queue';
-import { RequestQueueClient } from './resource_clients/request_queue';
-import { RequestQueueCollectionClient } from './resource_clients/request_queue_collection';
-import { RunClient } from './resource_clients/run';
-import { RunCollectionClient } from './resource_clients/run_collection';
-import { ScheduleClient } from './resource_clients/schedule';
-import { ScheduleCollectionClient } from './resource_clients/schedule_collection';
-import { StoreCollectionClient } from './resource_clients/store_collection';
-import { TaskClient } from './resource_clients/task';
-import { TaskCollectionClient } from './resource_clients/task_collection';
-import { UserClient } from './resource_clients/user';
-import { WebhookClient } from './resource_clients/webhook';
-import { WebhookCollectionClient } from './resource_clients/webhook_collection';
-import { WebhookDispatchClient } from './resource_clients/webhook_dispatch';
-import { WebhookDispatchCollectionClient } from './resource_clients/webhook_dispatch_collection';
-import { Statistics } from './statistics';
+import { HttpClient } from './http_client.js';
+import type { RequestInterceptorFunction } from './interceptors.js';
+import { ActorClient } from './resource_clients/actor.js';
+import { ActorCollectionClient } from './resource_clients/actor_collection.js';
+import { BuildClient } from './resource_clients/build.js';
+import { BuildCollectionClient } from './resource_clients/build_collection.js';
+import { DatasetClient } from './resource_clients/dataset.js';
+import { DatasetCollectionClient } from './resource_clients/dataset_collection.js';
+import { KeyValueStoreClient } from './resource_clients/key_value_store.js';
+import { KeyValueStoreCollectionClient } from './resource_clients/key_value_store_collection.js';
+import { LogClient } from './resource_clients/log.js';
+import type { RequestQueueUserOptions } from './resource_clients/request_queue.js';
+import { RequestQueueClient } from './resource_clients/request_queue.js';
+import { RequestQueueCollectionClient } from './resource_clients/request_queue_collection.js';
+import { RunClient } from './resource_clients/run.js';
+import { RunCollectionClient } from './resource_clients/run_collection.js';
+import { ScheduleClient } from './resource_clients/schedule.js';
+import { ScheduleCollectionClient } from './resource_clients/schedule_collection.js';
+import { StoreCollectionClient } from './resource_clients/store_collection.js';
+import { TaskClient } from './resource_clients/task.js';
+import { TaskCollectionClient } from './resource_clients/task_collection.js';
+import { UserClient } from './resource_clients/user.js';
+import { WebhookClient } from './resource_clients/webhook.js';
+import { WebhookCollectionClient } from './resource_clients/webhook_collection.js';
+import { WebhookDispatchClient } from './resource_clients/webhook_dispatch.js';
+import { WebhookDispatchCollectionClient } from './resource_clients/webhook_dispatch_collection.js';
+import { Statistics } from './statistics.js';
 /**
  * The official JavaScript client for the Apify API.
  *

package/dist/apify_client.js

@@ -1,51 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApifyClient = void 0;
-const tslib_1 = require("tslib");
-const zod_1 = require("zod");
-const consts_1 = require("@apify/consts");
-const log_1 = tslib_1.__importDefault(require("@apify/log"));
-const http_client_1 = require("./http_client");
-const actor_1 = require("./resource_clients/actor");
-const actor_collection_1 = require("./resource_clients/actor_collection");
-const build_1 = require("./resource_clients/build");
-const build_collection_1 = require("./resource_clients/build_collection");
-const dataset_1 = require("./resource_clients/dataset");
-const dataset_collection_1 = require("./resource_clients/dataset_collection");
-const key_value_store_1 = require("./resource_clients/key_value_store");
-const key_value_store_collection_1 = require("./resource_clients/key_value_store_collection");
-const log_2 = require("./resource_clients/log");
-const request_queue_1 = require("./resource_clients/request_queue");
-const request_queue_collection_1 = require("./resource_clients/request_queue_collection");
-const run_1 = require("./resource_clients/run");
-const run_collection_1 = require("./resource_clients/run_collection");
-const schedule_1 = require("./resource_clients/schedule");
-const schedule_collection_1 = require("./resource_clients/schedule_collection");
-const store_collection_1 = require("./resource_clients/store_collection");
-const task_1 = require("./resource_clients/task");
-const task_collection_1 = require("./resource_clients/task_collection");
-const user_1 = require("./resource_clients/user");
-const webhook_1 = require("./resource_clients/webhook");
-const webhook_collection_1 = require("./resource_clients/webhook_collection");
-const webhook_dispatch_1 = require("./resource_clients/webhook_dispatch");
-const webhook_dispatch_collection_1 = require("./resource_clients/webhook_dispatch_collection");
-const statistics_1 = require("./statistics");
-const utils_1 = require("./utils");
+import { z } from 'zod';
+import { ACTOR_ENV_VARS, ME_USER_NAME_PLACEHOLDER } from '@apify/consts';
+import logger from '@apify/log';
+import { HttpClient } from './http_client.js';
+import { ActorClient } from './resource_clients/actor.js';
+import { ActorCollectionClient } from './resource_clients/actor_collection.js';
+import { BuildClient } from './resource_clients/build.js';
+import { BuildCollectionClient } from './resource_clients/build_collection.js';
+import { DatasetClient } from './resource_clients/dataset.js';
+import { DatasetCollectionClient } from './resource_clients/dataset_collection.js';
+import { KeyValueStoreClient } from './resource_clients/key_value_store.js';
+import { KeyValueStoreCollectionClient } from './resource_clients/key_value_store_collection.js';
+import { LogClient } from './resource_clients/log.js';
+import { RequestQueueClient } from './resource_clients/request_queue.js';
+import { RequestQueueCollectionClient } from './resource_clients/request_queue_collection.js';
+import { RunClient } from './resource_clients/run.js';
+import { RunCollectionClient } from './resource_clients/run_collection.js';
+import { ScheduleClient } from './resource_clients/schedule.js';
+import { ScheduleCollectionClient } from './resource_clients/schedule_collection.js';
+import { StoreCollectionClient } from './resource_clients/store_collection.js';
+import { TaskClient } from './resource_clients/task.js';
+import { TaskCollectionClient } from './resource_clients/task_collection.js';
+import { UserClient } from './resource_clients/user.js';
+import { WebhookClient } from './resource_clients/webhook.js';
+import { WebhookCollectionClient } from './resource_clients/webhook_collection.js';
+import { WebhookDispatchClient } from './resource_clients/webhook_dispatch.js';
+import { WebhookDispatchCollectionClient } from './resource_clients/webhook_dispatch_collection.js';
+import { Statistics } from './statistics.js';
+import { parseArgument } from './utils.js';
 const DEFAULT_TIMEOUT_SECS = 360;
-const clientOptionsSchema = zod_1.z.strictObject({
-    baseUrl: zod_1.z.string().default('https://api.apify.com'),
-    publicBaseUrl: zod_1.z.string().default('https://api.apify.com'),
-    maxRetries: zod_1.z.number().default(8),
-    minDelayBetweenRetriesMillis: zod_1.z.number().default(500),
-    requestInterceptors: zod_1.z.array(zod_1.z.unknown()).default([]),
-    timeoutSecs: zod_1.z.number().default(DEFAULT_TIMEOUT_SECS),
-    token: zod_1.z.string().optional(),
-    userAgentSuffix: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+const clientOptionsSchema = z.strictObject({
+    baseUrl: z.string().default('https://api.apify.com'),
+    publicBaseUrl: z.string().default('https://api.apify.com'),
+    maxRetries: z.number().default(8),
+    minDelayBetweenRetriesMillis: z.number().default(500),
+    requestInterceptors: z.array(z.unknown()).default([]),
+    timeoutSecs: z.number().default(DEFAULT_TIMEOUT_SECS),
+    token: z.string().optional(),
+    userAgentSuffix: z.union([z.string(), z.array(z.string())]).optional(),
 });
-const resourceIdSchema = zod_1.z.string().min(1);
-const requestQueueOptionsSchema = zod_1.z.strictObject({
-    clientKey: zod_1.z.string().min(1).optional(),
-    timeoutSecs: zod_1.z.number().optional(),
+const resourceIdSchema = z.string().min(1);
+const requestQueueOptionsSchema = z.strictObject({
+    clientKey: z.string().min(1).optional(),
+    timeoutSecs: z.number().optional(),
 });
 /**
  * The official JavaScript client for the Apify API.
@@ -68,7 +64,7 @@ const requestQueueOptionsSchema = zod_1.z.strictObject({
  *
  * @see https://docs.apify.com/api/v2
  */
-class ApifyClient {
+export class ApifyClient {
     baseUrl;
     /**
      * @since Added in 2.17.0
@@ -79,7 +75,7 @@ class ApifyClient {
     logger;
     httpClient;
     constructor(options = {}) {
-        const parsed = (0, utils_1.parseArgument)(options, clientOptionsSchema, 'ApifyClientOptions');
+        const parsed = parseArgument(options, clientOptionsSchema, 'ApifyClientOptions');
         const { baseUrl, publicBaseUrl, maxRetries, minDelayBetweenRetriesMillis, requestInterceptors, timeoutSecs, token, } = parsed;
         const tempBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, baseUrl.length - 1) : baseUrl;
         this.baseUrl = `${tempBaseUrl}/v2`;
@@ -88,9 +84,9 @@ class ApifyClient {
             : publicBaseUrl;
         this.publicBaseUrl = `${tempPublicBaseUrl}/v2`;
         this.token = token;
-        this.stats = new statistics_1.Statistics();
-        this.logger = log_1.default.child({ prefix: 'ApifyClient' });
-        this.httpClient = new http_client_1.HttpClient({
+        this.stats = new Statistics();
+        this.logger = logger.child({ prefix: 'ApifyClient' });
+        this.httpClient = new HttpClient({
             apifyClientStats: this.stats,
             maxRetries,
             minDelayBetweenRetriesMillis,
@@ -118,7 +114,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/acts-get
      */
     actors() {
-        return new actor_collection_1.ActorCollectionClient(this._options());
+        return new ActorCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific Actor.
@@ -137,8 +133,8 @@ class ApifyClient {
      * ```
      */
     actor(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new actor_1.ActorClient({
+        parseArgument(id, resourceIdSchema);
+        return new ActorClient({
             id,
             ...this._options(),
         });
@@ -152,7 +148,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/actor-builds-get
      */
     builds() {
-        return new build_collection_1.BuildCollectionClient(this._options());
+        return new BuildCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific Actor build.
@@ -164,8 +160,8 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/actor-build-get
      */
     build(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new build_1.BuildClient({
+        parseArgument(id, resourceIdSchema);
+        return new BuildClient({
             id,
             ...this._options(),
         });
@@ -179,7 +175,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/datasets-get
      */
     datasets() {
-        return new dataset_collection_1.DatasetCollectionClient(this._options());
+        return new DatasetCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific dataset.
@@ -205,8 +201,8 @@ class ApifyClient {
      * ```
      */
     dataset(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new dataset_1.DatasetClient({
+        parseArgument(id, resourceIdSchema);
+        return new DatasetClient({
             id,
             ...this._options(),
         });
@@ -220,7 +216,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/key-value-stores-get
      */
     keyValueStores() {
-        return new key_value_store_collection_1.KeyValueStoreCollectionClient(this._options());
+        return new KeyValueStoreCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific key-value store.
@@ -242,8 +238,8 @@ class ApifyClient {
      * ```
      */
     keyValueStore(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new key_value_store_1.KeyValueStoreClient({
+        parseArgument(id, resourceIdSchema);
+        return new KeyValueStoreClient({
             id,
             ...this._options(),
         });
@@ -256,8 +252,8 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/log-get
      */
     log(buildOrRunId) {
-        (0, utils_1.parseArgument)(buildOrRunId, resourceIdSchema);
-        return new log_2.LogClient({
+        parseArgument(buildOrRunId, resourceIdSchema);
+        return new LogClient({
             id: buildOrRunId,
             ...this._options(),
         });
@@ -271,7 +267,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/request-queues-get
      */
     requestQueues() {
-        return new request_queue_collection_1.RequestQueueCollectionClient(this._options());
+        return new RequestQueueCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific request queue.
@@ -295,13 +291,13 @@ class ApifyClient {
      * ```
      */
     requestQueue(id, options = {}) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        const parsed = (0, utils_1.parseArgument)(options, requestQueueOptionsSchema, 'RequestQueueUserOptions');
+        parseArgument(id, resourceIdSchema);
+        const parsed = parseArgument(options, requestQueueOptionsSchema, 'RequestQueueUserOptions');
         const apiClientOptions = {
             id,
             ...this._options(),
         };
-        return new request_queue_1.RequestQueueClient(apiClientOptions, parsed);
+        return new RequestQueueClient(apiClientOptions, parsed);
     }
     /**
      * Returns a client for managing Actor runs in your account.
@@ -312,7 +308,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/actor-runs-get
      */
     runs() {
-        return new run_collection_1.RunCollectionClient({
+        return new RunCollectionClient({
             ...this._options(),
             resourcePath: 'actor-runs',
         });
@@ -337,8 +333,8 @@ class ApifyClient {
      * ```
      */
     run(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new run_1.RunClient({
+        parseArgument(id, resourceIdSchema);
+        return new RunClient({
             id,
             ...this._options(),
         });
@@ -352,7 +348,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/actor-tasks-get
      */
     tasks() {
-        return new task_collection_1.TaskCollectionClient(this._options());
+        return new TaskCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific Actor task.
@@ -370,8 +366,8 @@ class ApifyClient {
      * ```
      */
     task(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new task_1.TaskClient({
+        parseArgument(id, resourceIdSchema);
+        return new TaskClient({
             id,
             ...this._options(),
         });
@@ -385,7 +381,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/schedules-get
      */
     schedules() {
-        return new schedule_collection_1.ScheduleCollectionClient(this._options());
+        return new ScheduleCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific schedule.
@@ -397,8 +393,8 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/schedule-get
      */
     schedule(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new schedule_1.ScheduleClient({
+        parseArgument(id, resourceIdSchema);
+        return new ScheduleClient({
             id,
             ...this._options(),
         });
@@ -412,9 +408,9 @@ class ApifyClient {
      * @returns A client for the user
      * @see https://docs.apify.com/api/v2/user-get
      */
-    user(id = consts_1.ME_USER_NAME_PLACEHOLDER) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new user_1.UserClient({
+    user(id = ME_USER_NAME_PLACEHOLDER) {
+        parseArgument(id, resourceIdSchema);
+        return new UserClient({
             id,
             ...this._options(),
         });
@@ -428,7 +424,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/webhooks-get
      */
     webhooks() {
-        return new webhook_collection_1.WebhookCollectionClient(this._options());
+        return new WebhookCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific webhook.
@@ -440,8 +436,8 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/webhook-get
      */
     webhook(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new webhook_1.WebhookClient({
+        parseArgument(id, resourceIdSchema);
+        return new WebhookClient({
             id,
             ...this._options(),
         });
@@ -455,7 +451,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/webhook-dispatches-get
      */
     webhookDispatches() {
-        return new webhook_dispatch_collection_1.WebhookDispatchCollectionClient(this._options());
+        return new WebhookDispatchCollectionClient(this._options());
     }
     /**
      * Returns a client for a specific webhook dispatch.
@@ -465,8 +461,8 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/webhook-dispatch-get
      */
     webhookDispatch(id) {
-        (0, utils_1.parseArgument)(id, resourceIdSchema);
-        return new webhook_dispatch_1.WebhookDispatchClient({
+        parseArgument(id, resourceIdSchema);
+        return new WebhookDispatchClient({
             id,
             ...this._options(),
         });
@@ -480,7 +476,7 @@ class ApifyClient {
      * @see https://docs.apify.com/api/v2/store-get
      */
     store() {
-        return new store_collection_1.StoreCollectionClient(this._options());
+        return new StoreCollectionClient(this._options());
     }
     /**
      * Sets a status message for the current Actor run.
@@ -494,9 +490,9 @@ class ApifyClient {
      * @since Added in 2.7.0
      */
     async setStatusMessage(message, options) {
-        const runId = process.env[consts_1.ACTOR_ENV_VARS.RUN_ID];
+        const runId = process.env[ACTOR_ENV_VARS.RUN_ID];
         if (!runId) {
-            throw new Error(`Environment variable ${consts_1.ACTOR_ENV_VARS.RUN_ID} is not set!`);
+            throw new Error(`Environment variable ${ACTOR_ENV_VARS.RUN_ID} is not set!`);
         }
         await this.run(runId).update({
             statusMessage: message,
@@ -504,4 +500,3 @@ class ApifyClient {
         });
     }
 }
-exports.ApifyClient = ApifyClient;

package/dist/base/api_client.d.ts

@@ -1,6 +1,6 @@
-import type { ApifyClient } from '../apify_client';
-import type { HttpClient } from '../http_client';
-import type { PaginatedResponse, PaginationOptions } from '../utils';
+import type { ApifyClient } from '../apify_client.js';
+import type { HttpClient } from '../http_client.js';
+import type { PaginatedResponse, PaginationOptions } from '../utils.js';
 /** @private */
 export interface ApiClientOptions {
     baseUrl: string;

package/dist/base/api_client.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiClient = void 0;
-const utils_1 = require("../utils");
+import { toPath, toPathSegment } from '../utils.js';
 /** @private */
-class ApiClient {
+export class ApiClient {
     id;
     safeId;
     baseUrl;
@@ -23,7 +20,7 @@ class ApiClient {
         this.baseUrl = baseUrl;
         this.publicBaseUrl = publicBaseUrl;
         this.resourcePath = resourcePath;
-        this.url = id ? `${baseUrl}/${resourcePath}/${(0, utils_1.toPathSegment)(this.safeId)}` : `${baseUrl}/${resourcePath}`;
+        this.url = id ? `${baseUrl}/${resourcePath}/${toPathSegment(this.safeId)}` : `${baseUrl}/${resourcePath}`;
         this.apifyClient = apifyClient;
         this.httpClient = httpClient;
         this.params = params;
@@ -39,13 +36,13 @@ class ApiClient {
         return { ...baseOptions, ...moreOptions };
     }
     _url(path) {
-        return path ? `${this.url}/${(0, utils_1.toPath)(path)}` : this.url;
+        return path ? `${this.url}/${toPath(path)}` : this.url;
     }
     _publicUrl(path) {
         const url = this.id
-            ? `${this.publicBaseUrl}/${this.resourcePath}/${(0, utils_1.toPathSegment)(this.safeId)}`
+            ? `${this.publicBaseUrl}/${this.resourcePath}/${toPathSegment(this.safeId)}`
             : `${this.publicBaseUrl}/${this.resourcePath}`;
-        return path ? `${url}/${(0, utils_1.toPath)(path)}` : url;
+        return path ? `${url}/${toPath(path)}` : url;
     }
     _params(endpointParams) {
         return { ...this.params, ...endpointParams };
@@ -101,4 +98,3 @@ class ApiClient {
         });
     }
 }
-exports.ApiClient = ApiClient;

package/dist/base/resource_client.d.ts

@@ -1,5 +1,5 @@
 import type { ACT_JOB_STATUSES } from '@apify/consts';
-import { ApiClient } from './api_client';
+import { ApiClient } from './api_client.js';
 export declare const SMALL_TIMEOUT_MILLIS: number;
 export declare const MEDIUM_TIMEOUT_MILLIS: number;
 export declare const DEFAULT_TIMEOUT_MILLIS: number;

package/dist/base/resource_client.js

@@ -1,23 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceClient = exports.DEFAULT_TIMEOUT_MILLIS = exports.MEDIUM_TIMEOUT_MILLIS = exports.SMALL_TIMEOUT_MILLIS = void 0;
-const consts_1 = require("@apify/consts");
-const utils_1 = require("../utils");
-const api_client_1 = require("./api_client");
+import { ACT_JOB_TERMINAL_STATUSES } from '@apify/consts';
+import { catchNotFoundOrThrow, parseDateFields, pluckData } from '../utils.js';
+import { ApiClient } from './api_client.js';
 /**
  * We need to supply some number for the API,
  * because it would not accept "Infinity".
  * 999999 seconds is more than 10 days.
  */
 const MAX_WAIT_FOR_FINISH = 999999;
-exports.SMALL_TIMEOUT_MILLIS = 5 * 1000; // For fast and common actions. Suitable for idempotent actions.
-exports.MEDIUM_TIMEOUT_MILLIS = 30 * 1000; // For actions that may take longer.
-exports.DEFAULT_TIMEOUT_MILLIS = 360 * 1000; // 6 minutes
+export const SMALL_TIMEOUT_MILLIS = 5 * 1000; // For fast and common actions. Suitable for idempotent actions.
+export const MEDIUM_TIMEOUT_MILLIS = 30 * 1000; // For actions that may take longer.
+export const DEFAULT_TIMEOUT_MILLIS = 360 * 1000; // 6 minutes
 /**
  * Resource client.
  * @private
  */
-class ResourceClient extends api_client_1.ApiClient {
+export class ResourceClient extends ApiClient {
     async _get(options = {}, timeoutMillis) {
         const requestOpts = {
             url: this._url(),
@@ -27,10 +24,10 @@ class ResourceClient extends api_client_1.ApiClient {
         };
         try {
             const response = await this.httpClient.call(requestOpts);
-            return (0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data));
+            return parseDateFields(pluckData(response.data));
         }
         catch (err) {
-            (0, utils_1.catchNotFoundOrThrow)(err);
+            catchNotFoundOrThrow(err);
         }
         return undefined;
     }
@@ -42,7 +39,7 @@ class ResourceClient extends api_client_1.ApiClient {
             data: newFields,
             timeout: timeoutMillis,
         });
-        return (0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data));
+        return parseDateFields(pluckData(response.data));
     }
     async _delete(timeoutMillis) {
         try {
@@ -54,7 +51,7 @@ class ResourceClient extends api_client_1.ApiClient {
             });
         }
         catch (err) {
-            (0, utils_1.catchNotFoundOrThrow)(err);
+            catchNotFoundOrThrow(err);
         }
     }
     /**
@@ -70,7 +67,7 @@ class ResourceClient extends api_client_1.ApiClient {
             const millisSinceStart = Date.now() - startedAt;
             if (millisSinceStart >= waitMillis)
                 return false;
-            const hasJobEnded = job && consts_1.ACT_JOB_TERMINAL_STATUSES.includes(job.status);
+            const hasJobEnded = job && ACT_JOB_TERMINAL_STATUSES.includes(job.status);
             return !hasJobEnded;
         };
         do {
@@ -84,10 +81,10 @@ class ResourceClient extends api_client_1.ApiClient {
             };
             try {
                 const response = await this.httpClient.call(requestOpts);
-                job = (0, utils_1.parseDateFields)((0, utils_1.pluckData)(response.data));
+                job = parseDateFields(pluckData(response.data));
             }
             catch (err) {
-                (0, utils_1.catchNotFoundOrThrow)(err);
+                catchNotFoundOrThrow(err);
                 job = undefined;
             }
             // It might take some time for database replicas to get up-to-date,
@@ -105,4 +102,3 @@ class ResourceClient extends api_client_1.ApiClient {
         return job;
     }
 }
-exports.ResourceClient = ResourceClient;

package/dist/base/resource_collection_client.d.ts

@@ -1,5 +1,5 @@
-import type { PaginatedResponse, PaginationOptions } from '../utils';
-import { ApiClient } from './api_client';
+import type { PaginatedResponse, PaginationOptions } from '../utils.js';
+import { ApiClient } from './api_client.js';
 /**
  * Resource collection client.
  * @private