From 4a0ffc55734adaaf3e9eacd9ee4bbc212e96a71e Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Fri, 14 Oct 2022 17:52:29 +1100
Subject: Account for there being no year 0 CE

---
 src/lib.ts | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'src/lib.ts')

diff --git a/src/lib.ts b/src/lib.ts
index 1348498..5b02d39 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -115,13 +115,20 @@ export class HistDate {
 			later = this as HistDate;
 		}
 		//
-		const yearDiff = later.year - earlier.year;
+		const yearDiff = earlier.getYearDiff(later);
 		if (yearDiff == 0){
 			return later.month - earlier.month;
 		} else {
 			return (13 - earlier.month) + (yearDiff - 1) * 12 + later.month - 1;
 		}
 	}
+	getYearDiff(other: HistDate){
+		let yearDiff = Math.abs(this.year - other.year);
+		if (this.year * other.year < 0){ // Account for no 0 CE
+			yearDiff -= 1;
+		}
+		return yearDiff;
+	}
 	clone(){
 		return new HistDate(this.year, this.month, this.day);
 	}
@@ -181,6 +188,9 @@ export function stepDate(date: HistDate, scale: number, {forward=true, count=1,
 					newDate.month += 1;
 				} else {
 					newDate.year += 1;
+					if (newDate.year == 0){
+						newDate.year = 1;
+					}
 					newDate.month = 1;
 				}
 			} else {
@@ -188,11 +198,26 @@ export function stepDate(date: HistDate, scale: number, {forward=true, count=1,
 					newDate.month -= 1;
 				} else {
 					newDate.year -= 1;
+					if (newDate.year == 0){
+						newDate.year = -1;
+					}
 					newDate.month = 12;
 				}
 			}
 		} else {
-			newDate.year += forward ? scale : -scale;
+			let newYear;
+			if (forward){
+				newYear = newDate.year + scale;
+				if (newDate.year < 0 && newYear >= 0){ // If different sign, account for there being no 0 CE
+					newYear += 1;
+				}
+			} else {
+				newYear = newDate.year - scale;
+				if (newDate.year > 0 && newYear <= 0){
+					newYear -= 1;
+				}
+			}
+			newDate.year = newYear;
 		}
 	}
 	return newDate;
-- 
cgit v1.2.3