mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

get name if not provided in FormData.append (#4434)

Browse Source 
* get file name from blob if not provided

* add test

* another test

* format
This commit is contained in:
Dylan Conway
2023-08-31 17:33:08 -07:00
committed by GitHub
parent bd7262f037
commit fef70f2473
4 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bench/snippets/cp-r.mjs
View File

@@ -1,4 +1,3 @@
import { cp } from "fs/promises";
await cp(process.argv[2], process.argv[3], { recursive: true });

10
src/bun.js/bindings/webcore/JSDOMFormData.cpp
View File

@@ -286,6 +286,8 @@ static inline JSC::EncodedJSValue jsDOMFormDataPrototypeFunction_append1Body(JSC
RELEASE_AND_RETURN(throwScope, JSValue::encode(toJS<IDLUndefined>(*lexicalGlobalObject, throwScope, [&]() -> decltype(auto) { return impl.append(WTFMove(name), WTFMove(value)); })));
}
extern "C" BunString Blob__getFileNameString(void* impl);
static inline JSC::EncodedJSValue jsDOMFormDataPrototypeFunction_append2Body(JSC::JSGlobalObject* lexicalGlobalObject, JSC::CallFrame* callFrame, typename IDLOperation<JSDOMFormData>::ClassParameter castedThis)
{
auto& vm = JSC::getVM(lexicalGlobalObject);
@@ -298,10 +300,6 @@ static inline JSC::EncodedJSValue jsDOMFormDataPrototypeFunction_append2Body(JSC
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
EnsureStillAliveScope argument1 = callFrame->uncheckedArgument(1);
EnsureStillAliveScope argument2 = callFrame->argument(2);
auto filename = argument2.value().isUndefined() ? String() : convert<IDLUSVString>(*lexicalGlobalObject, argument2.value());
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
RefPtr<Blob> blobValue = nullptr;
if (argument1.value().inherits<JSBlob>()) {
blobValue = Blob::create(argument1.value());
@@ -312,6 +310,10 @@ static inline JSC::EncodedJSValue jsDOMFormDataPrototypeFunction_append2Body(JSC
}
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
EnsureStillAliveScope argument2 = callFrame->argument(2);
auto filename = argument2.value().isUndefined() ? Bun::toWTFString(Blob__getFileNameString(blobValue->impl())) : convert<IDLUSVString>(*lexicalGlobalObject, argument2.value());
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
RELEASE_AND_RETURN(throwScope, JSValue::encode(toJS<IDLUndefined>(*lexicalGlobalObject, throwScope, [&]() -> decltype(auto) { return impl.append(WTFMove(name), WTFMove(blobValue), WTFMove(filename)); })));
}

9
src/bun.js/webcore/blob.zig
View File

@@ -510,11 +510,20 @@ pub const Blob = struct {
this.finalize();
}
export fn Blob__getFileNameString(this: *Blob) callconv(.C) bun.String {
if (this.getFileName()) |filename| {
return bun.String.fromBytes(filename);
}
return bun.String.empty;
}
comptime {
_ = Blob__dupeFromJS;
_ = Blob__destroy;
_ = Blob__dupe;
_ = Blob__setAsFile;
_ = Blob__getFileNameString;
}
pub fn writeFormatForSize(size: usize, writer: anytype, comptime enable_ansi_colors: bool) !void {

30
test/js/web/html/FormData.test.ts
View File

@@ -36,6 +36,36 @@ describe("FormData", () => {
expect(formData.getAll("foo")[0]).toBe("bar");
});
it("should get filename from file", async () => {
const blob = new Blob(["bar"]);
const formData = new FormData();
formData.append("foo", blob);
// @ts-expect-error
expect(formData.get("foo").name).toBeUndefined();
formData.append("foo2", new File([blob], "foo.txt"));
// @ts-expect-error
expect(formData.get("foo2").name).toBe("foo.txt");
});
it("should use the correct filenames", async () => {
const blob = new Blob(["bar"]) as any;
const form = new FormData();
form.append("foo", blob);
expect(blob.name).toBeUndefined();
let b1 = form.get("foo") as any;
expect(blob.name).toBeUndefined();
expect(b1.name).toBeUndefined();
form.set("foo", b1, "foo.txt");
expect(blob.name).toBeUndefined();
expect(b1.name).toBeUndefined();
b1 = form.get("foo") as Blob;
expect(blob.name).toBeUndefined();
expect(b1.name).toBe("foo.txt");
});
const multipartFormDataFixturesRawBody = [
{
name: "simple",