@kalcodes/ethiopian-calendar 1.1.0 → 2.0.0

package/dist/index.d.ts

@@ -1,15 +1,58 @@
-import { type SimpleDate } from "./utils.js";
-declare const ETH_JDN_OFFSET = 1724221;
-declare const GREG_JDN_OFFSET = 1721426;
-declare function ethToJDN(date: SimpleDate): number;
-declare function jdnToEth(jdn: number): SimpleDate;
-declare function gregToJDN(date: SimpleDate): number;
-declare function jdnToGreg(jdn: number): {
+type DateStr = `${number}-${number}-${number}` | `${number}/${number}/${number}`;
+type DateObj = {
     year: number;
     month: number;
     day: number;
 };
-declare function gregToEth(date: SimpleDate): SimpleDate;
-declare function ethToGreg(date: SimpleDate): SimpleDate;
-export { ETH_JDN_OFFSET, GREG_JDN_OFFSET, ethToJDN, jdnToEth, ethToGreg, gregToJDN, jdnToGreg, gregToEth, type SimpleDate, };
+declare class CalendarError extends Error {
+    constructor(message: string);
+}
+declare class BaseCalendar {
+    year: number;
+    month: number;
+    day: number;
+    constructor(date: DateStr | DateObj);
+    _parseDateString(str: DateStr): DateObj;
+    static _today(): {
+        year: number;
+        month: number;
+        day: number;
+    };
+    toString(): string;
+}
+declare class EthiopianCalendar extends BaseCalendar {
+    static type: "ethiopian";
+    static jdnOffset: 1724221;
+    constructor(date: DateStr | DateObj | Date);
+    static isLeapYear(year: number): boolean;
+    get isLeapYear(): boolean;
+    get isValid(): boolean;
+    toJDN(): number;
+    toGregorian(): {
+        year: number;
+        month: number;
+        day: number;
+    };
+    static today(): EthiopianCalendar;
+    static epoch(): EthiopianCalendar;
+    static fromJDN(jdn: number): EthiopianCalendar;
+}
+declare class GregorianCalendar extends BaseCalendar {
+    static type: "gregorian";
+    static jdnOffset: 1721426;
+    constructor(date: DateStr | DateObj | Date);
+    static isLeapYear(year: number): boolean;
+    get isLeapYear(): boolean;
+    get isValid(): boolean;
+    toJDN(): number;
+    toEthiopian(): EthiopianCalendar;
+    static today(): GregorianCalendar;
+    static epoch(): GregorianCalendar;
+    static fromJDN(jdn: number): {
+        year: number;
+        month: number;
+        day: number;
+    };
+}
+export { CalendarError, EthiopianCalendar, GregorianCalendar };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,YAAY,CAAC;AAEpB,QAAA,MAAM,cAAc,UAAY,CAAC;AACjC,QAAA,MAAM,eAAe,UAAY,CAAC;AAElC,iBAAS,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAU1C;AAED,iBAAS,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAmBzC;AAED,iBAAS,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAmB3C;AAED,iBAAS,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAeA;AAED,iBAAS,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAK/C;AAED,iBAAS,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAK/C;AAED,OAAO,EACL,cAAc,EACd,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,KAAK,UAAU,GAChB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GACR,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAC/B,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;AAEpC,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,cAAM,aAAc,SAAQ,KAAK;IAC/B,YAAY,OAAO,EAAE,MAAM,EAE1B;CACF;AAED,cAAM,YAAY;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IAEZ,YAAY,IAAI,EAAE,OAAO,GAAG,OAAO,EAYlC;IAED,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAatC;IAED,MAAM,CAAC,MAAM;QAGT,IAAI;QACJ,KAAK;QACL,GAAG;MAEN;IAED,QAAQ,WAIP;CACF;AAED,cAAM,iBAAkB,SAAQ,YAAY;IAC1C,MAAM,CAAC,IAAI,EAAG,WAAW,CAAU;IACnC,MAAM,CAAC,SAAS,EAAG,OAAS,CAAU;IAEtC,YAAY,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,EAUzC;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,WAE7B;IACD,IAAI,UAAU,YAEb;IAED,IAAI,OAAO,YAUV;IAED,KAAK,WAUJ;IAED,WAAW;cAmGH,MAAM;eACL,MAAM;aACR,MAAM;MAnGZ;IAED,MAAM,CAAC,KAAK,sBAGX;IAED,MAAM,CAAC,KAAK,sBAEX;IAED,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,qBAmBzB;CACF;AAED,cAAM,iBAAkB,SAAQ,YAAY;IAC1C,MAAM,CAAC,IAAI,EAAG,WAAW,CAAU;IACnC,MAAM,CAAC,SAAS,EAAG,OAAS,CAAU;IAEtC,YAAY,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,EAazC;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,WAE7B;IAED,IAAI,UAAU,YAEb;IAED,IAAI,OAAO,IAAI,OAAO,CAMrB;IAED,KAAK,WAcJ;IAED,WAAW,sBAEV;IAED,MAAM,CAAC,KAAK,sBAEX;IAED,MAAM,CAAC,KAAK,sBAEX;IAED,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAC3B,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;KACb,CAeA;CACF;AAED,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/index.js

@@ -1,64 +1,174 @@
-import { toDateString, isValidEthDate, isValidGregDate, } from "./utils.js";
-const ETH_JDN_OFFSET = 1_724_221;
-const GREG_JDN_OFFSET = 1_721_426;
-function ethToJDN(date) {
-    const { year, month, day } = date;
-    if (!isValidEthDate(date))
-        throw new Error(`The date ${toDateString(date)} is invalid!`);
-    const leapDays = Math.floor((year - 1) / 4);
-    const daysInYear = 30 * (month - 1) + (day - 1);
-    return ETH_JDN_OFFSET + 365 * (year - 1) + leapDays + daysInYear;
-}
-function jdnToEth(jdn) {
-    const ethDays = jdn - ETH_JDN_OFFSET;
-    const cycles = Math.floor(ethDays / 1461);
-    const daysRemaining = ethDays % 1461;
-    let yearsInCycle = Math.floor(daysRemaining / 365);
-    let daysInYear = daysRemaining % 365;
-    if (daysRemaining === 1460) {
-        yearsInCycle = 3;
-        daysInYear = 365;
-    }
-    const year = cycles * 4 + yearsInCycle + 1;
-    const month = Math.floor(daysInYear / 30) + 1;
-    const day = (daysInYear % 30) + 1;
-    return { year, month, day };
-}
-function gregToJDN(date) {
-    const { year, month, day } = date;
-    if (!isValidGregDate(date))
-        throw new Error(`The date ${toDateString(date)} is invalid!`);
-    const a = Math.floor((14 - month) / 12);
-    const y = year + 4800 - a;
-    const m = month + 12 * a - 3;
-    return (day +
-        Math.floor((153 * m + 2) / 5) +
-        365 * y +
-        Math.floor(y / 4) -
-        Math.floor(y / 100) +
-        Math.floor(y / 400) -
-        32045);
+class CalendarError extends Error {
+    constructor(message) {
+        super(message);
+    }
 }
-function jdnToGreg(jdn) {
-    const a = jdn + 32044;
-    const b = Math.floor((4 * a + 3) / 146097);
-    const c = a - Math.floor((146097 * b) / 4);
-    const d = Math.floor((4 * c + 3) / 1461);
-    const e = c - Math.floor((1461 * d) / 4);
-    const m = Math.floor((5 * e + 2) / 153);
-    const day = e - Math.floor((153 * m + 2) / 5) + 1;
-    const month = m + 3 - 12 * Math.floor(m / 10);
-    const year = 100 * b + d - 4800 + Math.floor(m / 10);
-    return { year, month, day };
+class BaseCalendar {
+    year;
+    month;
+    day;
+    constructor(date) {
+        if (typeof date === "string") {
+            date = this._parseDateString(date);
+        }
+        this.year = date.year;
+        this.month = date.month;
+        this.day = date.day;
+        // WARNING: Negative years may fail
+        if (this.year < 1) {
+            console.warn("Proeleptic (negative) years are not supported yet!");
+        }
+    }
+    _parseDateString(str) {
+        const separator = str.includes("/") ? "/" : "-";
+        const pattern = new RegExp(`^\\d+${separator}\\d+${separator}\\d+$`);
+        if (!str.match(pattern))
+            throw new CalendarError(`${str} doesn't seem to be a valid date string! \n` +
+                `Date String must be of a form yy-mm-dd or yy/mm/dd.`);
+        const [year, month, day] = str.split("-").map((item) => Number(item));
+        return { year, month, day };
+    }
+    static _today() {
+        const today = new Date();
+        return {
+            year: today.getFullYear(),
+            month: today.getMonth() + 1,
+            day: today.getDate(),
+        };
+    }
+    toString() {
+        const month = this.month.toString().padStart(2, "0");
+        const day = this.day.toString().padStart(2, "0");
+        return `${this.year}-${month}-${day}`;
+    }
 }
-function gregToEth(date) {
-    if (!isValidGregDate(date))
-        throw new Error(`The date ${toDateString(date)} is invalid!`);
-    return jdnToEth(gregToJDN(date));
+class EthiopianCalendar extends BaseCalendar {
+    static type = "ethiopian";
+    static jdnOffset = 1_724_221;
+    constructor(date) {
+        if (date instanceof Date) {
+            super(new GregorianCalendar(date).toEthiopian());
+        }
+        else {
+            super(date);
+        }
+        // Validate input
+        if (!this.isValid)
+            throw new CalendarError(`The date ${this.toString()} is invalid!`);
+    }
+    static isLeapYear(year) {
+        return year % 4 === 0;
+    }
+    get isLeapYear() {
+        return EthiopianCalendar.isLeapYear(this.year);
+    }
+    get isValid() {
+        if (this.day < 1 || this.day > 30)
+            return false;
+        if (this.month < 1 || this.month > 13)
+            return false;
+        if (this.month === 13) {
+            if (this.isLeapYear)
+                return this.day <= 6;
+            return this.day <= 5;
+        }
+        return true;
+    }
+    toJDN() {
+        const leapDays = Math.floor((this.year - 1) / 4);
+        const daysInYear = 30 * (this.month - 1) + (this.day - 1);
+        return (EthiopianCalendar.jdnOffset +
+            365 * (this.year - 1) +
+            leapDays +
+            daysInYear);
+    }
+    toGregorian() {
+        return GregorianCalendar.fromJDN(this.toJDN());
+    }
+    static today() {
+        const gregorian = new GregorianCalendar(BaseCalendar._today());
+        return EthiopianCalendar.fromJDN(gregorian.toJDN());
+    }
+    static epoch() {
+        return new EthiopianCalendar("1-1-1");
+    }
+    static fromJDN(jdn) {
+        const ethDays = jdn - EthiopianCalendar.jdnOffset;
+        const cycles = Math.floor(ethDays / 1461);
+        const daysRemaining = ethDays % 1461;
+        let yearsInCycle = Math.floor(daysRemaining / 365);
+        let daysInYear = daysRemaining % 365;
+        if (daysRemaining === 1460) {
+            yearsInCycle = 3;
+            daysInYear = 365;
+        }
+        const year = cycles * 4 + yearsInCycle + 1;
+        const month = Math.floor(daysInYear / 30) + 1;
+        const day = (daysInYear % 30) + 1;
+        return new EthiopianCalendar({ year, month, day });
+    }
 }
-function ethToGreg(date) {
-    if (!isValidEthDate(date))
-        throw new Error(`The date ${toDateString(date)} is invalid!`);
-    return jdnToGreg(ethToJDN(date));
+class GregorianCalendar extends BaseCalendar {
+    static type = "gregorian";
+    static jdnOffset = 1_721_426;
+    constructor(date) {
+        if (date instanceof Date) {
+            date = {
+                year: date.getFullYear(),
+                month: date.getMonth() + 1,
+                day: date.getDate(),
+            };
+        }
+        super(date);
+        // Validate input
+        if (!this.isValid)
+            throw new CalendarError(`The date ${this.toString()} is invalid!`);
+    }
+    static isLeapYear(year) {
+        return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+    }
+    get isLeapYear() {
+        return GregorianCalendar.isLeapYear(this.year);
+    }
+    get isValid() {
+        if (this.month < 1 || this.month > 12)
+            return false;
+        const feb = this.isLeapYear ? 29 : 28;
+        const daysInMonth = [31, feb, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+        return this.day >= 1 && this.day <= daysInMonth[this.month - 1];
+    }
+    toJDN() {
+        const a = Math.floor((14 - this.month) / 12);
+        const y = this.year + 4800 - a;
+        const m = this.month + 12 * a - 3;
+        return (this.day +
+            Math.floor((153 * m + 2) / 5) +
+            365 * y +
+            Math.floor(y / 4) -
+            Math.floor(y / 100) +
+            Math.floor(y / 400) -
+            32045);
+    }
+    toEthiopian() {
+        return EthiopianCalendar.fromJDN(this.toJDN());
+    }
+    static today() {
+        return new GregorianCalendar(BaseCalendar._today());
+    }
+    static epoch() {
+        return new GregorianCalendar("1-1-1");
+    }
+    static fromJDN(jdn) {
+        const a = jdn + 32044;
+        const b = Math.floor((4 * a + 3) / 146097);
+        const c = a - Math.floor((146097 * b) / 4);
+        const d = Math.floor((4 * c + 3) / 1461);
+        const e = c - Math.floor((1461 * d) / 4);
+        const m = Math.floor((5 * e + 2) / 153);
+        const day = e - Math.floor((153 * m + 2) / 5) + 1;
+        const month = m + 3 - 12 * Math.floor(m / 10);
+        const year = 100 * b + d - 4800 + Math.floor(m / 10);
+        return new GregorianCalendar({ year, month, day });
+    }
 }
-export { ETH_JDN_OFFSET, GREG_JDN_OFFSET, ethToJDN, jdnToEth, ethToGreg, gregToJDN, jdnToGreg, gregToEth, };
+export { CalendarError, EthiopianCalendar, GregorianCalendar };

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "@kalcodes/ethiopian-calendar",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Simple ethiopian ⟵⟶ gregorian calendar converter.",
   "main": "dist/index.js",
   "type": "module",
   "author": "kalcodes",
-  "exports": {
-    ".": "./dist/index.js",
-    "./utils": "./dist/utils.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/kalcodes/ethiopian-calendar.git"
@@ -26,13 +22,6 @@
     "kalcodes"
   ],
   "license": "ISC",
-  "devEngines": {
-    "packageManager": {
-      "name": "pnpm",
-      "version": "^11.9.0",
-      "onFail": "download"
-    }
-  },
   "devDependencies": {
     "@types/node": "^26.2.0",
     "typescript": "^7.0.2"

package/dist/utils.d.ts

@@ -1,14 +0,0 @@
-type Separator = "-" | "/";
-type SimpleDate = {
-    year: number;
-    month: number;
-    day: number;
-};
-declare function isEthLeapYear(year: number): boolean;
-declare function isGregLeapYear(year: number): boolean;
-declare function isValidEthDate(date: SimpleDate): boolean;
-declare function isValidGregDate(date: SimpleDate): boolean;
-declare function toDateString(date: SimpleDate, separator?: Separator): string;
-declare function toDateObject(dateString: string, separator?: Separator): SimpleDate;
-export { type SimpleDate, type Separator, toDateObject, toDateString, isEthLeapYear, isGregLeapYear, isValidEthDate, isValidGregDate, };
-//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG,GAAG,GAAG,GAAG,CAAC;AAC3B,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,WAElC;AAED,iBAAS,cAAc,CAAC,IAAI,EAAE,MAAM,WAEnC;AAED,iBAAS,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAYjD;AAED,iBAAS,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAQlD;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,GAAE,SAAe,UAGjE;AAED,iBAAS,YAAY,CACnB,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,SAAe,GACzB,UAAU,CAcZ;AAED,OAAO,EACL,KAAK,UAAU,EACf,KAAK,SAAS,EACd,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,GAChB,CAAC"}

package/dist/utils.js

@@ -1,42 +0,0 @@
-function isEthLeapYear(year) {
-    return year % 4 === 0;
-}
-function isGregLeapYear(year) {
-    return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
-}
-function isValidEthDate(date) {
-    const { year, month, day } = date;
-    if (day < 1 || day > 30)
-        return false;
-    if (month < 1 || month > 13)
-        return false;
-    if (month === 13) {
-        if (isEthLeapYear(year))
-            return day <= 6;
-        return day <= 5;
-    }
-    return true;
-}
-function isValidGregDate(date) {
-    const { year, month, day } = date;
-    if (month < 1 || month > 12)
-        return false;
-    const feb = isGregLeapYear(year) ? 29 : 28;
-    const daysInMonth = [31, feb, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-    return day <= daysInMonth[month - 1];
-}
-function toDateString(date, separator = "-") {
-    const { year, month, day } = date;
-    return `${year}${separator}${month}${separator}${day}`;
-}
-function toDateObject(dateString, separator = "-") {
-    const pattern = new RegExp(`^\d+${separator}\d+${separator}\d+$`);
-    if (!dateString.match(pattern))
-        throw new Error(`${dateString} doesn't seem to be a valid date string! \n` +
-            `Date String should year-month-day or year/month/day.`);
-    const [year, month, day] = dateString
-        .split(separator)
-        .map((item) => Number(item));
-    return { year, month, day };
-}
-export { toDateObject, toDateString, isEthLeapYear, isGregLeapYear, isValidEthDate, isValidGregDate, };