Skip to content

Commit 9606674

Browse files
committed
chore: upgrade prettier
1 parent d827fa1 commit 9606674

File tree

9 files changed

+61
-82
lines changed

9 files changed

+61
-82
lines changed

.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"printWidth": 120,
3+
"singleQuote": true,
4+
"trailingComma": "all",
5+
"htmlWhitespaceSensitivity": "ignore",
6+
"tabWidth": 2
7+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"playwright-core": "1.35.1"
2020
},
2121
"devDependencies": {
22-
"prettier": "^2.7.1",
22+
"prettier": "2.8.8",
2323
"semantic-release": "19.0.2",
2424
"typescript": "4.7.2"
2525
}

src/base/index.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Metadata, status as Status } from "@grpc/grpc-js";
1+
import { Metadata, status as Status } from '@grpc/grpc-js';
22

33
export interface GrpcErrorResponse {
44
status: Status;
@@ -22,7 +22,7 @@ function fourBytesLength(sized: { length: number }): Uint8Array {
2222

2323
export function decodeGrpcWebBody(bodyBuffer: Buffer): GrpcResponse {
2424
if (bodyBuffer.length === 0) {
25-
throw new Error("Body has zero length, cannot decode!");
25+
throw new Error('Body has zero length, cannot decode!');
2626
}
2727

2828
const bodyRaw = new Uint8Array(bodyBuffer);
@@ -53,7 +53,7 @@ export function decodeGrpcWebBody(bodyBuffer: Buffer): GrpcResponse {
5353
const trailersHeader = 0x80;
5454

5555
if (bodyRaw.at(offset++) !== trailersHeader) {
56-
throw new Error("Expected trailers header 0x80");
56+
throw new Error('Expected trailers header 0x80');
5757
}
5858

5959
const trailersLength = readInt32Length(bodyRaw, offset);
@@ -66,16 +66,16 @@ export function decodeGrpcWebBody(bodyBuffer: Buffer): GrpcResponse {
6666

6767
const trailers = new Metadata();
6868

69-
trailersString.split("\r\n").forEach((trailer) => {
70-
const [key, value] = trailer.split(":", 2);
69+
trailersString.split('\r\n').forEach((trailer) => {
70+
const [key, value] = trailer.split(':', 2);
7171
trailers.set(key, value);
7272
});
7373

7474
if (status !== Status.OK) {
7575
return {
7676
status,
7777
trailers,
78-
detail: trailers.get("grpc-message")[0] as string | undefined,
78+
detail: trailers.get('grpc-message')[0] as string | undefined,
7979
};
8080
}
8181

@@ -99,19 +99,17 @@ export class GrpcUnknownStatus extends Error {
9999

100100
export function grpcResponseToBuffer(response: GrpcResponse): Buffer {
101101
// error messages need to have a zero length message field to be considered valid
102-
const message = "message" in response ? response.message : new Uint8Array();
102+
const message = 'message' in response ? response.message : new Uint8Array();
103103

104104
// all success responses have status OK
105-
const status = "status" in response ? response.status : Status.OK;
105+
const status = 'status' in response ? response.status : Status.OK;
106106
// error statuses may the detail field to denote a custom error message, otherwise use the string version of the status
107107
let grpcMessage: string | undefined;
108108

109-
if ("detail" in response) {
109+
if ('detail' in response) {
110110
grpcMessage = response.detail;
111111
} else {
112-
const currentStatus = Object.entries(Status).find(
113-
([, code]) => code === status
114-
);
112+
const currentStatus = Object.entries(Status).find(([, code]) => code === status);
115113

116114
if (!currentStatus) {
117115
throw new GrpcUnknownStatus(status);

src/playwright/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export { observeGrpcUnary } from "./observe-grpc-unary";
2-
export { mockGrpcUnary } from "./mock-grpc-unary";
3-
export { readGrpcRequest } from "./read-grpc-request";
4-
export * from "./interfaces";
1+
export { observeGrpcUnary } from './observe-grpc-unary';
2+
export { mockGrpcUnary } from './mock-grpc-unary';
3+
export { readGrpcRequest } from './read-grpc-request';
4+
export * from './interfaces';

src/playwright/interfaces.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
import { grpc } from "@improbable-eng/grpc-web";
2-
import { Request } from "playwright-core";
3-
import { status as Status, Metadata } from "@grpc/grpc-js";
1+
import { grpc } from '@improbable-eng/grpc-web';
2+
import { Request } from 'playwright-core';
3+
import { status as Status, Metadata } from '@grpc/grpc-js';
44

5-
export interface UnaryMethodDefinitionish
6-
extends grpc.UnaryMethodDefinition<any, any> {
5+
export interface UnaryMethodDefinitionish extends grpc.UnaryMethodDefinition<any, any> {
76
requestStream: any;
87
responseStream: any;
98
}
109

11-
export type RequestPredicate = (
12-
requestMessage: Uint8Array | null,
13-
request: Request
14-
) => boolean | Promise<boolean>;
10+
export type RequestPredicate = (requestMessage: Uint8Array | null, request: Request) => boolean | Promise<boolean>;
1511

1612
export interface MockedGrpcCall {
1713
/**
@@ -21,9 +17,7 @@ export interface MockedGrpcCall {
2117
* The request message argument to the optional predicate should be used to match the request payload.
2218
* Note the requestMessage objects need to be decoded using a protobuf decoder for the specific expected message.
2319
*/
24-
waitForMock(
25-
requestPredicate?: RequestPredicate
26-
): Promise<{ requestMessage: Uint8Array | null }>;
20+
waitForMock(requestPredicate?: RequestPredicate): Promise<{ requestMessage: Uint8Array | null }>;
2721
}
2822

2923
export interface ObservedGrpcCallResponse {
@@ -34,7 +28,5 @@ export interface ObservedGrpcCallResponse {
3428
}
3529

3630
export interface ObservedGrpcCall {
37-
waitForResponse: (
38-
requestPredicate?: RequestPredicate
39-
) => Promise<ObservedGrpcCallResponse>;
31+
waitForResponse: (requestPredicate?: RequestPredicate) => Promise<ObservedGrpcCallResponse>;
4032
}

src/playwright/mock-grpc-unary.ts

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,26 @@ export async function mockGrpcUnary(
77
page: Page,
88
rpc: UnaryMethodDefinitionish,
99
response: GrpcResponse | ((request: Uint8Array | null) => GrpcResponse),
10-
mockAtContextLevel: boolean = false
10+
mockAtContextLevel: boolean = false,
1111
): Promise<MockedGrpcCall> {
1212
const url = `/${rpc.service.serviceName}/${rpc.methodName}`;
1313

1414
// note this wildcard route url base is done in order to match both localhost and deployed service usages.
15-
await (mockAtContextLevel ? page.context() : page).route(
16-
'**' + url,
17-
(route) => {
18-
expect(
19-
route.request().method(),
20-
'ALL gRPC requests should be a POST request'
21-
).toBe('POST');
22-
23-
const grpcResponse =
24-
typeof response === 'function'
25-
? response(readGrpcRequest(route.request()))
26-
: response;
27-
28-
const grpcResponseBody = grpcResponseToBuffer(grpcResponse);
29-
30-
return route.fulfill({
31-
body: grpcResponseBody,
32-
contentType: 'application/grpc-web+proto',
33-
headers: {
34-
'Access-Control-Allow-Origin': '*',
35-
},
36-
});
37-
}
38-
);
15+
await (mockAtContextLevel ? page.context() : page).route('**' + url, (route) => {
16+
expect(route.request().method(), 'ALL gRPC requests should be a POST request').toBe('POST');
17+
18+
const grpcResponse = typeof response === 'function' ? response(readGrpcRequest(route.request())) : response;
19+
20+
const grpcResponseBody = grpcResponseToBuffer(grpcResponse);
21+
22+
return route.fulfill({
23+
body: grpcResponseBody,
24+
contentType: 'application/grpc-web+proto',
25+
headers: {
26+
'Access-Control-Allow-Origin': '*',
27+
},
28+
});
29+
});
3930

4031
return {
4132
async waitForMock(requestPredicate?) {

src/playwright/observe-grpc-unary.ts

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
import { Page } from "@playwright/test";
2-
import {
3-
ObservedGrpcCall,
4-
RequestPredicate,
5-
UnaryMethodDefinitionish,
6-
} from "./interfaces";
7-
import { decodeGrpcWebBody } from "../base";
8-
import { status as Status } from "@grpc/grpc-js";
9-
import { readGrpcRequest } from "./read-grpc-request";
10-
11-
export async function observeGrpcUnary(
12-
page: Page,
13-
rpc: UnaryMethodDefinitionish
14-
): Promise<ObservedGrpcCall> {
1+
import { Page } from '@playwright/test';
2+
import { ObservedGrpcCall, RequestPredicate, UnaryMethodDefinitionish } from './interfaces';
3+
import { decodeGrpcWebBody } from '../base';
4+
import { status as Status } from '@grpc/grpc-js';
5+
import { readGrpcRequest } from './read-grpc-request';
6+
7+
export async function observeGrpcUnary(page: Page, rpc: UnaryMethodDefinitionish): Promise<ObservedGrpcCall> {
158
const url = `/${rpc.service.serviceName}/${rpc.methodName}`;
169

1710
// note this wildcard route url base is done in order to match both localhost and deployed service usages.
1811
// eslint-disable-next-line @typescript-eslint/no-misused-promises
19-
await page.route("**" + url, async (route) => await route.continue());
12+
await page.route('**' + url, async (route) => await route.continue());
2013

2114
return {
2215
async waitForResponse(requestPredicate?: RequestPredicate) {
@@ -33,17 +26,15 @@ export async function observeGrpcUnary(
3326
return true;
3427
});
3528

36-
const response = await page.waitForResponse(
37-
(resp) => resp.request() === request
38-
);
29+
const response = await page.waitForResponse((resp) => resp.request() === request);
3930

4031
const requestMessage = readGrpcRequest(request);
4132

4233
const responseParsed = await decodeGrpcWebBody(await response.body());
4334

4435
const trailers = responseParsed.trailers ?? null;
4536

46-
if ("status" in responseParsed) {
37+
if ('status' in responseParsed) {
4738
return {
4839
requestMessage,
4940
responseMessage: null,

src/playwright/read-grpc-request.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Request } from "playwright-core";
2-
import { unframeRequest } from "../base";
1+
import { Request } from 'playwright-core';
2+
import { unframeRequest } from '../base';
33

44
export function readGrpcRequest(request: Request): Uint8Array | null {
55
const requestBody = request.postDataBuffer();

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,10 +2701,10 @@ [email protected]:
27012701
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.35.1.tgz#52c1e6ffaa6a8c29de1a5bdf8cce0ce290ffb81d"
27022702
integrity sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==
27032703

2704-
prettier@^2.7.1:
2705-
version "2.7.1"
2706-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
2707-
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
2704+
prettier@2.8.8:
2705+
version "2.8.8"
2706+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
2707+
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
27082708

27092709
proc-log@^2.0.0, proc-log@^2.0.1:
27102710
version "2.0.1"

0 commit comments

Comments
 (0)