@hebcal/core 3.33.3 → 3.33.4

package/dist/hdate.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.33.3 */
+/*! @hebcal/core v3.33.4 */
 const GERESH = '׳';
 const GERSHAYIM = '״';
 /**
@@ -549,19 +549,19 @@ Locale.useLocale('en');
     You should have received a copy of the GNU General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-const NISAN = 1;
+const NISAN$1 = 1;
 const IYYAR = 2;
 const SIVAN = 3;
 const TAMUZ = 4;
 const AV = 5;
 const ELUL = 6;
 const TISHREI = 7;
-const CHESHVAN = 8;
-const KISLEV = 9;
-const TEVET = 10;
-const SHVAT = 11;
-const ADAR_I = 12;
-const ADAR_II = 13;
+const CHESHVAN$1 = 8;
+const KISLEV$1 = 9;
+const TEVET$1 = 10;
+const SHVAT$1 = 11;
+const ADAR_I$1 = 12;
+const ADAR_II$1 = 13;
 /**
  * Hebrew months of the year (NISAN=1, TISHREI=7)
  * @readonly
@@ -903,7 +903,7 @@ class HDate {
         tempabs += HDate.daysInMonth(m, year);
       }
 
-      for (let m = NISAN; m < month; m++) {
+      for (let m = NISAN$1; m < month; m++) {
         tempabs += HDate.daysInMonth(m, year);
       }
     } else {
@@ -1049,7 +1049,7 @@ class HDate {
    * @example
    * import {HDate, months} from '@hebcal/core';
    * const hd = new HDate(15, months.CHESHVAN, 5769);
-   * console.log(ev.renderGematriya()); // 'ט״ו חֶשְׁוָן תשס״ט'
+   * console.log(hd.renderGematriya()); // 'ט״ו חֶשְׁוָן תשס״ט'
    * @return {string}
    */
 
