refactor: use internal fromUint8 for output conversion

Author: ChALkeR

base32.js

@@ -1,6 +1,5 @@
 import { assertEmptyRest } from './assert.js'
-import { typedView } from './array.js'
-import { E_STRING } from './fallback/_utils.js'
+import { fromUint8, E_STRING } from './fallback/_utils.js'
 import * as js from './fallback/base32.js'
 
 // See https://datatracker.ietf.org/doc/html/rfc4648
@@ -19,7 +18,7 @@ function fromBase32common(str, mode, padding, format, rest) {
     throw new TypeError('Invalid padding option')
   }
 
-  return typedView(js.fromBase32(str, mode), format)
+  return fromUint8(js.fromBase32(str, mode), format)
 }
 
 // By default, valid padding is accepted but not required

base58.js

@@ -1,5 +1,4 @@
-import { typedView } from './array.js'
-import { assertU8, E_STRING } from './fallback/_utils.js'
+import { assertU8, fromUint8, E_STRING } from './fallback/_utils.js'
 import { nativeDecoder, nativeEncoder, isHermes } from './fallback/platform.js'
 import { encodeAscii, decodeAscii } from './fallback/latin1.js'
 
@@ -124,7 +123,7 @@ function toBase58core(arr, alphabet, codes) {
 function fromBase58core(str, alphabet, codes, format = 'uint8') {
   if (typeof str !== 'string') throw new TypeError(E_STRING)
   const length = str.length
-  if (length === 0) return typedView(new Uint8Array(), format)
+  if (length === 0) return fromUint8(new Uint8Array(), format)
 
   const zeroC = codes[0]
   let zeros = 0
@@ -211,7 +210,7 @@ function fromBase58core(str, alphabet, codes, format = 'uint8') {
     }
   }
 
-  return typedView(res.slice(at - zeros), format) // slice is faster for small sizes than subarray
+  return fromUint8(res.slice(at - zeros), format)
 }
 
 export const toBase58 = (arr) => toBase58core(arr, alphabet58, codes58)

fallback/_utils.js

@@ -18,3 +18,16 @@ export const toBuf = (x) =>
 
 export const E_STRING = 'Input is not a string'
 export const E_STRICT_UNICODE = 'Input is not well-formed Unicode'
+
+export function fromUint8(arr, format) {
+  switch (format) {
+    case 'uint8':
+      if (arr.constructor !== Uint8Array) throw new Error('Unexpected')
+      return arr
+    case 'buffer':
+      if (arr.length <= 64) return Buffer.from(arr)
+      return Buffer.from(arr.buffer, arr.byteOffset, arr.byteLength)
+  }
+
+  throw new TypeError('Unexpected format')
+}

fallback/base58check.js

@@ -1,6 +1,5 @@
-import { typedView } from '@exodus/bytes/array.js'
 import { toBase58, fromBase58 } from '@exodus/bytes/base58.js'
-import { assertU8 } from './_utils.js'
+import { assertU8, fromUint8 } from './_utils.js'
 
 const E_CHECKSUM = 'Invalid checksum'
 
@@ -34,7 +33,7 @@ export const makeBase58check = (hashAlgo, hashAlgoSync) => {
     async decode(str, format = 'uint8') {
       const [payload, checksum] = decodeWithChecksum(str)
       assertChecksum(checksum, await hashAlgo(payload))
-      return typedView(payload, format)
+      return fromUint8(payload, format)
     },
   }
   if (!hashAlgoSync) return apis
@@ -47,7 +46,7 @@ export const makeBase58check = (hashAlgo, hashAlgoSync) => {
     decodeSync(str, format = 'uint8') {
       const [payload, checksum] = decodeWithChecksum(str)
       assertChecksum(checksum, hashAlgoSync(payload))
-      return typedView(payload, format)
+      return fromUint8(payload, format)
     },
   }
 }

hex.js

@@ -1,5 +1,4 @@
-import { typedView } from './array.js'
-import { assertU8 } from './fallback/_utils.js'
+import { assertU8, fromUint8 } from './fallback/_utils.js'
 import * as js from './fallback/hex.js'
 
 const { toHex: webHex } = Uint8Array.prototype // Modern engines have this
@@ -13,5 +12,5 @@ export function toHex(arr) {
 
 // Unlike Buffer.from(), throws on invalid input
 export const fromHex = Uint8Array.fromHex
-  ? (str, format = 'uint8') => typedView(Uint8Array.fromHex(str), format)
-  : (str, format = 'uint8') => typedView(js.fromHex(str), format)
+  ? (str, format = 'uint8') => fromUint8(Uint8Array.fromHex(str), format)
+  : (str, format = 'uint8') => fromUint8(js.fromHex(str), format)

utf8.js

@@ -1,5 +1,4 @@
-import { typedView } from './array.js'
-import { assertU8, E_STRING, E_STRICT_UNICODE } from './fallback/_utils.js'
+import { assertU8, fromUint8, E_STRING, E_STRICT_UNICODE } from './fallback/_utils.js'
 import { nativeDecoder, nativeEncoder } from './fallback/platform.js'
 import * as js from './fallback/utf8.auto.js'
 
@@ -60,7 +59,7 @@ function decode(arr, loose = false) {
   return js.decodeFast(arr, loose)
 }
 
-export const utf8fromString = (str, format = 'uint8') => typedView(encode(str, false), format)
-export const utf8fromStringLoose = (str, format = 'uint8') => typedView(encode(str, true), format)
+export const utf8fromString = (str, format = 'uint8') => fromUint8(encode(str, false), format)
+export const utf8fromStringLoose = (str, format = 'uint8') => fromUint8(encode(str, true), format)
 export const utf8toString = (arr) => decode(arr, false)
 export const utf8toStringLoose = (arr) => decode(arr, true)