fix(convertMany): allow converting units containing numbers

jonahsnider · Mar 5, 2021 · 6581876 · 6581876
1 parent fb81e39
commit 6581876
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/convert-many.ts b/src/convert-many.ts
@@ -12,7 +12,7 @@ const enum MatchGroups {
 	Unit
 }
 
-const splitExpression = /(-?(?:\d+)?\.?\d+)([^\d\s]+)/g;
+const splitExpression = /(-?(?:\d+)?\.?\d+)([^\s]+)/g;
 
 /**
  * Convert several values in a string into a single unit.

diff --git a/test/convert-many.test.ts b/test/convert-many.test.ts
@@ -2,13 +2,16 @@ import {convertMany} from '../src/';
 
 describe('convertMany', () => {
 	it('combines several units', () => {
-		// expect(convertMany('1min 30s').to('second')).toBe(90);
-		// expect(convertMany('51h 13min 56s').to('hours')).toBe(51 + 13 / 60 + 56 / 60 / 60);
+		expect(convertMany('1min 30s').to('second')).toBe(90);
+		expect(convertMany('51h 13min 56s').to('hours')).toBe(51 + 13 / 60 + 56 / 60 / 60);
 		expect(convertMany('51h 13min 56s').to('h')).toBe(51 + 13 / 60 + 56 / 60 / 60);
-	});
+		expect(convertMany('1m3').to('m3')).toBe(1);
 
-	it("doesn't convert when not necessary", () => {
-		expect(convertMany('1min').to('second')).toBe(60);
+		expect(convertMany('.1m').to('m')).toBe(0.1);
+		expect(convertMany('-.1m').to('m')).toBe(-0.1);
+		expect(convertMany('-1m').to('m')).toBe(-1);
+		expect(convertMany('0.1m').to('m')).toBe(0.1);
+		expect(convertMany('-0.1m').to('m')).toBe(-0.1);
 	});
 
 	it('throws when appropriate', () => {
@@ -27,7 +30,7 @@ describe('convertMany', () => {
 			global.__DEV__ = true;
 
 			convertMany('1min 2hours').to('seconds');
-			convertMany('1min2km').to('seconds');
+			convertMany('1min 2km').to('seconds');
 		}).toThrow("Couldn't convert km to seconds");
 	});
 });