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.

Sign up for GitHub

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

Jump to bottom

fix: binary data not working as described (fixes #289, #231) #299

Merged
merged 3 commits into from
Jul 13, 2022
Merged

fix: binary data not working as described (fixes #289, #231) #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
975eecd
Fix binary data as input in byte mode
RenovatingDev Jan 31, 2022
702296a
Add test for ByteData accepting Uint8ClampedArray
RenovatingDev Jan 31, 2022
66a7bef
Add test for binary data like in README.md
RenovatingDev Jan 31, 2022
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
5 changes: 4 additions & 1 deletion lib/core/byte-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ const Mode = require('./mode')

function ByteData (data) {
this.mode = Mode.BYTE
this.data = new Uint8Array(encodeUtf8(data))
if (typeof (data) === 'string') {
data = encodeUtf8(data)
}
this.data = new Uint8Array(data)
}

ByteData.getBitsLength = function getBitsLength (length) {
Expand Down
28 changes: 28 additions & 0 deletions test/e2e/toString.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,31 @@ test('toString terminal', function (t) {
t.equal(code + '\n', expectedTerminal, 'should output a valid symbol (promise)')
})
})

test('toString byte-input', function (t) {
const expectedOutput = [
' ',
' ',
' █▀▀▀▀▀█ █▄█▀ █▀▀▀▀▀█ ',
' █ ███ █ ▀█ █▀ █ ███ █ ',
' █ ▀▀▀ █ ▀ █ █ ▀▀▀ █ ',
' ▀▀▀▀▀▀▀ █▄▀▄█ ▀▀▀▀▀▀▀ ',
' ▀██▄██▀▀▀█▀▀ ▀█ ▄▀▄ ',
' ▀█▀▄█▄▀▄ ██ ▀ ▄ ▀▄ ▀ ',
' ▀ ▀ ▀▀▀▀█▄ ▄▀▄▀▄▀▄▀▄▀ ',
' █▀▀▀▀▀█ █ █▄█▀█▄█ ▀ ',
' █ ███ █ ▀█▀▀ ▀██ ▀█▀ ',
' █ ▀▀▀ █ ██▀ ▀ ▄ ▀▄▀▄▀ ',
' ▀▀▀▀▀▀▀ ▀▀▀ ▀ ▀▀▀ ▀▀▀ ',
' ',
' '
].join('\n')
const byteInput = new Uint8ClampedArray([1, 2, 3, 4, 5])

t.plan(2)

QRCode.toString([{ data: byteInput, mode: 'byte' }], { errorCorrectionLevel: 'L' }, (err, code) => {
t.ok(!err, 'there should be no error')
t.equal(code, expectedOutput, 'should output the correct code')
})
})
16 changes: 15 additions & 1 deletion test/unit/core/byte-data.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const BitBuffer = require('core/bit-buffer')
const ByteData = require('core/byte-data')
const Mode = require('core/mode')

test('Byte Data', function (t) {
test('Byte Data: String Input', function (t) {
const text = '1234'
const textBitLength = 32
const textByte = [49, 50, 51, 52] // 1, 2, 3, 4
Expand All @@ -24,3 +24,17 @@ test('Byte Data', function (t) {

t.end()
})

test('Byte Data: Byte Input', function (t) {
const bytes = new Uint8ClampedArray([1, 231, 32, 22])

const byteData = new ByteData(bytes)
t.equal(byteData.getLength(), bytes.length, 'Should return correct length')
t.equal(byteData.getBitsLength(), bytes.length * 8, 'Should return correct bit length')

const bitBuffer = new BitBuffer()
byteData.write(bitBuffer)
t.deepEqual(bitBuffer.buffer, bytes, 'Should write correct data to buffer')

t.end()
})