From 36afa69c5d90a6d54af40a6492729cbcce2b05d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ad=C3=A1mek?= Date: Tue, 6 Feb 2024 14:41:12 +0100 Subject: [PATCH] chore: update lint rules --- package-lock.json | 356 +++++++++++------- package.json | 2 +- src/apify_api_error.ts | 1 + src/apify_client.ts | 11 +- src/base/resource_client.ts | 7 +- src/body_parser.ts | 1 + src/http_client.ts | 10 +- src/interceptors.ts | 1 + src/resource_clients/actor.ts | 17 +- src/resource_clients/actor_collection.ts | 5 +- src/resource_clients/actor_env_var.ts | 3 +- .../actor_env_var_collection.ts | 3 +- src/resource_clients/actor_version.ts | 5 +- .../actor_version_collection.ts | 3 +- src/resource_clients/build.ts | 1 + src/resource_clients/build_collection.ts | 3 +- src/resource_clients/dataset.ts | 3 +- src/resource_clients/dataset_collection.ts | 3 +- src/resource_clients/key_value_store.ts | 4 +- .../key_value_store_collection.ts | 3 +- src/resource_clients/log.ts | 1 + src/resource_clients/request_queue.ts | 3 +- .../request_queue_collection.ts | 3 +- src/resource_clients/run.ts | 9 +- src/resource_clients/run_collection.ts | 3 +- src/resource_clients/schedule.ts | 1 + src/resource_clients/schedule_collection.ts | 3 +- src/resource_clients/store_collection.ts | 3 +- src/resource_clients/task.ts | 9 +- src/resource_clients/task_collection.ts | 3 +- src/resource_clients/webhook.ts | 11 +- src/resource_clients/webhook_collection.ts | 3 +- src/resource_clients/webhook_dispatch.ts | 2 +- .../webhook_dispatch_collection.ts | 3 +- src/utils.ts | 6 +- test/_helper.js | 1 + test/actors.test.js | 4 +- test/apify_api_error.test.js | 2 +- test/builds.test.js | 4 +- test/datasets.test.js | 4 +- test/http_client.test.js | 4 +- test/key_value_stores.test.js | 5 +- test/logs.test.js | 4 +- test/mock_server/routes/actors.js | 1 + test/mock_server/routes/builds.js | 1 + test/mock_server/routes/datasets.js | 1 + test/mock_server/routes/external.js | 1 + test/mock_server/routes/key_value_stores.js | 1 + test/mock_server/routes/logs.js | 1 + test/mock_server/routes/request_queues.js | 1 + test/mock_server/routes/runs.js | 1 + test/mock_server/routes/schedules.js | 1 + test/mock_server/routes/store.ts | 1 + test/mock_server/routes/tasks.js | 1 + test/mock_server/routes/users.js | 1 + test/mock_server/routes/webhook_dispatches.js | 1 + test/mock_server/routes/webhooks.js | 1 + test/mock_server/server.js | 19 +- test/request_queues.test.js | 4 +- test/runs.test.js | 4 +- test/schedules.test.js | 4 +- test/store.test.ts | 2 +- test/tasks.test.js | 4 +- test/users.test.js | 5 +- test/webhook_dispatches.test.js | 4 +- test/webhooks.test.js | 4 +- 66 files changed, 361 insertions(+), 236 deletions(-) diff --git a/package-lock.json b/package-lock.json index 985ceb85..8df3ca6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "apify-client", - "version": "2.8.6", + "version": "2.8.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "apify-client", - "version": "2.8.6", + "version": "2.8.7", "license": "Apache-2.0", "dependencies": { "@apify/consts": "^2.25.0", @@ -21,7 +21,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", @@ -90,9 +90,9 @@ "dev": true }, "node_modules/@apify/eslint-config": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@apify/eslint-config/-/eslint-config-0.3.4.tgz", - "integrity": "sha512-OAo1daRVA0TXtEbDEuM3q2A9muPOJuC0VI9YiBXrRYMMrhWBzUlY22xTYAqEUzjgjz+aqVWOEy+z5EkBjmc6Uw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@apify/eslint-config/-/eslint-config-0.4.0.tgz", + "integrity": "sha512-cXYQUstZ5wjIQMX9HM9GOg8+s0lWp9xF7Zee8bCl5QAkNJs5gKtCsKStv7v6A2hexUZ+N5HAEN2MFex9IIw2/g==", "dev": true, "dependencies": { "eslint-config-airbnb": "^19.0.0", @@ -108,16 +108,16 @@ } }, "node_modules/@apify/eslint-config-ts": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@apify/eslint-config-ts/-/eslint-config-ts-0.3.0.tgz", - "integrity": "sha512-yl2dVGdYe7TH+ApXHx5nb+Fd9NiuMOgZDH4u1s4hTe21K6LmqxWQtPAZZ1BjaUZMa/R+dl2Osfr30myLo0mKsQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@apify/eslint-config-ts/-/eslint-config-ts-0.4.1.tgz", + "integrity": "sha512-dN+SZFtawthQ9H6qZIWBEG2Lc2/u7m7E1+0EpW6UtYcGeSWJXaEzVjeu+0m/LGiPBpJ5Kjn5pzJrY8jbhuW71w==", "dev": true, "dependencies": { - "@apify/eslint-config": "^0.3.3", - "eslint-import-resolver-typescript": "^3.5.5", - "eslint-plugin-import": "^2.27.5", + "@apify/eslint-config": "^0.4.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.0", "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0" }, "peerDependencies": { @@ -4509,13 +4509,16 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4555,17 +4558,36 @@ "node": ">=8" } }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "node_modules/array.prototype.filter": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", + "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", + "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -4611,30 +4633,31 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", - "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -6380,6 +6403,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-iterator-helpers": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", @@ -7805,16 +7843,20 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7841,13 +7883,13 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.1.tgz", + "integrity": "sha512-KmuibvwbWaM4BHcBRYwJfZ1JxyJeBwB8ct9YYu67SvYdbEIlcQ2e56dHxfbobqW38GXo8/zDFqJeGtHiVbWyQw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -8536,12 +8578,12 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -8574,14 +8616,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11476,15 +11520,16 @@ } }, "node_modules/object.groupby": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", + "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1" + "array.prototype.filter": "^1.0.3", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0" } }, "node_modules/object.hasown": { @@ -12318,15 +12363,16 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", - "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", + "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0", + "get-intrinsic": "^1.2.3", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -14717,9 +14763,9 @@ "dev": true }, "@apify/eslint-config": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@apify/eslint-config/-/eslint-config-0.3.4.tgz", - "integrity": "sha512-OAo1daRVA0TXtEbDEuM3q2A9muPOJuC0VI9YiBXrRYMMrhWBzUlY22xTYAqEUzjgjz+aqVWOEy+z5EkBjmc6Uw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@apify/eslint-config/-/eslint-config-0.4.0.tgz", + "integrity": "sha512-cXYQUstZ5wjIQMX9HM9GOg8+s0lWp9xF7Zee8bCl5QAkNJs5gKtCsKStv7v6A2hexUZ+N5HAEN2MFex9IIw2/g==", "dev": true, "requires": { "eslint-config-airbnb": "^19.0.0", @@ -14747,16 +14793,16 @@ } }, "@apify/eslint-config-ts": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@apify/eslint-config-ts/-/eslint-config-ts-0.3.0.tgz", - "integrity": "sha512-yl2dVGdYe7TH+ApXHx5nb+Fd9NiuMOgZDH4u1s4hTe21K6LmqxWQtPAZZ1BjaUZMa/R+dl2Osfr30myLo0mKsQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@apify/eslint-config-ts/-/eslint-config-ts-0.4.1.tgz", + "integrity": "sha512-dN+SZFtawthQ9H6qZIWBEG2Lc2/u7m7E1+0EpW6UtYcGeSWJXaEzVjeu+0m/LGiPBpJ5Kjn5pzJrY8jbhuW71w==", "dev": true, "requires": { - "@apify/eslint-config": "^0.3.3", - "eslint-import-resolver-typescript": "^3.5.5", - "eslint-plugin-import": "^2.27.5", + "@apify/eslint-config": "^0.4.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.0", "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0" } }, @@ -18005,13 +18051,13 @@ } }, "array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" } }, "array-flatten": { @@ -18039,17 +18085,30 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "array.prototype.findlastindex": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "array.prototype.filter": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", + "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + } + }, + "array.prototype.findlastindex": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", + "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" } }, "array.prototype.flat": { @@ -18077,30 +18136,31 @@ } }, "array.prototype.tosorted": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", - "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" } }, "arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, "requires": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" } }, @@ -19362,6 +19422,18 @@ "which-typed-array": "^1.1.13" } }, + "es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true + }, "es-iterator-helpers": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", @@ -20438,11 +20510,12 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, "requires": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", @@ -20462,13 +20535,13 @@ "dev": true }, "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.1.tgz", + "integrity": "sha512-KmuibvwbWaM4BHcBRYwJfZ1JxyJeBwB8ct9YYu67SvYdbEIlcQ2e56dHxfbobqW38GXo8/zDFqJeGtHiVbWyQw==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0" } }, "get-tsconfig": { @@ -20966,12 +21039,12 @@ "dev": true }, "internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "requires": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" } @@ -20995,14 +21068,13 @@ "dev": true }, "is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" } }, "is-arrayish": { @@ -23121,15 +23193,16 @@ } }, "object.groupby": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", + "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1" + "array.prototype.filter": "^1.0.3", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0" } }, "object.hasown": { @@ -23750,15 +23823,16 @@ } }, "reflect.getprototypeof": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", - "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", + "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0", + "get-intrinsic": "^1.2.3", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" } diff --git a/package.json b/package.json index 4d78abdb..773c0e24 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/apify_api_error.ts b/src/apify_api_error.ts index 90718e87..5f16c5b7 100644 --- a/src/apify_api_error.ts +++ b/src/apify_api_error.ts @@ -1,4 +1,5 @@ import { AxiosResponse } from 'axios'; + import { isomorphicBufferToString } from './body_parser'; import { isBuffer } from './utils'; diff --git a/src/apify_client.ts b/src/apify_client.ts index 090f9abb..1e18adaa 100644 --- a/src/apify_client.ts +++ b/src/apify_client.ts @@ -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'; @@ -22,6 +20,7 @@ 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'; @@ -29,7 +28,7 @@ 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 @@ -139,7 +138,7 @@ export class ApifyClient { * https://docs.apify.com/api/v2#/reference/datasets/dataset */ dataset< - Data extends Record = Record + Data extends Record = Record, >(id: string): DatasetClient { ow(id, ow.string.nonEmpty); diff --git a/src/base/resource_client.ts b/src/base/resource_client.ts index c3968c63..46d706f8 100644 --- a/src/base/resource_client.ts +++ b/src/base/resource_client.ts @@ -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, @@ -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 { const { waitSecs = MAX_WAIT_FOR_FINISH, diff --git a/src/body_parser.ts b/src/body_parser.ts index 1e754b64..b3d5d4aa 100644 --- a/src/body_parser.ts +++ b/src/body_parser.ts @@ -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'; diff --git a/src/http_client.ts b/src/http_client.ts index 0d0ac24e..b18bc5da 100644 --- a/src/http_client.ts +++ b/src/http_client.ts @@ -1,9 +1,11 @@ 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, @@ -11,13 +13,13 @@ import { requestInterceptors, responseInterceptors, } from './interceptors'; +import { Statistics } from './statistics'; import { isNode, getVersionData, cast, isStream, } from './utils'; -import { Statistics } from './statistics'; const { version } = getVersionData(); diff --git a/src/interceptors.ts b/src/interceptors.ts index 37c9168e..23677110 100644 --- a/src/interceptors.ts +++ b/src/interceptors.ts @@ -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 { diff --git a/src/resource_clients/actor.ts b/src/resource_clients/actor.ts index 4b5598d4..256a0347 100644 --- a/src/resource_clients/actor.ts +++ b/src/resource_clients/actor.ts @@ -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'; @@ -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 { /** diff --git a/src/resource_clients/actor_collection.ts b/src/resource_clients/actor_collection.ts index a5b85e62..ddb50903 100644 --- a/src/resource_clients/actor_collection.ts +++ b/src/resource_clients/actor_collection.ts @@ -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 { /** diff --git a/src/resource_clients/actor_env_var.ts b/src/resource_clients/actor_env_var.ts index 4b306e70..6823f98f 100644 --- a/src/resource_clients/actor_env_var.ts +++ b/src/resource_clients/actor_env_var.ts @@ -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 { /** diff --git a/src/resource_clients/actor_env_var_collection.ts b/src/resource_clients/actor_env_var_collection.ts index 729562c4..db01ac68 100644 --- a/src/resource_clients/actor_env_var_collection.ts +++ b/src/resource_clients/actor_env_var_collection.ts @@ -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 { /** diff --git a/src/resource_clients/actor_version.ts b/src/resource_clients/actor_version.ts index 6327833d..1f2e01e8 100644 --- a/src/resource_clients/actor_version.ts +++ b/src/resource_clients/actor_version.ts @@ -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 { /** diff --git a/src/resource_clients/actor_version_collection.ts b/src/resource_clients/actor_version_collection.ts index dd76194d..90641727 100644 --- a/src/resource_clients/actor_version_collection.ts +++ b/src/resource_clients/actor_version_collection.ts @@ -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 { /** diff --git a/src/resource_clients/build.ts b/src/resource_clients/build.ts index b935b6f5..9f85726e 100644 --- a/src/resource_clients/build.ts +++ b/src/resource_clients/build.ts @@ -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 { diff --git a/src/resource_clients/build_collection.ts b/src/resource_clients/build_collection.ts index dfbd136c..b56cd0f9 100644 --- a/src/resource_clients/build_collection.ts +++ b/src/resource_clients/build_collection.ts @@ -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 { /** diff --git a/src/resource_clients/dataset.ts b/src/resource_clients/dataset.ts index 13c306f6..8c7c9e57 100644 --- a/src/resource_clients/dataset.ts +++ b/src/resource_clients/dataset.ts @@ -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 = Record + Data extends Record = Record, > extends ResourceClient { /** * @hidden diff --git a/src/resource_clients/dataset_collection.ts b/src/resource_clients/dataset_collection.ts index 8ebd8b0f..adf80aa1 100644 --- a/src/resource_clients/dataset_collection.ts +++ b/src/resource_clients/dataset_collection.ts @@ -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 { /** diff --git a/src/resource_clients/key_value_store.ts b/src/resource_clients/key_value_store.ts index c20870fa..2ecaddfa 100644 --- a/src/resource_clients/key_value_store.ts +++ b/src/resource_clients/key_value_store.ts @@ -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'; diff --git a/src/resource_clients/key_value_store_collection.ts b/src/resource_clients/key_value_store_collection.ts index 921d9dad..71cb3b1d 100644 --- a/src/resource_clients/key_value_store_collection.ts +++ b/src/resource_clients/key_value_store_collection.ts @@ -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 { /** diff --git a/src/resource_clients/log.ts b/src/resource_clients/log.ts index 9c040b21..650ba3cc 100644 --- a/src/resource_clients/log.ts +++ b/src/resource_clients/log.ts @@ -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'; diff --git a/src/resource_clients/request_queue.ts b/src/resource_clients/request_queue.ts index 1f000c2c..d0e3f872 100644 --- a/src/resource_clients/request_queue.ts +++ b/src/resource_clients/request_queue.ts @@ -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'; diff --git a/src/resource_clients/request_queue_collection.ts b/src/resource_clients/request_queue_collection.ts index 0bb15cf6..842e61bd 100644 --- a/src/resource_clients/request_queue_collection.ts +++ b/src/resource_clients/request_queue_collection.ts @@ -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 { /** diff --git a/src/resource_clients/run.ts b/src/resource_clients/run.ts index 9d1a8957..90ee493b 100644 --- a/src/resource_clients/run.ts +++ b/src/resource_clients/run.ts @@ -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 { /** diff --git a/src/resource_clients/run_collection.ts b/src/resource_clients/run_collection.ts index cfeab0ff..c4484d69 100644 --- a/src/resource_clients/run_collection.ts +++ b/src/resource_clients/run_collection.ts @@ -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 { /** diff --git a/src/resource_clients/schedule.ts b/src/resource_clients/schedule.ts index d25f403f..52ab6aca 100644 --- a/src/resource_clients/schedule.ts +++ b/src/resource_clients/schedule.ts @@ -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'; diff --git a/src/resource_clients/schedule_collection.ts b/src/resource_clients/schedule_collection.ts index a300d88c..f3efa6ad 100644 --- a/src/resource_clients/schedule_collection.ts +++ b/src/resource_clients/schedule_collection.ts @@ -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 { /** diff --git a/src/resource_clients/store_collection.ts b/src/resource_clients/store_collection.ts index 7a39b4d2..fc66d73b 100644 --- a/src/resource_clients/store_collection.ts +++ b/src/resource_clients/store_collection.ts @@ -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 { /** diff --git a/src/resource_clients/task.ts b/src/resource_clients/task.ts index 5f2c88d3..86dfc19f 100644 --- a/src/resource_clients/task.ts +++ b/src/resource_clients/task.ts @@ -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'; @@ -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 { /** diff --git a/src/resource_clients/task_collection.ts b/src/resource_clients/task_collection.ts index d30c8a1c..bb066b8d 100644 --- a/src/resource_clients/task_collection.ts +++ b/src/resource_clients/task_collection.ts @@ -1,8 +1,9 @@ import ow from 'ow'; + +import { Task, TaskUpdateData } from './task'; import { ApiClientSubResourceOptions } from '../base/api_client'; import { ResourceCollectionClient } from '../base/resource_collection_client'; import { PaginatedList } from '../utils'; -import { Task, TaskUpdateData } from './task'; export class TaskCollectionClient extends ResourceCollectionClient { /** diff --git a/src/resource_clients/webhook.ts b/src/resource_clients/webhook.ts index cc56082e..c95b8f79 100644 --- a/src/resource_clients/webhook.ts +++ b/src/resource_clients/webhook.ts @@ -1,17 +1,18 @@ import { WEBHOOK_EVENT_TYPES } from '@apify/consts'; import ow from 'ow'; -import { ResourceClient } from '../base/resource_client'; + +import { WebhookDispatch } from './webhook_dispatch'; import { WebhookDispatchCollectionClient } from './webhook_dispatch_collection'; +import { ApifyApiError } from '../apify_api_error'; +import { ApiClientSubResourceOptions } from '../base/api_client'; +import { ResourceClient } from '../base/resource_client'; +import { ApifyRequestConfig } from '../http_client'; import { pluckData, parseDateFields, catchNotFoundOrThrow, cast, } from '../utils'; -import { ApiClientSubResourceOptions } from '../base/api_client'; -import { ApifyApiError } from '../apify_api_error'; -import { WebhookDispatch } from './webhook_dispatch'; -import { ApifyRequestConfig } from '../http_client'; export class WebhookClient extends ResourceClient { /** diff --git a/src/resource_clients/webhook_collection.ts b/src/resource_clients/webhook_collection.ts index 9ecace78..3d1d1056 100644 --- a/src/resource_clients/webhook_collection.ts +++ b/src/resource_clients/webhook_collection.ts @@ -1,8 +1,9 @@ import ow from 'ow'; + +import { Webhook, WebhookUpdateData } from './webhook'; import { ApiClientSubResourceOptions } from '../base/api_client'; import { ResourceCollectionClient } from '../base/resource_collection_client'; import { PaginatedList } from '../utils'; -import { Webhook, WebhookUpdateData } from './webhook'; export class WebhookCollectionClient extends ResourceCollectionClient { /** diff --git a/src/resource_clients/webhook_dispatch.ts b/src/resource_clients/webhook_dispatch.ts index 71e92d41..a57d2666 100644 --- a/src/resource_clients/webhook_dispatch.ts +++ b/src/resource_clients/webhook_dispatch.ts @@ -1,6 +1,6 @@ +import { Webhook, WebhookEventType } from './webhook'; import { ApiClientSubResourceOptions } from '../base/api_client'; import { ResourceClient } from '../base/resource_client'; -import { Webhook, WebhookEventType } from './webhook'; export class WebhookDispatchClient extends ResourceClient { /** diff --git a/src/resource_clients/webhook_dispatch_collection.ts b/src/resource_clients/webhook_dispatch_collection.ts index 6c510226..fd733dae 100644 --- a/src/resource_clients/webhook_dispatch_collection.ts +++ b/src/resource_clients/webhook_dispatch_collection.ts @@ -1,8 +1,9 @@ import ow from 'ow'; + +import { WebhookDispatch } from './webhook_dispatch'; import { ApiClientSubResourceOptions } from '../base/api_client'; import { ResourceCollectionClient } from '../base/resource_collection_client'; import { PaginatedList } from '../utils'; -import { WebhookDispatch } from './webhook_dispatch'; export class WebhookDispatchCollectionClient extends ResourceCollectionClient { /** diff --git a/src/utils.ts b/src/utils.ts index bf3edc47..c01455a5 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,14 +1,16 @@ +import type { Readable } from 'node:stream'; import util from 'util'; import zlib from 'zlib'; + import ow from 'ow'; import type { TypedArray, JsonValue } from 'type-fest'; -import type { Readable } from 'node:stream'; + import { ApifyApiError } from './apify_api_error'; -import { WebhookUpdateData } from './resource_clients/webhook'; import { RequestQueueClientListRequestsOptions, RequestQueueClientListRequestsResult, } from './resource_clients/request_queue'; +import { WebhookUpdateData } from './resource_clients/webhook'; const PARSE_DATE_FIELDS_MAX_DEPTH = 3; // obj.data.someArrayField.[x].field const PARSE_DATE_FIELDS_KEY_SUFFIX = 'At'; diff --git a/test/_helper.js b/test/_helper.js index c68dc097..78e4dbfd 100644 --- a/test/_helper.js +++ b/test/_helper.js @@ -1,4 +1,5 @@ const { launchPuppeteer, puppeteerUtils } = require('@crawlee/puppeteer'); + const mockServer = require('./mock_server/server'); class Browser { diff --git a/test/actors.test.js b/test/actors.test.js index ca7b586a..30c2251f 100644 --- a/test/actors.test.js +++ b/test/actors.test.js @@ -1,7 +1,7 @@ +const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); const { ApifyClient } = require('../src'); const { stringifyWebhooksToBase64 } = require('../src/utils'); -const mockServer = require('./mock_server/server'); -const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); describe('Actor methods', () => { let baseUrl; diff --git a/test/apify_api_error.test.js b/test/apify_api_error.test.js index bc08dddb..0967f235 100644 --- a/test/apify_api_error.test.js +++ b/test/apify_api_error.test.js @@ -1,5 +1,5 @@ -const { ApifyClient } = require('../src/index'); const { Browser } = require('./_helper'); +const { ApifyClient } = require('../src/index'); describe('ApifyApiError', () => { const browser = new Browser(); diff --git a/test/builds.test.js b/test/builds.test.js index 0e2fff9f..cd8ca633 100644 --- a/test/builds.test.js +++ b/test/builds.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Build methods', () => { let baseUrl; diff --git a/test/datasets.test.js b/test/datasets.test.js index cc59170d..37a1037f 100644 --- a/test/datasets.test.js +++ b/test/datasets.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Dataset methods', () => { let baseUrl; diff --git a/test/http_client.test.js b/test/http_client.test.js index c8fd767c..96433bdc 100644 --- a/test/http_client.test.js +++ b/test/http_client.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src/index'); -const mockServer = require('./mock_server/server'); const { Browser } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src/index'); describe('HttpClient', () => { let baseUrl; diff --git a/test/key_value_stores.test.js b/test/key_value_stores.test.js index 6e636094..e0da49ff 100644 --- a/test/key_value_stores.test.js +++ b/test/key_value_stores.test.js @@ -1,7 +1,8 @@ const { Readable } = require('stream'); -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); + const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Key-Value Store methods', () => { let baseUrl; diff --git a/test/logs.test.js b/test/logs.test.js index 4227938a..53282783 100644 --- a/test/logs.test.js +++ b/test/logs.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Log methods', () => { let baseUrl; diff --git a/test/mock_server/routes/actors.js b/test/mock_server/routes/actors.js index 177ba029..bbf0237e 100644 --- a/test/mock_server/routes/actors.js +++ b/test/mock_server/routes/actors.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const actors = express.Router(); diff --git a/test/mock_server/routes/builds.js b/test/mock_server/routes/builds.js index eda416ed..8dc2c228 100644 --- a/test/mock_server/routes/builds.js +++ b/test/mock_server/routes/builds.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const builds = express.Router(); diff --git a/test/mock_server/routes/datasets.js b/test/mock_server/routes/datasets.js index 8dfeea2f..b59b1811 100644 --- a/test/mock_server/routes/datasets.js +++ b/test/mock_server/routes/datasets.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const datasets = express.Router(); diff --git a/test/mock_server/routes/external.js b/test/mock_server/routes/external.js index 0483bb06..f844c8b7 100644 --- a/test/mock_server/routes/external.js +++ b/test/mock_server/routes/external.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const external = express.Router(); diff --git a/test/mock_server/routes/key_value_stores.js b/test/mock_server/routes/key_value_stores.js index 6664db04..71b40a6e 100644 --- a/test/mock_server/routes/key_value_stores.js +++ b/test/mock_server/routes/key_value_stores.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const keyValueStores = express.Router(); diff --git a/test/mock_server/routes/logs.js b/test/mock_server/routes/logs.js index 58a92909..bf272431 100644 --- a/test/mock_server/routes/logs.js +++ b/test/mock_server/routes/logs.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const logs = express.Router(); diff --git a/test/mock_server/routes/request_queues.js b/test/mock_server/routes/request_queues.js index 41a80b56..f70e4169 100644 --- a/test/mock_server/routes/request_queues.js +++ b/test/mock_server/routes/request_queues.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const requestQueues = express.Router(); diff --git a/test/mock_server/routes/runs.js b/test/mock_server/routes/runs.js index f57c99c2..42db349e 100644 --- a/test/mock_server/routes/runs.js +++ b/test/mock_server/routes/runs.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const runs = express.Router(); diff --git a/test/mock_server/routes/schedules.js b/test/mock_server/routes/schedules.js index 34152a95..54bd980b 100644 --- a/test/mock_server/routes/schedules.js +++ b/test/mock_server/routes/schedules.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const schedules = express.Router(); diff --git a/test/mock_server/routes/store.ts b/test/mock_server/routes/store.ts index 6ffa552e..f025ff17 100644 --- a/test/mock_server/routes/store.ts +++ b/test/mock_server/routes/store.ts @@ -1,4 +1,5 @@ import express from 'express'; + import { addRoutes } from './add_routes'; const store = express.Router(); diff --git a/test/mock_server/routes/tasks.js b/test/mock_server/routes/tasks.js index 7b9f6bd3..4122f5db 100644 --- a/test/mock_server/routes/tasks.js +++ b/test/mock_server/routes/tasks.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const tasks = express.Router(); diff --git a/test/mock_server/routes/users.js b/test/mock_server/routes/users.js index 3ae39f4a..1ac7ba83 100644 --- a/test/mock_server/routes/users.js +++ b/test/mock_server/routes/users.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const users = express.Router(); diff --git a/test/mock_server/routes/webhook_dispatches.js b/test/mock_server/routes/webhook_dispatches.js index 2671f106..c4e55f1f 100644 --- a/test/mock_server/routes/webhook_dispatches.js +++ b/test/mock_server/routes/webhook_dispatches.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const webhookDispatches = express.Router(); diff --git a/test/mock_server/routes/webhooks.js b/test/mock_server/routes/webhooks.js index 5b937260..8cb78aa7 100644 --- a/test/mock_server/routes/webhooks.js +++ b/test/mock_server/routes/webhooks.js @@ -1,4 +1,5 @@ const express = require('express'); + const { addRoutes } = require('./add_routes'); const webhooks = express.Router(); diff --git a/test/mock_server/server.js b/test/mock_server/server.js index 4979527a..85fa8c7a 100644 --- a/test/mock_server/server.js +++ b/test/mock_server/server.js @@ -1,24 +1,25 @@ -const path = require('path'); const http = require('http'); +const path = require('path'); + const bodyParser = require('body-parser'); -const express = require('express'); const compression = require('compression'); +const express = require('express'); // Routers const actorRouter = require('./routes/actors'); const buildRouter = require('./routes/builds'); -const runRouter = require('./routes/runs'); -const taskRouter = require('./routes/tasks'); -const userRouter = require('./routes/users'); -const logRouter = require('./routes/logs'); const datasetRouter = require('./routes/datasets'); +const external = require('./routes/external'); const keyValueStores = require('./routes/key_value_stores'); +const logRouter = require('./routes/logs'); const requestQueues = require('./routes/request_queues'); -const webhooks = require('./routes/webhooks'); +const runRouter = require('./routes/runs'); const schedules = require('./routes/schedules'); -const webhookDispatches = require('./routes/webhook_dispatches'); -const external = require('./routes/external'); const store = require('./routes/store'); +const taskRouter = require('./routes/tasks'); +const userRouter = require('./routes/users'); +const webhookDispatches = require('./routes/webhook_dispatches'); +const webhooks = require('./routes/webhooks'); const app = express(); const v2Router = express.Router(); diff --git a/test/request_queues.test.js b/test/request_queues.test.js index 3956faf0..be515dd9 100644 --- a/test/request_queues.test.js +++ b/test/request_queues.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Request Queue methods', () => { let baseUrl; diff --git a/test/runs.test.js b/test/runs.test.js index 1a7cca69..57f23c82 100644 --- a/test/runs.test.js +++ b/test/runs.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Run methods', () => { let baseUrl; diff --git a/test/schedules.test.js b/test/schedules.test.js index cea4efff..bace0379 100644 --- a/test/schedules.test.js +++ b/test/schedules.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Schedule methods', () => { let baseUrl; diff --git a/test/store.test.ts b/test/store.test.ts index 2d253785..92de7f92 100644 --- a/test/store.test.ts +++ b/test/store.test.ts @@ -49,7 +49,7 @@ describe('Store', () => { expect(res.id).toEqual('store-list'); validateRequest(opts); - const browserRes: any = await page.evaluate((options: StoreCollectionListOptions) => client && client.store().list(options), opts); + const browserRes: any = await page.evaluate(async (options: StoreCollectionListOptions) => client && client.store().list(options), opts); expect(browserRes.id).toEqual('store-list'); expect(browserRes).toEqual(res); validateRequest(opts); diff --git a/test/tasks.test.js b/test/tasks.test.js index fdf401d5..a10d1448 100644 --- a/test/tasks.test.js +++ b/test/tasks.test.js @@ -1,7 +1,7 @@ +const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); const { ApifyClient } = require('../src'); const { stringifyWebhooksToBase64 } = require('../src/utils'); -const mockServer = require('./mock_server/server'); -const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); describe('Task methods', () => { let baseUrl; diff --git a/test/users.test.js b/test/users.test.js index e6dc71ff..c52cf835 100644 --- a/test/users.test.js +++ b/test/users.test.js @@ -1,7 +1,8 @@ const { ME_USER_NAME_PLACEHOLDER } = require('@apify/consts'); -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); + const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('User methods', () => { let baseUrl; diff --git a/test/webhook_dispatches.test.js b/test/webhook_dispatches.test.js index 721bceb5..803a55a7 100644 --- a/test/webhook_dispatches.test.js +++ b/test/webhook_dispatches.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Webhook Dispatch methods', () => { let baseUrl; diff --git a/test/webhooks.test.js b/test/webhooks.test.js index 3b78c4e4..25d5ef0c 100644 --- a/test/webhooks.test.js +++ b/test/webhooks.test.js @@ -1,6 +1,6 @@ -const { ApifyClient } = require('../src'); -const mockServer = require('./mock_server/server'); const { Browser, validateRequest, DEFAULT_OPTIONS } = require('./_helper'); +const mockServer = require('./mock_server/server'); +const { ApifyClient } = require('../src'); describe('Webhook methods', () => { let baseUrl;