@@ -1311,7 +1311,7 @@ class HDate {
 
 
   static daysInMonth(month, year) {
-    if (month == IYYAR || month == TAMUZ || month == ELUL || month == TEVET || month == ADAR_II || month == ADAR_I && !HDate.isLeapYear(year) || month == CHESHVAN && !HDate.longCheshvan(year) || month == KISLEV && HDate.shortKislev(year)) {
+    if (month == IYYAR || month == TAMUZ || month == ELUL || month == TEVET$1 || month == ADAR_II$1 || month == ADAR_I$1 && !HDate.isLeapYear(year) || month == CHESHVAN$1 && !HDate.longCheshvan(year) || month == KISLEV$1 && HDate.shortKislev(year)) {
       return 29;
     } else {
       return 30;
@@ -1449,7 +1449,7 @@ class HDate {
           /* this catches "november" */
         }
 
-        return NISAN;
+        return NISAN$1;
 
       case 'i':
         return IYYAR;
@@ -1459,11 +1459,11 @@ class HDate {
 
       case 'c':
       case 'ח':
-        return CHESHVAN;
+        return CHESHVAN$1;
 
       case 'k':
       case 'כ':
-        return KISLEV;
+        return KISLEV$1;
 
       case 's':
         switch (c[1]) {
@@ -1471,7 +1471,7 @@ class HDate {
             return SIVAN;
 
           case 'h':
-            return SHVAT;
+            return SHVAT$1;
         }
 
       case 't':
@@ -1483,7 +1483,7 @@ class HDate {
             return TISHREI;
 
           case 'e':
-            return TEVET;
+            return TEVET$1;
         }
 
         break;
@@ -1495,10 +1495,10 @@ class HDate {
 
           case 'd':
             if (/(1|[^i]i|a|א)$/i.test(monthName)) {
-              return ADAR_I;
+              return ADAR_I$1;
             }
 
-            return ADAR_II;
+            return ADAR_II$1;
           // else assume sheini
         }
 
@@ -1508,10 +1508,10 @@ class HDate {
         return SIVAN;
 
       case 'ט':
-        return TEVET;
+        return TEVET$1;
 
       case 'ש':
-        return SHVAT;
+        return SHVAT$1;
 
       case 'א':
         switch (c[1]) {
@@ -1520,10 +1520,10 @@ class HDate {
 
           case 'ד':
             if (/(1|[^i]i|a|א)$/i.test(monthName)) {
-              return ADAR_I;
+              return ADAR_I$1;
             }
 
-            return ADAR_II;
+            return ADAR_II$1;
           // else assume sheini
 
           case 'י':
@@ -1620,7 +1620,7 @@ function fixDate(date) {
 
 
 function fixMonth(date) {
-  if (date.month == ADAR_II && !date.isLeapYear()) {
+  if (date.month == ADAR_II$1 && !date.isLeapYear()) {
     date.month -= 1; // to Adar I
 
     fix(date);
@@ -1649,11 +1649,104 @@ function onOrBefore(day, t, offset) {
   return new HDate(HDate.dayOnOrBefore(day, t.abs() + offset));
 }
 
-var version="3.33.3";
+const NISAN = months.NISAN;
+const CHESHVAN = months.CHESHVAN;
+const KISLEV = months.KISLEV;
+const TEVET = months.TEVET;
+const SHVAT = months.SHVAT;
+const ADAR_I = months.ADAR_I;
+const ADAR_II = months.ADAR_II;
+/**
+ * @private
+ * @param {number} hyear Hebrew year
+ * @param {Date|HDate} gdate Gregorian or Hebrew date of death
+ * @return {HDate} anniversary occurring in hyear
+ */
+
+function getYahrzeit_(hyear, gdate) {
+  const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  let hDeath = {
+    yy: orig.getFullYear(),
+    mm: orig.getMonth(),
+    dd: orig.getDate()
+  };
+
+  if (hyear <= hDeath.yy) {
+    // `Hebrew year ${hyear} occurs on or before original date in ${hDeath.yy}`
+    return undefined;
+  }
+
+  if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hDeath.yy + 1)) {
+    // If it's Heshvan 30 it depends on the first anniversary;
+    // if that was not Heshvan 30, use the day before Kislev 1.
+    hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, KISLEV, 1) - 1);
+  } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hDeath.yy + 1)) {
+    // If it's Kislev 30 it depends on the first anniversary;
+    // if that was not Kislev 30, use the day before Teveth 1.
+    hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, TEVET, 1) - 1);
+  } else if (hDeath.mm == ADAR_II) {
+    // If it's Adar II, use the same day in last month of year (Adar or Adar II).
+    hDeath.mm = HDate.monthsInYear(hyear);
+  } else if (hDeath.mm == ADAR_I && hDeath.dd == 30 && !HDate.isLeapYear(hyear)) {
+    // If it's the 30th in Adar I and year is not a leap year
+    // (so Adar has only 29 days), use the last day in Shevat.
+    hDeath.dd = 30;
+    hDeath.mm = SHVAT;
+  } // In all other cases, use the normal anniversary of the date of death.
+  // advance day to rosh chodesh if needed
+
+
+  if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hyear)) {
+    hDeath.mm = KISLEV;
+    hDeath.dd = 1;
+  } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hyear)) {
+    hDeath.mm = TEVET;
+    hDeath.dd = 1;
+  }
+
+  return new HDate(hDeath.dd, hDeath.mm, hyear);
+}
+/**
+ * @private
+ * @param {number} hyear Hebrew year
+ * @param {Date|HDate} gdate Gregorian or Hebrew date of event
+ * @return {HDate} anniversary occurring in `hyear`
+ */
+
+function getBirthdayOrAnniversary_(hyear, gdate) {
+  const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  const origYear = orig.getFullYear();
+
+  if (hyear <= origYear) {
+    // `Hebrew year ${hyear} occurs on or before original date in ${origYear}`
+    return undefined;
+  }
+
+  const isOrigLeap = HDate.isLeapYear(origYear);
+  let month = orig.getMonth();
+  let day = orig.getDate();
+
+  if (month == ADAR_I && !isOrigLeap || month == ADAR_II && isOrigLeap) {
+    month = HDate.monthsInYear(hyear);
+  } else if (month == CHESHVAN && day == 30 && !HDate.longCheshvan(hyear)) {
+    month = KISLEV;
+    day = 1;
+  } else if (month == KISLEV && day == 30 && HDate.shortKislev(hyear)) {
+    month = TEVET;
+    day = 1;
+  } else if (month == ADAR_I && day == 30 && isOrigLeap && !HDate.isLeapYear(hyear)) {
+    month = NISAN;
+    day = 1;
+  }
+
+  return new HDate(day, month, hyear);
+}
+
+var version="3.33.4";
 
 var headers={"plural-forms":"nplurals=2; plural=(n > 1);",language:"he"};var contexts={"":{Adar:["אַדָר"],"Adar I":["אַדָר א׳"],"Adar II":["אַדָר ב׳"],Av:["אָב"],Cheshvan:["חֶשְׁוָן"],Elul:["אֱלוּל"],Iyyar:["אִיָיר"],Kislev:["כִּסְלֵו"],Nisan:["נִיסָן"],"Sh'vat":["שְׁבָט"],Sivan:["סִיוָן"],Tamuz:["תַּמּוּז"],Tevet:["טֵבֵת"],Tishrei:["תִשְׁרֵי"]}};var poHeMin = {headers:headers,contexts:contexts};
 
 Locale.addLocale('he', poHeMin);
 Locale.addLocale('h', poHeMin);
 
-export { HDate, Locale, gematriya, greg, months, version };
+export { HDate, Locale, gematriya, getBirthdayOrAnniversary_ as getBirthdayOrAnniversary, getYahrzeit_ as getYahrzeit, greg, months, version };