cafe-utility 32.1.0 → 33.0.0

package/index.d.ts

@@ -109,8 +109,10 @@ declare function asHexString(
 	options?: {
 		name?: string
 		byteLength?: number
+		uneven?: boolean
+		strictPrefix?: boolean
 	}
-): string
+): `0x${string}`
 declare function asSafeString(
 	string: any,
 	options?: {
@@ -450,7 +452,7 @@ declare function minutes(value: number): number
 declare function hours(value: number): number
 declare function days(value: number): number
 declare function makeDate(numberWithUnit: string): number
-declare function makeStorage(numberWithUnit: string): number
+declare function makeStorage(numberWithUnit: string, conversionMultiplier?: number): number
 declare function getPreLine(string: string): string
 declare function getCached<T>(key: string, ttlMillis: number, handler: () => Promise<T>): Promise<T>
 declare function deleteFromCache(key: string): void

package/index.js

@@ -373,10 +373,11 @@ function asString(n, e) {
 }
 function asHexString(n, e) {
 	if (!isHexString(n)) throw new TypeError(`Expected hex string${e?.name ? ` for ${e.name}` : ''}, got: ` + n)
+	if (e?.strictPrefix && !n.startsWith('0x')) throw new TypeError(`Expected hex string with 0x prefix${e?.name ? ` for ${e.name}` : ''}, got: ` + n)
 	const t = n.replace(/^0x/, '')
-	if (t.length % 2 !== 0) throw RangeError(`Expected even number of hex digits${e?.name ? ` for ${e.name}` : ''}; got: ` + n)
+	if (t.length % 2 !== 0 && !e?.uneven) throw RangeError(`Expected even number of hex digits${e?.name ? ` for ${e.name}` : ''}; got: ` + n)
 	if (e && e.byteLength && t.length !== e.byteLength * 2) throw RangeError(`Expected hex string${e?.name ? ` for ${e.name}` : ''} of byte length ${e.byteLength}; got: ` + t)
-	return t
+	return `0x${t}`
 }
 function asSafeString(n, e) {
 	if (
@@ -1416,21 +1417,21 @@ function makeDate(n) {
 			.replace(/^-?[0-9.]+/, '')
 			.trim()
 			.toLowerCase(),
-		r = dateUnits[t]
+		r = t === '' ? 1 : dateUnits[t]
 	if (!r) throw Error(`Unknown unit: "${t}"`)
-	return e * r
+	return Math.ceil(e * r)
 }
-const storageUnits = { b: 1, byte: 1, bytes: 1, kb: 1024, kilobyte: 1024, kilobytes: 1024, mb: 1024 ** 2, megabyte: 1024 ** 2, megabytes: 1024 ** 2, gb: 1024 ** 3, gigabyte: 1024 ** 3, gigabytes: 1024 ** 3, tb: 1024 ** 4, terabyte: 1024 ** 4, terabytes: 1024 ** 4 }
-function makeStorage(n) {
-	const e = parseFloat(n)
-	if (isNaN(e)) throw Error('makeDate got NaN for input')
-	const t = n
+const storageUnitExponents = { b: 0, byte: 0, bytes: 0, kb: 1, kilobyte: 1, kilobytes: 1, mb: 2, megabyte: 2, megabytes: 2, gb: 3, gigabyte: 3, gigabytes: 3, tb: 4, terabyte: 4, terabytes: 4 }
+function makeStorage(n, e = 1024) {
+	const t = parseFloat(n)
+	if (isNaN(t)) throw Error('makeStorage got NaN for input')
+	const r = n
 			.replace(/^-?[0-9.]+/, '')
 			.trim()
 			.toLowerCase(),
-		r = storageUnits[t]
-	if (!r) throw Error(`Unknown unit: "${t}"`)
-	return e * r
+		o = r === '' ? 0 : storageUnitExponents[r]
+	if (o == null) throw Error(`Unknown unit: "${r}"`)
+	return Math.ceil(t * e ** o)
 }
 function getPreLine(n) {
 	return n.replace(/ +/g, ' ').replace(/^ /gm, '')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cafe-utility",
-	"version": "32.1.0",
+	"version": "33.0.0",
 	"description": "",
 	"main": "index.js",
 	"exports": {