summaryrefslogtreecommitdiff
path: root/multipart
diff options
context:
space:
mode:
authorVincent LE GOFF <g_n_s@hotmail.fr>2019-04-24 13:41:23 +0200
committerRyan Dahl <ry@tinyclouds.org>2019-04-24 07:41:22 -0400
commitdcd01dd02530df0e799eb4227087680ffeb80d74 (patch)
tree8cc1dec75dd17c326fea6d7fe471b7e7a31032f7 /multipart
parente1f7a60bb326f8299f339635c0738d28431afa0a (diff)
Eslint fixes (denoland/deno_std#356)
Make warnings fail Original: https://github.com/denoland/deno_std/commit/4543b563a9a01c8c168aafcbfd9d4634effba7fc
Diffstat (limited to 'multipart')
-rw-r--r--multipart/formfile_test.ts2
-rw-r--r--multipart/multipart.ts24
-rw-r--r--multipart/multipart_test.ts42
3 files changed, 35 insertions, 33 deletions
diff --git a/multipart/formfile_test.ts b/multipart/formfile_test.ts
index 7f45c24db..63509fc9d 100644
--- a/multipart/formfile_test.ts
+++ b/multipart/formfile_test.ts
@@ -3,7 +3,7 @@ import { test } from "../testing/mod.ts";
import { assertEquals } from "../testing/asserts.ts";
import { isFormFile } from "./formfile.ts";
-test(function multipartIsFormFile() {
+test(function multipartIsFormFile(): void {
assertEquals(
isFormFile({
filename: "foo",
diff --git a/multipart/multipart.ts b/multipart/multipart.ts
index 9b3f1ceb0..0032e1cf5 100644
--- a/multipart/multipart.ts
+++ b/multipart/multipart.ts
@@ -166,19 +166,21 @@ class PartReader implements Reader, Closer {
this.contentDisposition = comps[0];
comps
.slice(1)
- .map(v => v.trim())
- .map(kv => {
- const [k, v] = kv.split("=");
- if (v) {
- const s = v.charAt(0);
- const e = v.charAt(v.length - 1);
- if ((s === e && s === '"') || s === "'") {
- params[k] = v.substr(1, v.length - 2);
- } else {
- params[k] = v;
+ .map((v): string => v.trim())
+ .map(
+ (kv): void => {
+ const [k, v] = kv.split("=");
+ if (v) {
+ const s = v.charAt(0);
+ const e = v.charAt(v.length - 1);
+ if ((s === e && s === '"') || s === "'") {
+ params[k] = v.substr(1, v.length - 2);
+ } else {
+ params[k] = v;
+ }
}
}
- });
+ );
return (this.contentDispositionParams = params);
}
diff --git a/multipart/multipart_test.ts b/multipart/multipart_test.ts
index 0c80b8841..ba4f05116 100644
--- a/multipart/multipart_test.ts
+++ b/multipart/multipart_test.ts
@@ -23,7 +23,7 @@ const boundary = "--abcde";
const dashBoundary = e.encode("--" + boundary);
const nlDashBoundary = e.encode("\r\n--" + boundary);
-test(function multipartScanUntilBoundary1() {
+test(function multipartScanUntilBoundary1(): void {
const data = `--${boundary}`;
const [n, err] = scanUntilBoundary(
e.encode(data),
@@ -36,7 +36,7 @@ test(function multipartScanUntilBoundary1() {
assertEquals(err, "EOF");
});
-test(function multipartScanUntilBoundary2() {
+test(function multipartScanUntilBoundary2(): void {
const data = `foo\r\n--${boundary}`;
const [n, err] = scanUntilBoundary(
e.encode(data),
@@ -49,7 +49,7 @@ test(function multipartScanUntilBoundary2() {
assertEquals(err, "EOF");
});
-test(function multipartScanUntilBoundary4() {
+test(function multipartScanUntilBoundary4(): void {
const data = `foo\r\n--`;
const [n, err] = scanUntilBoundary(
e.encode(data),
@@ -62,7 +62,7 @@ test(function multipartScanUntilBoundary4() {
assertEquals(err, null);
});
-test(function multipartScanUntilBoundary3() {
+test(function multipartScanUntilBoundary3(): void {
const data = `foobar`;
const [n, err] = scanUntilBoundary(
e.encode(data),
@@ -75,25 +75,25 @@ test(function multipartScanUntilBoundary3() {
assertEquals(err, null);
});
-test(function multipartMatchAfterPrefix1() {
+test(function multipartMatchAfterPrefix1(): void {
const data = `${boundary}\r`;
const v = matchAfterPrefix(e.encode(data), e.encode(boundary), null);
assertEquals(v, 1);
});
-test(function multipartMatchAfterPrefix2() {
+test(function multipartMatchAfterPrefix2(): void {
const data = `${boundary}hoge`;
const v = matchAfterPrefix(e.encode(data), e.encode(boundary), null);
assertEquals(v, -1);
});
-test(function multipartMatchAfterPrefix3() {
+test(function multipartMatchAfterPrefix3(): void {
const data = `${boundary}`;
const v = matchAfterPrefix(e.encode(data), e.encode(boundary), null);
assertEquals(v, 0);
});
-test(async function multipartMultipartWriter() {
+test(async function multipartMultipartWriter(): Promise<void> {
const buf = new Buffer();
const mw = new MultipartWriter(buf);
await mw.writeField("foo", "foo");
@@ -103,15 +103,15 @@ test(async function multipartMultipartWriter() {
await mw.close();
});
-test(function multipartMultipartWriter2() {
+test(function multipartMultipartWriter2(): void {
const w = new StringWriter();
assertThrows(
- () => new MultipartWriter(w, ""),
+ (): MultipartWriter => new MultipartWriter(w, ""),
Error,
"invalid boundary length"
);
assertThrows(
- () =>
+ (): MultipartWriter =>
new MultipartWriter(
w,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -120,52 +120,52 @@ test(function multipartMultipartWriter2() {
"invalid boundary length"
);
assertThrows(
- () => new MultipartWriter(w, "aaa aaa"),
+ (): MultipartWriter => new MultipartWriter(w, "aaa aaa"),
Error,
"invalid boundary character"
);
assertThrows(
- () => new MultipartWriter(w, "boundary¥¥"),
+ (): MultipartWriter => new MultipartWriter(w, "boundary¥¥"),
Error,
"invalid boundary character"
);
});
-test(async function multipartMultipartWriter3() {
+test(async function multipartMultipartWriter3(): Promise<void> {
const w = new StringWriter();
const mw = new MultipartWriter(w);
await mw.writeField("foo", "foo");
await mw.close();
await assertThrowsAsync(
- async () => {
+ async (): Promise<void> => {
await mw.close();
},
Error,
"closed"
);
await assertThrowsAsync(
- async () => {
+ async (): Promise<void> => {
await mw.writeFile("bar", "file", null);
},
Error,
"closed"
);
await assertThrowsAsync(
- async () => {
+ async (): Promise<void> => {
await mw.writeField("bar", "bar");
},
Error,
"closed"
);
assertThrows(
- () => {
+ (): void => {
mw.createFormField("bar");
},
Error,
"closed"
);
assertThrows(
- () => {
+ (): void => {
mw.createFormFile("bar", "file");
},
Error,
@@ -173,7 +173,7 @@ test(async function multipartMultipartWriter3() {
);
});
-test(async function multipartMultipartReader() {
+test(async function multipartMultipartReader(): Promise<void> {
// FIXME: path resolution
const o = await open(path.resolve("./multipart/fixtures/sample.txt"));
const mr = new MultipartReader(
@@ -188,7 +188,7 @@ test(async function multipartMultipartReader() {
assert(file.content !== void 0);
});
-test(async function multipartMultipartReader2() {
+test(async function multipartMultipartReader2(): Promise<void> {
const o = await open(path.resolve("./multipart/fixtures/sample.txt"));
const mr = new MultipartReader(
o,