-
-
Notifications
You must be signed in to change notification settings - Fork 35.4k
util: graduate TextEncoder/TextDecoder, tests #15743
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
Closed
Closed
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
8792273
util: graduate TextEncoder/TextDecoder, tests
jasnell 86e5c6a
[Squash] Address feedback
jasnell c36e468
[Squash] nits
jasnell fee7160
[Squash]
jasnell df357d7
[Squash]
jasnell 9ce7e64
[Squash]
jasnell 52b6b94
[Squash]
jasnell 45f7c79
[Squash]
jasnell dcbcfa3
[Squash]
jasnell 795bb3e
[Squash]
jasnell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
util: graduate TextEncoder/TextDecoder, tests
Add tests ported from Web Platform Tests. Graduate TextEncoder / TextDecoder from experimental
- Loading branch information
commit 87922733c091d38a0919972574426fd7e68fcb90
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| 'use strict'; | ||
|
|
||
| // From: https://github.com/w3c/web-platform-tests/blob/master/encoding/textdecoder-fatal-streaming.html | ||
|
|
||
| const common = require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| TextDecoder | ||
| } = require('util'); | ||
|
|
||
|
|
||
| { | ||
| [ | ||
| { encoding: 'utf-8', sequence: [0xC0] }, | ||
| { encoding: 'utf-16le', sequence: [0x00] }, | ||
| { encoding: 'utf-16be', sequence: [0x00] } | ||
| ].forEach((testCase) => { | ||
| const data = new Uint8Array([testCase.sequence]); | ||
| common.expectsError( | ||
| () => { | ||
| const decoder = new TextDecoder(testCase.encoding, { fatal: true }); | ||
| decoder.decode(data); | ||
| }, { | ||
| code: 'ERR_ENCODING_INVALID_ENCODED_DATA', | ||
| type: TypeError, | ||
| message: | ||
| `The encoded data was not valid for encoding ${testCase.encoding}` | ||
| } | ||
| ); | ||
|
|
||
| assert.strictEqual( | ||
| new TextDecoder(testCase.encoding).decode(data), | ||
| '\uFFFD' | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| { | ||
| const decoder = new TextDecoder('utf-16le', { fatal: true }); | ||
| const odd = new Uint8Array([0x00]); | ||
| const even = new Uint8Array([0x00, 0x00]); | ||
|
|
||
| assert.strictEqual(decoder.decode(odd, { stream: true }), ''); | ||
| assert.strictEqual(decoder.decode(odd), '\u0000'); | ||
|
|
||
| common.expectsError( | ||
| () => { | ||
| decoder.decode(even, { stream: true }); | ||
| decoder.decode(odd); | ||
| }, { | ||
| code: 'ERR_ENCODING_INVALID_ENCODED_DATA', | ||
| type: TypeError, | ||
| message: | ||
| 'The encoded data was not valid for encoding utf-16le' | ||
| } | ||
| ); | ||
|
|
||
| common.expectsError( | ||
| () => { | ||
| decoder.decode(odd, { stream: true }); | ||
| decoder.decode(even); | ||
| }, { | ||
| code: 'ERR_ENCODING_INVALID_ENCODED_DATA', | ||
| type: TypeError, | ||
| message: | ||
| 'The encoded data was not valid for encoding utf-16le' | ||
| } | ||
| ); | ||
|
|
||
| assert.strictEqual(decoder.decode(even, { stream: true }), '\u0000'); | ||
| assert.strictEqual(decoder.decode(even), '\u0000'); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| 'use strict'; | ||
|
|
||
| // From: https://github.com/w3c/web-platform-tests/blob/master/encoding/api-surrogates-utf8.html | ||
|
|
||
| require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| TextDecoder, | ||
| TextEncoder | ||
| } = require('util'); | ||
|
|
||
| const badStrings = [ | ||
| { | ||
| input: 'abc123', | ||
| expected: [0x61, 0x62, 0x63, 0x31, 0x32, 0x33], | ||
| decoded: 'abc123', | ||
| name: 'Sanity check' | ||
| }, | ||
| { | ||
| input: '\uD800', | ||
| expected: [0xef, 0xbf, 0xbd], | ||
| decoded: '\uFFFD', | ||
| name: 'Surrogate half (low)' | ||
| }, | ||
| { | ||
| input: '\uDC00', | ||
| expected: [0xef, 0xbf, 0xbd], | ||
| decoded: '\uFFFD', | ||
| name: 'Surrogate half (high)' | ||
| }, | ||
| { | ||
| input: 'abc\uD800123', | ||
| expected: [0x61, 0x62, 0x63, 0xef, 0xbf, 0xbd, 0x31, 0x32, 0x33], | ||
| decoded: 'abc\uFFFD123', | ||
| name: 'Surrogate half (low), in a string' | ||
| }, | ||
| { | ||
| input: 'abc\uDC00123', | ||
| expected: [0x61, 0x62, 0x63, 0xef, 0xbf, 0xbd, 0x31, 0x32, 0x33], | ||
| decoded: 'abc\uFFFD123', | ||
| name: 'Surrogate half (high), in a string' | ||
| }, | ||
| { | ||
| input: '\uDC00\uD800', | ||
| expected: [0xef, 0xbf, 0xbd, 0xef, 0xbf, 0xbd], | ||
| decoded: '\uFFFD\uFFFD', | ||
| name: 'Wrong order' | ||
| } | ||
| ]; | ||
|
|
||
| badStrings.forEach((t) => { | ||
| const encoded = new TextEncoder().encode(t.input); | ||
| assert.deepStrictEqual([].slice.call(encoded), t.expected); | ||
| assert.strictEqual(new TextDecoder('utf-8').decode(encoded), t.decoded); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| 'use strict'; | ||
|
|
||
| // From: https://github.com/w3c/web-platform-tests/blob/master/encoding/textdecoder-fatal.html | ||
|
|
||
| const common = require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| TextDecoder | ||
| } = require('util'); | ||
|
|
||
| const bad = [ | ||
| { encoding: 'utf-8', input: [0xFF], name: 'invalid code' }, | ||
| { encoding: 'utf-8', input: [0xC0], name: 'ends early' }, | ||
| { encoding: 'utf-8', input: [0xE0], name: 'ends early 2' }, | ||
| { encoding: 'utf-8', input: [0xC0, 0x00], name: 'invalid trail' }, | ||
| { encoding: 'utf-8', input: [0xC0, 0xC0], name: 'invalid trail 2' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x00], name: 'invalid trail 3' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0xC0], name: 'invalid trail 4' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x80, 0x00], name: 'invalid trail 5' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x80, 0xC0], name: 'invalid trail 6' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80], | ||
| name: '> 0x10FFFF' }, | ||
| { encoding: 'utf-8', input: [0xFE, 0x80, 0x80, 0x80, 0x80, 0x80], | ||
| name: 'obsolete lead byte' }, | ||
| // Overlong encodings | ||
| { encoding: 'utf-8', input: [0xC0, 0x80], name: 'overlong U+0000 - 2 bytes' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x80, 0x80], | ||
| name: 'overlong U+0000 - 3 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF0, 0x80, 0x80, 0x80], | ||
| name: 'overlong U+0000 - 4 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x80, 0x80], | ||
| name: 'overlong U+0000 - 5 bytes' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80], | ||
| name: 'overlong U+0000 - 6 bytes' }, | ||
| { encoding: 'utf-8', input: [0xC1, 0xBF], name: 'overlong U+007F - 2 bytes' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x81, 0xBF], | ||
| name: 'overlong U+007F - 3 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF0, 0x80, 0x81, 0xBF], | ||
| name: 'overlong U+007F - 4 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x81, 0xBF], | ||
| name: 'overlong U+007F - 5 bytes' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x81, 0xBF], | ||
| name: 'overlong U+007F - 6 bytes' }, | ||
| { encoding: 'utf-8', input: [0xE0, 0x9F, 0xBF], | ||
| name: 'overlong U+07FF - 3 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF0, 0x80, 0x9F, 0xBF], | ||
| name: 'overlong U+07FF - 4 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF8, 0x80, 0x80, 0x9F, 0xBF], | ||
| name: 'overlong U+07FF - 5 bytes' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x9F, 0xBF], | ||
| name: 'overlong U+07FF - 6 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF0, 0x8F, 0xBF, 0xBF], | ||
| name: 'overlong U+FFFF - 4 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF8, 0x80, 0x8F, 0xBF, 0xBF], | ||
| name: 'overlong U+FFFF - 5 bytes' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x8F, 0xBF, 0xBF], | ||
| name: 'overlong U+FFFF - 6 bytes' }, | ||
| { encoding: 'utf-8', input: [0xF8, 0x84, 0x8F, 0xBF, 0xBF], | ||
| name: 'overlong U+10FFFF - 5 bytes' }, | ||
| { encoding: 'utf-8', input: [0xFC, 0x80, 0x84, 0x8F, 0xBF, 0xBF], | ||
| name: 'overlong U+10FFFF - 6 bytes' }, | ||
| // UTF-16 surrogates encoded as code points in UTF-8 | ||
| { encoding: 'utf-8', input: [0xED, 0xA0, 0x80], name: 'lead surrogate' }, | ||
| { encoding: 'utf-8', input: [0xED, 0xB0, 0x80], name: 'trail surrogate' }, | ||
| { encoding: 'utf-8', input: [0xED, 0xA0, 0x80, 0xED, 0xB0, 0x80], | ||
| name: 'surrogate pair' }, | ||
| { encoding: 'utf-16le', input: [0x00], name: 'truncated code unit' }, | ||
| // Mismatched UTF-16 surrogates are exercised in utf16-surrogates.html | ||
| // FIXME: Add legacy encoding cases | ||
| ]; | ||
|
|
||
| bad.forEach((t) => { | ||
| common.expectsError( | ||
| () => { | ||
| new TextDecoder(t.encoding, { fatal: true }) | ||
| .decode(new Uint8Array(t.input)); | ||
| }, { | ||
| code: 'ERR_ENCODING_INVALID_ENCODED_DATA', | ||
| type: TypeError | ||
| } | ||
| ); | ||
| }); | ||
|
|
||
| { | ||
| assert('fatal' in new TextDecoder()); | ||
| assert.strictEqual(typeof new TextDecoder().fatal, 'boolean'); | ||
| assert(!new TextDecoder().fatal); | ||
| assert(new TextDecoder('utf-8', { fatal: true }).fatal); | ||
| } |
42 changes: 42 additions & 0 deletions
42
test/parallel/test-whatwg-encoding-textdecoder-ignorebom.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| 'use strict'; | ||
|
|
||
| // From: https://github.com/w3c/web-platform-tests/blob/master/encoding/textdecoder-ignorebom.html | ||
|
|
||
| require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| TextDecoder | ||
| } = require('util'); | ||
|
|
||
| const cases = [ | ||
| { | ||
| encoding: 'utf-8', | ||
| bytes: [0xEF, 0xBB, 0xBF, 0x61, 0x62, 0x63] | ||
| }, | ||
| { | ||
| encoding: 'utf-16le', | ||
| bytes: [0xFF, 0xFE, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00] | ||
| }, | ||
| { | ||
| encoding: 'utf-16be', | ||
| bytes: [0xFE, 0xFF, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63] | ||
| } | ||
| ]; | ||
|
|
||
| cases.forEach((testCase) => { | ||
| const BOM = '\uFEFF'; | ||
| let decoder = new TextDecoder(testCase.encoding, { ignoreBOM: true }); | ||
| const bytes = new Uint8Array(testCase.bytes); | ||
| assert.strictEqual(decoder.decode(bytes), `${BOM}abc`); | ||
| decoder = new TextDecoder(testCase.encoding, { ignoreBOM: false }); | ||
| assert.strictEqual(decoder.decode(bytes), 'abc'); | ||
| decoder = new TextDecoder(testCase.encoding); | ||
| assert.strictEqual(decoder.decode(bytes), 'abc'); | ||
| }); | ||
|
|
||
| { | ||
| assert('ignoreBOM' in new TextDecoder()); | ||
| assert.strictEqual(typeof new TextDecoder().ignoreBOM, 'boolean'); | ||
| assert(!new TextDecoder().ignoreBOM); | ||
| assert(new TextDecoder('utf-8', { ignoreBOM: true }).ignoreBOM); | ||
| } |
44 changes: 44 additions & 0 deletions
44
test/parallel/test-whatwg-encoding-textdecoder-streaming.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| 'use strict'; | ||
|
|
||
| // From: https://github.com/w3c/web-platform-tests/blob/master/encoding/textdecoder-streaming.html | ||
|
|
||
| require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| TextDecoder | ||
| } = require('util'); | ||
|
|
||
| const string = | ||
| '\x00123ABCabc\x80\xFF\u0100\u1000\uFFFD\uD800\uDC00\uDBFF\uDFFF'; | ||
| const octets = { | ||
| 'utf-8': [ | ||
| 0x00, 0x31, 0x32, 0x33, 0x41, 0x42, 0x43, 0x61, 0x62, 0x63, 0xc2, 0x80, | ||
| 0xc3, 0xbf, 0xc4, 0x80, 0xe1, 0x80, 0x80, 0xef, 0xbf, 0xbd, 0xf0, 0x90, | ||
| 0x80, 0x80, 0xf4, 0x8f, 0xbf, 0xbf], | ||
| 'utf-16le': [ | ||
| 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x41, 0x00, 0x42, 0x00, | ||
| 0x43, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x80, 0x00, 0xFF, 0x00, | ||
| 0x00, 0x01, 0x00, 0x10, 0xFD, 0xFF, 0x00, 0xD8, 0x00, 0xDC, 0xFF, 0xDB, | ||
| 0xFF, 0xDF], | ||
| 'utf-16be': [ | ||
| 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x41, 0x00, 0x42, | ||
| 0x00, 0x43, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x80, 0x00, 0xFF, | ||
| 0x01, 0x00, 0x10, 0x00, 0xFF, 0xFD, 0xD8, 0x00, 0xDC, 0x00, 0xDB, 0xFF, | ||
| 0xDF, 0xFF] | ||
| }; | ||
|
|
||
| Object.keys(octets).forEach((encoding) => { | ||
| for (let len = 1; len <= 5; ++len) { | ||
| const encoded = octets[encoding]; | ||
| const decoder = new TextDecoder(encoding); | ||
| let out = ''; | ||
| for (let i = 0; i < encoded.length; i += len) { | ||
| const sub = []; | ||
| for (let j = i; j < encoded.length && j < i + len; ++j) | ||
| sub.push(encoded[j]); | ||
| out += decoder.decode(new Uint8Array(sub), { stream: true }); | ||
| } | ||
| out += decoder.decode(); | ||
| assert.strictEqual(out, string); | ||
| } | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these be like https://github.com/nodejs/node/blob/c5f243a5f5417af24c10b294d1d57d5dbf64fea3/test/parallel/test-whatwg-url-searchparams-append.js#L8-L13?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, the URL tests use a completely different format. These had to be ported over to work with out test suite.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you put the link to a specific sha instead of
blob/master? Otherwise we lose track of the version of the test and if the upstream deletes a file it would be 404