foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext): use String#toWellFormed in ext/webidl and ext/node (#21054)

Browse source 
Fixes #18802 

This PR adds `util.toUSVString` to node:util:

```js
import util from "node:util";
util.toUSVString("string\ud801"); // => "string\ufffd"
```
This commit is contained in:
Kenta Moriuchi 2023-11-07 06:18:28 +09:00 committed by GitHub
parent 7eb34c7a36
commit 90189dd997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/tests/node_compat/test/parallel/test-util.js
View file

@ -161,8 +161,7 @@ assert.strictEqual(util.isFunction(function() {}), true);
assert.strictEqual(util.isFunction(), false);
assert.strictEqual(util.isFunction('string'), false);
// TODO(wafuwafu13): Enable this when `toUSVString` is ready.
// assert.strictEqual(util.toUSVString('string\ud801'), 'string\ufffd');
assert.strictEqual(util.toUSVString('string\ud801'), 'string\ufffd');
{
assert.strictEqual(util.types.isNativeError(new Error()), true);

8
cli/tests/unit_node/util_test.ts
View file

@ -208,6 +208,14 @@ Deno.test({
},
});
Deno.test({
name: "[util] toUSVString",
fn() {
assertEquals(util.toUSVString("foo"), "foo");
assertEquals(util.toUSVString("bar\ud801"), "bar\ufffd");
},
});
Deno.test({
name: "[util] isDate",
fn() {

10
ext/node/polyfills/util.ts
View file

@ -37,7 +37,9 @@ const {
SafeSet,
SetPrototypeAdd,
SetPrototypeHas,
StringPrototypeIsWellFormed,
StringPrototypePadStart,
StringPrototypeToWellFormed,
} = primordials;
export {
@ -187,6 +189,13 @@ export const TextDecoder = _TextDecoder;
export type TextEncoder = import("./_utils.ts")._TextEncoder;
export const TextEncoder = _TextEncoder;
export function toUSVString(str: string): string {
if (StringPrototypeIsWellFormed(str)) {
return str;
}
return StringPrototypeToWellFormed(str);
}
function pad(n: number) {
return StringPrototypePadStart(NumberPrototypeToString(n), 2, "0");
}
@ -309,6 +318,7 @@ export default {
stripVTControlCharacters,
TextDecoder,
TextEncoder,
toUSVString,
log,
debuglog,
isDeepStrictEqual,

26
ext/webidl/00_webidl.js
View file

@ -70,8 +70,8 @@ const {
// TODO(lucacasonato): add SharedArrayBuffer to primordials
// SharedArrayBufferPrototype
String,
StringFromCodePoint,
StringPrototypeCharCodeAt,
StringPrototypeToWellFormed,
Symbol,
SymbolIterator,
SymbolToStringTag,
@ -425,29 +425,7 @@ converters.ByteString = (V, prefix, context, opts) => {
converters.USVString = (V, prefix, context, opts) => {
const S = converters.DOMString(V, prefix, context, opts);
const n = S.length;
let U = "";
for (let i = 0; i < n; ++i) {
const c = StringPrototypeCharCodeAt(S, i);
if (c < 0xd800 || c > 0xdfff) {
U += StringFromCodePoint(c);
} else if (0xdc00 <= c && c <= 0xdfff) {
U += StringFromCodePoint(0xfffd);
} else if (i === n - 1) {
U += StringFromCodePoint(0xfffd);
} else {
const d = StringPrototypeCharCodeAt(S, i + 1);
if (0xdc00 <= d && d <= 0xdfff) {
const a = c & 0x3ff;
const b = d & 0x3ff;
U += StringFromCodePoint((2 << 15) + (2 << 9) * a + b);
++i;
} else {
U += StringFromCodePoint(0xfffd);
}
}
}
return U;
return StringPrototypeToWellFormed(S);
};
converters.object = (V, prefix, context, _opts) => {