Skip to content

Commit 1680163

Browse files
SodmanSodman
authored
Ran prettier (#3)
* Ran prettier
1 parent dd1eeb5 commit 1680163

File tree

3 files changed

+43
-40
lines changed

3 files changed

+43
-40
lines changed

‎__tests__/main.test.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ process.env["RUNNER_TOOL_CACHE"] = toolDir;
1515
import * as installer from "../src/installer";
1616

1717
describe("installer tests", () => {
18-
beforeEach(async function() {
18+
beforeEach(async function () {
1919
await io.rmRF(toolDir);
2020
await io.rmRF(tempDir);
2121
await io.mkdirP(toolDir);
@@ -53,13 +53,12 @@ describe("installer tests", () => {
5353
.replyWithFile(200, path.join(dataDir, "releases-1.json"));
5454

5555
nock("https://api.github.com")
56-
.get("/repos/protocolbuffers/protobuf/releases?page=2")
57-
.replyWithFile(200, path.join(dataDir, "releases-2.json"));
58-
56+
.get("/repos/protocolbuffers/protobuf/releases?page=2")
57+
.replyWithFile(200, path.join(dataDir, "releases-2.json"));
5958

6059
nock("https://api.github.com")
61-
.get("/repos/protocolbuffers/protobuf/releases?page=3")
62-
.replyWithFile(200, path.join(dataDir, "releases-3.json"));
60+
.get("/repos/protocolbuffers/protobuf/releases?page=3")
61+
.replyWithFile(200, path.join(dataDir, "releases-3.json"));
6362
});
6463

6564
afterEach(() => {
@@ -101,16 +100,15 @@ describe("installer tests", () => {
101100
nock("https://api.github.com")
102101
.get("/repos/protocolbuffers/protobuf/releases?page=1")
103102
.replyWithFile(200, path.join(dataDir, "releases-broken-rc-tag.json"));
104-
105-
nock("https://api.github.com")
103+
104+
nock("https://api.github.com")
106105
.get("/repos/protocolbuffers/protobuf/releases?page=2")
107106
.replyWithFile(200, path.join(dataDir, "releases-2.json"));
108107

109-
110-
nock("https://api.github.com")
108+
nock("https://api.github.com")
111109
.get("/repos/protocolbuffers/protobuf/releases?page=3")
112110
.replyWithFile(200, path.join(dataDir, "releases-3.json"));
113-
});
111+
});
114112

115113
afterEach(() => {
116114
nock.cleanAll();

‎lib/installer.js

+14-13
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ function getProtoc(version, includePreReleases, repoToken) {
7474
listeners: {
7575
stdout: (data) => {
7676
stdOut += data.toString();
77-
}
78-
}
77+
},
78+
},
7979
};
8080
yield exc.exec("go", ["env", "GOPATH"], options);
8181
const goPath = stdOut.trim();
@@ -127,15 +127,16 @@ function fetchVersions(includePreReleases, repoToken) {
127127
let rest;
128128
if (repoToken != "") {
129129
rest = new restm.RestClient("setup-protoc", "", [], {
130-
headers: { Authorization: "Bearer " + repoToken }
130+
headers: { Authorization: "Bearer " + repoToken },
131131
});
132132
}
133133
else {
134134
rest = new restm.RestClient("setup-protoc");
135135
}
136136
let tags = [];
137137
for (let pageNum = 1, morePages = true; morePages; pageNum++) {
138-
let nextPage = (yield rest.get("https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" + pageNum)).result || [];
138+
let nextPage = (yield rest.get("https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
139+
pageNum)).result || [];
139140
if (nextPage.length > 0) {
140141
tags = tags.concat(nextPage);
141142
}
@@ -144,9 +145,9 @@ function fetchVersions(includePreReleases, repoToken) {
144145
}
145146
}
146147
return tags
147-
.filter(tag => tag.tag_name.match(/v\d+\.[\w\.]+/g))
148-
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
149-
.map(tag => tag.tag_name.replace("v", ""));
148+
.filter((tag) => tag.tag_name.match(/v\d+\.[\w\.]+/g))
149+
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
150+
.map((tag) => tag.tag_name.replace("v", ""));
150151
});
151152
}
152153
// Compute an actual version starting from the `version` configuration param.
@@ -161,13 +162,13 @@ function computeVersion(version, includePreReleases, repoToken) {
161162
version = version.slice(0, version.length - 2);
162163
}
163164
const allVersions = yield fetchVersions(includePreReleases, repoToken);
164-
const validVersions = allVersions.filter(v => semver.valid(v));
165-
const possibleVersions = validVersions.filter(v => v.startsWith(version));
165+
const validVersions = allVersions.filter((v) => semver.valid(v));
166+
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
166167
const versionMap = new Map();
167-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
168+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
168169
const versions = Array.from(versionMap.keys())
169170
.sort(semver.rcompare)
170-
.map(v => versionMap.get(v));
171+
.map((v) => versionMap.get(v));
171172
core.debug(`evaluating ${versions.length} versions`);
172173
if (versions.length === 0) {
173174
throw new Error("unable to get latest version");
@@ -189,7 +190,7 @@ function normalizeVersion(version) {
189190
else {
190191
// handle beta and rc
191192
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
192-
if (preStrings.some(el => versionPart[1].includes(el))) {
193+
if (preStrings.some((el) => versionPart[1].includes(el))) {
193194
versionPart[1] = versionPart[1]
194195
.replace("beta", ".0-beta")
195196
.replace("rc", ".0-rc")
@@ -205,7 +206,7 @@ function normalizeVersion(version) {
205206
else {
206207
// handle beta and rc
207208
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
208-
if (preStrings.some(el => versionPart[2].includes(el))) {
209+
if (preStrings.some((el) => versionPart[2].includes(el))) {
209210
versionPart[2] = versionPart[2]
210211
.replace("beta", "-beta")
211212
.replace("rc", "-rc")

‎src/installer.ts

+20-16
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export async function getProtoc(
7777
listeners: {
7878
stdout: (data: Buffer) => {
7979
stdOut += data.toString();
80-
}
81-
}
80+
},
81+
},
8282
};
8383

8484
await exc.exec("go", ["env", "GOPATH"], options);
@@ -143,17 +143,21 @@ async function fetchVersions(
143143
let rest: restm.RestClient;
144144
if (repoToken != "") {
145145
rest = new restm.RestClient("setup-protoc", "", [], {
146-
headers: { Authorization: "Bearer " + repoToken }
146+
headers: { Authorization: "Bearer " + repoToken },
147147
});
148148
} else {
149149
rest = new restm.RestClient("setup-protoc");
150150
}
151151

152152
let tags: IProtocRelease[] = [];
153-
for (let pageNum=1,morePages=true; morePages; pageNum++) {
154-
let nextPage: IProtocRelease[] = (await rest.get<IProtocRelease[]>(
155-
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" + pageNum
156-
)).result || [];
153+
for (let pageNum = 1, morePages = true; morePages; pageNum++) {
154+
let nextPage: IProtocRelease[] =
155+
(
156+
await rest.get<IProtocRelease[]>(
157+
"https://api.github.com/repos/protocolbuffers/protobuf/releases?page=" +
158+
pageNum
159+
)
160+
).result || [];
157161
if (nextPage.length > 0) {
158162
tags = tags.concat(nextPage);
159163
} else {
@@ -162,9 +166,9 @@ async function fetchVersions(
162166
}
163167

164168
return tags
165-
.filter(tag => tag.tag_name.match(/v\d+\.[\w\.]+/g))
166-
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
167-
.map(tag => tag.tag_name.replace("v", ""));
169+
.filter((tag) => tag.tag_name.match(/v\d+\.[\w\.]+/g))
170+
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
171+
.map((tag) => tag.tag_name.replace("v", ""));
168172
}
169173

170174
// Compute an actual version starting from the `version` configuration param.
@@ -184,15 +188,15 @@ async function computeVersion(
184188
}
185189

186190
const allVersions = await fetchVersions(includePreReleases, repoToken);
187-
const validVersions = allVersions.filter(v => semver.valid(v));
188-
const possibleVersions = validVersions.filter(v => v.startsWith(version));
191+
const validVersions = allVersions.filter((v) => semver.valid(v));
192+
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
189193

190194
const versionMap = new Map();
191-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
195+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
192196

193197
const versions = Array.from(versionMap.keys())
194198
.sort(semver.rcompare)
195-
.map(v => versionMap.get(v));
199+
.map((v) => versionMap.get(v));
196200

197201
core.debug(`evaluating ${versions.length} versions`);
198202

@@ -218,7 +222,7 @@ function normalizeVersion(version: string): string {
218222
} else {
219223
// handle beta and rc
220224
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
221-
if (preStrings.some(el => versionPart[1].includes(el))) {
225+
if (preStrings.some((el) => versionPart[1].includes(el))) {
222226
versionPart[1] = versionPart[1]
223227
.replace("beta", ".0-beta")
224228
.replace("rc", ".0-rc")
@@ -234,7 +238,7 @@ function normalizeVersion(version: string): string {
234238
} else {
235239
// handle beta and rc
236240
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
237-
if (preStrings.some(el => versionPart[2].includes(el))) {
241+
if (preStrings.some((el) => versionPart[2].includes(el))) {
238242
versionPart[2] = versionPart[2]
239243
.replace("beta", "-beta")
240244
.replace("rc", "-rc")

0 commit comments

Comments
 (0)