feat: Switch to decimal units for data sizes

...to better align with our billing system

Author: cap10morgan

src/lib/humanFileSize.test.ts

@@ -2,30 +2,29 @@ import { describe, expect, it } from 'vitest';
 import { humanFileSize } from './humanFileSize';
 
 describe('humanFileSize', () => {
-	it('should return bytes for values less than 1024', () => {
+	it('should return bytes for values less than 1000', () => {
 		expect(humanFileSize(500)).toBe('500 B');
 		expect(humanFileSize(0)).toBe('0 B');
-		expect(humanFileSize(1023)).toBe('1,023 B');
+		expect(humanFileSize(999)).toBe('999 B');
 	});
 
-	it('should convert to KiB for values between 1024 and 1048575', () => {
-		expect(humanFileSize(1024)).toBe('1 KiB');
-		expect(humanFileSize(2048)).toBe('2 KiB');
-		expect(humanFileSize(1000000)).toBe('977 KiB');
-		expect(humanFileSize(1023900)).toBe('1,000 KiB')
+	it('should convert to KiB for values between 1000 and 1000000', () => {
+		expect(humanFileSize(1000)).toBe('1 KB');
+		expect(humanFileSize(2000)).toBe('2 KB');
+		expect(humanFileSize(900000)).toBe('900 KB');
 	});
 
 	it('should convert to MiB for appropriate values', () => {
-		expect(humanFileSize(1048576)).toBe('1 MiB');
-		expect(humanFileSize(2097152)).toBe('2 MiB');
+		expect(humanFileSize(1000000)).toBe('1 MB');
+		expect(humanFileSize(2000000)).toBe('2 MB');
 	});
 
 	it('should convert to GiB for appropriate values', () => {
-		expect(humanFileSize(1073741824)).toBe('1 GiB');
+		expect(humanFileSize(1000000000)).toBe('1 GB');
 	});
 
 	it('should apply the multiplier correctly', () => {
-		expect(humanFileSize(2, 1024)).toBe('2 KiB');
-		expect(humanFileSize(2, 1048576)).toBe('2 MiB');
+		expect(humanFileSize(2, 1000)).toBe('2 KB');
+		expect(humanFileSize(2, 1000000)).toBe('2 MB');
 	});
 });

src/lib/units.test.ts

@@ -6,22 +6,22 @@ describe('determineUnits', () => {
 		expect(determineUnits('foos', 0)).toBe('foos');
 	});
 
-	it("should return 'B' for bytes < 1,024", () => {
+	it("should return 'B' for bytes < 1,000", () => {
 		expect(determineUnits('bytes', 0)).toBe('B');
 		expect(determineUnits('bytes', 100)).toBe('B');
-		expect(determineUnits('bytes', 1023)).toBe('B');
+		expect(determineUnits('bytes', 999)).toBe('B');
 	});
 
-	it("should return 'KiB' for bytes >= 1,024 && < 1,048,576", () => {
-		expect(determineUnits('bytes', 1024)).toBe('KiB');
-		expect(determineUnits('bytes', 2048)).toBe('KiB');
-		expect(determineUnits('bytes', 1048575)).toBe('KiB');
+	it("should return 'KiB' for bytes >= 1,000 && < 1,000,000", () => {
+		expect(determineUnits('bytes', 1000)).toBe('KB');
+		expect(determineUnits('bytes', 2000)).toBe('KB');
+		expect(determineUnits('bytes', 900_000)).toBe('KB');
 	});
 
-	it("should return 'MiB' for bytes >= 1,048,576 && < 1,073,741,824", () => {
-		expect(determineUnits('bytes', 1048576)).toBe('MiB');
-		expect(determineUnits('bytes', 10000000)).toBe('MiB');
-		expect(determineUnits('bytes', 1073741823)).toBe('MiB');
+	it("should return 'MiB' for bytes >= 1,000,000 && < 1,000,000,000", () => {
+		expect(determineUnits('bytes', 1_000_000)).toBe('MB');
+		expect(determineUnits('bytes', 10_000_000)).toBe('MB');
+		expect(determineUnits('bytes', 900_000_000)).toBe('MB');
 	});
 
 	it("should return 'secs' for seconds < 60", () => {
@@ -55,20 +55,19 @@ describe('scaleValueToUnits', () => {
 		expect(scaleValueToUnits(1000000, 'bytes', 'B')).toBe(1000000);
 	});
 
-	it('should scale bytes to KiB', () => {
-		expect(scaleValueToUnits(0, 'bytes', 'KiB')).toBe(0);
-		expect(scaleValueToUnits(1023, 'bytes', 'KiB')).toBeCloseTo(1);
-		expect(scaleValueToUnits(1024, 'bytes', 'KiB')).toBe(1);
-		expect(scaleValueToUnits(1024 * 2, 'bytes', 'KiB')).toBe(2);
-		expect(scaleValueToUnits(1024 * 10, 'bytes', 'KiB')).toBe(10);
+	it('should scale bytes to KB', () => {
+		expect(scaleValueToUnits(0, 'bytes', 'KB')).toBe(0);
+		expect(scaleValueToUnits(1000, 'bytes', 'KB')).toBe(1);
+		expect(scaleValueToUnits(1000 * 2, 'bytes', 'KB')).toBe(2);
+		expect(scaleValueToUnits(1000 * 10, 'bytes', 'KB')).toBe(10);
 	});
 
-	it('should scale bytes to MiB', () => {
-		expect(scaleValueToUnits(0, 'bytes', 'MiB')).toBe(0);
-		expect(scaleValueToUnits(1024, 'bytes', 'MiB')).toBeCloseTo(0.001);
-		expect(scaleValueToUnits(1024 * 1024, 'bytes', 'MiB')).toBe(1);
-		expect(scaleValueToUnits(1024 * 1024 * 2, 'bytes', 'MiB')).toBe(2);
-		expect(scaleValueToUnits(1024 * 1024 * 10, 'bytes', 'MiB')).toBe(10);
+	it('should scale bytes to MB', () => {
+		expect(scaleValueToUnits(0, 'bytes', 'MB')).toBe(0);
+		expect(scaleValueToUnits(1000, 'bytes', 'MB')).toBeCloseTo(0.001);
+		expect(scaleValueToUnits(1000 * 1000, 'bytes', 'MB')).toBe(1);
+		expect(scaleValueToUnits(1000 * 1000 * 2, 'bytes', 'MB')).toBe(2);
+		expect(scaleValueToUnits(1000 * 1000 * 10, 'bytes', 'MB')).toBe(10);
 	});
 
 	it('should leave secs scaled to secs as-is', () => {

src/lib/units.ts

@@ -1,9 +1,9 @@
 export type Units = 'bytes' | 'secs';
 
-const dataUnits = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+const dataUnits = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 const timeUnits = ['secs', 'mins', 'hrs'];
 const unitsMultipliers = {
-	bytes: 1024,
+	bytes: 1000,
 	secs: 60,
 };