Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

move logic to zones.ts

Browse source
This commit is contained in:
Yury Semikhatsky 2024-11-06 11:06:34 -08:00
parent 62c23ce180
commit df2ceb726a
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/playwright-core/src/client/waiter.ts
View file

@ -30,7 +30,7 @@ export class Waiter {
private _channelOwner: ChannelOwner<channels.EventTargetChannel>;
private _waitId: string;
private _error: string | undefined;
private _savedZone: Zone | undefined;
private _savedZone: Zone;
constructor(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string) {
this._waitId = createGuid();
@ -107,12 +107,11 @@ export class Waiter {
}
}
function waitForEvent<T = void>(emitter: EventEmitter, event: string, savedZone: Zone | undefined, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
function waitForEvent<T = void>(emitter: EventEmitter, event: string, savedZone: Zone, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
let listener: (eventArg: any) => void;
const promise = new Promise<T>((resolve, reject) => {
listener = async (eventArg: any) => {
// Reset apiZone and expectZone, but restore step data.
await zones.runInZone(savedZone?.copyWithoutTypes(['apiZone', 'expectZone']), async () => {
await savedZone.run(async () => {
try {
if (predicate && !(await predicate(eventArg)))
return;

39
packages/playwright-core/src/utils/zones.ts
View file

@ -22,12 +22,7 @@ class ZoneManager {
private readonly _asyncLocalStorage = new AsyncLocalStorage<Zone|undefined>();
run<T, R>(type: ZoneType, data: T, func: () => R): R {
const current = this._asyncLocalStorage.getStore();
const zone = Zone.createWithData(current, type, data);
return this.runInZone(zone, func);
}
runInZone<R>(zone: Zone | undefined, func: () => R): R {
const zone = Zone.createWithData(this._asyncLocalStorage, type, data);
return this._asyncLocalStorage.run(zone, func);
}
@ -36,8 +31,8 @@ class ZoneManager {
return zone?.get(type);
}
currentZone(): Zone | undefined {
return this._asyncLocalStorage.getStore();
currentZone(): Zone {
return this._asyncLocalStorage.getStore() ?? Zone.createEmpty(this._asyncLocalStorage);
}
exitZones<R>(func: () => R): R {
@ -46,25 +41,33 @@ class ZoneManager {
}
export class Zone {
private readonly store: Map<ZoneType, unknown>;
private readonly _asyncLocalStorage: AsyncLocalStorage<Zone | undefined>;
private readonly _data: Map<ZoneType, unknown>;
static createWithData(currentZone: Zone | undefined, type: ZoneType, data: unknown) {
const store = new Map(currentZone?.store.entries() ?? []);
static createWithData(asyncLocalStorage: AsyncLocalStorage<Zone|undefined>, type: ZoneType, data: unknown) {
const store = new Map(asyncLocalStorage.getStore()?._data);
store.set(type, data);
return new Zone(store);
return new Zone(asyncLocalStorage, store);
}
private constructor(store: Map<ZoneType, unknown>) {
this.store = store;
static createEmpty(asyncLocalStorage: AsyncLocalStorage<Zone|undefined>) {
return new Zone(asyncLocalStorage, new Map());
}
copyWithoutTypes(types: ZoneType[]): Zone {
const store = new Map(this.store.entries().filter(([type]) => !types.includes(type)));
return new Zone(store);
private constructor(asyncLocalStorage: AsyncLocalStorage<Zone|undefined>, store: Map<ZoneType, unknown>) {
this._asyncLocalStorage = asyncLocalStorage;
this._data = store;
}
run<R>(func: () => R): R {
// Reset apiZone and expectZone, but restore stepZone.
const entries = [...this._data.entries()].filter(([type]) => (type !== 'apiZone' && type !== 'expectZone'));
const resetZone = new Zone(this._asyncLocalStorage, new Map(entries));
return this._asyncLocalStorage.run(resetZone, func);
}
get<T>(type: ZoneType): T | undefined {
return this.store.get(type) as T | undefined;
return this._data.get(type) as T | undefined;
}
}