foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): use primordials in ext/node/polyfills/string_decoder.ts (#24296)

Browse source
This commit is contained in:
Asher Gomez 2024-06-21 15:52:20 +10:00 committed by GitHub
parent b4939f3379
commit 9168078669
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/node/polyfills/string_decoder.ts
View file

@ -20,9 +20,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
// TODO(petamoriken): enable prefer-primordials for node polyfills
// deno-lint-ignore-file prefer-primordials
// Logic and comments translated pretty much one-to-one from node's impl // Logic and comments translated pretty much one-to-one from node's impl
// (https://github.com/nodejs/node/blob/ba06c5c509956dc413f91b755c1c93798bb700d4/src/string_decoder.cc) // (https://github.com/nodejs/node/blob/ba06c5c509956dc413f91b755c1c93798bb700d4/src/string_decoder.cc)
@ -35,11 +32,19 @@ import {
NodeError, NodeError,
} from "ext:deno_node/internal/errors.ts"; } from "ext:deno_node/internal/errors.ts";
import { primordials } from "ext:core/mod.js"; import { core, primordials } from "ext:core/mod.js";
const { const {
ArrayBufferIsView, ArrayBufferIsView,
ObjectDefineProperties, ObjectDefineProperties,
Symbol,
MathMin,
DataViewPrototypeGetBuffer,
ObjectPrototypeIsPrototypeOf,
String,
TypedArrayPrototypeGetBuffer,
StringPrototypeToLowerCase,
} = primordials; } = primordials;
const { isTypedArray } = core;
const { MAX_STRING_LENGTH } = constants; const { MAX_STRING_LENGTH } = constants;
@ -50,7 +55,7 @@ type Any = any;
function normalizeEncoding(enc?: string): string { function normalizeEncoding(enc?: string): string {
const encoding = castEncoding(enc ?? null); const encoding = castEncoding(enc ?? null);
if (!encoding) { if (!encoding) {
if (typeof enc !== "string" || enc.toLowerCase() !== "raw") { if (typeof enc !== "string" || StringPrototypeToLowerCase(enc) !== "raw") {
throw new ERR_UNKNOWN_ENCODING( throw new ERR_UNKNOWN_ENCODING(
enc as Any, enc as Any,
); );
@ -64,7 +69,8 @@ function normalizeEncoding(enc?: string): string {
*/ */
function isBufferType(buf: Buffer) { function isBufferType(buf: Buffer) {
return buf instanceof Buffer && buf.BYTES_PER_ELEMENT; return ObjectPrototypeIsPrototypeOf(Buffer.prototype, buf) &&
buf.BYTES_PER_ELEMENT;
} }
function normalizeBuffer(buf: Buffer) { function normalizeBuffer(buf: Buffer) {
@ -79,7 +85,9 @@ function normalizeBuffer(buf: Buffer) {
return buf; return buf;
} else { } else {
return Buffer.from( return Buffer.from(
buf.buffer, isTypedArray(buf)
? TypedArrayPrototypeGetBuffer(buf)
: DataViewPrototypeGetBuffer(buf),
); );
} }
} }
@ -94,6 +102,7 @@ function bufferToString(
if (len > MAX_STRING_LENGTH) { if (len > MAX_STRING_LENGTH) {
throw new NodeError("ERR_STRING_TOO_LONG", "string exceeds maximum length"); throw new NodeError("ERR_STRING_TOO_LONG", "string exceeds maximum length");
} }
// deno-lint-ignore prefer-primordials
return buf.toString(encoding as Any, start, end); return buf.toString(encoding as Any, start, end);
} }
@ -136,7 +145,7 @@ function decode(this: StringDecoder, buf: Buffer) {
} }
} }
const bytesToCopy = Math.min(buf.length - bufIdx, this[kMissingBytes]); const bytesToCopy = MathMin(buf.length - bufIdx, this[kMissingBytes]);
buf.copy( buf.copy(
this.lastChar, this.lastChar,
this[kBufferedBytes], this[kBufferedBytes],