jcal-zmanim 1.5.1 → 1.5.3

package/dist/index.d.cts

@@ -28,11 +28,11 @@ declare class Sedra {
     /**
      * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
      */
-    toString(): string;
+    toString(): string | false;
     /**
      * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
      */
-    toStringHeb(): string;
+    toStringHeb(): string | false;
     static lastCalculatedYear: {
         firstSatInYear: number;
         sedraArray?: number[];
@@ -484,7 +484,7 @@ declare class Utils {
      * @param {number} dayOfOmer The day of the Omer for which to get the nusach for
      * @param {'ashkenaz'|'sefard'|'sefardi'} nusach Should it be La'Omer ("sefard") or Ba'Omer ("ashkenaz") or "sefardi" (Eidot Hamizrach)?
      */
-    static getOmerNusach(dayOfOmer: number, nusach: 'ashkenaz' | 'sefard' | 'sefardi'): string;
+    static getOmerNusach(dayOfOmer: number, nusach: "ashkenaz" | "sefard" | "sefardi"): string;
     /**
      * Returns the given time in a formatted string.
      * @param {Time} time An object in the format {hour : 23, minute :42, second: 18 }
@@ -569,10 +569,10 @@ declare class Utils {
      */
     static toInt(float: number): number;
     /***
-    * Takes either a jDate or a Date and returns both
-    * @param date {Date |jDate}
-    * @returns {{ sdate:Date, jdate:jDate }}
-    */
+     * Takes either a jDate or a Date and returns both
+     * @param date {Date |jDate}
+     * @returns {{ sdate:Date, jdate:jDate }}
+     */
     static bothDates(date: Date | jDate): {
         sdate: Date;
         jdate: jDate;

package/dist/index.d.ts

@@ -28,11 +28,11 @@ declare class Sedra {
     /**
      * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
      */
-    toString(): string;
+    toString(): string | false;
     /**
      * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
      */
-    toStringHeb(): string;
+    toStringHeb(): string | false;
     static lastCalculatedYear: {
         firstSatInYear: number;
         sedraArray?: number[];
@@ -484,7 +484,7 @@ declare class Utils {
      * @param {number} dayOfOmer The day of the Omer for which to get the nusach for
      * @param {'ashkenaz'|'sefard'|'sefardi'} nusach Should it be La'Omer ("sefard") or Ba'Omer ("ashkenaz") or "sefardi" (Eidot Hamizrach)?
      */
-    static getOmerNusach(dayOfOmer: number, nusach: 'ashkenaz' | 'sefard' | 'sefardi'): string;
+    static getOmerNusach(dayOfOmer: number, nusach: "ashkenaz" | "sefard" | "sefardi"): string;
     /**
      * Returns the given time in a formatted string.
      * @param {Time} time An object in the format {hour : 23, minute :42, second: 18 }
@@ -569,10 +569,10 @@ declare class Utils {
      */
     static toInt(float: number): number;
     /***
-    * Takes either a jDate or a Date and returns both
-    * @param date {Date |jDate}
-    * @returns {{ sdate:Date, jdate:jDate }}
-    */
+     * Takes either a jDate or a Date and returns both
+     * @param date {Date |jDate}
+     * @returns {{ sdate:Date, jdate:jDate }}
+     */
     static bothDates(date: Date | jDate): {
         sdate: Date;
         jdate: jDate;

package/dist/index.js

@@ -148,7 +148,7 @@ var _Sedra = /*#__PURE__*/ function() {
    * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
    */ key: "toString",
             value: function toString() {
-                return this.sedras.map(function(s) {
+                return this.sedras.length > 0 && this.sedras.map(function(s) {
                     return s.eng;
                 }).join(" - ");
             }
@@ -158,7 +158,7 @@ var _Sedra = /*#__PURE__*/ function() {
    * Gets the sedra/s as a string. If there are two, they are seperated by a " - "
    */ key: "toStringHeb",
             value: function toStringHeb() {
-                return this.sedras.map(function(s) {
+                return this.sedras.length > 0 && this.sedras.map(function(s) {
                     return s.heb;
                 }).join(" - ");
             }
@@ -4187,19 +4187,19 @@ var _Utils = /*#__PURE__*/ function() {
    */ function getTimeIntervalTextStringHeb(time) {
                 var t = "";
                 if (time.hour > 0) {
-                    t += "".concat(time.hour.toString(), " ").concat(time.hour === 1 ? "\u05E9\u05E2\u05D4" : "\u05E9\u05E2\u05D5\u05EA");
+                    t += "".concat(time.hour.toString(), " ").concat(time.hour === 1 ? "\u05E9\u05E2\u05D4" : "\u05E9\u05E2\u05D5\u05EA", "\xad");
                 }
                 if (time.minute > 0) {
                     if (t.length) {
                         t += " ";
                     }
-                    t += "".concat(time.minute.toString(), " ").concat(time.minute === 1 ? "\u05D3\u05E7\u05D4" : "\u05D3\u05E7\u05D5\u05EA");
+                    t += "".concat(time.minute.toString(), " ").concat(time.minute === 1 ? "\u05D3\u05E7\u05D4" : "\u05D3\u05E7\u05D5\u05EA", "\xad");
                 }
                 if ((time.second || 0) > 0) {
                     if (t.length) {
                         t += " ";
                     }
-                    t += "".concat(Math.trunc(time.second || 0).toString(), " ").concat(time.second === 1 ? "\u05E9\u05E0\u05D9\u05D9\u05D4" : "\u05E9\u05E0\u05D9\u05D5\u05EA");
+                    t += "".concat(Math.trunc(time.second || 0).toString(), " ").concat(time.second === 1 ? "\u05E9\u05E0\u05D9\u05D9\u05D4" : "\u05E9\u05E0\u05D9\u05D5\u05EA", "\xad");
                 }
                 return t;
             }
@@ -4212,19 +4212,19 @@ var _Utils = /*#__PURE__*/ function() {
    */ function getTimeIntervalTextString(time) {
                 var t = "";
                 if (time.hour > 0) {
-                    t += "".concat(time.hour.toString(), " ").concat(time.hour === 1 ? "hour" : "hours");
+                    t += "".concat(time.hour.toString(), " ").concat(time.hour === 1 ? "hour" : "hours", "\xad");
                 }
                 if (time.minute > 0) {
                     if (t.length) {
                         t += " ";
                     }
-                    t += "".concat(time.minute.toString(), " ").concat(time.minute === 1 ? "minute" : "minutes");
+                    t += "".concat(time.minute.toString(), " ").concat(time.minute === 1 ? "minute" : "minutes", "\xad");
                 }
                 if ((time.second || 0) > 0) {
                     if (t.length) {
                         t += " ";
                     }
-                    t += "".concat(Math.trunc(time.second || 0).toString(), " ").concat(time.second === 1 ? "second" : "seconds");
+                    t += "".concat(Math.trunc(time.second || 0).toString(), " ").concat(time.second === 1 ? "second" : "seconds", "\xad");
                 }
                 return t;
             }
@@ -4291,7 +4291,7 @@ var _Utils = /*#__PURE__*/ function() {
             value: /**
    * Returns the given time in a formatted string.
    * @param {Time} time An object in the format {hour : 23, minute :42, second: 18 }
-   * @param {1 | -1} [sign] 
+   * @param {1 | -1} [sign]
    * @param {Boolean} [army] If falsey, the returned string will be: 11:42:18 PM otherwise it will be 23:42:18
    * @param {Boolean} [roundUp] If falsey, the numbers will converted to a whole number by rounding down, otherwise, up.
    */ function getTimeString(time, sign, army, roundUp) {
@@ -4479,10 +4479,10 @@ var _Utils = /*#__PURE__*/ function() {
         {
             key: "bothDates",
             value: /***
-  * Takes either a jDate or a Date and returns both
-  * @param date {Date |jDate}
-  * @returns {{ sdate:Date, jdate:jDate }}
-  */ function bothDates(date) {
+   * Takes either a jDate or a Date and returns both
+   * @param date {Date |jDate}
+   * @returns {{ sdate:Date, jdate:jDate }}
+   */ function bothDates(date) {
                 var jdate = _instanceof(date, Date) ? new jDate(date) : date;
                 var sdate = _instanceof(date, Date) ? date : jdate.getDate();
                 return {
@@ -13454,7 +13454,7 @@ function getNotifications(date, time, location, english, showGaonShir, showDafYo
     var _Utils_bothDates = Utils.bothDates(date), sdate = _Utils_bothDates.sdate, jdate = _Utils_bothDates.jdate;
     dayNotes.length = 0;
     tefillahNotes.length = 0;
-    var month = jdate.Month, day = jdate.Day, dow = jdate.DayOfWeek, _ZmanimUtils_getBasicShulZmanim = ZmanimUtils.getBasicShulZmanim(date, location), chatzosHayom = _ZmanimUtils_getBasicShulZmanim.chatzosHayom, chatzosHalayla = _ZmanimUtils_getBasicShulZmanim.chatzosHalayla, alos = _ZmanimUtils_getBasicShulZmanim.alos, shkia = _ZmanimUtils_getBasicShulZmanim.shkia, isAfterChatzosHayom = Utils.isTimeAfter(chatzosHayom, time), isAfterChatzosHalayla = typeof chatzosHalayla !== "undefined" && (Utils.isTimeAfter(chatzosHalayla, time) || chatzosHalayla.hour > 12 && time.hour < 12), isAfterAlos = Utils.isTimeAfter(alos, time), isAfterShkia = Utils.isTimeAfter(shkia, time), isDaytime = isAfterAlos && !isAfterShkia, isNightTime = !isDaytime, isNotBeinHasmashos = !isAfterShkia || Utils.isTimeAfter(Utils.addMinutes(shkia, 18), time), isMorning = isDaytime && !isAfterChatzosHayom, isAfternoon = isDaytime && isAfterChatzosHayom, isYomTov = jdate.isYomTovOrCholHamoed(location.Israel), isLeapYear = jDate.isJdLeapY(jdate.Year), noTachnun = isAfternoon && (dow === DaysOfWeek.FRIDAY || day === 29);
+    var month = jdate.Month, day = jdate.Day, dow = jdate.DayOfWeek, _ZmanimUtils_getBasicShulZmanim = ZmanimUtils.getBasicShulZmanim(date, location), chatzosHayom = _ZmanimUtils_getBasicShulZmanim.chatzosHayom, chatzosHalayla = _ZmanimUtils_getBasicShulZmanim.chatzosHalayla, alos = _ZmanimUtils_getBasicShulZmanim.alos, shkia = _ZmanimUtils_getBasicShulZmanim.shkia, isAfterChatzosHayom = Utils.isTimeAfter(chatzosHayom, time), isAfterChatzosHalayla = typeof chatzosHalayla !== "undefined" && (Utils.isTimeAfter(chatzosHalayla, time) || chatzosHalayla.hour > 12 && time.hour < 12), isAfterAlos = Utils.isTimeAfter(alos, time), isAfterShkia = Utils.isTimeAfter(shkia, time), isDaytime = isAfterAlos && !isAfterShkia, isNightTime = !isDaytime, isNotBeinHasmashos = !isAfterShkia || Utils.isTimeAfter(Utils.addMinutes(shkia, 18), time), isMorning = isDaytime && !isAfterChatzosHayom, isAfternoon = isDaytime && isAfterChatzosHayom && isNotBeinHasmashos, isYomTov = jdate.isYomTovOrCholHamoed(location.Israel), isLeapYear = jDate.isJdLeapY(jdate.Year), noTachnun = isAfternoon && (dow === DaysOfWeek.FRIDAY || day === 29);
     dayInfo = {
         jdate: jdate,
         sdate: sdate,
@@ -13514,6 +13514,8 @@ function getShabbosNotifications() {
         addDayNote("Shabbos Shuva", "\u05E9\u05D1\u05EA \u05E9\u05D5\u05D1\u05D4");
     } else if (month === JewishMonthsNames.AV && day > 2 && day < 10) {
         addDayNote("Shabbos Chazon", "\u05E9\u05D1\u05EA \u05D7\u05D6\u05D5\u05DF");
+    } else if (month === JewishMonthsNames.AV && day > 10 && day < 18) {
+        addDayNote("Shabbos Nachamu", "\u05E9\u05D1\u05EA \u05E0\u05D7\u05DE\u05D5");
     } else if (month === (isLeapYear ? JewishMonthsNames.ADAR : JewishMonthsNames.SHVAT) && day > 24 || month === (isLeapYear ? JewishMonthsNames.ADAR_SHEINI : JewishMonthsNames.ADAR) && day === 1) {
         addDayNote("Parshas Shkalim", "\u05E4\u05E8\u05E9\u05EA \u05E9\u05E7\u05DC\u05D9\u05DD");
     } else if (month === (isLeapYear ? JewishMonthsNames.ADAR_SHEINI : JewishMonthsNames.ADAR) && day > 7 && day < 14) {
@@ -13523,9 +13525,12 @@ function getShabbosNotifications() {
     } else if (month === (isLeapYear ? JewishMonthsNames.ADAR_SHEINI : JewishMonthsNames.ADAR) && day > 23 && day < 30 || month === JewishMonthsNames.NISSAN && day === 1) {
         addDayNote("Parshas Hachodesh", "\u05E4\u05E8\u05E9\u05EA \u05D4\u05D7\u05D5\u05D3\u05E9");
     }
-    if (isMorning && !isYomTov) {
+    if (!isYomTov) {
         var sedra = jdate.getSedra(israel);
-        if (sedra.sedras.length > 0) {
+        if (sedra.sedras.length > 0 && sedra.toStringHeb() === "\u05D1\u05E9\u05DC\u05D7") {
+            addDayNote("Shabbos Shira", "\u05E9\u05D1\u05EA \u05E9\u05D9\u05E8\u05D4");
+        }
+        if (isMorning && sedra.sedras.length > 0) {
             addTefillahNote("Kriyas Hatorah Parshas ".concat(sedra.toString()), 'קה"ת פרשת '.concat(sedra.toStringHeb()));
         }
         if (month !== JewishMonthsNames.ELLUL && day > 22 && day < 30) {
@@ -13628,6 +13633,9 @@ function getAroundTheYearNotifications() {
             if (dow !== DaysOfWeek.SHABBOS && day > 15 && day !== 21) {
                 addTefillahNote("Vesain Bracha", "\u05D5\u05EA\u05DF \u05D1\u05E8\u05DB\u05D4");
             }
+            if (isNightTime && (dow !== DaysOfWeek.FRIDAY && day === 14 || dow === DaysOfWeek.THURSDAY && day === 13)) {
+                addDayNote("Bedikas Chometz", "\u05D1\u05D3\u05D9\u05E7\u05EA \u05D7\u05DE\u05E5");
+            }
             if (isMorning && dow !== DaysOfWeek.SHABBOS && [
                 14,
                 16,