Simplify the use of Text Encoding features

gfx · gfx · commit 729f05a635de · 2020-09-27T21:48:08.000+09:00
diff --git a/src/Decoder.ts b/src/Decoder.ts
@@ -1,7 +1,7 @@
 import { prettyByte } from "./utils/prettyByte";
 import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec";
 import { getInt64, getUint64 } from "./utils/int";
-import { utf8DecodeJs, TEXT_ENCODING_AVAILABLE, TEXT_DECODER_THRESHOLD, utf8DecodeTD } from "./utils/utf8";
+import { utf8DecodeJs, TEXT_DECODER_THRESHOLD, utf8DecodeTD } from "./utils/utf8";
 import { createDataView, ensureUint8Array } from "./utils/typedArrays";
 import { CachedKeyDecoder, KeyDecoder } from "./CachedKeyDecoder";
 
@@ -492,7 +492,7 @@ export class Decoder<ContextType> {
     let object: string;
     if (this.stateIsMapKey() && this.keyDecoder?.canBeCached(byteLength)) {
       object = this.keyDecoder.decode(this.bytes, offset, byteLength);
-    } else if (TEXT_ENCODING_AVAILABLE && byteLength > TEXT_DECODER_THRESHOLD) {
+    } else if (byteLength > TEXT_DECODER_THRESHOLD) {
       object = utf8DecodeTD(this.bytes, offset, byteLength);
     } else {
       object = utf8DecodeJs(this.bytes, offset, byteLength);
diff --git a/src/Encoder.ts b/src/Encoder.ts
@@ -1,4 +1,4 @@
-import { utf8EncodeJs, utf8Count, TEXT_ENCODING_AVAILABLE, TEXT_ENCODER_THRESHOLD, utf8EncodeTE } from "./utils/utf8";
+import { utf8EncodeJs, utf8Count, TEXT_ENCODER_THRESHOLD, utf8EncodeTE } from "./utils/utf8";
 import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec";
 import { setInt64, setUint64 } from "./utils/int";
 import { ensureUint8Array } from "./utils/typedArrays";
@@ -169,7 +169,7 @@ export class Encoder<ContextType> {
     const maxHeaderSize = 1 + 4;
     const strLength = object.length;
 
-    if (TEXT_ENCODING_AVAILABLE && strLength > TEXT_ENCODER_THRESHOLD) {
+    if (strLength > TEXT_ENCODER_THRESHOLD) {
       const byteLength = utf8Count(object);
       this.ensureBufferSizeToWrite(maxHeaderSize + byteLength);
       this.writeStringHeader(byteLength);
diff --git a/src/utils/utf8.ts b/src/utils/utf8.ts
@@ -1,9 +1,11 @@
-export const TEXT_ENCODING_AVAILABLE =
+const TEXT_ENCODING_AVAILABLE =
   typeof process !== "undefined" &&
   process.env.TEXT_ENCODING !== "never" &&
   typeof TextEncoder !== "undefined" &&
   typeof TextDecoder !== "undefined";
 
+const STR_SIZE_MAX = 0xffff_ffff; // uint32_max
+
 export function utf8Count(str: string): number {
   const strLength = str.length;
 
@@ -88,7 +90,11 @@ export function utf8EncodeJs(str: string, output: Uint8Array, outputOffset: numb
 }
 
 const sharedTextEncoder = TEXT_ENCODING_AVAILABLE ? new TextEncoder() : undefined;
-export const TEXT_ENCODER_THRESHOLD = typeof process !== "undefined" && process.env.TEXT_ENCODING !== "force" ? 200 : 0;
+export const TEXT_ENCODER_THRESHOLD = !TEXT_ENCODING_AVAILABLE
+  ? STR_SIZE_MAX
+  : typeof process !== "undefined" && process.env.TEXT_ENCODING !== "force"
+  ? 200
+  : 0;
 
 function utf8EncodeTEencode(str: string, output: Uint8Array, outputOffset: number): void {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -154,7 +160,11 @@ export function utf8DecodeJs(bytes: Uint8Array, inputOffset: number, byteLength:
 }
 
 const sharedTextDecoder = TEXT_ENCODING_AVAILABLE ? new TextDecoder() : null;
-export const TEXT_DECODER_THRESHOLD = typeof process !== "undefined" && process.env.TEXT_DECODER !== "force" ? 200 : 0;
+export const TEXT_DECODER_THRESHOLD = !TEXT_ENCODING_AVAILABLE
+  ? STR_SIZE_MAX
+  : typeof process !== "undefined" && process.env.TEXT_DECODER !== "force"
+  ? 200
+  : 0;
 
 export function utf8DecodeTD(bytes: Uint8Array, inputOffset: number, byteLength: number): string {
   const stringBytes = bytes.subarray(inputOffset, inputOffset + byteLength);
