@xylabs/hex 2.13.20 → 2.13.21

package/src/hex/{from.ts → from/from.ts}

@@ -1,8 +1,8 @@
 import { isArrayBuffer } from '@xylabs/arraybuffer'
 
-import { isHex } from './is'
-import { HexConfig } from './model'
-import { bitsToNibbles } from './nibble'
+import { HexConfig } from '../model'
+import { bitsToNibbles } from '../nibble'
+import { hexFromHexString } from './fromHexString'
 
 export const hexFromArrayBuffer = (buffer: ArrayBuffer, config?: HexConfig): string => {
   const unPadded = [...new Uint8Array(buffer)].map((x) => x.toString(16).padStart(2, '0')).join('')
@@ -20,33 +20,26 @@ export const hexFromNumber = (value: number, config?: HexConfig): string => {
   return hexFromBigInt(BigInt(value), config)
 }
 
-export const hexFromHexString = (value: string, config: HexConfig = {}): string => {
-  const { prefix = false, byteSize = 8 } = config
-  const nibbleBoundary = bitsToNibbles(byteSize)
-  const unPadded = (value.startsWith('0x') ? value.substring(2) : value).toLowerCase()
-  if (isHex(unPadded)) {
-    const padded = unPadded.padStart(unPadded.length + (unPadded.length % nibbleBoundary), '0')
-    return prefix ? `0x${padded}` : padded
-  } else {
-    throw Error('Received string is not a value hex')
-  }
-}
-
 export const hexFrom = (value: unknown, config?: HexConfig): string => {
   switch (typeof value) {
-    case 'string':
+    case 'string': {
       return hexFromHexString(value, config)
-    case 'bigint':
+    }
+    case 'bigint': {
       return hexFromBigInt(value, config)
-    case 'number':
+    }
+    case 'number': {
       return hexFromNumber(value, config)
-    case 'object':
+    }
+    case 'object': {
       if (isArrayBuffer(value)) {
         return hexFromArrayBuffer(value, config)
       } else {
-        throw Error('Invalid type: object !== ArrayBuffer')
+        throw new Error('Invalid type: object !== ArrayBuffer')
       }
-    default:
-      throw Error(`Invalid type: ${typeof value}`)
+    }
+    default: {
+      throw new Error(`Invalid type: ${typeof value}`)
+    }
   }
 }

package/src/hex/from/fromHexString.ts

@@ -0,0 +1,15 @@
+import { isHex } from '../is'
+import { HexConfig } from '../model'
+import { bitsToNibbles } from '../nibble'
+
+export const hexFromHexString = (value: string, config: HexConfig = {}): string => {
+  const { prefix = false, byteSize = 8 } = config
+  const nibbleBoundary = bitsToNibbles(byteSize)
+  const unPadded = (value.startsWith('0x') ? value.slice(2) : value).toLowerCase()
+  if (isHex(unPadded)) {
+    const padded = unPadded.padStart(unPadded.length + (unPadded.length % nibbleBoundary), '0')
+    return prefix ? `0x${padded}` : padded
+  } else {
+    throw new Error('Received string is not a value hex')
+  }
+}

package/src/hex/from/index.ts

@@ -0,0 +1,2 @@
+export * from './from'
+export * from './fromHexString'

package/src/hex/index.ts

@@ -1,6 +1,7 @@
 export * from './as'
 export * from './from'
 export * from './is'
+export * from './isHexZero'
 export * from './legacy'
 export * from './model'
 export * from './nibble'

package/src/hex/is.ts

@@ -1,19 +1,16 @@
-import { hexFromHexString } from './from'
-import { Hex } from './model'
+import { Hex, HexConfig } from './model'
 import { bitsToNibbles } from './nibble'
-import { hexRegex } from './regex'
+import { hexRegex, hexRegexWithPrefix } from './regex'
 
-export const isHexZero = (value: string) => {
-  return BigInt(hexFromHexString(value, { prefix: true })) === 0n
-}
-
-export const isHex = (value: unknown, bitLength?: number): value is Hex => {
+export const isHex = (value: unknown, config?: HexConfig): value is Hex => {
   //Is it a string?
   if (typeof value !== 'string') return false
 
+  const valueCharLength = config?.prefix ? value.length - 2 : value.length
+
   //If a bitLength specified, does it conform?
-  if (bitLength !== undefined && value.length !== bitsToNibbles(bitLength)) return false
+  if (config?.bitLength !== undefined && valueCharLength !== bitsToNibbles(config?.bitLength)) return false
 
   //Does it only has hex values?
-  return hexRegex.test(value)
+  return config?.prefix ? hexRegexWithPrefix.test(value) : hexRegex.test(value)
 }

package/src/hex/isHexZero.ts

@@ -0,0 +1,5 @@
+import { hexFromHexString } from './from'
+
+export const isHexZero = (value?: string) => {
+  return value ? BigInt(hexFromHexString(value, { prefix: true })) === 0n : undefined
+}

package/src/hex/nibble.ts

@@ -1,7 +1,7 @@
 //determine the number of nibbles for a given number of bits
 export const bitsToNibbles = (value: number): number => {
   const nibbles = value >> 2
-  if (value !== nibbles << 2) throw Error('Bits for nibbles must multiple of 4')
+  if (value !== nibbles << 2) throw new Error('Bits for nibbles must multiple of 4')
   return nibbles
 }
 

package/src/hex/regex.ts

@@ -1,2 +1,2 @@
-export const hexRegex = /^[0-9a-f]+$/i
-export const hexRegexWithPrefix = /0x[0-9a-f]+$/i
+export const hexRegex = /^[\da-f]+$/i
+export const hexRegexWithPrefix = /0x[\da-f]+$/i

package/dist/browser/hex/from.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}

package/dist/browser/hex/from.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}

package/dist/browser/hex/from.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}

package/dist/node/hex/from.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}

package/dist/node/hex/from.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}

package/dist/node/hex/from.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.d.ts","sourceRoot":"","sources":["../../../src/hex/from.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,eAAO,MAAM,kBAAkB,WAAY,WAAW,WAAW,SAAS,KAAG,MAG5E,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAU,SAAS,KAAQ,MAKrE,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,SAAS,KAAG,MAEjE,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAU,SAAS,KAAQ,MAUxE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,OAAO,WAAW,SAAS,KAAG,MAiB5D,CAAA"}