jcal-zmanim 1.0.9 → 1.1.0

package/dist/{AppUtils.js → JCal/ZmanimUtils.js}

@@ -3,20 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WhichDaysFlags = exports.DaysOfWeek = void 0;
-const Utils_1 = __importDefault(require("./JCal/Utils"));
-const Zmanim_1 = __importDefault(require("./JCal/Zmanim"));
-const jDate_1 = __importDefault(require("./JCal/jDate"));
-const ZmanTypes_1 = require("./ZmanTypes");
-exports.DaysOfWeek = Object.freeze({
-    SUNDAY: 0,
-    MONDAY: 1,
-    TUESDAY: 2,
-    WEDNESDAY: 3,
-    THURSDAY: 4,
-    FRIDAY: 5,
-    SHABBOS: 6,
-});
+exports.WhichDaysFlags = void 0;
+const Utils_1 = require("../Utils");
+const Zmanim_1 = __importDefault(require("./Zmanim"));
+const ZmanTypes_1 = require("../ZmanTypes");
 exports.WhichDaysFlags = Object.freeze({
     SUNDAY: 1,
     MONDAY: 2,
@@ -27,45 +17,7 @@ exports.WhichDaysFlags = Object.freeze({
     SHABBOS: 64,
     YOMTOV: 128,
 });
-class AppUtils {
-    /**
-     * Returns the date corrected time of the given zmanim on the given date at the given location
-     * If the zman is after or within 30 minutes of the given time, this days zman is returned, othwise tomorrows zman is returned.
-     * @param {Date} sdate
-     * @param {jDate} jdate
-     * @param {Time} time
-     * @param {Settings} settings
-     * @param {Time} sunset
-     * @returns {[{zmanType:ZmanToShow,time:Time, isTomorrow:boolean}]}
-     */
-    static getCorrectZmanTimes(sdate, jdate, time, settings, sunset) {
-        const correctedTimes = [], zmanTypes = settings.zmanimToShow, location = settings.location, tomorrowJd = jdate.addDays(1), tomorrowSd = Utils_1.default.addDaysToSdate(sdate, 1), 
-        /*  Candle lighting and chometz times are not shown after sunset.
-            This solves the issue of Candle lighting showing as having "passed 20 minutes ago"
-            Thursday evening after sunset - which shows as hasCandleLighting = true
-            as it is already Friday... */
-        zmanTimes = AppUtils.getZmanTimes(zmanTypes.filter((zt) => ![21, 22, 23].includes(zt.id) || Utils_1.default.isTimeAfter(time, sunset)), sdate, jdate, location), tomorrowTimes = AppUtils.getZmanTimes(
-        //Candle lighting tomorrow is never shown...
-        zmanTypes.filter((zt) => zt.id !== 21), tomorrowSd, tomorrowJd, location);
-        for (let zt of zmanTimes) {
-            let oTime = zt.time, isTomorrow = false, diff = Utils_1.default.timeDiff(time, oTime, true);
-            if (diff.sign < 1 &&
-                Utils_1.default.totalMinutes(diff) >= settings.minToShowPassedZman) {
-                const tom = tomorrowTimes.find((t) => t.zmanType === zt.zmanType);
-                if (tom && tom.time) {
-                    oTime = tom.time;
-                    isTomorrow = true;
-                }
-            }
-            correctedTimes.push({
-                zmanType: zt.zmanType,
-                time: oTime,
-                isTomorrow,
-            });
-        }
-        return correctedTimes.sort((a, b) => (a.isTomorrow ? 1 : -1) - (b.isTomorrow ? 1 : -1) ||
-            Utils_1.default.totalSeconds(a.time) - Utils_1.default.totalSeconds(b.time));
-    }
+class ZmanimUtils {
     /**
      * Gets the zmanim for all the types in the given list.
      * @param {[ZmanToShow]} zmanTypes An array of ZmanTypes to get the zman for.
@@ -75,8 +27,8 @@ class AppUtils {
      * @returns{[{zmanType:{id:number,offset:?number,desc:string,eng:string,heb:string },time:Time}]}
      */
     static getZmanTimes(zmanTypes, date, jdate, location) {
-        const mem = AppUtils.zmanTimesCache.find((z) => Utils_1.default.isSameSdate(z.date, date) &&
-            z.location.Name === location.Name), zmanTimes = [], whichDay = AppUtils.getWhichDays(date, jdate, location);
+        const mem = ZmanimUtils.zmanTimesCache.find((z) => Utils_1.Utils.isSameSdate(z.date, date) &&
+            z.location.Name === location.Name), zmanTimes = [], whichDay = ZmanimUtils.getWhichDays(date, jdate, location);
         let sunrise, sunset, suntimesMishor, sunriseMishor, sunsetMishor, mishorNeg90, chatzos, shaaZmanis, shaaZmanisMga;
         if (mem) {
             sunrise = mem.sunrise;
@@ -96,7 +48,7 @@ class AppUtils {
             suntimesMishor = Zmanim_1.default.getSunTimes(date, location, false);
             sunriseMishor = suntimesMishor.sunrise;
             sunsetMishor = suntimesMishor.sunset;
-            mishorNeg90 = Utils_1.default.addMinutes(sunriseMishor, -90);
+            mishorNeg90 = Utils_1.Utils.addMinutes(sunriseMishor, -90);
             chatzos =
                 sunriseMishor &&
                     sunsetMishor &&
@@ -109,7 +61,7 @@ class AppUtils {
                 sunriseMishor &&
                     sunsetMishor &&
                     Zmanim_1.default.getShaaZmanisMga(suntimesMishor, true);
-            AppUtils.zmanTimesCache.push({
+            ZmanimUtils.zmanTimesCache.push({
                 date,
                 location,
                 sunrise,
@@ -132,34 +84,34 @@ class AppUtils {
                 case ZmanTypes_1.ZmanTypeIds.ChatzosLayla: // chatzosNight
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(chatzos, 720 + offset),
+                        time: Utils_1.Utils.addMinutes(chatzos, 720 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.Alos90: // alos90
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(mishorNeg90, offset)
+                            ? Utils_1.Utils.addMinutes(mishorNeg90, offset)
                             : mishorNeg90,
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.Alos72: // alos72
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(sunriseMishor, -72 + offset),
+                        time: Utils_1.Utils.addMinutes(sunriseMishor, -72 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.TalisTefillin: //talisTefillin
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(sunriseMishor, -36 + offset),
+                        time: Utils_1.Utils.addMinutes(sunriseMishor, -36 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.NetzAtElevation: //netzElevation
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(sunrise, offset)
+                            ? Utils_1.Utils.addMinutes(sunrise, offset)
                             : sunrise,
                     });
                     break;
@@ -167,7 +119,7 @@ class AppUtils {
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(sunriseMishor, offset)
+                            ? Utils_1.Utils.addMinutes(sunriseMishor, offset)
                             : sunriseMishor,
                     });
                     break;
@@ -175,35 +127,35 @@ class AppUtils {
                     if (shaaZmanisMga)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(mishorNeg90, Math.floor(shaaZmanisMga * 3) + offset),
+                            time: Utils_1.Utils.addMinutes(mishorNeg90, Math.floor(shaaZmanisMga * 3) + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.szksGra: //szksGra
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunriseMishor, Math.floor(shaaZmanis * 3) + offset),
+                            time: Utils_1.Utils.addMinutes(sunriseMishor, Math.floor(shaaZmanis * 3) + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.sztMga: // sztMga
                     if (shaaZmanisMga)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(mishorNeg90, Math.floor(shaaZmanisMga * 4) + offset),
+                            time: Utils_1.Utils.addMinutes(mishorNeg90, Math.floor(shaaZmanisMga * 4) + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.sztGra: //sztGra
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunriseMishor, Math.floor(shaaZmanis * 4) + offset),
+                            time: Utils_1.Utils.addMinutes(sunriseMishor, Math.floor(shaaZmanis * 4) + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.chatzosDay: //chatzos
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(chatzos, offset)
+                            ? Utils_1.Utils.addMinutes(chatzos, offset)
                             : chatzos,
                     });
                     break;
@@ -211,28 +163,28 @@ class AppUtils {
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(chatzos, shaaZmanis * 0.5 + offset),
+                            time: Utils_1.Utils.addMinutes(chatzos, shaaZmanis * 0.5 + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.minKet: //minKet
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunriseMishor, shaaZmanis * 9.5 + offset),
+                            time: Utils_1.Utils.addMinutes(sunriseMishor, shaaZmanis * 9.5 + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.plag: //plag
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunriseMishor, shaaZmanis * 10.75 + offset),
+                            time: Utils_1.Utils.addMinutes(sunriseMishor, shaaZmanis * 10.75 + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.shkiaAtSeaLevel: //shkiaMishor
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(sunsetMishor, offset)
+                            ? Utils_1.Utils.addMinutes(sunsetMishor, offset)
                             : sunsetMishor,
                     });
                     break;
@@ -240,57 +192,57 @@ class AppUtils {
                     zmanTimes.push({
                         zmanType,
                         time: offset
-                            ? Utils_1.default.addMinutes(sunset, offset)
+                            ? Utils_1.Utils.addMinutes(sunset, offset)
                             : sunset,
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.tzais45: // tzais45
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(sunset, 45 + offset),
+                        time: Utils_1.Utils.addMinutes(sunset, 45 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.tzais50: //tzais50
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(sunset, 50 + offset),
+                        time: Utils_1.Utils.addMinutes(sunset, 50 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.tzais72: //tzais72
                     zmanTimes.push({
                         zmanType,
-                        time: Utils_1.default.addMinutes(sunset, 72 + offset),
+                        time: Utils_1.Utils.addMinutes(sunset, 72 + offset),
                     });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.rabbeinuTamZmanios: //tzais72Zmaniot
                     if (shaaZmanis)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunset, shaaZmanis * 1.2 + offset),
+                            time: Utils_1.Utils.addMinutes(sunset, shaaZmanis * 1.2 + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.rabbeinuTamZmaniosMga: //tzais72ZmaniotMA
                     if (shaaZmanisMga)
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunset, shaaZmanisMga * 1.2 + offset),
+                            time: Utils_1.Utils.addMinutes(sunset, shaaZmanisMga * 1.2 + offset),
                         });
                     break;
                 case ZmanTypes_1.ZmanTypeIds.candleLighting: //candleLighting
                     if (sunset && jdate.hasCandleLighting()) {
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(Zmanim_1.default.getCandleLightingFromSunset(sunset, location), offset),
+                            time: Utils_1.Utils.addMinutes(Zmanim_1.default.getCandleLightingFromSunset(sunset, location), offset),
                         });
                     }
                     break;
                 case ZmanTypes_1.ZmanTypeIds.SofZmanEatingChometz: //Sof Zman Achilas Chometz
                     if (shaaZmanisMga && jdate.Month === 1 &&
                         jdate.Day === 14 &&
-                        Utils_1.default.isTimeAfter(sunrise, Utils_1.default.timeFromDate(date))) {
+                        Utils_1.Utils.isTimeAfter(sunrise, Utils_1.Utils.timeFromDate(date))) {
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunrise, -90 + offset + shaaZmanisMga * 4),
+                            time: Utils_1.Utils.addMinutes(sunrise, -90 + offset + shaaZmanisMga * 4),
                         });
                     }
                     break;
@@ -298,12 +250,12 @@ class AppUtils {
                     if (shaaZmanisMga &&
                         jdate.Month === 1 &&
                         (jdate.Day === 14 ||
-                            (jdate.DayOfWeek === exports.DaysOfWeek.FRIDAY &&
+                            (jdate.DayOfWeek === Utils_1.DaysOfWeek.FRIDAY &&
                                 jdate.Day === 13)) &&
-                        Utils_1.default.isTimeAfter(sunrise, Utils_1.default.timeFromDate(date))) {
+                        Utils_1.Utils.isTimeAfter(sunrise, Utils_1.Utils.timeFromDate(date))) {
                         zmanTimes.push({
                             zmanType,
-                            time: Utils_1.default.addMinutes(sunrise, -90 + offset + shaaZmanisMga * 5),
+                            time: Utils_1.Utils.addMinutes(sunrise, -90 + offset + shaaZmanisMga * 5),
                         });
                     }
                     break;
@@ -322,32 +274,32 @@ class AppUtils {
             return exports.WhichDaysFlags.YOMTOV;
         }
         switch (date.getDay()) {
-            case exports.DaysOfWeek.SUNDAY:
+            case Utils_1.DaysOfWeek.SUNDAY:
                 return exports.WhichDaysFlags.SUNDAY;
-            case exports.DaysOfWeek.MONDAY:
+            case Utils_1.DaysOfWeek.MONDAY:
                 return exports.WhichDaysFlags.MONDAY;
-            case exports.DaysOfWeek.TUESDAY:
+            case Utils_1.DaysOfWeek.TUESDAY:
                 return exports.WhichDaysFlags.TUESDAY;
-            case exports.DaysOfWeek.WEDNESDAY:
+            case Utils_1.DaysOfWeek.WEDNESDAY:
                 return exports.WhichDaysFlags.WEDNESDAY;
-            case exports.DaysOfWeek.THURSDAY:
+            case Utils_1.DaysOfWeek.THURSDAY:
                 return exports.WhichDaysFlags.THURSDAY;
-            case exports.DaysOfWeek.FRIDAY:
+            case Utils_1.DaysOfWeek.FRIDAY:
                 return exports.WhichDaysFlags.FRIDAY;
-            case exports.DaysOfWeek.SHABBOS:
+            case Utils_1.DaysOfWeek.SHABBOS:
                 return exports.WhichDaysFlags.SHABBOS;
         }
         return 0;
     }
     /**
      * Returns the zmanim necessary for showing basic shul notifications: chatzosHayom, chatzosHalayla, alos
-     * @param {jDate} jdate
-     * @param {Date} sdate
+     * @param {jDate|Date} date
      * @param {Location} location
      * @returns {{chatzosHayom:Time, chatzosHalayla:Time, alos:Time, shkia:Time }}
      */
-    static getBasicShulZmanim(jdate, sdate, location) {
-        const zmanim = AppUtils.getZmanTimes([
+    static getBasicShulZmanim(date, location) {
+        const { sdate, jdate } = Utils_1.Utils.bothDates(date);
+        const zmanim = ZmanimUtils.getZmanTimes([
             (0, ZmanTypes_1.getZmanType)(ZmanTypes_1.ZmanTypeIds.chatzosDay),
             (0, ZmanTypes_1.getZmanType)(ZmanTypes_1.ZmanTypeIds.Alos90),
             (0, ZmanTypes_1.getZmanType)(ZmanTypes_1.ZmanTypeIds.shkiaElevation),
@@ -355,7 +307,7 @@ class AppUtils {
         ], sdate, jdate, location);
         return {
             chatzosHayom: zmanim[0].time,
-            chatzosHalayla: Utils_1.default.addMinutes(zmanim[0].time, 720),
+            chatzosHalayla: Utils_1.Utils.addMinutes(zmanim[0].time, 720),
             alos: zmanim[1].time,
             shkia: zmanim[2].time,
         };
@@ -367,32 +319,10 @@ class AppUtils {
     * @returns {{zmanType:ZmanToShow, time?:Time }[]}
     */
     static getAllZmanim(date, location) {
-        const jd = date instanceof Date
-            ? new jDate_1.default(date)
-            : date;
-        return AppUtils.getZmanTimes(ZmanTypes_1.ZmanTypes, jd.getDate(), jd, location);
-    }
-    /**
-     * Compares two zmanim for showing to see if they are the same
-     * @param {{id:number,offset:?Number, whichDaysFlags:?Number, desc: String, eng: String, heb: String }} zman1
-     * @param {{id:number,offset:?Number, whichDaysFlags:?Number, desc: String, eng: String, heb: String }} zman2
-     */
-    static IsSameZmanToShow(zman1, zman2) {
-        return (zman1.id === zman2.id &&
-            zman1.desc === zman2.desc &&
-            zman1.eng === zman2.eng &&
-            zman1.heb === zman2.heb &&
-            (zman1.offset || 0) === (zman2.offset || 0) &&
-            (zman1.whichDaysFlags || 0) === (zman2.whichDaysFlags || 0));
-    }
-    /**
-     * Returns all available ZmanTypes - including baseTypes and custom added types
-     * @param {Settings} settings
-     */
-    static AllZmanTypes(settings) {
-        return [...ZmanTypes_1.ZmanTypes] /*.concat(settings.customZmanim)*/;
+        const { sdate, jdate } = Utils_1.Utils.bothDates(date);
+        return ZmanimUtils.getZmanTimes(ZmanTypes_1.ZmanTypes, sdate, jdate, location);
     }
 }
-AppUtils.zmanTimesCache = [];
-exports.default = AppUtils;
-//# sourceMappingURL=AppUtils.js.map
+ZmanimUtils.zmanTimesCache = [];
+exports.default = ZmanimUtils;
+//# sourceMappingURL=ZmanimUtils.js.map

package/dist/JCal/ZmanimUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ZmanimUtils.js","sourceRoot":"","sources":["../../src/JCal/ZmanimUtils.ts"],"names":[],"mappings":"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"}

package/dist/JCal/jDate.d.ts

@@ -124,7 +124,7 @@ export default class jDate {
     /**Is the current Jewish Date the day before a yomtov that contains a Friday?*/
     hasEiruvTavshilin(israel: boolean): boolean;
     /**Gets the candle lighting time for the current Jewish date for the given Location object.*/
-    getCandleLighting(location: Location, nullIfNoCandles: boolean): import("../jcal-zmanim").Time | null | undefined;
+    getCandleLighting(location: Location, nullIfNoCandles: boolean): import("../jcal-zmanim.js").Time | null | undefined;
     /**Get the sedra of the week for the current Jewish date.*/
     getSedra(israel: boolean): Sedra;
     /**Get the prakim of Pirkei Avos for the current Jewish date.*/
@@ -132,11 +132,11 @@ export default class jDate {
     /**Gets sunrise and sunset time for the current Jewish date at the given Location.
      *
      * Return format: {sunrise: {hour: 6, minute: 18}, sunset: {hour: 19, minute: 41}}*/
-    getSunriseSunset(location: Location, ignoreElevation?: boolean): import("../jcal-zmanim").SunTimes;
+    getSunriseSunset(location: Location, ignoreElevation?: boolean): import("../jcal-zmanim.js").SunTimes;
     /**Gets Chatzos for both the day and the night for the current Jewish date at the given Location.
      *
      *Return format: {hour: 11, minute: 48}*/
-    getChatzos(location: Location): import("../jcal-zmanim").Time;
+    getChatzos(location: Location): import("../jcal-zmanim.js").Time;
     /**Gets the length of a single Sha'a Zmanis in minutes for the current Jewish date at the given Location.*/
     getShaaZmanis(location: Location, offset: number): number;
     /**Returns the daily daf in English. For example: Sukkah, Daf 3.*/

package/dist/JCal/jDate.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const GeneralUtils_1 = require("../GeneralUtils");
-const Utils_js_1 = __importDefault(require("./Utils.js"));
+const Utils_js_1 = require("../Utils.js");
 const Sedra_js_1 = __importDefault(require("./Sedra.js"));
 const PirkeiAvos_js_1 = __importDefault(require("./PirkeiAvos.js"));
 const Zmanim_js_1 = __importDefault(require("./Zmanim.js"));
@@ -55,7 +54,7 @@ class jDate {
             this.fromAbs(jDate.absSd(new Date()));
         }
         else if (arg instanceof Date) {
-            if ((0, GeneralUtils_1.isValidDate)(arg)) {
+            if (Utils_js_1.Utils.isValidDate(arg)) {
                 this.fromAbs(jDate.absSd(arg));
             }
             else {
@@ -70,9 +69,9 @@ class jDate {
                 (arg.length > 3 && arg[3]) ||
                     jDate.absJd(this.Year, this.Month, this.Day);
         }
-        else if (arg && (0, GeneralUtils_1.isString)(arg)) {
+        else if (arg && Utils_js_1.Utils.isString(arg)) {
             const d = new Date(arg);
-            if ((0, GeneralUtils_1.isValidDate)(d)) {
+            if (Utils_js_1.Utils.isValidDate(d)) {
                 this.fromAbs(jDate.absSd(d));
             }
             else {
@@ -81,7 +80,7 @@ class jDate {
                     '" cannot be parsed into a Date');
             }
         }
-        else if ((0, GeneralUtils_1.isNumber)(arg)) {
+        else if (Utils_js_1.Utils.isNumber(arg)) {
             //if no other arguments were supplied, we assume that the supplied number is an absolute date
             if (arguments.length === 1) {
                 this.fromAbs(arg);
@@ -98,7 +97,7 @@ class jDate {
         //If arg is an object that has a "year" property that contains a valid value...
         else if (typeof arg === 'object') {
             const argObj = arg;
-            if ((0, GeneralUtils_1.isNumber)(argObj.year)) {
+            if (Utils_js_1.Utils.isNumber(argObj.year)) {
                 this.Day = argObj.day || 1;
                 this.Month = argObj.month || 7;
                 this.Year = argObj.year;
@@ -270,9 +269,9 @@ class jDate {
             ? dontCapitalize
                 ? 't'
                 : 'T'
-            : Utils_js_1.default.dowEng[this.getDayOfWeek()] + ', t') +
+            : Utils_js_1.DaysOfWeekEng[this.getDayOfWeek()] + ', t') +
             'he ' +
-            Utils_js_1.default.toSuffixed(this.Day) +
+            Utils_js_1.Utils.toSuffixed(this.Day) +
             ' of ' +
             this.monthName());
     }
@@ -281,8 +280,8 @@ class jDate {
      * @param {boolean} showDow - show day of week?
      */
     toShortstring(showDow) {
-        return ((showDow ? Utils_js_1.default.dowEng[this.getDayOfWeek()] + ' ' : '') +
-            Utils_js_1.default.jMonthsEng[this.Month] +
+        return ((showDow ? Utils_js_1.DaysOfWeekEng[this.getDayOfWeek()] + ' ' : '') +
+            Utils_js_1.JewishMonthsEng[this.Month] +
             ' ' +
             this.Day.toString() +
             ', ' +
@@ -293,18 +292,18 @@ class jDate {
      * @param {boolean} showYear - show the year number?
      */
     monthName(showYear = true) {
-        return (Utils_js_1.default.jMonthsEng[this.Month] +
+        return (Utils_js_1.JewishMonthsEng[this.Month] +
             (showYear ? ' ' + this.Year.toString() : ''));
     }
     /**Returns the current Jewish date in the format: יום חמישי כ"א כסלו תשע"ו.*/
     toStringHeb() {
-        return (Utils_js_1.default.dowHeb[this.getDayOfWeek()] +
+        return (Utils_js_1.DaysOfWeekHeb[this.getDayOfWeek()] +
             ' ' +
-            Utils_js_1.default.toJNum(this.Day) +
+            Utils_js_1.Utils.toJewishNumber(this.Day) +
             ' ' +
-            Utils_js_1.default.jMonthsHeb[this.Month] +
+            Utils_js_1.JewishMonthsHeb[this.Month] +
             ' ' +
-            Utils_js_1.default.toJNum(this.Year % 1000));
+            Utils_js_1.Utils.toJewishNumber(this.Year % 1000));
     }
     /**Gets the day of the omer for the current Jewish date. If the date is not during sefira, 0 is returned.*/
     getDayOfOmer() {
@@ -355,10 +354,10 @@ class jDate {
     }
     /**Is today Erev Yom Tov? (includes Erev second days of Sukkos and Pesach) */
     isErevYomTov() {
-        return ((this.Month === 1 && (0, GeneralUtils_1.has)(this.Day, 14, 20)) ||
+        return ((this.Month === 1 && Utils_js_1.Utils.has(this.Day, 14, 20)) ||
             (this.Month === 3 && this.Day === 5) ||
             (this.Month === 6 && this.Day === 29) ||
-            (this.Month === 7 && (0, GeneralUtils_1.has)(this.Day, 9, 14, 21)));
+            (this.Month === 7 && Utils_js_1.Utils.has(this.Day, 9, 14, 21)));
     }
     /**Does the current Jewish date have candle lighting before sunset?*/
     hasCandleLighting() {
@@ -468,7 +467,7 @@ class jDate {
         // If just the year is set, then the date is set to Rosh Hashana of that year.
         // In the above scenario, we can't just pass the args along, as the constructor will treat it as an absolute date.
         //...and that folks, is actually the whole point of this function...
-        else if ((0, GeneralUtils_1.isNumber)(arg) && arguments.length === 1) {
+        else if (Utils_js_1.Utils.isNumber(arg) && arguments.length === 1) {
             return new jDate(arg, 7, 1);
         }
         else {
@@ -481,7 +480,7 @@ class jDate {
     /**Calculate the Jewish year, month and day for the given absolute date.*/
     static fromAbs(absDay) {
         //To save on calculations, start with a few years before date
-        let year = 3761 + Utils_js_1.default.toInt(absDay / (absDay > 0 ? 366 : 300)), month, day;
+        let year = 3761 + Utils_js_1.Utils.toInt(absDay / (absDay > 0 ? 366 : 300)), month, day;
         // Search forward for year from the approximation year.
         while (absDay >= jDate.absJd(year + 1, 7, 1)) {
             year++;
@@ -590,13 +589,13 @@ class jDate {
         if (cached) {
             return cached.elapsed;
         }
-        const months = Utils_js_1.default.toInt(235 * Utils_js_1.default.toInt((year - 1) / 19) + // Leap months this cycle
+        const months = Utils_js_1.Utils.toInt(235 * Utils_js_1.Utils.toInt((year - 1) / 19) + // Leap months this cycle
             12 * ((year - 1) % 19) + // Regular months in this cycle.
             (7 * ((year - 1) % 19) + 1) / 19), // Months in complete cycles so far.
         parts = 204 + 793 * (months % 1080), hours = 5 +
             12 * months +
-            793 * Utils_js_1.default.toInt(months / 1080) +
-            Utils_js_1.default.toInt(parts / 1080), conjDay = Utils_js_1.default.toInt(1 + 29 * months + hours / 24), conjParts = 1080 * (hours % 24) + (parts % 1080);
+            793 * Utils_js_1.Utils.toInt(months / 1080) +
+            Utils_js_1.Utils.toInt(parts / 1080), conjDay = Utils_js_1.Utils.toInt(1 + 29 * months + hours / 24), conjParts = 1080 * (hours % 24) + (parts % 1080);
         let altDay;
         /* at the end of a leap year -  15 hours, 589 parts or later... -
         ... or is on a Monday at... -  ...of a common year, -
@@ -616,7 +615,7 @@ class jDate {
             altDay = conjDay;
         }
         // A day is added if Rosh HaShanah would occur on Sunday, Friday or Wednesday,
-        if ((0, GeneralUtils_1.has)(altDay % 7, 0, 3, 5)) {
+        if (Utils_js_1.Utils.has(altDay % 7, 0, 3, 5)) {
             altDay += 1;
         }
         //Add this year to the cache to save on calculations later on