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

[node.js compat] latin1 & ascii encoding for Buffer

Browse Source
This commit is contained in:
Jarred Sumner
2022-08-03 21:11:20 -07:00
parent 290fb7f7e7
commit b310d7c40d
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bun.js/bindings/JSBuffer.cpp
View File

@@ -201,13 +201,13 @@ static inline JSC::EncodedJSValue jsBufferConstructorFunction_allocUnsafeBody(JS
RELEASE_AND_RETURN(throwScope, JSBuffer__bufferFromLength(lexicalGlobalObject, length));
}
EncodedJSValue JSBuffer__bufferFromPointerAndLength(JSC::JSGlobalObject* lexicalGlobalObject, char* ptr, unsigned int length)
EncodedJSValue JSBuffer__bufferFromPointerAndLength(JSC::JSGlobalObject* lexicalGlobalObject, const unsigned char* ptr, unsigned int length)
{
JSC::JSUint8Array* uint8Array;
if (LIKELY(length > 0)) {
auto buffer = ArrayBuffer::createFromBytes(ptr, length, nullptr);
auto buffer = ArrayBuffer::create(ptr, length);
uint8Array = JSC::JSUint8Array::create(lexicalGlobalObject, lexicalGlobalObject->typedArrayStructure(JSC::TypeUint8), WTFMove(buffer), 0, length);
} else {
@@ -273,7 +273,8 @@ static inline JSC::EncodedJSValue constructBufferFromStringAndEncoding(JSC::JSGl
case WebCore::BufferEncodingType::ascii: {
if (view.is8Bit()) {
result = Bun__encoding__constructFromLatin1AsASCII(lexicalGlobalObject, view.characters8(), view.length());
// ascii is a noop for latin1
result = JSBuffer__bufferFromPointerAndLength(lexicalGlobalObject, view.characters8(), view.length());
} else {
result = Bun__encoding__constructFromUTF16AsASCII(lexicalGlobalObject, view.characters16(), view.length());
}
@@ -281,7 +282,9 @@ static inline JSC::EncodedJSValue constructBufferFromStringAndEncoding(JSC::JSGl
}
case WebCore::BufferEncodingType::latin1: {
if (view.is8Bit()) {
result = Bun__encoding__constructFromLatin1AsASCII(lexicalGlobalObject, view.characters8(), view.length());
// The native encoding is latin1
// so we don't need to do any conversion.
result = JSBuffer__bufferFromPointerAndLength(lexicalGlobalObject, view.characters8(), view.length());
} else {
result = Bun__encoding__constructFromUTF16AsASCII(lexicalGlobalObject, view.characters16(), view.length());
}
@@ -292,7 +295,9 @@ static inline JSC::EncodedJSValue constructBufferFromStringAndEncoding(JSC::JSGl
if (view.is8Bit()) {
result = Bun__encoding__constructFromLatin1AsUTF16(lexicalGlobalObject, view.characters8(), view.length());
} else {
result = Bun__encoding__constructFromUTF16AsUTF16(lexicalGlobalObject, view.characters16(), view.length());
// The native encoding is UTF-16
// so we don't need to do any conversion.
result = JSBuffer__bufferFromPointerAndLength(lexicalGlobalObject, reinterpret_cast<const unsigned char*>(view.characters16()), view.length() * 2);
}
break;
}

14
test/bun.js/buffer.test.js
View File

@@ -162,13 +162,13 @@ it("Buffer.from", () => {
});
it("Buffer.from latin1 vs ascii", () => {
const simpleBuffer = Buffer.from('\xa4', 'binary');
expect(simpleBuffer.toString("latin1").toBe("¤"));
expect(simpleBuffer.toString('ascii').toBe("$"));
const asciiBuffer = Buffer.from('\xa4', 'ascii');
expect(asciiBuffer.toString("latin1").toBe("¤"));
expect(asciiBuffer.toString('ascii').toBe("$"));
const simpleBuffer = Buffer.from("\xa4", "binary");
expect(simpleBuffer.toString("latin1")).toBe("¤");
expect(simpleBuffer.toString("ascii")).toBe("$");
gc();
const asciiBuffer = Buffer.from("\xa4", "ascii");
expect(asciiBuffer.toString("latin1")).toBe("¤");
expect(asciiBuffer.toString("ascii")).toBe("$");
gc();
});