Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: UTF-8 string encoding and decoding #34

Merged
merged 6 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions packages/typed-binary/src/io/bufferReader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ import type { ISerialInput } from './types';
import { unwrapBuffer } from './unwrapBuffer';

export class BufferReader extends BufferIOBase implements ISerialInput {
private _cachedTextDecoder: TextDecoder | undefined;

private get _textDecoder() {
if (!this._cachedTextDecoder) {
this._cachedTextDecoder = new TextDecoder(undefined, { fatal: true });
}
return this._cachedTextDecoder;
}

private copyInputToHelper(bytes: number) {
for (let i = 0; i < bytes; ++i) {
this.helperByteView[this.switchEndianness ? bytes - 1 - i : i] =
Expand Down Expand Up @@ -37,15 +46,21 @@ export class BufferReader extends BufferIOBase implements ISerialInput {
}

readString() {
let contents = '';

let char = String.fromCharCode(this.uint8View[this.byteOffset++]);
while (char !== '\0') {
contents += char;
char = String.fromCharCode(this.uint8View[this.byteOffset++]);
// Looking for the 'NULL' byte.
let end = this.byteOffset;
while (end < this.uint8View.byteLength) {
if (this.uint8View[end++] === 0) {
break;
}
}

return contents;
const result = this._textDecoder.decode(
this.uint8View.subarray(this.byteOffset, end - 1),
);

this.byteOffset = end;

return result;
}

readSlice(
Expand Down
17 changes: 14 additions & 3 deletions packages/typed-binary/src/io/bufferWriter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ import type { ISerialOutput } from './types';
import { unwrapBuffer } from './unwrapBuffer';

export class BufferWriter extends BufferIOBase implements ISerialOutput {
private _cachedTextEncoder: TextEncoder | undefined;

private get _textEncoder() {
if (!this._cachedTextEncoder) {
this._cachedTextEncoder = new TextEncoder();
}
return this._cachedTextEncoder;
}

private copyHelperToOutput(bytes: number) {
for (let i = 0; i < bytes; ++i)
this.uint8View[this.byteOffset++] =
Expand Down Expand Up @@ -36,9 +45,11 @@ export class BufferWriter extends BufferIOBase implements ISerialOutput {
}

writeString(value: string) {
for (let i = 0; i < value.length; ++i) {
this.uint8View[this.byteOffset++] = value.charCodeAt(i);
}
const result = this._textEncoder.encodeInto(
value,
this.uint8View.subarray(this.byteOffset),
);
this.byteOffset += result.written;

// Extra null character
this.uint8View[this.byteOffset++] = 0;
Expand Down
12 changes: 11 additions & 1 deletion packages/typed-binary/src/structure/baseTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ export class BoolSchema extends Schema<boolean> {
////

export class StringSchema extends Schema<string> {
private static _cachedEncoder: TextEncoder | undefined;

private static get _encoder() {
if (!StringSchema._cachedEncoder) {
StringSchema._cachedEncoder = new TextEncoder();
}
return StringSchema._cachedEncoder;
}

read(input: ISerialInput): string {
return input.readString();
}
Expand All @@ -55,7 +64,8 @@ export class StringSchema extends Schema<string> {
// A string cannot be bound
return measurer.unbounded;
}
return measurer.add(value.length + 1);
const encoded = StringSchema._encoder.encode(value);
return measurer.add(encoded.byteLength + 1);
}
}

Expand Down
3 changes: 3 additions & 0 deletions packages/typed-binary/src/test/object.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
object,
optional,
string,
u32,
} from '../describe';
import { type ISchema, MaxValue, type ObjectSchema } from '../structure';
import type { Parsed } from '../utilityTypes';
Expand All @@ -28,11 +29,13 @@ describe('ObjectSchema', () => {
const description = object({
value: i32,
label: string,
extra: u32,
});

const value = {
value: 70,
label: 'Banana',
extra: 43,
};

const { output, input } = makeIO(64);
Expand Down
12 changes: 12 additions & 0 deletions packages/typed-binary/src/test/string.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,16 @@ describe('StringSchema', () => {
const decoded = encodeAndDecode(string, value);
expect(decoded).to.equal(value);
});

it('should encode an emoji', () => {
const value = '⛓️‍💥';
const decoded = encodeAndDecode(string, value);
expect(decoded).to.equal(value);
});

it('should encode a unicode string', () => {
const value = 'A wonderful 🌞 sunny day! 🌲🌲🌲 Forest trip.';
const decoded = encodeAndDecode(string, value);
expect(decoded).to.equal(value);
});
});
Loading