@hebcal/core 3.39.0 → 3.40.0

package/dist/hdate0-bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.39.0 */
+/*! @hebcal/core v3.40.0 */
 var hebcal = (function (exports) {
 'use strict';
 
@@ -75,11 +75,12 @@ function dayOfYear(date) {
     throw new TypeError("Argument not a Date: ".concat(date));
   }
 
-  var doy = date.getDate() + 31 * date.getMonth();
+  var month = date.getMonth();
+  var doy = date.getDate() + 31 * month;
 
-  if (date.getMonth() > 1) {
+  if (month > 1) {
     // FEB
-    doy -= Math.floor((4 * (date.getMonth() + 1) + 23) / 10);
+    doy -= Math.floor((4 * (month + 1) + 23) / 10);
 
     if (isLeapYear$1(date.getFullYear())) {
       doy++;
@@ -136,7 +137,7 @@ function yearFromFixed(abs) {
 
 function toFixed(year, month, day) {
   var 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 : isLeapYear$1(year) ? -1 : -2) + day;
+  return 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + (month <= 2 ? 0 : isLeapYear$1(year) ? -1 : -2) + day;
 }
 /**
  * Converts from Rata Die (R.D. number) to Gregorian date.

package/dist/hdate0-bundle.min.js

@@ -1,2 +1,2 @@
-/*! @hebcal/core v3.39.0 */
-var hebcal=function(r){"use strict";function t(r){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},t(r)}var n=[0,31,28,31,30,31,30,31,31,30,31,30,31];function e(r,t){return r-t*Math.floor(r/t)}function o(r,t){return Math.floor(r/t)}function a(r){return!(r%4||!(r%100)&&r%400)}function u(r){return"object"===t(r)&&Date.prototype===r.__proto__}function f(r,t,n){var e=r-1;return 0+365*e+o(e,4)-o(e,100)+o(e,400)+o(367*t-362,12)+Math.floor(t<=2?0:a(r)?-1:-2)+n}[n,n.slice()][1][2]=29;var c=["","Nisan","Iyyar","Sivan","Tamuz","Av","Elul","Tishrei","Cheshvan","Kislev","Tevet","Sh'vat"],i=[c.concat(["Adar","Nisan"]),c.concat(["Adar I","Adar II","Nisan"])],h=Object.create(null),l=-1373428;function s(r,t,n){var e=n;if(t<7){for(var o=7;o<=b(r);o++)e+=m(o,r);for(var a=1;a<t;a++)e+=m(a,r)}else for(var u=7;u<t;u++)e+=m(u,r);return l+M(r)+e-1}function y(r){return l+M(r)}function v(r){return(1+7*r)%19<7}function b(r){return 12+v(r)}function m(r,t){switch(r){case 2:case 4:case 6:case 10:case 13:return 29}return 12===r&&!v(t)||8===r&&!A(t)||9===r&&g(t)?29:30}function M(r){var t=h[r]=h[r]||function(r){var t=r-1,n=235*Math.floor(t/19)+t%19*12+Math.floor((t%19*7+1)/19),e=204+n%1080*793,o=5+12*n+793*Math.floor(n/1080)+Math.floor(e/1080),a=e%1080+o%24*1080,u=1+29*n+Math.floor(o/24),f=u+(a>=19440||2==u%7&&a>=9924&&!v(r)||1==u%7&&a>=16789&&v(t));return f+(f%7==0||f%7==3||f%7==5)}(r);return t}function p(r){return M(r+1)-M(r)}function A(r){return p(r)%10==5}function g(r){return p(r)%10==3}var I={abs2hebrew:function(r){if("number"!=typeof r||isNaN(r))throw new TypeError("invalid parameter to abs2hebrew ".concat(r));r=Math.trunc(r);for(var t=Math.floor((r-l)/365.24682220597794);y(t)<=r;)++t;for(var n=r<s(--t,1,1)?7:1;r>s(t,n,m(n,t));)++n;return{yy:t,mm:n,dd:1+r-s(t,n,1)}},daysInMonth:m,daysInYear:p,getMonthName:function(r,t){if("number"!=typeof r||isNaN(r)||r<1||r>14)throw new TypeError("bad month argument ".concat(r));return i[+v(t)][r]},hebrew2abs:s,isLeapYear:v,longCheshvan:A,months:{NISAN:1,IYYAR:2,SIVAN:3,TAMUZ:4,AV:5,ELUL:6,TISHREI:7,CHESHVAN:8,KISLEV:9,TEVET:10,SHVAT:11,ADAR_I:12,ADAR_II:13},monthsInYear:b,shortKislev:g};return r.abs2greg=function(r){if("number"!=typeof r)throw new TypeError("Argument not a Number: ".concat(r));var t=function(r){var t=r-1,n=o(t,146097),a=e(t,146097),u=o(a,36524),f=e(a,36524),c=o(f,1461),i=o(e(f,1461),365),h=400*n+100*u+4*c+i;return 4!=u&&4!=i?h+1:h}(r=Math.trunc(r)),n=o(12*(r-f(t,1,1)+(r<f(t,3,1)?0:a(t)?1:2))+373,367),u=r-f(t,n,1)+1,c=new Date(t,n-1,u);return t<100&&t>=0&&c.setFullYear(t),c},r.greg2abs=function(r){if(!u(r))throw new TypeError("Argument not a Date: ".concat(r));var t=r.getFullYear()-1;return function(r){if(!u(r))throw new TypeError("Argument not a Date: ".concat(r));var t=r.getDate()+31*r.getMonth();return r.getMonth()>1&&(t-=Math.floor((4*(r.getMonth()+1)+23)/10),a(r.getFullYear())&&t++),t}(r)+365*t+(Math.floor(t/4)-Math.floor(t/100)+Math.floor(t/400))},r.hdate=I,Object.defineProperty(r,"__esModule",{value:!0}),r}({});
+/*! @hebcal/core v3.40.0 */
+var hebcal=function(r){"use strict";function t(r){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},t(r)}var n=[0,31,28,31,30,31,30,31,31,30,31,30,31];function e(r,t){return r-t*Math.floor(r/t)}function o(r,t){return Math.floor(r/t)}function a(r){return!(r%4||!(r%100)&&r%400)}function u(r){return"object"===t(r)&&Date.prototype===r.__proto__}function f(r,t,n){var e=r-1;return 365*e+o(e,4)-o(e,100)+o(e,400)+o(367*t-362,12)+(t<=2?0:a(r)?-1:-2)+n}[n,n.slice()][1][2]=29;var c=["","Nisan","Iyyar","Sivan","Tamuz","Av","Elul","Tishrei","Cheshvan","Kislev","Tevet","Sh'vat"],i=[c.concat(["Adar","Nisan"]),c.concat(["Adar I","Adar II","Nisan"])],h=Object.create(null),l=-1373428;function s(r,t,n){var e=n;if(t<7){for(var o=7;o<=b(r);o++)e+=m(o,r);for(var a=1;a<t;a++)e+=m(a,r)}else for(var u=7;u<t;u++)e+=m(u,r);return l+p(r)+e-1}function y(r){return l+p(r)}function v(r){return(1+7*r)%19<7}function b(r){return 12+v(r)}function m(r,t){switch(r){case 2:case 4:case 6:case 10:case 13:return 29}return 12===r&&!v(t)||8===r&&!A(t)||9===r&&I(t)?29:30}function p(r){var t=h[r]=h[r]||function(r){var t=r-1,n=235*Math.floor(t/19)+t%19*12+Math.floor((t%19*7+1)/19),e=204+n%1080*793,o=5+12*n+793*Math.floor(n/1080)+Math.floor(e/1080),a=e%1080+o%24*1080,u=1+29*n+Math.floor(o/24),f=u+(a>=19440||2==u%7&&a>=9924&&!v(r)||1==u%7&&a>=16789&&v(t));return f+(f%7==0||f%7==3||f%7==5)}(r);return t}function M(r){return p(r+1)-p(r)}function A(r){return M(r)%10==5}function I(r){return M(r)%10==3}var w={abs2hebrew:function(r){if("number"!=typeof r||isNaN(r))throw new TypeError("invalid parameter to abs2hebrew ".concat(r));r=Math.trunc(r);for(var t=Math.floor((r-l)/365.24682220597794);y(t)<=r;)++t;for(var n=r<s(--t,1,1)?7:1;r>s(t,n,m(n,t));)++n;return{yy:t,mm:n,dd:1+r-s(t,n,1)}},daysInMonth:m,daysInYear:M,getMonthName:function(r,t){if("number"!=typeof r||isNaN(r)||r<1||r>14)throw new TypeError("bad month argument ".concat(r));return i[+v(t)][r]},hebrew2abs:s,isLeapYear:v,longCheshvan:A,months:{NISAN:1,IYYAR:2,SIVAN:3,TAMUZ:4,AV:5,ELUL:6,TISHREI:7,CHESHVAN:8,KISLEV:9,TEVET:10,SHVAT:11,ADAR_I:12,ADAR_II:13},monthsInYear:b,shortKislev:I};return r.abs2greg=function(r){if("number"!=typeof r)throw new TypeError("Argument not a Number: ".concat(r));var t=function(r){var t=r-1,n=o(t,146097),a=e(t,146097),u=o(a,36524),f=e(a,36524),c=o(f,1461),i=o(e(f,1461),365),h=400*n+100*u+4*c+i;return 4!=u&&4!=i?h+1:h}(r=Math.trunc(r)),n=o(12*(r-f(t,1,1)+(r<f(t,3,1)?0:a(t)?1:2))+373,367),u=r-f(t,n,1)+1,c=new Date(t,n-1,u);return t<100&&t>=0&&c.setFullYear(t),c},r.greg2abs=function(r){if(!u(r))throw new TypeError("Argument not a Date: ".concat(r));var t=r.getFullYear()-1;return function(r){if(!u(r))throw new TypeError("Argument not a Date: ".concat(r));var t=r.getMonth(),n=r.getDate()+31*t;return t>1&&(n-=Math.floor((4*(t+1)+23)/10),a(r.getFullYear())&&n++),n}(r)+365*t+(Math.floor(t/4)-Math.floor(t/100)+Math.floor(t/400))},r.hdate=w,Object.defineProperty(r,"__esModule",{value:!0}),r}({});

package/dist/hdate0.mjs

@@ -0,0 +1,457 @@
+/*! @hebcal/core v3.40.0 */
+/*
+ * More minimal greg routines
+ */
+
+/** @private */
+const lengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+/** @private */
+const monthLengths = [
+  lengths,
+  lengths.slice(),
+];
+monthLengths[1][2] = 29;
+
+/**
+ * @private
+ * @param {number} x
+ * @param {number} y
+ * @return {number}
+ */
+function mod(x, y) {
+  return x - y * Math.floor(x / y);
+}
+
+/**
+ * @private
+ * @param {number} x
+ * @param {number} y
+ * @return {number}
+ */
+function quotient(x, y) {
+  return Math.floor(x / y);
+}
+
+/**
+ * Returns true if the Gregorian year is a leap year
+ * @private
+ * @param {number} year Gregorian year
+ * @return {boolean}
+ */
+function isLeapYear$1(year) {
+  return !(year % 4) && (!!(year % 100) || !(year % 400));
+}
+
+/**
+ * Returns true if the object is a Javascript Date
+ * @private
+ * @param {Object} obj
+ * @return {boolean}
+ */
+function isDate(obj) {
+  return typeof obj === 'object' && Date.prototype === obj.__proto__;
+}
+
+/**
+ * Returns number of days since January 1 of that year
+ * @private
+ * @param {Date} date Gregorian date
+ * @return {number}
+ */
+function dayOfYear(date) {
+  if (!isDate(date)) {
+    throw new TypeError(`Argument not a Date: ${date}`);
+  }
+  const month = date.getMonth();
+  let doy = date.getDate() + 31 * month;
+  if (month > 1) {
+    // FEB
+    doy -= Math.floor((4 * (month + 1) + 23) / 10);
+    if (isLeapYear$1(date.getFullYear())) {
+      doy++;
+    }
+  }
+  return doy;
+}
+
+/**
+ * Converts Gregorian date to absolute R.D. (Rata Die) days
+ * @private
+ * @param {Date} date Gregorian date
+ * @return {number}
+ */
+function greg2abs(date) {
+  if (!isDate(date)) {
+    throw new TypeError(`Argument not a Date: ${date}`);
+  }
+  const year = date.getFullYear() - 1;
+  return (
+    dayOfYear(date) + // days this year
+    365 * year + // + days in prior years
+    (Math.floor(year / 4) - // + Julian Leap years
+    Math.floor(year / 100) + // - century years
+    Math.floor(year / 400))
+  ); // + Gregorian leap years
+}
+
+/**
+ * @private
+ * @param {number} abs - R.D. number of days
+ * @return {number}
+ */
+function yearFromFixed(abs) {
+  const l0 = abs - 1;
+  const n400 = quotient(l0, 146097);
+  const d1 = mod(l0, 146097);
+  const n100 = quotient(d1, 36524);
+  const d2 = mod(d1, 36524);
+  const n4 = quotient(d2, 1461);
+  const d3 = mod(d2, 1461);
+  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
+ * @param {number} month
+ * @param {number} day
+ * @return {number}
+ */
+function toFixed(year, month, day) {
+  const py = year - 1;
+  return 365 * py +
+    quotient(py, 4) -
+    quotient(py, 100) +
+    quotient(py, 400) +
+    quotient((367 * month - 362), 12) +
+    (month <= 2 ? 0 : (isLeapYear$1(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:
+ * Three Historical Calendars'' by E. M. Reingold,  N. Dershowitz, and S. M.
+ * Clamen, Software--Practice and Experience, Volume 23, Number 4
+ * (April, 1993), pages 383-404 for an explanation.
+ * @private
+ * @param {number} abs - R.D. number of days
+ * @return {Date}
+ */
+function abs2greg(abs) {
+  if (typeof abs !== 'number') {
+    throw new TypeError(`Argument not a Number: ${abs}`);
+  }
+  abs = Math.trunc(abs);
+  const year = yearFromFixed(abs);
+  const priorDays = abs - toFixed(year, 1, 1);
+  const correction = abs < toFixed(year, 3, 1) ? 0 : (isLeapYear$1(year) ? 1 : 2);
+  const month = quotient((12 * (priorDays + correction) + 373), 367);
+  const day = abs - toFixed(year, month, 1) + 1;
+  const dt = new Date(year, month - 1, day);
+  if (year < 100 && year >= 0) {
+    dt.setFullYear(year);
+  }
+  return dt;
+}
+
+/*
+ * More minimal HDate
+ */
+
+const NISAN = 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;
+
+/**
+ * Hebrew months of the year (NISAN=1, TISHREI=7)
+ * @readonly
+ * @enum {number}
+ */
+const months = {
+  /** Nissan / ניסן */
+  NISAN: 1,
+  /** Iyyar / אייר */
+  IYYAR: 2,
+  /** Sivan / סיון */
+  SIVAN: 3,
+  /** Tamuz (sometimes Tammuz) / תמוז */
+  TAMUZ: 4,
+  /** Av / אב */
+  AV: 5,
+  /** Elul / אלול */
+  ELUL: 6,
+  /** Tishrei / תִשְׁרֵי */
+  TISHREI: 7,
+  /** Cheshvan / חשון */
+  CHESHVAN: 8,
+  /** Kislev / כסלו */
+  KISLEV: 9,
+  /** Tevet / טבת */
+  TEVET: 10,
+  /** Sh'vat / שבט */
+  SHVAT: 11,
+  /** Adar or Adar Rishon / אדר */
+  ADAR_I: 12,
+  /** Adar Sheini (only on leap years) / אדר ב׳ */
+  ADAR_II: 13,
+};
+
+const monthNames0 = [
+  '',
+  'Nisan',
+  'Iyyar',
+  'Sivan',
+  'Tamuz',
+  'Av',
+  'Elul',
+  'Tishrei',
+  'Cheshvan',
+  'Kislev',
+  'Tevet',
+  'Sh\'vat',
+];
+
+/**
+ * Transliterations of Hebrew month names.
+ * Regular years are index 0 and leap years are index 1.
+ * @private
+ */
+const monthNames = [
+  monthNames0.concat([
+    'Adar',
+    'Nisan',
+  ]),
+  monthNames0.concat([
+    'Adar I',
+    'Adar II',
+    'Nisan',
+  ]),
+];
+
+const edCache = Object.create(null);
+
+const EPOCH = -1373428;
+// Avg year length in the cycle (19 solar years with 235 lunar months)
+const AVG_HEBYEAR_DAYS = 365.24682220597794;
+
+/**
+ * Converts Hebrew date to R.D. (Rata Die) fixed days.
+ * R.D. 1 is the imaginary date Monday, January 1, 1 on the Gregorian
+ * Calendar.
+ * @private
+ * @param {number} year Hebrew year
+ * @param {number} month Hebrew month
+ * @param {number} day Hebrew date (1-30)
+ * @return {number}
+ */
+function hebrew2abs(year, month, day) {
+  let tempabs = day;
+
+  if (month < TISHREI) {
+    for (let m = TISHREI; m <= monthsInYear(year); m++) {
+      tempabs += daysInMonth(m, year);
+    }
+    for (let m = NISAN; m < month; m++) {
+      tempabs += daysInMonth(m, year);
+    }
+  } else {
+    for (let m = TISHREI; m < month; m++) {
+      tempabs += daysInMonth(m, year);
+    }
+  }
+
+  return EPOCH + elapsedDays(year) + tempabs - 1;
+}
+
+/**
+ * @private
+ * @param {number} year
+ * @return {number}
+ */
+function newYear(year) {
+  return EPOCH + elapsedDays(year);
+}
+
+/**
+ * Converts absolute R.D. days to Hebrew date
+ * @private
+ * @param {number} abs absolute R.D. days
+ * @return {SimpleHebrewDate}
+ */
+function abs2hebrew(abs) {
+  if (typeof abs !== 'number' || isNaN(abs)) {
+    throw new TypeError(`invalid parameter to abs2hebrew ${abs}`);
+  }
+  abs = Math.trunc(abs);
+
+  // first, quickly approximate year
+  let year = Math.floor((abs - EPOCH) / AVG_HEBYEAR_DAYS);
+  while (newYear(year) <= abs) {
+    ++year;
+  }
+  --year;
+
+  let month = abs < hebrew2abs(year, 1, 1) ? 7 : 1;
+  while (abs > hebrew2abs(year, month, daysInMonth(month, year))) {
+    ++month;
+  }
+
+  const day = 1 + abs - hebrew2abs(year, month, 1);
+  return {yy: year, mm: month, dd: day};
+}
+
+/**
+ * Returns true if Hebrew year is a leap year
+ * @private
+ * @param {number} year Hebrew year
+ * @return {boolean}
+ */
+function isLeapYear(year) {
+  return (1 + year * 7) % 19 < 7;
+}
+
+/**
+ * Number of months in this Hebrew year (either 12 or 13 depending on leap year)
+ * @private
+ * @param {number} year Hebrew year
+ * @return {number}
+ */
+function monthsInYear(year) {
+  return 12 + isLeapYear(year); // boolean is cast to 1 or 0
+}
+
+/**
+ * Number of days in Hebrew month in a given year (29 or 30)
+ * @private
+ * @param {number} month Hebrew month (e.g. months.TISHREI)
+ * @param {number} year Hebrew year
+ * @return {number}
+ */
+function daysInMonth(month, year) {
+  switch (month) {
+    case IYYAR:
+    case TAMUZ:
+    case ELUL:
+    case TEVET:
+    case ADAR_II:
+      return 29;
+  }
+  if ((month === ADAR_I && !isLeapYear(year)) ||
+      (month === CHESHVAN && !longCheshvan(year)) ||
+      (month === KISLEV && shortKislev(year))) {
+    return 29;
+  } else {
+    return 30;
+  }
+}
+
+/**
+ * Returns a transliterated string name of Hebrew month in year,
+ * for example 'Elul' or 'Cheshvan'.
+ * @private
+ * @param {number} month Hebrew month (e.g. months.TISHREI)
+ * @param {number} year Hebrew year
+ * @return {string}
+ */
+function getMonthName(month, year) {
+  if (typeof month !== 'number' || isNaN(month) || month < 1 || month > 14) {
+    throw new TypeError(`bad month argument ${month}`);
+  }
+  return monthNames[+isLeapYear(year)][month];
+}
+
+/**
+ * Days from sunday prior to start of Hebrew calendar to mean
+ * conjunction of Tishrei in Hebrew YEAR
+ * @private
+ * @param {number} year Hebrew year
+ * @return {number}
+ */
+function elapsedDays(year) {
+  const elapsed = edCache[year] = edCache[year] || elapsedDays0(year);
+  return elapsed;
+}
+
+/**
+ * Days from sunday prior to start of Hebrew calendar to mean
+ * conjunction of Tishrei in Hebrew YEAR
+ * @private
+ * @param {number} year Hebrew year
+ * @return {number}
+ */
+function elapsedDays0(year) {
+  const prevYear = year - 1;
+  const mElapsed = 235 * Math.floor(prevYear / 19) + // Months in complete 19 year lunar (Metonic) cycles so far
+      12 * (prevYear % 19) + // Regular months in this cycle
+      Math.floor(((prevYear % 19) * 7 + 1) / 19); // Leap months this cycle
+
+  const pElapsed = 204 + 793 * (mElapsed % 1080);
+
+  const hElapsed = 5 +
+      12 * mElapsed +
+      793 * Math.floor(mElapsed / 1080) +
+      Math.floor(pElapsed / 1080);
+
+  const parts = (pElapsed % 1080) + 1080 * (hElapsed % 24);
+
+  const day = 1 + 29 * mElapsed + Math.floor(hElapsed / 24);
+  const altDay = day +
+      (parts >= 19440 ||
+        (2 === day % 7 && parts >= 9924 && !isLeapYear(year)) ||
+        (1 === day % 7 && parts >= 16789 && isLeapYear(prevYear)));
+
+  return altDay + (altDay % 7 === 0 || altDay % 7 === 3 || altDay % 7 === 5);
+}
+
+/**
+ * Number of days in the hebrew YEAR.
+ * A common Hebrew calendar year can have a length of 353, 354 or 355 days
+ * A leap Hebrew calendar year can have a length of 383, 384 or 385 days
+ * @private
+ * @param {number} year Hebrew year
+ * @return {number}
+ */
+function daysInYear(year) {
+  return elapsedDays(year + 1) - elapsedDays(year);
+}
+
+/**
+ * true if Cheshvan is long in Hebrew year
+ * @private
+ * @param {number} year Hebrew year
+ * @return {boolean}
+ */
+function longCheshvan(year) {
+  return daysInYear(year) % 10 === 5;
+}
+
+/**
+ * true if Kislev is short in Hebrew year
+ * @private
+ * @param {number} year Hebrew year
+ * @return {boolean}
+ */
+function shortKislev(year) {
+  return daysInYear(year) % 10 === 3;
+}
+
+const hdate = {
+  abs2hebrew, daysInMonth, daysInYear, getMonthName, hebrew2abs,
+  isLeapYear, longCheshvan, months,
+  monthsInYear, shortKislev,
+};
+
+export { abs2greg, greg2abs, hdate };

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.39.0 */
+/*! @hebcal/core v3.40.0 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -93,11 +93,12 @@ function dayOfYear(date) {
     throw new TypeError(`Argument not a Date: ${date}`);
   }
 
-  let doy = date.getDate() + 31 * date.getMonth();
+  const month = date.getMonth();
+  let doy = date.getDate() + 31 * month;
 
-  if (date.getMonth() > 1) {
+  if (month > 1) {
     // FEB
-    doy -= Math.floor((4 * (date.getMonth() + 1) + 23) / 10);
+    doy -= Math.floor((4 * (month + 1) + 23) / 10);
 
     if (isLeapYear$1(date.getFullYear())) {
       doy++;
@@ -154,7 +155,7 @@ function yearFromFixed(abs) {
 
 function 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 : isLeapYear$1(year) ? -1 : -2) + day;
+  return 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + (month <= 2 ? 0 : isLeapYear$1(year) ? -1 : -2) + day;
 }
 /**
  * Converts from Rata Die (R.D. number) to Gregorian date.
@@ -4193,6 +4194,10 @@ function throwError(errorMessage) {
  *     Hebrew date, e.g. `['Noach']` or `['Matot', 'Masei']`
  * @property {boolean} chag True if this is a regular parasha HaShavua
  *     Torah reading, false if it's a special holiday reading
+ * @property {number|number[]} num the parsha number (or numbers) using 1-indexing.
+ *     A `number` for a regular (single) parsha, and a `number[]` for a doubled parsha.
+ *     For Parashat *Bereshit*, `num` would be equal to `1`, and for
+ *     *Matot-Masei* it would be `[42, 43]`
  */
 
 /**
@@ -4384,7 +4389,8 @@ class Sedra {
     if (index >= 0) {
       return {
         parsha: [parshiot[index]],
-        chag: false
+        chag: false,
+        num: index + 1
       };
     }
 
@@ -4392,7 +4398,8 @@ class Sedra {
 
     return {
       parsha: [parshiot[p1], parshiot[p1 + 1]],
-      chag: false
+      chag: false,
+      num: [p1 + 1, p1 + 2]
     };
   }
 
@@ -4609,8 +4616,9 @@ class ParshaEvent extends Event {
    * @param {string[]} parsha - untranslated name of single or double parsha,
    *   such as ['Bereshit'] or ['Achrei Mot', 'Kedoshim']
    * @param {boolean} il
+   * @param {number|number[]} num
    */
-  constructor(date, parsha, il) {
+  constructor(date, parsha, il, num) {
     if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {
       throw new TypeError('Bad parsha argument');
     }
@@ -4619,6 +4627,7 @@ class ParshaEvent extends Event {
     super(date, desc, flags.PARSHA_HASHAVUA);
     this.parsha = parsha;
     this.il = Boolean(il);
+    this.num = num || -1;
   }
   /**
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
@@ -5521,7 +5530,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-var version="3.39.0";
+var version="3.40.0";
 
 var headers$1={"plural-forms":"nplurals=2; plural=(n > 1);",language:"en_CA@ashkenazi"};var contexts$1={"":{Berachot:["Berachos"],Shabbat:["Shabbos"],Taanit:["Taanis"],Yevamot:["Yevamos"],Ketubot:["Kesubos"],"Baba Batra":["Baba Basra"],Makkot:["Makkos"],Shevuot:["Shevuos"],Horayot:["Horayos"],Menachot:["Menachos"],Bechorot:["Bechoros"],Keritot:["Kerisos"],Midot:["Midos"],"Achrei Mot":["Achrei Mos"],Bechukotai:["Bechukosai"],"Beha'alotcha":["Beha'aloscha"],Bereshit:["Bereshis"],Chukat:["Chukas"],"Erev Shavuot":["Erev Shavuos"],"Erev Sukkot":["Erev Sukkos"],"Ki Tavo":["Ki Savo"],"Ki Teitzei":["Ki Seitzei"],"Ki Tisa":["Ki Sisa"],Matot:["Matos"],"Purim Katan":["Purim Koton"],Tazria:["Sazria"],"Shabbat Chazon":["Shabbos Chazon"],"Shabbat HaChodesh":["Shabbos HaChodesh"],"Shabbat HaGadol":["Shabbos HaGadol"],"Shabbat Nachamu":["Shabbos Nachamu"],"Shabbat Parah":["Shabbos Parah"],"Shabbat Shekalim":["Shabbos Shekalim"],"Shabbat Shuva":["Shabbos Shuvah"],"Shabbat Zachor":["Shabbos Zachor"],Shavuot:["Shavuos"],"Shavuot I":["Shavuos I"],"Shavuot II":["Shavuos II"],Shemot:["Shemos"],"Shmini Atzeret":["Shmini Atzeres"],"Simchat Torah":["Simchas Torah"],Sukkot:["Sukkos"],"Sukkot I":["Sukkos I"],"Sukkot II":["Sukkos II"],"Sukkot II (CH''M)":["Sukkos II (CH''M)"],"Sukkot III (CH''M)":["Sukkos III (CH''M)"],"Sukkot IV (CH''M)":["Sukkos IV (CH''M)"],"Sukkot V (CH''M)":["Sukkos V (CH''M)"],"Sukkot VI (CH''M)":["Sukkos VI (CH''M)"],"Sukkot VII (Hoshana Raba)":["Sukkos VII (Hoshana Raba)"],"Ta'anit Bechorot":["Ta'anis Bechoros"],"Ta'anit Esther":["Ta'anis Esther"],Toldot:["Toldos"],Vaetchanan:["Vaeschanan"],Yitro:["Yisro"],"Vezot Haberakhah":["Vezos Haberakhah"],Parashat:["Parshas"],"Leil Selichot":["Leil Selichos"],"Shabbat Mevarchim Chodesh":["Shabbos Mevorchim Chodesh"],"Shabbat Shirah":["Shabbos Shirah"],Tevet:["Teves"],"Asara B'Tevet":["Asara B'Teves"],Berakhot:["Berakhos"],Sheviit:["Sheviis"],Terumot:["Terumos"],Maasrot:["Maasros"],Eduyot:["Eduyos"],Avot:["Avos"],Bekhorot:["Bekhoros"],Middot:["Middos"],Oholot:["Oholos"],Tahorot:["Tahoros"],Mikvaot:["Mikvaos"]}};var poAshkenazi = {headers:headers$1,contexts:contexts$1};
 
@@ -5537,17 +5546,13 @@ const heNoNikud = {};
 Object.keys(heStrs).forEach(key => {
   heNoNikud[key] = [Locale.hebrewStripNikkud(heStrs[key][0])];
 });
-const localeName = 'he-x-NoNikud';
 const poHeNoNikud = {
-  headers: {
-    'plural-forms': 'nplurals=2; plural=(n!=1);',
-    'language': localeName
-  },
+  headers: poHe.headers,
   contexts: {
     '': heNoNikud
   }
 };
-Locale.addLocale(localeName, poHeNoNikud);
+Locale.addLocale('he-x-NoNikud', poHeNoNikud);
 
 /*
     Hebcal - A Jewish Calendar Generator
@@ -5854,7 +5859,7 @@ function getMaskFromOptions(options) {
   }
 
   if (options.candlelighting) {
-    mask |= LIGHT_CANDLES | LIGHT_CANDLES_TZEIS;
+    mask |= LIGHT_CANDLES | LIGHT_CANDLES_TZEIS | YOM_TOV_ENDS;
   } // suppression of defaults
 
 
@@ -6124,7 +6129,7 @@ class HebrewCalendar {
         const parsha0 = sedra.lookup(abs);
 
         if (!parsha0.chag) {
-          evts.push(new ParshaEvent(hd, parsha0.parsha, il));
+          evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
         }
       }