@crawlee/core 4.0.0-beta.99 → 4.0.0-rc.0

package/validators.js

@@ -1,29 +1,17 @@
-import ow from 'ow';
+import { schemas } from '@crawlee/utils/internal';
+export { ArgumentValidationError, parseArgument } from '@crawlee/utils';
+export { schemas } from '@crawlee/utils/internal';
 /** @internal */
 export const validators = {
     // Naming it browser page for future proofing with Playwright
-    browserPage: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('goto', 'evaluate', '$', 'on')),
-        message: (label) => `Expected argument '${label}' to be a Puppeteer Page, got something else.`,
-    }),
-    proxyConfiguration: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('newProxyInfo')),
-        message: (label) => `Expected argument '${label}' to implement the IProxyConfiguration interface (missing 'newProxyInfo'), got something else.`,
-    }),
-    requestList: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('fetchNextRequest', 'persistState')),
-        message: (label) => `Expected argument '${label}' to be a RequestList, got something else.`,
-    }),
-    requestQueue: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('fetchNextRequest', 'addRequest')),
-        message: (label) => `Expected argument '${label}' to be a RequestQueue, got something else.`,
-    }),
-    browserPool: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('newPage', 'closePage', 'extractPageState', 'injectPageState')),
-        message: (label) => `Expected argument '${label}' to implement the IBrowserPool interface (missing one of 'newPage', 'closePage', 'extractPageState', 'injectPageState'), got something else.`,
-    }),
-    sessionPool: (value) => ({
-        validator: ow.isValid(value, ow.object.hasKeys('getSession')),
-        message: (label) => `Expected argument '${label}' to implement the ISessionPool interface (missing 'getSession'), got something else.`,
-    }),
+    browserPage: schemas.objectWithKeys(['goto', 'evaluate', '$', 'on'], 'Expected a Puppeteer Page, got something else.'),
+    proxyConfiguration: schemas.objectWithKeys(['newProxyInfo'], "Expected an object implementing the IProxyConfiguration interface (missing 'newProxyInfo'), got something else."),
+    requestList: schemas.objectWithKeys(['fetchNextRequest', 'persistState'], 'Expected a RequestList, got something else.'),
+    requestQueue: schemas.objectWithKeys(['fetchNextRequest', 'addRequest'], 'Expected a RequestQueue, got something else.'),
+    browserPool: schemas.objectWithKeys(['newPage', 'closePage', 'extractPageState', 'injectPageState'], "Expected an object implementing the IBrowserPool interface (missing one of 'newPage', 'closePage', 'extractPageState', 'injectPageState'), got something else."),
+    sessionPool: schemas.objectWithKeys(['getSession'], "Expected an object implementing the ISessionPool interface (missing 'getSession'), got something else."),
+    requestManager: schemas.objectWithKeys(['fetchNextRequest', 'addRequest', 'addRequestsBatched'], "Expected an object implementing the IRequestManager interface (missing one of 'fetchNextRequest', 'addRequest', 'addRequestsBatched'), got something else."),
+    storageBackend: schemas.objectWithKeys(['createDatasetBackend', 'createKeyValueStoreBackend', 'createRequestQueueBackend'], "Expected an object implementing the StorageBackend interface (missing one of 'createDatasetBackend', 'createKeyValueStoreBackend', 'createRequestQueueBackend'), got something else."),
+    logger: schemas.logger,
+    httpClient: schemas.httpClient,
 };

package/storages/access_checking.d.ts

@@ -1,12 +0,0 @@
-import type { Awaitable } from '@crawlee/types';
-/**
- * Invoke a storage access checker function defined using {@link withCheckedStorageAccess} higher up in the call stack.
- */
-export declare const checkStorageAccess: () => void | undefined;
-/**
- * Define a storage access checker function that should be used by calls to {@link checkStorageAccess} in the callbacks.
- *
- * @param checkFunction The check function that should be invoked by {@link checkStorageAccess} calls
- * @param callback The code that should be invoked with the `checkFunction` setting
- */
-export declare const withCheckedStorageAccess: <T>(checkFunction: () => void, callback: () => Awaitable<T>) => Promise<T>;

package/storages/access_checking.js

@@ -1,17 +0,0 @@
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { tryCancel } from '@apify/timeout';
-const storage = new AsyncLocalStorage();
-/**
- * Invoke a storage access checker function defined using {@link withCheckedStorageAccess} higher up in the call stack.
- */
-export const checkStorageAccess = () => {
-    tryCancel();
-    return storage.getStore()?.checkFunction();
-};
-/**
- * Define a storage access checker function that should be used by calls to {@link checkStorageAccess} in the callbacks.
- *
- * @param checkFunction The check function that should be invoked by {@link checkStorageAccess} calls
- * @param callback The code that should be invoked with the `checkFunction` setting
- */
-export const withCheckedStorageAccess = async (checkFunction, callback) => storage.run({ checkFunction }, callback);