feat(pressure): add psi units

Closes #454
jonahsnider · Mar 29, 2022 · 24d4908 · 24d4908
1 parent 2812353
commit 24d4908
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 4 deletions.
diff --git a/packages/bundled-conversions/src/index.ts b/packages/bundled-conversions/src/index.ts
@@ -644,6 +644,11 @@ export const conversions = {
 	atmosphere: [8, 101325],
 	atmospheres: [8, 101325],
 	atm: [8, 101325],
+	'pound per square inch': [8, 6894.757],
+	'pounds per square inch': [8, 6894.757],
+	psi: [8, 6894.757],
+	'lbf/in2': [8, 6894.757],
+	'lbf/in²': [8, 6894.757],
 	kelvin: [9, 1],
 	kelvins: [9, 1],
 	K: [9, 1],
@@ -1079,7 +1084,7 @@ export const bestUnits = {
 			[1000000000000, 'TW'],
 			[1000000000000000, 'PW'],
 		],
-		[[1, 'Pa']],
+		[[1, 'psi']],
 		[[1, 'F']],
 		[
 			[1, 'ns'],

diff --git a/packages/bundled-conversions/test/snapshots/index.test.ts.md b/packages/bundled-conversions/test/snapshots/index.test.ts.md
@@ -2357,6 +2357,14 @@ Generated by [AVA](https://avajs.dev).
         4,
         4.448222,
       ],
+      'lbf/in2': [
+        8,
+        6894.757,
+      ],
+      'lbf/in²': [
+        8,
+        6894.757,
+      ],
       liter: [
         11,
         0.001,
@@ -3449,6 +3457,10 @@ Generated by [AVA](https://avajs.dev).
         4,
         4.448222,
       ],
+      'pound per square inch': [
+        8,
+        6894.757,
+      ],
       'pound-force': [
         4,
         4.448222,
@@ -3465,10 +3477,18 @@ Generated by [AVA](https://avajs.dev).
         6,
         453.59237,
       ],
+      'pounds per square inch': [
+        8,
+        6894.757,
+      ],
       ps: [
         10,
         1e-12,
       ],
+      psi: [
+        8,
+        6894.757,
+      ],
       pt: [
         11,
         0.000473176473,
@@ -4296,7 +4316,7 @@ Generated by [AVA](https://avajs.dev).
         [
           [
             1,
-            'Pa',
+            'psi',
           ],
         ],
         [

diff --git a/packages/bundled-conversions/test/snapshots/index.test.ts.snap b/packages/bundled-conversions/test/snapshots/index.test.ts.snap
diff --git a/packages/conversions/src/conversions/pressure.ts b/packages/conversions/src/conversions/pressure.ts
@@ -6,7 +6,7 @@ import {Id} from '../types/index.js';
 
 export const pressure: ReadonlyDeep<Family> = {
 	id: Id.Pressure,
-	best: ['Pa'],
+	best: {metric: ['Pa'], imperial: ['psi']},
 	conversions: [
 		{names: ['pascal', 'pascals'], symbols: ['Pa'], ratio: 1},
 		...expandMacro(Macros.si, {names: ['pascal', 'pascals'], symbols: ['Pa'], ratio: 1}),
@@ -18,5 +18,8 @@ export const pressure: ReadonlyDeep<Family> = {
 		{names: ['millitorr'], symbols: ['mTorr'], ratio: new BigNumber(101_325).div(760).div(1e3)},
 
 		{names: ['atmosphere', 'atmospheres'], symbols: ['atm'], ratio: 101_325},
+
+		// https://en.wikipedia.org/wiki/Pound_per_square_inch
+		{names: ['pound per square inch', 'pounds per square inch'], symbols: ['psi', 'lbf/in2', 'lbf/in²'], ratio: 6.894_757e3},
 	],
 };
diff --git a/packages/convert/src/conversions/pressure.test.ts b/packages/convert/src/conversions/pressure.test.ts
@@ -0,0 +1,5 @@
+import {assertConversions} from '../../test/assert-conversion';
+
+describe('conversions', () => {
+	assertConversions([{from: [1, 'psi'], to: [6.894_757 - Number.EPSILON * 3, 'kPa']}]);
+});
diff --git a/packages/optimized-conversions/src/optimizer/best.ts b/packages/optimized-conversions/src/optimizer/best.ts
@@ -1,3 +1,4 @@
+import assert from 'node:assert/strict';
 import {combineIterables, Sort} from '@jonahsnider/util';
 import type * as Conversions from 'conversions';
 import BigNumber from 'bignumber.js';
@@ -34,7 +35,13 @@ export function optimizeBest(conversionFamilies: ReadonlyArray<Readonly<Conversi
 
 			const conversionFamilyBest = Array.isArray(conversionFamily.best) ? conversionFamily.best : conversionFamily.best[kind];
 
-			conversionFamilyBest.sort(Sort.ascending(bestUnit => lookup[bestUnit].toNumber()));
+			conversionFamilyBest.sort(
+				Sort.ascending(bestUnit => {
+					assert(lookup[bestUnit], `The unit "${bestUnit}" couldn't be found in conversion family ${conversionFamily.id} while optimizing best conversions`);
+
+					return lookup[bestUnit].toNumber();
+				}),
+			);
 
 			const firstValue = lookup[conversionFamilyBest[0]];