Skip to content
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
32 changes: 32 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Tests

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
javascript:
name: JavaScript Tests
runs-on: ubuntu-latest

defaults:
run:
working-directory: javascript

steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
cache-dependency-path: javascript/package-lock.json

- name: Install dependencies
run: npm ci

- name: Run tests
run: npm test
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
!examples/*.json
!examples/*.beve

# Allow package.json in javascript
!javascript/package.json
!javascript/package-lock.json

# JavaScript
javascript/node_modules/

# Added by cargo

/target
Expand Down
33 changes: 23 additions & 10 deletions javascript/beve.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,12 @@
}

function read_compressed() {
const header = buffer[cursor++];
const header = buffer[cursor];
const config = header & 0b00000011;

switch (config) {
case 0:
cursor += 1;
return header >> 2;
case 1: {
const h = new DataView(buffer.buffer, cursor, 2);
Expand All @@ -323,8 +324,9 @@
case 3: {
let val = BigInt(0);
for (let i = 0; i < 8; ++i) {
val |= BigInt(buffer[cursor++]) << BigInt(8 * i);
val |= BigInt(buffer[cursor + i]) << BigInt(8 * i);
}
cursor += 8;
return Number(val >> BigInt(2));
}
default:
Expand Down Expand Up @@ -498,7 +500,10 @@
}

function write_value(writer, value) {
if (Array.isArray(value) && value.length > 1 && typeof value[0] === 'number') {
if (value === null || value === undefined) {
// null header: type 0, is_bool = 0
writer.append_uint8(0);
} else if (Array.isArray(value) && value.length > 1 && value.every(v => typeof v === 'number')) {
let header = 4;
if (typeof value[0] === 'number' && !Number.isInteger(value[0])) {
header |= 0b01100000; // float64_t (double)
Expand Down Expand Up @@ -528,26 +533,34 @@
} else if (typeof value === 'string') {
let header = 2;
writer.append_uint8(header);
writeCompressed(writer, value.length);
writer.append(value);
const bytes = new TextEncoder().encode(value);
writeCompressed(writer, bytes.length);
writer.ensureCapacity(bytes.length);
writer.buffer.set(bytes, writer.offset);
writer.offset += bytes.length;
} else if (Array.isArray(value)) {
let header = 5;
writer.append_uint8(header);
writeCompressed(writer, value.length);
for (let i = 0; i < value.length; i++) {
write_value(writer, value[i]);
}
} else if (typeof value === 'object' && Object.keys(value).length > 0) {
} else if (typeof value === 'object') {
// Filter out undefined values (matching JSON.stringify behavior)
const keys = Object.keys(value).filter(k => value[k] !== undefined);
let header = 3;
let keyType = 0; // Assuming keys are always strings
let isSigned = false;
header |= keyType << 3;
header |= isSigned << 5;
writer.append_uint8(header);
writeCompressed(writer, Object.keys(value).length);
for (const key in value) {
writeCompressed(writer, key.length);
writer.append(key);
writeCompressed(writer, keys.length);
for (const key of keys) {
const keyBytes = new TextEncoder().encode(key);
writeCompressed(writer, keyBytes.length);
writer.ensureCapacity(keyBytes.length);
writer.buffer.set(keyBytes, writer.offset);
writer.offset += keyBytes.length;
write_value(writer, value[key]);
}
} else {
Expand Down
Loading