Skip to content

Commit

Permalink
chore: update lint rules
Browse files Browse the repository at this point in the history
  • Loading branch information
B4nan committed Feb 6, 2024
1 parent 15c0d29 commit 36afa69
Show file tree
Hide file tree
Showing 66 changed files with 361 additions and 236 deletions.
356 changes: 215 additions & 141 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"type-fest": "^4.0.0"
},
"devDependencies": {
"@apify/eslint-config-ts": "^0.3.0",
"@apify/eslint-config-ts": "^0.4.0",
"@apify/tsconfig": "^0.1.0",
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.0",
Expand Down
1 change: 1 addition & 0 deletions src/apify_api_error.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { AxiosResponse } from 'axios';

import { isomorphicBufferToString } from './body_parser';
import { isBuffer } from './utils';

Expand Down
11 changes: 5 additions & 6 deletions src/apify_client.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import ow from 'ow';
import { ME_USER_NAME_PLACEHOLDER, ACTOR_ENV_VARS } from '@apify/consts';
import logger, { Log } from '@apify/log';

import { SetStatusMessageOptions } from '@crawlee/types';
import ow from 'ow';

import { HttpClient } from './http_client';
import { Statistics } from './statistics';
import { RequestInterceptorFunction } from './interceptors';

import { ActorClient } from './resource_clients/actor';
import { ActorCollectionClient } from './resource_clients/actor_collection';
import { BuildClient } from './resource_clients/build';
Expand All @@ -22,14 +20,15 @@ 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 { StoreCollectionClient } from './resource_clients/store_collection';
import { Statistics } from './statistics';

/**
* ApifyClient is the official library to access [Apify API](https://docs.apify.com/api/v2) from your
Expand Down Expand Up @@ -139,7 +138,7 @@ export class ApifyClient {
* https://docs.apify.com/api/v2#/reference/datasets/dataset
*/
dataset<
Data extends Record<string | number, any> = Record<string | number, unknown>
Data extends Record<string | number, any> = Record<string | number, unknown>,
>(id: string): DatasetClient<Data> {
ow(id, ow.string.nonEmpty);

Expand Down
7 changes: 4 additions & 3 deletions src/base/resource_client.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { ACT_JOB_STATUSES, ACT_JOB_TERMINAL_STATUSES } from '@apify/consts';

import { ApiClient } from './api_client';
import { ApifyApiError } from '../apify_api_error';
import { ApifyRequestConfig } from '../http_client';
import {
pluckData,
parseDateFields,
catchNotFoundOrThrow,
} from '../utils';
import { ApifyApiError } from '../apify_api_error';
import { ApifyRequestConfig } from '../http_client';

/**
* We need to supply some number for the API,
Expand Down Expand Up @@ -63,7 +64,7 @@ export class ResourceClient extends ApiClient {
* here to stay DRY.
*/
protected async _waitForFinish<
R extends { status: typeof ACT_JOB_STATUSES[keyof typeof ACT_JOB_STATUSES]; }
R extends { status: typeof ACT_JOB_STATUSES[keyof typeof ACT_JOB_STATUSES]; },
>(options: WaitForFinishOptions = {}): Promise<R> {
const {
waitSecs = MAX_WAIT_FOR_FINISH,
Expand Down
1 change: 1 addition & 0 deletions src/body_parser.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import contentTypeParser from 'content-type';
import { JsonArray, JsonObject } from 'type-fest';

import { isNode } from './utils';

const CONTENT_TYPE_JSON = 'application/json';
Expand Down
10 changes: 6 additions & 4 deletions src/http_client.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import os from 'os';
import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import retry, { RetryFunction } from 'async-retry';
import KeepAliveAgent from 'agentkeepalive';

import { APIFY_ENV_VARS } from '@apify/consts';
import { Log } from '@apify/log';
import KeepAliveAgent from 'agentkeepalive';
import retry, { RetryFunction } from 'async-retry';
import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';

import { ApifyApiError } from './apify_api_error';
import {
InvalidResponseBodyError,
RequestInterceptorFunction,
requestInterceptors,
responseInterceptors,
} from './interceptors';
import { Statistics } from './statistics';
import {
isNode,
getVersionData,
cast,
isStream,
} from './utils';
import { Statistics } from './statistics';

const { version } = getVersionData();

Expand Down
1 change: 1 addition & 0 deletions src/interceptors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import axios, { AxiosInterceptorManager, AxiosResponse, AxiosTransformer } from 'axios';
import contentTypeParser from 'content-type';
import { JsonObject } from 'type-fest';

import { maybeParseBody } from './body_parser';
import { ApifyRequestConfig, ApifyResponse } from './http_client';
import {
Expand Down
17 changes: 9 additions & 8 deletions src/resource_clients/actor.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import { ACT_JOB_STATUSES, META_ORIGINS } from '@apify/consts';
import { AxiosRequestConfig } from 'axios';
import ow from 'ow';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import {
cast,
parseDateFields,
pluckData,
stringifyWebhooksToBase64,
} from '../utils';

import { ActorVersion, ActorVersionClient } from './actor_version';
import { ActorVersionCollectionClient } from './actor_version_collection';
import { Build } from './build';
Expand All @@ -17,6 +10,14 @@ import { RunClient } from './run';
import { RunCollectionClient } from './run_collection';
import { WebhookUpdateData } from './webhook';
import { WebhookCollectionClient } from './webhook_collection';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import {
cast,
parseDateFields,
pluckData,
stringifyWebhooksToBase64,
} from '../utils';

export class ActorClient extends ResourceClient {
/**
Expand Down
5 changes: 3 additions & 2 deletions src/resource_clients/actor_collection.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import ow from 'ow';

import { Actor, ActorDefaultRunOptions, ActorExampleRunInput } from './actor';
import { ActorVersion } from './actor_version';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { Actor, ActorDefaultRunOptions, ActorExampleRunInput } from './actor';
import { ActorVersion } from './actor_version';

export class ActorCollectionClient extends ResourceCollectionClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/actor_env_var.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import ow from 'ow';

import { ActorEnvironmentVariable } from './actor_version';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import { ActorEnvironmentVariable } from './actor_version';

export class ActorEnvVarClient extends ResourceClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/actor_env_var_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { ActorEnvironmentVariable } from './actor_version';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { ActorEnvironmentVariable } from './actor_version';

export class ActorEnvVarCollectionClient extends ResourceCollectionClient {
/**
Expand Down
5 changes: 3 additions & 2 deletions src/resource_clients/actor_version.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';

import { ActorEnvVarClient } from './actor_env_var';
import { ActorEnvVarCollectionClient } from './actor_env_var_collection';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';

export class ActorVersionClient extends ResourceClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/actor_version_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { ActorVersion, FinalActorVersion } from './actor_version';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { ActorVersion, FinalActorVersion } from './actor_version';

export class ActorVersionCollectionClient extends ResourceCollectionClient {
/**
Expand Down
1 change: 1 addition & 0 deletions src/resource_clients/build.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ACT_JOB_TERMINAL_STATUSES } from '@apify/consts';
import ow from 'ow';

import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import {
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/build_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { Build } from './build';
import { ApiClientOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { Build } from './build';

export class BuildCollectionClient extends ResourceCollectionClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/dataset.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import ow from 'ow';

import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import { ApifyResponse } from '../http_client';
import { cast, PaginatedList } from '../utils';

export class DatasetClient<
Data extends Record<string | number, any> = Record<string | number, unknown>
Data extends Record<string | number, any> = Record<string | number, unknown>,
> extends ResourceClient {
/**
* @hidden
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/dataset_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { Dataset } from './dataset';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { Dataset } from './dataset';

export class DatasetCollectionClient extends ResourceCollectionClient {
/**
Expand Down
4 changes: 3 additions & 1 deletion src/resource_clients/key_value_store.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { Readable } from 'node:stream';

import log from '@apify/log';
import ow from 'ow';
import { JsonValue } from 'type-fest';
import type { Readable } from 'node:stream';

import { ApifyApiError } from '../apify_api_error';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/key_value_store_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { KeyValueStore } from './key_value_store';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { KeyValueStore } from './key_value_store';

export class KeyValueStoreCollectionClient extends ResourceCollectionClient {
/**
Expand Down
1 change: 1 addition & 0 deletions src/resource_clients/log.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Readable } from 'node:stream';

import { ApifyApiError } from '../apify_api_error';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/request_queue.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import log from '@apify/log';
import { MAX_PAYLOAD_SIZE_BYTES, REQUEST_QUEUE_MAX_REQUESTS_PER_BATCH_OPERATION } from '@apify/consts';
import log from '@apify/log';
import ow from 'ow';
import type { JsonObject } from 'type-fest';

import { ApifyApiError } from '../apify_api_error';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/request_queue_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { RequestQueue } from './request_queue';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { RequestQueue } from './request_queue';

export class RequestQueueCollectionClient extends ResourceCollectionClient {
/**
Expand Down
9 changes: 5 additions & 4 deletions src/resource_clients/run.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import ow from 'ow';
import { AxiosRequestConfig } from 'axios';
import { ResourceClient } from '../base/resource_client';
import ow from 'ow';

import { ActorRun } from './actor';
import { DatasetClient } from './dataset';
import { KeyValueStoreClient } from './key_value_store';
import { LogClient } from './log';
import { RequestQueueClient } from './request_queue';
import { ApiClientOptionsWithOptionalResourcePath } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
import {
pluckData,
parseDateFields,
cast,
} from '../utils';
import { ApiClientOptionsWithOptionalResourcePath } from '../base/api_client';
import { ActorRun } from './actor';

export class RunClient extends ResourceClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/run_collection.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { ACT_JOB_STATUSES } from '@apify/consts';
import ow from 'ow';

import { ActorRunListItem } from './actor';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { ActorRunListItem } from './actor';

export class RunCollectionClient extends ResourceCollectionClient {
/**
Expand Down
1 change: 1 addition & 0 deletions src/resource_clients/schedule.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import ow from 'ow';

import { ApifyApiError } from '../apify_api_error';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/schedule_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { Schedule, ScheduleCreateOrUpdateData } from './schedule';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { Schedule, ScheduleCreateOrUpdateData } from './schedule';

export class ScheduleCollectionClient extends ResourceCollectionClient {
/**
Expand Down
3 changes: 2 additions & 1 deletion src/resource_clients/store_collection.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import ow from 'ow';

import { ActorStats } from './actor';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceCollectionClient } from '../base/resource_collection_client';
import { PaginatedList } from '../utils';
import { ActorStats } from './actor';

export class StoreCollectionClient extends ResourceCollectionClient {
/**
Expand Down
9 changes: 5 additions & 4 deletions src/resource_clients/task.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { ACT_JOB_STATUSES, META_ORIGINS } from '@apify/consts';
import ow from 'ow';

import { ActorRun, ActorStartOptions } from './actor';
import { RunClient } from './run';
import { RunCollectionClient } from './run_collection';
import { WebhookCollectionClient } from './webhook_collection';
import { ApifyApiError } from '../apify_api_error';
import { ApiClientSubResourceOptions } from '../base/api_client';
import { ResourceClient } from '../base/resource_client';
Expand All @@ -12,10 +17,6 @@ import {
pluckData,
stringifyWebhooksToBase64,
} from '../utils';
import { ActorRun, ActorStartOptions } from './actor';
import { RunClient } from './run';
import { RunCollectionClient } from './run_collection';
import { WebhookCollectionClient } from './webhook_collection';

export class TaskClient extends ResourceClient {
/**
Expand Down
Loading

0 comments on commit 36afa69

Please sign in to comment.