@hebcal/core 3.33.2 → 3.33.5

package/dist/hdate.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.33.2 */
+/*! @hebcal/core v3.33.5 */
 const GERESH = '׳';
 const GERSHAYIM = '״';
 /**
@@ -207,53 +207,55 @@ function quotient(x, y) {
 }
 /**
  * Gregorian date helper functions.
- * @namespace
  */
 
 
-const greg = {
+class greg {
   /**
    * Long names of the Gregorian months (1='January', 12='December')
    * @readonly
    * @type {string[]}
    */
-  monthNames: ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-
+  static monthNames = ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
   /**
    * Returns true if the Gregorian year is a leap year
    * @param {number} year Gregorian year
    * @return {boolean}
    */
-  isLeapYear: function (year) {
-    return !(year % 4) && (!!(year % 100) || !(year % 400));
-  },
 
+  static isLeapYear(year) {
+    return !(year % 4) && (!!(year % 100) || !(year % 400));
+  }
   /**
    * Number of days in the Gregorian month for given year
    * @param {number} month Gregorian month (1=January, 12=December)
    * @param {number} year Gregorian year
    * @return {number}
    */
-  daysInMonth: function (month, year) {
+
+
+  static daysInMonth(month, year) {
     // 1 based months
     return monthLengths[+this.isLeapYear(year)][month];
-  },
-
+  }
   /**
    * Returns true if the object is a Javascript Date
    * @param {Object} obj
    * @return {boolean}
    */
-  isDate: function (obj) {
-    return typeof obj === 'object' && Date.prototype === obj.__proto__;
-  },
 
+
+  static isDate(obj) {
+    return typeof obj === 'object' && Date.prototype === obj.__proto__;
+  }
   /**
    * Returns number of days since January 1 of that year
    * @param {Date} date Gregorian date
    * @return {number}
    */
-  dayOfYear: function (date) {
+
+
+  static dayOfYear(date) {
     if (!this.isDate(date)) {
       throw new TypeError('Argument to greg.dayOfYear not a Date');
     }
@@ -270,14 +272,15 @@ const greg = {
     }
 
     return doy;
-  },
-
+  }
   /**
    * Converts Gregorian date to absolute R.D. (Rata Die) days
    * @param {Date} date Gregorian date
    * @return {number}
    */
-  greg2abs: function (date) {
+
+
+  static greg2abs(date) {
     if (!this.isDate(date)) {
       throw new TypeError('Argument to greg.greg2abs not a Date');
     }
@@ -288,14 +291,15 @@ const greg = {
     Math.floor(year / 4) - // + Julian Leap years
     Math.floor(year / 100) + // - century years
     Math.floor(year / 400)); // + Gregorian leap years
-  },
-
+  }
   /**
    * @private
    * @param {number} theDate - R.D. number of days
    * @return {number}
    */
-  yearFromFixed: function (theDate) {
+
+
+  static yearFromFixed(theDate) {
     const l0 = theDate - 1;
     const n400 = quotient(l0, 146097);
     const d1 = mod(l0, 146097);
@@ -306,8 +310,7 @@ const greg = {
     const n1 = quotient(d3, 365);
     const year = 400 * n400 + 100 * n100 + 4 * n4 + n1;
     return n100 != 4 && n1 != 4 ? year + 1 : year;
-  },
-
+  }
   /**
    * @private
    * @param {number} year
@@ -315,11 +318,12 @@ const greg = {
    * @param {number} day
    * @return {number}
    */
-  toFixed: function (year, month, day) {
+
+
+  static toFixed(year, month, day) {
     const py = year - 1;
     return 0 + 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + Math.floor(month <= 2 ? 0 : this.isLeapYear(year) ? -1 : -2) + day;
-  },
-
+  }
   /**
    * Converts from Rata Die (R.D. number) to Gregorian date.
    * See the footnote on page 384 of ``Calendrical Calculations, Part II:
@@ -329,7 +333,9 @@ const greg = {
    * @param {number} theDate - R.D. number of days
    * @return {Date}
    */
-  abs2greg: function (theDate) {
+
+
+  static abs2greg(theDate) {
     if (typeof theDate !== 'number') {
       throw new TypeError('Argument to greg.abs2greg not a Number');
     }
@@ -348,7 +354,8 @@ const greg = {
 
     return dt;
   }
-};
+
+}
 
 const noopLocale = {
   headers: {
@@ -371,19 +378,17 @@ const alias = {
  * * `ashkenazi` - Ashkenazi transliterations (e.g. "Shabbos")
  * * `he` - Hebrew (e.g. "שַׁבָּת")
  * * `he-x-NoNikud` - Hebrew without nikud (e.g. "שבת")
- * @namespace
  */
 
-const Locale = {
+class Locale {
   /** @private */
-  locales: Object.create(null),
-
+  static locales = Object.create(null);
   /** @private */
-  activeLocale: null,
 
+  static activeLocale = null;
   /** @private */
-  activeName: null,
 
+  static activeName = null;
   /**
    * Returns translation only if `locale` offers a non-empty translation for `id`.
    * Otherwise, returns `undefined`.
@@ -391,7 +396,8 @@ const Locale = {
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  lookupTranslation: function lookupTranslation(id, locale) {
+
+  static lookupTranslation(id, locale) {
     const locale0 = locale && locale.toLowerCase();
     const loc = typeof locale == 'string' && this.locales[locale0] || this.activeLocale;
     const array = loc[id];
@@ -401,15 +407,16 @@ const Locale = {
     }
 
     return undefined;
-  },
-
+  }
   /**
    * By default, if no translation was found, returns `id`.
    * @param {string} id Message ID to translate
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  gettext: function gettext(id, locale) {
+
+
+  static gettext(id, locale) {
     const text = this.lookupTranslation(id, locale);
 
     if (typeof text == 'undefined') {
@@ -417,21 +424,21 @@ const Locale = {
     }
 
     return text;
-  },
-
+  }
   /**
    * Register locale translations.
    * @param {string} locale Locale name (i.e.: `'he'`, `'fr'`)
    * @param {LocaleDate} data parsed data from a `.po` file.
    */
-  addLocale: function addLocale(locale, data) {
+
+
+  static addLocale(locale, data) {
     if (typeof data.contexts !== 'object' || typeof data.contexts[''] !== 'object') {
       throw new TypeError(`Locale '${locale}' invalid compact format`);
     }
 
     this.locales[locale.toLowerCase()] = data.contexts[''];
-  },
-
+  }
   /**
    * Activates a locale. Throws an error if the locale has not been previously added.
    * After setting the locale to be used, all strings marked for translations
@@ -439,7 +446,9 @@ const Locale = {
    * @param {string} locale Locale name (i.e: `'he'`, `'fr'`)
    * @return {LocaleData}
    */
-  useLocale: function useLocale(locale) {
+
+
+  static useLocale(locale) {
     const locale0 = locale.toLowerCase();
     const obj = this.locales[locale0];
 
@@ -450,30 +459,33 @@ const Locale = {
     this.activeName = alias[locale0] || locale0;
     this.activeLocale = obj;
     return this.activeLocale;
-  },
-
+  }
   /**
    * Returns the name of the active locale (i.e. 'he', 'ashkenazi', 'fr')
    * @return {string}
    */
-  getLocaleName: function getLocaleName() {
-    return this.activeName;
-  },
 
+
+  static getLocaleName() {
+    return this.activeName;
+  }
   /**
    * Returns the names of registered locales
    * @return {string[]}
    */
-  getLocaleNames: function getLocaleNames() {
-    return Object.keys(this.locales).sort();
-  },
 
+
+  static getLocaleNames() {
+    return Object.keys(this.locales).sort();
+  }
   /**
    * @param {number} n
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  ordinal: function ordinal(n, locale) {
+
+
+  static ordinal(n, locale) {
     const locale1 = locale && locale.toLowerCase();
     const locale0 = locale1 || this.activeName;
 
@@ -502,28 +514,31 @@ const Locale = {
       default:
         return n + '.';
     }
-  },
-
+  }
   /**
    * @private
    * @param {number} n
    * @return {string}
    */
-  getEnOrdinal: function getEnOrdinal(n) {
+
+
+  static getEnOrdinal(n) {
     const s = ['th', 'st', 'nd', 'rd'];
     const v = n % 100;
     return n + (s[(v - 20) % 10] || s[v] || s[0]);
-  },
-
+  }
   /**
    * Removes nekudot from Hebrew string
    * @param {string} str
    * @return {string}
    */
-  hebrewStripNikkud: function hebrewStripNikkud(str) {
+
+
+  static hebrewStripNikkud(str) {
     return str.replace(/[\u0590-\u05bd]/g, '').replace(/[\u05bf-\u05c7]/g, '');
   }
-};
+
+}
 Locale.addLocale('en', noopLocale);
 Locale.addLocale('s', noopLocale);
 Locale.addLocale('', noopLocale);
@@ -549,19 +564,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 +918,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 +1064,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 +1326,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 +1464,7 @@ class HDate {
           /* this catches "november" */
         }
 
-        return NISAN;
+        return NISAN$1;
 
       case 'i':
         return IYYAR;
@@ -1459,11 +1474,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 +1486,7 @@ class HDate {
             return SIVAN;
 
           case 'h':
-            return SHVAT;
+            return SHVAT$1;
         }
 
       case 't':
@@ -1483,7 +1498,7 @@ class HDate {
             return TISHREI;
 
           case 'e':
-            return TEVET;
+            return TEVET$1;
         }
 
         break;
@@ -1495,10 +1510,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 +1523,10 @@ class HDate {
         return SIVAN;
 
       case 'ט':
-        return TEVET;
+        return TEVET$1;
 
       case 'ש':
-        return SHVAT;
+        return SHVAT$1;
 
       case 'א':
         switch (c[1]) {
@@ -1520,10 +1535,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 +1635,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 +1664,104 @@ function onOrBefore(day, t, offset) {
   return new HDate(HDate.dayOnOrBefore(day, t.abs() + offset));
 }
 
-var version="3.33.2";
+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.5";
 
 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 };