@applitools/core-base
Advanced tools
Comparing version 1.1.40 to 1.1.41
@@ -35,8 +35,8 @@ "use strict"; | ||
const getAccountInfoWithCache = utils.general.cachify(getAccountInfo, ([{ settings }]) => { | ||
return [settings.serverUrl, settings.apiKey, settings.proxy]; | ||
return [settings.serverUrl, settings.apiKey]; | ||
}); | ||
const getBatchBranchesWithCache = utils.general.cachify(getBatchBranches, ([{ settings }]) => { | ||
return [settings.serverUrl, settings.apiKey, settings.proxy, settings.batchId]; | ||
return [settings.batchId, settings.serverUrl, settings.apiKey]; | ||
}); | ||
return { | ||
const core = { | ||
getAccountInfo: getAccountInfoWithCache, | ||
@@ -52,2 +52,3 @@ getBatchBranches: getBatchBranchesWithCache, | ||
}; | ||
return core; | ||
async function openEyes({ settings, logger = defaultLogger, }) { | ||
@@ -133,3 +134,3 @@ var _a, _b, _c; | ||
const upload = (0, upload_1.makeUpload)({ config: { uploadUrl: test.account.uploadUrl, proxy: settings.proxy }, logger }); | ||
return makeEyesRequests({ test, req, upload, logger }); | ||
return makeEyesRequests({ core, test, req, upload, logger }); | ||
} | ||
@@ -307,6 +308,7 @@ async function locate({ target, settings, logger = defaultLogger, }) { | ||
exports.makeCoreRequests = makeCoreRequests; | ||
function makeEyesRequests({ test, req, upload, logger: defaultLogger, }) { | ||
function makeEyesRequests({ core, test, req, upload, logger: defaultLogger, }) { | ||
let resultsPromise = undefined; | ||
let supportsCheckAndClose = true; | ||
return { | ||
const eyes = { | ||
core, | ||
test, | ||
@@ -323,2 +325,3 @@ get running() { | ||
}; | ||
return eyes; | ||
async function check({ target, settings, logger = defaultLogger, }) { | ||
@@ -325,0 +328,0 @@ logger.log('Request "check" called for target', target, 'with settings', settings); |
{ | ||
"name": "@applitools/core-base", | ||
"version": "1.1.40", | ||
"version": "1.1.41", | ||
"homepage": "https://applitools.com", | ||
@@ -50,3 +50,3 @@ "bugs": { | ||
"version": "bongo version", | ||
"postversion": "bongo postversion --skip-release-notification" | ||
"postversion": "bongo postversion" | ||
}, | ||
@@ -60,3 +60,3 @@ "dependencies": { | ||
"devDependencies": { | ||
"@applitools/bongo": "^2.2.5", | ||
"@applitools/bongo": "^3.0.1", | ||
"@applitools/test-server": "^1.1.27", | ||
@@ -63,0 +63,0 @@ "@applitools/test-utils": "^1.5.13", |
@@ -1,2 +0,2 @@ | ||
import type { ImageTarget, Core, Eyes, ServerSettings, ReportSettings, TestInfo } from '../types'; | ||
import type { Core, Eyes, ServerSettings, OpenSettings, ReportSettings, TestInfo } from '../types'; | ||
import { type Fetch } from '@applitools/req'; | ||
@@ -6,3 +6,3 @@ import { type Logger } from '@applitools/logger'; | ||
import { type Upload } from './upload'; | ||
export interface CoreRequests extends Core<ImageTarget, EyesRequests> { | ||
export interface CoreRequests extends Core { | ||
getBatchBranches(options: { | ||
@@ -17,4 +17,9 @@ settings: ServerSettings & { | ||
}>; | ||
openEyes(options: { | ||
settings: OpenSettings; | ||
logger?: Logger; | ||
}): Promise<EyesRequests>; | ||
} | ||
export interface EyesRequests extends Eyes<ImageTarget> { | ||
export interface EyesRequests extends Eyes { | ||
readonly core: CoreRequests; | ||
report(options: { | ||
@@ -30,3 +35,4 @@ settings?: ReportSettings; | ||
}): CoreRequests; | ||
export declare function makeEyesRequests({ test, req, upload, logger: defaultLogger, }: { | ||
export declare function makeEyesRequests({ core, test, req, upload, logger: defaultLogger, }: { | ||
core: CoreRequests; | ||
test: TestInfo; | ||
@@ -33,0 +39,0 @@ req: ReqEyes; |
@@ -18,9 +18,9 @@ /// <reference types="node" /> | ||
export type Target = ImageTarget; | ||
export interface Core<TTarget = Target, TEyes extends Eyes<TTarget> = Eyes<TTarget>> { | ||
export interface Core { | ||
openEyes(options: { | ||
settings: OpenSettings; | ||
logger?: Logger; | ||
}): Promise<TEyes>; | ||
}): Promise<Eyes>; | ||
locate<TLocator extends string>(options: { | ||
target: TTarget; | ||
target: Target; | ||
settings: LocateSettings<TLocator>; | ||
@@ -30,3 +30,3 @@ logger?: Logger; | ||
locateText<TPattern extends string>(options: { | ||
target: TTarget; | ||
target: Target; | ||
settings: LocateTextSettings<TPattern>; | ||
@@ -36,3 +36,3 @@ logger?: Logger; | ||
extractText(options: { | ||
target: TTarget; | ||
target: Target; | ||
settings: MaybeArray<ExtractTextSettings>; | ||
@@ -59,7 +59,8 @@ logger?: Logger; | ||
} | ||
export interface Eyes<TTarget = Target> { | ||
export interface Eyes { | ||
readonly core: Core; | ||
readonly test: TestInfo; | ||
readonly running: boolean; | ||
check(options: { | ||
target: TTarget; | ||
target: Target; | ||
settings?: CheckSettings; | ||
@@ -69,3 +70,3 @@ logger?: Logger; | ||
checkAndClose(options: { | ||
target: TTarget; | ||
target: Target; | ||
settings?: CheckSettings & CloseSettings; | ||
@@ -72,0 +73,0 @@ logger?: Logger; |
103567
1930